diff options
| author | alanh <alanh> | 2000-09-22 17:06:37 +0000 |
|---|---|---|
| committer | alanh <alanh> | 2000-09-22 17:06:37 +0000 |
| commit | 585028e1a2b5cc7ad96a5a84518014610e55814a (patch) | |
| tree | d1954bf1cb5136007345a256c55871648d05e55b /xc | |
| parent | c0fd23c13d4bbe14ab6908e8444aefe0ed22176c (diff) | |
Import of XFree86 4.0.1d-pre
Diffstat (limited to 'xc')
1963 files changed, 7045 insertions, 3843 deletions
diff --git a/xc/Imakefile b/xc/Imakefile index e9515ea3b..e64ff1503 100644 --- a/xc/Imakefile +++ b/xc/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $ -XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ +XCOMM $XFree86: xc/Imakefile,v 3.19 2000/05/31 15:02:54 eich Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/xc/Makefile b/xc/Makefile index 0df5cca51..aa87714ec 100644 --- a/xc/Makefile +++ b/xc/Makefile @@ -1,5 +1,5 @@ # $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $ -# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $ +# $XFree86: xc/Makefile,v 3.15 1999/08/14 10:48:56 dawes Exp $ # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. diff --git a/xc/config/Imakefile b/xc/config/Imakefile index 870f8833f..4c0526256 100644 --- a/xc/config/Imakefile +++ b/xc/config/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $ -XCOMM $XFree86: xc/config/Imakefile,v 1.2 2000/02/13 00:12:18 dawes Exp $ +XCOMM $XFree86$ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/xc/config/cf/Amoeba.cf b/xc/config/cf/Amoeba.cf index a84478902..0a07942c3 100644 --- a/xc/config/cf/Amoeba.cf +++ b/xc/config/cf/Amoeba.cf @@ -1,5 +1,5 @@ XCOMM platform: $XConsortium: Amoeba.cf /main/12 1996/09/28 16:04:48 rws $ -XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.9 1996/12/23 05:50:00 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.8 1996/01/26 08:59:07 dawes Exp $ /* The presence of this configuration file in the X distribution * does not imply full support for the system it describes. diff --git a/xc/config/cf/DGUX.cf b/xc/config/cf/DGUX.cf index b383099ee..7837f25c3 100644 --- a/xc/config/cf/DGUX.cf +++ b/xc/config/cf/DGUX.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.4 1998/12/29 13:00:46 dawes Exp $ /* Copyright Takis Psarogiannakopoulos <takis@pmms.cam.ac.uk> * This is the DG/ux configuration file of X11R6.3 */ diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index 4f5657a8f..a6545089f 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -132,6 +132,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #endif #endif +/* + * 4.1/i386 and 5.0/i386 have the AGP driver. + */ +#ifndef HasAgpGart +#if defined(i386Architecture) && \ + (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)) +#define HasAgpGart YES +#endif +#endif + /* * This doesn't work the way it does on every other system. On FreeBSD it's * only a "hint, not a demand", whatever that means. Note that this is not diff --git a/xc/config/cf/Imake.cf b/xc/config/cf/Imake.cf index fd1dc23fa..6eecac1ae 100644 --- a/xc/config/cf/Imake.cf +++ b/xc/config/cf/Imake.cf @@ -17,7 +17,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.60 2000/08/11 17:27:10 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.59 2000/08/09 23:40:08 dawes Exp $ #if defined(clipper) || defined(__clipper__) # undef clipper @@ -580,19 +580,100 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.60 2000/08/11 17:27:10 dawes Exp $ # undef linux # define LinuxArchitecture # ifdef i386 -# define i386Architecture +# ifndef i386Architecture +# define i386Architecture +# endif # undef i386 XCOMM Keep cpp from replacing path elements containing i486/i586/i686 -# undef i486 -# undef i586 -# undef i686 -# endif /* i386 */ +# ifdef i486 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef i486 +# endif +# ifdef i586 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef i586 +# endif +# ifdef i686 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef i686 +# endif +# ifdef k6 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef k6 +# endif +# endif /* k6 */ # ifdef __i386__ # ifndef i386Architecture # define i386Architecture # endif # undef __i386__ # endif /* __i386__ */ +# ifdef __i486__ +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i486__ +# endif /* __i486__ */ +# ifdef __i586__ +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i586__ +# endif /* __i586__ */ +# ifdef __i686__ +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i686__ +# endif /* __i686__ */ +# ifdef __k6__ +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __k6__ +# endif /* __k6__ */ +# ifdef __i386 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i386 +# endif /* __i386 */ +# ifdef __i486 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i486 +# endif /* __i486 */ +# ifdef __i586 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i586 +# endif /* __i586 */ +# ifdef __i686 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __i686 +# endif /* __i686 */ +# ifdef __k6 +# ifndef i386Architecture +# define i386Architecture +# endif +# undef __k6 +# endif /* __k6 */ +# ifdef __s390__ +# define s390Architecture +# undef __s390__ +# endif /* s390 */ # ifdef __alpha # define AlphaArchitecture # undef __alpha @@ -648,7 +729,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 # undef mips # undef __mips__ # endif -/* for compatibility with 3.3.x */ +XCOMM for compatibility with 3.3.x # ifdef PpcArchitecture # define PowerPCArchitecture # endif diff --git a/xc/config/cf/Imake.rules b/xc/config/cf/Imake.rules index 93718e2ba..f09fd6c0b 100644 --- a/xc/config/cf/Imake.rules +++ b/xc/config/cf/Imake.rules @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.76 2000/06/15 20:49:55 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.76tsi Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -3117,6 +3117,7 @@ NormalRelocatableTarget(Concat(module,_drv), objects) #ifndef LibraryModuleTarget #if MakeDllModules #define LibraryModuleTarget(module,objects) @@\ +NormalLibraryTarget(module, objects) @@\ DynamicModuleTarget(Concat3(lib,module,.so), objects) #else #define LibraryModuleTarget(module, objects) @@\ @@ -3130,6 +3131,7 @@ NormalLibraryTarget(module, objects) #ifndef DepLibraryModuleTarget #if MakeDllModules #define DepLibraryModuleTarget(module,deplist,objects) @@\ +NormalDepLibraryTarget(module, deplist, objects) @@\ DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects) #else #define DepLibraryModuleTarget(module,deplist,objects) @@\ @@ -3146,7 +3148,7 @@ AllTarget(module) @@\ @@\ module: modlist @@\ RemoveFile($@) @@\ - $(LD) -o $@ $(SHLIBLDFLAGS) modlist @@\ + $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\ @@\ clean:: @@\ RemoveFile(module) @@ -3161,7 +3163,7 @@ AllTarget(module) @@\ @@\ module: deplist @@\ RemoveFile($@) @@\ - $(LD) -o $@ $(SHLIBLDFLAGS) modlist @@\ + $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\ @@\ clean:: @@\ RemoveFile(module) diff --git a/xc/config/cf/Imake.tmpl b/xc/config/cf/Imake.tmpl index cf62c8596..8097a1755 100644 --- a/xc/config/cf/Imake.tmpl +++ b/xc/config/cf/Imake.tmpl @@ -493,6 +493,14 @@ GLIDE2INCDIR = Glide2IncDir #endif #endif GLIDE3INCDIR = Glide3IncDir +#ifndef Glide3LibName +#if HasGlide3 +#define Glide3LibName glide3 +#else +#define Glide3LibName +#endif +#endif +GLIDE3LIBNAME = Glide3LibName #ifndef HasTk #define HasTk NO #endif diff --git a/xc/config/cf/Imakefile b/xc/config/cf/Imakefile index 5d189e281..590e978a9 100644 --- a/xc/config/cf/Imakefile +++ b/xc/config/cf/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $ -XCOMM $XFree86: xc/config/cf/Imakefile,v 3.23 2000/08/09 23:40:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imakefile,v 3.22 2000/01/21 02:29:34 dawes Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. diff --git a/xc/config/cf/Library.tmpl b/xc/config/cf/Library.tmpl index c965cd436..1ff02970e 100644 --- a/xc/config/cf/Library.tmpl +++ b/xc/config/cf/Library.tmpl @@ -19,7 +19,7 @@ XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $ -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.12 1999/10/13 04:20:41 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.11 1999/08/28 09:00:17 dawes Exp $ #ifndef LibraryCplusplusOptions # if DoSharedLib && defined(SharedLibraryCplusplusOptions) diff --git a/xc/config/cf/NetBSD.cf b/xc/config/cf/NetBSD.cf index c138f94f6..8669d0548 100644 --- a/xc/config/cf/NetBSD.cf +++ b/xc/config/cf/NetBSD.cf @@ -72,6 +72,18 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasVarRun YES #define HasVarDb YES +/* Defines for using the GNU pth thread library -- experimental */ + +#ifdef NetBSDPth +#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ +#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ +#define HasThreadSafeAPI NO +#define HasPosixThreads YES +#define SystemMTDefines -D_REENTRANT PthreadHLocation +#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread +#define SharedX11Reqs ThreadsLibraries +#endif + /* * Compiler Features */ @@ -242,7 +254,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasBsdMake YES #define CompressAllFonts YES #define GzipFontCompression YES -#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) +#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) #ifdef InstallCmd diff --git a/xc/config/cf/OpenBSD.cf b/xc/config/cf/OpenBSD.cf index 2750309e1..499b0671e 100644 --- a/xc/config/cf/OpenBSD.cf +++ b/xc/config/cf/OpenBSD.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.39 2000/08/01 23:38:45 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.38 2000/07/07 20:06:56 tsi Exp $ XCOMM #ifndef OSName diff --git a/xc/config/cf/QNX4.cf b/xc/config/cf/QNX4.cf index 340b60c82..3de52226b 100644 --- a/xc/config/cf/QNX4.cf +++ b/xc/config/cf/QNX4.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.2 2000/01/21 02:29:34 dawes Exp $ #define StripInstalledPrograms NO #define BuildServer YES diff --git a/xc/config/cf/QNX4.rules b/xc/config/cf/QNX4.rules index 010596341..1ce9b55c6 100644 --- a/xc/config/cf/QNX4.rules +++ b/xc/config/cf/QNX4.rules @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/QNX4.rules,v 1.1 1999/12/27 00:45:43 robin Exp $ +XCOMM platform: $XFree86: xc/config/cf/QNX.rules,v 1.1.2.2 1999/07/23 13:42:29 hohndel Exp $ XCOMM Rules to work around wlib for QNX... diff --git a/xc/config/cf/README b/xc/config/cf/README index 30797bd95..ff8430140 100644 --- a/xc/config/cf/README +++ b/xc/config/cf/README @@ -3,7 +3,7 @@ $TOG: README /main/76 1998/05/11 14:35:10 barstow $ -$XFree86: xc/config/cf/README,v 1.11 2000/06/14 00:16:02 dawes Exp $ +$XFree86: xc/config/cf/README,v 1.10 1998/10/02 06:15:01 dawes Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! diff --git a/xc/config/cf/Server.tmpl b/xc/config/cf/Server.tmpl index 42aadf311..b75a16199 100644 --- a/xc/config/cf/Server.tmpl +++ b/xc/config/cf/Server.tmpl @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.16 2000/02/18 16:23:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.15 1999/10/13 04:20:41 dawes Exp $ /* * Server imakefile info - this contains any special redefinitions, etc. * that Imakefiles in the server subtree will need. diff --git a/xc/config/cf/ServerLib.tmpl b/xc/config/cf/ServerLib.tmpl index fe38049fe..8ad6c7fa3 100644 --- a/xc/config/cf/ServerLib.tmpl +++ b/xc/config/cf/ServerLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0 1996/10/03 08:28:07 dawes Exp $ +XCOMM $XFree86$ /* * Server Library imakefile info - this contains any special * redefinitions, etc. that Imakefiles in the various server library diff --git a/xc/config/cf/Threads.tmpl b/xc/config/cf/Threads.tmpl index a505fcef7..52da0e48f 100644 --- a/xc/config/cf/Threads.tmpl +++ b/xc/config/cf/Threads.tmpl @@ -1,5 +1,5 @@ XCOMM $XConsortium: Threads.tmpl /main/11 1996/09/28 16:07:06 rws $ -XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.2 1996/12/23 05:50:12 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.1 1996/01/05 13:06:32 dawes Exp $ /* * For a multi-threaded application or library, diff --git a/xc/config/cf/WinLib.tmpl b/xc/config/cf/WinLib.tmpl index 9ae402d50..e550d0b7f 100644 --- a/xc/config/cf/WinLib.tmpl +++ b/xc/config/cf/WinLib.tmpl @@ -1,5 +1,5 @@ XCOMM $XConsortium: WinLib.tmpl /main/3 1996/11/13 14:43:09 lehors $ -XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.2 1999/01/11 14:39:59 dawes Exp $ +XCOMM $XFree86$ #define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) #define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) diff --git a/xc/config/cf/X11.rules b/xc/config/cf/X11.rules index 97745c14e..4355b10fa 100644 --- a/xc/config/cf/X11.rules +++ b/xc/config/cf/X11.rules @@ -1,7 +1,7 @@ XCOMM $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $ -XCOMM $XFree86: xc/config/cf/X11.rules,v 1.4 1997/09/09 11:56:20 hohndel Exp $ +XCOMM $XFree86: $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject diff --git a/xc/config/cf/X11.tmpl b/xc/config/cf/X11.tmpl index 29d80c9b8..2a2461d30 100644 --- a/xc/config/cf/X11.tmpl +++ b/xc/config/cf/X11.tmpl @@ -5,7 +5,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.73 2000/08/09 02:57:19 tsi Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.74 2000/08/26 16:15:51 keithp Exp $ /*************************************************************************** * * @@ -298,6 +298,12 @@ XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.73 2000/08/09 02:57:19 tsi Exp $ #ifndef BuildPSResLibrary #define BuildPSResLibrary BuildDPSLibraries #endif +#ifndef BuildRender +#define BuildRender NO +#endif +#ifndef BuildRenderLibrary +#define BuildRenderLibrary BuildRender +#endif #ifndef BuildMiscDocs #define BuildMiscDocs NO @@ -711,6 +717,14 @@ FCHOWN_DEFINES = -DHAS_FCHOWN #endif #endif +#ifndef RenderDefines +#if BuildRender +#define RenderDefines -DRENDER +#else +#define RenderDefines /**/ +#endif +#endif + #ifndef FontCacheExtentionDefines #if BuildFontCache #define FontCacheExtensionDefines -DFONTCACHE @@ -728,7 +742,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN XCSecurityDefines CupDefines PervasiveDBEDefines \ XF86BigfontExtensionDefines DPMSDefines \ LowMemDefines XprintDefines XineramaDefines \ - SitePervasiveExtensionDefines + SitePervasiveExtensionDefines RenderDefines #endif #ifndef SiteExtensionDefines #define SiteExtensionDefines /**/ @@ -1408,6 +1422,21 @@ ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) #endif #endif +#if BuildRenderLibrary +#ifndef SharedLibXrender +#define SharedLibXrender HasSharedLibraries +#endif +#ifndef NormalLibXrender +#define NormalLibXrender YES +#endif +#ifndef DebugLibXrender +#define DebugLibXrender NO +#endif +#ifndef ProfileLibXrender +#define ProfileLibXrender NO +#endif +#endif + #if BuildGLXLibrary #ifndef SharedLibGlx #define SharedLibGlx HasSharedLibraries @@ -1609,6 +1638,18 @@ ProjectUnsharedLibReferences(GLX,GL,$(GLXLIBSRC),XBuildLibDir) #endif #endif +#if BuildRenderLibrary + XRENDERLIBSRC = $(LIBSRC)/Xrender +#if SharedLibXrender +#ifndef SharedXrenderRev +#define SharedXrenderRev 1.0 +#endif +SharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev) +#else +ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir) +#endif +#endif + #if BuildFontCacheLib # ifndef SharedLibXfontcache # define SharedLibXfontcache NO diff --git a/xc/config/cf/bsd.cf b/xc/config/cf/bsd.cf index 1c80bb210..722212a23 100644 --- a/xc/config/cf/bsd.cf +++ b/xc/config/cf/bsd.cf @@ -1,5 +1,5 @@ XCOMM platform: $XConsortium: bsd.cf /main/24 1996/09/28 16:09:13 rws $ -XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.2 1998/09/06 04:46:50 dawes Exp $ +XCOMM $XFree86$ #ifndef OSName #define OSName 4.3bsd diff --git a/xc/config/cf/bsdLib.rules b/xc/config/cf/bsdLib.rules index c4885b7de..a760df815 100644 --- a/xc/config/cf/bsdLib.rules +++ b/xc/config/cf/bsdLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $ -XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.13 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.12 1999/06/06 08:47:44 dawes Exp $ /* * NetBSD/FreeBSD shared library rules */ diff --git a/xc/config/cf/bsdLib.tmpl b/xc/config/cf/bsdLib.tmpl index ac912550d..19ffef4bc 100644 --- a/xc/config/cf/bsdLib.tmpl +++ b/xc/config/cf/bsdLib.tmpl @@ -42,7 +42,10 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #define CplusplusLibC #define FrescoSysLibs CplusplusLibC MathLibrary +/* Allow for libpthread, as overridden by OS definitions */ +#if !defined(SharedX11Reqs) #define SharedX11Reqs +#endif #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) diff --git a/xc/config/cf/bsdi.cf b/xc/config/cf/bsdi.cf index b3312ab39..72ded4dd4 100644 --- a/xc/config/cf/bsdi.cf +++ b/xc/config/cf/bsdi.cf @@ -1,5 +1,5 @@ XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.31 2000/08/01 23:38:45 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.30 2000/06/30 17:15:05 dawes Exp $ #ifndef OSName #define OSName DefaultOSName diff --git a/xc/config/cf/bsdiLib.rules b/xc/config/cf/bsdiLib.rules index fc1dd8dc2..a361ec065 100644 --- a/xc/config/cf/bsdiLib.rules +++ b/xc/config/cf/bsdiLib.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdiLib.rules,v 3.1 2000/05/18 00:33:16 dawes Exp $ +XCOMM $XFree86$ /* * BSDI shared library rules (converted from SVr4/Linux rules) diff --git a/xc/config/cf/bsdiLib.tmpl b/xc/config/cf/bsdiLib.tmpl index 82873b181..7acd56adf 100644 --- a/xc/config/cf/bsdiLib.tmpl +++ b/xc/config/cf/bsdiLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.1 2000/05/18 00:33:16 dawes Exp $ +XCOMM $XFree86$ /* * BSDI shared library template (converted from Linux template) diff --git a/xc/config/cf/cygwin.cf b/xc/config/cf/cygwin.cf index b4feccd3e..911e9be03 100644 --- a/xc/config/cf/cygwin.cf +++ b/xc/config/cf/cygwin.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.1 2000/08/09 23:40:09 dawes Exp $ +XCOMM platform: $XFree86$ XCOMM XCOMM - changes since B20 Cygwin32 release XCOMM - avoided tons of "not in XXX directory" messages; diff --git a/xc/config/cf/cygwin.rules b/xc/config/cf/cygwin.rules index 9ed93be31..bf0b13987 100644 --- a/xc/config/cf/cygwin.rules +++ b/xc/config/cf/cygwin.rules @@ -120,7 +120,7 @@ CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\ junk.c: @@\ echo "#include <cygwin/cygwin_dll.h>" >junk.c @@\ - echo "DECLARE_CYGWIN_DLL(dll_main);" >>junk.c @@\ + echo "/*DECLARE_CYGWIN_DLL(dll_main);*/" >>junk.c @@\ echo "int WINAPI dll_main(HANDLE a, DWORD reason, void *q)" >>junk.c @@\ echo "{ return 1; }" >>junk.c @@\ Concat3(lib,libname,.dll): solist junk.o libname.def @@\ diff --git a/xc/config/cf/cygwin.tmpl b/xc/config/cf/cygwin.tmpl index 0b12f21b7..3ba00f3f1 100644 --- a/xc/config/cf/cygwin.tmpl +++ b/xc/config/cf/cygwin.tmpl @@ -1,5 +1,5 @@ XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.1 2000/08/09 23:40:09 dawes Exp $ +XCOMM $XFree86$ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XLIBONLY) diff --git a/xc/config/cf/gnu.cf b/xc/config/cf/gnu.cf index 3e3890945..1bfcdb421 100644 --- a/xc/config/cf/gnu.cf +++ b/xc/config/cf/gnu.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.7 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.6 2000/02/29 15:24:13 tsi Exp $ #ifndef OSName #define OSName GNU diff --git a/xc/config/cf/gnuLib.rules b/xc/config/cf/gnuLib.rules index d3dc1e173..f5d14b740 100644 --- a/xc/config/cf/gnuLib.rules +++ b/xc/config/cf/gnuLib.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.3 1999/06/06 08:47:44 dawes Exp $ +XCOMM $XFree86: xc/config/cf/gnuLib.rules,v 1.2 1999/03/07 14:05:01 dawes Exp $ /* * GNU/Hurd shared library rules diff --git a/xc/config/cf/gnuLib.tmpl b/xc/config/cf/gnuLib.tmpl index 6b905dbaf..3f58409b9 100644 --- a/xc/config/cf/gnuLib.tmpl +++ b/xc/config/cf/gnuLib.tmpl @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.2 1999/06/06 12:13:22 dawes Exp $ +XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.1 1998/08/16 10:24:03 dawes Exp $ /* * GNU Hurd shared library template diff --git a/xc/config/cf/hpLib.rules b/xc/config/cf/hpLib.rules index c1852a9f3..007e0f0d2 100644 --- a/xc/config/cf/hpLib.rules +++ b/xc/config/cf/hpLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: hpLib.rules /main/16 1996/12/04 11:44:35 swick $ * HP shared library rules */ -XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.3 1999/01/11 05:13:06 dawes Exp $ +XCOMM $XFree86$ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/ibmLib.rules b/xc/config/cf/ibmLib.rules index 2e5c9feb2..120666096 100644 --- a/xc/config/cf/ibmLib.rules +++ b/xc/config/cf/ibmLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: ibmLib.rules /main/15 1996/12/30 16:06:05 kaleb $ * AIX shared library rules */ -XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.4 1999/01/11 05:13:06 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/ibmLib.tmpl b/xc/config/cf/ibmLib.tmpl index 6c3be3a97..452e0a86d 100644 --- a/xc/config/cf/ibmLib.tmpl +++ b/xc/config/cf/ibmLib.tmpl @@ -4,7 +4,7 @@ XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $ * AIX shared library template */ -XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.2 1999/01/11 14:40:00 dawes Exp $ +XCOMM $XFree86$ /* * IBM used an unusual shared object file name in some librares. diff --git a/xc/config/cf/isc.cf b/xc/config/cf/isc.cf index 1a17f472b..de2e7a033 100644 --- a/xc/config/cf/isc.cf +++ b/xc/config/cf/isc.cf @@ -2,7 +2,7 @@ XCOMM $XConsortium: isc.cf /main/1 1996/10/31 14:45:18 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.14 1999/03/29 01:36:47 dawes Exp $ #ifndef HasGcc2 #define HasGcc2 YES diff --git a/xc/config/cf/kdrive.cf b/xc/config/cf/kdrive.cf index 68417bac9..003fd3cf4 100644 --- a/xc/config/cf/kdrive.cf +++ b/xc/config/cf/kdrive.cf @@ -28,6 +28,9 @@ XCOMM $XConsortium: $ #ifndef XItsyServer #define XItsyServer NO #endif +#ifndef XvesaServer +#define XvesaServer NO +#endif #if XItsyServer #include <itsy.cf> @@ -43,6 +46,9 @@ XCOMM $XConsortium: $ #ifndef BuildPseudo8 #define BuildPseudo8 NO #endif +#ifndef BuildRender +#define BuildRender YES +#endif /* * By default, build all of the fonts. diff --git a/xc/config/cf/linux.cf b/xc/config/cf/linux.cf index 69ebca6b7..216f6afde 100644 --- a/xc/config/cf/linux.cf +++ b/xc/config/cf/linux.cf @@ -4,47 +4,47 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.133 2000/08/11 17:27:10 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.135 2000/08/26 04:30:48 dawes Exp $ #ifndef LinuxElfDefault -#define LinuxElfDefault YES +# define LinuxElfDefault YES #endif #ifndef UseElfFormat -#define UseElfFormat LinuxElfDefault +# define UseElfFormat LinuxElfDefault #endif #ifndef OSBinaryType -#if UseElfFormat -#define OSBinaryType [ELF] -#else -#ifdef AlphaArchitecture -#define OSBinaryType [ECOFF] -#else -#define OSBinaryType [a.out] -#endif -#endif +# if UseElfFormat +# define OSBinaryType [ELF] +# else +# ifdef AlphaArchitecture +# define OSBinaryType [ECOFF] +# else +# define OSBinaryType [a.out] +# endif +# endif #endif #ifndef OSName -#define OSName DefaultOSName OSBinaryType +# define OSName DefaultOSName OSBinaryType #endif #ifndef OSVendor -#define OSVendor /**/ +# define OSVendor /**/ #endif #ifndef OSMajorVersion -#define OSMajorVersion DefaultOSMajorVersion +# define OSMajorVersion DefaultOSMajorVersion #endif #ifndef OSMinorVersion -#define OSMinorVersion DefaultOSMinorVersion +# define OSMinorVersion DefaultOSMinorVersion #endif #ifndef OSTeenyVersion -#define OSTeenyVersion DefaultOSTeenyVersion +# define OSTeenyVersion DefaultOSTeenyVersion #endif #ifndef LinuxDistribution -#define LinuxDistribution DefaultLinuxDistribution +# define LinuxDistribution DefaultLinuxDistribution /* Add "#define LinuxDistribution Linux<mumble>" to your site.def or host.def. Currently only LinuxSuSE, LinuxRedHat and LinuxDebian will be figured out @@ -66,20 +66,20 @@ XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.133 2000/08/11 17:27:10 daw */ #endif #ifndef LinuxDistName -#define LinuxDistName DefaultLinuxDistName +# define LinuxDistName DefaultLinuxDistName #endif #ifndef LinuxCLibMajorVersion -#define LinuxCLibMajorVersion DefaultLinuxCLibMajorVersion +# define LinuxCLibMajorVersion DefaultLinuxCLibMajorVersion #endif #ifndef LinuxCLibMinorVersion -#define LinuxCLibMinorVersion DefaultLinuxCLibMinorVersion +# define LinuxCLibMinorVersion DefaultLinuxCLibMinorVersion #endif #ifndef LinuxCLibTeenyVersion -#define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion +# define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion #endif #ifndef LinuxBinUtilsMajorVersion -#define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion +# define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion #endif XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) @@ -94,71 +94,71 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) * */ #ifndef BinUtilsMajorVersion -#define BinUtilsMajorVersion LinuxBinUtilsMajorVersion +# define BinUtilsMajorVersion LinuxBinUtilsMajorVersion #endif #if (LinuxCLibMajorVersion >= 6 || LinuxDistribution == LinuxSuSE) -#define LinuxLocaleDefines /**/ +# define LinuxLocaleDefines /**/ #else -#define LinuxLocaleDefines -DX_LOCALE +# define LinuxLocaleDefines -DX_LOCALE #endif #if LinuxDistribution == LinuxDebian -#define LinuxAdditionalIncludes -I/usr/src/linux/include +# define LinuxAdditionalIncludes -I/usr/src/linux/include #else -#define LinuxAdditionalIncludes /**/ +# define LinuxAdditionalIncludes /**/ #endif #ifndef LinuxGnuSourceDefines -#ifdef UseInstalled -#define LinuxGnuSourceDefines /**/ -#else -#define LinuxGnuSourceDefines -D_GNU_SOURCE -#endif +# ifdef UseInstalled +# define LinuxGnuSourceDefines /**/ +# else +# define LinuxGnuSourceDefines -D_GNU_SOURCE +# endif #endif #if LinuxCLibMajorVersion >= 6 -#define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ +# define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE \ -D_BSD_SOURCE -D_SVID_SOURCE \ LinuxAdditionalIncludes LinuxGnuSourceDefines \ LinuxLocaleDefines -#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H -#define HasPosixThreads YES -#define ThreadedX YES -#define HasThreadSafeAPI YES -#define ThreadsLibraries -lpthread -#define SystemMTDefines -D_REENTRANT -#ifndef HasLibCrypt -#define HasLibCrypt YES -#endif +# define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H +# define HasPosixThreads YES +# define ThreadedX YES +# define HasThreadSafeAPI YES +# define ThreadsLibraries -lpthread +# define SystemMTDefines -D_REENTRANT +# ifndef HasLibCrypt +# define HasLibCrypt YES +# endif /* netscape wraps select but not poll as of communicator 4.72 */ -#ifndef HasPoll -#define HasPoll NO -#endif +# ifndef HasPoll +# define HasPoll NO +# endif #else -#define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ +# define LinuxSourceDefines -D_POSIX_SOURCE -D_POSIX_C_SOURCE=2 \ -D_BSD_SOURCE -D_SVID_SOURCE \ LinuxGnuSourceDefines LinuxLocaleDefines -#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC -#ifndef HasLibCrypt -#define HasLibCrypt NO -#endif +# define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC +# ifndef HasLibCrypt +# define HasLibCrypt NO +# endif #endif /* On x86, determine whether to build with MTRR support */ #ifndef HasMTRRSupport -#ifdef i386Architecture +# ifdef i386Architecture /* There is no certain way to know if <asm/mtrr.h> is available, but it made it into kernel 2.2, so... */ -#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) -#define HasMTRRSupport YES -#else -#define HasMTRRSupport NO -#endif -#else -#define HasMTRRSupport NO /* no for non-ix86 */ -#endif +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) +# define HasMTRRSupport YES +# else +# define HasMTRRSupport NO +# endif +# else +# define HasMTRRSupport NO /* no for non-ix86 */ +# endif #endif #ifndef XF86INT10_BUILD @@ -228,11 +228,11 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) * The Rush extension support. */ #ifndef BuildXF86RushExt -#define BuildXF86RushExt YES +# define BuildXF86RushExt YES #endif #ifndef LinuxFBDevSupport -#define LinuxFBDevSupport YES +# define LinuxFBDevSupport YES #endif /* For compatibility */ @@ -285,124 +285,133 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define UseStaticTermcapLib NO #endif +#ifndef BourneShell +/* + * This will cause builds/installs to terminate on errors, as on other + * platforms. + */ +#define BourneShell /bin/sh -e +#endif + #define MkdirHierCmd mkdir -p + #if LinuxElfDefault -#if UseElfFormat -# ifdef MipsArchitecture +# if UseElfFormat +# ifdef MipsArchitecture +# ifndef AsCmd +# define AsCmd gcc -c -x assembler-with-cpp +# endif +# ifndef DoLoadableServer +# define DoLoadableServer NO +# endif +# endif /* MipsArchitecure */ +# ifndef CcCmd +# define CcCmd gcc +# endif # ifndef AsCmd -# define AsCmd gcc -c -x assembler-with-cpp +# define AsCmd as # endif -# ifndef DoLoadableServer -# define DoLoadableServer NO +# ifndef LdCmd +# define LdCmd ld # endif -# endif /* MipsArchitecure */ -#ifndef CcCmd -#define CcCmd gcc -#endif -#ifndef AsCmd -#define AsCmd as -#endif -#ifndef LdCmd -#define LdCmd ld -#endif -#define AsmDefines -D__ELF__ -#define CplusplusCmd c++ -#ifndef LinuxUsesNcurses -#if LinuxCLibMajorVersion >= 6 || (LinuxDistribution == LinuxSuSE) -#define LinuxUsesNcurses YES -#else -#define LinuxUsesNcurses NO -#endif -#endif -#ifndef TermcapLibrary -#if UseStaticTermcapLib -#if LinuxUsesNcurses -#define TermcapLibrary StaticLibrary(/usr/lib,ncurses) -#else -#define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap) -#endif -#else -#if LinuxUsesNcurses -#define TermcapLibrary -lncurses -#else -#define TermcapLibrary -ltermcap -#endif -#endif -#endif -#else -#ifdef AlphaArchitecture -#define CcCmd gcc -b alpha-linuxecoff -#define CplusplusCmd g++ -b alpha-linuxecoff -#define AsCmd /usr/alpha-linuxecoff/bin/as -#define LdCmd /usr/alpha-linuxecoff/bin/ld -m alpha -#define AsmDefines -DUSE_GAS -U__ELF__ -#endif /* AlphaArchitecture */ -#ifdef ia64Architecture -#define CcCmd gcc -#define CplusplusCmd g++ -#define AsCmd as -#define LdCmd ld -#define AsmDefines -DUSE_GAS -U__ELF__ -#endif /* ia64Architecture */ -#ifdef i386Architecture -#define CcCmd gcc -b i486-linuxaout -#define CplusplusCmd g++ -b i486-linuxaout -#define AsCmd /usr/i486-linuxaout/bin/as -#define LdCmd /usr/i486-linuxaout/bin/ld -m i386linux -#define AsmDefines -DUSE_GAS -U__ELF__ -#endif /* i386Architecture */ -#ifdef Mc68020Architecture -#define CcCmd gcc -b m68k-linuxaout -#define CplusplusCmd g++ -b m68k-linuxaout -#define AsCmd /usr/m68k-linuxaout/bin/as -#define LdCmd /usr/m68k-linuxaout/bin/ld -m m68klinux -#define AsmDefines -DUSE_GAS -U__ELF__ -#endif /* Mc68020Architecture */ -#endif -#else -#if UseElfFormat -#ifdef AlphaArchitecture -#define CcCmd gcc -b alpha-linux -#define AsCmd /usr/alpha-linux/bin/as -#define LdCmd ld -m elf64alpha -#define AsmDefines -D__ELF__ -#define CplusplusCmd c++ -b alpha-linux -#endif /* AlphaArchitecture */ -#ifdef ia64Architecture -#define CcCmd gcc -#define CplusplusCmd g++ -#define AsCmd as -#define LdCmd ld -#define AsmDefines -D__ELF__ -#endif /* ia64Architecture */ -#ifdef i386Architecture -#define CcCmd gcc -b i486-linux -#define AsCmd /usr/i486-linux/bin/as -#define LdCmd ld -m elf_i386 -#define AsmDefines -D__ELF__ -#define CplusplusCmd c++ -b i486-linux -#endif /* i386Architecture */ -#ifdef Mc68020Architecture -#define CcCmd gcc -b m68k-linux -#define AsCmd /usr/m68k-linux/bin/as -#define LdCmd ld -m m68kelf -#define AsmDefines -D__ELF__ -#define CplusplusCmd c++ -b m68k-linux -#endif /* Mc68020Architecture */ +# define AsmDefines -D__ELF__ +# define CplusplusCmd c++ +# ifndef LinuxUsesNcurses +# if LinuxCLibMajorVersion >= 6 || (LinuxDistribution == LinuxSuSE) +# define LinuxUsesNcurses YES +# else +# define LinuxUsesNcurses NO +# endif +# endif +# ifndef TermcapLibrary +# if UseStaticTermcapLib +# if LinuxUsesNcurses +# define TermcapLibrary StaticLibrary(/usr/lib,ncurses) +# else +# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap) +# endif +# else +# if LinuxUsesNcurses +# define TermcapLibrary -lncurses +# else +# define TermcapLibrary -ltermcap +# endif +# endif +# endif +# else +# ifdef AlphaArchitecture +# define CcCmd gcc -b alpha-linuxecoff +# define CplusplusCmd g++ -b alpha-linuxecoff +# define AsCmd /usr/alpha-linuxecoff/bin/as +# define LdCmd /usr/alpha-linuxecoff/bin/ld -m alpha +# define AsmDefines -DUSE_GAS -U__ELF__ +# endif /* AlphaArchitecture */ +# ifdef ia64Architecture +# define CcCmd gcc +# define CplusplusCmd g++ +# define AsCmd as +# define LdCmd ld +# define AsmDefines -DUSE_GAS -U__ELF__ +# endif /* ia64Architecture */ +# ifdef i386Architecture +# define CcCmd gcc -b i486-linuxaout +# define CplusplusCmd g++ -b i486-linuxaout +# define AsCmd /usr/i486-linuxaout/bin/as +# define LdCmd /usr/i486-linuxaout/bin/ld -m i386linux +# define AsmDefines -DUSE_GAS -U__ELF__ +# endif /* i386Architecture */ +# ifdef Mc68020Architecture +# define CcCmd gcc -b m68k-linuxaout +# define CplusplusCmd g++ -b m68k-linuxaout +# define AsCmd /usr/m68k-linuxaout/bin/as +# define LdCmd /usr/m68k-linuxaout/bin/ld -m m68klinux +# define AsmDefines -DUSE_GAS -U__ELF__ +# endif /* Mc68020Architecture */ +# endif #else -#define CcCmd gcc -#define AsCmd as -#define LdCmd ld -#define AsmDefines -DUSE_GAS -#endif +# if UseElfFormat +# ifdef AlphaArchitecture +# define CcCmd gcc -b alpha-linux +# define AsCmd /usr/alpha-linux/bin/as +# define LdCmd ld -m elf64alpha +# define AsmDefines -D__ELF__ +# define CplusplusCmd c++ -b alpha-linux +# endif /* AlphaArchitecture */ +# ifdef ia64Architecture +# define CcCmd gcc +# define CplusplusCmd g++ +# define AsCmd as +# define LdCmd ld +# define AsmDefines -D__ELF__ +# endif /* ia64Architecture */ +# ifdef i386Architecture +# define CcCmd gcc -b i486-linux +# define AsCmd /usr/i486-linux/bin/as +# define LdCmd ld -m elf_i386 +# define AsmDefines -D__ELF__ +# define CplusplusCmd c++ -b i486-linux +# endif /* i386Architecture */ +# ifdef Mc68020Architecture +# define CcCmd gcc -b m68k-linux +# define AsCmd /usr/m68k-linux/bin/as +# define LdCmd ld -m m68kelf +# define AsmDefines -D__ELF__ +# define CplusplusCmd c++ -b m68k-linux +# endif /* Mc68020Architecture */ +# else +# define CcCmd gcc +# define AsCmd as +# define LdCmd ld +# define AsmDefines -DUSE_GAS +# endif #endif #if UseElfFormat -#ifndef DoLoadableServer -#define DoLoadableServer YES -#endif +# ifndef DoLoadableServer +# define DoLoadableServer YES +# endif #endif #ifndef CppCmd -#define CppCmd /lib/cpp +# define CppCmd /lib/cpp #endif /* Some Linux distributions have yacc, some don't. All have bison. */ #define YaccCmd bison -y @@ -412,107 +421,113 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define PostIncDir DefaultGccIncludeDir #define LdCombineFlags -r #ifndef LdPostLib -#define LdPostLib /* Never needed */ +# define LdPostLib /* Never needed */ #endif #define HasWChar32 YES #define StandardCppOptions -traditional #define StandardCppDefines StandardDefines #define HasVarRun YES -#define VarDbDirectory /var/state +#define VarDbDirectory /var/lib #ifndef XF86OSCardDrivers -#define XF86OSCardDrivers v4l +# define XF86OSCardDrivers v4l #endif #ifdef i386Architecture -#define OptimizedCDebugFlags DefaultGcc2i386Opt -#define LinuxMachineDefines -D__i386__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#if UseElfFormat -#define HasPlugin YES -#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ -#endif +# define OptimizedCDebugFlags DefaultGcc2i386Opt +# define LinuxMachineDefines -D__i386__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# if UseElfFormat +# define HasPlugin YES +# define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */ +# endif #endif /* i386Architecture */ +#ifdef s390Architecture +#define OptimizedCDebugFlags -O2 +#define LinuxMachineDefines -D__s390__ +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +#endif /* s390Architecture */ + #ifdef AlphaArchitecture -#define OptimizedCDebugFlags DefaultGcc2AxpOpt -#define LinuxMachineDefines -D__alpha__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +# define OptimizedCDebugFlags DefaultGcc2AxpOpt +# define LinuxMachineDefines -D__alpha__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AlphaArchitecture */ #ifdef Arm32Architecture -#define DefaultCCOptions -fsigned-char -#define OptimizedCDebugFlags -O3 -#define LinuxMachineDefines -D__arm__ -U__arm -Uarm -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSEGAS XFree86ServerDefines +# define DefaultCCOptions -fsigned-char +# define OptimizedCDebugFlags -O3 +# define LinuxMachineDefines -D__arm__ -U__arm -Uarm +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSEGAS XFree86ServerDefines #endif /* Arm32Achitecture */ #ifdef ia64Architecture -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__ia64__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -#define DoLoadableServer NO +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__ia64__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* ia64Architecture */ #ifdef Mc68020Architecture -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__mc68000__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#define PositionIndependentCFlags -fpic -#define PositionIndependentCplusplusFlags -fpic +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__mc68000__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# define PositionIndependentCFlags -fpic +# define PositionIndependentCplusplusFlags -fpic #endif /* Mc68020Architecture */ #ifdef PpcArchitecture -#define DefaultCCOptions -fsigned-char -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__powerpc__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# define DefaultCCOptions -fsigned-char +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__powerpc__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* PpcArchitecture */ #ifdef SparcArchitecture -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__sparc__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -#define AsVISOption -Av9a -#ifdef Sparc64Architecture -#define AsOutputArchSize 64 -#else -#define AsOutputArchSize 32 -#endif +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__sparc__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# define AsVISOption -Av9a +# ifdef Sparc64Architecture +# define AsOutputArchSize 64 +# else +# define AsOutputArchSize 32 +# endif #endif #ifdef MipsArchitecture -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__mips__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# define OptimizedCDebugFlags -O2 +# define LinuxMachineDefines -D__mips__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif #ifndef StandardDefines -#define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines +# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #endif #if UseElfFormat -#define DlLibrary -rdynamic -ldl +# define DlLibrary -rdynamic -ldl #else -#define DlLibrary /**/ +# define DlLibrary /**/ #endif #define ServerExtraSysLibs /**/ #if HasDECnet -#define ConnectionFlags -DUNIXCONN -DTCPCONN -DDNETCONN -#define ExtraLibraries -ldnet +# define ConnectionFlags -DUNIXCONN -DTCPCONN -DDNETCONN +# define ExtraLibraries -ldnet #else -#define ConnectionFlags -DUNIXCONN -DTCPCONN +# define ConnectionFlags -DUNIXCONN -DTCPCONN #endif /* Some of these man page defaults are overriden in the above OS sections */ @@ -536,18 +551,18 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #endif #ifndef StaticLibrary -#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic +# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif #ifndef LinkGLToUsrLib -#define LinkGLToUsrLib YES +# define LinkGLToUsrLib YES #endif -#ifndef LinkGLToUsrInclude -#define LinkGLToUsrInclude YES +# ifndef LinkGLToUsrInclude +# define LinkGLToUsrInclude YES #endif -#define HasGnuMake YES +#define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname @@ -557,13 +572,17 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) +#ifdef S390Architecture +# define HasXServer NO +#endif + #include <lnxLib.rules> #ifdef KDriveXServer -#include <kdrive.cf> +# include <kdrive.cf> #else -#include <xfree86.cf> +# include <xfree86.cf> #endif #ifndef XFree86ServerOSDefines -#define XFree86ServerOSDefines +# define XFree86ServerOSDefines #endif diff --git a/xc/config/cf/lnxLib.rules b/xc/config/cf/lnxLib.rules index a82239d84..eaf069dbc 100644 --- a/xc/config/cf/lnxLib.rules +++ b/xc/config/cf/lnxLib.rules @@ -1,5 +1,5 @@ XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.38 2000/06/15 20:49:56 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.37 1999/06/06 08:47:44 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) diff --git a/xc/config/cf/lnxLib.tmpl b/xc/config/cf/lnxLib.tmpl index 6f4a9d42d..325f593cd 100644 --- a/xc/config/cf/lnxLib.tmpl +++ b/xc/config/cf/lnxLib.tmpl @@ -1,5 +1,5 @@ XCOMM $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.12 1999/06/27 14:07:17 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.11 1999/06/06 12:13:23 dawes Exp $ /* * Linux shared library template diff --git a/xc/config/cf/lnxdoc.rules b/xc/config/cf/lnxdoc.rules index 3b63ccbaa..1cb3c1f4c 100644 --- a/xc/config/cf/lnxdoc.rules +++ b/xc/config/cf/lnxdoc.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.19 2000/02/26 05:19:44 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.18 2000/01/25 01:36:53 dawes Exp $ XCOMM XCOMM Rules for formatting Linuxdoc-SGML documentation XCOMM diff --git a/xc/config/cf/lnxdoc.tmpl b/xc/config/cf/lnxdoc.tmpl index d02221e55..5024eba9b 100644 --- a/xc/config/cf/lnxdoc.tmpl +++ b/xc/config/cf/lnxdoc.tmpl @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.10 1999/07/04 08:31:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.9 1999/04/15 03:34:39 dawes Exp $ XCOMM #ifndef HasSgmlFmt diff --git a/xc/config/cf/lynx.cf b/xc/config/cf/lynx.cf index 196b58e96..098415f33 100644 --- a/xc/config/cf/lynx.cf +++ b/xc/config/cf/lynx.cf @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.38 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.37 2000/06/20 20:07:56 dawes Exp $ #ifndef OSName diff --git a/xc/config/cf/mach.cf b/xc/config/cf/mach.cf index 014b94015..0aafa507e 100644 --- a/xc/config/cf/mach.cf +++ b/xc/config/cf/mach.cf @@ -2,7 +2,7 @@ XCOMM $TOG: mach.cf /main/2 1997/06/08 20:08:20 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.11 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.10 1999/03/21 01:44:59 dawes Exp $ #define OSName Mach 2.5/3.0 #define OSVendor /**/ diff --git a/xc/config/cf/minix.cf b/xc/config/cf/minix.cf index 167f00981..2c21ffdf7 100644 --- a/xc/config/cf/minix.cf +++ b/xc/config/cf/minix.cf @@ -2,7 +2,7 @@ XCOMM $XConsortium: minix.cf /main/1 1996/10/31 14:47:22 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.4 1996/12/27 06:50:21 dawes Exp $ /* diff --git a/xc/config/cf/ncr.cf b/xc/config/cf/ncr.cf index 61279d3fa..7a4ab8c2e 100644 --- a/xc/config/cf/ncr.cf +++ b/xc/config/cf/ncr.cf @@ -1,5 +1,5 @@ XCOMM platform: $XConsortium: ncr.cf /main/28 1996/09/28 16:11:31 rws $ -XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.18 1996/12/27 06:50:22 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.17 1996/12/23 05:50:28 dawes Exp $ #ifndef OSName #define OSName Unix System V Release 4/MP-RAS diff --git a/xc/config/cf/necLib.rules b/xc/config/cf/necLib.rules index 992416702..fb586a4cc 100644 --- a/xc/config/cf/necLib.rules +++ b/xc/config/cf/necLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: necLib.rules /main/4 1996/09/28 16:11:42 rws $ * NECOS shared library rules */ -XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.2 1999/01/11 05:13:07 dawes Exp $ +XCOMM $XFree86$ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/nto.cf b/xc/config/cf/nto.cf index 3969f66da..5c0585f76 100644 --- a/xc/config/cf/nto.cf +++ b/xc/config/cf/nto.cf @@ -1,4 +1,4 @@ -/* $XFree86: xc/config/cf/nto.cf,v 1.3 2000/07/07 20:06:56 tsi Exp $ */ +/* $XFree86: xc/config/cf/nto.cf,v 1.2 1999/12/27 00:45:43 robin Exp $ */ /* Get X to build using the gcc toolchain, from QNX4 */ /* Let us try to separate the x86 stuff out of here as well... */ diff --git a/xc/config/cf/nto.rules b/xc/config/cf/nto.rules index 0332ab7a3..4c14986b6 100644 --- a/xc/config/cf/nto.rules +++ b/xc/config/cf/nto.rules @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/nto.rules,v 1.2 1999/12/27 00:45:44 robin Exp $ +XCOMM $XFree86: xc/config/cf/nto.rules,v 1.1.2.1 1999/07/29 09:40:13 hohndel Exp $ XCOMM Rules for QNX/Neutrino XCOMM Note that some of these will disappear when we stop cross-compiling diff --git a/xc/config/cf/os2.cf b/xc/config/cf/os2.cf index 1d8ac4ba1..8486da37e 100644 --- a/xc/config/cf/os2.cf +++ b/xc/config/cf/os2.cf @@ -2,7 +2,7 @@ XCOMM $TOG: os2.cf /main/2 1997/08/05 08:51:25 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.30 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.29 2000/04/05 18:13:08 dawes Exp $ #define OSName OS/2 #define OSVendor IBM diff --git a/xc/config/cf/os2.rules b/xc/config/cf/os2.rules index 8d28329bd..3ba95d35e 100644 --- a/xc/config/cf/os2.rules +++ b/xc/config/cf/os2.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf diff --git a/xc/config/cf/os2Lib.rules b/xc/config/cf/os2Lib.rules index 00c517893..29eefb42a 100644 --- a/xc/config/cf/os2Lib.rules +++ b/xc/config/cf/os2Lib.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2Lib.rules /main/1 1996/10/31 14:47:29 kaleb $ -XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.11 2000/04/05 18:13:09 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.10 1999/04/29 09:13:20 dawes Exp $ /* * OS2/EMX shared library rules (DLL version) diff --git a/xc/config/cf/os2Lib.tmpl b/xc/config/cf/os2Lib.tmpl index b4d6852ee..9405b3d23 100644 --- a/xc/config/cf/os2Lib.tmpl +++ b/xc/config/cf/os2Lib.tmpl @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2Lib.tmpl /main/1 1996/10/31 14:47:31 kaleb $ -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.10 2000/08/09 02:57:20 tsi Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.9 2000/04/05 18:13:10 dawes Exp $ /* * OS2/EMX shared library template diff --git a/xc/config/cf/osfLib.rules b/xc/config/cf/osfLib.rules index 24e3a622a..6deff7077 100644 --- a/xc/config/cf/osfLib.rules +++ b/xc/config/cf/osfLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: osfLib.rules /main/16 1996/09/28 16:11:55 rws $ * OSF/1 shared library rules */ -XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86$ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/osfLib.tmpl b/xc/config/cf/osfLib.tmpl index 4e2867fb5..7abba2ab3 100644 --- a/xc/config/cf/osfLib.tmpl +++ b/xc/config/cf/osfLib.tmpl @@ -4,7 +4,7 @@ XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $ * OSF/1 shared library template */ -XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.2 1999/01/11 14:40:01 dawes Exp $ +XCOMM $XFree86$ #if ThreadedX && ModernOSF1 #if OSMajorVersion < 4 diff --git a/xc/config/cf/sco.cf b/xc/config/cf/sco.cf index 81b9131a6..d37138488 100644 --- a/xc/config/cf/sco.cf +++ b/xc/config/cf/sco.cf @@ -1,5 +1,5 @@ XCOMM platform: $XConsortium: sco.cf /main/5 1996/12/04 10:12:36 swick $ -XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.12 1996/12/23 05:50:30 dawes Exp $ /* * This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX. diff --git a/xc/config/cf/sco5.cf b/xc/config/cf/sco5.cf index 23aeafb27..c5c113c09 100644 --- a/xc/config/cf/sco5.cf +++ b/xc/config/cf/sco5.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.7 1998/07/25 05:57:16 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.6 1997/11/22 06:50:05 dawes Exp $ /* * This is for SCO Open Server 5.0.2 or later. diff --git a/xc/config/cf/scoLib.rules b/xc/config/cf/scoLib.rules index 55476dd4b..d2484db44 100644 --- a/xc/config/cf/scoLib.rules +++ b/xc/config/cf/scoLib.rules @@ -1,5 +1,5 @@ XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $ -XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.5 1999/10/13 04:20:42 dawes Exp $ +XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.4 1999/06/06 08:47:45 dawes Exp $ /* * SharedLibraryTarget3 - generate rules to create a shared library; diff --git a/xc/config/cf/sgi.cf b/xc/config/cf/sgi.cf index fb0df8008..227f3dc1f 100644 --- a/xc/config/cf/sgi.cf +++ b/xc/config/cf/sgi.cf @@ -1,5 +1,5 @@ XCOMM platform: $TOG: sgi.cf /main/49 1998/02/26 09:12:19 barstow $ -XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.8 1999/06/06 15:36:03 dawes Exp $ +XCOMM $XFree86$ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/sgiLib.rules b/xc/config/cf/sgiLib.rules index 27cdfcd6d..cc19bbb33 100644 --- a/xc/config/cf/sgiLib.rules +++ b/xc/config/cf/sgiLib.rules @@ -1,5 +1,5 @@ XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $ -XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/site.def b/xc/config/cf/site.def index 4e84dae6f..409f6b976 100644 --- a/xc/config/cf/site.def +++ b/xc/config/cf/site.def @@ -21,7 +21,7 @@ XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ * .cf file, not overridden in site.def. * * * ***************************************************************************/ -XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ +XCOMM site: $XFree86: xc/config/cf/site.def,v 3.23 2000/03/31 22:55:15 dawes Exp $ /* if you want host-specific customization, this is one way to do it */ /* diff --git a/xc/config/cf/sun.cf b/xc/config/cf/sun.cf index 8f3f577a1..858d35fad 100644 --- a/xc/config/cf/sun.cf +++ b/xc/config/cf/sun.cf @@ -3,7 +3,7 @@ XCOMM platform: $TOG: sun.cf /main/176 1997/12/09 17:27:51 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.53 2000/08/11 19:51:01 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.52 2000/06/20 22:08:36 dawes Exp $ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/sunLib.rules b/xc/config/cf/sunLib.rules index caddbaf16..5f9fdc816 100644 --- a/xc/config/cf/sunLib.rules +++ b/xc/config/cf/sunLib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: sunLib.rules /main/15 1996/09/28 16:13:16 rws $ * SunOS shared library rules */ -XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86$ #ifndef HasSharedLibraries #define HasSharedLibraries YES diff --git a/xc/config/cf/sunLib.tmpl b/xc/config/cf/sunLib.tmpl index 47e504cfd..976db4b83 100644 --- a/xc/config/cf/sunLib.tmpl +++ b/xc/config/cf/sunLib.tmpl @@ -4,7 +4,7 @@ XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $ -XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.11 1998/01/25 03:59:57 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.10 1997/08/26 10:00:42 hohndel Exp $ /* * SunOS shared library template diff --git a/xc/config/cf/sv3Lib.rules b/xc/config/cf/sv3Lib.rules index 9072b4f40..41133a310 100644 --- a/xc/config/cf/sv3Lib.rules +++ b/xc/config/cf/sv3Lib.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: sv3Lib.rules /main/1 1996/10/31 14:47:33 kaleb $ -XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.3 1999/10/13 04:20:43 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.2 1999/01/11 05:13:09 dawes Exp $ /* * SVR3 shared library rules * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany diff --git a/xc/config/cf/sv3Lib.tmpl b/xc/config/cf/sv3Lib.tmpl index 7935321a4..98fc6c718 100644 --- a/xc/config/cf/sv3Lib.tmpl +++ b/xc/config/cf/sv3Lib.tmpl @@ -2,7 +2,7 @@ XCOMM $XConsortium: sv3Lib.tmpl /main/1 1996/10/31 14:47:35 kaleb $ -XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.1 1996/12/27 06:50:28 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.0 1994/05/21 23:39:32 dawes Exp $ /* * SVR3 shared library template * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany diff --git a/xc/config/cf/sv4Lib.rules b/xc/config/cf/sv4Lib.rules index ecdfc8566..c4bb9afce 100644 --- a/xc/config/cf/sv4Lib.rules +++ b/xc/config/cf/sv4Lib.rules @@ -4,7 +4,7 @@ XCOMM $XConsortium: sv4Lib.rules /main/18 1996/09/28 16:13:29 rws $ * SVR4 shared library rules */ -XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.6 1999/06/06 08:47:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.5 1999/01/11 05:13:09 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES diff --git a/xc/config/cf/sv4Lib.tmpl b/xc/config/cf/sv4Lib.tmpl index edd1acb48..52e634dd2 100644 --- a/xc/config/cf/sv4Lib.tmpl +++ b/xc/config/cf/sv4Lib.tmpl @@ -4,7 +4,7 @@ XCOMM $XConsortium: sv4Lib.tmpl /main/23 1996/12/04 10:11:01 swick $ * SVR4 shared library template */ -XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.4 1999/06/06 12:13:23 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.3 1996/12/30 13:57:39 dawes Exp $ /* SVR4 shared libraries are deficient in link semantics */ XMULIBONLY = -lXmu diff --git a/xc/config/cf/svr3.cf b/xc/config/cf/svr3.cf index 3f3973eea..cf1acdc4f 100644 --- a/xc/config/cf/svr3.cf +++ b/xc/config/cf/svr3.cf @@ -2,7 +2,7 @@ XCOMM $XConsortium: svr3.cf /main/1 1996/10/31 14:47:37 kaleb $ -XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.13 2000/03/21 19:56:59 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.12 2000/02/29 03:08:56 dawes Exp $ #ifndef HasGcc #define HasGcc YES diff --git a/xc/config/cf/svr4.cf b/xc/config/cf/svr4.cf index 30662644e..0b0cb1892 100644 --- a/xc/config/cf/svr4.cf +++ b/xc/config/cf/svr4.cf @@ -1,5 +1,5 @@ XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $ -XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.40 2000/06/17 01:40:39 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.39 2000/06/14 00:16:03 dawes Exp $ /* * A default OS name */ diff --git a/xc/config/cf/usl.cf b/xc/config/cf/usl.cf index 58ea98f9b..ff8896ebf 100644 --- a/xc/config/cf/usl.cf +++ b/xc/config/cf/usl.cf @@ -3,7 +3,7 @@ XCOMM platform: $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $ -XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.19 2000/02/15 16:55:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.18 2000/02/15 00:07:40 dawes Exp $ #ifndef OSName # define OSName DefaultOSName diff --git a/xc/config/cf/xf86.rules b/xc/config/cf/xf86.rules index 98c11ac2f..b53028489 100644 --- a/xc/config/cf/xf86.rules +++ b/xc/config/cf/xf86.rules @@ -1,5 +1,5 @@ XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.31 2000/03/31 22:55:15 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.30 1999/10/13 16:49:02 dawes Exp $ /* * These rules are needed to build the XFree86 X Servers diff --git a/xc/config/cf/xf86.tmpl b/xc/config/cf/xf86.tmpl index 9b113f24b..90750679c 100644 --- a/xc/config/cf/xf86.tmpl +++ b/xc/config/cf/xf86.tmpl @@ -2,7 +2,7 @@ XCOMM $XConsortium: xf86.tmpl /main/2 1996/10/31 15:01:41 kaleb $ -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.27 2000/08/04 16:13:15 eich Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.25 1999/08/14 10:48:59 dawes Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def index d49306a04..634323ae0 100644 --- a/xc/config/cf/xf86site.def +++ b/xc/config/cf/xf86site.def @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.162 2000/05/31 07:14:52 eich Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.160 2000/03/22 23:35:47 dawes Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index da51a798f..50c89cb92 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.308 2000/08/11 19:10:36 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.311 2000/08/26 16:15:51 keithp Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -16,6 +16,10 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ # define XFree86Devel YES #endif +#ifndef BuildDebug +# define BuildDebug YES +#endif + /* * settings for the config file parser */ @@ -140,11 +144,7 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ # define XF86AFB YES # endif -/* - * XXX Should change this to allow such drivers to be built without agpgart - * support (when it is useful to do so). - */ -# if HasAgpGart +# if HasAgpGart || XFree86Devel # define AgpGartDrivers i810 # else # define AgpGartDrivers /**/ @@ -453,6 +453,11 @@ XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ # endif #endif +#if BuildDebug +# define DebugDefines -DBUILDDEBUG +#else +# define DebugDefines /**/ +#endif /* * Fbdev module defines. They are set to indicate the fb types supported @@ -602,7 +607,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define GlxCoreLibDefines /**/ # endif -# if defined(SparcArchitecture) +# if defined(SparcArchitecture) || defined(ia64Architecture) # define GlxArchDefines -D__GLX_ALIGN64 # else # define GlxArchDefines /**/ @@ -689,6 +694,11 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildXinerama YES #endif +/* Build Render extension */ +#ifndef BuildRender +# define BuildRender YES +#endif + #if 0 #ifndef JoystickSupport # define JoystickSupport NO @@ -973,6 +983,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 VidModeExtensionDefines \ ServerSnprintfDefines \ SmartScheduleDefines \ + DebugDefines \ -DX_BYTE_ORDER=ByteOrder #endif diff --git a/xc/config/cf/xttMod.tmpl b/xc/config/cf/xttMod.tmpl index 832724040..aac431327 100644 --- a/xc/config/cf/xttMod.tmpl +++ b/xc/config/cf/xttMod.tmpl @@ -1,6 +1,6 @@ /* -*- Makefile -*- */ XCOMM Code converter template of X-TT -XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.4 1999/08/14 10:49:00 dawes Exp $ */ +XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.4tsi Exp $ */ #ifdef IHaveModules /* New designed XFree86 module */ @@ -63,7 +63,7 @@ AllTarget($(CCONV_MODULE_FILE)) $(CCONV_MODULE_FILE): $(OBJS) $(RM) $@~ - $(LD) -o $@~ $(SHLIBLDFLAGS) $(OBJS) $(REQUIREDLIBS) + $(CC) -o $@~ $(SHLIBLDFLAGS) $(OBJS) $(REQUIREDLIBS) $(RM) $@ $(MV) $@~ $@ diff --git a/xc/config/imake/Imakefile b/xc/config/imake/Imakefile index 36610865d..7d943b11f 100644 --- a/xc/config/imake/Imakefile +++ b/xc/config/imake/Imakefile @@ -3,7 +3,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.9 1999/08/14 10:49:01 dawes Exp $ +XCOMM $XFree86: xc/config/imake/Imakefile,v 3.8 1999/04/17 09:08:08 dawes Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. diff --git a/xc/config/imake/Makefile.ini b/xc/config/imake/Makefile.ini index 44c62a132..a20649956 100644 --- a/xc/config/imake/Makefile.ini +++ b/xc/config/imake/Makefile.ini @@ -7,7 +7,7 @@ # may be given at the top of the build tree for systems that do not define # any machine-specific preprocessor symbols. # -# $XFree86: xc/config/imake/Makefile.ini,v 3.6 2000/08/09 23:40:09 dawes Exp $ +# $XFree86: xc/config/imake/Makefile.ini,v 3.7 2000/08/23 21:06:19 dawes Exp $ BOOTSTRAPCFLAGS = CC = cc @@ -40,8 +40,8 @@ ccimake: ccimake.c bootstrap: -@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi $(MV) *.o bootstrap - if [ -f imake ]; then $(MV) imake bootstrap; fi - if [ -f imake.exe ]; then $(MV) imake.exe bootstrap; fi + @if [ -f imake ]; then set -x; $(MV) imake bootstrap; else exit 0; fi + @if [ -f imake.exe ]; then set -x; $(MV) imake.exe bootstrap; else exit 0; fi relink: $(RM) imake diff --git a/xc/config/imake/imake.c b/xc/config/imake/imake.c index cf88d29e0..1925e1ad9 100644 --- a/xc/config/imake/imake.c +++ b/xc/config/imake/imake.c @@ -8,7 +8,7 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.36 2000/07/07 20:06:57 tsi Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.35 2000/06/13 02:28:27 dawes Exp $ */ /* * diff --git a/xc/config/imake/imakemdep.h b/xc/config/imake/imakemdep.h index 1cfe347a9..688a6a04c 100644 --- a/xc/config/imake/imakemdep.h +++ b/xc/config/imake/imakemdep.h @@ -336,12 +336,30 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __i386__ "-D__i386__", # endif +# ifdef __i486__ + "-D__i486__", +# endif +# ifdef __i586__ + "-D__i586__", +# endif +# ifdef __i686__ + "-D__i686__", +# endif +# ifdef __k6__ + "-D__k6__", +# endif +# ifdef __ia64__ + "-D__ia64__", +# endif +# ifdef __s390__ + "-D__s390__", +# endif # ifdef __alpha__ "-D__alpha__", # endif -#ifdef __arm__ +# ifdef __arm__ "-D__arm__", -#endif +# endif # ifdef __sparc__ "-D__sparc__", # endif @@ -1036,6 +1054,45 @@ struct symtab predefs[] = { # ifdef PowerMAX_OS {"PowerMAX_OS", "1"}, # endif +# ifdef ia64 + {"ia64", "1"}, +# endif +# ifdef __ia64__ + {"__ia64__", "1"}, +# endif +# ifdef __i386__ + {"__i386__", "1"}, +# endif +# ifdef __i486__ + {"__i486__", "1"}, +# endif +# ifdef __i586__ + {"__i586__", "1"}, +# endif +# ifdef __i686__ + {"__i686__", "1"}, +# endif +# ifdef __k6__ + {"__k6__", "1"}, +# endif +# ifdef i386 + {"i386", "1"}, +# endif +# ifdef i486 + {"i486", "1"}, +# endif +# ifdef i586 + {"i586", "1"}, +# endif +# ifdef i686 + { "i686", "1"}, +# endif +# ifdef k6 + {"k6", "1"}, +# endif +# ifdef __s390__ + {"__s390__", "1"}, +# endif /* add any additional symbols before this line */ {NULL, NULL} }; diff --git a/xc/config/imake/imakesvc.cmd b/xc/config/imake/imakesvc.cmd index 6b1352cfd..1108c3904 100644 --- a/xc/config/imake/imakesvc.cmd +++ b/xc/config/imake/imakesvc.cmd @@ -2,7 +2,7 @@ * This script serves as a helper cmd file for imake. Install this in * the path just like imake itself. * - * $XFree86: xc/config/imake/imakesvc.cmd,v 3.14 2000/04/05 18:13:11 dawes Exp $ + * $XFree86: xc/config/imake/imakesvc.cmd,v 3.13 1999/04/29 09:13:23 dawes Exp $ */ '@echo off' ADDRESS CMD diff --git a/xc/config/makedepend/Imakefile b/xc/config/makedepend/Imakefile index ad42e7683..12e328522 100644 --- a/xc/config/makedepend/Imakefile +++ b/xc/config/makedepend/Imakefile @@ -3,7 +3,7 @@ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.7 1999/08/14 10:49:02 dawes Exp $ +XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.6 1999/04/17 09:08:08 dawes Exp $ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o diff --git a/xc/config/makedepend/cppsetup.c b/xc/config/makedepend/cppsetup.c index b04e0763e..0c2954536 100644 --- a/xc/config/makedepend/cppsetup.c +++ b/xc/config/makedepend/cppsetup.c @@ -20,7 +20,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/config/makedepend/cppsetup.c,v 3.5 2000/04/04 19:24:45 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.4 1998/10/05 13:21:48 dawes Exp $ */ #include "def.h" diff --git a/xc/config/makedepend/def.h b/xc/config/makedepend/def.h index 158bcb3f2..e7ac95081 100644 --- a/xc/config/makedepend/def.h +++ b/xc/config/makedepend/def.h @@ -20,7 +20,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/config/makedepend/def.h,v 3.6 1999/03/21 07:34:25 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.5 1998/10/05 13:21:48 dawes Exp $ */ #include "Xos.h" #include "Xfuncproto.h" diff --git a/xc/config/makedepend/ifparser.c b/xc/config/makedepend/ifparser.c index 5e4e97c62..d5385614a 100644 --- a/xc/config/makedepend/ifparser.c +++ b/xc/config/makedepend/ifparser.c @@ -58,7 +58,7 @@ * * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.c,v 3.7 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.c,v 3.6 1996/12/30 13:57:55 dawes Exp $ */ #include "ifparser.h" #include <ctype.h> diff --git a/xc/config/makedepend/ifparser.h b/xc/config/makedepend/ifparser.h index 761084b04..df868e9e6 100644 --- a/xc/config/makedepend/ifparser.h +++ b/xc/config/makedepend/ifparser.h @@ -57,7 +57,7 @@ * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.h,v 3.3 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.h,v 3.2 1996/12/30 13:57:56 dawes Exp $ */ #include <stdio.h> diff --git a/xc/config/makedepend/include.c b/xc/config/makedepend/include.c index 664372e29..8856d53a4 100644 --- a/xc/config/makedepend/include.c +++ b/xc/config/makedepend/include.c @@ -20,7 +20,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/config/makedepend/include.c,v 3.4 1998/10/05 13:21:49 dawes Exp $ */ +/* $XFree86$ */ #include "def.h" diff --git a/xc/config/makedepend/main.c b/xc/config/makedepend/main.c index f0eb92f11..34e340f8d 100644 --- a/xc/config/makedepend/main.c +++ b/xc/config/makedepend/main.c @@ -20,7 +20,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/config/makedepend/main.c,v 3.16 1999/03/21 07:34:26 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.15 1998/10/06 06:08:25 dawes Exp $ */ #include "def.h" #ifdef hpux diff --git a/xc/config/makedepend/parse.c b/xc/config/makedepend/parse.c index c295ceaf3..2962206f3 100644 --- a/xc/config/makedepend/parse.c +++ b/xc/config/makedepend/parse.c @@ -20,7 +20,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/config/makedepend/parse.c,v 1.6 1999/03/21 07:34:26 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.5 1998/10/05 13:21:49 dawes Exp $ */ #include "def.h" diff --git a/xc/config/makedepend/pr.c b/xc/config/makedepend/pr.c index 0291098f3..75a6274fd 100644 --- a/xc/config/makedepend/pr.c +++ b/xc/config/makedepend/pr.c @@ -20,7 +20,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/config/makedepend/pr.c,v 1.2 1998/10/05 13:21:50 dawes Exp $ */ +/* $XFree86$ */ #include "def.h" diff --git a/xc/config/pswrap/Imakefile b/xc/config/pswrap/Imakefile index abbf1d47f..27d5e5a04 100644 --- a/xc/config/pswrap/Imakefile +++ b/xc/config/pswrap/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $ +XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.5 2000/06/07 19:35:39 tsi Exp $ FRIENDSDEF = -DFRIENDSFILE='"<DPS/dpsclient.h>"' DEFINES = -DXENVIRONMENT diff --git a/xc/config/pswrap/lexer.l b/xc/config/pswrap/lexer.l index acbee3c84..70e962500 100644 --- a/xc/config/pswrap/lexer.l +++ b/xc/config/pswrap/lexer.l @@ -36,7 +36,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/lexer.l,v 1.9 2000/06/07 19:48:09 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/lexer.l,v 1.8 2000/05/18 23:46:08 dawes Exp $ */ #include <ctype.h> #include <stdlib.h> diff --git a/xc/config/pswrap/main.c b/xc/config/pswrap/main.c index fb67400be..d226bd553 100644 --- a/xc/config/pswrap/main.c +++ b/xc/config/pswrap/main.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/main.c,v 1.4 2000/06/07 19:50:47 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/main.c,v 1.3 2000/05/18 23:46:08 dawes Exp $ */ #include <stdio.h> diff --git a/xc/config/pswrap/psw.c b/xc/config/pswrap/psw.c index cf9b4bfd3..2a3e4d5af 100644 --- a/xc/config/pswrap/psw.c +++ b/xc/config/pswrap/psw.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/psw.c,v 1.5 2000/06/07 21:36:56 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/psw.c,v 1.4 2000/05/19 00:25:42 dawes Exp $ */ /***********/ /* Imports */ diff --git a/xc/config/pswrap/pswfile.c b/xc/config/pswrap/pswfile.c index 5965e82bc..41e74535f 100644 --- a/xc/config/pswrap/pswfile.c +++ b/xc/config/pswrap/pswfile.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswfile.c,v 1.4 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include "pswversion.h" diff --git a/xc/config/pswrap/pswparser.y b/xc/config/pswrap/pswparser.y index d3a7135c0..580990b16 100644 --- a/xc/config/pswrap/pswparser.y +++ b/xc/config/pswrap/pswparser.y @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswparser.y,v 1.4 2000/05/18 23:46:08 dawes Exp $ */ +/* $XFree86: xc/config/pswrap/pswparser.y,v 1.3 2000/05/18 17:20:18 dawes Exp $ */ /* * Not all yaccs understand this. diff --git a/xc/config/pswrap/pswpriv.h b/xc/config/pswrap/pswpriv.h index 9c9392b71..3fc49e1f2 100644 --- a/xc/config/pswrap/pswpriv.h +++ b/xc/config/pswrap/pswpriv.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.6 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86$ */ #ifndef PSWPRIV_H #define PSWPRIV_H diff --git a/xc/config/util/Imakefile b/xc/config/util/Imakefile index 94da9da28..e275629ae 100644 --- a/xc/config/util/Imakefile +++ b/xc/config/util/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.28 2000/03/31 20:13:12 dawes Exp $ +XCOMM $XFree86: xc/config/util/Imakefile,v 3.27 2000/03/24 16:34:12 tsi Exp $ #if UseCCMakeDepend MDEP_PROG = makedepend diff --git a/xc/config/util/added.cmd b/xc/config/util/added.cmd index aa63f1688..5b54a7a63 100644 --- a/xc/config/util/added.cmd +++ b/xc/config/util/added.cmd @@ -2,7 +2,7 @@ * run with 'added dirlist_file' * where dirlist_file is a XFree86 added-* file * - * $XFree86: xc/config/util/added.cmd,v 3.0 1994/10/20 06:01:00 dawes Exp $ + * $XFree86$ */ file = arg(1) diff --git a/xc/config/util/bsdinst.sh b/xc/config/util/bsdinst.sh index 3ac7afa92..ea56b599b 100755 --- a/xc/config/util/bsdinst.sh +++ b/xc/config/util/bsdinst.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $XFree86: xc/config/util/bsdinst.sh,v 3.3 1996/12/23 05:56:13 dawes Exp $ +# $XFree86: xc/config/util/bsdinst.sh,v 3.2 1996/01/05 13:07:37 dawes Exp $ # # This accepts bsd-style install arguments and makes the appropriate calls # to the System V install. diff --git a/xc/config/util/buildos2.cmd b/xc/config/util/buildos2.cmd index 863a70a22..9fce5d5a7 100644 --- a/xc/config/util/buildos2.cmd +++ b/xc/config/util/buildos2.cmd @@ -1,5 +1,5 @@ /* REXX */ -/* $XFree86: xc/config/util/buildos2.cmd,v 3.10 2000/04/05 18:13:12 dawes Exp $ +/* $XFree86: xc/config/util/buildos2.cmd,v 3.9 1999/04/29 09:13:24 dawes Exp $ * this file is supposed to run from the xc/ dir. * you must copy it manually to there before using. It is just here * in order not to be in the root dir. diff --git a/xc/config/util/elistgen.sun b/xc/config/util/elistgen.sun index 536e52e0c..1a6762402 100644 --- a/xc/config/util/elistgen.sun +++ b/xc/config/util/elistgen.sun @@ -15,7 +15,7 @@ XCOMM linker to reconstruct the shared library, libfoo.so. XCOMM XCOMM ######################################################################## XCOMM -XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.6 2000/02/09 17:10:25 dawes Exp $ +XCOMM $XFree86$ XCOMM Utility programs FILTER=CXXFILT # C++ symbol demangler diff --git a/xc/config/util/gccmdep.cpp b/xc/config/util/gccmdep.cpp index 603c5f933..9eeaddb75 100644 --- a/xc/config/util/gccmdep.cpp +++ b/xc/config/util/gccmdep.cpp @@ -3,7 +3,7 @@ XCOMM!/bin/sh XCOMM XCOMM makedepend which uses 'gcc -M' XCOMM -XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.4 2000/08/08 03:16:26 dawes Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.3 1996/02/25 01:16:15 dawes Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com> XCOMM diff --git a/xc/config/util/indir.cmd b/xc/config/util/indir.cmd index e351d8382..2c86690aa 100644 --- a/xc/config/util/indir.cmd +++ b/xc/config/util/indir.cmd @@ -1,7 +1,7 @@ /* OS/2 rexx script to emulate the "cd dir; command" mechanism in make * which does not work with stupid CMD.EXE * - * $XFree86: xc/config/util/indir.cmd,v 3.2 2000/04/05 18:13:13 dawes Exp $ + * $XFree86: xc/config/util/indir.cmd,v 3.1 1996/01/24 21:56:12 dawes Exp $ */ curdir = directory() line = fixbadprefix(ARG(1)) diff --git a/xc/config/util/instos2.cmd b/xc/config/util/instos2.cmd index 501cf6716..922c49577 100644 --- a/xc/config/util/instos2.cmd +++ b/xc/config/util/instos2.cmd @@ -1,5 +1,5 @@ @echo off -rem $XFree86: xc/config/util/instos2.cmd,v 3.0 1996/01/24 21:56:14 dawes Exp $ +rem $XFree86$ rem this file is supposed to run from the xc/ dir. rem you must copy it manually to there before using. It is just here rem in order not to be in the root dir. diff --git a/xc/config/util/lndir.c b/xc/config/util/lndir.c index 0355bc504..610a961ba 100644 --- a/xc/config/util/lndir.c +++ b/xc/config/util/lndir.c @@ -22,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/config/util/lndir.c,v 3.10 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.8 1998/10/05 13:21:51 dawes Exp $ */ /* From the original /bin/sh script: diff --git a/xc/config/util/makestrs.c b/xc/config/util/makestrs.c index c81e38012..420e1f2d2 100644 --- a/xc/config/util/makestrs.c +++ b/xc/config/util/makestrs.c @@ -21,7 +21,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/config/util/makestrs.c,v 3.4 1998/10/05 13:21:51 dawes Exp $ */ +/* $XFree86$ */ /* Constructs string definitions */ diff --git a/xc/config/util/mdepend.cpp b/xc/config/util/mdepend.cpp index b54ef3a19..f51e58284 100644 --- a/xc/config/util/mdepend.cpp +++ b/xc/config/util/mdepend.cpp @@ -22,7 +22,7 @@ XCOMM work on both USG and BSD systems. However, when System V.4 comes out, XCOMM USG users will probably have to change "silent" to "-s" instead of XCOMM "-" (at least, that is what the documentation implies). XCOMM -XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3 2000/08/08 03:16:26 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.2 1997/06/29 07:54:20 dawes Exp $ XCOMM CC=PREPROC diff --git a/xc/config/util/mkdirhier.cmd b/xc/config/util/mkdirhier.cmd index 5978f38f4..9ee8fa791 100644 --- a/xc/config/util/mkdirhier.cmd +++ b/xc/config/util/mkdirhier.cmd @@ -1,5 +1,5 @@ /* OS/2 REXX SCRIPT */ -/* $XFree86: xc/config/util/mkdirhier.cmd,v 3.2 1996/02/19 12:16:51 dawes Exp $ */ +/* $XFree86: xc/config/util/mkdirhier.cmd,v 3.1 1996/02/09 08:18:04 dawes Exp $ */ CALL RxFuncAdd 'SysMkDir', 'RexxUtil', 'SysMkDir' diff --git a/xc/config/util/mkhtmlindex.sh b/xc/config/util/mkhtmlindex.sh index 70f68a466..dc91fc002 100644 --- a/xc/config/util/mkhtmlindex.sh +++ b/xc/config/util/mkhtmlindex.sh @@ -25,7 +25,7 @@ fi cd $1 for s in $VOLLIST; do - list="`ls *.$s.html 2> /dev/null`" + list="`ls *.$s.html 2> /dev/null`" || : # ignore failed glob expansion if [ X"$list" != X ]; then file=$INDEX$s.html rm -f $file diff --git a/xc/config/util/os2inst.cmd b/xc/config/util/os2inst.cmd index 1a8d1ae5a..7ad6aed00 100644 --- a/xc/config/util/os2inst.cmd +++ b/xc/config/util/os2inst.cmd @@ -1,6 +1,6 @@ /* OS/2 REXX SCRIPT */ -/* $XFree86: xc/config/util/os2inst.cmd,v 3.1 1996/02/19 12:16:52 dawes Exp $ +/* $XFree86: xc/config/util/os2inst.cmd,v 3.0 1994/10/20 06:01:03 dawes Exp $ * * This is a wrapper for the install command. As any utility, * install could have been lifted from the BSD sources, but I just wanted diff --git a/xc/config/util/remove.cmd b/xc/config/util/remove.cmd index a9c7a8ad0..e533e075f 100644 --- a/xc/config/util/remove.cmd +++ b/xc/config/util/remove.cmd @@ -2,7 +2,7 @@ * run with 'remove dirlist_file' * where dirlist_file is be a XFree86 removed-* file * - * $XFree86: xc/config/util/remove.cmd,v 3.0 1994/10/20 06:01:04 dawes Exp $ + * $XFree86$ */ '@echo off' file = arg(1) diff --git a/xc/config/util/revpath.c b/xc/config/util/revpath.c index db88393cb..bbad8fc38 100644 --- a/xc/config/util/revpath.c +++ b/xc/config/util/revpath.c @@ -1,7 +1,7 @@ /* * Copyright 1999 by The XFree86 Project, Inc. */ -/* $XFree86: xc/config/util/revpath.c,v 1.2 1999/02/01 11:55:49 dawes Exp $ */ +/* $XFree86: xc/config/util/revpath.c,v 1.1 1999/01/03 03:58:13 dawes Exp $ */ /* * Reverse a pathname. It returns a relative path that can be used to undo diff --git a/xc/config/util/revpath.man b/xc/config/util/revpath.man index a97f8f267..77a89e9af 100644 --- a/xc/config/util/revpath.man +++ b/xc/config/util/revpath.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/config/util/revpath.man,v 1.1 1999/01/03 03:58:14 dawes Exp $ +.\" $XFree86$ .TH REVPATH 1 "4.0" "XFree86" .SH NAME revpath \- generate a relative path that can be used to undo a change-directory diff --git a/xc/config/util/xmake.cmd b/xc/config/util/xmake.cmd index f00cf71e5..24e14947f 100644 --- a/xc/config/util/xmake.cmd +++ b/xc/config/util/xmake.cmd @@ -1,5 +1,5 @@ /* REXX */ -/* $XFree86: xc/config/util/xmake.cmd,v 3.1 1996/03/10 11:50:47 dawes Exp $ */ +/* $XFree86: xc/config/util/xmake.cmd,v 3.0 1996/01/24 21:56:17 dawes Exp $ */ '@echo off' PARSE ARG a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 x11make.exe 'MAKE=x11make.exe SHELL=' a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 diff --git a/xc/config/util/xmkmf.cmd b/xc/config/util/xmkmf.cmd index 7c4b3d5f7..bd51e01ab 100644 --- a/xc/config/util/xmkmf.cmd +++ b/xc/config/util/xmkmf.cmd @@ -1,7 +1,7 @@ /* OS/2 REXX */ /* make a Makefile from an Imakefile from inside or outside the sources * - * $XFree86: xc/config/util/xmkmf.cmd,v 3.1 1996/04/15 11:14:27 dawes Exp $ + * $XFree86: xc/config/util/xmkmf.cmd,v 3.0 1996/01/24 21:56:19 dawes Exp $ */ '@ECHO OFF' diff --git a/xc/extras/FreeType/README.XFree86 b/xc/extras/FreeType/README.XFree86 index 9b574ff20..e0cfeb313 100644 --- a/xc/extras/FreeType/README.XFree86 +++ b/xc/extras/FreeType/README.XFree86 @@ -16,5 +16,5 @@ When importing version A.B of FreeType, use: Files that are modified relative to the most recent import should have -the ident text: $XFree86: xc/extras/FreeType/README.XFree86,v 1.3 2000/02/13 06:15:21 dawes Exp $ added in a comment. +the ident text: $XFree86: xc/extras/FreeType/README.XFree86,v 1.2 1998/09/06 05:05:29 dawes Exp $ added in a comment. diff --git a/xc/extras/FreeType/lib/arch/unix/freetype.c b/xc/extras/FreeType/lib/arch/unix/freetype.c index ec4f854d4..3d242e50d 100644 --- a/xc/extras/FreeType/lib/arch/unix/freetype.c +++ b/xc/extras/FreeType/lib/arch/unix/freetype.c @@ -1,6 +1,6 @@ /* This file is an Xserver-specific version */ -/* $XFree86: xc/extras/FreeType/lib/arch/unix/freetype.c,v 1.3 2000/02/13 05:03:56 dawes Exp $ */ +/* $XFree86: xc/extras/FreeType/lib/arch/unix/freetype.c,v 1.2 1998/09/06 04:29:55 dawes Exp $ */ /* Single object library component for Unix */ diff --git a/xc/extras/FreeType/lib/ttfile.c b/xc/extras/FreeType/lib/ttfile.c index 9a2915b79..0377008be 100644 --- a/xc/extras/FreeType/lib/ttfile.c +++ b/xc/extras/FreeType/lib/ttfile.c @@ -38,7 +38,7 @@ * new "Load_TrueType_Any" function in the tables loader. * ******************************************************************/ -/* $XFree86: xc/extras/FreeType/lib/ttfile.c,v 1.4 2000/02/18 12:18:43 tsi Exp $ */ +/* $XFree86: xc/extras/FreeType/lib/ttfile.c,v 1.3 2000/02/13 05:03:52 dawes Exp $ */ #include "ttconfig.h" diff --git a/xc/extras/FreeType/lib/ttmemory.h b/xc/extras/FreeType/lib/ttmemory.h index 4995fdfa4..ab7137c4a 100644 --- a/xc/extras/FreeType/lib/ttmemory.h +++ b/xc/extras/FreeType/lib/ttmemory.h @@ -25,7 +25,7 @@ * 'legacy' applications (all four test programs have been updated). * ******************************************************************/ -/* $XFree86: xc/extras/FreeType/lib/ttmemory.h,v 1.4 2000/02/13 05:03:53 dawes Exp $ */ +/* $XFree86: xc/extras/FreeType/lib/ttmemory.h,v 1.3 1999/01/24 03:38:35 dawes Exp $ */ #ifndef TTMEMORY_H #define TTMEMORY_H diff --git a/xc/extras/FreeType/lib/tttypes.h b/xc/extras/FreeType/lib/tttypes.h index 3c9a05afe..90c52ee6e 100644 --- a/xc/extras/FreeType/lib/tttypes.h +++ b/xc/extras/FreeType/lib/tttypes.h @@ -20,7 +20,7 @@ * of the high-level interface. See also 'freetype.h'. * ******************************************************************/ -/* $XFree86: xc/extras/FreeType/lib/tttypes.h,v 1.5 2000/02/13 05:03:53 dawes Exp $ */ +/* $XFree86: xc/extras/FreeType/lib/tttypes.h,v 1.4 1999/01/24 03:38:35 dawes Exp $ */ #ifndef TTTYPES_H #define TTTYPES_H diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h index 7266dbc29..fa0ebf2d6 100644 --- a/xc/extras/Mesa/include/GL/gl.h +++ b/xc/extras/Mesa/include/GL/gl.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/include/GL/gl.h,v 1.6 2000/08/11 16:36:41 dawes Exp $ */ +/* $XFree86: xc/extras/Mesa/include/GL/gl.h,v 1.5 2000/08/09 23:40:10 dawes Exp $ */ #ifndef __gl_h_ diff --git a/xc/extras/Mesa/include/GL/xmesa_xf86.h b/xc/extras/Mesa/include/GL/xmesa_xf86.h index a142e9524..66805872a 100644 --- a/xc/extras/Mesa/include/GL/xmesa_xf86.h +++ b/xc/extras/Mesa/include/GL/xmesa_xf86.h @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/extras/Mesa/include/GL/xmesa_xf86.h,v 1.4 2000/03/03 16:02:10 tsi Exp $ */ +/* $XFree86$ */ /* * Authors: diff --git a/xc/extras/Mesa/src/FX/fxddtex.c b/xc/extras/Mesa/src/FX/fxddtex.c index 3c3caa4ee..eb5ea0a03 100644 --- a/xc/extras/Mesa/src/FX/fxddtex.c +++ b/xc/extras/Mesa/src/FX/fxddtex.c @@ -41,7 +41,7 @@ * * See fxapi.h for more revision/author details. */ - +/* $XFree86$ */ #ifdef HAVE_CONFIG_H #include "conf.h" @@ -645,7 +645,7 @@ void fxTexGetFormat(GLenum glformat, GrTextureFormat_t *tfmt, GLint *ifmt) case GL_RGBA12: case GL_RGBA16: if(tfmt) - (*tfmt)=GR_TEXFMT_ARGB_8888; + (*tfmt)=GR_TEXFMT_ARGB_4444; if(ifmt) (*ifmt)=GL_RGBA; break; @@ -800,8 +800,8 @@ GLboolean fxDDTexImage2D(GLcontext *ctx, GLenum target, GLint level, case GL_RGB10_A2: case GL_RGBA12: case GL_RGBA16: - texelSize = 4; - intFormat = MESA_A8_R8_G8_B8; + texelSize = 2; + intFormat = MESA_A4_R4_G4_B4; break; case GL_RGB5_A1: texelSize = 2; diff --git a/xc/extras/Mesa/src/FX/fxtexman.c b/xc/extras/Mesa/src/FX/fxtexman.c index 5066efa55..85cb6df4c 100644 --- a/xc/extras/Mesa/src/FX/fxtexman.c +++ b/xc/extras/Mesa/src/FX/fxtexman.c @@ -41,7 +41,7 @@ * * See fxapi.h for more revision/author details. */ - +/* $XFree86$ */ /* fxtexman.c - 3Dfx VooDoo texture memory functions */ @@ -181,11 +181,19 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) MemRange *prev, *tmp; int result; struct gl_texture_object *obj; + int blockCount, deleteCount; + int largestBlock = 0; while (1) { prev=0; tmp=fxMesa->tmFree[tmu]; + blockCount = 0; + deleteCount = 0; while (tmp) { + blockCount++; + if (tmp->endAddr - tmp->startAddr > largestBlock) + largestBlock = tmp->endAddr - tmp->startAddr; + if (tmp->endAddr-tmp->startAddr>=size) { /* Fits here */ result=tmp->startAddr; tmp->startAddr+=size; @@ -196,6 +204,7 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) fxMesa->tmFree[tmu]=tmp->next; } fxTMDeleteRangeNode(fxMesa, tmp); + deleteCount++; } fxMesa->freeTexMem[tmu]-=size; return result; @@ -207,6 +216,11 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) obj=fxTMFindOldestObject(fxMesa, tmu); if (!obj) { fprintf(stderr, "fx Driver: No space for texture\n"); + fprintf(stderr, " requested size = %d\n", size); + fprintf(stderr, " largest block = %d\n", largestBlock); + fprintf(stderr, " tmu = %d\n", tmu); + fprintf(stderr, " block count = %d\n", blockCount); + fprintf(stderr, " delete count = %d\n", deleteCount); return -1; } fxTMMoveOutTM(fxMesa, obj); @@ -261,6 +275,7 @@ static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa, GLuint age, old, lasttime, bindnumber; tfxTexInfo *info; struct gl_texture_object *obj, *tmp; + int wrap = 0, anyFound = 0, inTmuCount = 0; tmp=fxMesa->glCtx->Shared->TexObjectList; if (!tmp) return 0; @@ -271,13 +286,19 @@ static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa, while (tmp) { info=fxTMGetTexInfo(tmp); + if (info && info->isInTM) + inTmuCount++; + if (info && info->isInTM && ((info->whichTMU==tmu) || (info->whichTMU==FX_TMU_BOTH) || (info->whichTMU==FX_TMU_SPLIT))) { lasttime=info->lastTimeUsed; + anyFound = 1; - if (lasttime>bindnumber) + if (lasttime>bindnumber) { age=bindnumber+(UINT_MAX-lasttime+1); /* TO DO: check wrap around */ + wrap = 1; + } else age=bindnumber-lasttime; @@ -288,6 +309,10 @@ static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa, } tmp=tmp->Next; } + if (!obj) { + fprintf(stderr, " wrap = %d anyFound = %d inTmuCount = %d\n", + wrap, anyFound, inTmuCount); + } return obj; } @@ -299,7 +324,16 @@ static MemRange *fxTMAddObj(fxMesaContext fxMesa, MemRange *range; startAddr=fxTMFindStartAddr(fxMesa, tmu, texmemsize); - if (startAddr<0) return 0; + if (startAddr<0 || startAddr > 0xffffff00) { + tfxTexInfo *ti=fxTMGetTexInfo(tObj); + GrTexInfo *info = &(ti->info); + fprintf(stderr, " smallLodLog2 = %d\n", (int) info->smallLodLog2); + fprintf(stderr, " largeLodLog2 = %d\n", (int) info->largeLodLog2); + fprintf(stderr, " aspectRatioLog2 = %d\n", (int) info->aspectRatioLog2); + fprintf(stderr, " format = 0x%x\n", (unsigned int) info->format); + fprintf(stderr, " data = %p\n", info->data); + return 0; + } range=fxTMNewRangeNode(fxMesa, startAddr, startAddr+texmemsize); return range; } diff --git a/xc/extras/Mesa/src/X/xmesa1.c b/xc/extras/Mesa/src/X/xmesa1.c index 7261194bd..072154592 100644 --- a/xc/extras/Mesa/src/X/xmesa1.c +++ b/xc/extras/Mesa/src/X/xmesa1.c @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/X/xmesa1.c,v 1.6 2000/08/09 23:40:10 dawes Exp $ */ +/* $XFree86$ */ /* diff --git a/xc/extras/Mesa/src/config.c b/xc/extras/Mesa/src/config.c index 8f8a79aae..e8d18cd0b 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/config.c,v 1.5 2000/08/09 23:40:10 dawes Exp $ */ +/* $XFree86$ */ /* Mesa config file parse and execute code. diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c index d21711805..dc6028503 100644 --- a/xc/extras/Mesa/src/fog.c +++ b/xc/extras/Mesa/src/fog.c @@ -22,7 +22,7 @@ * 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. */ - +/* $XFree86$ */ #ifdef PC_HEADER #include "all.h" @@ -330,7 +330,7 @@ _mesa_fog_rgba_pixels( const GLcontext *ctx, GLfloat eyez = d / (c+ndcz); GLfloat f, g; GLfloat tmp = negDensitySquared * eyez * eyez; -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) /* XXX this underflow check may be needed for other systems */ if (tmp < FLT_MIN_10_EXP) f = exp( FLT_MIN_10_EXP ); @@ -409,7 +409,7 @@ _mesa_fog_ci_pixels( const GLcontext *ctx, if (eyez < 0.0) eyez = -eyez; tmp = negDensitySquared * eyez * eyez; -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) /* XXX this underflow check may be needed for other systems */ if (tmp < FLT_MIN_10_EXP) f = exp( FLT_MIN_10_EXP ); diff --git a/xc/extras/Mesa/src/glheader.h b/xc/extras/Mesa/src/glheader.h index 8276f518a..5e0d28f94 100644 --- a/xc/extras/Mesa/src/glheader.h +++ b/xc/extras/Mesa/src/glheader.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/glheader.h,v 1.8 2000/08/11 17:01:49 dawes Exp $ */ +/* $XFree86: xc/extras/Mesa/src/glheader.h,v 1.7 2000/08/09 23:40:10 dawes Exp $ */ #ifndef GLHEADER_H diff --git a/xc/extras/Mesa/src/linetemp.h b/xc/extras/Mesa/src/linetemp.h index 9e0fbd301..cb55021cd 100644 --- a/xc/extras/Mesa/src/linetemp.h +++ b/xc/extras/Mesa/src/linetemp.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/linetemp.h,v 1.8 2000/06/17 00:02:13 martin Exp $ */ +/* $XFree86: xc/extras/Mesa/src/linetemp.h,v 1.7 2000/02/18 12:18:44 tsi Exp $ */ /* * Line Rasterizer Template diff --git a/xc/extras/Mesa/src/lnaatemp.h b/xc/extras/Mesa/src/lnaatemp.h index 118ffb675..235d55e06 100644 --- a/xc/extras/Mesa/src/lnaatemp.h +++ b/xc/extras/Mesa/src/lnaatemp.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/lnaatemp.h,v 1.10 2000/06/21 20:18:13 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/lnaatemp.h,v 1.9 2000/06/21 15:12:28 tsi Exp $ */ /* * Antialiased Line Rasterizer Template diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h index 773e77645..da6c630b1 100644 --- a/xc/extras/Mesa/src/mmath.h +++ b/xc/extras/Mesa/src/mmath.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.6 2000/08/09 23:40:10 dawes Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.5 2000/06/17 00:02:14 martin Exp $ */ /* * Faster arithmetic functions. If the FAST_MATH preprocessor symbol is diff --git a/xc/extras/Mesa/src/teximage.c b/xc/extras/Mesa/src/teximage.c index f5a2047b3..41bfd9699 100644 --- a/xc/extras/Mesa/src/teximage.c +++ b/xc/extras/Mesa/src/teximage.c @@ -22,7 +22,7 @@ * 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. */ - +/* $XFree86$ */ #ifdef PC_HEADER #include "all.h" @@ -1557,7 +1557,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat, } else { /* if no error, update proxy texture image parameters */ - init_texture_image(ctx->Texture.Proxy1D->Image[level], + init_texture_image(ctx->Texture.Proxy2D->Image[level], width, height, 1, border, internalFormat); } } @@ -1667,7 +1667,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat, } else { /* if no error, update proxy texture image parameters */ - init_texture_image(ctx->Texture.Proxy1D->Image[level], + init_texture_image(ctx->Texture.Proxy3D->Image[level], width, height, depth, border, internalFormat); } } diff --git a/xc/extras/Mesa/src/tritemp.h b/xc/extras/Mesa/src/tritemp.h index 61e040365..003ed1fd2 100644 --- a/xc/extras/Mesa/src/tritemp.h +++ b/xc/extras/Mesa/src/tritemp.h @@ -22,7 +22,7 @@ * 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. */ -/* $XFree86: xc/extras/Mesa/src/tritemp.h,v 1.8 2000/06/17 00:02:18 martin Exp $ */ +/* $XFree86: xc/extras/Mesa/src/tritemp.h,v 1.7 2000/02/18 12:18:46 tsi Exp $ */ /* * Triangle Rasterizer Template diff --git a/xc/extras/Mesa/src/vbrender.c b/xc/extras/Mesa/src/vbrender.c index 9ee4fbb8c..9cbcf83d7 100644 --- a/xc/extras/Mesa/src/vbrender.c +++ b/xc/extras/Mesa/src/vbrender.c @@ -22,7 +22,7 @@ * 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. */ - +/* $XFree86$ */ /* * Render points, lines, and polygons. The only entry point to this @@ -292,7 +292,7 @@ static void render_triangle( GLcontext *ctx, return; facing = (c<0.0F) ^ (ctx->Polygon.FrontFace==GL_CW); - tricaps = ctx->IndirectTriangles; + tricaps = ctx->TriangleCaps; if (tricaps & DD_TRI_OFFSET) { /* finish computing plane equation of polygon, compute offset */ @@ -342,7 +342,7 @@ static void render_quad( GLcontext *ctx, GLuint v0, GLuint v1, GLfloat fy = win[v3][1] - win[v1][1]; GLfloat c = ex*fy-ey*fx; GLuint facing; - GLuint tricaps = ctx->IndirectTriangles; + GLuint tricaps = ctx->TriangleCaps; if (c * ctx->backface_sign > 0) return; diff --git a/xc/extras/README b/xc/extras/README index 787fa2e0c..295910e73 100644 --- a/xc/extras/README +++ b/xc/extras/README @@ -13,5 +13,5 @@ licences). -$XFree86: xc/extras/README,v 1.2 1998/08/29 08:10:34 dawes Exp $ +$XFree86: xc/extras/README,v 1.1 1998/08/29 08:01:42 dawes Exp $ diff --git a/xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c b/xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c index 333e2e45b..78710eb36 100644 --- a/xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c +++ b/xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c @@ -33,7 +33,7 @@ Notice=== */ -/* $XFree86: xc/extras/X-TrueType/ARABIC/CP1256toUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */ +/* $XFree86$ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c b/xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c index 7d0d55d4c..97fa568fe 100644 --- a/xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c +++ b/xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c @@ -42,7 +42,7 @@ Notice=== Pablo Saratxaga <srtxg@chanae.alphanet.ch> */ -/* $XFree86: xc/extras/X-TrueType/ARABIC/XATERMtoUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */ +/* $XFree86$ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c b/xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c index 9c9f844fc..fd98726ef 100644 --- a/xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c +++ b/xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c @@ -46,7 +46,7 @@ Notice=== whith -misc-fontspecific instead of -viscii1.1-1 *sigh*) */ -/* $XFree86: xc/extras/X-TrueType/DOSENCODING/DOSENCODINGtoUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */ +/* $XFree86$ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c b/xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c index b3f45eeb2..854c7f83e 100644 --- a/xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c +++ b/xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c @@ -73,7 +73,7 @@ Notice=== a microsoft-symbol encoding table the glyphs will match. -- srtxg */ -/* $XFree86: xc/extras/X-TrueType/ISO8859.6/ISO8859_6toUCS2.c,v 1.2 2000/06/27 21:26:32 tsi Exp $ */ +/* $XFree86$ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c b/xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c index a9e2cc101..a1708170f 100644 --- a/xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c +++ b/xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c @@ -39,7 +39,7 @@ Notice=== positions (first char is at 0x02) so the table goes from 0x00 to 0xff. */ -/* $XFree86: xc/extras/X-TrueType/VISCII/VISCIItoUCS2.c,v 1.2 2000/06/27 21:26:33 tsi Exp $ */ +/* $XFree86$ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/xttcconv.c b/xc/extras/X-TrueType/xttcconv.c index 140284607..780306c66 100644 --- a/xc/extras/X-TrueType/xttcconv.c +++ b/xc/extras/X-TrueType/xttcconv.c @@ -30,7 +30,7 @@ Notice=== */ -/* $XFree86: xc/extras/X-TrueType/xttcconv.c,v 1.8 2000/05/18 23:46:10 dawes Exp $ */ +/* $XFree86: xc/extras/X-TrueType/xttcconv.c,v 1.7 2000/02/29 16:07:13 tsi Exp $ */ #include "xttversion.h" diff --git a/xc/extras/X-TrueType/xttcconvP.h b/xc/extras/X-TrueType/xttcconvP.h index 0fa8ff3a5..be29feb74 100644 --- a/xc/extras/X-TrueType/xttcconvP.h +++ b/xc/extras/X-TrueType/xttcconvP.h @@ -32,7 +32,7 @@ Notice=== */ -/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.6 2000/06/27 21:26:32 tsi Exp $ */ +/* $XFree86: xc/extras/X-TrueType/xttcconvP.h,v 1.5 2000/02/13 05:24:36 dawes Exp $ */ #ifndef _XTTCCONVP_H_ #define _XTTCCONVP_H_ 1 diff --git a/xc/extras/X-TrueType/xttcommon.h b/xc/extras/X-TrueType/xttcommon.h index 5ebe00f08..84ec6c42e 100644 --- a/xc/extras/X-TrueType/xttcommon.h +++ b/xc/extras/X-TrueType/xttcommon.h @@ -31,7 +31,7 @@ Notice=== */ -/* $XFree86: xc/extras/X-TrueType/xttcommon.h,v 1.7 2000/02/18 12:18:49 tsi Exp $ */ +/* $XFree86: xc/extras/X-TrueType/xttcommon.h,v 1.6 2000/02/14 19:20:19 dawes Exp $ */ #ifndef _XTTCOMMON_H_ #define _XTTCOMMON_H_ (1) diff --git a/xc/extras/X-TrueType/xttfuncs.c b/xc/extras/X-TrueType/xttfuncs.c index a838b65af..790cd73dc 100644 --- a/xc/extras/X-TrueType/xttfuncs.c +++ b/xc/extras/X-TrueType/xttfuncs.c @@ -31,7 +31,7 @@ Notice=== */ -/* $XFree86: xc/extras/X-TrueType/xttfuncs.c,v 1.7 2000/05/18 23:46:10 dawes Exp $ */ +/* $XFree86: xc/extras/X-TrueType/xttfuncs.c,v 1.6 2000/02/14 19:20:20 dawes Exp $ */ #include "xttversion.h" diff --git a/xc/extras/Xpm/lib/XpmI.h b/xc/extras/Xpm/lib/XpmI.h index e330bfc56..fa4273ab2 100644 --- a/xc/extras/Xpm/lib/XpmI.h +++ b/xc/extras/Xpm/lib/XpmI.h @@ -22,6 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ +/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.2 2000/08/23 22:10:00 tsi Exp $ */ /*****************************************************************************\ * XpmI.h: * @@ -82,7 +83,8 @@ extern FILE *popen(); #endif /* the following is defined in X11R6 but not in previous versions */ -#ifdef __alpha +#if defined(__alpha) || defined(__alpha__) || \ + defined(ia64) || defined(__ia64__) #ifndef LONG64 #define LONG64 #endif diff --git a/xc/extras/rman/contrib/bennett.txt b/xc/extras/rman/contrib/bennett.txt index e95e3ea65..49cb2ddda 100644 --- a/xc/extras/rman/contrib/bennett.txt +++ b/xc/extras/rman/contrib/bennett.txt @@ -3,7 +3,7 @@ *************** *** 1,5 **** --- 1,9 ---- - static char rcsid[] = "$Header: /home/ajax/dri-backup/xc/xc/extras/rman/contrib/bennett.txt,v 1.1.1.1 2000/07/10 20:49:22 alanh Exp $"; + static char rcsid[] = "$Header: /home/ajax/dri-backup/xc/xc/extras/rman/contrib/bennett.txt,v 1.1.1.2 2000/09/22 17:14:46 alanh Exp $"; + /* ELS: SearchDirs by "Edward L. Sutter" <els@sage.sage.att.com> */ + /* AB: HTMLHeader and HTMLFooter by Anne Bennett <anne@alcor.concordia.ca> */ diff --git a/xc/extras/rman/contrib/hman.pl b/xc/extras/rman/contrib/hman.pl index 8d7c3f0f0..472ee6e5b 100755 --- a/xc/extras/rman/contrib/hman.pl +++ b/xc/extras/rman/contrib/hman.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w #!/citi/gtfd/mach/bin/perl -w ############### -# $Id: hman.pl,v 1.1.1.1 2000/07/10 20:49:22 alanh Exp $ +# $Id: hman.pl,v 1.1.1.2 2000/09/22 17:14:46 alanh Exp $ # $Source: /home/ajax/dri-backup/xc/xc/extras/rman/contrib/hman.pl,v $ ############################################ # TODO: diff --git a/xc/extras/rman/contrib/http-rman.c b/xc/extras/rman/contrib/http-rman.c index 5e85eeaf4..444d61687 100644 --- a/xc/extras/rman/contrib/http-rman.c +++ b/xc/extras/rman/contrib/http-rman.c @@ -1,4 +1,4 @@ -/* $Id: http-rman.c,v 1.1.1.1 2000/07/10 20:49:23 alanh Exp $ +/* $Id: http-rman.c,v 1.1.1.2 2000/09/22 17:14:46 alanh Exp $ * * Name: * http-rman.c -- a rudimentary man-page HTTP server diff --git a/xc/extras/rman/rman.1 b/xc/extras/rman/rman.1 index 7be339197..5485efb26 100644 --- a/xc/extras/rman/rman.1 +++ b/xc/extras/rman/rman.1 @@ -266,4 +266,4 @@ University of California, Berkeley .br Computer Science Division .PP -Manual page last updated on $Date: 2000/07/10 20:49:14 $ +Manual page last updated on $Date: 2000/09/22 17:14:38 $ diff --git a/xc/extras/rman/rman.c b/xc/extras/rman/rman.c index b82f43872..8520d8a22 100644 --- a/xc/extras/rman/rman.c +++ b/xc/extras/rman/rman.c @@ -16,7 +16,7 @@ static char rcsid[] = "Header: /home/cs/phelps/spine/rman/RCS/rman.c,v 1.144 199 source interpretation added September 24, 1996 renamed PolyglotMan due to lawsuit by Rosetta, Inc. August 8, 1997 */ -/* $XFree86: xc/extras/rman/rman.c,v 1.11 2000/08/09 23:40:11 dawes Exp $ */ +/* $XFree86: xc/extras/rman/rman.c,v 1.10 2000/07/03 16:26:01 dawes Exp $ */ /* TO DO **** diff --git a/xc/extras/rman/rman.html b/xc/extras/rman/rman.html index 8ff15172b..bc6d46014 100644 --- a/xc/extras/rman/rman.html +++ b/xc/extras/rman/rman.html @@ -317,6 +317,6 @@ developed at the<BR> University of California, Berkeley<BR> Computer Science Division -<P>Manual page last updated on $Date: 2000/07/10 20:49:21 $ +<P>Manual page last updated on $Date: 2000/09/22 17:14:44 $ </BODY></HTML> diff --git a/xc/extras/x86emu/include/x86emu/types.h b/xc/extras/x86emu/include/x86emu/types.h index 7566d3820..7c207f525 100644 --- a/xc/extras/x86emu/include/x86emu/types.h +++ b/xc/extras/x86emu/include/x86emu/types.h @@ -36,7 +36,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.3 2000/01/26 22:05:46 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.2 2000/01/23 04:32:41 dawes Exp $ */ #ifndef __X86EMU_TYPES_H #define __X86EMU_TYPES_H diff --git a/xc/extras/x86emu/src/x86emu/debug.c b/xc/extras/x86emu/src/x86emu/debug.c index 7519b35c3..481374d53 100644 --- a/xc/extras/x86emu/src/x86emu/debug.c +++ b/xc/extras/x86emu/src/x86emu/debug.c @@ -36,7 +36,7 @@ * emulator. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.2 2000/04/05 18:13:14 dawes Exp $ */ #include "x86emu/x86emui.h" #ifdef IN_MODULE diff --git a/xc/extras/x86emu/src/x86emu/decode.c b/xc/extras/x86emu/src/x86emu/decode.c index 6c93fe5f6..433e3bc03 100644 --- a/xc/extras/x86emu/src/x86emu/decode.c +++ b/xc/extras/x86emu/src/x86emu/decode.c @@ -37,7 +37,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.6 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86$ */ #include "x86emu/x86emui.h" diff --git a/xc/extras/x86emu/src/x86emu/ops.c b/xc/extras/x86emu/src/x86emu/ops.c index 16b4733ba..3f289adae 100644 --- a/xc/extras/x86emu/src/x86emu/ops.c +++ b/xc/extras/x86emu/src/x86emu/ops.c @@ -70,7 +70,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.2 2000/01/23 04:32:42 dawes Exp $ */ #include "x86emu/x86emui.h" diff --git a/xc/extras/x86emu/src/x86emu/ops2.c b/xc/extras/x86emu/src/x86emu/ops2.c index 0fcaabd73..a7416c046 100644 --- a/xc/extras/x86emu/src/x86emu/ops2.c +++ b/xc/extras/x86emu/src/x86emu/ops2.c @@ -37,7 +37,7 @@ * instructions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.3 2000/04/19 15:48:13 tsi Exp $ */ +/* $XFree86$ */ #include "x86emu/x86emui.h" diff --git a/xc/extras/x86emu/src/x86emu/sys.c b/xc/extras/x86emu/src/x86emu/sys.c index a7d97831c..9a6de3e59 100644 --- a/xc/extras/x86emu/src/x86emu/sys.c +++ b/xc/extras/x86emu/src/x86emu/sys.c @@ -56,7 +56,7 @@ X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */ X86EMU_intrFuncs _X86EMU_intrTab[256]; /*----------------------------- Implementation ----------------------------*/ -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) /* to cope with broken egcs-1.1.2 :-(((( */ /* @@ -263,7 +263,7 @@ u16 X86API rdw( } else #endif -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) val = ldw_u((u16*)(M.mem_base + addr)); #else val = *(u16*)(M.mem_base + addr); @@ -300,7 +300,7 @@ u32 X86API rdl( } else #endif -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) val = ldl_u((u32*)(M.mem_base + addr)); #else val = *(u32*)(M.mem_base + addr); @@ -356,7 +356,7 @@ DB( if (DEBUG_MEM_TRACE()) } else #endif -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) stw_u(val,(u16*)(M.mem_base + addr)); #else *(u16*)(M.mem_base + addr) = val; @@ -390,7 +390,7 @@ DB( if (DEBUG_MEM_TRACE()) } else #endif -#ifdef __alpha__ +#if defined(__alpha__) || defined(__alpha) stl_u(val,(u32*)(M.mem_base + addr)); #else *(u32*)(M.mem_base + addr) = val; diff --git a/xc/extras/x86emu/src/x86emu/x86emu/debug.h b/xc/extras/x86emu/src/x86emu/x86emu/debug.h index 7577f5ee5..6d34e0ade 100644 --- a/xc/extras/x86emu/src/x86emu/x86emu/debug.h +++ b/xc/extras/x86emu/src/x86emu/x86emu/debug.h @@ -35,7 +35,7 @@ * Description: Header file for debug definitions. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_DEBUG_H #define __X86EMU_DEBUG_H diff --git a/xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h b/xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h index 4fa8d5503..041255f18 100644 --- a/xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h +++ b/xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h @@ -39,7 +39,7 @@ * platform. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_PRIM_ASM_H #define __X86EMU_PRIM_ASM_H diff --git a/xc/extras/x86emu/src/x86emu/x86emu/x86emui.h b/xc/extras/x86emu/src/x86emu/x86emu/x86emui.h index 8d22563ac..11b7f3fe1 100644 --- a/xc/extras/x86emu/src/x86emu/x86emu/x86emui.h +++ b/xc/extras/x86emu/src/x86emu/x86emu/x86emui.h @@ -38,7 +38,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.3 2000/04/17 16:29:47 eich Exp $ */ +/* $XFree86$ */ #ifndef __X86EMU_X86EMUI_H #define __X86EMU_X86EMUI_H diff --git a/xc/include/DPS/ColorSB.h b/xc/include/DPS/ColorSB.h index f995930d3..04aa06136 100644 --- a/xc/include/DPS/ColorSB.h +++ b/xc/include/DPS/ColorSB.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/ColorSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */ +/* $XFree86$ */ #ifndef _ColorSelectionBox_h #define _ColorSelectionBox_h diff --git a/xc/include/DPS/ColorSBP.h b/xc/include/DPS/ColorSBP.h index 128a716d2..c26dc71f4 100644 --- a/xc/include/DPS/ColorSBP.h +++ b/xc/include/DPS/ColorSBP.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/ColorSBP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */ +/* $XFree86$ */ #ifndef _ColorSelectionBoxP_H #define _ColorSelectionBoxP_H diff --git a/xc/include/DPS/DPSScrollW.h b/xc/include/DPS/DPSScrollW.h index 451cafde8..5baeec785 100644 --- a/xc/include/DPS/DPSScrollW.h +++ b/xc/include/DPS/DPSScrollW.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/DPSScrollW.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */ +/* $XFree86$ */ #ifndef _DPSScrolledWindow_h #define _DPSScrolledWindow_h diff --git a/xc/include/DPS/DPSScrollWP.h b/xc/include/DPS/DPSScrollWP.h index 7a363c78d..a1bf26a76 100644 --- a/xc/include/DPS/DPSScrollWP.h +++ b/xc/include/DPS/DPSScrollWP.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/DPSScrollWP.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */ +/* $XFree86$ */ #ifndef _DPSScrolledWindowP_H #define _DPSScrolledWindowP_H diff --git a/xc/include/DPS/FontSB.h b/xc/include/DPS/FontSB.h index 767fb5d27..d37d126c7 100644 --- a/xc/include/DPS/FontSB.h +++ b/xc/include/DPS/FontSB.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/FontSB.h,v 1.2 2000/06/07 22:02:54 tsi Exp $ */ +/* $XFree86$ */ #ifndef _FontSelectionBox_h #define _FontSelectionBox_h diff --git a/xc/include/DPS/FontSBP.h b/xc/include/DPS/FontSBP.h index 2c1730f4f..99a867f52 100644 --- a/xc/include/DPS/FontSBP.h +++ b/xc/include/DPS/FontSBP.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/FontSBP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef _FontSelectionBoxP_H #define _FontSelectionBoxP_H diff --git a/xc/include/DPS/FontSamplP.h b/xc/include/DPS/FontSamplP.h index 2f9017eb9..045b83ed6 100644 --- a/xc/include/DPS/FontSamplP.h +++ b/xc/include/DPS/FontSamplP.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/FontSamplP.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef _FontSamplerP_H #define _FontSamplerP_H diff --git a/xc/include/DPS/FontSample.h b/xc/include/DPS/FontSample.h index 46cef3897..6197217b5 100644 --- a/xc/include/DPS/FontSample.h +++ b/xc/include/DPS/FontSample.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/FontSample.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef _FontSampler_h #define _FontSampler_h diff --git a/xc/include/DPS/Imakefile b/xc/include/DPS/Imakefile index ae6b0f172..197f16ae3 100644 --- a/xc/include/DPS/Imakefile +++ b/xc/include/DPS/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/include/DPS/Imakefile,v 1.4 2000/02/21 16:50:44 dawes Exp $ +XCOMM $XFree86: xc/include/DPS/Imakefile,v 1.3 2000/02/19 14:23:06 tsi Exp $ HEADERS = \ XDPS.h\ diff --git a/xc/include/DPS/PSres.h b/xc/include/DPS/PSres.h index 887fff621..b6b4c4184 100644 --- a/xc/include/DPS/PSres.h +++ b/xc/include/DPS/PSres.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/PSres.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef _PSres_h #define _PSres_h diff --git a/xc/include/DPS/XDPSlib.h b/xc/include/DPS/XDPSlib.h index e467f76f2..e9bd563af 100644 --- a/xc/include/DPS/XDPSlib.h +++ b/xc/include/DPS/XDPSlib.h @@ -34,7 +34,7 @@ * * Author: Adobe Systems Incorporated and Digital Equipment Corporation */ -/* $XFree86: xc/include/DPS/XDPSlib.h,v 1.3 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef _XDPSlib_h #define _XDPSlib_h diff --git a/xc/include/DPS/dpsXpreview.h b/xc/include/DPS/dpsXpreview.h index 4eaf3ac4f..17c050bc0 100644 --- a/xc/include/DPS/dpsXpreview.h +++ b/xc/include/DPS/dpsXpreview.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsXpreview.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef DPS_X_PREVIEW_H #define DPS_X_PREVIEW_H diff --git a/xc/include/DPS/dpsXshare.h b/xc/include/DPS/dpsXshare.h index 9e0ca3b00..581b5b066 100644 --- a/xc/include/DPS/dpsXshare.h +++ b/xc/include/DPS/dpsXshare.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsXshare.h,v 1.2 2000/06/07 22:02:55 tsi Exp $ */ +/* $XFree86$ */ #ifndef DPS_X_SHARE_H #define DPS_X_SHARE_H diff --git a/xc/include/DPS/dpsXuserpath.h b/xc/include/DPS/dpsXuserpath.h index 2fa42fa4c..59259924e 100644 --- a/xc/include/DPS/dpsXuserpath.h +++ b/xc/include/DPS/dpsXuserpath.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsXuserpath.h,v 1.2 2000/06/07 22:02:56 tsi Exp $ */ +/* $XFree86$ */ #ifndef DPS_X_DOUSERPATH_H #define DPS_X_DOUSERPATH_H diff --git a/xc/include/DPS/dpsclient.h b/xc/include/DPS/dpsclient.h index 0a009a046..8980f446a 100644 --- a/xc/include/DPS/dpsclient.h +++ b/xc/include/DPS/dpsclient.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsclient.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */ +/* $XFree86$ */ #ifndef DPSCLIENT_H #define DPSCLIENT_H diff --git a/xc/include/DPS/dpsconfig.h b/xc/include/DPS/dpsconfig.h index e887a57a8..e7ca47f29 100644 --- a/xc/include/DPS/dpsconfig.h +++ b/xc/include/DPS/dpsconfig.h @@ -35,6 +35,7 @@ * * Author: Adobe Systems Incorporated */ +/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.2 2000/08/23 22:10:02 tsi Exp $ */ #ifndef DPSCONFIG_H #define DPSCONFIG_H @@ -85,11 +86,8 @@ #define IEEEFLOAT 1 #endif /* _IBMR2 */ -#ifndef IEEEFLOAT -#define IEEEFLOAT 1 -#endif /* IEEEFLOAT */ - -#ifdef __alpha +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) #define IEEEFLOAT 1 #endif /* __alpha */ @@ -97,6 +95,10 @@ #define IEEEFLOAT 1 #endif /* __i386__ */ +#ifndef IEEEFLOAT +#define IEEEFLOAT 1 +#endif /* IEEEFLOAT */ + #endif /* IEEEFLOAT */ #ifndef DPS_FORMATNAME @@ -124,9 +126,10 @@ #ifndef SWAPBITS -#ifdef __alpha +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) #define SWAPBITS 1 -#endif /* alpha */ +#endif /* __alpha */ #ifdef vax #define SWAPBITS 1 @@ -169,14 +172,15 @@ * MIN_POINTER_ALIGN. MIN_POINTER_ALIGN must be a power of 2. * * MIN_POINTER_ALIGN must be 8 on - * Alpha + * Alpha, IA-64 * MIN_POINTER_ALIGN must be 4 on * VAX, i80x86 series, MIPS, mc680x0 series, IBM R6000, SPARC, HPPA */ #ifndef MIN_POINTER_ALIGN -#ifdef __alpha +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) #define MIN_POINTER_ALIGN 8 #endif /* __alpha */ diff --git a/xc/include/DPS/dpsexcept.h b/xc/include/DPS/dpsexcept.h index 365819a73..7daf70195 100644 --- a/xc/include/DPS/dpsexcept.h +++ b/xc/include/DPS/dpsexcept.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsexcept.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */ +/* $XFree86$ */ /* Original version: Jeffrey Mogul, Stanford, 18 February 1983 diff --git a/xc/include/DPS/dpsfriends.h b/xc/include/DPS/dpsfriends.h index eb4850d99..072cc3f1c 100644 --- a/xc/include/DPS/dpsfriends.h +++ b/xc/include/DPS/dpsfriends.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsfriends.h,v 1.3 2000/06/07 22:02:56 tsi Exp $ */ +/* $XFree86$ */ #ifndef DPSFRIENDS_H #define DPSFRIENDS_H diff --git a/xc/include/GL/Imakefile b/xc/include/GL/Imakefile index 750b4953f..fba436929 100644 --- a/xc/include/GL/Imakefile +++ b/xc/include/GL/Imakefile @@ -1,5 +1,5 @@ -XCOMM $XFree86: xc/include/GL/Imakefile,v 1.10 2000/08/04 03:51:40 tsi Exp $ +XCOMM $XFree86: xc/include/GL/Imakefile,v 1.9 2000/06/17 00:02:46 martin Exp $ LinkSourceFile(gl.h, ../../extras/Mesa/include/GL) LinkSourceFile(glext.h, ../../extras/Mesa/include/GL) diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h index ac7284edc..c74e9758c 100644 --- a/xc/include/GL/glx.h +++ b/xc/include/GL/glx.h @@ -1,7 +1,7 @@ #ifndef __GLX_glx_h__ #define __GLX_glx_h__ -/* $XFree86: xc/include/GL/glx.h,v 1.7 2000/06/30 18:27:00 dawes Exp $ */ +/* $XFree86: xc/include/GL/glx.h,v 1.6 2000/06/17 00:02:46 martin Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/xc/include/GL/glxint.h b/xc/include/GL/glxint.h index f426be291..5dbcf1f56 100644 --- a/xc/include/GL/glxint.h +++ b/xc/include/GL/glxint.h @@ -1,7 +1,7 @@ #ifndef __GLX_glxint_h__ #define __GLX_glxint_h__ -/* $XFree86: xc/include/GL/glxint.h,v 1.2 1999/06/14 07:23:28 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/include/GL/glxmd.h b/xc/include/GL/glxmd.h index 9b634840e..0523f1036 100644 --- a/xc/include/GL/glxmd.h +++ b/xc/include/GL/glxmd.h @@ -1,7 +1,7 @@ #ifndef _GLX_glxmd_h_ #define _GLX_glxmd_h_ -/* $XFree86: xc/include/GL/glxmd.h,v 1.2 1999/06/14 07:23:28 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/include/GL/glxproto.h b/xc/include/GL/glxproto.h index a6659cde1..94456798f 100644 --- a/xc/include/GL/glxproto.h +++ b/xc/include/GL/glxproto.h @@ -1,7 +1,7 @@ #ifndef _GLX_glxproto_h_ #define _GLX_glxproto_h_ -/* $XFree86: xc/include/GL/glxproto.h,v 1.2 1999/06/14 07:23:29 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/include/GL/glxtokens.h b/xc/include/GL/glxtokens.h index 8c4f2185a..39a521e63 100644 --- a/xc/include/GL/glxtokens.h +++ b/xc/include/GL/glxtokens.h @@ -1,7 +1,7 @@ #ifndef __GLX_glxtokens_h__ #define __GLX_glxtokens_h__ -/* $XFree86: xc/include/GL/glxtokens.h,v 1.4 2000/06/17 00:02:46 martin Exp $ */ +/* $XFree86: xc/include/GL/glxtokens.h,v 1.3 2000/02/15 07:13:24 martin Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/xc/include/Imakefile b/xc/include/Imakefile index 98899f60f..8db49e285 100644 --- a/xc/include/Imakefile +++ b/xc/include/Imakefile @@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/93 1997/06/13 15:34:58 kaleb $ -XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $ +XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags /**/ diff --git a/xc/include/X.h b/xc/include/X.h index 0a98d1aec..fd48c8dea 100644 --- a/xc/include/X.h +++ b/xc/include/X.h @@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/X.h,v 1.3 1999/08/22 08:58:48 dawes Exp $ */ +/* $XFree86$ */ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ diff --git a/xc/include/XF86keysym.h b/xc/include/XF86keysym.h index 9b6773641..dd4263424 100644 --- a/xc/include/XF86keysym.h +++ b/xc/include/XF86keysym.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/XF86keysym.h,v 1.5 2000/07/07 00:44:58 dawes Exp $ */ +/* $XFree86: xc/include/XF86keysym.h,v 1.4 2000/06/17 00:27:29 dawes Exp $ */ /* * XFree86 vendor specific keysyms. diff --git a/xc/include/Xalloca.h b/xc/include/Xalloca.h index 73a45069f..af427d68f 100644 --- a/xc/include/Xalloca.h +++ b/xc/include/Xalloca.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xalloca.h,v 3.8 2000/02/17 14:00:31 dawes Exp $ */ +/* $XFree86$ */ /* * The purpose of this header is to define the macros ALLOCATE_LOCAL and diff --git a/xc/include/Xarch.h b/xc/include/Xarch.h index 0633ebcd3..c8b9eb22e 100644 --- a/xc/include/Xarch.h +++ b/xc/include/Xarch.h @@ -25,7 +25,7 @@ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/include/Xarch.h,v 1.10 2000/06/15 20:49:58 dawes Exp $ */ +/* $XFree86: xc/include/Xarch.h,v 1.9 1999/12/27 00:39:19 robin Exp $ */ /* diff --git a/xc/include/Xdefs.h b/xc/include/Xdefs.h index 315fc7054..f079b669f 100644 --- a/xc/include/Xdefs.h +++ b/xc/include/Xdefs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/Xdefs.h,v 1.2 1999/08/22 06:21:20 dawes Exp $ */ +/* $XFree86: xc/include/Xdefs.h,v 1.1 1999/08/21 13:47:33 dawes Exp $ */ /*********************************************************** diff --git a/xc/include/Xfuncs.h b/xc/include/Xfuncs.h index 124b342e3..6de347be1 100644 --- a/xc/include/Xfuncs.h +++ b/xc/include/Xfuncs.h @@ -21,7 +21,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/include/Xfuncs.h,v 3.6 2000/01/22 15:34:22 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncs.h,v 3.5 1999/12/13 02:12:42 robin Exp $ */ #ifndef _XFUNCS_H_ #define _XFUNCS_H_ diff --git a/xc/include/Xmd.h b/xc/include/Xmd.h index b019e876f..4179c575e 100644 --- a/xc/include/Xmd.h +++ b/xc/include/Xmd.h @@ -54,7 +54,8 @@ SOFTWARE. #ifdef CRAY #define WORD64 /* 64-bit architecture */ #endif -#if defined(__alpha) || defined(__alpha__) || defined(__ia64__) +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) #define LONG64 /* 32/64-bit architecture */ #endif #ifdef __sgi diff --git a/xc/include/Xos.h b/xc/include/Xos.h index 30ce3d56f..17678b31d 100644 --- a/xc/include/Xos.h +++ b/xc/include/Xos.h @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.30 2000/08/10 17:40:27 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.29 2000/08/09 23:40:11 dawes Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. diff --git a/xc/include/Xos_r.h b/xc/include/Xos_r.h index 457626b2c..cef0b42e4 100644 --- a/xc/include/Xos_r.h +++ b/xc/include/Xos_r.h @@ -242,6 +242,42 @@ typedef struct { struct passwd* pwp; size_t len; } _Xgetpwparams; + +/* NetBSD, at least, is missing several of the unixware passwd fields. */ + +#if defined(__NetBSD__) +__inline__ void _Xpw_copyPasswd(_Xgetpwparams p) +{ + memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)); + + (p).pws.pw_name = (p).pwbuf; + (p).len = strlen((p).pwp->pw_name); + strcpy((p).pws.pw_name, (p).pwp->pw_name); + + (p).pws.pw_passwd = (p).pws.pw_name + (p).len + 1; + (p).len = strlen((p).pwp->pw_passwd); + strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd); + + (p).pws.pw_class = (p).pws.pw_passwd + (p).len + 1; + (p).len = strlen((p).pwp->pw_class); + strcpy((p).pws.pw_class, (p).pwp->pw_class); + + (p).pws.pw_gecos = (p).pws.pw_class + (p).len + 1; + (p).len = strlen((p).pwp->pw_gecos); + strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos); + + (p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1; + (p).len = strlen((p).pwp->pw_dir); + strcpy((p).pws.pw_dir, (p).pwp->pw_dir); + + (p).pws.pw_shell = (p).pws.pw_dir + (p).len + 1; + (p).len = strlen((p).pwp->pw_shell); + strcpy((p).pws.pw_shell, (p).pwp->pw_shell); + + (p).pwp = &(p).pws; +} + +#else # define _Xpw_copyPasswd(p) \ (memcpy(&(p).pws, (p).pwp, sizeof(struct passwd)), \ ((p).pws.pw_name = (p).pwbuf), \ @@ -267,6 +303,7 @@ typedef struct { strcpy((p).pws.pw_shell, (p).pwp->pw_shell), \ ((p).pwp = &(p).pws), \ 0 ) +#endif # define _XGetpwuid(u,p) \ ( (_Xos_processLock), \ (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p) : 0), \ @@ -375,6 +412,10 @@ typedef int _Xgetservbynameparams; /* dummy */ /* UnixWare 2.0, or other systems with thread support but no _r API. */ /* WARNING: The h_addr_list and s_aliases values are *not* copied! */ +#if defined(__NetBSD__) +#include <sys/param.h> +#endif + typedef struct { struct hostent hent; char h_name[MAXHOSTNAMELEN]; diff --git a/xc/include/Xosdefs.h b/xc/include/Xosdefs.h index 12652cf60..191058ab3 100644 --- a/xc/include/Xosdefs.h +++ b/xc/include/Xosdefs.h @@ -21,7 +21,7 @@ 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/include/Xosdefs.h,v 3.14 1998/12/20 11:56:46 dawes Exp $ */ +/* $XFree86: xc/include/Xosdefs.h,v 3.13 1998/10/02 07:38:51 dawes Exp $ */ #ifndef _XOSDEFS_H_ #define _XOSDEFS_H_ diff --git a/xc/include/Xpoll.h b/xc/include/Xpoll.h index 59687bb2c..b6c5c5afe 100644 --- a/xc/include/Xpoll.h +++ b/xc/include/Xpoll.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xpoll.h,v 3.6 1999/12/27 00:39:19 robin Exp $ */ +/* $XFree86: xc/include/Xpoll.h,v 3.5 1998/12/13 12:23:40 dawes Exp $ */ #ifndef _XPOLL_H_ #define _XPOLL_H_ @@ -101,13 +101,13 @@ typedef struct fd_set { #endif #ifndef FD_SET -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) +#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= ((fd_mask)1 << ((n) % NFDBITS))) #endif #ifndef FD_CLR -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) +#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~((fd_mask)1 << ((n) % NFDBITS))) #endif #ifndef FD_ISSET -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) +#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & ((fd_mask)1 << ((n) % NFDBITS))) #endif #ifndef FD_ZERO #define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) diff --git a/xc/include/Xthreads.h b/xc/include/Xthreads.h index 1e697388d..d62bb3367 100644 --- a/xc/include/Xthreads.h +++ b/xc/include/Xthreads.h @@ -21,7 +21,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/include/Xthreads.h,v 3.7 2000/06/25 16:03:43 tsi Exp $ */ +/* $XFree86: xc/include/Xthreads.h,v 3.6 1999/10/13 04:20:47 dawes Exp $ */ #ifndef _XTHREADS_H_ #define _XTHREADS_H_ diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile index e9371d6e1..1817a1761 100644 --- a/xc/include/extensions/Imakefile +++ b/xc/include/extensions/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/50 1997/11/24 16:47:55 kaleb $ -XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.34 2000/03/31 22:55:18 dawes Exp $ +XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.35 2000/08/26 00:33:41 keithp Exp $ #if BuildScreenSaverLibrary SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h @@ -32,11 +32,14 @@ FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h #if BuildXinerama XINERAMAHEADERS = panoramiXext.h panoramiXproto.h Xinerama.h #endif +#if BuildRenderLibrary +RENDERHEADERS = render.h renderproto.h +#endif EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \ $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \ $(LBXHEADERS) $(XVHEADERS) $(XF86RUSHHEADERS) \ - $(FONTCACHEHEADERS) + $(FONTCACHEHEADERS) $(RENDERHEADERS) diff --git a/xc/include/extensions/Print.h b/xc/include/extensions/Print.h index 497923fe4..c122041e2 100644 --- a/xc/include/extensions/Print.h +++ b/xc/include/extensions/Print.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Print.h,v 1.3 1999/12/16 02:26:31 robin Exp $ */ /* $XConsortium: Print.h /main/3 1996/12/10 14:59:02 rws $ */ /****************************************************************************** diff --git a/xc/include/extensions/Printstr.h b/xc/include/extensions/Printstr.h index e3a38628c..564da19a1 100644 --- a/xc/include/extensions/Printstr.h +++ b/xc/include/extensions/Printstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Printstr.h,v 1.3 1999/12/16 02:26:32 robin Exp $ */ +/* $XFree86: $ */ /* $XConsortium: Printstr.h /main/2 1996/11/16 15:20:15 rws $ */ /****************************************************************************** diff --git a/xc/include/extensions/XI.h b/xc/include/extensions/XI.h index f92bba332..e178559ab 100644 --- a/xc/include/extensions/XI.h +++ b/xc/include/extensions/XI.h @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XI.h,v 1.3 1998/12/06 13:30:37 dawes Exp $ */ +/* $XFree86$ */ /* Definitions used by the server, library and client */ diff --git a/xc/include/extensions/XIproto.h b/xc/include/extensions/XIproto.h index b781a225a..15d00cc85 100644 --- a/xc/include/extensions/XIproto.h +++ b/xc/include/extensions/XIproto.h @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XIproto.h,v 1.3 1998/12/06 13:30:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIPROTO_H #define _XIPROTO_H diff --git a/xc/include/extensions/XKB.h b/xc/include/extensions/XKB.h index 06426edcf..42d946d2a 100644 --- a/xc/include/extensions/XKB.h +++ b/xc/include/extensions/XKB.h @@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86$ */ #ifndef _XKB_H_ #define _XKB_H_ @@ -257,6 +258,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XkbPerKeyRepeatMask (1L << 30) #define XkbControlsEnabledMask (1L << 31) +#define XkbAccessXOptionsMask (XkbStickyKeysMask|XkbAccessXFeedbackMask) + #define XkbAllBooleanCtrlsMask (0x00001FFF) #define XkbAllControlsMask (0xF8001FFF) #define XkbAllControlEventsMask XkbAllControlsMask diff --git a/xc/include/extensions/XKBgeom.h b/xc/include/extensions/XKBgeom.h index 217d60edf..08d33cd7d 100644 --- a/xc/include/extensions/XKBgeom.h +++ b/xc/include/extensions/XKBgeom.h @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.6 1999/03/14 03:20:35 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 1.0tsi Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ diff --git a/xc/include/extensions/XKBsrv.h b/xc/include/extensions/XKBsrv.h index 782b8aac1..fba989033 100644 --- a/xc/include/extensions/XKBsrv.h +++ b/xc/include/extensions/XKBsrv.h @@ -235,7 +235,7 @@ typedef struct _XkbSrvLedInfo { #define XkbAX_KRGMask (XkbSlowKeysMask|XkbBounceKeysMask) #define XkbAllFilteredEventsMask \ - (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbAX_KRGMask) + (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask) /***====================================================================***/ diff --git a/xc/include/extensions/XShm.h b/xc/include/extensions/XShm.h index 2e8d26050..e0a41dc47 100644 --- a/xc/include/extensions/XShm.h +++ b/xc/include/extensions/XShm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/XShm.h,v 1.4 1999/04/29 09:13:26 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XShm.h,v 1.3 1998/10/02 07:39:14 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/include/extensions/XTest.h b/xc/include/extensions/XTest.h index b878cccbb..842243016 100644 --- a/xc/include/extensions/XTest.h +++ b/xc/include/extensions/XTest.h @@ -20,7 +20,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/include/extensions/XTest.h,v 3.1 1998/10/02 07:39:15 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XTest.h,v 3.0 1996/12/12 09:12:53 dawes Exp $ */ #ifndef _XTEST_H_ #define _XTEST_H_ diff --git a/xc/include/extensions/Xinerama.h b/xc/include/extensions/Xinerama.h index c0b369f57..4c675a7dc 100644 --- a/xc/include/extensions/Xinerama.h +++ b/xc/include/extensions/Xinerama.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xinerama.h,v 3.2 2000/03/01 01:04:20 dawes Exp $ */ +/* $XFree86$ */ #ifndef _Xinerama_h #define _Xinerama_h diff --git a/xc/include/extensions/Xv.h b/xc/include/extensions/Xv.h index a6a027195..4e85fa719 100644 --- a/xc/include/extensions/Xv.h +++ b/xc/include/extensions/Xv.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xv.h,v 1.5 1999/12/11 19:28:48 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/Xv.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */ #ifndef XV_H #define XV_H diff --git a/xc/include/extensions/Xvlib.h b/xc/include/extensions/Xvlib.h index 28e7ce4e2..c44dc63a5 100644 --- a/xc/include/extensions/Xvlib.h +++ b/xc/include/extensions/Xvlib.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/Xvlib.h,v 1.1 1999/05/23 06:33:22 dawes Exp $ */ #ifndef XVLIB_H #define XVLIB_H diff --git a/xc/include/extensions/Xvproto.h b/xc/include/extensions/Xvproto.h index 0b44154d8..c24452891 100644 --- a/xc/include/extensions/Xvproto.h +++ b/xc/include/extensions/Xvproto.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */ +/* $XFree86$ */ #ifndef XVPROTO_H #define XVPROTO_H diff --git a/xc/include/extensions/dpms.h b/xc/include/extensions/dpms.h index 7fe645b06..f1df3060d 100644 --- a/xc/include/extensions/dpms.h +++ b/xc/include/extensions/dpms.h @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */ +/* $XFree86: xc/include/extensions/dpms.h,v 3.3 1999/03/07 11:40:23 dawes Exp $ */ /* * HISTORY diff --git a/xc/include/extensions/extutil.h b/xc/include/extensions/extutil.h index 53211c4d6..58e128adf 100644 --- a/xc/include/extensions/extutil.h +++ b/xc/include/extensions/extutil.h @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND * ARE SUBJECT TO CHANGE! */ -/* $XFree86: xc/include/extensions/extutil.h,v 1.2 1999/03/07 08:29:27 dawes Exp $ */ +/* $XFree86$ */ #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ @@ -189,7 +189,7 @@ XExtDisplayInfo *proc (Display *dpy) \ } #define XEXT_FIND_DISLPAY_PROTO(proc) \ - XExtDisplayInfo *proc(Display dpy) + XExtDisplayInfo *proc(Display *dpy) #define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \ int proc (Display *dpy, XExtCodes *codes) \ diff --git a/xc/include/extensions/fontcacheP.h b/xc/include/extensions/fontcacheP.h index 141f71412..718e06a37 100644 --- a/xc/include/extensions/fontcacheP.h +++ b/xc/include/extensions/fontcacheP.h @@ -26,7 +26,7 @@ * * Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.4 2000/03/01 01:04:21 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FONTCACHEP_H_ #define _FONTCACHEP_H_ diff --git a/xc/include/extensions/lbxopts.h b/xc/include/extensions/lbxopts.h index d96e3c6db..707d0f6da 100644 --- a/xc/include/extensions/lbxopts.h +++ b/xc/include/extensions/lbxopts.h @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/lbxopts.h,v 1.4 2000/05/18 23:46:11 dawes Exp $ */ +/* $XFree86: xc/include/extensions/lbxopts.h,v 1.3 1997/01/18 07:17:15 dawes Exp $ */ #ifndef _LBX_OPTS_H_ #define _LBX_OPTS_H_ diff --git a/xc/include/extensions/multibuf.h b/xc/include/extensions/multibuf.h index 1250edfb0..f502fa19a 100644 --- a/xc/include/extensions/multibuf.h +++ b/xc/include/extensions/multibuf.h @@ -20,7 +20,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/include/extensions/multibuf.h,v 3.2 1999/01/31 12:21:17 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibuf.h,v 3.1 1998/10/02 07:39:16 dawes Exp $ */ #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ diff --git a/xc/include/extensions/multibufst.h b/xc/include/extensions/multibufst.h index 6ac50f42c..262ec3444 100644 --- a/xc/include/extensions/multibufst.h +++ b/xc/include/extensions/multibufst.h @@ -20,7 +20,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/include/extensions/multibufst.h,v 3.4 1999/01/31 12:21:17 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibufst.h,v 3.3 1998/10/02 07:39:16 dawes Exp $ */ #ifndef _MULTIBUFST_H_ #define _MULTIBUFST_H_ diff --git a/xc/include/extensions/panoramiXext.h b/xc/include/extensions/panoramiXext.h index 10444b822..251aa11b7 100644 --- a/xc/include/extensions/panoramiXext.h +++ b/xc/include/extensions/panoramiXext.h @@ -22,7 +22,7 @@ /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/panoramiXproto.h b/xc/include/extensions/panoramiXproto.h index 577c9fa50..e65ea083a 100644 --- a/xc/include/extensions/panoramiXproto.h +++ b/xc/include/extensions/panoramiXproto.h @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/render.h b/xc/include/extensions/render.h new file mode 100644 index 000000000..0362d3203 --- /dev/null +++ b/xc/include/extensions/render.h @@ -0,0 +1,111 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _RENDER_H_ +#define _RENDER_H_ + +typedef unsigned long Glyph; +typedef unsigned long GlyphSet; +typedef unsigned long Picture; +typedef unsigned long PictFormat; + +#define RENDER_NAME "RENDER" +#define RENDER_MAJOR 0 +#define RENDER_MINOR 0 + +#define X_RenderQueryVersion 0 +#define X_RenderQueryPictFormats 1 +#define X_RenderQueryPictIndexValues 2 +#define X_RenderQueryDithers 3 +#define X_RenderCreatePicture 4 +#define X_RenderChangePicture 5 +#define X_RenderSetPictureClipRectangles 6 +#define X_RenderFreePicture 7 +#define X_RenderComposite 8 +#define X_RenderScale 9 +#define X_RenderTrapezoids 10 +#define X_RenderTriangles 11 +#define X_RenderTriStrip 12 +#define X_RenderTriFan 13 +#define X_RenderColorTrapezoids 14 +#define X_RenderColorTriangles 15 +#define X_RenderTransform 16 +#define X_RenderCreateGlyphSet 17 +#define X_RenderReferenceGlyphSet 18 +#define X_RenderFreeGlyphSet 19 +#define X_RenderAddGlyphs 20 +#define X_RenderAddGlyphsFromPicture 21 +#define X_RenderFreeGlyphs 22 +#define X_RenderCompositeGlyphs8 23 +#define X_RenderCompositeGlyphs16 24 +#define X_RenderCompositeGlyphs32 25 + +#define BadPictFormat 0 +#define BadPicture 1 +#define BadPictOp 2 +#define BadGlyphSet 3 +#define BadGlyph 4 +#define RenderNumberErrors (BadGlyph+1) + +#define PictTypeIndexed 0 +#define PictTypeDirect 1 + +#define PictOpClear 0 +#define PictOpSrc 1 +#define PictOpDst 2 +#define PictOpOver 3 +#define PictOpOverReverse 4 +#define PictOpIn 5 +#define PictOpInReverse 6 +#define PictOpOut 7 +#define PictOpOutReverse 8 +#define PictOpAtop 9 +#define PictOpAtopReverse 10 +#define PictOpXor 11 +#define PictOpAdd 12 +#define PictOpSaturate 13 +#define PictOpMaximum 13 + +#define PolyEdgeSharp 0 +#define PolyEdgeSmooth 1 + +#define PolyModePrecise 0 +#define PolyModeImprecise 1 + +#define CPRepeat (1 << 0) +#define CPAlphaMap (1 << 1) +#define CPAlphaXOrigin (1 << 2) +#define CPAlphaYOrigin (1 << 3) +#define CPClipXOrigin (1 << 4) +#define CPClipYOrigin (1 << 5) +#define CPClipMask (1 << 6) +#define CPGraphicsExposure (1 << 7) +#define CPSubwindowMode (1 << 8) +#define CPPolyEdge (1 << 9) +#define CPPolyMode (1 << 10) +#define CPDither (1 << 11) +#define CPLastBit 11 + +#endif /* _RENDER_H_ */ diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h new file mode 100644 index 000000000..0279b70ee --- /dev/null +++ b/xc/include/extensions/renderproto.h @@ -0,0 +1,376 @@ +/* + * $XFree86: xc/include/extensions/renderproto.h,v 1.2 2000/08/28 02:43:11 tsi Exp $ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _XRENDERP_H_ +#define _XRENDERP_H_ + +#include "render.h" + +#define Window CARD32 +#define Drawable CARD32 +#define Font CARD32 +#define Pixmap CARD32 +#define Cursor CARD32 +#define Colormap CARD32 +#define GContext CARD32 +#define Atom CARD32 +#define VisualID CARD32 +#define Time CARD32 +#define KeyCode CARD8 +#define KeySym CARD32 + +#define Picture CARD32 +#define PictFormat CARD32 +#define Fixed CARD32 +#define Glyphset CARD32 +#define Glyph CARD32 + +/* + * data structures + */ + +typedef struct { + CARD16 red B16; + CARD16 redMask B16; + CARD16 green B16; + CARD16 greenMask B16; + CARD16 blue B16; + CARD16 blueMask B16; + CARD16 alpha B16; + CARD16 alphaMask B16; +} xDirectFormat; + +#define sz_xDirectFormat 16 + +typedef struct { + PictFormat id B32; + CARD8 type; + CARD8 depth; + CARD16 pad1 B16; + xDirectFormat direct; + Colormap colormap; +} xPictFormInfo; + +#define sz_xPictFormInfo 16 + +typedef struct { + VisualID visual; + PictFormat format; +} xPictVisual; + +#define sz_xPictVisual 8 + +typedef struct { + CARD8 depth; + CARD8 pad1; + CARD16 nPictVisuals B16; + CARD32 pad2 B32; +} xPictDepth; + +#define sz_xPictDepth 8 + +typedef struct { + CARD32 nDepth B32; + PictFormat fallback B32; +} xPictScreen; + +#define sz_xPictScreen 8 + +typedef struct { + CARD32 pixel B32; + CARD16 red B16; + CARD16 green B16; + CARD16 blue B16; + CARD16 pad B16; +} xIndexValue; + +#define sz_xIndexValue 12 + +typedef struct { + CARD16 width B16; + CARD16 height B16; + INT16 x B16; + INT16 y B16; + INT16 xOff B16; + INT16 yOff B16; +} xGlyphInfo; + +#define sz_xGlyphInfo 12 + +typedef struct { + CARD8 len; + CARD8 pad1; + CARD16 pad2; + INT16 deltax; + INT16 deltay; +} xGlyphElt; + +#define sz_xGlyphElt 8 + +/* + * requests and replies + */ +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD32 majorVersion B32; + CARD32 minorVersion B32; +} xRenderQueryVersionReq; + +#define sz_xRenderQueryVersionReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 majorVersion B32; + CARD32 minorVersion B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRenderQueryVersionReply; + +#define sz_xRenderQueryVersionReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; +} xRenderQueryPictFormatsReq; + +#define sz_xRenderQueryPictFormatsReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 numFormats B32; + CARD32 numScreens B32; + CARD32 numDepths B32; + CARD32 numVisuals B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xRenderQueryPictFormatsReply; + +#define sz_xRenderQueryPictFormatsReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + PictFormat format B32; +} xRenderQueryPictIndexValuesReq; + +#define sz_xRenderQueryPictIndexValuesReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 numIndexValues; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; +} xRenderQueryPictIndexValuesReply; + +#define sz_xRenderQueryPictIndexValuesReply 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture pid B32; + Drawable drawable B32; + PictFormat format B32; + CARD32 mask B32; +} xRenderCreatePictureReq; + +#define sz_xRenderCreatePictureReq 20 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + CARD32 mask B32; +} xRenderChangePictureReq; + +#define sz_xRenderChangePictureReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; + INT16 xOrigin B16; + INT16 yOrigin B16; +} xRenderSetPictureClipRectanglesReq; + +#define sz_xRenderSetPictureClipRectanglesReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture picture B32; +} xRenderFreePictureReq; + +#define sz_xRenderFreePictureReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture mask B32; + Picture dst B32; + INT16 xSrc B16; + INT16 ySrc B16; + INT16 xMask B16; + INT16 yMask B16; + INT16 xDst B16; + INT16 yDst B16; + CARD16 width B16; + CARD16 height B16; +} xRenderCompositeReq; + +#define sz_xRenderCompositeReq 36 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Picture src B32; + Picture dst B32; + CARD32 colorScale B32; + CARD32 alphaScale B32; + INT16 xSrc B16; + INT16 ySrc B16; + INT16 xDst B16; + INT16 yDst B16; + CARD16 width B16; + CARD16 height B16; +} xRenderScaleReq; + +#define sz_xRenderScaleReq 32 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset gsid B32; + PictFormat format B32; +} xRenderCreateGlyphSetReq; + +#define sz_xRenderCreateGlyphSetReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset gsid B32; + Glyphset existing B32; +} xRenderReferenceGlyphSetReq; + +#define sz_xRenderReferenceGlyphSetReq 24 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; +} xRenderFreeGlyphSetReq; + +#define sz_xRenderFreeGlyphSetReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; + CARD32 nglyphs; +} xRenderAddGlyphsReq; + +#define sz_xRenderAddGlyphsReq 12 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + Glyphset glyphset B32; +} xRenderFreeGlyphsReq; + +#define sz_xRenderFreeGlyphsReq 8 + +typedef struct { + CARD8 reqType; + CARD8 renderReqType; + CARD16 length B16; + CARD8 op; + CARD8 pad1; + CARD16 pad2 B16; + Picture src B32; + Picture dst B32; + PictFormat maskFormat B32; + Glyphset glyphset B32; + INT16 xSrc B16; + INT16 ySrc B16; +} xRenderCompositeGlyphsReq, xRenderCompositeGlyphs8Req, +xRenderCompositeGlyphs16Req, xRenderCompositeGlyphs32Req; + +#define sz_xRenderCompositeGlyphs8Req 28 +#define sz_xRenderCompositeGlyphs16Req 28 +#define sz_xRenderCompositeGlyphs32Req 28 + +#undef Window +#undef Drawable +#undef Font +#undef Pixmap +#undef Cursor +#undef Colormap +#undef GContext +#undef Atom +#undef VisualID +#undef Time +#undef KeyCode +#undef KeySym + +#undef Picture +#undef PictFormat +#undef Fixed +#undef Glyphset +#undef Glyph + +#endif /* _XRENDERP_H_ */ diff --git a/xc/include/extensions/shmstr.h b/xc/include/extensions/shmstr.h index 3feba51dd..f3a61d0c7 100644 --- a/xc/include/extensions/shmstr.h +++ b/xc/include/extensions/shmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shmstr.h,v 3.1 1998/10/02 07:39:18 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.0 1996/05/06 05:52:42 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/include/extensions/xf86bigfont.h b/xc/include/extensions/xf86bigfont.h index 0d36840bc..653e09921 100644 --- a/xc/include/extensions/xf86bigfont.h +++ b/xc/include/extensions/xf86bigfont.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ +/* $XFree86: $ */ /* * Declarations for the BIGFONT extension. * diff --git a/xc/include/extensions/xf86bigfstr.h b/xc/include/extensions/xf86bigfstr.h index 9e9c9e6eb..5eb73d78f 100644 --- a/xc/include/extensions/xf86bigfstr.h +++ b/xc/include/extensions/xf86bigfstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */ /* * Declarations of request structures for the BIGFONT extension. * diff --git a/xc/include/extensions/xf86dga.h b/xc/include/extensions/xf86dga.h index 6918a5130..064832d17 100644 --- a/xc/include/extensions/xf86dga.h +++ b/xc/include/extensions/xf86dga.h @@ -1,7 +1,7 @@ /* Copyright (c) 1999 XFree86 Inc */ -/* $XFree86: xc/include/extensions/xf86dga.h,v 3.20 1999/10/13 04:20:48 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dga.h,v 3.19 1999/08/22 05:57:22 dawes Exp $ */ #ifndef _XF86DGA_H_ #define _XF86DGA_H_ diff --git a/xc/include/extensions/xf86dga1.h b/xc/include/extensions/xf86dga1.h index 41790b179..6cb97b3c4 100644 --- a/xc/include/extensions/xf86dga1.h +++ b/xc/include/extensions/xf86dga1.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.2 1999/04/17 07:05:41 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs diff --git a/xc/include/extensions/xf86dga1str.h b/xc/include/extensions/xf86dga1str.h index 5695fbd13..0dfde9bc2 100644 --- a/xc/include/extensions/xf86dga1str.h +++ b/xc/include/extensions/xf86dga1str.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.2 1999/05/03 12:15:37 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs diff --git a/xc/include/extensions/xf86dgastr.h b/xc/include/extensions/xf86dgastr.h index e5ef683f4..005b049f3 100644 --- a/xc/include/extensions/xf86dgastr.h +++ b/xc/include/extensions/xf86dgastr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.12 1999/08/22 05:57:23 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.11 1999/07/18 08:14:22 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs diff --git a/xc/include/extensions/xf86misc.h b/xc/include/extensions/xf86misc.h index 1ba48ecec..a56621fa9 100644 --- a/xc/include/extensions/xf86misc.h +++ b/xc/include/extensions/xf86misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86misc.h,v 3.13 2000/04/17 16:29:48 eich Exp $ */ +/* $XFree86: xc/include/extensions/xf86misc.h,v 3.11 1998/06/28 03:52:34 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xc/include/extensions/xf86mscstr.h b/xc/include/extensions/xf86mscstr.h index 3262220a3..c35feed84 100644 --- a/xc/include/extensions/xf86mscstr.h +++ b/xc/include/extensions/xf86mscstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.8 1998/06/28 03:52:34 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.7 1998/06/27 12:53:24 hohndel Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xc/include/extensions/xf86rush.h b/xc/include/extensions/xf86rush.h index 32628b464..e45389410 100644 --- a/xc/include/extensions/xf86rush.h +++ b/xc/include/extensions/xf86rush.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86rush.h,v 1.4 2000/02/29 03:09:00 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86rush.h,v 1.3 2000/02/11 22:35:44 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss diff --git a/xc/include/extensions/xf86rushstr.h b/xc/include/extensions/xf86rushstr.h index e59478362..00f489573 100644 --- a/xc/include/extensions/xf86rushstr.h +++ b/xc/include/extensions/xf86rushstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.4 2000/02/29 03:09:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.3 2000/02/11 22:35:44 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss diff --git a/xc/include/extensions/xf86vmode.h b/xc/include/extensions/xf86vmode.h index 34e4fa8fb..4dee2f72a 100644 --- a/xc/include/extensions/xf86vmode.h +++ b/xc/include/extensions/xf86vmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.27 1999/03/14 11:17:37 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.26 1999/03/12 02:36:20 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY diff --git a/xc/include/extensions/xf86vmstr.h b/xc/include/extensions/xf86vmstr.h index 6a5cb3d8c..a8275ee09 100644 --- a/xc/include/extensions/xf86vmstr.h +++ b/xc/include/extensions/xf86vmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.23 1999/03/14 11:17:38 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.22 1999/03/07 08:29:28 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY diff --git a/xc/include/fonts/FS.h b/xc/include/fonts/FS.h index c070e08fd..70bec2db1 100644 --- a/xc/include/fonts/FS.h +++ b/xc/include/fonts/FS.h @@ -46,7 +46,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/include/fonts/FS.h,v 1.5 1999/08/22 08:58:48 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FS_H_ #define _FS_H_ diff --git a/xc/include/fonts/Imakefile b/xc/include/fonts/Imakefile index ebe0d70b9..cb51ccde3 100644 --- a/xc/include/fonts/Imakefile +++ b/xc/include/fonts/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:32:27 rws $ -XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.6 1999/08/28 09:00:23 dawes Exp $ +XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.5 1999/08/14 10:49:16 dawes Exp $ HEADERS = FS.h FSproto.h fsmasks.h diff --git a/xc/include/fonts/font.h b/xc/include/fonts/font.h index 6e32146d4..2cecde4a4 100644 --- a/xc/include/fonts/font.h +++ b/xc/include/fonts/font.h @@ -1,5 +1,5 @@ /* $XConsortium: font.h /main/14 1996/09/28 16:32:33 rws $ */ -/* $XFree86: xc/include/fonts/font.h,v 3.3 1998/10/25 07:11:11 dawes Exp $ */ +/* $XFree86: xc/include/fonts/font.h,v 3.2 1997/01/14 22:13:06 dawes Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/xc/include/fonts/fontproto.h b/xc/include/fonts/fontproto.h index 12f1e4503..d8dab31a9 100644 --- a/xc/include/fonts/fontproto.h +++ b/xc/include/fonts/fontproto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */ +/* $XFree86: xc/include/fonts/fontproto.h,v 1.1 1999/08/21 13:47:34 dawes Exp $ */ /*********************************************************** diff --git a/xc/include/fonts/fontstruct.h b/xc/include/fonts/fontstruct.h index ef9dc1d6f..e5ef0d2b9 100644 --- a/xc/include/fonts/fontstruct.h +++ b/xc/include/fonts/fontstruct.h @@ -1,5 +1,5 @@ /* $XConsortium: fontstruct.h /main/17 1996/08/09 16:23:54 kaleb $ */ -/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */ +/* $XFree86: xc/include/fonts/fontstruct.h,v 3.2 1999/06/13 13:46:51 dawes Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/xc/include/keysymdef.h b/xc/include/keysymdef.h index c4e22039c..9eb1c7c28 100644 --- a/xc/include/keysymdef.h +++ b/xc/include/keysymdef.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysymdef.h,v 1.9 1999/07/06 11:38:02 dawes Exp $ */ +/* $XFree86: xc/include/keysymdef.h,v 1.8 1999/06/08 11:31:02 dawes Exp $ */ #define XK_VoidSymbol 0xFFFFFF /* void symbol */ diff --git a/xc/lib/FS/FSClServ.c b/xc/lib/FS/FSClServ.c index 637ac6df4..a0a1ff4dd 100644 --- a/xc/lib/FS/FSClServ.c +++ b/xc/lib/FS/FSClServ.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSClServ.c,v 1.3 1999/02/20 15:07:12 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSConnServ.c b/xc/lib/FS/FSConnServ.c index c3f801f81..970b4fc87 100644 --- a/xc/lib/FS/FSConnServ.c +++ b/xc/lib/FS/FSConnServ.c @@ -46,7 +46,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/lib/FS/FSConnServ.c,v 3.6 1998/10/03 08:41:06 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.5 1998/04/05 00:45:41 robin Exp $ */ #include <stdio.h> #include "FSlibint.h" diff --git a/xc/lib/FS/FSErrHndlr.c b/xc/lib/FS/FSErrHndlr.c index 355bd208b..f5774900e 100644 --- a/xc/lib/FS/FSErrHndlr.c +++ b/xc/lib/FS/FSErrHndlr.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.3 1999/02/20 15:07:12 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSOpenFont.c b/xc/lib/FS/FSOpenFont.c index 341d2dc31..5991f0498 100644 --- a/xc/lib/FS/FSOpenFont.c +++ b/xc/lib/FS/FSOpenFont.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.4 1999/02/25 06:00:55 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.3 1999/02/20 15:07:12 hohndel Exp $ */ /* diff --git a/xc/lib/FS/FSOpenServ.c b/xc/lib/FS/FSOpenServ.c index 9c4943347..13c92a765 100644 --- a/xc/lib/FS/FSOpenServ.c +++ b/xc/lib/FS/FSOpenServ.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.3 1999/02/20 15:07:13 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSQXExt.c b/xc/lib/FS/FSQXExt.c index fc4375f45..45f223be3 100644 --- a/xc/lib/FS/FSQXExt.c +++ b/xc/lib/FS/FSQXExt.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.3 1999/02/20 15:07:13 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSSetCats.c b/xc/lib/FS/FSSetCats.c index 6a8d8f43f..479721c87 100644 --- a/xc/lib/FS/FSSetCats.c +++ b/xc/lib/FS/FSSetCats.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.3 1999/03/14 03:20:36 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.0tsi Exp $ */ /* diff --git a/xc/lib/FS/FSSynchro.c b/xc/lib/FS/FSSynchro.c index fee61bc77..ecf6de68f 100644 --- a/xc/lib/FS/FSSynchro.c +++ b/xc/lib/FS/FSSynchro.c @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.3 1999/02/20 15:07:13 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSlib.h b/xc/lib/FS/FSlib.h index 0bdd39b4e..f55730e2c 100644 --- a/xc/lib/FS/FSlib.h +++ b/xc/lib/FS/FSlib.h @@ -24,7 +24,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSlib.h,v 1.3 1999/02/20 15:07:14 hohndel Exp $ */ +/* $XFree86: $ */ /* diff --git a/xc/lib/FS/FSlibInt.c b/xc/lib/FS/FSlibInt.c index 654ed0785..ca06f5bdc 100644 --- a/xc/lib/FS/FSlibInt.c +++ b/xc/lib/FS/FSlibInt.c @@ -46,7 +46,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/lib/FS/FSlibInt.c,v 3.7 1999/12/27 00:39:20 robin Exp $ */ +/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.6 1999/02/25 06:00:56 dawes Exp $ */ /* * FSlibInt.c - Internal support routines for the C subroutine diff --git a/xc/lib/FS/FSlibint.h b/xc/lib/FS/FSlibint.h index bb4fc9745..0756c46df 100644 --- a/xc/lib/FS/FSlibint.h +++ b/xc/lib/FS/FSlibint.h @@ -46,7 +46,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/lib/FS/FSlibint.h,v 3.4 1999/02/19 21:26:52 hohndel Exp $ */ +/* $XFree86: xc/lib/FS/FSlibint.h,v 3.3 1998/10/03 08:41:07 dawes Exp $ */ /* * FSlib internal decls diff --git a/xc/lib/FS/FSlibos.h b/xc/lib/FS/FSlibos.h index 962738b67..65b778a20 100644 --- a/xc/lib/FS/FSlibos.h +++ b/xc/lib/FS/FSlibos.h @@ -46,7 +46,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/lib/FS/FSlibos.h,v 3.5 1999/12/27 00:39:21 robin Exp $ */ +/* $XFree86: xc/lib/FS/FSlibos.h,v 3.4 1998/10/03 08:41:08 dawes Exp $ */ /* * FSlib networking & os include file diff --git a/xc/lib/FS/Imakefile b/xc/lib/FS/Imakefile index a391d0d24..f27712f1b 100644 --- a/xc/lib/FS/Imakefile +++ b/xc/lib/FS/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/20 1996/09/28 16:32:46 rws $ -XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.4 1999/02/19 21:26:52 hohndel Exp $ +XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.3 1998/12/20 11:56:48 dawes Exp $ #define DoNormalLib NormalLibFS #define DoSharedLib SharedLibFS #define DoExtraLib SharedLibFS diff --git a/xc/lib/GL/GL-def.cpp b/xc/lib/GL/GL-def.cpp index bb08a81ef..ac1c9aff5 100644 --- a/xc/lib/GL/GL-def.cpp +++ b/xc/lib/GL/GL-def.cpp @@ -428,4 +428,4 @@ EXPORTS glBlendEquationEXT @ 462 glTexImage3D @ 463 -/* $XFree86: xc/lib/GL/GL-def.cpp,v 1.1 2000/08/09 23:40:11 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/GL/GLos2.def b/xc/lib/GL/GLos2.def index ea88da97b..bc9d7d3d7 100644 --- a/xc/lib/GL/GLos2.def +++ b/xc/lib/GL/GLos2.def @@ -1,5 +1,5 @@ LIBRARY GL -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/GL/GLos2.def,v 1.1 1999/04/29 09:13:26 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/GL/Imakefile b/xc/lib/GL/Imakefile index 0bbc3fcd2..3e5710abb 100644 --- a/xc/lib/GL/Imakefile +++ b/xc/lib/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.30 2000/08/25 13:42:19 dawes Exp $ #include <Threads.tmpl> @@ -18,12 +18,15 @@ XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.29 2000/07/02 19:23:34 dawes Exp $ REQUIREDLIBS = SharedGLReqs #endif -#if 0 - LOWSRC = lowpc.c - LOWOBJ = lowpc.o +XCOMM +XCOMM Not related to ProfileLibGlx - I dont know how that works. KW. +XCOMM +#ifdef GlxSoProf + PROFSRC = lowpc.c highpc.c + PROFOBJ = lowpc.o highpc.o - HISRC = highpc.c - HIOBJ = highpc.o +SubdirLibraryRule($(PROFOBJ)) +NormalLintTarget($(PROFSRC)) #endif #if BuildXF86DRI && defined(i386Architecture) @@ -69,11 +72,19 @@ REQUIREDLIBS = SharedGLReqs #endif #endif - MESAOBJS = mesa/src/?*.o mesa/src/X86/?*.o - MESAUOBJS = mesa/src/unshared/?*.o mesa/src/X86/unshared/?*.o $(ASM_OBJS) - MESADOBJS = mesa/src/debugger/?*.o mesa/src/X86/debugger/?*.o $(ASM_OBJS) - MESAPOBJS = mesa/src/profiled/?*.o mesa/src/X86/profiled/?*.o $(ASM_OBJS) - MESADONES = mesa/src/DONE mesa/src/X86/DONE +#ifdef i386Architecture + MESAARCHOBJS = mesa/src/X86/?*.o +MESAARCHUOBJS = mesa/src/X86/unshared/?*.o $(ASM_OBJS) +MESAARCHDOBJS = mesa/src/X86/debugger/?*.o $(ASM_OBJS) +MESAARCHPOBJS = mesa/src/X86/profiled/?*.o $(ASM_OBJS) +MESAARCHDONES = mesa/src/X86/DONE +#endif + + MESAOBJS = mesa/src/?*.o $(MESAARCHOBJS) + MESAUOBJS = mesa/src/unshared/?*.o $(MESAARCHUOBJS) + MESADOBJS = mesa/src/debugger/?*.o $(MESAARCHDOBJS) + MESAPOBJS = mesa/src/profiled/?*.o $(MESAARCHPOBJS) + MESADONES = mesa/src/DONE $(MESAARCHDONES) DRIMESAOBJS = mesa/dri/?*.o DRIMESAUOBJS = mesa/dri/unshared/?*.o @@ -122,7 +133,7 @@ XCOMM nothing DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) $(DRIMESAPOBJS) $(DRMPOBJS) DRVDONES = $(TDFXDONES) $(MESADONES) $(DRIMESADONES) $(DRMDONES) -REQUIREDLIBS += -lglide3x -ldl +REQUIREDLIBS += -lglide3 -ldl GLXSUBDIRS = glx dri mesa/dri mesa/include/GL mesa/src mesa/src/drv/tdfx @@ -241,28 +252,19 @@ MakeSubdirs($(GLXSUBDIRS)) #ifdef OS2Architecture OBJS = $(LIBNAME).a #else - OBJS = $(LOWOBJ) $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(HIOBJ) + OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) #endif #if HasSharedLibraries -#if 1 UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) #else UOBJS = $(OBJS) #endif -#else - UOBJS = $(OBJS) -#endif DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) DONES = $(GLXDONES) $(DRIDONES) $(DRVDONES) -#if 0 -SubdirLibraryRule(highpc.o lowpc.o) -NormalLintTarget(highpc.c lowpc.c) -#endif - #if LocalThreads THREADOBJS = $(THREADS_LIBS) #endif diff --git a/xc/lib/GL/dri/Imakefile b/xc/lib/GL/dri/Imakefile index bd1e11042..9ae59ad47 100644 --- a/xc/lib/GL/dri/Imakefile +++ b/xc/lib/GL/dri/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/dri/Imakefile,v 1.5 2000/02/15 07:13:25 martin Exp $ +XCOMM $XFree86: xc/lib/GL/dri/Imakefile,v 1.4 2000/02/08 17:18:26 dawes Exp $ #include <Threads.tmpl> diff --git a/xc/lib/GL/dri/XF86dri.c b/xc/lib/GL/dri/XF86dri.c index ea3160cd5..a11c67d37 100644 --- a/xc/lib/GL/dri/XF86dri.c +++ b/xc/lib/GL/dri/XF86dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.7 2000/06/20 05:08:37 dawes Exp $ */ +/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.8 2000/08/13 10:19:56 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -461,7 +461,7 @@ Bool XF86DRIGetDrawableInfo(dpy, screen, drawable, *pClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1); if (*pClipRects) - _XRead32(dpy, *pClipRects, len); + _XRead(dpy, (char*)*pClipRects, len); } else { *pClipRects = NULL; } @@ -471,7 +471,7 @@ Bool XF86DRIGetDrawableInfo(dpy, screen, drawable, *pBackClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1); if (*pBackClipRects) - _XRead32(dpy, *pBackClipRects, len); + _XRead(dpy, (char*)*pBackClipRects, len); } else { *pBackClipRects = NULL; } @@ -511,7 +511,7 @@ Bool XF86DRIGetDeviceInfo(dpy, screen, hFrameBuffer, *hFrameBuffer = rep.hFrameBufferLow; #ifdef LONG64 - *hFrameBuffer = ((drmHandle)rep.hFrameBufferHigh) << 32; + *hFrameBuffer |= ((drmHandle)rep.hFrameBufferHigh) << 32; #endif *fbOrigin = rep.framebufferOrigin; @@ -524,7 +524,7 @@ Bool XF86DRIGetDeviceInfo(dpy, screen, hFrameBuffer, _XEatData(dpy, ((rep.length+3) & ~3)); return False; } - _XRead32(dpy, *pDevPrivate, rep.length); + _XRead(dpy, (char*)*pDevPrivate, rep.length); } else { *pDevPrivate = NULL; } diff --git a/xc/lib/GL/dri/dri_tmm.c b/xc/lib/GL/dri/dri_tmm.c index 3df4c309b..1bd77ed59 100644 --- a/xc/lib/GL/dri/dri_tmm.c +++ b/xc/lib/GL/dri/dri_tmm.c @@ -24,7 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.2 2000/02/23 04:46:34 martin Exp $ + * $XFree86: xc/lib/GL/dri/dri_tmm.c,v 1.1 1999/06/14 07:23:32 dawes Exp $ * * * DESCRIPTION diff --git a/xc/lib/GL/dri/dri_tmm.h b/xc/lib/GL/dri/dri_tmm.h index 1eb56a7c1..350a301b5 100644 --- a/xc/lib/GL/dri/dri_tmm.h +++ b/xc/lib/GL/dri/dri_tmm.h @@ -24,7 +24,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/lib/GL/dri/dri_tmm.h,v 1.2 2000/02/23 04:46:34 martin Exp $ + * $XFree86: xc/lib/GL/dri/dri_tmm.h,v 1.1 1999/06/14 07:23:32 dawes Exp $ * */ diff --git a/xc/lib/GL/dri/drm/Imakefile b/xc/lib/GL/dri/drm/Imakefile index 0433cd081..fc2534fe2 100644 --- a/xc/lib/GL/dri/drm/Imakefile +++ b/xc/lib/GL/dri/drm/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.7 2000/08/09 23:40:11 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.8 2000/08/16 01:45:28 dawes Exp $ #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx @@ -11,7 +11,10 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I. + INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I. \ + -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \ + -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel \ + -I$(XF86OSSRC) SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c \ xf86drmR128.c OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o \ @@ -19,25 +22,28 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #if defined(LinuxArchitecture) OS_SUBDIR = linux +OS_SUBDIR2 = linux #endif #if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture) OS_SUBDIR = bsd +OS_SUBDIR2 = linux #endif -#if defined(cygwinArchitecture) +#if defined(cygwinArchitecture) && 0 /* XXX FIX ME */ OS_SUBDIR = cygwin +OS_SUBDIR2 = cygwin #endif LinkSourceFile(xf86drm.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm) -LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm) -LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm) -LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm) -LinkSourceFile(xf86drm.h,$(XF86OSSRC)) -LinkSourceFile(drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel) -LinkSourceFile(mga_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel) -LinkSourceFile(i810_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel) -LinkSourceFile(xf86drmR128.c,$(XF86OSSRC)/$(OS_SUBDIR)/drm) -LinkSourceFile(xf86drmR128.h,$(XF86OSSRC)) -LinkSourceFile(r128_drm.h,$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel) +LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) +LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) +LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) +LinkSourceFile(xf86drmR128.c,$(XF86OSSRC)/$(OS_SUBDIR2)/drm) + +LinkSourceFile(drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel) +LinkSourceFile(i810_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel) +LinkSourceFile(mga_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel) +LinkSourceFile(r128_drm.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel) +LinkSourceFile(sis_drm_public.h,$(XF86OSSRC)/$(OS_SUBDIR2)/drm/kernel) #include <Library.tmpl> diff --git a/xc/lib/GL/dri/xf86dri.h b/xc/lib/GL/dri/xf86dri.h index bc75cb64c..8b7cd3aa2 100644 --- a/xc/lib/GL/dri/xf86dri.h +++ b/xc/lib/GL/dri/xf86dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.6 2000/06/17 00:02:48 martin Exp $ */ +/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.5 2000/02/23 04:46:34 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/dri/xf86dristr.h b/xc/lib/GL/dri/xf86dristr.h index 4f92ba6cf..42e5da785 100644 --- a/xc/lib/GL/dri/xf86dristr.h +++ b/xc/lib/GL/dri/xf86dristr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.6 2000/06/17 00:02:48 martin Exp $ */ +/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.5 2000/02/23 04:46:34 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/glx/Imakefile b/xc/lib/GL/glx/Imakefile index 8f3111bdb..f90cc8c70 100644 --- a/xc/lib/GL/glx/Imakefile +++ b/xc/lib/GL/glx/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.11 2000/08/01 20:28:38 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.10 2000/06/30 17:15:07 dawes Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., diff --git a/xc/lib/GL/glx/clientattrib.c b/xc/lib/GL/glx/clientattrib.c index 0e23c09ad..cf4e251bc 100644 --- a/xc/lib/GL/glx/clientattrib.c +++ b/xc/lib/GL/glx/clientattrib.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/clientattrib.c,v 1.4 2000/02/18 16:23:09 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/clientattrib.c,v 1.3 2000/02/15 19:19:17 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/compsize.c b/xc/lib/GL/glx/compsize.c index cf5de61bb..c3a84c00c 100644 --- a/xc/lib/GL/glx/compsize.c +++ b/xc/lib/GL/glx/compsize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/compsize.c,v 1.2 1999/06/14 07:23:34 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/eval.c b/xc/lib/GL/glx/eval.c index ca4f54ce5..2584e49fc 100644 --- a/xc/lib/GL/glx/eval.c +++ b/xc/lib/GL/glx/eval.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/eval.c,v 1.2 1999/06/14 07:23:35 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/g_render.c b/xc/lib/GL/glx/g_render.c index b9f37c171..5ce10c083 100644 --- a/xc/lib/GL/glx/g_render.c +++ b/xc/lib/GL/glx/g_render.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/g_render.c,v 1.2 1999/06/14 07:23:35 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/g_single.c b/xc/lib/GL/glx/g_single.c index b41865ef0..7a984231f 100644 --- a/xc/lib/GL/glx/g_single.c +++ b/xc/lib/GL/glx/g_single.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/g_single.c,v 1.2 1999/06/14 07:23:36 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/g_vendpriv.c b/xc/lib/GL/glx/g_vendpriv.c index b178ab811..2ff9f2ed8 100644 --- a/xc/lib/GL/glx/g_vendpriv.c +++ b/xc/lib/GL/glx/g_vendpriv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/g_vendpriv.c,v 1.2 1999/06/14 07:23:36 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/glxcmds.c b/xc/lib/GL/glx/glxcmds.c index deccf9a3c..b3be89f2d 100644 --- a/xc/lib/GL/glx/glxcmds.c +++ b/xc/lib/GL/glx/glxcmds.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.11 2000/07/01 15:23:10 martin Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.10 2000/06/26 05:41:28 martin Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/glxext.c b/xc/lib/GL/glx/glxext.c index 2367f49a0..c7c044d15 100644 --- a/xc/lib/GL/glx/glxext.c +++ b/xc/lib/GL/glx/glxext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.6 2000/02/15 19:19:18 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.5 2000/02/15 07:13:27 martin Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 diff --git a/xc/lib/GL/glx/indirect.h b/xc/lib/GL/glx/indirect.h index 4e18e0cde..40aeb57b1 100644 --- a/xc/lib/GL/glx/indirect.h +++ b/xc/lib/GL/glx/indirect.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/indirect.h,v 1.2 2000/02/15 19:19:18 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/indirect.h,v 1.1 1999/06/14 07:23:37 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/glx/indirect_init.c b/xc/lib/GL/glx/indirect_init.c index 3d631bee6..490f7cb3d 100644 --- a/xc/lib/GL/glx/indirect_init.c +++ b/xc/lib/GL/glx/indirect_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/indirect_init.c,v 1.5 2000/03/02 16:07:32 martin Exp $ */ +/* $XFree86: xc/lib/GL/glx/indirect_init.c,v 1.4 2000/02/15 19:19:19 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/glx/indirect_init.h b/xc/lib/GL/glx/indirect_init.h index 46eade8c5..62d04ba6d 100644 --- a/xc/lib/GL/glx/indirect_init.h +++ b/xc/lib/GL/glx/indirect_init.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/indirect_init.h,v 1.3 2000/02/15 19:19:19 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/indirect_init.h,v 1.2 2000/02/08 17:18:33 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/glx/indirect_wrap.h b/xc/lib/GL/glx/indirect_wrap.h index 047576157..0570ad16c 100644 --- a/xc/lib/GL/glx/indirect_wrap.h +++ b/xc/lib/GL/glx/indirect_wrap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/indirect_wrap.h,v 1.3 2000/02/15 19:19:19 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/indirect_wrap.h,v 1.2 2000/02/08 17:18:33 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/glx/packrender.h b/xc/lib/GL/glx/packrender.h index cc699ada5..f83e00858 100644 --- a/xc/lib/GL/glx/packrender.h +++ b/xc/lib/GL/glx/packrender.h @@ -1,7 +1,7 @@ #ifndef __GLX_packrender_h__ #define __GLX_packrender_h__ -/* $XFree86: xc/lib/GL/glx/packrender.h,v 1.5 2000/02/18 16:23:10 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/packrender.h,v 1.4 2000/02/15 19:19:20 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/packsingle.h b/xc/lib/GL/glx/packsingle.h index 830944262..7a31e9c9c 100644 --- a/xc/lib/GL/glx/packsingle.h +++ b/xc/lib/GL/glx/packsingle.h @@ -85,7 +85,7 @@ *((FLOAT32 *) (pc + offset)) = a #else -#define __GLX_SINGLE_PUT_SHORT(offset,a) \ +#define __GLX_SINGLE_PUT_SHORT(offset,a) \ { GLubyte *cp = (pc+offset); \ int shift = (64-16) - ((int)(cp) >> (64-6)); \ *(int *)cp = (*(int *)cp & ~(0xffff << shift)) | ((a & 0xffff) << shift); } diff --git a/xc/lib/GL/glx/packvendpriv.h b/xc/lib/GL/glx/packvendpriv.h index aa3cf8146..74bd6d82b 100644 --- a/xc/lib/GL/glx/packvendpriv.h +++ b/xc/lib/GL/glx/packvendpriv.h @@ -1,7 +1,7 @@ #ifndef __GLX_packvendpriv_h__ #define __GLX_packvendpriv_h__ -/* $XFree86: xc/lib/GL/glx/packvendpriv.h,v 1.3 2000/02/08 17:18:34 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/packvendpriv.h,v 1.2 1999/06/14 07:23:38 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/pixel.c b/xc/lib/GL/glx/pixel.c index a1dd3637c..5f6a2f0ec 100644 --- a/xc/lib/GL/glx/pixel.c +++ b/xc/lib/GL/glx/pixel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/pixel.c,v 1.3 2000/02/08 17:18:34 dawes Exp $ */ +/* $XFree86: xc/lib/GL/glx/pixel.c,v 1.2 1999/06/14 07:23:38 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/pixelstore.c b/xc/lib/GL/glx/pixelstore.c index 9dcef2057..393c00836 100644 --- a/xc/lib/GL/glx/pixelstore.c +++ b/xc/lib/GL/glx/pixelstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/pixelstore.c,v 1.2 1999/06/14 07:23:39 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/render2.c b/xc/lib/GL/glx/render2.c index 099bd9747..ba96659ad 100644 --- a/xc/lib/GL/glx/render2.c +++ b/xc/lib/GL/glx/render2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/render2.c,v 1.2 1999/06/14 07:23:39 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/renderpix.c b/xc/lib/GL/glx/renderpix.c index e6b34567d..4456ae862 100644 --- a/xc/lib/GL/glx/renderpix.c +++ b/xc/lib/GL/glx/renderpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/renderpix.c,v 1.2 1999/06/14 07:23:39 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/single2.c b/xc/lib/GL/glx/single2.c index 2d2998729..6f4957308 100644 --- a/xc/lib/GL/glx/single2.c +++ b/xc/lib/GL/glx/single2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/single2.c,v 1.2 1999/06/14 07:23:39 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/singlepix.c b/xc/lib/GL/glx/singlepix.c index 82edb3904..26c786f1c 100644 --- a/xc/lib/GL/glx/singlepix.c +++ b/xc/lib/GL/glx/singlepix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/singlepix.c,v 1.2 1999/06/14 07:23:39 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/size.h b/xc/lib/GL/glx/size.h index 1005d298a..b93d184c1 100644 --- a/xc/lib/GL/glx/size.h +++ b/xc/lib/GL/glx/size.h @@ -1,7 +1,7 @@ #ifndef _size_h_ #define _size_h_ -/* $XFree86: xc/lib/GL/glx/size.h,v 1.2 1999/06/14 07:23:40 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/glx/vertarr.c b/xc/lib/GL/glx/vertarr.c index e62e52663..56820e039 100644 --- a/xc/lib/GL/glx/vertarr.c +++ b/xc/lib/GL/glx/vertarr.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/vertarr.c,v 1.2 1999/06/14 07:23:40 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/include/GL/internal/glcore.h b/xc/lib/GL/include/GL/internal/glcore.h index 08de67219..49bec4261 100644 --- a/xc/lib/GL/include/GL/internal/glcore.h +++ b/xc/lib/GL/include/GL/internal/glcore.h @@ -1,7 +1,7 @@ #ifndef __gl_core_h_ #define __gl_core_h_ -/* $XFree86: xc/lib/GL/include/GL/internal/glcore.h,v 1.5 1999/06/14 07:23:42 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/lib/GL/makeprofile.sh b/xc/lib/GL/makeprofile.sh index 05d1b221a..81c1daa00 100755 --- a/xc/lib/GL/makeprofile.sh +++ b/xc/lib/GL/makeprofile.sh @@ -1,13 +1,23 @@ #!/bin/sh +# $XFree86$ -RUNDIR=$1 +libname=$1 -[ -f ${RUNDIR}/glx_lowpc ] || { echo "no file ${RUNDIR}/glx_lowpc" ; exit 1 } -[ -f ${RUNDIR}/gmon.out ] || { echo "no file ${RUNDIR}/gmon.out" ; exit 1 } +if [ ! -f ${libname} ] ; then + echo "no file ${libname}" + srcdir=${LIBGL_MODULES_DIR} + driver=$1 + libname=${srcdir}/lib_${driver}_dri_p.a + echo "trying ${libname}" +fi -rm -f glx_lowpc gmon.out glxsyms profile -ln -s ${RUNDIR}/glx_lowpc . || exit 1 -ln -s ${RUNDIR}/gmon.out . || exit 1 +if [ ! -f ${libname} ] ; then + echo "no file ${libname}" + echo "please specify full path to lib_(driver)_dri_p.a" + exit 1 +fi + +ld -o glxsyms -noinhibit-exec --whole-archive -Ttext=`cat glx_lowpc` ${libname} 2> /dev/null || { echo "couldn't build relocated object" ; exit 1 } + +gprof glxsyms < gmon.out > profile || { echo "gprof failed" ; exit 1 } -ld -o glxsyms -noinhibit-exec --whole-archive -Ttext=`cat glx_lowpc` libGL.a 2> /dev/null && \ -gprof glxsyms < gmon.out > profile diff --git a/xc/lib/GL/mesa/dri/Imakefile b/xc/lib/GL/mesa/dri/Imakefile index 23e4ea50e..cd4b4ccf1 100644 --- a/xc/lib/GL/mesa/dri/Imakefile +++ b/xc/lib/GL/mesa/dri/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/dri/Imakefile,v 1.2 2000/02/23 04:46:36 martin Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/dri/Imakefile,v 1.1 2000/02/08 17:18:35 dawes Exp $ #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx diff --git a/xc/lib/GL/mesa/dri/dri_mesa.c b/xc/lib/GL/mesa/dri/dri_mesa.c index f72ce375a..e97f35bf2 100644 --- a/xc/lib/GL/mesa/dri/dri_mesa.c +++ b/xc/lib/GL/mesa/dri/dri_mesa.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.8 2000/06/26 05:41:29 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.c,v 1.7 2000/06/17 00:02:50 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/dri/dri_mesa.h b/xc/lib/GL/mesa/dri/dri_mesa.h index 07ce97d66..42903bf1e 100644 --- a/xc/lib/GL/mesa/dri/dri_mesa.h +++ b/xc/lib/GL/mesa/dri/dri_mesa.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.h,v 1.4 2000/06/17 00:02:50 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/dri/dri_mesa.h,v 1.3 2000/03/02 16:07:33 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/dri/dri_mesaint.h b/xc/lib/GL/mesa/dri/dri_mesaint.h index ba20e0d3e..9c33dda17 100644 --- a/xc/lib/GL/mesa/dri/dri_mesaint.h +++ b/xc/lib/GL/mesa/dri/dri_mesaint.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/dri/dri_mesaint.h,v 1.7 2000/06/17 00:02:51 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/dri/dri_mesaint.h,v 1.6 2000/02/23 04:46:38 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/dri/dri_xmesaapi.h b/xc/lib/GL/mesa/dri/dri_xmesaapi.h index dbe1f21b0..54f22df70 100644 --- a/xc/lib/GL/mesa/dri/dri_xmesaapi.h +++ b/xc/lib/GL/mesa/dri/dri_xmesaapi.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/dri/dri_xmesaapi.h,v 1.4 2000/06/17 00:02:51 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/dri/dri_xmesaapi.h,v 1.3 2000/02/23 04:46:38 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/include/GL/Imakefile b/xc/lib/GL/mesa/include/GL/Imakefile index c48636a19..b809ac5e7 100644 --- a/xc/lib/GL/mesa/include/GL/Imakefile +++ b/xc/lib/GL/mesa/include/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/include/GL/Imakefile,v 1.6 2000/08/01 20:28:38 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/include/GL/Imakefile,v 1.5 2000/06/30 18:27:00 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/lib/GL/mesa/src/Imakefile b/xc/lib/GL/mesa/src/Imakefile index 779cde990..0f46bad31 100644 --- a/xc/lib/GL/mesa/src/Imakefile +++ b/xc/lib/GL/mesa/src/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.16 2000/08/01 20:28:38 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.15 2000/06/24 16:14:07 dawes Exp $ #include <Threads.tmpl> diff --git a/xc/lib/GL/mesa/src/OSmesa/Imakefile b/xc/lib/GL/mesa/src/OSmesa/Imakefile index a38ddd585..5b34c311d 100644 --- a/xc/lib/GL/mesa/src/OSmesa/Imakefile +++ b/xc/lib/GL/mesa/src/OSmesa/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.4 2000/08/01 20:28:38 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.3 2000/06/26 22:27:41 tsi Exp $ #include <Threads.tmpl> diff --git a/xc/lib/GL/mesa/src/OSmesa/OSmesa-def.cpp b/xc/lib/GL/mesa/src/OSmesa/OSmesa-def.cpp index a2ec77a4d..34d76a7d4 100644 --- a/xc/lib/GL/mesa/src/OSmesa/OSmesa-def.cpp +++ b/xc/lib/GL/mesa/src/OSmesa/OSmesa-def.cpp @@ -22,4 +22,4 @@ EXPORTS glVertexPointer glDrawElements -/* $XFree86: xc/lib/GL/mesa/src/OSmesa/OSmesa-def.cpp,v 1.1 2000/08/09 23:40:12 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/GL/mesa/src/X/Imakefile b/xc/lib/GL/mesa/src/X/Imakefile index 1f9f01b46..2da510a1a 100644 --- a/xc/lib/GL/mesa/src/X/Imakefile +++ b/xc/lib/GL/mesa/src/X/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.5 2000/02/23 04:46:39 martin Exp $ #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx diff --git a/xc/lib/GL/mesa/src/X86/Imakefile b/xc/lib/GL/mesa/src/X86/Imakefile index f97040009..f328d7655 100644 --- a/xc/lib/GL/mesa/src/X86/Imakefile +++ b/xc/lib/GL/mesa/src/X86/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.10 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.9 2000/06/17 00:02:53 martin Exp $ #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx diff --git a/xc/lib/GL/mesa/src/drv/Imakefile b/xc/lib/GL/mesa/src/drv/Imakefile index cdac99c61..a90b7ae6d 100644 --- a/xc/lib/GL/mesa/src/drv/Imakefile +++ b/xc/lib/GL/mesa/src/drv/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.14 2000/08/01 20:52:18 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.14tsi Exp $ #define DoNormalLib NormalLibGlx #define DoSharedLib SharedLibGlx @@ -34,7 +34,7 @@ DRIVER += sis SUBDIRS = $(DRIVER) #else -#if defined(i386Architecture) +#if defined(i386Architecture) || defined(ia64Architecture) SUBDIRS += gamma #if HasGlide3 SUBDIRS += tdfx diff --git a/xc/lib/GL/mesa/src/drv/common/hwlog.c b/xc/lib/GL/mesa/src/drv/common/hwlog.c index e78803c26..a3208d3a4 100644 --- a/xc/lib/GL/mesa/src/drv/common/hwlog.c +++ b/xc/lib/GL/mesa/src/drv/common/hwlog.c @@ -24,7 +24,7 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.c,v 1.2 2000/06/22 16:59:23 tsi Exp $ */ +/* $XFree86$ */ #include "hwlog.h" hwlog_t hwlog = { 0,0,0, "[???] "}; diff --git a/xc/lib/GL/mesa/src/drv/common/hwlog.h b/xc/lib/GL/mesa/src/drv/common/hwlog.h index dcc24f39c..4bf9f6a9c 100644 --- a/xc/lib/GL/mesa/src/drv/common/hwlog.h +++ b/xc/lib/GL/mesa/src/drv/common/hwlog.h @@ -24,7 +24,7 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.2 2000/06/22 16:59:23 tsi Exp $ */ +/* $XFree86$ */ /* Usage: * - use mgaError for error messages. Always write to X error and log file. diff --git a/xc/lib/GL/mesa/src/drv/common/mm.c b/xc/lib/GL/mesa/src/drv/common/mm.c index 416f007e4..f2bd889eb 100644 --- a/xc/lib/GL/mesa/src/drv/common/mm.c +++ b/xc/lib/GL/mesa/src/drv/common/mm.c @@ -21,7 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/mm.c,v 1.2 2000/06/22 16:59:23 tsi Exp $ */ +/* $XFree86$ */ #include <stdlib.h> #include <stdio.h> diff --git a/xc/lib/GL/mesa/src/drv/ffb/Imakefile b/xc/lib/GL/mesa/src/drv/ffb/Imakefile index 06fbd148c..d1b88bb9c 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/Imakefile +++ b/xc/lib/GL/mesa/src/drv/ffb/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.3 2000/06/25 14:44:26 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.4tsi Exp $ #include <Threads.tmpl> @@ -19,11 +19,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \ -I$(XF86DRIVERSRC)/sunffb \ -I../../../include -I../.. -I../../X -I../common \ - -I../../../dri \ - -I$(XF86OSSRC)/linux/drm/kernel + -I../../../dri #endif -MESA_INCLUDES = -I. -I.. -I../../include +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c index 3f3097327..1880dbf35 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.c,v 1.1 2000/06/20 05:08:37 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h index 29f197399..bb639943a 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_clear.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_CLEAR_H #define _FFB_CLEAR_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c index 8b06ef77b..2ecdc62d4 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.c,v 1.1 2000/06/20 05:08:38 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h index 4ffcbe666..fd5133bcb 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_dd.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D. * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c index 678dfff7f..eaa5ffcb1 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.c,v 1.1 2000/06/20 05:08:38 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h index a098bfcc2..7f37b9846 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_depth.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_DEPTH_H #define _FFB_DEPTH_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h index b78c7e5b6..86d5e9a71 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_fifo.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_FIFO_H #define _FFB_FIFO_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c index 180f10422..4b3afa90a 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.c,v 1.1 2000/06/20 05:08:38 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h index 7c5e0b284..e32e54df7 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lines.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_LINES_H #define _FFB_LINES_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h index 593637008..0a9d4fa34 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_linetmp.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ static void TAG(ffb_line)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint pv) { diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h index 1042ee407..45c5d447f 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_lock.h,v 1.1 2000/06/20 05:08:38 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_LOCK_H #define _FFB_LOCK_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c index 88c5b3dd3..2f811f422 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.c,v 1.1 2000/06/20 05:08:39 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h index b7910d288..313905034 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pipeline.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_PIPELINE_H #define _FFB_PIPELINE_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_points.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_points.c index d459ed3f3..84a7a0ded 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_points.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_points.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_points.c,v 1.1 2000/06/20 05:08:39 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_points.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_points.h index b3a078e8a..b6b373e51 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_points.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_points.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_points.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_POINTS_H #define _FFB_POINTS_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h index c7d3b1e8e..ad5b7ee47 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_pointtmp.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ static void TAG(ffb_points)(GLcontext *ctx, GLuint first, GLuint last) { diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_span.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_span.c index dbae8df6b..f2e15e73b 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_span.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_span.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_span.c,v 1.1 2000/06/20 05:08:39 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_span.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_span.h index 00501e823..0d59c8e2f 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_span.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_span.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_span.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_SPAN_H #define _FFB_SPAN_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c index b083533e3..2d6d5c23a 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_state.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_state.c,v 1.1 2000/06/20 05:08:39 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_state.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_state.h index 4221b503a..12f932948 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_state.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_state.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_state.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_STATE_H #define _FFB_STATE_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c index 5292973c4..fb2088862 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.c,v 1.1 2000/06/20 05:08:39 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h index af161e7c1..1982625bb 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_stencil.h,v 1.1 2000/06/20 05:08:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_STENCIL_H #define _FFB_STENCIL_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c index 1e60b4d5d..c0e3083be 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.c,v 1.1 2000/06/20 05:08:40 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h index 0fffb3d79..05d6f8432 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tris.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_TRIS_H #define _FFB_TRIS_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h index ba7312238..3954fb192 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_tritmp.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */ +/* $XFree86$ */ static void TAG(ffb_triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint pv) { diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c index c48b06082..2797e1349 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.c,v 1.1 2000/06/20 05:08:40 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h index 29051bdb7..77307542e 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_vb.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_VB_H #define _FFB_VB_H diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c b/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c index 021da998d..1ce5c6c40 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.c,v 1.1 2000/06/20 05:08:40 dawes Exp $ +/* $XFree86$ * * GLX Hardware Device Driver for Sun Creator/Creator3D * Copyright (C) 2000 David S. Miller diff --git a/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h b/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h index 4eb8ff4f0..ad615bcd4 100644 --- a/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h +++ b/xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/ffb/ffb_xmesa.h,v 1.1 2000/06/20 05:08:40 dawes Exp $ */ +/* $XFree86$ */ #ifndef _FFB_XMESA_H_ #define _FFB_XMESA_H_ diff --git a/xc/lib/GL/mesa/src/drv/gamma/Imakefile b/xc/lib/GL/mesa/src/drv/gamma/Imakefile index 2ce5519c1..535d63fda 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/Imakefile +++ b/xc/lib/GL/mesa/src/drv/gamma/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.11 2000/06/25 14:44:26 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.12tsi Exp $ #include <Threads.tmpl> @@ -19,12 +19,11 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -I$(TOP)/include -I$(TOP)/include/GL \ -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \ -I$(XF86DRIVERSRC)/glint \ - -I../../../include -I../.. -I../../X -I../common \ - -I$(XF86OSSRC)/linux/drm/kernel + -I../../../include -I../.. -I../../X -I../common #endif -MESA_INCLUDES = -I. -I.. -I../../include - +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_client.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_client.h index 36521c9ab..2d6a23fd9 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_client.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_client.h @@ -31,7 +31,7 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_client.h,v 1.2 2000/02/23 04:46:41 martin Exp $ + * $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_client.h,v 1.1 1999/06/14 07:31:12 dawes Exp $ * */ diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c index 8c1293ab6..93d604f3c 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c,v 1.6 2000/06/17 00:02:55 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.c,v 1.5 2000/05/10 18:55:27 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h index 37fd75eca..036bf4998 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h,v 1.4 2000/03/02 16:07:36 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_gl.h,v 1.3 2000/02/23 04:46:43 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_init.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_init.c index 1bb9e2361..44fe0dbc3 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_init.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_init.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.c,v 1.2 2000/02/23 04:46:43 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.c,v 1.1 1999/06/14 07:31:15 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_init.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_init.h index 6714bbc26..e8fd5a0df 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_init.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_init.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.h,v 1.3 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_init.h,v 1.2 2000/02/23 04:46:43 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c index c60dec70d..e3b0a3bfa 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c,v 1.5 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_inithw.c,v 1.4 2000/05/10 18:55:27 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h index 124722170..c458bf642 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h,v 1.4 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_macros.h,v 1.3 2000/02/23 04:46:44 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c index 8d340ad09..17220fbb4 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c,v 1.3 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_matrix.c,v 1.2 2000/02/23 04:46:44 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_region.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_region.h index f7a7826ce..4fe716051 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_region.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_region.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_region.h,v 1.2 2000/02/23 04:46:45 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_region.h,v 1.1 1999/06/14 07:31:16 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h index 85c2b925a..b13dbdba5 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h,v 1.3 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_regs.h,v 1.2 2000/02/23 04:46:45 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c index 3a0f1cafb..ffa437ed2 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.3 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.c,v 1.2 2000/02/23 04:46:45 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h index 83f754884..c10ec1f9e 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h,v 1.2 2000/02/23 04:46:45 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_texture.h,v 1.1 1999/06/14 07:31:17 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c b/xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c index f10f5f038..c7bb60d9e 100644 --- a/xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c,v 1.6 2000/06/17 00:02:56 martin Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_xmesa.c,v 1.5 2000/05/10 18:55:27 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/i810/Imakefile b/xc/lib/GL/mesa/src/drv/i810/Imakefile index abf1e5960..9abab65d6 100644 --- a/xc/lib/GL/mesa/src/drv/i810/Imakefile +++ b/xc/lib/GL/mesa/src/drv/i810/Imakefile @@ -1,3 +1,4 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.8 2000/08/24 22:20:07 tsi Exp $ #include <Threads.tmpl> @@ -11,13 +12,6 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif -#if defined(LinuxArchitecture) -OS_SUBDIR = linux -#endif -#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture) -OS_SUBDIR = bsd -#endif - #if BuildXF86DRI DRI_DEFINES = GlxDefines -DDRIVERTS DRI_INCLUDES = -I../../../../dri -I../../../../glx \ @@ -25,12 +19,11 @@ OS_SUBDIR = bsd -I$(TOP)/include -I$(TOP)/include/GL \ -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \ -I$(XF86DRIVERSRC)/i810 \ - -I../../../include -I../.. -I../common -I../../X \ - -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel + -I../../../include -I../.. -I../common -I../../X #endif -MESA_INCLUDES = -I. -I.. -I../../include - +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) @@ -52,6 +45,13 @@ MESA_INCLUDES = -I. -I.. -I../../include ../../../../dri/drm/xf86drmRandom.o \ ../../../../dri/drm/xf86drmSL.o +#ifdef GlxSoProf + HIOBJS = ../../../../highpc.o + LOOBJS = ../../../../lowpc.o +#else + HIOBJS = + LOOBJS = +#endif I810SRCS = i810_xmesa.c \ i810dd.c \ @@ -263,8 +263,10 @@ XCOMM Disabling 3Dnow code for the time being. COMMONSRCS = ../common/mm.c ../common/hwlog.c COMMONOBJS = ../common/mm.o ../common/hwlog.o - SRCS = $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) $(COMMONSRCS) $(I810SRCS) - OBJS = $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) $(COMMONOBJS) $(I810OBJS) + SRCS = $(LOSRCS) $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) \ + $(COMMONSRCS) $(I810SRCS) $(HISRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) \ + $(COMMONOBJS) $(I810OBJS) $(HIOBJS) REQUIREDLIBS += -lm #if !GlxBuiltInI810 @@ -292,6 +294,14 @@ ALL_OBJS = $(OBJS) ALL_DEPS = DONE SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS)) InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _i810_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),$(ALL_DEPS),$(ALL_OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif #endif + + DependTarget() diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h b/xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h index 5c2548280..65d89b849 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810_3d_reg.h @@ -1,4 +1,4 @@ - +/* $XFree86$ */ #ifndef I810_3D_REG_H #define I810_3D_REG_H @@ -110,6 +110,8 @@ #define LCS_LINEWIDTH_SHIFT 12 #define LCS_LINEWIDTH_0_5 (0x1<<12) #define LCS_LINEWIDTH_1_0 (0x2<<12) +#define LCS_LINEWIDTH_2_0 (0x4<<12) +#define LCS_LINEWIDTH_3_0 (0x6<<12) #define LCS_UPDATE_ALPHA_INTERP (0x1<<11) #define LCS_ALPHA_FLAT (0x0<<10) #define LCS_ALPHA_INTERP (0x1<<10) @@ -653,4 +655,18 @@ typedef struct { #define I810PACKCOLOR565(r,g,b) \ ((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3)) + +#define I810_VFMT_T0 (GFX_OP_VERTEX_FMT | \ + VF_TEXCOORD_COUNT_1 | \ + VF_SPEC_FOG_ENABLE | \ + VF_RGBA_ENABLE | \ + VF_XYZW) + +#define I810_VFMT_T0T1 (GFX_OP_VERTEX_FMT | \ + VF_TEXCOORD_COUNT_2 | \ + VF_SPEC_FOG_ENABLE | \ + VF_RGBA_ENABLE | \ + VF_XYZW) + + #endif diff --git a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c index 63d8f5826..fbc35c1c4 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810_xmesa.c @@ -339,6 +339,12 @@ GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis, ctx->Const.MaxTextureSize = 1<<10; } + ctx->Const.MinLineWidth = 1.0; + ctx->Const.MinLineWidthAA = 1.0; + ctx->Const.MaxLineWidth = 3.0; + ctx->Const.MaxLineWidthAA = 3.0; + ctx->Const.LineWidthGranularity = 1.0; + /* Dri stuff */ @@ -381,6 +387,7 @@ GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis, ctx->Driver.TriangleCaps = (DD_TRI_CULL| DD_TRI_LIGHT_TWOSIDE| + DD_LIGHTING_CULL| DD_TRI_STIPPLE| DD_TRI_OFFSET); @@ -480,7 +487,6 @@ void i810XMesaSetFrontClipRects( i810ContextPtr imesa ) imesa->drawX = dPriv->x; imesa->drawY = dPriv->y; - imesa->drawMap = (char *)imesa->driScreen->pFB; i810EmitDrawingRectangle( imesa ); } @@ -511,7 +517,6 @@ void i810XMesaSetBackClipRects( i810ContextPtr imesa ) imesa->drawY = dPriv->backY; } - imesa->drawMap = imesa->i810Screen->back.map; i810EmitDrawingRectangle( imesa ); imesa->dirty |= I810_UPLOAD_CLIPRECTS; diff --git a/xc/lib/GL/mesa/src/drv/i810/i810context.h b/xc/lib/GL/mesa/src/drv/i810/i810context.h index 1e0bc560f..9738190f2 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810context.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810context.h @@ -21,7 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ - +/* $XFree86$ */ #ifndef I810CONTEXT_INC #define I810CONTEXT_INC @@ -54,6 +54,7 @@ typedef struct i810_texture_object_t *i810TextureObjectPtr; #define I810_FALLBACK_COLORMASK 0x8 #define I810_FALLBACK_STIPPLE 0x10 #define I810_FALLBACK_SPECULAR 0x20 +#define I810_FALLBACK_LOGICOP 0x40 @@ -96,6 +97,7 @@ struct i810_context_t { */ GLuint Setup[I810_CTX_SETUP_SIZE]; GLuint BufferSetup[I810_DEST_SETUP_SIZE]; + int vertsize; /* Support for CVA and the fast paths. diff --git a/xc/lib/GL/mesa/src/drv/i810/i810dd.c b/xc/lib/GL/mesa/src/drv/i810/i810dd.c index 73e518fb8..951903f50 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810dd.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810dd.c @@ -21,7 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810dd.c,v 1.3 2000/06/22 16:59:24 tsi Exp $ */ +/* $XFree86$ */ #include "types.h" #include "vbrender.h" diff --git a/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c b/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c index 3e4887619..ed8f4a854 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810fastpath.c @@ -21,6 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +/* $XFree86$ */ #include <stdio.h> @@ -50,9 +51,9 @@ struct i810_fast_tab { -#define POINT(x) i810_draw_point(imesa, &ivert[x].v, psize) -#define LINE(x,y) i810_draw_line(imesa, &ivert[x].v, &ivert[y].v, lwidth) -#define TRI(x,y,z) i810_draw_triangle(imesa, &ivert[x].v, &ivert[y].v, &ivert[z].v) +#define POINT(x) i810_draw_point(imesa, &ivert[x], psize) +#define LINE(x,y) i810_draw_line(imesa, &ivert[x], &ivert[y] ) +#define TRI(x,y,z) i810_draw_triangle(imesa, &ivert[x], &ivert[y], &ivert[z]) @@ -94,9 +95,8 @@ do { \ const GLuint *elt = VB->EltPtr->data; \ GLcontext *ctx = VB->ctx; \ i810ContextPtr imesa = I810_CONTEXT(ctx); \ - const GLfloat lwidth = ctx->Line.Width; \ const GLfloat psize = ctx->Point.Size; \ - (void) lwidth; (void)psize; (void) ivert; + (void)psize; (void) ivert; #define TAG(x) x##_i810_smooth_indirect diff --git a/xc/lib/GL/mesa/src/drv/i810/i810ioctl.c b/xc/lib/GL/mesa/src/drv/i810/i810ioctl.c index 8a31c94ff..ad26e5224 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810ioctl.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810ioctl.c @@ -1,7 +1,8 @@ +/* $XFree86$ */ + #include <stdio.h> #include <unistd.h> - #include "types.h" #include "pb.h" #include "dd.h" @@ -14,7 +15,7 @@ #include "drm.h" #include <sys/ioctl.h> -static drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa ) +drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa ) { drm_i810_dma_t dma; drmBufPtr buf; @@ -43,7 +44,7 @@ static drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa ) buf = &(imesa->i810Screen->bufs->list[dma.request_idx]); buf->idx = dma.request_idx; - buf->used = 0; + buf->used = 4; /* leave room for instruction header */ buf->total = dma.request_size; if(imesa->i810Screen->use_copy_buf != 1) @@ -428,45 +429,29 @@ void i810FlushVerticesLocked( i810ContextPtr imesa ) } -GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords, GLuint prim ) +GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords ) { GLuint *start; if (!imesa->vertex_dma_buffer) { - if (I810_DEBUG&DEBUG_VERBOSE_IOCTL) - fprintf(stderr, "i810AllocPrimitiveVerts -- get buf\n"); LOCK_HARDWARE(imesa); imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa ); - imesa->vertex_dma_buffer->used = 4; - imesa->vertex_prim = prim; UNLOCK_HARDWARE(imesa); } - else if (imesa->vertex_prim != prim || - imesa->vertex_dma_buffer->used + dwords * 4 > + else if (imesa->vertex_dma_buffer->used + dwords * 4 > imesa->vertex_dma_buffer->total) { - if (I810_DEBUG&DEBUG_VERBOSE_IOCTL) - fprintf(stderr, "i810AllocPrimitiveVerts -- flush\n"); - i810FlushVertices( imesa ); LOCK_HARDWARE(imesa); + i810FlushVerticesLocked( imesa ); imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa ); - imesa->vertex_dma_buffer->used = 4; - imesa->vertex_prim = prim; UNLOCK_HARDWARE(imesa); } - - if (0) - fprintf(stderr, "i810AllocPrimitiveVerts %d, buf %d, used %d\n", - dwords, imesa->vertex_dma_buffer->idx, - imesa->vertex_dma_buffer->used); - start = (GLuint *)((char *)imesa->vertex_dma_buffer->address + imesa->vertex_dma_buffer->used); imesa->vertex_dma_buffer->used += dwords * 4; - return start; } diff --git a/xc/lib/GL/mesa/src/drv/i810/i810ioctl.h b/xc/lib/GL/mesa/src/drv/i810/i810ioctl.h index 6e698dd61..51ea4ef5a 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810ioctl.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810ioctl.h @@ -1,10 +1,12 @@ +/* $XFree86$ */ + #ifndef MGA_IOCTL_H #define MGA_IOCTL_H #include "i810context.h" -GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords, GLuint prim ); +GLuint *i810AllocDwords( i810ContextPtr imesa, int dwords ); void i810GetGeneralDmaBufferLocked( i810ContextPtr mmesa ); @@ -34,5 +36,34 @@ GLbitfield i810Clear( GLcontext *ctx, GLbitfield mask, GLboolean all, if (imesa->vertex_dma_buffer) i810FlushVertices(imesa); \ } while (0) +extern drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa ); + +static __inline +GLuint *i810AllocDwordsInline( i810ContextPtr imesa, int dwords ) +{ + int bytes = dwords * 4; + GLuint *start; + + if (!imesa->vertex_dma_buffer) + { + LOCK_HARDWARE(imesa); + imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa ); + UNLOCK_HARDWARE(imesa); + } + else if (imesa->vertex_dma_buffer->used + bytes > + imesa->vertex_dma_buffer->total) + { + LOCK_HARDWARE(imesa); + i810FlushVerticesLocked( imesa ); + imesa->vertex_dma_buffer = i810_get_buffer_ioctl( imesa ); + UNLOCK_HARDWARE(imesa); + } + + start = (GLuint *)((char *)imesa->vertex_dma_buffer->address + + imesa->vertex_dma_buffer->used); + + imesa->vertex_dma_buffer->used += bytes; + return start; +} #endif diff --git a/xc/lib/GL/mesa/src/drv/i810/i810state.c b/xc/lib/GL/mesa/src/drv/i810/i810state.c index 3103c326c..0607edfea 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810state.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810state.c @@ -65,8 +65,8 @@ static void i810DDBlendEquation(GLcontext *ctx, GLenum mode) { if (mode != GL_FUNC_ADD_EXT) { ctx->Color.BlendEquation = GL_FUNC_ADD_EXT; - i810Error("Unsupported blend equation"); - exit(1); + if (0) fprintf(stderr, "Unsupported blend equation: %s\n", + gl_lookup_enum_by_nr(mode)); } } @@ -242,6 +242,20 @@ static void i810DDDither(GLcontext *ctx, GLboolean enable) { } +static void i810DDLogicOp( GLcontext *ctx, GLenum opcode ) +{ + if (ctx->Color.ColorLogicOpEnabled) + { + i810ContextPtr imesa = I810_CONTEXT(ctx); + + FLUSH_BATCH( imesa ); + + if (opcode == GL_COPY) + imesa->Fallback &= ~I810_FALLBACK_LOGICOP; + else + imesa->Fallback |= I810_FALLBACK_LOGICOP; + } +} static GLboolean i810DDSetDrawBuffer(GLcontext *ctx, GLenum mode ) { @@ -254,6 +268,7 @@ static GLboolean i810DDSetDrawBuffer(GLcontext *ctx, GLenum mode ) if (mode == GL_FRONT_LEFT) { imesa->drawMap = (char *)imesa->driScreen->pFB; + imesa->readMap = (char *)imesa->driScreen->pFB; imesa->BufferSetup[I810_DESTREG_DI1] = (imesa->i810Screen->fbOffset | imesa->i810Screen->backPitchBits); imesa->dirty |= I810_UPLOAD_BUFFERS; @@ -263,6 +278,7 @@ static GLboolean i810DDSetDrawBuffer(GLcontext *ctx, GLenum mode ) else if (mode == GL_BACK_LEFT) { imesa->drawMap = imesa->i810Screen->back.map; + imesa->readMap = imesa->i810Screen->back.map; imesa->BufferSetup[I810_DESTREG_DI1] = (imesa->i810Screen->backOffset | imesa->i810Screen->backPitchBits); imesa->dirty |= I810_UPLOAD_BUFFERS; @@ -352,6 +368,7 @@ static void i810DDReducedPrimitiveChange( GLcontext *ctx, GLenum prim ) imesa->Setup[I810_CTXREG_LCS] &= ~LCS_CULL_MASK; imesa->Setup[I810_CTXREG_ST1] &= ~ST1_ENABLE; imesa->Setup[I810_CTXREG_AA] &= ~AA_ENABLE; + imesa->vertex_prim = PR_TRIANGLES; switch (ctx->PB->primitive) { case GL_POLYGON: @@ -366,12 +383,10 @@ static void i810DDReducedPrimitiveChange( GLcontext *ctx, GLenum prim ) imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE; break; case GL_LINES: - imesa->Setup[I810_CTXREG_LCS] &= ~LCS_LINEWIDTH_0_5; - if (ctx->Line.SmoothFlag) { + if (ctx->Line.SmoothFlag) imesa->Setup[I810_CTXREG_AA] |= AA_ENABLE; - imesa->Setup[I810_CTXREG_LCS] |= LCS_LINEWIDTH_0_5; - } imesa->Setup[I810_CTXREG_LCS] |= LCS_CULL_DISABLE; + imesa->vertex_prim = PR_LINES; break; case GL_POINTS: if (ctx->Point.SmoothFlag) @@ -385,6 +400,21 @@ static void i810DDReducedPrimitiveChange( GLcontext *ctx, GLenum prim ) } +static void i810DDLineWidth( GLcontext *ctx, GLfloat widthf ) +{ + i810ContextPtr imesa = I810_CONTEXT( ctx ); + int width = (int)widthf; + + if (width > 3) width = 3; + if (width < 1) width = 1; + + imesa->Setup[I810_CTXREG_LCS] &= ~LCS_LINEWIDTH_3_0; + + if (width & 1) imesa->Setup[I810_CTXREG_LCS] |= LCS_LINEWIDTH_1_0; + if (width & 2) imesa->Setup[I810_CTXREG_LCS] |= LCS_LINEWIDTH_2_0; + + imesa->dirty |= I810_UPLOAD_CTX; +} /* ============================================================= * Color masks @@ -590,6 +620,13 @@ static void i810DDEnable(GLcontext *ctx, GLenum cap, GLboolean state) imesa->Setup[I810_CTXREG_MT] |= MT_TEXEL1_ENABLE; } break; + case GL_COLOR_LOGIC_OP: + case GL_INDEX_LOGIC_OP: + FLUSH_BATCH( imesa ); + imesa->Fallback &= ~I810_FALLBACK_LOGICOP; + if (state && ctx->Color.LogicOp != GL_COPY) + imesa->Fallback |= I810_FALLBACK_LOGICOP; + break; default: ; } @@ -713,11 +750,7 @@ void i810DDInitState( i810ContextPtr imesa ) memset(imesa->Setup, 0, sizeof(imesa->Setup)); - imesa->Setup[I810_CTXREG_VF] = (GFX_OP_VERTEX_FMT | - VF_TEXCOORD_COUNT_2 | - VF_SPEC_FOG_ENABLE | - VF_RGBA_ENABLE | - VF_XYZW); + imesa->Setup[I810_CTXREG_VF] = I810_VFMT_T0; imesa->Setup[I810_CTXREG_MT] = (GFX_OP_MAP_TEXELS | MT_UPDATE_TEXEL1_STATE | @@ -925,20 +958,16 @@ void i810DDInitState( i810ContextPtr imesa ) if (imesa->glCtx->Color.DriverDrawBuffer == GL_BACK_LEFT) { imesa->drawMap = i810Screen->back.map; + imesa->readMap = i810Screen->back.map; imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->backOffset | i810Screen->backPitchBits); } else { imesa->drawMap = (char *)imesa->driScreen->pFB; + imesa->readMap = (char *)imesa->driScreen->pFB; imesa->BufferSetup[I810_DESTREG_DI1] = (i810Screen->fbOffset | i810Screen->backPitchBits); } - if (imesa->glCtx->Color.DriverDrawBuffer == GL_BACK_LEFT) { - imesa->readMap = i810Screen->back.map; - } else { - imesa->readMap = (char *)imesa->driScreen->pFB; - } - imesa->BufferSetup[I810_DESTREG_DV0] = GFX_OP_DESTBUFFER_VARS; imesa->BufferSetup[I810_DESTREG_DV1] = (DV_HORG_BIAS_OGL | DV_VORG_BIAS_OGL | @@ -1006,6 +1035,8 @@ void i810DDInitStateFuncs(GLcontext *ctx) ctx->Driver.RenderFinish = 0; ctx->Driver.PolygonStipple = i810DDPolygonStipple; ctx->Driver.LineStipple = 0; + ctx->Driver.LineWidth = i810DDLineWidth; + ctx->Driver.LogicOpcode = i810DDLogicOp; ctx->Driver.SetReadBuffer = i810DDSetReadBuffer; ctx->Driver.SetDrawBuffer = i810DDSetDrawBuffer; ctx->Driver.Color = i810DDSetColor; diff --git a/xc/lib/GL/mesa/src/drv/i810/i810tris.c b/xc/lib/GL/mesa/src/drv/i810/i810tris.c index c601ca492..ff2ae77f6 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810tris.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810tris.c @@ -22,6 +22,7 @@ * * */ +/* $XFree86$ */ #include <stdio.h> #include <math.h> @@ -44,13 +45,10 @@ (to)[3] = (from)[3]; \ } - - -static triangle_func tri_tab[0x20]; -static quad_func quad_tab[0x20]; -static line_func line_tab[0x20]; -static points_func points_tab[0x20]; - +static triangle_func tri_tab[0x10]; +static quad_func quad_tab[0x10]; +static line_func line_tab[0x10]; +static points_func points_tab[0x10]; #define IND (0) #define TAG(x) x @@ -60,30 +58,32 @@ static points_func points_tab[0x20]; #define TAG(x) x##_flat #include "i810tritmp.h" -#define IND (I810_OFFSET_BIT) /* wide */ +#define IND (I810_OFFSET_BIT) #define TAG(x) x##_offset #include "i810tritmp.h" -#define IND (I810_OFFSET_BIT|I810_FLAT_BIT) /* wide|flat */ +#define IND (I810_OFFSET_BIT|I810_FLAT_BIT) #define TAG(x) x##_offset_flat #include "i810tritmp.h" -#define IND (I810_TWOSIDE_BIT) /* stipple */ +#define IND (I810_TWOSIDE_BIT) #define TAG(x) x##_twoside #include "i810tritmp.h" -#define IND (I810_TWOSIDE_BIT|I810_FLAT_BIT) /* stipple|flat */ +#define IND (I810_TWOSIDE_BIT|I810_FLAT_BIT) #define TAG(x) x##_twoside_flat #include "i810tritmp.h" -#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT) /* stipple|wide */ +#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT) #define TAG(x) x##_twoside_offset #include "i810tritmp.h" -#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT|I810_FLAT_BIT) /* stip|wide|flat*/ +#define IND (I810_TWOSIDE_BIT|I810_OFFSET_BIT|I810_FLAT_BIT) #define TAG(x) x##_twoside_offset_flat #include "i810tritmp.h" + + void i810DDTrifuncInit() { init(); @@ -98,62 +98,68 @@ void i810DDTrifuncInit() +#define ALL_FALLBACK (DD_MULTIDRAW | DD_SELECT | DD_FEEDBACK) +#define POINT_FALLBACK (ALL_FALLBACK) +#define LINE_FALLBACK (ALL_FALLBACK | DD_LINE_STIPPLE) +#define TRI_FALLBACK (ALL_FALLBACK | DD_TRI_UNFILLED) +#define ANY_FALLBACK (POINT_FALLBACK|LINE_FALLBACK|TRI_FALLBACK|DD_TRI_STIPPLE) +#define ANY_RASTER_FLAGS (DD_FLATSHADE|DD_TRI_LIGHT_TWOSIDE|DD_TRI_OFFSET) -void i810DDChooseRenderState( GLcontext *ctx ) +void i810DDChooseRenderState(GLcontext *ctx) { - i810ContextPtr imesa = I810_CONTEXT( ctx ); - GLuint flags = ctx->TriangleCaps; - - imesa->IndirectTriangles = 0; - - if (flags) { - GLuint ind = 0; - GLuint shared = 0; - - if (flags & DD_FLATSHADE) shared |= I810_FLAT_BIT; - if (flags & DD_MULTIDRAW) shared |= I810_FALLBACK_BIT; - if (flags & DD_SELECT) shared |= I810_FALLBACK_BIT; - if (flags & DD_FEEDBACK) shared |= I810_FALLBACK_BIT; - if (flags & DD_STENCIL) shared |= I810_FALLBACK_BIT; - - imesa->renderindex = shared; - imesa->PointsFunc = points_tab[shared]; - - ind = shared; - if (flags & DD_LINE_WIDTH) ind |= I810_WIDE_LINE_BIT; - if (flags & DD_LINE_STIPPLE) ind |= I810_FALLBACK_BIT; - - imesa->renderindex |= ind; - imesa->LineFunc = line_tab[ind]; - if (ind & I810_FALLBACK_BIT) - imesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE; - - ind = shared; - if (flags & DD_TRI_OFFSET) ind |= I810_OFFSET_BIT; - if (flags & DD_TRI_LIGHT_TWOSIDE) ind |= I810_TWOSIDE_BIT; - if (flags & DD_TRI_UNFILLED) ind |= I810_FALLBACK_BIT; - if ((flags & DD_TRI_STIPPLE) && - (ctx->IndirectTriangles & DD_TRI_STIPPLE)) ind |= I810_FALLBACK_BIT; - - imesa->renderindex |= ind; - imesa->TriangleFunc = tri_tab[ind]; - imesa->QuadFunc = quad_tab[ind]; - if (ind & I810_FALLBACK_BIT) - imesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE|DD_QUAD_SW_RASTERIZE); - } - else if (imesa->renderindex) - { - imesa->renderindex = 0; - imesa->PointsFunc = points_tab[0]; - imesa->LineFunc = line_tab[0]; - imesa->TriangleFunc = tri_tab[0]; - imesa->QuadFunc = quad_tab[0]; - } - - - if (I810_DEBUG&DEBUG_VERBOSE_API) { - gl_print_tri_caps("tricaps", ctx->TriangleCaps); - } + i810ContextPtr imesa = I810_CONTEXT(ctx); + GLuint flags = ctx->TriangleCaps; + CARD32 index = 0; + + if (imesa->Fallback) { + imesa->renderindex = I810_FALLBACK_BIT; + return; + } + + if (flags & ANY_RASTER_FLAGS) { + if (flags & DD_FLATSHADE) index |= I810_FLAT_BIT; + if (flags & DD_TRI_LIGHT_TWOSIDE) index |= I810_TWOSIDE_BIT; + if (flags & DD_TRI_OFFSET) index |= I810_OFFSET_BIT; + } + + imesa->PointsFunc = points_tab[index]; + imesa->LineFunc = line_tab[index]; + imesa->TriangleFunc = tri_tab[index]; + imesa->QuadFunc = quad_tab[index]; + imesa->renderindex = index; + imesa->IndirectTriangles = 0; + + if (flags & ANY_FALLBACK) { + if (flags & POINT_FALLBACK) { + imesa->renderindex |= I810_FALLBACK_BIT; + imesa->PointsFunc = 0; + imesa->IndirectTriangles |= DD_POINT_SW_RASTERIZE; + } + + if (flags & LINE_FALLBACK) { + imesa->renderindex |= I810_FALLBACK_BIT; + imesa->LineFunc = 0; + imesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE; + } + + if (flags & TRI_FALLBACK) { + imesa->renderindex |= I810_FALLBACK_BIT; + imesa->TriangleFunc = 0; + imesa->QuadFunc = 0; + imesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | + DD_QUAD_SW_RASTERIZE); + } + /* Special cases: + */ + if ((flags & DD_TRI_STIPPLE) && + (ctx->IndirectTriangles & DD_TRI_STIPPLE)) { + imesa->renderindex |= I810_FALLBACK_BIT; + imesa->TriangleFunc = 0; + imesa->QuadFunc = 0; + imesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | + DD_QUAD_SW_RASTERIZE); + } + } } diff --git a/xc/lib/GL/mesa/src/drv/i810/i810tris.h b/xc/lib/GL/mesa/src/drv/i810/i810tris.h index 3b3843683..95a98f72d 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810tris.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810tris.h @@ -22,158 +22,138 @@ * * */ +/* $XFree86$ */ #ifndef I810TRIS_INC #define I810TRIS_INC #include "types.h" #include "i810ioctl.h" +#include "i810vb.h" extern void i810PrintRenderState( const char *msg, GLuint state ); extern void i810DDChooseRenderState(GLcontext *ctx); extern void i810DDTrifuncInit( void ); -/* shared */ #define I810_FLAT_BIT 0x1 - -/* triangle */ #define I810_OFFSET_BIT 0x2 #define I810_TWOSIDE_BIT 0x4 +#define I810_FALLBACK_BIT 0x8 -/* line */ -#define I810_WIDE_LINE_BIT 0x2 -#define I810_STIPPLE_LINE_BIT 0x4 - -/* shared */ -#define I810_FALLBACK_BIT 0x8 - - - - - -static i810_vertex __inline__ *i810AllocTriangles( i810ContextPtr imesa, int nr) -{ - GLuint *start = i810AllocDwords( imesa, 30*nr, PR_TRIANGLES ); - return (i810_vertex *)start; -} - -static i810_vertex __inline__ *i810AllocLine( i810ContextPtr imesa ) -{ - GLuint *start = i810AllocDwords( imesa, 20, PR_LINES ); - return (i810_vertex *)start; -} - -static i810_vertex __inline__ *i810AllocRect( i810ContextPtr imesa ) -{ - GLuint *start = i810AllocDwords( imesa, 30, PR_RECTS ); - return (i810_vertex *)start; -} static void __inline__ i810_draw_triangle( i810ContextPtr imesa, - i810_vertex *v0, - i810_vertex *v1, - i810_vertex *v2 ) + i810VertexPtr v0, + i810VertexPtr v1, + i810VertexPtr v2 ) { - i810_vertex *wv = i810AllocTriangles( imesa, 1 ); - wv[0] = *v0; - wv[1] = *v1; - wv[2] = *v2; + GLuint vertsize = imesa->vertsize; + GLuint *vb = i810AllocDwordsInline( imesa, 3 * vertsize ); + int j; + +#if 1 + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "D" ((long)vb), "S" ((long)v0) + : "memory" ); + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "S" ((long)v1) + : "memory" ); + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "S" ((long)v2) + : "memory" ); +#else + + for (j = 0 ; j < vertsize ; j++) + vb[j] = v0->ui[j]; + + vb += vertsize; + for (j = 0 ; j < vertsize ; j++) + vb[j] = v1->ui[j]; + + vb += vertsize; + for (j = 0 ; j < vertsize ; j++) + vb[j] = v2->ui[j]; +#endif } static __inline__ void i810_draw_point( i810ContextPtr imesa, - i810_vertex *tmp, float sz ) + i810VertexPtr tmp, + float sz ) { - i810_vertex *wv = i810AllocTriangles( imesa, 2 ); - - wv[0] = *tmp; - wv[0].x = tmp->x - sz; - wv[0].y = tmp->y - sz; - - wv[1] = *tmp; - wv[1].x = tmp->x + sz; - wv[1].y = tmp->y - sz; - - wv[2] = *tmp; - wv[2].x = tmp->x + sz; - wv[2].y = tmp->y + sz; - - wv[3] = *tmp; - wv[3].x = tmp->x + sz; - wv[3].y = tmp->y + sz; - - wv[4] = *tmp; - wv[4].x = tmp->x - sz; - wv[4].y = tmp->y + sz; - - wv[5] = *tmp; - wv[5].x = tmp->x - sz; - wv[5].y = tmp->y - sz; - -} - - -static __inline__ void i810_draw_line_line( i810ContextPtr imesa, - i810_vertex *tmp0, - i810_vertex *tmp1 ) -{ - i810_vertex *wv = i810AllocLine( imesa ); - wv[0] = *tmp0; - wv[1] = *tmp1; -} - -static __inline__ void i810_draw_tri_line( i810ContextPtr imesa, - i810_vertex *tmp0, - i810_vertex *tmp1, - float width ) -{ - i810_vertex *wv = i810AllocTriangles( imesa, 2 ); - - float dx, dy, ix, iy; - - dx = tmp0->x - tmp1->x; - dy = tmp0->y - tmp1->y; - - ix = width * .5; iy = 0; - if (dx * dx > dy * dy) { - iy = ix; ix = 0; - } - - wv[0] = *tmp0; - wv[0].x = tmp0->x - ix; - wv[0].y = tmp0->y - iy; - - wv[1] = *tmp1; - wv[1].x = tmp1->x + ix; - wv[1].y = tmp1->y + iy; - - wv[2] = *tmp0; - wv[2].x = tmp0->x + ix; - wv[2].y = tmp0->y + iy; - - wv[3] = *tmp0; - wv[3].x = tmp0->x - ix; - wv[3].y = tmp0->y - iy; - - wv[4] = *tmp1; - wv[4].x = tmp1->x - ix; - wv[4].y = tmp1->y - iy; - - wv[5] = *tmp1; - wv[5].x = tmp1->x + ix; - wv[5].y = tmp1->y + iy; + int vertsize = imesa->vertsize; + GLuint *vb = i810AllocDwordsInline( imesa, 6 * vertsize ); + int j; + + *(float *)&vb[0] = tmp->v.x - sz; + *(float *)&vb[1] = tmp->v.y - sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; + vb += vertsize; + + *(float *)&vb[0] = tmp->v.x + sz; + *(float *)&vb[1] = tmp->v.y - sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; + vb += vertsize; + + *(float *)&vb[0] = tmp->v.x + sz; + *(float *)&vb[1] = tmp->v.y + sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; + vb += vertsize; + + *(float *)&vb[0] = tmp->v.x + sz; + *(float *)&vb[1] = tmp->v.y + sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; + vb += vertsize; + + *(float *)&vb[0] = tmp->v.x - sz; + *(float *)&vb[1] = tmp->v.y + sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; + vb += vertsize; + + *(float *)&vb[0] = tmp->v.x - sz; + *(float *)&vb[1] = tmp->v.y - sz; + for (j = 2 ; j < vertsize ; j++) + vb[j] = tmp->ui[j]; } static __inline__ void i810_draw_line( i810ContextPtr imesa, - i810_vertex *tmp0, - i810_vertex *tmp1, - float width ) + i810VertexPtr v0, + i810VertexPtr v1 ) { - i810_draw_line_line( imesa, tmp0, tmp1 ); + GLuint vertsize = imesa->vertsize; + GLuint *vb = i810AllocDwordsInline( imesa, 2 * vertsize ); + +#if defined(USE_X86_ASM) + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "D" ((long)vb), "S" ((long)v0) + : "memory" ); + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "S" ((long)v1) + : "memory" ); +#else + int j; + + for (j = 0 ; j < vertsize ; j++) + vb[j] = v0->ui[j]; + + vb += vertsize; + for (j = 0 ; j < vertsize ; j++) + vb[j] = v1->ui[j]; +#endif } + #endif diff --git a/xc/lib/GL/mesa/src/drv/i810/i810tritmp.h b/xc/lib/GL/mesa/src/drv/i810/i810tritmp.h index 9d6b43d93..4b11fa2c0 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810tritmp.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810tritmp.h @@ -1,96 +1,104 @@ +/* $XFree86$ */ -static __inline__ void TAG(triangle)( GLcontext *ctx, GLuint e0, - GLuint e1, GLuint e2, GLuint pv ) +static __inline void TAG(triangle)(GLcontext *ctx, + GLuint e0, GLuint e1, GLuint e2, + GLuint pv) { - i810ContextPtr imesa = I810_CONTEXT(ctx); - struct vertex_buffer *VB = ctx->VB; - i810VertexPtr i810VB = I810_DRIVER_DATA(VB)->verts; - const i810_vertex *v0 = &i810VB[e0].v; - const i810_vertex *v1 = &i810VB[e1].v; - const i810_vertex *v2 = &i810VB[e2].v; + i810ContextPtr i810ctx = I810_CONTEXT(ctx); + struct vertex_buffer *VB = ctx->VB; + i810VertexPtr i810verts = I810_DRIVER_DATA(VB)->verts; + i810Vertex *v[3]; #if (IND & I810_OFFSET_BIT) - GLfloat offset = ctx->Polygon.OffsetUnits * 1.0/0x10000; + GLfloat offset; + GLfloat z[3]; #endif -#if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT)) - int c0 = *(int *)&i810VB[pv].v.color; - int c1 = c0; - int c2 = c0; +#if (IND & (I810_TWOSIDE_BIT | I810_FLAT_BIT)) + GLuint c[3]; #endif + v[0] = &i810verts[e0]; + v[1] = &i810verts[e1]; + v[2] = &i810verts[e2]; + +#if (IND & (I810_TWOSIDE_BIT | I810_FLAT_BIT)) + c[0] = v[0]->ui[4]; + c[1] = v[1]->ui[4]; + c[2] = v[2]->ui[4]; +#endif -#if (IND & (I810_TWOSIDE_BIT|I810_OFFSET_BIT)) + +#if (IND & (I810_TWOSIDE_BIT | I810_OFFSET_BIT)) { - GLfloat ex = v0->x - v2->x; - GLfloat ey = v0->y - v2->y; - GLfloat fx = v1->x - v2->x; - GLfloat fy = v1->y - v2->y; - GLfloat c = ex*fy-ey*fx; - -#if (IND & I810_TWOSIDE_BIT) + GLfloat ex = v[0]->v.x - v[2]->v.x; + GLfloat ey = v[0]->v.y - v[2]->v.y; + GLfloat fx = v[1]->v.x - v[2]->v.x; + GLfloat fy = v[1]->v.y - v[2]->v.y; + GLfloat cc = ex*fy - ey*fx; + +#if (IND & I810_TWOSIDE_BIT) { - GLuint facing = (c>0.0) ^ ctx->Polygon.FrontBit; + GLuint facing = (cc > 0.0) ^ ctx->Polygon.FrontBit; GLubyte (*vbcolor)[4] = VB->Color[facing]->data; if (IND & I810_FLAT_BIT) { - I810_COLOR((char *)&c0,vbcolor[pv]); - c2 = c1 = c0; + I810_COLOR((char *)&v[0]->ui[4], vbcolor[pv]); + v[2]->ui[4] = v[1]->ui[4] = v[0]->ui[4]; } else { - I810_COLOR((char *)&c0,vbcolor[e0]); - I810_COLOR((char *)&c1,vbcolor[e1]); - I810_COLOR((char *)&c2,vbcolor[e2]); + I810_COLOR((char *)&v[0]->ui[4], vbcolor[e0]); + I810_COLOR((char *)&v[1]->ui[4], vbcolor[e1]); + I810_COLOR((char *)&v[2]->ui[4], vbcolor[e2]); } } #endif - -#if (IND & I810_OFFSET_BIT) + +#if (IND & I810_OFFSET_BIT) { - if (c * c > 1e-16) { - GLfloat factor = ctx->Polygon.OffsetFactor; - GLfloat ez = v0->z - v2->z; - GLfloat fz = v1->z - v2->z; - GLfloat a = ey*fz-ez*fy; - GLfloat b = ez*fx-ex*fz; - GLfloat ic = 1.0 / c; - GLfloat ac = a * ic; - GLfloat bc = b * ic; - if (ac<0.0F) ac = -ac; - if (bc<0.0F) bc = -bc; - offset += MAX2( ac, bc ) * factor; + offset = ctx->Polygon.OffsetUnits * 1.0/0x10000; + z[0] = v[0]->v.z; + z[1] = v[1]->v.z; + z[2] = v[2]->v.z; + if (cc * cc > 1e-16) { + GLfloat ez = z[0] - z[2]; + GLfloat fz = z[1] - z[2]; + GLfloat a = ey*fz - ez*fy; + GLfloat b = ez*fx - ex*fz; + GLfloat ic = 1.0 / cc; + GLfloat ac = a * ic; + GLfloat bc = b * ic; + if (ac < 0.0f) ac = -ac; + if (bc < 0.0f) bc = -bc; + offset += MAX2(ac, bc) * ctx->Polygon.OffsetFactor; } + v[0]->v.z += offset; + v[1]->v.z += offset; + v[2]->v.z += offset; } #endif } -#endif - - +#elif (IND & I810_FLAT_BIT) { - i810_vertex *wv = i810AllocTriangles( imesa, 1 ); - wv[0] = *v0; -#if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT)) - *((int *)(&wv[0].color)) = c0; -#endif -#if (IND & I810_OFFSET_BIT) - wv[0].z = v0->z + offset; + GLuint color = i810verts[pv].ui[4]; + v[0]->ui[4] = color; + v[1]->ui[4] = color; + v[2]->ui[4] = color; + } #endif + i810_draw_triangle( i810ctx, v[0], v[1], v[2] ); - wv[1] = *v1; -#if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT)) - *((int *)(&wv[1].color)) = c1; -#endif #if (IND & I810_OFFSET_BIT) - wv[1].z = v1->z + offset; + v[0]->v.z = z[0]; + v[1]->v.z = z[1]; + v[2]->v.z = z[2]; #endif - wv[2] = *v2; -#if (IND & (I810_FLAT_BIT|I810_TWOSIDE_BIT)) - *((int *)(&wv[2].color)) = c2; +#if (IND & (I810_FLAT_BIT | I810_TWOSIDE_BIT)) + v[0]->ui[4] = c[0]; + v[1]->ui[4] = c[1]; + v[2]->ui[4] = c[2]; #endif -#if (IND & I810_OFFSET_BIT) - wv[2].z = v2->z + offset; -#endif - } + } @@ -106,31 +114,39 @@ static void TAG(line)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv ) { i810ContextPtr imesa = I810_CONTEXT( ctx ); i810VertexPtr i810VB = I810_DRIVER_DATA(ctx->VB)->verts; - int tmp0, tmp1; - (void) tmp0; (void) tmp1; +#if (IND & (I810_TWOSIDE_BIT|I810_FLAT_BIT|I810_OFFSET_BIT)) + i810Vertex tmp0 = i810VB[v0]; + i810Vertex tmp1 = i810VB[v1]; - if (IND & I810_FLAT_BIT) { - tmp0 = *(int *)&i810VB[v0].v.color; - tmp1 = *(int *)&i810VB[v1].v.color; - i810VB[v0].v.color = i810VB[pv].v.color; - i810VB[v1].v.color = i810VB[pv].v.color; - } + if (IND & I810_TWOSIDE_BIT) { + GLubyte (*vbcolor)[4] = ctx->VB->ColorPtr->data; - if (IND & I810_WIDE_LINE_BIT) - { - i810_draw_tri_line( imesa, &i810VB[v0].v, &i810VB[v1].v, - ctx->Line.Width ); - } - else - { - i810_draw_line_line( imesa, &i810VB[v0].v, &i810VB[v1].v ); - } + if (IND & I810_FLAT_BIT) { + I810_COLOR((char *)&tmp0.v.color,vbcolor[pv]); + *(int *)&tmp1.v.color = *(int *)&tmp0.v.color; + } else { + I810_COLOR((char *)&tmp0.v.color,vbcolor[v0]); + I810_COLOR((char *)&tmp1.v.color,vbcolor[v1]); + } - if (IND & I810_FLAT_BIT) { - *(int *)&i810VB[v0].v.color = tmp0; - *(int *)&i810VB[v1].v.color = tmp1; - } + } else if (IND & I810_FLAT_BIT) { + *(int *)&tmp0.v.color = *(int *)&i810VB[pv].v.color; + *(int *)&tmp1.v.color = *(int *)&i810VB[pv].v.color; + } + + /* Relies on precomputed LineZoffset from vbrender.c + */ + if (IND & I810_OFFSET_BIT) { + GLfloat offset = ctx->LineZoffset * (1.0 / 0x10000); + tmp0.v.z += offset; + tmp1.v.z += offset; + } + + i810_draw_line( imesa, &tmp0, &tmp1 ); +#else + i810_draw_line( imesa, &i810VB[v0], &i810VB[v1] ); +#endif } @@ -148,8 +164,19 @@ static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last ) for(i=first;i<=last;i++) { if(VB->ClipMask[i]==0) { - i810_vertex *tmp = &i810VB[i].v; - i810_draw_point( imesa, tmp, sz ); + if (IND & I810_TWOSIDE_BIT) { + i810Vertex tmp0 = i810VB[i]; + if (IND & I810_TWOSIDE_BIT) { + GLubyte (*vbcolor)[4] = VB->ColorPtr->data; + I810_COLOR((char *)&tmp0.v.color, vbcolor[i]); + } + if (IND & I810_OFFSET_BIT) { + GLfloat offset = ctx->PointZoffset * (1.0 / 0x10000); + tmp0.v.z += offset; + } + i810_draw_point( imesa, &tmp0, sz ); + } else + i810_draw_point( imesa, &i810VB[i], sz ); } } } diff --git a/xc/lib/GL/mesa/src/drv/i810/i810vb.c b/xc/lib/GL/mesa/src/drv/i810/i810vb.c index 59b1d5ef8..13b7114ff 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810vb.c +++ b/xc/lib/GL/mesa/src/drv/i810/i810vb.c @@ -22,6 +22,7 @@ * * */ +/* $XFree86$ */ #include "i810context.h" #include "i810vb.h" @@ -261,16 +262,17 @@ void i810ChooseRasterSetupFunc(GLcontext *ctx) i810ContextPtr imesa = I810_CONTEXT( ctx ); int funcindex = (I810_WIN_BIT | I810_RGBA_BIT); - if (ctx->Texture.Enabled & 0xf) { - /* This doesn't work for non-RGBA textures - if (ctx->Texture.Unit[0].EnvMode == GL_REPLACE) - funcindex &= ~I810_RGBA_BIT; - */ - funcindex |= I810_TEX0_BIT; - } + imesa->vertsize = 8; + imesa->Setup[I810_CTXREG_VF] = I810_VFMT_T0; - if (ctx->Texture.Enabled & 0xf0) + if (ctx->Texture.Enabled & 0xf) + funcindex |= I810_TEX0_BIT; + + if (ctx->Texture.Enabled & 0xf0) { funcindex |= I810_TEX1_BIT; + imesa->vertsize = 10; + imesa->Setup[I810_CTXREG_VF] = I810_VFMT_T0T1; + } if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) funcindex |= I810_SPEC_BIT; diff --git a/xc/lib/GL/mesa/src/drv/i810/i810vb.h b/xc/lib/GL/mesa/src/drv/i810/i810vb.h index 23685f106..b8ad58c8e 100644 --- a/xc/lib/GL/mesa/src/drv/i810/i810vb.h +++ b/xc/lib/GL/mesa/src/drv/i810/i810vb.h @@ -22,6 +22,7 @@ * * */ +/* $XFree86$ */ #ifndef I810VB_INC #define I810VB_INC @@ -60,6 +61,7 @@ typedef struct { union i810_vertex_t { i810_vertex v; float f[16]; + GLuint ui[16]; }; typedef union i810_vertex_t i810Vertex; diff --git a/xc/lib/GL/mesa/src/drv/mga/Imakefile b/xc/lib/GL/mesa/src/drv/mga/Imakefile index 3eec12d29..ee844248a 100644 --- a/xc/lib/GL/mesa/src/drv/mga/Imakefile +++ b/xc/lib/GL/mesa/src/drv/mga/Imakefile @@ -1,3 +1,4 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.8 2000/08/24 22:20:07 tsi Exp $ #include <Threads.tmpl> @@ -11,13 +12,6 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif -#if defined(LinuxArchitecture) -OS_SUBDIR = linux -#endif -#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture) -OS_SUBDIR = bsd -#endif - #ifdef i386Architecture #ifdef MesaUse3DNow ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM -DUSE_3DNOW_ASM @@ -34,24 +28,16 @@ OS_SUBDIR = bsd -I$(TOP)/include -I$(TOP)/include/GL \ -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \ -I$(XF86DRIVERSRC)/mga \ - -I../../../include -I../.. -I../../X -I../common \ - -I$(XF86OSSRC)/$(OS_SUBDIR)/drm/kernel + -I../../../include -I../.. -I../../X -I../common #endif -MESA_INCLUDES = -I. -I.. -I../../include - +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) -#if 0 - LOSRC = ../../../../lowpc.c - LOOBJ = ../../../../lowpc.o - - HISRC = ../../../../highpc.c - HIOBJ = ../../../../highpc.o -#endif DRISRCS = ../../../dri/dri_mesa.c \ ../../../../dri/dri_tmm.c @@ -275,14 +261,23 @@ MESA_INCLUDES = -I. -I.. -I../../include #endif #endif +#ifdef GlxSoProf + HIOBJS = ../../../../highpc.o + LOOBJS = ../../../../lowpc.o + HISRCS = ../../../../highpc.c + LOSRCS = ../../../../lowpc.c +#endif + ASMSRCS = $(X86_SRCS) $(MMX_SRCS) $(3DNOW_SRCS) ASMOBJS = $(X86_OBJS) $(MMX_OBJS) $(3DNOW_OBJS) COMMONSRCS = ../common/mm.c ../common/hwlog.c COMMONOBJS = ../common/mm.o ../common/hwlog.o - SRCS = $(LOWSRC) $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) $(COMMONSRCS) $(MGASRCS) $(HISRC) - OBJS = $(LOWOBJ) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJ) + SRCS = $(LOSRCS) $(DRISRCS) $(DRMSRCS) $(MESASRCS) $(ASMSRCS) \ + $(COMMONSRCS) $(MGASRCS) $(HISRCS) + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(MESAOBJS) $(ASMOBJS) \ + $(COMMONOBJS) $(MGAOBJS) $(HIOBJS) REQUIREDLIBS += -lm #if !GlxBuiltInMga @@ -310,6 +305,12 @@ ALL_OBJS = $(OBJS) ALL_DEPS = DONE SharedDepModuleTarget($(LIBNAME),$(ALL_DEPS),$(ALL_OBJS)) InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri) + +#ifdef GlxSoProf +SOPROF_LIBNAME = _mga_dri_p +NormalDepLibraryTarget($(SOPROF_LIBNAME),$(ALL_DEPS),$(ALL_OBJS)) +InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri) +#endif #endif DependTarget() diff --git a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c index d0fe02d9b..4b486fb80 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -24,7 +25,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c,v 1.4 2000/06/22 16:59:24 tsi Exp $ */ /* * Authors: @@ -49,7 +49,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mgastate.h" #include "mgatex.h" #include "mgaspan.h" -#include "mgadepth.h" #include "mgatris.h" #include "mgapipeline.h" #include "mgabuffers.h" @@ -215,7 +214,6 @@ GLboolean XMesaInitDriver(__DRIscreenPrivate *sPriv) mgaScreen->backPitch); */ - mgaScreen->Attrib = MGA_PF_565; mgaScreen->bufs = drmMapBufs(sPriv->fd); if (!mgaScreen->bufs) { /*drmUnmap(mgaScreen->agp_tex.map, mgaScreen->agp_tex.size);*/ @@ -312,6 +310,36 @@ GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis, make_empty_list(&mmesa->TexObjList[i]); } + + /* Set the maximum texture size small enough that we can guarentee + * that both texture units can bind a maximal texture and have them + * on the card at once. + */ + { + int nr = 2; + + if (mgaScreen->chipset == MGA_CARD_TYPE_G200) + nr = 1; + + if (mgaScreen->textureSize[0] < nr*1024*1024) { + ctx->Const.MaxTextureLevels = 9; + ctx->Const.MaxTextureSize = 1<<8; + } else if (mgaScreen->textureSize[0] < nr*4*1024*1024) { + ctx->Const.MaxTextureLevels = 10; + ctx->Const.MaxTextureSize = 1<<9; + } else { + ctx->Const.MaxTextureLevels = 11; + ctx->Const.MaxTextureSize = 1<<10; + } + } + + if (mgaScreen->cpp == 2) + mmesa->depth_scale = 1.0/(GLdouble)0xffff; + else + mmesa->depth_scale = 1.0/(GLdouble)0xffffffff; + + + mmesa->renderindex = -1; /* impossible value */ mmesa->new_state = ~0; mmesa->dirty = ~0; @@ -335,6 +363,7 @@ GLboolean XMesaCreateContext( Display *dpy, GLvisual *mesaVis, ctx->Driver.TriangleCaps = (DD_TRI_CULL| + DD_LIGHTING_CULL| DD_TRI_LIGHT_TWOSIDE| DD_TRI_STIPPLE| DD_TRI_OFFSET); diff --git a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h index 489b71836..7d9da0322 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h +++ b/xc/lib/GL/mesa/src/drv/mga/mga_xmesa.h @@ -24,6 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ +/* $XFree86$ */ /* * Authors: @@ -58,7 +59,6 @@ typedef struct { int cpp; /* for front and back buffers */ - int Attrib; unsigned int mAccess; unsigned int frontOffset; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c index d70eef0eb..0431361d2 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.c @@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mgalib.h" #include "mgabuffers.h" #include "mgastate.h" +#include "mgaioctl.h" static void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa ) { @@ -47,7 +48,6 @@ static void mgaXMesaSetFrontClipRects( mgaContextPtr mmesa ) mmesa->drawX = driDrawable->x; mmesa->drawY = driDrawable->y; - mmesa->drawOffset = mmesa->mgaScreen->frontOffset; mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->drawOffset; mmesa->dirty |= MGA_UPLOAD_CTX; mmesa->dirty |= MGA_UPLOAD_CLIPRECTS; @@ -71,7 +71,6 @@ static void mgaXMesaSetBackClipRects( mgaContextPtr mmesa ) mmesa->drawY = driDrawable->backY; } - mmesa->drawOffset = mmesa->mgaScreen->backOffset; mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->drawOffset; mmesa->dirty |= MGA_UPLOAD_CTX; @@ -271,6 +270,7 @@ GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode ) if (mode == GL_FRONT_LEFT) { mmesa->drawOffset = mmesa->mgaScreen->frontOffset; + mmesa->readOffset = mmesa->mgaScreen->frontOffset; mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->frontOffset; mmesa->dirty |= MGA_UPLOAD_CTX; mmesa->draw_buffer = MGA_FRONT; @@ -280,6 +280,7 @@ GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode ) else if (mode == GL_BACK_LEFT) { mmesa->drawOffset = mmesa->mgaScreen->backOffset; + mmesa->readOffset = mmesa->mgaScreen->backOffset; mmesa->Setup[MGA_CTXREG_DSTORG] = mmesa->mgaScreen->backOffset; mmesa->draw_buffer = MGA_BACK; mmesa->dirty |= MGA_UPLOAD_CTX; @@ -293,25 +294,19 @@ GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode ) } } -/* XXX I don't know whether this is correct, but it at least compiles properly now */ -void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, GLenum mode) +void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *buffer, + GLenum mode ) { mgaContextPtr mmesa = MGA_CONTEXT(ctx); - mmesa->Fallback &= ~MGA_FALLBACK_BUFFER; - if (mode == GL_FRONT_LEFT) { mmesa->readOffset = mmesa->mgaScreen->frontOffset; mmesa->read_buffer = MGA_FRONT; } - else if (mode == GL_BACK_LEFT) + else { mmesa->readOffset = mmesa->mgaScreen->backOffset; mmesa->read_buffer = MGA_BACK; } - else - { - mmesa->Fallback |= MGA_FALLBACK_BUFFER; - } } diff --git a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.h b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.h index bebddb65d..7f1bf1c11 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgabuffers.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgabuffers.h @@ -3,8 +3,9 @@ #ifndef MGA_BUFFERS_H #define MGA_BUFFERS_H -void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, - GLenum mode ); +void mgaDDSetReadBuffer(GLcontext *ctx, GLframebuffer *buffer, + GLenum mode ); + GLboolean mgaDDSetDrawBuffer(GLcontext *ctx, GLenum mode ); void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers ); diff --git a/xc/lib/GL/mesa/src/drv/mga/mgadd.c b/xc/lib/GL/mesa/src/drv/mga/mgadd.c index c8f52d286..d67c24ba0 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgadd.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgadd.c @@ -26,6 +26,7 @@ /* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgadd.c,v 1.3 2000/06/22 16:59:24 tsi Exp $ */ + #include "types.h" #include "vbrender.h" @@ -37,7 +38,6 @@ #include "mgalib.h" #include "mgaclear.h" #include "mgadd.h" -#include "mgadepth.h" #include "mgalog.h" #include "mgastate.h" #include "mgaspan.h" @@ -61,11 +61,11 @@ static const GLubyte *mgaDDGetString( GLcontext *ctx, GLenum name ) mgaContextPtr mmesa = MGA_CONTEXT( ctx ); switch (name) { case GL_VENDOR: - return (GLubyte *)"Precision Insight, Inc."; + return (GLubyte *) "Precision Insight, Inc."; case GL_RENDERER: - if (MGA_IS_G200(mmesa)) return (GLubyte *)"Mesa DRI G200 20000510"; - if (MGA_IS_G400(mmesa)) return (GLubyte *)"Mesa DRI G400 20000510"; - return (GLubyte *)"Mesa DRI MGA 20000510"; + if (MGA_IS_G200(mmesa)) return (GLubyte *) "Mesa DRI G200 20000510"; + if (MGA_IS_G400(mmesa)) return (GLubyte *) "Mesa DRI G400 20000510"; + return (GLubyte *) "Mesa DRI MGA 20000510"; default: return 0; } @@ -102,7 +102,7 @@ void mgaDDExtensionsInit( GLcontext *ctx ) /* Support multitexture only on the g400. */ - if (1 /*!MGA_IS_G400(MGA_CONTEXT(ctx))*/) + if (1 || !MGA_IS_G400(MGA_CONTEXT(ctx))) { gl_extensions_disable( ctx, "GL_EXT_multitexture" ); gl_extensions_disable( ctx, "GL_SGIS_multitexture" ); @@ -130,6 +130,13 @@ void mgaDDExtensionsInit( GLcontext *ctx ) gl_extensions_disable( ctx, "GL_INGR_blend_func_separate" ); gl_extensions_disable( ctx, "GL_EXT_texture_lod_bias" ); gl_extensions_disable( ctx, "GL_MESA_resize_buffers" ); + + gl_extensions_disable( ctx, "GL_SGI_color_matrix" ); + gl_extensions_disable( ctx, "GL_SGI_color_table" ); + gl_extensions_disable( ctx, "GL_SGIX_pixel_texture" ); + gl_extensions_disable( ctx, "GL_ARB_texture_cube_map" ); + gl_extensions_disable( ctx, "GL_ARB_texture_compression" ); + gl_extensions_disable( ctx, "GL_EXT_convolution" ); } diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c b/xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c index 4751eb091..74a1bf683 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgaeltpath.c @@ -21,6 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +/* $XFree86$ */ #include <stdio.h> @@ -328,8 +329,8 @@ static void refresh_projection_matrix( GLcontext *ctx ) m[MAT_TX] = mat->m[MAT_TX] + mmesa->drawX + .5; m[MAT_SY] = (- mat->m[MAT_SY]); m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - .5; - m[MAT_SZ] = mat->m[MAT_SZ] * (1.0 / 0x10000); - m[MAT_TZ] = mat->m[MAT_TZ] * (1.0 / 0x10000); + m[MAT_SZ] = mat->m[MAT_SZ] * mmesa->depth_scale; + m[MAT_TZ] = mat->m[MAT_TZ] * mmesa->depth_scale; } #define CLIP_UBYTE_B 0 diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h b/xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h index ce758a532..3973228bb 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgaelttmp.h @@ -21,6 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +/* $XFree86$ */ /* Buffers fill from high addresses down with vertices and from low * addresses up with elements. @@ -83,8 +84,6 @@ static void TAG(emit_unclipped_verts)( struct vertex_buffer *VB ) } if (TYPE & MGA_TEX0_BIT) { -/* fprintf(stderr, "i %d tex0 %f, %f\n", i, */ -/* tex0_data[0], tex0_data[1]); */ *(int*)&f[6] = *(int*)&tex0_data[0]; *(int*)&f[7] = *(int*)&tex0_data[1]; } @@ -126,20 +125,25 @@ static void TAG(build_tri_verts)( mgaContextPtr mmesa, O[3] = clip[3]; if (TYPE & MGA_RGBA_BIT) { - GLubyte *col = VEC_ELT(VB->ColorPtr, GLubyte, elt[i]); + GLubyte *color = VEC_ELT(VB->ColorPtr, GLubyte, elt[i]); +#if defined(USE_X86_ASM) + __asm__ ( + "movl (%%edx),%%eax \n" + "bswap %%eax \n" + "rorl $8,%%eax \n" + "movl %%eax,16(%%edi) \n" + : + : "d" (color), "D" (O) + : "%eax" ); +#else GLubyte *b = (GLubyte *)&O[4]; - b[CLIP_UBYTE_R] = col[0]; - b[CLIP_UBYTE_G] = col[1]; - b[CLIP_UBYTE_B] = col[2]; - b[CLIP_UBYTE_A] = col[3]; + b[CLIP_UBYTE_B] = color[2]; + b[CLIP_UBYTE_G] = color[1]; + b[CLIP_UBYTE_R] = color[0]; + b[CLIP_UBYTE_A] = color[3]; +#endif } - if (0) - fprintf(stderr, - "build_tri_vert elt[%d]: %d phys: %x (first_phys %x elt_buf %x\n", - i, elt[i], UNCLIPPED_VERT(elt[i]), - mmesa->first_vert_phys, (GLuint)mmesa->elt_buf); - *(GLuint *)&O[5] = UNCLIPPED_VERT(elt[i]); if (TYPE & MGA_TEX0_BIT) { @@ -176,8 +180,6 @@ static void TAG(interp)( GLfloat t, ((GLubyte *)&(J[4]))); } - if (0) fprintf(stderr, "setting 0x%x to ~0\n", (GLuint)&O[5]); - *(GLuint *)&O[5] = ~0; /* note that this is a new vertex */ if (TYPE & MGA_TEX0_BIT) { @@ -215,10 +217,6 @@ static void TAG(project_and_emit_verts)( mgaContextPtr mmesa, const GLfloat *I = &verts[elt[i] * CLIP_STRIDE]; GLuint tmp = *(GLuint *)&I[5]; - if (0) fprintf(stderr, "elt[%d] (tmp 0x%x %d) %d --> ", i, (GLuint)&I[5], - tmp, elt[i]); - - if ((elt[i] = tmp) == ~0) { GLfloat oow = 1.0/I[3]; @@ -247,7 +245,6 @@ static void TAG(project_and_emit_verts)( mgaContextPtr mmesa, O -= BUFFER_STRIDE; } - if (0) fprintf(stderr, "0x%x\n", elt[i]); } mmesa->next_vert = O; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c b/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c index 73a939b74..abb85481d 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgafastpath.c @@ -21,6 +21,7 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +/* $XFree86$ */ #include <stdio.h> @@ -386,8 +387,8 @@ static void mga_project_vertices( struct vertex_buffer *VB ) m[MAT_TX] = mat->m[MAT_TX] + mmesa->drawX + SUBPIXEL_X; m[MAT_SY] = (- mat->m[MAT_SY]); m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY + SUBPIXEL_Y; - m[MAT_SZ] = mat->m[MAT_SZ] * (1.0 / 0x10000); - m[MAT_TZ] = mat->m[MAT_TZ] * (1.0 / 0x10000); + m[MAT_SZ] = mat->m[MAT_SZ] * mmesa->depth_scale; + m[MAT_TZ] = mat->m[MAT_TZ] * mmesa->depth_scale; gl_project_v16( mgaVB->verts[VB->CopyStart].f, mgaVB->verts[mgaVB->last_vert].f, @@ -409,8 +410,8 @@ static void mga_project_clipped_vertices( struct vertex_buffer *VB ) m[MAT_TX] = mat->m[MAT_TX] + mmesa->drawX + SUBPIXEL_X; m[MAT_SY] = (- mat->m[MAT_SY]); m[MAT_TY] = (- mat->m[MAT_TY]) + mmesa->driDrawable->h + mmesa->drawY - SUBPIXEL_Y; - m[MAT_SZ] = mat->m[MAT_SZ] * (1.0 / 0x10000); - m[MAT_TZ] = mat->m[MAT_TZ] * (1.0 / 0x10000); + m[MAT_SZ] = mat->m[MAT_SZ] * mmesa->depth_scale; + m[MAT_TZ] = mat->m[MAT_TZ] * mmesa->depth_scale; gl_project_clipped_v16( mgaVB->verts[VB->CopyStart].f, mgaVB->verts[mgaVB->last_vert].f, diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c index e1a5890d2..2a4d41887 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.c @@ -1,5 +1,6 @@ -#include <stdio.h> +/* $XFree86$ */ +#include <stdio.h> #include "types.h" #include "pb.h" @@ -9,7 +10,6 @@ #include "mgalib.h" #include "mgadd.h" #include "mgastate.h" -#include "mgadepth.h" #include "mgatex.h" #include "mgalog.h" #include "mgavb.h" @@ -20,7 +20,8 @@ #include "drm.h" #include <sys/ioctl.h> -#define DEPTH_SCALE 65535.0F +#define DEPTH_SCALE_16 ((GLfloat)0xffff) +#define DEPTH_SCALE_32 ((GLfloat)0xffffffff) static void mga_iload_dma_ioctl(mgaContextPtr mmesa, unsigned long dest, @@ -81,7 +82,7 @@ int mgaUpdateLock( mgaContextPtr mmesa, drmLockFlags flags ) return 0; } -static drmBufPtr mga_get_buffer_ioctl( mgaContextPtr mmesa ) +drmBufPtr mga_get_buffer_ioctl( mgaContextPtr mmesa ) { int idx = 0; int size = 0; @@ -164,7 +165,12 @@ GLbitfield mgaClear( GLcontext *ctx, GLbitfield mask, GLboolean all, clear.flags = 0; clear.clear_color = mmesa->ClearColor; - clear.clear_depth = (mgaUI32) (ctx->Depth.Clear * DEPTH_SCALE); + + if (mmesa->mgaScreen->cpp == 2) + clear.clear_depth = ctx->Depth.Clear * (GLdouble)0xffff; + else { + clear.clear_depth = ctx->Depth.Clear * (GLdouble)0xffffffff; + } FLUSH_BATCH( mmesa ); @@ -573,7 +579,7 @@ void mgaGetILoadBufferLocked( mgaContextPtr mmesa ) } - void mgaDDFlush( GLcontext *ctx ) +void mgaDDFlush( GLcontext *ctx ) { mgaContextPtr mmesa = MGA_CONTEXT( ctx ); @@ -583,10 +589,7 @@ void mgaGetILoadBufferLocked( mgaContextPtr mmesa ) /* This may be called redundantly - dispatch_age may trail what * has actually been sent and processed by the hardware. */ -#if 0 - if (GET_DISPATCH_AGE( mmesa ) < mmesa->sarea->last_enqueue) -#endif - { + if (1 || GET_DISPATCH_AGE( mmesa ) < mmesa->sarea->last_enqueue) { LOCK_HARDWARE( mmesa ); if (0) fprintf(stderr, "mgaDDFlush %d %d\n", GET_DISPATCH_AGE( mmesa ), mmesa->sarea->last_enqueue); mgaUpdateLock( mmesa, DRM_LOCK_FLUSH ); diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h index 900e4a4f8..12ee83eb6 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h @@ -1,7 +1,10 @@ +/* $XFree86$ */ + #ifndef MGA_IOCTL_H #define MGA_IOCTL_H #include "mgalib.h" +#include "mga_xmesa.h" GLbitfield mgaClear( GLcontext *ctx, GLbitfield mask, GLboolean all, GLint cx, GLint cy, GLint cw, GLint ch ); @@ -54,5 +57,36 @@ void mgaDDInitIoctlFuncs( GLcontext *ctx ); else if (mmesa->next_elt != mmesa->first_elt) mgaFlushElts(mmesa); \ } while (0) +extern drmBufPtr mga_get_buffer_ioctl( mgaContextPtr mmesa ); + +static __inline +mgaUI32 *mgaAllocVertexDwordsInline( mgaContextPtr mmesa, int dwords ) +{ + int bytes = dwords * 4; + mgaUI32 *head; + + if (!mmesa->vertex_dma_buffer) { + LOCK_HARDWARE( mmesa ); + + if (mmesa->first_elt != mmesa->next_elt) + mgaFlushEltsLocked(mmesa); + + mmesa->vertex_dma_buffer = mga_get_buffer_ioctl( mmesa ); + UNLOCK_HARDWARE( mmesa ); + } else if (mmesa->vertex_dma_buffer->used + bytes > + mmesa->vertex_dma_buffer->total) { + LOCK_HARDWARE( mmesa ); + mgaFlushVerticesLocked( mmesa ); + mmesa->vertex_dma_buffer = mga_get_buffer_ioctl( mmesa ); + UNLOCK_HARDWARE( mmesa ); + } + + head = (mgaUI32 *)((char *)mmesa->vertex_dma_buffer->address + + mmesa->vertex_dma_buffer->used); + + mmesa->vertex_dma_buffer->used += bytes; + return head; +} + #endif diff --git a/xc/lib/GL/mesa/src/drv/mga/mgalib.h b/xc/lib/GL/mesa/src/drv/mga/mgalib.h index e00525f7b..7b3252c9b 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgalib.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgalib.h @@ -23,7 +23,7 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ - +/* $XFree86$ */ #ifndef MGALIB_INC #define MGALIB_INC @@ -39,7 +39,6 @@ #include "mgacommon.h" #include "mm.h" #include "mgalog.h" -#include "mgaioctl.h" #include "mgatex.h" #include "mgavb.h" @@ -61,7 +60,7 @@ */ #define MGA_FALLBACK_TEXTURE 0x1 #define MGA_FALLBACK_BUFFER 0x2 -#define MGA_FALLBACK_STIPPLE 0x3 +#define MGA_FALLBACK_LOGICOP 0x4 /* For mgaCtx->new_state. @@ -180,7 +179,7 @@ struct mga_context_t { GLushort MonoColor; GLushort ClearColor; GLuint poly_stipple; - + GLfloat depth_scale; /* Dma buffers */ @@ -295,18 +294,14 @@ extern int MGA_DEBUG; #define DEBUG_VERBOSE_IOCTL 0x10 #define DEBUG_VERBOSE_2D 0x20 -static __inline__ mgaUI32 mgaPackColor(mgaUI32 format, +static __inline__ mgaUI32 mgaPackColor(mgaUI32 cpp, mgaUI8 r, mgaUI8 g, mgaUI8 b, mgaUI8 a) { - switch (format & MGA_PF_MASK) { - case MGA_PF_555: - return MGAPACKCOLOR555(r,g,b,a); - case MGA_PF_565: + switch (cpp) { + case 2: return MGAPACKCOLOR565(r,g,b); - case MGA_PF_888: - return MGAPACKCOLOR888(r,g,b); - case MGA_PF_8888: + case 4: return MGAPACKCOLOR8888(r,g,b,a); default: return 0; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgaspan.c b/xc/lib/GL/mesa/src/drv/mga/mgaspan.c index 887e194d2..97dd54514 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgaspan.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgaspan.c @@ -1,9 +1,11 @@ +/* $XFree86$ */ + #include "types.h" #include "mgadd.h" #include "mgalib.h" -#include "mgadma.h" #include "mgalog.h" #include "mgaspan.h" +#include "mgaioctl.h" #define DBG 0 @@ -16,11 +18,11 @@ GLuint height = dPriv->h; \ char *read_buf = (char *)(sPriv->pFB + \ mmesa->readOffset + \ - dPriv->x * 2 + \ + dPriv->x * mgaScreen->cpp + \ dPriv->y * pitch); \ char *buf = (char *)(sPriv->pFB + \ mmesa->drawOffset + \ - dPriv->x * 2 + \ + dPriv->x * mgaScreen->cpp + \ dPriv->y * pitch); \ GLushort p = MGA_CONTEXT( ctx )->MonoColor; \ (void) read_buf; (void) buf; (void) p @@ -107,29 +109,33 @@ do { \ -/* 15 bit, 555 rgb color spanline and pixel functions - */ -#define WRITE_RGBA( _x, _y, r, g, b, a ) \ - *(GLushort *)(buf + _x*2 + _y*pitch) = (((r & 0xf8) << 7) | \ - ((g & 0xf8) << 3) | \ - ((b & 0xf8) >> 3)) -#define WRITE_PIXEL( _x, _y, p ) \ - *(GLushort *)(buf + _x*2 + _y*pitch) = p -#define READ_RGBA( rgba, _x, _y ) \ -do { \ - GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch); \ - rgba[0] = (p >> 7) & 0xf8; \ - rgba[1] = (p >> 3) & 0xf8; \ - rgba[2] = (p << 3) & 0xf8; \ - rgba[3] = 255; \ -} while(0) - -#define TAG(x) mga##x##_555 +/* 32 bit, 8888 argb color spanline and pixel functions + */ +#define WRITE_RGBA(_x, _y, r, g, b, a) \ + *(GLuint *)(buf + _x*4 + _y*pitch) = ((r << 16) | \ + (g << 8) | \ + (b << 0) | \ + (a << 24) ) + +#define WRITE_PIXEL(_x, _y, p) \ + *(GLuint *)(buf + _x*4 + _y*pitch) = p + +#define READ_RGBA(rgba, _x, _y) \ + do { \ + GLuint p = *(GLuint *)(read_buf + _x*4 + _y*pitch); \ + rgba[0] = (p >> 16) & 0xff; \ + rgba[1] = (p >> 8) & 0xff; \ + rgba[2] = (p >> 0) & 0xff; \ + rgba[3] = (p >> 24) & 0xff; \ + } while (0) + +#define TAG(x) mga##x##_8888 #include "spantmp.h" + /* 16 bit depthbuffer functions. */ #define WRITE_DEPTH( _x, _y, d ) \ @@ -144,9 +150,30 @@ do { \ + + + + +/* 32 bit depthbuffer functions. + */ +#define WRITE_DEPTH( _x, _y, d ) \ + *(GLushort *)(buf + _x*4 + _y*pitch) = d; + +#define READ_DEPTH( d, _x, _y ) \ + d = *(GLushort *)(buf + _x*4 + _y*pitch); + +#define TAG(x) mga##x##_32 +#include "depthtmp.h" + + + + void mgaDDInitSpanFuncs( GLcontext *ctx ) { - if (1) { + mgaContextPtr mmesa = MGA_CONTEXT(ctx); + + switch (mmesa->mgaScreen->cpp) { + case 2: ctx->Driver.WriteRGBASpan = mgaWriteRGBASpan_565; ctx->Driver.WriteRGBSpan = mgaWriteRGBSpan_565; ctx->Driver.WriteMonoRGBASpan = mgaWriteMonoRGBASpan_565; @@ -154,20 +181,29 @@ void mgaDDInitSpanFuncs( GLcontext *ctx ) ctx->Driver.WriteMonoRGBAPixels = mgaWriteMonoRGBAPixels_565; ctx->Driver.ReadRGBASpan = mgaReadRGBASpan_565; ctx->Driver.ReadRGBAPixels = mgaReadRGBAPixels_565; - } else { - ctx->Driver.WriteRGBASpan = mgaWriteRGBASpan_555; - ctx->Driver.WriteRGBSpan = mgaWriteRGBSpan_555; - ctx->Driver.WriteMonoRGBASpan = mgaWriteMonoRGBASpan_555; - ctx->Driver.WriteRGBAPixels = mgaWriteRGBAPixels_555; - ctx->Driver.WriteMonoRGBAPixels = mgaWriteMonoRGBAPixels_555; - ctx->Driver.ReadRGBASpan = mgaReadRGBASpan_555; - ctx->Driver.ReadRGBAPixels = mgaReadRGBAPixels_555; + + ctx->Driver.ReadDepthSpan = mgaReadDepthSpan_16; + ctx->Driver.WriteDepthSpan = mgaWriteDepthSpan_16; + ctx->Driver.ReadDepthPixels = mgaReadDepthPixels_16; + ctx->Driver.WriteDepthPixels = mgaWriteDepthPixels_16; + break; + + case 4: + ctx->Driver.WriteRGBASpan = mgaWriteRGBASpan_8888; + ctx->Driver.WriteRGBSpan = mgaWriteRGBSpan_8888; + ctx->Driver.WriteMonoRGBASpan = mgaWriteMonoRGBASpan_8888; + ctx->Driver.WriteRGBAPixels = mgaWriteRGBAPixels_8888; + ctx->Driver.WriteMonoRGBAPixels = mgaWriteMonoRGBAPixels_8888; + ctx->Driver.ReadRGBASpan = mgaReadRGBASpan_8888; + ctx->Driver.ReadRGBAPixels = mgaReadRGBAPixels_8888; + + ctx->Driver.ReadDepthSpan = mgaReadDepthSpan_32; + ctx->Driver.WriteDepthSpan = mgaWriteDepthSpan_32; + ctx->Driver.ReadDepthPixels = mgaReadDepthPixels_32; + ctx->Driver.WriteDepthPixels = mgaWriteDepthPixels_32; + break; } - ctx->Driver.ReadDepthSpan = mgaReadDepthSpan_16; - ctx->Driver.WriteDepthSpan = mgaWriteDepthSpan_16; - ctx->Driver.ReadDepthPixels = mgaReadDepthPixels_16; - ctx->Driver.WriteDepthPixels = mgaWriteDepthPixels_16; ctx->Driver.WriteCI8Span =NULL; ctx->Driver.WriteCI32Span =NULL; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgastate.c b/xc/lib/GL/mesa/src/drv/mga/mgastate.c index cbe05b093..f43a1b4d0 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgastate.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgastate.c @@ -10,7 +10,6 @@ #include "mgalib.h" #include "mgadd.h" #include "mgastate.h" -#include "mgadepth.h" #include "mgatex.h" #include "mgalog.h" #include "mgavb.h" @@ -18,6 +17,22 @@ #include "mgaregs.h" #include "mgabuffers.h" +/* Some outstanding problems with accelerating logic ops... + */ +#if defined(ACCEL_ROP) +static GLuint mgarop_NoBLK[16] = { + DC_atype_rpl | 0x00000000, DC_atype_rstr | 0x00080000, + DC_atype_rstr | 0x00040000, DC_atype_rpl | 0x000c0000, + DC_atype_rstr | 0x00020000, DC_atype_rstr | 0x000a0000, + DC_atype_rstr | 0x00060000, DC_atype_rstr | 0x000e0000, + DC_atype_rstr | 0x00010000, DC_atype_rstr | 0x00090000, + DC_atype_rstr | 0x00050000, DC_atype_rstr | 0x000d0000, + DC_atype_rpl | 0x00030000, DC_atype_rstr | 0x000b0000, + DC_atype_rstr | 0x00070000, DC_atype_rpl | 0x000f0000 +}; +#endif + + static void mgaUpdateZMode(const GLcontext *ctx) { mgaContextPtr mmesa = MGA_CONTEXT( ctx ); @@ -52,7 +67,15 @@ static void mgaUpdateZMode(const GLcontext *ctx) zmode |= DC_zmode_nozcmp | DC_atype_i; } - mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_zmode_MASK & DC_atype_MASK; +#if defined(ACCEL_ROP) + mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_bop_MASK; + if (ctx->Color.ColorLogicOpEnabled) + zmode |= mgarop_NoBLK[(ctx->Color.LogicOp)&0xf]; + else + zmode |= mgarop_NoBLK[GL_COPY & 0xf]; +#endif + + mmesa->Setup[MGA_CTXREG_DWGCTL] &= DC_zmode_MASK & DC_atype_MASK; mmesa->Setup[MGA_CTXREG_DWGCTL] |= zmode; mmesa->dirty |= MGA_UPLOAD_CTX; } @@ -119,7 +142,25 @@ static void mgaDDDepthMask(GLcontext *ctx, GLboolean flag) MGA_CONTEXT(ctx)->new_state |= MGA_NEW_DEPTH; } - +#if defined(ACCEL_ROP) +static void mgaDDLogicOp( GLcontext *ctx, GLenum opcode ) +{ + FLUSH_BATCH( MGA_CONTEXT(ctx) ); + MGA_CONTEXT(ctx)->new_state |= MGA_NEW_DEPTH; +} +#else +static void mgaDDLogicOp( GLcontext *ctx, GLenum opcode ) +{ + if (ctx->Color.ColorLogicOpEnabled) { + FLUSH_BATCH( MGA_CONTEXT(ctx) ); + + if (opcode == GL_COPY) + MGA_CONTEXT(ctx)->Fallback &= ~MGA_FALLBACK_LOGICOP; + else + MGA_CONTEXT(ctx)->Fallback |= MGA_FALLBACK_LOGICOP; + } +} +#endif static void mgaUpdateFogAttrib( GLcontext *ctx ) @@ -231,13 +272,13 @@ static void mgaUpdateAlphaMode(GLcontext *ctx) case GL_ONE_MINUS_SRC_ALPHA: a |= AC_src_om_src_alpha; break; case GL_DST_ALPHA: - if (mgaScreen->Attrib & MGA_PF_HASALPHA) + if (mgaScreen->cpp == 4) a |= AC_src_dst_alpha; else a |= AC_src_one; break; case GL_ONE_MINUS_DST_ALPHA: - if (mgaScreen->Attrib & MGA_PF_HASALPHA) + if (mgaScreen->cpp == 4) a |= AC_src_om_dst_alpha; else a |= AC_src_zero; @@ -263,13 +304,13 @@ static void mgaUpdateAlphaMode(GLcontext *ctx) case GL_ONE_MINUS_SRC_COLOR: a |= AC_dst_om_src_color; break; case GL_DST_ALPHA: - if (mgaScreen->Attrib & MGA_PF_HASALPHA) + if (mgaScreen->cpp == 4) a |= AC_dst_dst_alpha; else a |= AC_dst_one; break; case GL_ONE_MINUS_DST_ALPHA: - if (mgaScreen->Attrib & MGA_PF_HASALPHA) + if (mgaScreen->cpp == 4) a |= AC_dst_om_dst_alpha; else a |= AC_dst_zero; @@ -355,8 +396,7 @@ static void mgaDDSetColor(GLcontext *ctx, { mgaContextPtr mmesa = MGA_CONTEXT(ctx); - mmesa->MonoColor = mgaPackColor( mmesa->mgaScreen->Attrib, - r, g, b, a ); + mmesa->MonoColor = mgaPackColor( mmesa->mgaScreen->cpp, r, g, b, a ); } @@ -366,8 +406,7 @@ static void mgaDDClearColor(GLcontext *ctx, { mgaContextPtr mmesa = MGA_CONTEXT(ctx); - mmesa->ClearColor = mgaPackColor( mmesa->mgaScreen->Attrib, - r, g, b, a ); + mmesa->ClearColor = mgaPackColor( mmesa->mgaScreen->cpp, r, g, b, a ); } @@ -426,19 +465,14 @@ static GLboolean mgaDDColorMask(GLcontext *ctx, mgaScreenPrivate *mgaScreen = mmesa->mgaScreen; - GLuint mask = mgaPackColor(mgaScreen->Attrib, + GLuint mask = mgaPackColor(mgaScreen->cpp, ctx->Color.ColorMask[RCOMP], ctx->Color.ColorMask[GCOMP], ctx->Color.ColorMask[BCOMP], ctx->Color.ColorMask[ACOMP]); - switch (mgaScreen->Attrib & MGA_PF_MASK) - { - case MGA_PF_555: - case MGA_PF_565: + if (mgaScreen->cpp == 2) mask = mask | (mask << 16); - break; - } if (mmesa->Setup[MGA_CTXREG_PLNWT] != mask) { FLUSH_BATCH( MGA_CONTEXT(ctx) ); @@ -577,10 +611,7 @@ void mgaEmitHwStateLocked( mgaContextPtr mmesa ) mmesa->CurrentTexObj[1]->Setup, sizeof(mmesa->sarea->TexState[1])); - mmesa->sarea->WarpPipe = ((mmesa->setupindex & MGA_WARP_T2GZSAF) | - MGA_ALPHA_BIT | MGA_SPEC_BIT | MGA_FOG_BIT); - - + mmesa->sarea->WarpPipe = mmesa->warp_pipe; mmesa->sarea->dirty |= mmesa->dirty; #if 0 @@ -631,7 +662,7 @@ static void mgaDDEnable(GLcontext *ctx, GLenum cap, GLboolean state) case GL_TEXTURE_2D: case GL_TEXTURE_3D: FLUSH_BATCH( mmesa ); - mmesa->new_state |= MGA_NEW_TEXTURE; + mmesa->new_state |= (MGA_NEW_TEXTURE|MGA_NEW_ALPHA); break; case GL_POLYGON_STIPPLE: if ((ctx->Driver.TriangleCaps & DD_TRI_STIPPLE) && @@ -644,8 +675,19 @@ static void mgaDDEnable(GLcontext *ctx, GLenum cap, GLboolean state) mmesa->Setup[MGA_CTXREG_DWGCTL] |= mmesa->poly_stipple; } break; - default: + case GL_COLOR_LOGIC_OP: + case GL_INDEX_LOGIC_OP: + FLUSH_BATCH( mmesa ); +#if !defined(ACCEL_ROP) + mmesa->Fallback &= ~MGA_FALLBACK_LOGICOP; + if (state && ctx->Color.LogicOp != GL_COPY) + mmesa->Fallback |= MGA_FALLBACK_LOGICOP; +#else + mmesa->new_state |= MGA_NEW_DEPTH; +#endif break; + default: + break; } } @@ -662,10 +704,11 @@ static void mgaWarpUpdateState( GLcontext *ctx ) int index = mmesa->setupindex; index &= ~(MGA_WIN_BIT|MGA_TEX0_BIT|MGA_RGBA_BIT); - index |= MGA_ALPHA_BIT; + index |= MGA_ALPHA_BIT | MGA_SPEC_BIT | MGA_FOG_BIT; if (index != mmesa->warp_pipe) { + FLUSH_BATCH(mmesa); mmesa->warp_pipe = index; mmesa->new_state |= MGA_NEW_WARP; mmesa->dirty |= MGA_UPLOAD_PIPE; @@ -741,6 +784,7 @@ void mgaDDReducedPrimitiveChange( GLcontext *ctx, GLenum prim ) if (ctx->Polygon.StippleFlag && (ctx->Driver.TriangleCaps & DD_TRI_STIPPLE)) { + mmesa->dirty |= MGA_UPLOAD_CTX; mmesa->Setup[MGA_CTXREG_DWGCTL] &= ~(0xf<<20); if (ctx->PB->primitive == GL_POLYGON) mmesa->Setup[MGA_CTXREG_DWGCTL] |= mmesa->poly_stipple; @@ -804,16 +848,37 @@ void mgaInitState( mgaContextPtr mmesa ) mmesa->Setup[MGA_CTXREG_DSTORG] = mgaScreen->frontOffset; } -/* mmesa->Setup[MGA_CTXREG_MACCESS] = mgaScreen->mAccess; */ -/* mmesa->Setup[MGA_CTXREG_DWGCTL] = ( DC_clipdis_disable | */ -/* (0xC << DC_bop_SHIFT) | */ -/* DC_shftzero_enable | */ -/* DC_zmode_nozcmp | */ -/* DC_atype_zi ); */ - - - mmesa->Setup[MGA_CTXREG_MACCESS] = 0x1; - mmesa->Setup[MGA_CTXREG_DWGCTL] = 0xc4074; + if (mgaScreen->cpp == 2) + mmesa->Setup[MGA_CTXREG_MACCESS] = (MA_pwidth_16 | + MA_zwidth_16 | + MA_memreset_disable | + MA_fogen_disable | + MA_tlutload_disable | + MA_nodither_disable | + MA_dit555_disable); + else + mmesa->Setup[MGA_CTXREG_MACCESS] = (MA_pwidth_32 | + MA_zwidth_32 | /* stencil? */ + MA_memreset_disable | + MA_fogen_disable | + MA_tlutload_disable | + MA_nodither_enable | + MA_dit555_disable); + + mmesa->Setup[MGA_CTXREG_DWGCTL] = (DC_opcod_trap | + DC_atype_i | + DC_linear_xy | + DC_zmode_nozcmp | + DC_solid_disable | + DC_arzero_disable | + DC_sgnzero_disable | + DC_shftzero_enable | + (0xC << DC_bop_SHIFT) | + (0x0 << DC_trans_SHIFT) | + DC_bltmod_bmonolef | + DC_pattern_disable | + DC_transc_disable | + DC_clipdis_disable); mmesa->Setup[MGA_CTXREG_PLNWT] = ~0; @@ -864,6 +929,7 @@ void mgaDDInitStateFuncs( GLcontext *ctx ) ctx->Driver.Color = mgaDDSetColor; ctx->Driver.ClearColor = mgaDDClearColor; ctx->Driver.Dither = mgaDDDither; + ctx->Driver.LogicOpcode = mgaDDLogicOp; ctx->Driver.PolygonStipple = mgaDDPolygonStipple; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatex.c b/xc/lib/GL/mesa/src/drv/mga/mgatex.c index 5c31934d8..23a7dddc0 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatex.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgatex.c @@ -34,10 +34,10 @@ #include "mm.h" #include "mgalib.h" -#include "mgadma.h" #include "mgatex.h" #include "mgalog.h" #include "mgaregs.h" +#include "mgaioctl.h" #include "simple_list.h" @@ -908,15 +908,27 @@ static void mgaUpdateTextureStage( GLcontext *ctx, int unit ) TD0_alpha_sel_mul); break; case GL_DECAL: - *reg = (TD0_color_arg2_fcol | - TD0_color_alpha_currtex | - TD0_color_alpha2inv_enable | - TD0_color_arg2mul_alpha2 | - TD0_color_arg1mul_alpha1 | - TD0_color_add_add | - TD0_color_sel_add | - TD0_alpha_arg2_fcol | - TD0_alpha_sel_arg2 ); + if (unit == 0) + *reg = (TD0_color_arg2_diffuse | + TD0_color_alpha_currtex | + TD0_color_alpha2inv_enable | + TD0_color_arg2mul_alpha2 | + TD0_color_arg1mul_alpha1 | + TD0_color_add_add | + TD0_color_sel_add | + TD0_alpha_arg2_diffuse | + TD0_alpha_sel_arg2 ); + else + *reg = (TD0_color_arg2_prevstage | + TD0_color_alpha_currtex | + TD0_color_alpha2inv_enable | + TD0_color_arg2mul_alpha2 | + TD0_color_arg1mul_alpha1 | + TD0_color_add_add | + TD0_color_sel_add | + TD0_alpha_arg2_prevstage | + TD0_alpha_sel_arg2 ); + break; case GL_ADD: @@ -1096,8 +1108,8 @@ Driver functions called directly from mesa /* * mgaTexEnv */ -void mgaTexEnv( GLcontext *ctx, GLenum target, GLenum pname, - const GLfloat *param ) +void mgaTexEnv( GLcontext *ctx, GLenum target, + GLenum pname, const GLfloat *param ) { mgaContextPtr mmesa = MGA_CONTEXT(ctx); mgaMsg( 10, "mgaTexEnv( %i )\n", pname ); @@ -1106,7 +1118,8 @@ void mgaTexEnv( GLcontext *ctx, GLenum target, GLenum pname, if (pname == GL_TEXTURE_ENV_MODE) { /* force the texture state to be updated */ FLUSH_BATCH( MGA_CONTEXT(ctx) ); - MGA_CONTEXT(ctx)->new_state |= MGA_NEW_TEXTURE; + MGA_CONTEXT(ctx)->new_state |= (MGA_NEW_TEXTURE | + MGA_NEW_ALPHA); } else if (pname == GL_TEXTURE_ENV_COLOR) { @@ -1122,9 +1135,7 @@ void mgaTexEnv( GLcontext *ctx, GLenum target, GLenum pname, c[2] = fc[2]; c[3] = fc[3]; - /* No alpha at 16bpp? - */ - col = mgaPackColor( mmesa->mgaScreen->Attrib, + col = mgaPackColor( mmesa->mgaScreen->cpp, c[0], c[1], c[2], c[3] ); mmesa->envcolor = (c[3]<<24) | (c[0]<<16) | (c[1]<<8) | (c[2]); diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatex.h b/xc/lib/GL/mesa/src/drv/mga/mgatex.h index 748c9c42b..2f838eefc 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatex.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgatex.h @@ -24,7 +24,7 @@ * John Carmack <johnc@idsoftware.com> * Keith Whitwell <keithw@precisioninsight.com> */ -/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatex.h,v 1.3 2000/06/22 16:59:24 tsi Exp $ */ +/* $XFree86$ */ #ifndef MGATEX_INC #define MGATEX_INC diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatris.c b/xc/lib/GL/mesa/src/drv/mga/mgatris.c index 387a79f3e..96e38ec1f 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatris.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgatris.c @@ -23,6 +23,7 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ +/* $XFree86$ */ #include <stdio.h> #include <math.h> @@ -60,19 +61,18 @@ static void mga_null_points( GLcontext *ctx, GLuint first, GLuint last ) { -static triangle_func tri_tab[0x20]; -static quad_func quad_tab[0x20]; -static line_func line_tab[0x20]; -static points_func points_tab[0x20]; +static triangle_func tri_tab[0x10]; +static quad_func quad_tab[0x10]; +static line_func line_tab[0x10]; +static points_func points_tab[0x10]; static void mgaPrintRenderState( const char *msg, GLuint state ) { - mgaMsg(1, "%s: (%x) %s%s%s%s%s%s\n", + fprintf(stderr, "%s: (%x) %s%s%s%s%s\n", msg, state, (state & MGA_FLAT_BIT) ? "flat, " : "", (state & MGA_OFFSET_BIT) ? "offset, " : "", (state & MGA_TWOSIDE_BIT) ? "twoside, " : "", - (state & MGA_ANTIALIAS_BIT) ? "antialias, " : "", (state & MGA_NODRAW_BIT) ? "no-draw, " : "", (state & MGA_FALLBACK_BIT) ? "fallback" : ""); } @@ -109,6 +109,7 @@ static void mgaPrintRenderState( const char *msg, GLuint state ) #define TAG(x) x##_twoside_offset_flat #include "mgatritmp.h" + void mgaDDTrifuncInit() { int i; @@ -124,8 +125,7 @@ void mgaDDTrifuncInit() init_twoside_offset_flat(); for (i = 0 ; i < 0x20 ; i++) - if ((i & (MGA_NODRAW_BIT|MGA_FALLBACK_BIT)) == MGA_NODRAW_BIT) - { + if (i & MGA_NODRAW_BIT) { quad_tab[i] = mga_null_quad; tri_tab[i] = mga_null_triangle; line_tab[i] = mga_null_line; @@ -135,84 +135,76 @@ void mgaDDTrifuncInit() +#define ALL_FALLBACK (DD_MULTIDRAW | DD_SELECT | DD_FEEDBACK) +#define POINT_FALLBACK (ALL_FALLBACK | DD_POINT_SMOOTH) +#define LINE_FALLBACK (ALL_FALLBACK | DD_LINE_SMOOTH | DD_LINE_STIPPLE) +#define TRI_FALLBACK (ALL_FALLBACK | DD_TRI_SMOOTH | DD_TRI_UNFILLED) +#define ANY_FALLBACK (POINT_FALLBACK|LINE_FALLBACK|TRI_FALLBACK|DD_TRI_STIPPLE) +#define ANY_RASTER_FLAGS (DD_FLATSHADE|DD_TRI_LIGHT_TWOSIDE|DD_TRI_OFFSET|DD_Z_NEVER) - - -void mgaDDChooseRenderState( GLcontext *ctx ) +/* Setup the Point, Line, Triangle and Quad functions based on the + current rendering state. Wherever possible, use the hardware to + render the primitive. Otherwise, fallback to software rendering. */ +void mgaDDChooseRenderState(GLcontext *ctx) { - mgaContextPtr mmesa = MGA_CONTEXT( ctx ); - GLuint flags = ctx->TriangleCaps; - - if (mmesa->Fallback) - return; - - mmesa->IndirectTriangles = 0; - - if (flags) { - GLuint ind = 0; - GLuint shared = 0; - - if (flags & DD_Z_NEVER) shared |= MGA_NODRAW_BIT; - if (flags & DD_FLATSHADE) shared |= MGA_FLAT_BIT; - if (flags & (DD_MULTIDRAW| - DD_SELECT| - DD_FEEDBACK)) shared |= MGA_FALLBACK_BIT; - if (flags & DD_STENCIL) shared |= MGA_FALLBACK_BIT; - - ind = shared; -#if 0 - if (flags & DD_POINT_SMOOTH) ind |= MGA_ANTIALIAS_BIT; -#else - if (flags & DD_POINT_SMOOTH) ind |= MGA_FALLBACK_BIT; -#endif - - mmesa->renderindex = ind; - mmesa->PointsFunc = points_tab[ind]; - if (ind & MGA_FALLBACK_BIT) - mmesa->IndirectTriangles |= DD_POINT_SW_RASTERIZE; - - ind = shared; -#if 0 - if (flags & DD_LINE_SMOOTH) ind |= MGA_ANTIALIAS_BIT; -#else - if (flags & DD_LINE_SMOOTH) ind |= MGA_FALLBACK_BIT; -#endif - if (flags & DD_LINE_STIPPLE) ind |= MGA_FALLBACK_BIT; - - mmesa->renderindex |= ind; - mmesa->LineFunc = line_tab[ind]; - if (ind & MGA_FALLBACK_BIT) - mmesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE; - - ind = shared; - if (flags & DD_TRI_SMOOTH) ind |= MGA_ANTIALIAS_BIT; - if (flags & DD_TRI_OFFSET) ind |= MGA_OFFSET_BIT; - if (flags & DD_TRI_LIGHT_TWOSIDE) ind |= MGA_TWOSIDE_BIT; - if (flags & DD_TRI_UNFILLED) ind |= MGA_FALLBACK_BIT; - if ((flags & DD_TRI_STIPPLE) && - (ctx->IndirectTriangles & DD_TRI_STIPPLE)) ind |= MGA_FALLBACK_BIT; - - mmesa->renderindex |= ind; - mmesa->TriangleFunc = tri_tab[ind]; - mmesa->QuadFunc = quad_tab[ind]; - if (ind & MGA_FALLBACK_BIT) - mmesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | - DD_QUAD_SW_RASTERIZE); - } - else if (mmesa->renderindex) - { - mmesa->renderindex = 0; - mmesa->PointsFunc = points_tab[0]; - mmesa->LineFunc = line_tab[0]; - mmesa->TriangleFunc = tri_tab[0]; - mmesa->QuadFunc = quad_tab[0]; - } - - if (0) { - gl_print_tri_caps("tricaps", ctx->TriangleCaps); - mgaPrintRenderState("mga: Render state", mmesa->renderindex); - } + mgaContextPtr mmesa = MGA_CONTEXT(ctx); + GLuint flags = ctx->TriangleCaps; + CARD32 index = 0; + + if (mmesa->Fallback) { + mmesa->renderindex = MGA_FALLBACK_BIT; + return; + } + + if (flags & ANY_RASTER_FLAGS) { + if (flags & DD_FLATSHADE) index |= MGA_FLAT_BIT; + if (flags & DD_TRI_LIGHT_TWOSIDE) index |= MGA_TWOSIDE_BIT; + if (flags & DD_TRI_OFFSET) index |= MGA_OFFSET_BIT; + if (flags & DD_Z_NEVER) index |= MGA_NODRAW_BIT; + } + + mmesa->PointsFunc = points_tab[index]; + mmesa->LineFunc = line_tab[index]; + mmesa->TriangleFunc = tri_tab[index]; + mmesa->QuadFunc = quad_tab[index]; + + mmesa->renderindex = index; + mmesa->IndirectTriangles = 0; + + if (flags & ANY_FALLBACK) { + if (flags & POINT_FALLBACK) { + mmesa->renderindex |= MGA_FALLBACK_BIT; + mmesa->PointsFunc = 0; + mmesa->IndirectTriangles |= DD_POINT_SW_RASTERIZE; + } + + if (flags & LINE_FALLBACK) { + mmesa->renderindex |= MGA_FALLBACK_BIT; + mmesa->LineFunc = 0; + mmesa->IndirectTriangles |= DD_LINE_SW_RASTERIZE; + } + + if (flags & TRI_FALLBACK) { + mmesa->renderindex |= MGA_FALLBACK_BIT; + mmesa->TriangleFunc = 0; + mmesa->QuadFunc = 0; + mmesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | + DD_QUAD_SW_RASTERIZE); + } + /* Special cases: + */ + if ((flags & DD_TRI_STIPPLE) && + (ctx->IndirectTriangles & DD_TRI_STIPPLE)) { + mmesa->renderindex |= MGA_FALLBACK_BIT; + mmesa->TriangleFunc = 0; + mmesa->QuadFunc = 0; + mmesa->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | + DD_QUAD_SW_RASTERIZE); + } + } } + + diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatris.h b/xc/lib/GL/mesa/src/drv/mga/mgatris.h index dcf697409..5da20e6ce 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatris.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgatris.h @@ -23,22 +23,18 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ +/* $XFree86$ */ #ifndef MGATIS_INC #define MGATIS_INC #include "types.h" +#include "mgaioctl.h" extern void mgaDDChooseRenderState(GLcontext *ctx); extern void mgaDDTrifuncInit( void ); -/* Todo: - * - Antialiasing (?) - * - line and polygon stipple - * - stencil - */ -#define MGA_ANTIALIAS_BIT 0 /* ignored for now, no fallback */ #define MGA_FLAT_BIT 0x1 #define MGA_OFFSET_BIT 0x2 #define MGA_TWOSIDE_BIT 0x4 @@ -54,9 +50,28 @@ static __inline void mga_draw_triangle( mgaContextPtr mmesa, mgaVertex *v2 ) { mgaUI32 vertsize = mmesa->vertsize; - mgaUI32 *wv = mgaAllocVertexDwords( mmesa, 3 * vertsize ); + mgaUI32 *wv = mgaAllocVertexDwordsInline( mmesa, 3 * vertsize ); int j; +#if defined (USE_X86_ASM) + /* GTH: We can safely assume the vertex stride is some number of + * dwords, and thus a "rep movsd" is okay. The vb pointer is + * automagically updated with this instruction, so we don't have + * to manually take care of incrementing it. + */ + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "D" ((long)wv), "S" ((long)v0) + : "memory" ); + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "S" ((long)v1) + : "memory" ); + __asm__ __volatile__( "rep ; movsl" + : "=%c" (j) + : "0" (vertsize), "S" ((long)v2) + : "memory" ); +#else for (j = 0 ; j < vertsize ; j++) wv[j] = v0->ui[j]; @@ -67,6 +82,7 @@ static __inline void mga_draw_triangle( mgaContextPtr mmesa, wv += vertsize; for (j = 0 ; j < vertsize ; j++) wv[j] = v2->ui[j]; +#endif } @@ -77,38 +93,38 @@ static __inline void mga_draw_point( mgaContextPtr mmesa, mgaUI32 *wv = mgaAllocVertexDwords( mmesa, 6*vertsize); int j; - *(float *)&wv[0] = tmp->warp1.x - sz; - *(float *)&wv[1] = tmp->warp1.y - sz; + *(float *)&wv[0] = tmp->v.x - sz; + *(float *)&wv[1] = tmp->v.y - sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp->warp1.x + sz; - *(float *)&wv[1] = tmp->warp1.y - sz; + *(float *)&wv[0] = tmp->v.x + sz; + *(float *)&wv[1] = tmp->v.y - sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp->warp1.x + sz; - *(float *)&wv[1] = tmp->warp1.y + sz; + *(float *)&wv[0] = tmp->v.x + sz; + *(float *)&wv[1] = tmp->v.y + sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp->warp1.x + sz; - *(float *)&wv[1] = tmp->warp1.y + sz; + *(float *)&wv[0] = tmp->v.x + sz; + *(float *)&wv[1] = tmp->v.y + sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp->warp1.x - sz; - *(float *)&wv[1] = tmp->warp1.y + sz; + *(float *)&wv[0] = tmp->v.x - sz; + *(float *)&wv[1] = tmp->v.y + sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp->warp1.x - sz; - *(float *)&wv[1] = tmp->warp1.y - sz; + *(float *)&wv[0] = tmp->v.x - sz; + *(float *)&wv[1] = tmp->v.y - sz; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp->ui[j]; } @@ -124,8 +140,8 @@ static __inline void mga_draw_line( mgaContextPtr mmesa, float dx, dy, ix, iy; int j; - dx = tmp0->warp1.x - tmp1->warp1.x; - dy = tmp0->warp1.y - tmp1->warp1.y; + dx = tmp0->v.x - tmp1->v.x; + dy = tmp0->v.y - tmp1->v.y; ix = width * .5; iy = 0; @@ -136,38 +152,38 @@ static __inline void mga_draw_line( mgaContextPtr mmesa, iy = ix; ix = 0; } - *(float *)&wv[0] = tmp0->warp1.x - ix; - *(float *)&wv[1] = tmp0->warp1.y - iy; + *(float *)&wv[0] = tmp0->v.x - ix; + *(float *)&wv[1] = tmp0->v.y - iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp0->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp1->warp1.x + ix; - *(float *)&wv[1] = tmp1->warp1.y + iy; + *(float *)&wv[0] = tmp1->v.x + ix; + *(float *)&wv[1] = tmp1->v.y + iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp1->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp0->warp1.x + ix; - *(float *)&wv[1] = tmp0->warp1.y + iy; + *(float *)&wv[0] = tmp0->v.x + ix; + *(float *)&wv[1] = tmp0->v.y + iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp0->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp0->warp1.x - ix; - *(float *)&wv[1] = tmp0->warp1.y - iy; + *(float *)&wv[0] = tmp0->v.x - ix; + *(float *)&wv[1] = tmp0->v.y - iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp0->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp1->warp1.x - ix; - *(float *)&wv[1] = tmp1->warp1.y - iy; + *(float *)&wv[0] = tmp1->v.x - ix; + *(float *)&wv[1] = tmp1->v.y - iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp1->ui[j]; wv += vertsize; - *(float *)&wv[0] = tmp1->warp1.x + ix; - *(float *)&wv[1] = tmp1->warp1.y + iy; + *(float *)&wv[0] = tmp1->v.x + ix; + *(float *)&wv[1] = tmp1->v.y + iy; for (j = 2 ; j < vertsize ; j++) wv[j] = tmp1->ui[j]; wv += vertsize; diff --git a/xc/lib/GL/mesa/src/drv/mga/mgatritmp.h b/xc/lib/GL/mesa/src/drv/mga/mgatritmp.h index 2a9d16b86..03901443b 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgatritmp.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgatritmp.h @@ -1,94 +1,109 @@ +/* $XFree86$ */ -static __inline void TAG(triangle)( GLcontext *ctx, GLuint e0, - GLuint e1, GLuint e2, GLuint pv ) +static __inline void TAG(triangle)(GLcontext *ctx, + GLuint e0, GLuint e1, GLuint e2, + GLuint pv) { - mgaContextPtr mmesa = MGA_CONTEXT( ctx ); - GLuint vertsize = mmesa->vertsize; - mgaUI32 *wv = mgaAllocVertexDwords( mmesa, 3 * vertsize); - - struct vertex_buffer *VB = ctx->VB; - mgaVertexPtr mgaVB = MGA_DRIVER_DATA(VB)->verts; - const mgaVertex *v[3]; - int i, j; + mgaContextPtr mmesa = MGA_CONTEXT(ctx); + struct vertex_buffer *VB = ctx->VB; + mgaVertexPtr mgaverts = MGA_DRIVER_DATA(VB)->verts; + mgaVertex *v[3]; #if (IND & MGA_OFFSET_BIT) - GLfloat offset = ctx->Polygon.OffsetUnits * 1.0/0x10000; + GLfloat offset; + GLfloat z[3]; #endif -#if (IND & (MGA_FLAT_BIT|MGA_TWOSIDE_BIT)) - mgaUI32 c[3]; - - c[2] = c[1] = c[0] = *(mgaUI32 *)&mgaVB[pv].warp2.color; +#if (IND & (MGA_TWOSIDE_BIT | MGA_FLAT_BIT)) + GLuint c[3]; #endif - (void) VB; + v[0] = &mgaverts[e0]; + v[1] = &mgaverts[e1]; + v[2] = &mgaverts[e2]; - v[0] = &mgaVB[e0]; - v[1] = &mgaVB[e1]; - v[2] = &mgaVB[e2]; +#if (IND & (MGA_TWOSIDE_BIT | MGA_FLAT_BIT)) + c[0] = v[0]->ui[4]; + c[1] = v[1]->ui[4]; + c[2] = v[2]->ui[4]; +#endif -#if (IND & (MGA_TWOSIDE_BIT|MGA_OFFSET_BIT)) +#if (IND & (MGA_TWOSIDE_BIT | MGA_OFFSET_BIT)) { - GLfloat ex = v[0]->warp1.x - v[2]->warp1.x; - GLfloat ey = v[0]->warp1.y - v[2]->warp1.y; - GLfloat fx = v[1]->warp1.x - v[2]->warp1.x; - GLfloat fy = v[1]->warp1.y - v[2]->warp1.y; - GLfloat cc = ex*fy-ey*fx; - -#if (IND & MGA_TWOSIDE_BIT) + GLfloat ex = v[0]->v.x - v[2]->v.x; + GLfloat ey = v[0]->v.y - v[2]->v.y; + GLfloat fx = v[1]->v.x - v[2]->v.x; + GLfloat fy = v[1]->v.y - v[2]->v.y; + GLfloat cc = ex*fy - ey*fx; + +#if (IND & MGA_TWOSIDE_BIT) { - GLuint facing = (cc>0.0) ^ ctx->Polygon.FrontBit; + GLuint facing = (cc > 0.0) ^ ctx->Polygon.FrontBit; GLubyte (*vbcolor)[4] = VB->Color[facing]->data; if (IND & MGA_FLAT_BIT) { - MGA_COLOR((char *)&c[0],vbcolor[pv]); - c[2] = c[1] = c[0]; + MGA_COLOR((char *)&v[0]->ui[4], vbcolor[pv]); + v[2]->ui[4] = v[1]->ui[4] = v[0]->ui[4]; } else { - MGA_COLOR((char *)&c[0],vbcolor[e0]); - MGA_COLOR((char *)&c[1],vbcolor[e1]); - MGA_COLOR((char *)&c[2],vbcolor[e2]); + MGA_COLOR((char *)&v[0]->ui[4], vbcolor[e0]); + MGA_COLOR((char *)&v[1]->ui[4], vbcolor[e1]); + MGA_COLOR((char *)&v[2]->ui[4], vbcolor[e2]); } } #endif - -#if (IND & MGA_OFFSET_BIT) + +#if (IND & MGA_OFFSET_BIT) { + offset = ctx->Polygon.OffsetUnits * mmesa->depth_scale; + z[0] = v[0]->v.z; + z[1] = v[1]->v.z; + z[2] = v[2]->v.z; if (cc * cc > 1e-16) { - GLfloat factor = ctx->Polygon.OffsetFactor; - GLfloat ez = v[0]->warp1.z - v[2]->warp1.z; - GLfloat fz = v[1]->warp1.z - v[2]->warp1.z; - GLfloat a = ey*fz-ez*fy; - GLfloat b = ez*fx-ex*fz; - GLfloat ic = 1.0 / cc; - GLfloat ac = a * ic; - GLfloat bc = b * ic; - if (ac<0.0F) ac = -ac; - if (bc<0.0F) bc = -bc; - offset += MAX2( ac, bc ) * factor; + GLfloat ez = z[0] - z[2]; + GLfloat fz = z[1] - z[2]; + GLfloat a = ey*fz - ez*fy; + GLfloat b = ez*fx - ex*fz; + GLfloat ic = 1.0 / cc; + GLfloat ac = a * ic; + GLfloat bc = b * ic; + if (ac < 0.0f) ac = -ac; + if (bc < 0.0f) bc = -bc; + offset += MAX2(ac, bc) * ctx->Polygon.OffsetFactor; } + v[0]->v.z += offset; + v[1]->v.z += offset; + v[2]->v.z += offset; } #endif } -#endif - - mgaglx.c_triangles++; - - for (j = 0 ; j < 3 ; j++, wv += vertsize) { +#elif (IND & MGA_FLAT_BIT) + { + GLuint color = mgaverts[pv].ui[4]; + v[0]->ui[4] = color; + v[1]->ui[4] = color; + v[2]->ui[4] = color; + } +#endif - for (i = 0 ; i < vertsize ; i++) - wv[i] = v[j]->ui[i]; + mga_draw_triangle( mmesa, v[0], v[1], v[2] ); -#if (IND & (MGA_FLAT_BIT|MGA_TWOSIDE_BIT)) - wv[4] = c[j]; /* color is the fifth element... */ -#endif #if (IND & MGA_OFFSET_BIT) - *(float *)&wv[2] = v[j]->warp1.z + offset; + v[0]->v.z = z[0]; + v[1]->v.z = z[1]; + v[2]->v.z = z[2]; #endif - } + +#if (IND & (MGA_FLAT_BIT | MGA_TWOSIDE_BIT)) + v[0]->ui[4] = c[0]; + v[1]->ui[4] = c[1]; + v[2]->ui[4] = c[2]; +#endif + } + static void TAG(quad)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3, GLuint pv ) @@ -103,30 +118,48 @@ static void TAG(line)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv ) mgaContextPtr mmesa = MGA_CONTEXT( ctx ); mgaVertexPtr mgaVB = MGA_DRIVER_DATA(ctx->VB)->verts; float width = ctx->Line.Width; + GLfloat z0, z1; + GLuint c0, c1; + mgaVertex *vert0 = &mgaVB[v0]; + mgaVertex *vert1 = &mgaVB[v1]; - if (IND & (MGA_TWOSIDE_BIT|MGA_FLAT_BIT)) { - mgaVertex tmp0 = mgaVB[v0]; - mgaVertex tmp1 = mgaVB[v1]; - - if (IND & MGA_TWOSIDE_BIT) { - GLubyte (*vbcolor)[4] = ctx->VB->ColorPtr->data; - if (IND & MGA_FLAT_BIT) { - MGA_COLOR((char *)&tmp0.warp1.color,vbcolor[pv]); - *(int *)&tmp1.warp1.color = *(int *)&tmp0.warp1.color; - } else { - MGA_COLOR((char *)&tmp0.warp1.color,vbcolor[v0]); - MGA_COLOR((char *)&tmp1.warp1.color,vbcolor[v1]); - } + if (IND & MGA_TWOSIDE_BIT) { + GLubyte (*vbcolor)[4] = ctx->VB->ColorPtr->data; + if (IND & MGA_FLAT_BIT) { + MGA_COLOR((char *)&vert0->v.color,vbcolor[pv]); + *(int *)&vert1->v.color = *(int *)&vert0->v.color; } else { - *(int *)&tmp0.warp1.color = *(int *)&mgaVB[pv].warp1.color; - *(int *)&tmp1.warp1.color = *(int *)&mgaVB[pv].warp1.color; + MGA_COLOR((char *)&vert0->v.color,vbcolor[v0]); + MGA_COLOR((char *)&vert1->v.color,vbcolor[v1]); } - mga_draw_line( mmesa, &tmp0, &tmp1, width ); + } else if (IND & MGA_FLAT_BIT) { + c0 = *(GLuint *) &(vert0->v.color); + c1 = *(GLuint *) &(vert1->v.color); + *(int *)&vert0->v.color = + *(int *)&vert1->v.color = *(int *)&mgaVB[pv].v.color; + } + + if (IND & MGA_OFFSET_BIT) { + GLfloat offset = ctx->LineZoffset * mmesa->depth_scale; + z0 = vert0->v.z; + z1 = vert1->v.z; + vert0->v.z += offset; + vert1->v.z += offset; + } + + mga_draw_line( mmesa, &mgaVB[v0], &mgaVB[v1], width ); + + if (IND & MGA_OFFSET_BIT) { + vert0->v.z = z0; + vert1->v.z = z1; + } + + if ((IND & MGA_FLAT_BIT) && !(IND & MGA_TWOSIDE_BIT)) { + *(GLuint *) &(vert0->v.color) = c0; + *(GLuint *) &(vert1->v.color) = c1; } - else - mga_draw_line( mmesa, &mgaVB[v0], &mgaVB[v1], width ); } @@ -140,10 +173,16 @@ static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last ) for(i=first;i<=last;i++) if(VB->ClipMask[i]==0) { - if (IND & MGA_TWOSIDE_BIT) { - GLubyte (*vbcolor)[4] = VB->ColorPtr->data; + if (IND & (MGA_TWOSIDE_BIT|MGA_OFFSET_BIT)) { mgaVertex tmp0 = mgaVB[i]; - MGA_COLOR((char *)&tmp0.warp1.color, vbcolor[i]); + if (IND & MGA_TWOSIDE_BIT) { + GLubyte (*vbcolor)[4] = VB->ColorPtr->data; + MGA_COLOR((char *)&tmp0.v.color, vbcolor[i]); + } + if (IND & MGA_OFFSET_BIT) { + GLfloat offset = ctx->PointZoffset * mmesa->depth_scale; + tmp0.v.z += offset; + } mga_draw_point( mmesa, &tmp0, sz ); } else mga_draw_point( mmesa, &mgaVB[i], sz ); @@ -157,10 +196,8 @@ static void TAG(init)( void ) { tri_tab[IND] = TAG(triangle); quad_tab[IND] = TAG(quad); - line_tab[IND] = TAG(line); points_tab[IND] = TAG(points); - } diff --git a/xc/lib/GL/mesa/src/drv/mga/mgavb.c b/xc/lib/GL/mesa/src/drv/mga/mgavb.c index cacb42886..c0a74ced6 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgavb.c +++ b/xc/lib/GL/mesa/src/drv/mga/mgavb.c @@ -23,46 +23,48 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ +/* $XFree86$ */ #include "mgalib.h" #include "mgavb.h" #include "mgalog.h" #include "stages.h" +#include "mem.h" #include <stdio.h> #include <stdlib.h> #define TEX0 { \ - v->warp2.tu0 = tc0[i][0]; \ - v->warp2.tv0 = tc0[i][1]; \ + v->v.tu0 = tc0[i][0]; \ + v->v.tv0 = tc0[i][1]; \ } #define TEX1 { \ - v->warp2.tu1 = tc1[i][0]; \ - v->warp2.tv1 = tc1[i][1]; \ + v->v.tu1 = tc1[i][0]; \ + v->v.tv1 = tc1[i][1]; \ } #define SPC { \ GLubyte *spec = &(VB->Spec[0][i][0]); \ - v->warp2.specular.red = spec[0]; \ - v->warp2.specular.green = spec[1]; \ - v->warp2.specular.blue = spec[2]; \ + v->v.specular.red = spec[0]; \ + v->v.specular.green = spec[1]; \ + v->v.specular.blue = spec[2]; \ } #define FOG { \ GLubyte *spec = &(VB->Spec[0][i][0]); \ - v->warp2.specular.alpha = spec[3]; \ + v->v.specular.alpha = spec[3]; \ } #define COL { \ GLubyte *col = &(VB->Color[0]->data[i][0]); \ - v->warp2.color.blue = col[2]; \ - v->warp2.color.green = col[1]; \ - v->warp2.color.red = col[0]; \ - v->warp2.color.alpha = col[3]; \ + v->v.color.blue = col[2]; \ + v->v.color.green = col[1]; \ + v->v.color.red = col[0]; \ + v->v.color.alpha = col[3]; \ } -/* The warp2 code we have doesn't seem to support projective texturing +/* The v code we have doesn't seem to support projective texturing * in the multitexture case. (Would require another 1/w value for the * second set of texcoords). This may be a problem for the g400. */ @@ -74,19 +76,19 @@ mmesa->setupdone &= ~MGA_WIN_BIT; \ for (i=start; i < end; i++, v++) { \ float oow = 1.0 / tc[i][3]; \ - v->warp2.rhw *= tc[i][3]; \ - v->warp2.tu0 *= oow; \ - v->warp2.tv0 *= oow; \ + v->v.rhw *= tc[i][3]; \ + v->v.tu0 *= oow; \ + v->v.tv0 *= oow; \ } \ } #define COORD \ GLfloat *win = VB->Win.data[i]; \ - v->warp2.rhw = win[3]; \ - v->warp2.z = (1.0/0x10000) * win[2]; \ - v->warp2.x = win[0] + xoffset; \ - v->warp2.y = - win[1] + yoffset; + v->v.rhw = win[3]; \ + v->v.z = depth_scale * win[2]; \ + v->v.x = win[0] + xoffset; \ + v->v.y = - win[1] + yoffset; #define NOP @@ -100,11 +102,12 @@ static void name(struct vertex_buffer *VB, GLuint start, GLuint end) \ mgaVertexPtr v; \ GLfloat (*tc0)[4]; \ GLfloat (*tc1)[4]; \ - GLfloat xoffset = mmesa->drawX + SUBPIXEL_X; \ - GLfloat yoffset = mmesa->driDrawable->h + mmesa->drawY + SUBPIXEL_Y; \ + const GLfloat depth_scale = mmesa->depth_scale; \ + const GLfloat xoffset = mmesa->drawX + SUBPIXEL_X; \ + const GLfloat yoffset = mmesa->driDrawable->h + mmesa->drawY + \ + SUBPIXEL_Y; \ int i; \ - (void) xoffset; (void) yoffset; \ - if (0) fprintf(stderr, "V"); \ + (void) xoffset; (void) yoffset; (void) depth_scale; \ gl_import_client_data( VB, VB->ctx->RenderFlags, \ (VB->ClipOrMask \ ? VEC_WRITABLE|VEC_GOOD_STRIDE \ @@ -420,6 +423,10 @@ static void FatalError( char *s ) } +#ifndef ALIGN_MALLOC +#define ALIGN_MALLOC(x,y) malloc(y) +#define ALIGN_FREE free +#endif void mgaDDResizeVB( struct vertex_buffer *VB, GLuint size ) { @@ -440,8 +447,8 @@ void mgaDDResizeVB( struct vertex_buffer *VB, GLuint size ) if (!mvb->clipped_elements.start) FatalError("mga-glx: out of memory !\n"); - free( VB->ClipMask ); - VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * mvb->size); + ALIGN_FREE( VB->ClipMask ); + VB->ClipMask = (GLubyte *)ALIGN_MALLOC(4, sizeof(GLubyte) * mvb->size); if (!VB->ClipMask) FatalError("mga-glx: out of memory !\n"); @@ -477,8 +484,8 @@ void mgaDDRegisterVB( struct vertex_buffer *VB ) if (!mvb->clipped_elements.start) FatalError("mga-glx: out of memory !\n"); - free( VB->ClipMask ); - VB->ClipMask = (GLubyte *)malloc(sizeof(GLubyte) * mvb->size); + ALIGN_FREE( VB->ClipMask ); + VB->ClipMask = (GLubyte *)ALIGN_MALLOC(4, sizeof(GLubyte) * mvb->size); if (!VB->ClipMask) FatalError("mga-glx: out of memory !\n"); diff --git a/xc/lib/GL/mesa/src/drv/mga/mgavb.h b/xc/lib/GL/mesa/src/drv/mga/mgavb.h index 675c1779c..7af1daf12 100644 --- a/xc/lib/GL/mesa/src/drv/mga/mgavb.h +++ b/xc/lib/GL/mesa/src/drv/mga/mgavb.h @@ -23,6 +23,7 @@ * * Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de> */ +/* $XFree86$ */ #ifndef MGAVB_INC #define MGAVB_INC @@ -46,35 +47,25 @@ typedef struct mga_warp_color_t { } mga_warp_color; -/* - * vertex type used for the single-warp g200 - */ -typedef struct mga_warp_vertex_t { - GLfloat x,y,z; /* coordinates in screen space*/ - GLfloat rhw; /* reciprocal homogeneous w */ - mga_warp_color color; /* vertex color */ - mga_warp_color specular; /* specular color, alpha is fog */ - GLfloat tu0,tv0; /* texture coordinates */ -} mga_warp_vertex1; /* - * vertex type used for the dual-warp g400 + * The vertex structure. The final tu1/tv1 values only used in multitexture + * modes. */ -typedef struct mga_warp_vertex2_t { +typedef struct mga_warp_vertex_t { GLfloat x,y,z; /* coordinates in screen space*/ GLfloat rhw; /* reciprocal homogeneous w */ mga_warp_color color; /* vertex color */ mga_warp_color specular; /* specular color, alpha is fog */ GLfloat tu0,tv0; /* texture coordinates */ GLfloat tu1,tv1; /* same for second stage */ -} mga_warp_vertex2; +} mga_warp_vertex; /* The fastpath code still expects a 16-float stride vertex. */ union mga_vertex_t { - mga_warp_vertex1 warp1; - mga_warp_vertex2 warp2; + mga_warp_vertex v; float f[16]; mgaUI32 ui[16]; }; diff --git a/xc/lib/GL/mesa/src/drv/r128/Imakefile b/xc/lib/GL/mesa/src/drv/r128/Imakefile index 3a0ef541a..98d35d236 100644 --- a/xc/lib/GL/mesa/src/drv/r128/Imakefile +++ b/xc/lib/GL/mesa/src/drv/r128/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.4 2000/06/26 05:41:29 martin Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.4tsi Exp $ #include <Threads.tmpl> @@ -42,7 +42,8 @@ LinkSourceFile(mm.h, ../common) LinkSourceFile(hwlog.c, ../common) LinkSourceFile(hwlog.h, ../common) -MESA_INCLUDES = -I. -I.. -I../../include +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFINES) INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(MESA_INCLUDES) $(DRI_INCLUDES) diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_cce.c b/xc/lib/GL/mesa/src/drv/r128/r128_cce.c index ae470e2e5..44d74c6b0 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_cce.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_cce.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_cce.h b/xc/lib/GL/mesa/src/drv/r128/r128_cce.h index b4778b731..36748b68e 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_cce.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_cce.h @@ -199,5 +199,14 @@ do { \ UNLOCK_HARDWARE( r128ctx ); \ } while (0) +#define FLUSH_BATCH( r128ctx ) \ +do { \ + if ( R128_DEBUG_FLAGS & DEBUG_VERBOSE_IOCTL ) \ + fprintf( stderr, "FLUSH_BATCH in %s\n", __FUNCTION__ ); \ + if ( r128ctx->vert_buf ) { \ + r128FlushVertices( r128ctx ); \ + } \ +} while (0) + #endif #endif /* _R128_CCE_H_ */ diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_clear.c b/xc/lib/GL/mesa/src/drv/r128/r128_clear.c index 41707930a..30cfd598d 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_clear.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_clear.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -55,6 +54,9 @@ void r128ClearDepthBuffer(r128ContextPtr r128ctx, GLboolean all, if (!(r128ctx->regs.tex_cntl_c & R128_Z_WRITE_ENABLE)) return; + /* Flush any outstanding vertex buffers */ + FLUSH_BATCH(r128ctx); + switch (r128ctx->regs.z_sten_cntl_c & R128_Z_PIX_WIDTH_MASK) { case R128_Z_PIX_WIDTH_16: write_mask = 0x0000ffff; @@ -81,9 +83,6 @@ void r128ClearDepthBuffer(r128ContextPtr r128ctx, GLboolean all, LOCK_HARDWARE(r128ctx); - /* Flush any outstanding vertex buffers */ - r128FlushVerticesLocked(r128ctx); - /* Init the clip rects here in case they changed during the LOCK_HARDWARE macro */ c = dPriv->pClipRects; @@ -145,6 +144,9 @@ void r128ClearColorBuffer(r128ContextPtr r128ctx, GLboolean all, XF86DRIClipRectPtr c; int dst_bpp; + /* Flush any outstanding vertex buffers */ + FLUSH_BATCH(r128ctx); + switch (r128ctx->r128Screen->bpp) { case 8: dst_bpp = R128_GMC_DST_8BPP_CI; @@ -172,9 +174,6 @@ void r128ClearColorBuffer(r128ContextPtr r128ctx, GLboolean all, LOCK_HARDWARE(r128ctx); - /* Flush any outstanding vertex buffers */ - r128FlushVerticesLocked(r128ctx); - /* Init the clip rects here in case they changed during the LOCK_HARDWARE macro */ c = dPriv->pClipRects; diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_clear.h b/xc/lib/GL/mesa/src/drv/r128/r128_clear.h index 9087fd48a..7018b05b4 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_clear.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_clear.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_clear.h,v 1.1 2000/06/17 00:03:04 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_context.c b/xc/lib/GL/mesa/src/drv/r128/r128_context.c index ab2046a3b..fabdbabda 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_context.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_context.c @@ -35,7 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_cce.h" @@ -130,6 +129,10 @@ GLboolean r128CreateContext(Display *dpy, GLvisual *glVisual, | DD_TRI_LIGHT_TWOSIDE | DD_TRI_OFFSET); + /* Ask Mesa to clip fog coordinates for us + */ + glCtx->TriangleCaps |= DD_CLIP_FOG_COORD; + /* Reset Mesa's current 2D texture pointers to the driver's textures */ glCtx->Shared->DefaultD[2][0].DriverData = NULL; glCtx->Shared->DefaultD[2][1].DriverData = NULL; @@ -166,9 +169,9 @@ GLboolean r128CreateContext(Display *dpy, GLvisual *glVisual, /* Register the fast path */ if (glCtx->NrPipelineStages) glCtx->NrPipelineStages = - r128RegisterPipelineStages(glCtx->PipelineStage, - glCtx->PipelineStage, - glCtx->NrPipelineStages); + r128DDRegisterPipelineStages(glCtx->PipelineStage, + glCtx->PipelineStage, + glCtx->NrPipelineStages); r128DDInitState(r128ctx); diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_context.h b/xc/lib/GL/mesa/src/drv/r128/r128_context.h index 2cc257a0c..ae8ef6a2d 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_context.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_context.h @@ -42,7 +42,6 @@ typedef struct r128_context r128ContextRec; typedef struct r128_context *r128ContextPtr; #include "r128_texobj.h" -#include "r128_fastpath.h" /* Flags for what needs to be updated before a new primitive is rendered */ #define R128_CLEAN 0x0000 @@ -62,7 +61,6 @@ typedef struct r128_context *r128ContextPtr; #define R128_CTX_TEX1STATE 0x0008 #define R128_CTX_TEXENVSTATE 0x0010 #define R128_CTX_FOGSTATE 0x0020 -#define R128_CTX_FOGTABLE 0x0040 #define R128_CTX_ZSTENSTATE 0x0080 #define R128_CTX_SCISSORS 0x0100 #define R128_CTX_ALPHASTATE 0x0200 @@ -80,6 +78,12 @@ typedef struct r128_context *r128ContextPtr; #define R128_FALLBACK_SWONLY 0x0020 #define R128_FALLBACK_RENDER_MODE 0x0040 #define R128_FALLBACK_MULTIDRAW 0x0080 +#define R128_FALLBACK_LOGICOP 0x0100 + +typedef void (*r128InterpFunc)( GLfloat t, + GLfloat *result, + const GLfloat *in, + const GLfloat *out ); /* NOTE: The groups below need to be kept together so that a single memcpy can be used to transfer data to the ring buffer */ @@ -130,10 +134,6 @@ typedef struct { CARD32 pm4_vc_fpu_setup; /* 0x071c */ - CARD32 fog_3d_table_start; /* 0x1810 */ - CARD32 fog_3d_table_end; - CARD32 fog_3d_table_density; /* 0x181c */ - CARD32 window_xy_offset; /* 0x1bcc */ CARD32 dp_write_mask; /* 0x16cc */ @@ -165,8 +165,6 @@ struct r128_context { CARD32 lastSwapAge; /* Last known swap age */ - GLenum FogMode; /* Current fog equation */ - int Scissor; XF86DRIClipRectRec ScissorRect; /* Current software scissor */ @@ -232,9 +230,11 @@ struct r128_context { int c_vertexBuffers; }; -#define R128_MESACTX(r128ctx) ((r128ctx)->glCtx) -#define R128_DRIDRAWABLE(r128ctx) ((r128ctx)->driDrawable) -#define R128_DRISCREEN(r128ctx) ((r128ctx)->r128Screen->driScreen) +#define R128_CONTEXT(ctx) ((r128ContextPtr)(ctx->DriverCtx)) + +#define R128_MESACTX(r128ctx) ((r128ctx)->glCtx) +#define R128_DRIDRAWABLE(r128ctx) ((r128ctx)->driDrawable) +#define R128_DRISCREEN(r128ctx) ((r128ctx)->r128Screen->driScreen) extern GLboolean r128CreateContext(Display *dpy, GLvisual *glVisual, __DRIcontextPrivate *driContextPriv); diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_dd.c b/xc/lib/GL/mesa/src/drv/r128/r128_dd.c index a2009f167..74cb2e2cd 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_dd.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_dd.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -45,6 +44,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_pipeline.h" #include "r128_dd.h" +#include "extensions.h" + /* Driver entry point for clearing color and ancillary buffers */ static GLbitfield r128DDClear(GLcontext *ctx, GLbitfield mask, GLboolean all, GLint x, GLint y, GLint width, GLint height) @@ -97,7 +98,7 @@ static const GLubyte *r128DDGetString(GLcontext *ctx, GLenum name) case GL_VENDOR: return (GLubyte *)"Precision Insight, Inc."; case GL_RENDERER: - return (GLubyte *)"Mesa DRI Rage128 20000613"; + return (GLubyte *)"Mesa DRI Rage128 20000630"; default: return NULL; } @@ -111,7 +112,7 @@ static void r128DDFlush(GLcontext *ctx) { r128ContextPtr r128ctx = R128_CONTEXT(ctx); - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); #if ENABLE_PERF_BOXES if (r128ctx->boxes) { @@ -169,6 +170,13 @@ void r128DDInitExtensions(GLcontext *ctx) if (getenv("LIBGL_NO_MULTITEXTURE")) gl_extensions_disable(ctx, "GL_ARB_multitexture"); + + gl_extensions_disable( ctx, "GL_SGI_color_matrix" ); + gl_extensions_disable( ctx, "GL_SGI_color_table" ); + gl_extensions_disable( ctx, "GL_SGIX_pixel_texture" ); + gl_extensions_disable( ctx, "GL_ARB_texture_cube_map" ); + gl_extensions_disable( ctx, "GL_ARB_texture_compression" ); + gl_extensions_disable( ctx, "GL_EXT_convolution" ); } /* Initialize the driver's misc functions */ diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_dd.h b/xc/lib/GL/mesa/src/drv/r128/r128_dd.h index f58dbd39a..91aa02586 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_dd.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_dd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_dd.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c b/xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c index 11d178f39..ac251a3ad 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_fastpath.c @@ -33,12 +33,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_state.h" #include "r128_vb.h" #include "r128_cce.h" #include "r128_tris.h" -#include "r128_fastpath.h" +#include "r128_pipeline.h" #include "mmath.h" #include "cva.h" @@ -52,6 +51,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. isn't necesary here. */ +typedef void (*r128BuildVerticesFunc)( struct vertex_buffer *VB, + GLuint do_cliptest ); + typedef struct r128_fast_table { r128BuildVerticesFunc build_vertices; r128InterpFunc interp; @@ -467,7 +469,7 @@ static void r128ProjectClippedVertices(struct vertex_buffer *VB) static r128FastPathTable r128FastTab[0x80]; /* Initialize the table of fast path support functions */ -void r128FastPathInit(void) +void r128DDFastPathInit(void) { r128_render_init_clip_elt(); r128_render_init_smooth_indirect(); @@ -483,7 +485,7 @@ void r128FastPathInit(void) #define VALID_SETUP (R128_RGBA_BIT | R128_TEX0_BIT | R128_TEX1_BIT) -void r128FastPath(struct vertex_buffer *VB) +void r128DDFastPath(struct vertex_buffer *VB) { GLcontext *ctx = VB->ctx; GLenum prim = ctx->CVA.elt_mode; @@ -506,7 +508,7 @@ void r128FastPath(struct vertex_buffer *VB) /* Reserve enough space for the pathological case */ if (VB->EltPtr->count * 12 > R128_DRIVER_DATA(VB)->size) { - r128ResizeVB(VB, VB->EltPtr->count * 12); + r128DDResizeVB(VB, VB->EltPtr->count * 12); do_cliptest = 1; } diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h b/xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h index 8f0350e12..a0fc9255e 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_fasttmp.h,v 1.1 2000/06/17 00:03:05 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_init.h b/xc/lib/GL/mesa/src/drv/r128/r128_init.h index 49fb73209..fe8d69c3d 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_init.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_init.h @@ -47,8 +47,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_screen.h" #include "r128_context.h" -#define DEBUG 1 -#define DEBUG_LOCKING 1 +#define DEBUG 0 +#define DEBUG_LOCKING 0 #define ENABLE_PERF_BOXES 0 diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_lock.h b/xc/lib/GL/mesa/src/drv/r128/r128_lock.h index 82d27a91b..91a65c210 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_lock.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_lock.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_lock.h,v 1.1 2000/06/17 00:03:06 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c b/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c index 86537ea33..070b1e509 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.c @@ -2,7 +2,7 @@ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., - Cedar Park, Texas. + Cedar Park, Texas. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -33,91 +33,133 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_vb.h" -#include "r128_fastpath.h" #include "r128_pipeline.h" #include "types.h" - -static struct gl_pipeline_stage r128FastStage = { - "R128 Fast Path", - (PIPE_OP_VERT_XFORM | - PIPE_OP_RAST_SETUP_0 | - PIPE_OP_RAST_SETUP_1 | - PIPE_OP_RENDER), - PIPE_PRECALC, - 0, 0, 0, 0, 0, 0, 0, 0, 0, - r128FastPath +#include "fog.h" + +static struct gl_pipeline_stage r128_fast_stage = { + "R128 Fast Path", + (PIPE_OP_VERT_XFORM | + PIPE_OP_RAST_SETUP_0 | + PIPE_OP_RAST_SETUP_1 | + PIPE_OP_RENDER), + PIPE_PRECALC, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + r128DDFastPath }; +#define ILLEGAL_ENABLES (TEXTURE0_3D | \ + TEXTURE1_3D | \ + ENABLE_TEXMAT0 | \ + ENABLE_TEXMAT1 | \ + ENABLE_TEXGEN0 | \ + ENABLE_TEXGEN1 | \ + ENABLE_USERCLIP | \ + ENABLE_LIGHT | \ + ENABLE_FOG) + /* Build the PRECALC pipeline with our stage, if possible. Otherwise, - return GL_FALSE */ -GLboolean r128DDBuildPrecalcPipeline(GLcontext *ctx) + * return GL_FALSE. + */ +GLboolean r128DDBuildPrecalcPipeline( GLcontext *ctx ) { - r128ContextPtr r128ctx = R128_CONTEXT(ctx); - struct gl_pipeline *pipe = &ctx->CVA.pre; - - if (r128ctx->RenderIndex == 0 && - !(ctx->Enabled & (TEXTURE0_3D | - TEXTURE1_3D | - ENABLE_TEXMAT0 | - ENABLE_TEXMAT1 | - ENABLE_TEXGEN0 | - ENABLE_TEXGEN1 | - ENABLE_USERCLIP | - ENABLE_LIGHT | - ENABLE_FOG)) && + r128ContextPtr r128ctx = R128_CONTEXT(ctx); + struct gl_pipeline *pipe = &ctx->CVA.pre; + + if ( r128ctx->RenderIndex == 0 && + (ctx->Enabled & ILLEGAL_ENABLES) == 0 && (ctx->Array.Flags & (VERT_OBJ_234 | VERT_TEX0_4 | VERT_TEX1_4 | - VERT_ELT)) == (VERT_OBJ_23 | - VERT_ELT)) { - pipe->stages[0] = &r128FastStage; - pipe->stages[1] = 0; - pipe->new_inputs = ctx->RenderFlags & VERT_DATA; - pipe->ops = pipe->stages[0]->ops; - - r128ctx->useFastPath = GL_TRUE; - return GL_TRUE; - } - - if (r128ctx->useFastPath) { - r128ctx->useFastPath = GL_FALSE; - - ctx->CVA.VB->ClipOrMask = 0; - ctx->CVA.VB->ClipAndMask = CLIP_ALL_BITS; - ctx->Array.NewArrayState |= ctx->Array.Summary; - } - - return GL_FALSE; + VERT_ELT)) == (VERT_OBJ_23 | VERT_ELT) ) + { + pipe->stages[0] = &r128_fast_stage; + pipe->stages[1] = 0; + pipe->new_inputs = ctx->RenderFlags & VERT_DATA; + pipe->ops = pipe->stages[0]->ops; + + r128ctx->useFastPath = GL_TRUE; + return GL_TRUE; + } + + if ( r128ctx->useFastPath ) { + r128ctx->useFastPath = GL_FALSE; + + ctx->CVA.VB->ClipOrMask = 0; + ctx->CVA.VB->ClipAndMask = CLIP_ALL_BITS; + ctx->Array.NewArrayState |= ctx->Array.Summary; + } + + return GL_FALSE; } +/* Still do the normal fixup and copy-to-current, so this isn't so + * bad. + */ +#define ILLEGAL_INPUTS_IMM (VERT_OBJ_4 | \ + VERT_TEX0_4 | \ + VERT_TEX1_4 | \ + VERT_MATERIAL) + +static void r128DDCheckRasterSetup( GLcontext *ctx, + struct gl_pipeline_stage *d ) +{ + d->type = PIPE_IMMEDIATE | PIPE_PRECALC; + d->inputs = ctx->RenderFlags; + + /* r128 requires an extra input: + */ + if ( ctx->FogMode == FOG_FRAGMENT ) + d->inputs |= VERT_FOG_COORD; + + d->outputs = VERT_SETUP_FULL; + + if ( ctx->IndirectTriangles & DD_SW_SETUP ) + d->type = PIPE_IMMEDIATE; +} /* Register the pipeline with our stages included */ -GLuint r128RegisterPipelineStages(struct gl_pipeline_stage *out, - const struct gl_pipeline_stage *in, - GLuint nr) +GLuint r128DDRegisterPipelineStages( struct gl_pipeline_stage *out, + const struct gl_pipeline_stage *in, + GLuint nr ) { - int i; - - for (i = 0; i < nr; i++) { - out[i] = in[i]; - switch (in[i].ops) { - case PIPE_OP_RAST_SETUP_0: - out[i].cva_state_change = (NEW_LIGHTING | - NEW_TEXTURING | - NEW_RASTER_OPS); - out[i].state_change = ~0; - out[i].check = r128CheckPartialRasterSetup; - out[i].run = r128PartialRasterSetup; - break; - - case PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1: - out[i].run = r128DoRasterSetup; - break; - } - } - - return nr; + int i, o; + + for ( i = o = 0 ; i < nr ; i++ ) { + switch ( in[i].ops ) { + /* Completely replace Mesa's fog processing to generate fog + * coordinates instead of messing with colors. + */ + case PIPE_OP_FOG: + out[o] = gl_fog_coord_stage; + o++; + break; + + case PIPE_OP_RAST_SETUP_0: + out[o] = in[i]; + out[o].cva_state_change = (NEW_LIGHTING | + NEW_TEXTURING | + NEW_RASTER_OPS); + out[o].state_change = ~0; + out[o].check = r128DDCheckPartialRasterSetup; + out[o].run = r128DDPartialRasterSetup; + o++; + break; + + case PIPE_OP_RAST_SETUP_0 | PIPE_OP_RAST_SETUP_1: + out[o] = in[i]; + out[o].check = r128DDCheckRasterSetup; + out[o].run = r128DDDoRasterSetup; + o++; + break; + + default: + out[o++] = in[i]; + break; + } + } + + return o; } diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h b/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h index 0a35e16f9..e8d077bfc 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_pipeline.h @@ -2,7 +2,7 @@ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., - Cedar Park, Texas. + Cedar Park, Texas. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -35,9 +35,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef _R128_PIPELINE_H_ #define _R128_PIPELINE_H_ -extern GLboolean r128DDBuildPrecalcPipeline(GLcontext *ctx); -extern GLuint r128RegisterPipelineStages(struct gl_pipeline_stage *out, +extern GLboolean r128DDBuildPrecalcPipeline( GLcontext *ctx ); +extern GLuint r128DDRegisterPipelineStages( struct gl_pipeline_stage *out, const struct gl_pipeline_stage *in, - GLuint nr); + GLuint nr ); + +extern void r128DDFastPathInit( void ); +extern void r128DDFastPath( struct vertex_buffer *VB ); #endif /* _R128_PIPELINE_H_ */ diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_screen.c b/xc/lib/GL/mesa/src/drv/r128/r128_screen.c index ff23134d0..0ffa37348 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_screen.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_screen.c @@ -41,7 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_cce.h" #include "r128_tris.h" #include "r128_vb.h" -#include "r128_fastpath.h" +#include "r128_pipeline.h" #include <sys/mman.h> @@ -108,7 +108,6 @@ r128ScreenPtr r128CreateScreen(__DRIscreenPrivate *sPriv) return NULL; } r128Screen->vbOffset = r128DRIPriv->vbOffset; - r128Screen->vbBufSize = r128DRIPriv->vbBufSize; r128Screen->indRgn.handle = r128DRIPriv->indHandle; r128Screen->indRgn.size = r128DRIPriv->indMapSize; @@ -156,6 +155,13 @@ r128ScreenPtr r128CreateScreen(__DRIscreenPrivate *sPriv) } } + /* Allow both AGP and PCI cards to use vertex buffers. PCI cards use + * the ring walker method, ie. the vertex buffer data is actually part + * of the command stream. + */ + r128Screen->vbMapSize = r128DRIPriv->vbMapSize; + r128Screen->vbBufSize = r128DRIPriv->vbBufSize; + r128Screen->deviceID = r128DRIPriv->deviceID; r128Screen->width = r128DRIPriv->width; @@ -231,9 +237,9 @@ r128ScreenPtr r128CreateScreen(__DRIscreenPrivate *sPriv) r128InitVertexBuffers(r128Screen); - r128FastPathInit(); - r128TriangleFuncsInit(); - r128SetupInit(); + r128DDFastPathInit(); + r128DDTriangleFuncsInit(); + r128DDSetupInit(); return r128Screen; } diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_screen.h b/xc/lib/GL/mesa/src/drv/r128/r128_screen.h index 2a64bd6ba..775af5073 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_screen.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_screen.h @@ -2,7 +2,7 @@ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., - Cedar Park, Texas. + Cedar Park, Texas. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a @@ -60,6 +60,7 @@ typedef struct { r128RegionRec vbRgn; unsigned char *vb; int vbOffset; + int vbMapSize; int vbBufSize; drmBufMapPtr vbBufs; diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_span.c b/xc/lib/GL/mesa/src/drv/r128/r128_span.c index c937a4bc9..6f5bb4f0c 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_span.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_span.c @@ -35,7 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -94,6 +93,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define HW_LOCK() \ r128ContextPtr r128ctx = R128_CONTEXT(ctx); \ + FLUSH_BATCH(r128ctx); \ LOCK_HARDWARE(r128ctx); \ r128WaitForIdleLocked(r128ctx); diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_span.h b/xc/lib/GL/mesa/src/drv/r128/r128_span.h index e1cab0a48..f83a4da9f 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_span.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_span.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_span.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_state.c b/xc/lib/GL/mesa/src/drv/r128/r128_state.c index ff341d22f..42e602ae6 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_state.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_state.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -69,8 +68,8 @@ static void r128DDUpdateState(GLcontext *ctx) r128UpdateHWState(r128ctx); if (ctx->NewState & INTERESTED) { - r128ChooseRenderState(ctx); - r128ChooseRasterSetupFunc(ctx); + r128DDChooseRenderState(ctx); + r128DDChooseRasterSetupFunc(ctx); } if (!r128ctx->Fallback) { @@ -124,7 +123,7 @@ static void r128DDReducedPrimitiveChange(GLcontext *ctx, GLenum prim) } if (r128ctx->regs.pm4_vc_fpu_setup != f) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.pm4_vc_fpu_setup = f; /* FIXME: Load into hardware now??? */ @@ -163,11 +162,15 @@ static GLboolean r128DDSetDrawBuffer(GLcontext *ctx, GLenum mode) case GL_FRONT_LEFT: r128ctx->drawX = r128ctx->r128Screen->fbX; r128ctx->drawY = r128ctx->r128Screen->fbY; + r128ctx->readX = r128ctx->r128Screen->fbX; + r128ctx->readY = r128ctx->r128Screen->fbY; found = GL_TRUE; break; case GL_BACK_LEFT: r128ctx->drawX = r128ctx->r128Screen->backX; r128ctx->drawY = r128ctx->r128Screen->backY; + r128ctx->readX = r128ctx->r128Screen->fbX; + r128ctx->readY = r128ctx->r128Screen->fbY; found = GL_TRUE; break; default: @@ -179,7 +182,7 @@ static GLboolean r128DDSetDrawBuffer(GLcontext *ctx, GLenum mode) x += r128ctx->drawX; y += r128ctx->drawY; - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.window_xy_offset = ((y << R128_WINDOW_Y_SHIFT) | (x << R128_WINDOW_X_SHIFT)); @@ -235,10 +238,9 @@ static GLboolean r128DDColorMask(GLcontext *ctx, ctx->Color.ColorMask[ACOMP]); if (r128ctx->regs.plane_3d_mask_c != mask) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.plane_3d_mask_c = mask; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_MISC; } @@ -275,10 +277,9 @@ static void r128DDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref) } if (r128ctx->regs.misc_3d_state_cntl_reg != a) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.misc_3d_state_cntl_reg = a; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ALPHASTATE; } @@ -364,10 +365,9 @@ static void r128DDBlendFunc(GLcontext *ctx, GLenum sfactor, GLenum dfactor) } if (r128ctx->regs.misc_3d_state_cntl_reg != b) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.misc_3d_state_cntl_reg = b; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ALPHASTATE; } @@ -414,10 +414,9 @@ static void r128DDCullFace(GLcontext *ctx, GLenum mode) } if (r128ctx->regs.pm4_vc_fpu_setup != f) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.pm4_vc_fpu_setup = f; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_SETUPSTATE; } @@ -437,10 +436,9 @@ static void r128DDFrontFace(GLcontext *ctx, GLenum mode) } if (r128ctx->regs.pm4_vc_fpu_setup != f) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.pm4_vc_fpu_setup = f; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_SETUPSTATE; } @@ -466,10 +464,9 @@ static void r128DDDepthFunc(GLcontext *ctx, GLenum func) } if (r128ctx->regs.z_sten_cntl_c != z) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.z_sten_cntl_c = z; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ZSTENSTATE; } @@ -484,10 +481,9 @@ static void r128DDDepthMask(GLcontext *ctx, GLboolean flag) else t &= ~R128_Z_WRITE_ENABLE; if (r128ctx->regs.tex_cntl_c != t) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.tex_cntl_c = t; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ENGINESTATE; } @@ -507,16 +503,30 @@ static void r128DDLightModelfv(GLcontext *ctx, GLenum pname, t &= ~R128_SPEC_LIGHT_ENABLE; if (r128ctx->regs.tex_cntl_c != t) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.tex_cntl_c = t; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ENGINESTATE; } } } +static void r128DDLogicOpCode( GLcontext *ctx, GLenum opcode ) +{ + if (ctx->Color.ColorLogicOpEnabled) + { + r128ContextPtr r128ctx = R128_CONTEXT(ctx); + + FLUSH_BATCH( r128ctx ); + + if (opcode == GL_COPY) + r128ctx->Fallback &= ~R128_FALLBACK_LOGICOP; + else + r128ctx->Fallback |= R128_FALLBACK_LOGICOP; + } +} + static void r128DDEnable(GLcontext *ctx, GLenum cap, GLboolean state) { @@ -581,6 +591,15 @@ static void r128DDEnable(GLcontext *ctx, GLenum cap, GLboolean state) else t &= ~R128_FOG_ENABLE; break; + case GL_INDEX_LOGIC_OP: + case GL_COLOR_LOGIC_OP: + FLUSH_BATCH( r128ctx ); + if (state && ctx->Color.LogicOp != GL_COPY) + r128ctx->Fallback |= R128_FALLBACK_LOGICOP; + else + r128ctx->Fallback &= ~R128_FALLBACK_LOGICOP; + break; + case GL_LIGHT0: case GL_LIGHT1: case GL_LIGHT2: @@ -592,8 +611,6 @@ static void r128DDEnable(GLcontext *ctx, GLenum cap, GLboolean state) case GL_LIGHTING: case GL_LINE_SMOOTH: case GL_LINE_STIPPLE: - case GL_INDEX_LOGIC_OP: - case GL_COLOR_LOGIC_OP: case GL_MAP1_COLOR_4: case GL_MAP1_INDEX: case GL_MAP1_NORMAL: @@ -655,18 +672,16 @@ static void r128DDEnable(GLcontext *ctx, GLenum cap, GLboolean state) } if (r128ctx->regs.tex_cntl_c != t) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.tex_cntl_c = t; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_ENGINESTATE; } if (r128ctx->regs.pm4_vc_fpu_setup != f) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.pm4_vc_fpu_setup = f; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_SETUPSTATE; } @@ -678,8 +693,6 @@ static void r128DDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param) r128ContextPtr r128ctx = R128_CONTEXT(ctx); GLubyte c[4]; CARD32 col; - floatTOint fog; - GLenum mode; if (R128_DEBUG_FLAGS & DEBUG_VERBOSE_API) { fprintf(stderr, "r128DDFogfv(%p, 0x%x)\n", ctx, pname); @@ -687,61 +700,18 @@ static void r128DDFogfv(GLcontext *ctx, GLenum pname, const GLfloat *param) switch (pname) { case GL_FOG_MODE: - mode = (GLenum)(GLint)*param; - if (r128ctx->FogMode != mode) { - r128FlushVertices(r128ctx); - r128ctx->FogMode = mode; - - /* FIXME: Load into hardware now??? */ - r128ctx->dirty |= R128_UPDATE_CONTEXT; - r128ctx->dirty_context |= R128_CTX_FOGTABLE; - } - break; - case GL_FOG_DENSITY: - fog.f = *param; - if (r128ctx->regs.fog_3d_table_density != fog.i) { - r128FlushVertices(r128ctx); - r128ctx->regs.fog_3d_table_density = fog.i; - - /* FIXME: Load into hardware now??? */ - r128ctx->dirty |= R128_UPDATE_CONTEXT; - r128ctx->dirty_context |= R128_CTX_FOGSTATE; - } - break; - case GL_FOG_START: - fog.f = *param; - if (r128ctx->regs.fog_3d_table_start != fog.i) { - r128FlushVertices(r128ctx); - r128ctx->regs.fog_3d_table_start = fog.i; - - /* FIXME: Load into hardware now??? */ - r128ctx->dirty |= R128_UPDATE_CONTEXT; - r128ctx->dirty_context |= R128_CTX_FOGSTATE; - } - break; - case GL_FOG_END: - fog.f = *param; - if (r128ctx->regs.fog_3d_table_end != fog.i) { - r128FlushVertices(r128ctx); - r128ctx->regs.fog_3d_table_end = fog.i; - - /* FIXME: Load into hardware now??? */ - r128ctx->dirty |= R128_UPDATE_CONTEXT; - r128ctx->dirty_context |= R128_CTX_FOGSTATE; - } break; case GL_FOG_COLOR: FLOAT_RGBA_TO_UBYTE_RGBA(c, ctx->Fog.Color); col = r128PackColor(32, c[0], c[1], c[2], c[3]); if (r128ctx->regs.fog_color_c != col) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.fog_color_c = col; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_FOGSTATE; } @@ -763,6 +733,33 @@ static void r128DDScissor(GLcontext *ctx, r128ctx->ScissorRect.y2 = r128ctx->driDrawable->h - y; } +static void r128DDShadeModel( GLcontext *ctx, GLenum mode ) +{ + r128ContextPtr r128ctx = R128_CONTEXT( ctx ); + CARD32 s = r128ctx->regs.pm4_vc_fpu_setup; + + s &= ~R128_FPU_COLOR_MASK; + + switch ( mode ) { + case GL_FLAT: + s |= R128_FPU_COLOR_FLAT; + break; + case GL_SMOOTH: + s |= R128_FPU_COLOR_GOURAUD; + break; + default: + return; + } + + if ( r128ctx->regs.pm4_vc_fpu_setup != s ) { + FLUSH_BATCH( r128ctx ); + r128ctx->regs.pm4_vc_fpu_setup = s; + + r128ctx->dirty |= R128_UPDATE_CONTEXT; + r128ctx->dirty_context |= R128_CTX_SETUPSTATE; + } +} + /* Initialize the driver's state functions */ void r128DDInitStateFuncs(GLcontext *ctx) { @@ -807,10 +804,11 @@ void r128DDInitStateFuncs(GLcontext *ctx) ctx->Driver.Fogfv = r128DDFogfv; ctx->Driver.Hint = NULL; ctx->Driver.Lightfv = NULL; + ctx->Driver.LogicOpcode = r128DDLogicOpCode; ctx->Driver.LightModelfv = r128DDLightModelfv; ctx->Driver.PolygonMode = NULL; ctx->Driver.Scissor = r128DDScissor; - ctx->Driver.ShadeModel = NULL; + ctx->Driver.ShadeModel = r128DDShadeModel; ctx->Driver.ClearStencil = NULL; ctx->Driver.StencilFunc = NULL; ctx->Driver.StencilMask = NULL; @@ -892,7 +890,7 @@ void r128DDInitState(r128ContextPtr r128ctx) R128_SCALE_3D_TEXMAP_SHADE | R128_SCALE_PIX_REPLICATE | R128_ALPHA_COMB_ADD_CLAMP | - R128_FOG_TABLE | + R128_FOG_VERTEX | R128_ALPHA_BLEND_SRC_ONE | R128_ALPHA_BLEND_DST_ZERO | R128_ALPHA_TEST_ALWAYS | @@ -965,7 +963,7 @@ void r128DDInitState(r128ContextPtr r128ctx) R128_MISC_SCALE_3D_TEXMAP_SHADE | R128_MISC_SCALE_PIX_REPLICATE | R128_ALPHA_COMB_ADD_CLAMP | - R128_FOG_TABLE | + R128_FOG_VERTEX | R128_ALPHA_BLEND_SRC_ONE | R128_ALPHA_BLEND_DST_ZERO | R128_ALPHA_TEST_ALWAYS; @@ -1024,13 +1022,7 @@ void r128DDInitState(r128ContextPtr r128ctx) r128ctx->regs.setup_cntl = R128_COLOR_GOURAUD | R128_PRIM_TYPE_TRI | -#if 1 - /* FIXME: Let r128 multiply? */ R128_TEXTURE_ST_MULT_W | -#else - /* FIXME: Or, pre multiply? */ - R128_TEXTURE_ST_DIRECT | -#endif R128_STARTING_VERTEX_1 | R128_ENDING_VERTEX_3 | R128_SU_POLY_LINE_NOT_LAST | @@ -1050,11 +1042,7 @@ void r128DDInitState(r128ContextPtr r128ctx) R128_FPU_ROUND_TRUNCATE | R128_WM_SEL_8DW; - r128ctx->FogMode = GL_EXP; - r128ctx->regs.fog_color_c = 0x00808080; - r128ctx->regs.fog_3d_table_start = 0x00000000; - r128ctx->regs.fog_3d_table_end = 0xffffffff; - r128ctx->regs.fog_3d_table_density = 0x00000000; + r128ctx->regs.fog_color_c = 0x00000000; r128ctx->regs.window_xy_offset = 0x00000000; @@ -1066,7 +1054,13 @@ void r128DDInitState(r128ContextPtr r128ctx) r128ctx->dirty_context |= R128_CTX_ALL_DIRTY; } -/* Upload the fog table for the current fog mode */ +#if 0 +/* Upload the fog table for the current fog mode + * + * KW: I beleive that this can be made to work for all fog modes, + * given some constraints on the projection matrix. Please leave + * this code here for now... + */ static void r128UploadFogTable(r128ContextPtr r128ctx) { int i; @@ -1096,7 +1090,7 @@ static void r128UploadFogTable(r128ContextPtr r128ctx) case GL_EXP: for (i = 0; i < 256; i++) { float arg = (255 - i)/255.0; - float exparg = (exp(arg) - 1) / (M_E - 1); /* range [0,1] */ + float exparg = exp(arg); int result; FLOAT_COLOR_TO_UBYTE_COLOR(result, exparg); R128CCE(result); @@ -1113,6 +1107,7 @@ static void r128UploadFogTable(r128ContextPtr r128ctx) break; } } +#endif /* Load the current context's state into the hardware */ /* NOTE: This function is only called while holding the hardware lock */ @@ -1202,18 +1197,8 @@ static void r128LoadContext(r128ContextPtr r128ctx) } if (r128ctx->dirty_context & R128_CTX_FOGSTATE) { - R128CCE0(R128_CCE_PACKET0, R128_FOG_3D_TABLE_START, 1); - R128CCE(r128ctx->regs.fog_3d_table_start); - R128CCE(r128ctx->regs.fog_3d_table_end); - - R128CCE1(R128_CCE_PACKET1, - R128_FOG_COLOR_C, R128_FOG_3D_TABLE_DENSITY); + R128CCE1(R128_CCE_PACKET0, R128_FOG_COLOR_C, 0); R128CCE(r128ctx->regs.fog_color_c); - R128CCE(r128ctx->regs.fog_3d_table_density); - } - - if (r128ctx->dirty_context & R128_CTX_FOGTABLE) { - r128UploadFogTable(r128ctx); } if (r128ctx->dirty_context & R128_CTX_ZSTENSTATE) { diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_state.h b/xc/lib/GL/mesa/src/drv/r128/r128_state.h index faa182a86..f847452f0 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_state.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_state.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_state.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_swap.c b/xc/lib/GL/mesa/src/drv/r128/r128_swap.c index e1b65bdda..d047f3777 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_swap.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_swap.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -82,20 +81,13 @@ static void r128ClearBoxLocked( r128ContextPtr r128ctx, color = r128PackColor( r128ctx->r128Screen->bpp, r, g, b, 0 ); - /* Temporarily disable Z and stencil buffer and texture mapping modes */ - R128CCE0( R128_CCE_PACKET0, R128_TEX_CNTL_C, 0 ); - R128CCE( r128ctx->regs.tex_cntl_c & ~(R128_Z_ENABLE | - R128_STENCIL_ENABLE | - R128_TEXMAP_ENABLE) ); - R128CCE3( R128_CCE_PACKET3_CNTL_PAINT_MULTI, 3 ); R128CCE( R128_GMC_BRUSH_SOLID_COLOR | dst_bpp | R128_GMC_SRC_DATATYPE_COLOR | R128_ROP3_P - | R128_GMC_3D_FCN_EN /* FIXME?? */ - | R128_GMC_CLR_CMP_CNTL_DIS /* FIXME?? */ - | R128_AUX_CLIP_DIS ); /* FIXME?? */ + | R128_GMC_CLR_CMP_CNTL_DIS + | R128_GMC_AUX_CLIP_DIS ); R128CCE( color ); R128CCE( (x << 16) | y ); R128CCE( (w << 16) | h ); @@ -145,15 +137,15 @@ void r128PerformanceBoxesLocked( r128ContextPtr r128ctx ) /* Draw bars to represent the utilization of the vertex buffers */ r128ClearBoxLocked( r128ctx, 4, 16, 252, 4, 32, 32, 32 ); - t = r128ctx->r128Screen->vbRgn.size / r128ctx->r128Screen->vbBufSize; + t = r128ctx->r128Screen->vbMapSize / r128ctx->r128Screen->vbBufSize; w = 252 * r128ctx->c_vertexBuffers / t; if ( w < 1 ) { - w = 1; + w = 1; } if ( r128ctx->c_vertexBuffers > t ) { - r128ClearBoxLocked( r128ctx, 4, 16, 252, 4, 255, 32, 32 ); + r128ClearBoxLocked( r128ctx, 4, 16, 252, 4, 255, 32, 32 ); } else { - r128ClearBoxLocked( r128ctx, 4, 16, w, 4, 196, 128, 128 ); + r128ClearBoxLocked( r128ctx, 4, 16, w, 4, 196, 128, 128 ); } } @@ -206,6 +198,9 @@ void r128SwapBuffers(r128ContextPtr r128ctx) XF86DRIClipRectPtr c; int dst_bpp; + /* Flush any outstanding vertex buffers */ + FLUSH_BATCH(r128ctx); + switch (r128ctx->r128Screen->bpp) { case 8: dst_bpp = R128_GMC_DST_8BPP_CI; @@ -225,9 +220,6 @@ void r128SwapBuffers(r128ContextPtr r128ctx) LOCK_HARDWARE(r128ctx); - /* Flush any outstanding vertex buffers */ - r128FlushVerticesLocked(r128ctx); - /* Throttle the frame rate -- only allow one pending swap buffers * request at a time. */ diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_swap.h b/xc/lib/GL/mesa/src/drv/r128/r128_swap.h index 6a89bd2cb..89d36a32d 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_swap.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_swap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_swap.h,v 1.1 2000/06/17 00:03:07 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_tex.c b/xc/lib/GL/mesa/src/drv/r128/r128_tex.c index e412b3bf5..d03d49211 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_tex.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_tex.c @@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -634,6 +633,14 @@ static void r128UploadSubImage(r128ContextPtr r128ctx, case 4: texelsPerDword = 1; break; } + /* FIXME: The sub image offset calcs are broken - they weren't a + * while ago? + */ + x = 0; + y = 0; + width = image->Width; + height = image->Height; + imageWidth = image->Width; imageHeight = image->Height; @@ -1685,7 +1692,7 @@ static void r128DDTexEnv(GLcontext *ctx, GLenum target, GLenum pname, switch (pname) { case GL_TEXTURE_ENV_MODE: /* TexEnv modes are handled in UpdateTextureState */ - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->dirty |= R128_UPDATE_TEXSTATE; break; case GL_TEXTURE_ENV_COLOR: @@ -1693,10 +1700,9 @@ static void r128DDTexEnv(GLcontext *ctx, GLenum target, GLenum pname, FLOAT_RGBA_TO_UBYTE_RGBA(texUnit->EnvColor, c); col = r128PackColor(32, c[0], c[1], c[2], c[3]); if (r128ctx->regs.constant_color_c != col) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->regs.constant_color_c = col; - /* FIXME: Load into hardware now??? */ r128ctx->dirty |= R128_UPDATE_CONTEXT; r128ctx->dirty_context |= R128_CTX_TEXENVSTATE; } @@ -1723,7 +1729,7 @@ static void r128DDTexImage(GLcontext *ctx, GLenum target, t = (r128TexObjPtr)tObj->DriverData; if (t) { - if (t->bound) r128FlushVertices(r128ctx); + if (t->bound) FLUSH_BATCH(r128ctx); /* Destroy the old texture, and upload a new one. The actual uploading of the texture image occurs in the UploadSubImage @@ -1754,7 +1760,7 @@ static void r128DDTexSubImage(GLcontext *ctx, GLenum target, t = (r128TexObjPtr)tObj->DriverData; if (t) { - if (t->bound) r128FlushVertices(r128ctx); + if (t->bound) FLUSH_BATCH(r128ctx); LOCK_HARDWARE(r128ctx); r128UploadSubImage(r128ctx, t, level, @@ -1786,18 +1792,18 @@ static void r128DDTexParameter(GLcontext *ctx, GLenum target, switch (pname) { case GL_TEXTURE_MIN_FILTER: case GL_TEXTURE_MAG_FILTER: - if (t->bound) r128FlushVertices(r128ctx); + if (t->bound) FLUSH_BATCH(r128ctx); r128SetTexFilter(t, tObj->MinFilter, tObj->MagFilter); break; case GL_TEXTURE_WRAP_S: case GL_TEXTURE_WRAP_T: - if (t->bound) r128FlushVertices(r128ctx); + if (t->bound) FLUSH_BATCH(r128ctx); r128SetTexWrap(t, tObj->WrapS, tObj->WrapT); break; case GL_TEXTURE_BORDER_COLOR: - if (t->bound) r128FlushVertices(r128ctx); + if (t->bound) FLUSH_BATCH(r128ctx); r128SetTexBorderColor(t, tObj->BorderColor); break; @@ -1814,7 +1820,7 @@ static void r128DDBindTexture(GLcontext *ctx, GLenum target, { r128ContextPtr r128ctx = R128_CONTEXT(ctx); - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); /* Unbind the old texture */ if (r128ctx->CurrentTexObj[ctx->Texture.CurrentUnit]) { @@ -1835,7 +1841,7 @@ static void r128DDDeleteTexture(GLcontext *ctx, if (t) { if (t->bound) { - r128FlushVertices(r128ctx); + FLUSH_BATCH(r128ctx); r128ctx->CurrentTexObj[t->bound-1] = 0; r128ctx->dirty |= R128_UPDATE_TEXSTATE; diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_tex.h b/xc/lib/GL/mesa/src/drv/r128/r128_tex.h index ed1d5e2b5..20893110c 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_tex.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_tex.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.h,v 1.1 2000/06/17 00:03:08 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_texobj.h b/xc/lib/GL/mesa/src/drv/r128/r128_texobj.h index 8ccaaf9fe..588b768ed 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_texobj.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_texobj.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texobj.h,v 1.1 2000/06/17 00:03:08 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_tris.c b/xc/lib/GL/mesa/src/drv/r128/r128_tris.c index afca477c9..40c462171 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_tris.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_tris.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -43,10 +42,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_tris.h" #include "r128_state.h" -static triangle_func tri_tab[0x10]; -static quad_func quad_tab[0x10]; -static line_func line_tab[0x10]; -static points_func points_tab[0x10]; +static struct { + points_func points; + line_func line; + triangle_func tri; + quad_func quad; +} rast_tab[0x10]; #define R128_COLOR(to, from) \ do { \ @@ -89,7 +90,7 @@ do { \ #include "r128_tritmp.h" /* Initialize the table of points, line and triangle drawing functions */ -void r128TriangleFuncsInit(void) +void r128DDTriangleFuncsInit(void) { init(); init_flat(); @@ -101,82 +102,62 @@ void r128TriangleFuncsInit(void) init_twoside_offset_flat(); } + + +/* FIXME: Only enable software fallback for stencil in 16 bpp mode after + we have hardware stencil support */ +#define ALL_FALLBACK (DD_MULTIDRAW | DD_SELECT | DD_FEEDBACK | DD_STENCIL) +#define POINT_FALLBACK (ALL_FALLBACK | DD_POINT_SMOOTH) +#define LINE_FALLBACK (ALL_FALLBACK | DD_LINE_SMOOTH | DD_LINE_STIPPLE) +#define TRI_FALLBACK (ALL_FALLBACK | DD_TRI_SMOOTH | DD_TRI_STIPPLE | DD_TRI_UNFILLED) +#define ANY_FALLBACK (POINT_FALLBACK|LINE_FALLBACK|TRI_FALLBACK) + /* Setup the Point, Line, Triangle and Quad functions based on the current rendering state. Wherever possible, use the hardware to render the primitive. Otherwise, fallback to software rendering. */ -void r128ChooseRenderState(GLcontext *ctx) +void r128DDChooseRenderState(GLcontext *ctx) { r128ContextPtr r128ctx = R128_CONTEXT(ctx); GLuint flags = ctx->TriangleCaps; + CARD32 index = 0; - /* KW: Includes handling of SWonly rendering: - */ - if (r128ctx->Fallback) - return; + if (r128ctx->Fallback) { + r128ctx->RenderIndex = R128_FALLBACK_BIT; + return; + } + if (flags & (DD_FLATSHADE|DD_TRI_LIGHT_TWOSIDE|DD_TRI_OFFSET)) { + if (flags & DD_FLATSHADE) index |= R128_FLAT_BIT; + if (flags & DD_TRI_LIGHT_TWOSIDE) index |= R128_TWOSIDE_BIT; + if (flags & DD_TRI_OFFSET) index |= R128_OFFSET_BIT; + } + + r128ctx->PointsFunc = rast_tab[index].points; + r128ctx->LineFunc = rast_tab[index].line; + r128ctx->TriangleFunc = rast_tab[index].tri; + r128ctx->QuadFunc = rast_tab[index].quad; + + r128ctx->RenderIndex = index; r128ctx->IndirectTriangles = 0; - if (flags) { - CARD32 index = 0; - CARD32 shared = 0; - CARD32 fallback = R128_FALLBACK_BIT; - - /* KW: I'd prefer to remove SWfallbackDisable & just use - * R128_FALLBACK_BIT throughout this routine. - */ - if (r128ctx->SWfallbackDisable) fallback = 0; - - if (flags & DD_FLATSHADE) shared |= R128_FLAT_BIT; - if (flags & DD_TRI_LIGHT_TWOSIDE) shared |= R128_TWOSIDE_BIT; - - /* TODO: Fix mesa so that these can be handled in - * r128ctx->Fallback. - */ - if (flags & (DD_MULTIDRAW | - DD_SELECT | - DD_FEEDBACK)) shared |= R128_FALLBACK_BIT; - - /* FIXME: Only enable in 16 bpp mode after we have hardware - stencil support */ - if (flags & DD_STENCIL) shared |= R128_FALLBACK_BIT; - - /* Setup PointFunc */ - index = shared; - if (flags & DD_POINT_SMOOTH) index |= fallback; - - r128ctx->RenderIndex = index; - r128ctx->PointsFunc = points_tab[index]; - if (index & R128_FALLBACK_BIT) - r128ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE; + if (flags & ANY_FALLBACK) { + r128ctx->RenderIndex |= R128_FALLBACK_BIT; - /* Setup LineFunc */ - index = shared; - if (flags & DD_LINE_SMOOTH) index |= fallback; - if (flags & DD_LINE_STIPPLE) index |= fallback; + if (flags & POINT_FALLBACK) { + r128ctx->PointsFunc = 0; + r128ctx->IndirectTriangles |= DD_POINT_SW_RASTERIZE; + } - r128ctx->RenderIndex |= index; - r128ctx->LineFunc = line_tab[index]; - if (index & R128_FALLBACK_BIT) + if (flags & LINE_FALLBACK) { + r128ctx->LineFunc = 0; r128ctx->IndirectTriangles |= DD_LINE_SW_RASTERIZE; + } - /* Setup TriangleFunc and QuadFunc */ - index = shared; - if (flags & DD_TRI_OFFSET) index |= R128_OFFSET_BIT; - if (flags & DD_TRI_SMOOTH) index |= fallback; - if (flags & DD_TRI_UNFILLED) index |= fallback; - if (flags & DD_TRI_STIPPLE) index |= fallback; - - r128ctx->RenderIndex |= index; - r128ctx->TriangleFunc = tri_tab[index]; - r128ctx->QuadFunc = quad_tab[index]; - if (index & R128_FALLBACK_BIT) + if (flags & TRI_FALLBACK) { + r128ctx->TriangleFunc = 0; + r128ctx->QuadFunc = 0; r128ctx->IndirectTriangles |= (DD_TRI_SW_RASTERIZE | DD_QUAD_SW_RASTERIZE); - } else if (r128ctx->RenderIndex) { - r128ctx->RenderIndex = 0; - r128ctx->PointsFunc = points_tab[0]; - r128ctx->LineFunc = line_tab[0]; - r128ctx->TriangleFunc = tri_tab[0]; - r128ctx->QuadFunc = quad_tab[0]; + } } } diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_tris.h b/xc/lib/GL/mesa/src/drv/r128/r128_tris.h index b587b0f3b..e66442fc3 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_tris.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_tris.h @@ -39,8 +39,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r128_vb.h" -extern void r128ChooseRenderState(GLcontext *ctx); -extern void r128TriangleFuncsInit(void); +extern void r128DDChooseRenderState(GLcontext *ctx); +extern void r128DDTriangleFuncsInit(void); #define R128_FLAT_BIT 0x01 #define R128_OFFSET_BIT 0x02 diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h b/xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h index 966b8f51c..9eda433b9 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_tritmp.h @@ -52,10 +52,10 @@ static __inline void TAG(triangle)(GLcontext *ctx, int i, j; #if (IND & R128_OFFSET_BIT) - GLfloat offset = ctx->Polygon.OffsetUnits * r128ctx->depth_scale; + GLfloat offset; #endif -#if (IND & (R128_FLAT_BIT | R128_TWOSIDE_BIT)) +#if (IND & R128_TWOSIDE_BIT) int c[3]; c[0] = c[1] = c[2] = *(int *)&r128verts[pv].vert1.dif_argb; @@ -90,8 +90,8 @@ static __inline void TAG(triangle)(GLcontext *ctx, #if (IND & R128_OFFSET_BIT) { + offset = ctx->Polygon.OffsetUnits * r128ctx->depth_scale; if (cc * cc > 1e-16) { - GLfloat factor = ctx->Polygon.OffsetFactor; GLfloat ez = v[0]->vert1.z - v[2]->vert1.z; GLfloat fz = v[1]->vert1.z - v[2]->vert1.z; GLfloat a = ey*fz - ez*fy; @@ -101,7 +101,7 @@ static __inline void TAG(triangle)(GLcontext *ctx, GLfloat bc = b * ic; if (ac < 0.0f) ac = -ac; if (bc < 0.0f) bc = -bc; - offset += MAX2(ac, bc) * factor; + offset += MAX2(ac, bc) * ctx->Polygon.OffsetFactor; } } #endif @@ -113,7 +113,7 @@ static __inline void TAG(triangle)(GLcontext *ctx, for (i = 0 ; i < vertsize ; i++) vb[i] = v[j]->ui[i]; -#if (IND & (R128_FLAT_BIT|R128_TWOSIDE_BIT)) +#if (IND & R128_TWOSIDE_BIT) vb[4] = c[j]; /* color is the fifth element... */ #endif #if (IND & R128_OFFSET_BIT) @@ -132,17 +132,25 @@ static void TAG(quad)(GLcontext *ctx, } -/* Draw a single line. Note that the device-dependent vertex data might - need to be changed based on the render state. */ +/* Draw a single line. Note that the device-dependent vertex data + * might need to be changed based on the render state. + * + * Polygon offset for GL_LINE triangles is dependent on a harness in + * core mesa setting up LineZoffset on a per-triangle basis. + * + * Twosided lighting for GL_LINE triangles is dependent on the same + * harness. + */ static void TAG(line)(GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv) { - r128ContextPtr r128ctx = R128_CONTEXT(ctx); - r128VertexPtr r128verts = R128_DRIVER_DATA(ctx->VB)->verts; - float width = ctx->Line.Width; + r128ContextPtr r128ctx = R128_CONTEXT(ctx); + r128VertexPtr r128verts = R128_DRIVER_DATA(ctx->VB)->verts; + float width = ctx->Line.Width; - if (IND & (R128_TWOSIDE_BIT|R128_FLAT_BIT)) { + + if (IND & (R128_TWOSIDE_BIT|R128_FLAT_BIT|R128_OFFSET_BIT)) { r128Vertex tmp0 = r128verts[v0]; r128Vertex tmp1 = r128verts[v1]; @@ -156,11 +164,17 @@ static void TAG(line)(GLcontext *ctx, R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[v0]); R128_COLOR((char *)&tmp1.vert1.dif_argb, vbcolor[v1]); } - } else { + } else if (IND & R128_FLAT_BIT) { *(int *)&tmp0.vert1.dif_argb = *(int *)&r128verts[pv].vert1.dif_argb; *(int *)&tmp1.vert1.dif_argb = *(int *)&r128verts[pv].vert1.dif_argb; } + if (IND & R128_OFFSET_BIT) { + GLfloat offset = ctx->LineZoffset * r128ctx->depth_scale; + tmp0.vert1.z += offset; + tmp1.vert1.z += offset; + } + r128DrawLineVB( r128ctx, &tmp0, &tmp1, width ); } else @@ -178,12 +192,20 @@ static void TAG(points)(GLcontext *ctx, GLfloat size = ctx->Point.Size * 0.5; int i; + for(i = first; i <= last; i++) { if(VB->ClipMask[i] == 0) { - if (IND & R128_TWOSIDE_BIT) { - GLubyte (*vbcolor)[4] = VB->ColorPtr->data; + if (IND & (R128_TWOSIDE_BIT|R128_OFFSET_BIT)) { r128Vertex tmp0 = r128verts[i]; - R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[i]); + + if (IND & R128_TWOSIDE_BIT) { + GLubyte (*vbcolor)[4] = VB->ColorPtr->data; + R128_COLOR((char *)&tmp0.vert1.dif_argb, vbcolor[i]); + } + if (IND & R128_OFFSET_BIT) { + GLfloat offset = ctx->PointZoffset * r128ctx->depth_scale; + tmp0.vert1.z += offset; + } r128DrawPointVB( r128ctx, &tmp0, size ); } else r128DrawPointVB( r128ctx, &r128verts[i], size ); @@ -194,10 +216,10 @@ static void TAG(points)(GLcontext *ctx, /* Initialize the table of primitives to render. */ static void TAG(init)(void) { - tri_tab[IND] = TAG(triangle); - quad_tab[IND] = TAG(quad); - line_tab[IND] = TAG(line); - points_tab[IND] = TAG(points); + rast_tab[IND].tri = TAG(triangle); + rast_tab[IND].quad = TAG(quad); + rast_tab[IND].line = TAG(line); + rast_tab[IND].points = TAG(points); } #undef IND diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_vb.c b/xc/lib/GL/mesa/src/drv/r128/r128_vb.c index c6d45c468..0cc529957 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_vb.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_vb.c @@ -33,7 +33,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r128_init.h" -#include "r128_mesa.h" #include "r128_xmesa.h" #include "r128_context.h" #include "r128_lock.h" @@ -64,6 +63,11 @@ do { \ v->vert1.spec_frgb.b = spec[2]; \ } while (0) +#define FOG \ +do { \ + GLubyte *spec = &(VB->Spec[0][i][0]); \ + v->vert1.spec_frgb.a = spec[3]; \ +} while (0) #define COL \ do { \ @@ -135,7 +139,7 @@ do { \ #define NOP /* Setup the r128 vertex buffer entries */ -#define SETUPFUNC(name,win,col,tex0,tex1,tex0_4,tex1_4,spec) \ +#define SETUPFUNC(name,win,col,tex0,tex1,tex0_4,tex1_4,spec,fog) \ static void name(struct vertex_buffer *VB, GLuint start, GLuint end) \ { \ r128ContextPtr r128ctx = R128_CONTEXT(VB->ctx); \ @@ -164,6 +168,7 @@ static void name(struct vertex_buffer *VB, GLuint start, GLuint end) \ win; \ col; \ spec; \ + fog; \ tex0; \ tex1; \ } \ @@ -172,6 +177,7 @@ static void name(struct vertex_buffer *VB, GLuint start, GLuint end) \ if (VB->ClipMask[i] == 0) { \ win; \ spec; \ + fog; \ tex0; \ tex1; \ } \ @@ -182,29 +188,53 @@ static void name(struct vertex_buffer *VB, GLuint start, GLuint end) \ } -SETUPFUNC(rs_wt0, COORD, NOP, TEX0, NOP, TEX0_4, NOP, NOP) -SETUPFUNC(rs_wt1, COORD, NOP, NOP, TEX1, NOP, TEX1_4, NOP) -SETUPFUNC(rs_wt0t1, COORD, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP) -SETUPFUNC(rs_wg, COORD, COL, NOP, NOP, NOP, NOP, NOP) -SETUPFUNC(rs_wgs, COORD, COL, NOP, NOP, NOP, NOP, SPC) -SETUPFUNC(rs_wgt0, COORD, COL, TEX0, NOP, TEX0_4, NOP, NOP) -SETUPFUNC(rs_wgt1, COORD, COL, NOP, TEX1, NOP, TEX1_4, NOP) -SETUPFUNC(rs_wgt0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP) -SETUPFUNC(rs_wgst0, COORD, COL, TEX0, NOP, TEX0_4, NOP, SPC) -SETUPFUNC(rs_wgst1, COORD, COL, NOP, TEX1, NOP, TEX1_4, SPC) -SETUPFUNC(rs_wgst0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC) - -SETUPFUNC(rs_t0, NOP, NOP, TEX0, NOP, TEX0_4, NOP, NOP) -SETUPFUNC(rs_t1, NOP, NOP, NOP, TEX1, NOP, TEX1_4, NOP) -SETUPFUNC(rs_t0t1, NOP, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP) -SETUPFUNC(rs_g, NOP, COL, NOP, NOP, NOP, NOP, NOP) -SETUPFUNC(rs_gs, NOP, COL, NOP, NOP, NOP, NOP, SPC) -SETUPFUNC(rs_gt0, NOP, COL, TEX0, NOP, TEX0_4, NOP, NOP) -SETUPFUNC(rs_gt1, NOP, COL, NOP, TEX1, NOP, TEX1_4, NOP) -SETUPFUNC(rs_gt0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP) -SETUPFUNC(rs_gst0, NOP, COL, TEX0, NOP, TEX0_4, NOP, SPC) -SETUPFUNC(rs_gst1, NOP, COL, NOP, TEX1, NOP, TEX1_4, SPC) -SETUPFUNC(rs_gst0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC) +SETUPFUNC(rs_wt0, COORD, NOP, TEX0, NOP, TEX0_4, NOP, NOP, NOP) +SETUPFUNC(rs_wt1, COORD, NOP, NOP, TEX1, NOP, TEX1_4, NOP, NOP) +SETUPFUNC(rs_wt0t1, COORD, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP, NOP) +SETUPFUNC(rs_wft0, COORD, NOP, TEX0, NOP, TEX0_4, NOP, NOP, FOG) +SETUPFUNC(rs_wft1, COORD, NOP, NOP, TEX1, NOP, TEX1_4, NOP, FOG) +SETUPFUNC(rs_wft0t1, COORD, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP, FOG) +SETUPFUNC(rs_wg, COORD, COL, NOP, NOP, NOP, NOP, NOP, NOP) +SETUPFUNC(rs_wgs, COORD, COL, NOP, NOP, NOP, NOP, SPC, NOP) +SETUPFUNC(rs_wgt0, COORD, COL, TEX0, NOP, TEX0_4, NOP, NOP, NOP) +SETUPFUNC(rs_wgt1, COORD, COL, NOP, TEX1, NOP, TEX1_4, NOP, NOP) +SETUPFUNC(rs_wgt0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP, NOP) +SETUPFUNC(rs_wgst0, COORD, COL, TEX0, NOP, TEX0_4, NOP, SPC, NOP) +SETUPFUNC(rs_wgst1, COORD, COL, NOP, TEX1, NOP, TEX1_4, SPC, NOP) +SETUPFUNC(rs_wgst0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC, NOP) +SETUPFUNC(rs_wgf, COORD, COL, NOP, NOP, NOP, NOP, NOP, FOG) +SETUPFUNC(rs_wgfs, COORD, COL, NOP, NOP, NOP, NOP, SPC, FOG) +SETUPFUNC(rs_wgft0, COORD, COL, TEX0, NOP, TEX0_4, NOP, NOP, FOG) +SETUPFUNC(rs_wgft1, COORD, COL, NOP, TEX1, NOP, TEX1_4, NOP, FOG) +SETUPFUNC(rs_wgft0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP, FOG) +SETUPFUNC(rs_wgfst0, COORD, COL, TEX0, NOP, TEX0_4, NOP, SPC, FOG) +SETUPFUNC(rs_wgfst1, COORD, COL, NOP, TEX1, NOP, TEX1_4, SPC, FOG) +SETUPFUNC(rs_wgfst0t1, COORD, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC, FOG) + +SETUPFUNC(rs_t0, NOP, NOP, TEX0, NOP, TEX0_4, NOP, NOP, NOP) +SETUPFUNC(rs_t1, NOP, NOP, NOP, TEX1, NOP, TEX1_4, NOP, NOP) +SETUPFUNC(rs_t0t1, NOP, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP, NOP) +SETUPFUNC(rs_f, NOP, NOP, NOP, NOP, NOP, NOP, NOP, FOG) +SETUPFUNC(rs_ft0, NOP, NOP, TEX0, NOP, TEX0_4, NOP, NOP, FOG) +SETUPFUNC(rs_ft1, NOP, NOP, NOP, TEX1, NOP, TEX1_4, NOP, FOG) +SETUPFUNC(rs_ft0t1, NOP, NOP, TEX0, TEX1, TEX0_4, TEX1_4, NOP, FOG) +SETUPFUNC(rs_g, NOP, COL, NOP, NOP, NOP, NOP, NOP, NOP) +SETUPFUNC(rs_gs, NOP, COL, NOP, NOP, NOP, NOP, SPC, NOP) +SETUPFUNC(rs_gt0, NOP, COL, TEX0, NOP, TEX0_4, NOP, NOP, NOP) +SETUPFUNC(rs_gt1, NOP, COL, NOP, TEX1, NOP, TEX1_4, NOP, NOP) +SETUPFUNC(rs_gt0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP, NOP) +SETUPFUNC(rs_gst0, NOP, COL, TEX0, NOP, TEX0_4, NOP, SPC, NOP) +SETUPFUNC(rs_gst1, NOP, COL, NOP, TEX1, NOP, TEX1_4, SPC, NOP) +SETUPFUNC(rs_gst0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC, NOP) +SETUPFUNC(rs_gf, NOP, COL, NOP, NOP, NOP, NOP, NOP, FOG) +SETUPFUNC(rs_gfs, NOP, COL, NOP, NOP, NOP, NOP, SPC, FOG) +SETUPFUNC(rs_gft0, NOP, COL, TEX0, NOP, TEX0_4, NOP, NOP, FOG) +SETUPFUNC(rs_gft1, NOP, COL, NOP, TEX1, NOP, TEX1_4, NOP, FOG) +SETUPFUNC(rs_gft0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, NOP, FOG) +SETUPFUNC(rs_gfst0, NOP, COL, TEX0, NOP, TEX0_4, NOP, SPC, FOG) +SETUPFUNC(rs_gfst1, NOP, COL, NOP, TEX1, NOP, TEX1_4, SPC, FOG) +SETUPFUNC(rs_gfst0t1, NOP, COL, TEX0, TEX1, TEX0_4, TEX1_4, SPC, FOG) + static void rs_invalid(struct vertex_buffer *VB, GLuint start, GLuint end) { @@ -215,7 +245,7 @@ typedef void (*setupFunc)(struct vertex_buffer *, GLuint, GLuint); static setupFunc setup_func[0x20]; /* Initialize the table of vertex buffer setup functions */ -void r128SetupInit(void) +void r128DDSetupInit(void) { int i; @@ -225,7 +255,9 @@ void r128SetupInit(void) setup_func[R128_WIN_BIT|R128_TEX0_BIT] = rs_wt0; setup_func[R128_WIN_BIT|R128_TEX1_BIT] = rs_wt1; setup_func[R128_WIN_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wt0t1; - + setup_func[R128_WIN_BIT|R128_FOG_BIT|R128_TEX0_BIT] = rs_wft0; + setup_func[R128_WIN_BIT|R128_FOG_BIT|R128_TEX1_BIT] = rs_wft1; + setup_func[R128_WIN_BIT|R128_FOG_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wft0t1; setup_func[R128_WIN_BIT|R128_RGBA_BIT] = rs_wg; setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT] = rs_wgs; setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_TEX0_BIT] = rs_wgt0; @@ -234,12 +266,24 @@ void r128SetupInit(void) setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_wgst0; setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_wgst1; setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wgst0t1; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT] = rs_wgf; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT] = rs_wgfs; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_TEX0_BIT] = rs_wgft0; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_TEX1_BIT] = rs_wgft1; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wgft0t1; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_wgfst0; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_wgfst1; + setup_func[R128_WIN_BIT|R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_wgfst0t1; /* Funcs to repair vertices */ setup_func[R128_TEX0_BIT] = rs_t0; setup_func[R128_TEX1_BIT] = rs_t1; setup_func[R128_TEX0_BIT|R128_TEX1_BIT] = rs_t0t1; + setup_func[R128_FOG_BIT] = rs_f; + setup_func[R128_FOG_BIT|R128_TEX0_BIT] = rs_ft0; + setup_func[R128_FOG_BIT|R128_TEX1_BIT] = rs_ft1; + setup_func[R128_FOG_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_ft0t1; setup_func[R128_RGBA_BIT] = rs_g; setup_func[R128_RGBA_BIT|R128_SPEC_BIT] = rs_gs; setup_func[R128_RGBA_BIT|R128_TEX0_BIT] = rs_gt0; @@ -248,11 +292,19 @@ void r128SetupInit(void) setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_gst0; setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_gst1; setup_func[R128_RGBA_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_gst0t1; + setup_func[R128_RGBA_BIT|R128_FOG_BIT] = rs_gf; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT] = rs_gfs; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_TEX0_BIT] = rs_gft0; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_TEX1_BIT] = rs_gft1; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_gft0t1; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX0_BIT] = rs_gfst0; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX1_BIT] = rs_gfst1; + setup_func[R128_RGBA_BIT|R128_FOG_BIT|R128_SPEC_BIT|R128_TEX0_BIT|R128_TEX1_BIT] = rs_gfst0t1; } /* Initialize the vertex buffer setup functions based on the current rendering state */ -void r128ChooseRasterSetupFunc(GLcontext *ctx) +void r128DDChooseRasterSetupFunc(GLcontext *ctx) { r128ContextPtr r128ctx = R128_CONTEXT(ctx); int funcIndex = R128_WIN_BIT | R128_RGBA_BIT; @@ -286,13 +338,16 @@ void r128ChooseRasterSetupFunc(GLcontext *ctx) if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) funcIndex |= R128_SPEC_BIT; + if (ctx->Fog.Enabled) + funcIndex |= R128_FOG_BIT; + r128ctx->SetupIndex = funcIndex; ctx->Driver.RasterSetup = setup_func[funcIndex]; } /* Check to see if any updates of the vertex buffer entries are needed */ -void r128CheckPartialRasterSetup(GLcontext *ctx, - struct gl_pipeline_stage *s) +void r128DDCheckPartialRasterSetup(GLcontext *ctx, + struct gl_pipeline_stage *s) { r128ContextPtr r128ctx = R128_CONTEXT(ctx); int tmp = r128ctx->SetupDone; @@ -308,7 +363,7 @@ void r128CheckPartialRasterSetup(GLcontext *ctx, /* Update the vertex buffer entries, if necessary */ -void r128PartialRasterSetup(struct vertex_buffer *VB) +void r128DDPartialRasterSetup(struct vertex_buffer *VB) { r128ContextPtr r128ctx = R128_CONTEXT(VB->ctx); int new = VB->pipeline->new_outputs; @@ -317,12 +372,13 @@ void r128PartialRasterSetup(struct vertex_buffer *VB) if (new & VERT_WIN) { new = available; - index |= R128_WIN_BIT; + index |= R128_WIN_BIT | R128_FOG_BIT; } if (new & VERT_RGBA) index |= R128_RGBA_BIT | R128_SPEC_BIT; if (new & VERT_TEX0_ANY) index |= R128_TEX0_BIT; if (new & VERT_TEX1_ANY) index |= R128_TEX1_BIT; + if (new & VERT_FOG_COORD) index |= R128_FOG_BIT; r128ctx->SetupDone &= ~index; index &= r128ctx->SetupIndex; @@ -332,18 +388,18 @@ void r128PartialRasterSetup(struct vertex_buffer *VB) } /* Perform the raster setup for the fast path, if using CVA */ -void r128DoRasterSetup(struct vertex_buffer *VB) +void r128DDDoRasterSetup(struct vertex_buffer *VB) { GLcontext *ctx = VB->ctx; - if (VB->Type == VB_CVA_PRECALC) r128PartialRasterSetup(VB); + if (VB->Type == VB_CVA_PRECALC) r128DDPartialRasterSetup(VB); else if (ctx->Driver.RasterSetup) ctx->Driver.RasterSetup(VB, VB->CopyStart, VB->Count); } /* Resize an existing vertex buffer */ -void r128ResizeVB(struct vertex_buffer *VB, GLuint size) +void r128DDResizeVB(struct vertex_buffer *VB, GLuint size) { r128VertexBufferPtr r128vb = R128_DRIVER_DATA(VB); diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_vb.h b/xc/lib/GL/mesa/src/drv/r128/r128_vb.h index 6b6670918..131a982a1 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_vb.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_vb.h @@ -146,21 +146,26 @@ typedef struct { #define R128_DRIVER_DATA(vb) ((r128VertexBufferPtr)((vb)->driver_data)) -#define R128_SPEC_BIT 0x01 -#define R128_TEX1_BIT 0x02 -#define R128_TEX0_BIT 0x04 -#define R128_RGBA_BIT 0x08 -#define R128_WIN_BIT 0x10 - -extern void r128SetupInit(void); -extern void r128ChooseRasterSetupFunc(GLcontext *ctx); -extern void r128CheckPartialRasterSetup(GLcontext *ctx, - struct gl_pipeline_stage *s); -extern void r128PartialRasterSetup(struct vertex_buffer *VB); -extern void r128DoRasterSetup(struct vertex_buffer *VB); -extern void r128ResizeVB(struct vertex_buffer *VB, GLuint size); -extern void r128DDRegisterVB(struct vertex_buffer *VB); -extern void r128DDUnregisterVB(struct vertex_buffer *VB); +#define R128_WIN_BIT 0x01 +#define R128_RGBA_BIT 0x02 +#define R128_FOG_BIT 0x04 +#define R128_SPEC_BIT 0x08 +#define R128_TEX0_BIT 0x10 +#define R128_TEX1_BIT 0x20 + +extern void r128DDSetupInit( void ); + +extern void r128DDChooseRasterSetupFunc( GLcontext *ctx ); +extern void r128PrintSetupFlags( char *msg, GLuint flags ); + +extern void r128DDCheckPartialRasterSetup( GLcontext *ctx, + struct gl_pipeline_stage *s ); +extern void r128DDPartialRasterSetup(struct vertex_buffer *VB); +extern void r128DDDoRasterSetup(struct vertex_buffer *VB); + +extern void r128DDResizeVB(struct vertex_buffer *VB, GLuint size); +extern void r128DDRegisterVB(struct vertex_buffer *VB); +extern void r128DDUnregisterVB(struct vertex_buffer *VB); #endif #endif /* _R128_VB_H_ */ diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c index 461ab30c3..aae13df65 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.c,v 1.1 2000/06/17 00:03:09 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h index 87d032fb2..ca6fc127b 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_xmesa.h,v 1.1 2000/06/17 00:03:09 martin Exp $ */ +/* $XFree86$ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., diff --git a/xc/lib/GL/mesa/src/drv/sis/Imakefile b/xc/lib/GL/mesa/src/drv/sis/Imakefile index 2ed7b8c15..e5e16f588 100644 --- a/xc/lib/GL/mesa/src/drv/sis/Imakefile +++ b/xc/lib/GL/mesa/src/drv/sis/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.4 2000/08/11 17:27:10 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.6tsi Exp $ #include <Threads.tmpl> @@ -18,13 +18,6 @@ XCOMM DEBUG_DEFINES = -DSIS_DEBUG ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif -#if defined(LinuxArchitecture) -OS_SUBDIR = linux -#endif -#if defined(FreeBSDArchitecture) || defined(BSDOSArchitecture) -OS_SUBDIR = bsd -#endif - #ifdef i386Architecture #ifdef MesaUse3DNow ASM_DEFS = -DUSE_MMX_ASM -DUSE_X86_ASM -DUSE_3DNOW_ASM @@ -42,11 +35,11 @@ OS_SUBDIR = bsd -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri \ -I$(XF86DRIVERSRC)/sis \ -I../../../include -I../.. -I../../X \ - -I../common/ \ - -I$(XF86OSSRC)/linux/drm/kernel + -I../common/ #endif -MESA_INCLUDES = -I. -I.. -I../../include +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm LinkSourceFile(xdriP.h, ../../X) diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_alloc.c b/xc/lib/GL/mesa/src/drv/sis/sis_alloc.c index 99c980e83..935a220e6 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_alloc.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_alloc.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c,v 1.3 2000/08/04 03:51:41 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include <assert.h> @@ -16,7 +47,7 @@ #define Z_BUFFER_HW_ALIGNMENT 16 #define Z_BUFFER_HW_PLUS (16 + 4) -/* 3D engine uses 2,and bitblt uses 4 */ +/* 3D engine uses 2, and bitblt uses 4 */ #define DRAW_BUFFER_HW_ALIGNMENT 16 #define DRAW_BUFFER_HW_PLUS (16 + 4) @@ -60,13 +91,15 @@ sis_alloc_fb (__GLSiScontext * hwcx, GLuint size, void **free) } static void -sis_free_fb (__GLSiScontext * hwcx, void *free) +sis_free_fb (int hHWContext, void *free) { xf86FreeOffscreenArea ((FBAreaPtr) free); } #else +int gDRMSubFD = -1; + /* debug */ #if 1 @@ -103,11 +136,8 @@ sis_alloc_fb (__GLSiScontext * hwcx, GLuint size, void **free) } static void -sis_free_fb (__GLSiScontext * hwcx, void *free) +sis_free_fb (int hHWContext, void *free) { - GLcontext *ctx = hwcx->gc; - XMesaContext xmesa = (XMesaContext) ctx->DriverCtx; - drm_sis_mem_t fb; if (SIS_VERBOSE&VERBOSE_SIS_MEMORY) @@ -116,9 +146,9 @@ sis_free_fb (__GLSiScontext * hwcx, void *free) (DWORD)free, (DWORD)getpid(), --_total_video_memory_count); } - fb.context = xmesa->driContextPriv->hHWContext; + fb.context = hHWContext; fb.free = (unsigned int)free; - ioctl(hwcx->drmSubFD, SIS_IOCTL_FB_FREE, &fb); + ioctl(gDRMSubFD, SIS_IOCTL_FB_FREE, &fb); } #else @@ -139,7 +169,7 @@ sis_alloc_fb (__GLSiScontext * hwcx, GLuint size, void **free) } static void -sis_free_fb (__GLSiScontext * hwcx, void *free) +sis_free_fb (int hHWContext, void *free) { return; } @@ -176,11 +206,8 @@ sis_alloc_agp (__GLSiScontext * hwcx, GLuint size, void **free) } static void -sis_free_agp (__GLSiScontext * hwcx, void *free) +sis_free_agp (int hHWContext, void *free) { - GLcontext *ctx = hwcx->gc; - XMesaContext xmesa = (XMesaContext) ctx->DriverCtx; - drm_sis_mem_t agp; if (SIS_VERBOSE&VERBOSE_SIS_MEMORY) @@ -189,9 +216,9 @@ sis_free_agp (__GLSiScontext * hwcx, void *free) (DWORD)free, (DWORD)getpid(), --_total_video_memory_count); } - agp.context = xmesa->driContextPriv->hHWContext; + agp.context = hHWContext; agp.free = (unsigned int)free; - ioctl(hwcx->drmSubFD, SIS_IOCTL_AGP_FREE, &agp); + ioctl(gDRMSubFD, SIS_IOCTL_AGP_FREE, &agp); } /* debug */ @@ -277,9 +304,9 @@ void sis_free_z_stencil_buffer (XMesaBuffer buf) { sisBufferInfo *priv = (sisBufferInfo *) buf->private; - __GLSiScontext *hwcx = (__GLSiScontext *) buf->xm_context->private; + XMesaContext xmesa = buf->xm_context; - sis_free_fb (hwcx, priv->zbFree); + sis_free_fb (xmesa->driContextPriv->hHWContext, priv->zbFree); priv->zbFree = NULL; buf->depthbuffer = NULL; } @@ -307,6 +334,7 @@ sis_alloc_back_image (GLcontext * ctx, XMesaImage *image, void **free, width2 = (depth == 2) ? ALIGNMENT (xm_buffer->width, 2) : xm_buffer->width; size = width2 * xm_buffer->height * depth + DRAW_BUFFER_HW_PLUS; + /* Fixme: unique context alloc/free back-buffer? */ addr = sis_alloc_fb (hwcx, size, free); if (!addr) { @@ -316,7 +344,7 @@ sis_alloc_back_image (GLcontext * ctx, XMesaImage *image, void **free, addr = (GLbyte *) ALIGNMENT ((GLuint) addr, DRAW_BUFFER_HW_ALIGNMENT); - image->data = (char *)addr; + image->data = addr; image->bytes_per_line = width2 * depth; image->bits_per_pixel = depth * 8; @@ -351,9 +379,9 @@ sis_alloc_back_image (GLcontext * ctx, XMesaImage *image, void **free, void sis_free_back_image (XMesaBuffer buf, XMesaImage *image, void *free) { - __GLSiScontext *hwcx = (__GLSiScontext *) buf->xm_context->private; + XMesaContext xmesa = buf->xm_context; - sis_free_fb (hwcx, free); + sis_free_fb (xmesa->driContextPriv->hHWContext, free); image->data = NULL; } @@ -476,7 +504,7 @@ sis_alloc_texture_image (GLcontext * ctx, GLtextureImage * image) area->Format = driver_format; area->Size = image->Width * image->Height * texel_size; area->texelSize = texel_size; - area->hwcx = hwcx; + area->hHWContext = xmesa->driContextPriv->hHWContext; /* debug */ area->realSize = area->Size; @@ -490,7 +518,6 @@ void sis_free_texture_image (GLtextureImage * image) { SIStextureArea *area = (SIStextureArea *) image->DriverData; - __GLSiScontext *hwcx = (__GLSiScontext *) area->hwcx; /* debug */ Total_Real_Textures_Used -= area->realSize; @@ -498,14 +525,14 @@ sis_free_texture_image (GLtextureImage * image) if (!area) return; - + if (area->Data) switch(area->memType){ case VIDEO_TYPE: - sis_free_fb (hwcx, area->free); + sis_free_fb (area->hHWContext, area->free); break; case AGP_TYPE: - sis_free_agp (hwcx, area->free); + sis_free_agp (area->hHWContext, area->free); break; default: assert(0); diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_clear.c b/xc/lib/GL/mesa/src/drv/sis/sis_clear.c index 86240b1b4..03da12499 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_clear.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_clear.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_clear.c,v 1.3 2000/08/04 03:51:41 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include "sis_ctx.h" #include "sis_mesa.h" @@ -558,12 +589,12 @@ sis_swap_buffers (XMesaBuffer b) /* TODO: need lock? */ #if 1 - while((*hwcx->FrameCountPtr) - *(DWORD volatile *)(hwcx->IOBase+0x8a2c) - > SIS_MAX_FRAME_LENGTH) { - /* - DWORD temp = *(DWORD *)(hwcx->IOBase+0x8a2c); - */ + int repeat = 0; + + while(((*hwcx->FrameCountPtr) - *(DWORD volatile *)(hwcx->IOBase+0x8a2c) + > SIS_MAX_FRAME_LENGTH) && + (repeat++ < 10)); } #endif diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_common.h b/xc/lib/GL/mesa/src/drv/sis/sis_common.h index a492bd24b..8b62fadcf 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_common.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_common.h @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_common.h,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #ifndef _sis_common_h_ #define _sis_common_h_ @@ -146,7 +177,7 @@ typedef struct sis_texure_area GLuint Pitch; GLuint Size; GLuint texelSize; - void *hwcx; + unsigned int hHWContext; /* Debug */ GLuint realSize; diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_ctx.c b/xc/lib/GL/mesa/src/drv/sis/sis_ctx.c index 820e7d733..a45934fac 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_ctx.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_ctx.c @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifdef XFree86Server # define PSZ 8 # include "cfb.h" diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_ctx.h b/xc/lib/GL/mesa/src/drv/sis/sis_ctx.h index f225fc0cf..5bbaa29b4 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_ctx.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_ctx.h @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_ctx.h,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #ifndef _sis_ctx_h_ #define _sis_ctx_h_ @@ -109,9 +140,8 @@ typedef struct __GLSiSHardwareRec } __GLSiSHardware; -/* - ** Device dependent context state - */ +/* Device dependent context state */ + typedef struct __GLSiScontextRec { /* This must be first in this structure */ @@ -121,10 +151,10 @@ typedef struct __GLSiScontextRec unsigned int bytesPerPixel; unsigned char *IOBase; unsigned char *FbBase; - unsigned int displayWidth; /* per byte */ + unsigned int displayWidth; unsigned int pitch; - /* for sw-render */ + /* For Software Renderer */ GLubyte *swRenderBase; GLuint swRenderPitch; GLubyte *swZBase; @@ -143,7 +173,7 @@ typedef struct __GLSiScontextRec unsigned int clearColorPattern; unsigned int clearZStencilPattern; - /* render function */ + /* Render Function */ points_func PointsFunc; line_func LineFunc; triangle_func TriangleFunc; @@ -196,7 +226,7 @@ typedef struct __GLSiScontextRec void (*SwapBuffers)(XMesaBuffer b); - /* stereo */ + /* Stereo */ GLboolean isFullScreen; GLboolean useStereo; GLboolean stereoEnabled; @@ -221,7 +251,7 @@ typedef struct __GLSiScontextRec } __GLSiScontext; -/* Macros to access hwcx */ +/* Macros */ #define GET_IOBase(x) ((x)->IOBase) #define GET_FbBase(x) ((x)->FbBase) #define GET_AGPBase(x) ((x)->AGPBase) @@ -253,6 +283,9 @@ void sis_StartAGP (GLcontext * ctx); void sis_FlushAGP (GLcontext * ctx); extern float *AGP_CurrentPtr; +/* DRM FD */ +extern int gDRMSubFD; + void sis_fatal_error (void); #endif diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_debug.c b/xc/lib/GL/mesa/src/drv/sis/sis_debug.c index 3d9c21012..d95579ac0 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_debug.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_debug.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_debug.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ /* * dump HW states, set environment variable SIS_DEBUG diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_debug.h b/xc/lib/GL/mesa/src/drv/sis/sis_debug.h index ea4c16204..546aa361a 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_debug.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_debug.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifndef _sis_debug_h_ #define _sis_debug_h_ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c b/xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c index 725c9e10a..ba1092d30 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_fastpath.c @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + /* * FOR * 1. triangle/strip with 2-texture with no other capability diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_fog.c b/xc/lib/GL/mesa/src/drv/sis/sis_fog.c index 61bab48d8..7a2f5302c 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_fog.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_fog.c @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #include "sis_ctx.h" #include "sis_mesa.h" diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_init.h b/xc/lib/GL/mesa/src/drv/sis/sis_init.h index 12fd6164a..8b8f3b4ab 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_init.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_init.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifndef _sis_init_h_ #define _sis_init_h_ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h b/xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h index 28f5007c0..33f4542bf 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_linefunc.h,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #define SIS_TRI_FUNC 0 @@ -156,7 +187,7 @@ else{ \ AGP_CurrentPtr+=3; \ if (SIS_STATES & (SIS_USE_W)) \ { \ - if(VB->TexCoordPtr[1]->size == 4){ \ + if(VB->TexCoordPtr[0]->size == 4){ \ AGP_CurrentPtr[0] = VB->Win.data[v][3] * \ VB->TexCoordPtr[0]->data[v][3]; \ } \ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_lock.h b/xc/lib/GL/mesa/src/drv/sis/sis_lock.h index 7e6dadb20..99bee12ca 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_lock.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_lock.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifndef _sis_dri_h_ #define _sis_dri_h_ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c index ca09b153f..d733a4cf8 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_mesa.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include "sis_ctx.h" #include "sis_mesa.h" diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.h b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.h index 9d3d05db7..033ee56ad 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifndef _sis_mesa_h_ #define _sis_mesa_h_ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_reg.h b/xc/lib/GL/mesa/src/drv/sis/sis_reg.h index d9b408b42..1d023e634 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_reg.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_reg.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #ifndef _sis_reg_h_ #define _sis_reg_h_ diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_render.c b/xc/lib/GL/mesa/src/drv/sis/sis_render.c index f59e4be2e..f990d43b5 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_render.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_render.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_render.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include "sis_ctx.h" #include "sis_mesa.h" @@ -425,6 +456,8 @@ sis_set_render_func (GLcontext * ctx) ctx->Driver.LineFunc = NULL; ctx->Driver.TriangleFunc = NULL; hwcx->swRenderFlag = ~0x0; + ctx->Visual->DepthMax = (sizeof(GLdepth)==2)?0xffff:0xffffffff; + ctx->Visual->DepthMaxF = (double)(sizeof(GLdepth)==2)?0xffff:0xffffffff; */ } diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_span.c b/xc/lib/GL/mesa/src/drv/sis/sis_span.c index fcee409d1..1128e39b3 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_span.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_span.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_span.c,v 1.2 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include "sis_ctx.h" #include "sis_mesa.h" @@ -14,7 +45,7 @@ XMesaContext xmesa = (XMesaContext) ctx->DriverCtx; \ __GLSiScontext *hwcx = (__GLSiScontext *) xmesa->private; \ GLuint pitch = hwcx->swRenderPitch; \ - char *buf = (char *)hwcx->swRenderBase + char *buf = hwcx->swRenderBase #define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \ _y >= miny && _y < maxy) diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_stencil.c b/xc/lib/GL/mesa/src/drv/sis/sis_stencil.c index 950435cf4..3f2abb5bb 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_stencil.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_stencil.c @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #include "sis_ctx.h" #include "sis_mesa.h" diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h b/xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h index 322a7ad40..f2969bec2 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_swzfunc.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + static void SIS_TAG (sis_WriteDepthSpan) (GLcontext * ctx, GLuint n, GLint x, GLint y, const GLdepth depth[], const GLubyte mask[]) diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_texture.c b/xc/lib/GL/mesa/src/drv/sis/sis_texture.c index eb9042563..bbbe73dd7 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_texture.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_texture.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_texture.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include "sis_ctx.h" #include "sis_mesa.h" @@ -113,10 +144,8 @@ sis_TexImage (GLcontext * ctx, GLenum target, SIStextureArea *area; if (target == GL_TEXTURE_3D || image->Border) - { - return; - } - + return; + if (!tObj->DriverData) { sisTexobjInfo *info; @@ -139,8 +168,7 @@ sis_TexImage (GLcontext * ctx, GLenum target, } else { - /* Optimize */ - + /* Optimize */ ((sisTexobjInfo *) tObj->DriverData)->dirtyFlag |= (SIS_TEX_PARAMETER | SIS_TEX_ENV); } @@ -153,7 +181,7 @@ sis_TexImage (GLcontext * ctx, GLenum target, if (area->Format == GL_RGB8) { int i; - GLbyte *src = (GLbyte *)image->Data; + GLbyte *src = image->Data; GLbyte *dst = area->Data; for (i = 0; i < area->Size / 4; i++) @@ -203,7 +231,7 @@ sis_TexSubImage (GLcontext * ctx, GLenum target, if (area->Format == GL_RGB8) { - src = (GLbyte *)image->Data + (xoffset + yoffset * image->Width) * 3; + src = image->Data + (xoffset + yoffset * image->Width) * 3; dst = area->Data + (xoffset + yoffset * image->Width) * 4; soffset = (image->Width - width) * 3; doffset = (image->Width - width) * 4; @@ -224,7 +252,7 @@ sis_TexSubImage (GLcontext * ctx, GLenum target, GLuint texelSize = area->texelSize; GLuint copySize = texelSize * width; - src = (GLbyte *)image->Data + (xoffset + yoffset * image->Width) * texelSize; + src = image->Data + (xoffset + yoffset * image->Width) * texelSize; dst = area->Data + (xoffset + yoffset * image->Width) * texelSize; soffset = image->Width * texelSize; diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h b/xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h index 126b1ac53..7c57a615f 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_trifunc.h @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #define SIS_TRI_FUNC 1 static void diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c b/xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c index 497d1cf96..89a11c5a1 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_xf86glx.c,v 1.1 2000/06/30 19:30:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.6 2000/02/08 17:18:52 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c b/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c index 1dd01a51a..0f9bb0619 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c @@ -1,4 +1,35 @@ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ #include <unistd.h> #include <sys/mman.h> @@ -78,6 +109,8 @@ GLboolean XMesaInitDriver (__DRIscreenPrivate * driScrnPriv) global_regs = priv->regs; global_agp = priv->agp; global_FbBase = driScrnPriv->pFB; + + gDRMSubFD = driScrnPriv->fd; return GL_TRUE; } @@ -302,7 +335,7 @@ GLframebuffer *XMesaCreatePixmapBuffer( Display *dpy, static void SISDestroyBuffer (XMesaBuffer b) { if (SIS_VERBOSE&VERBOSE_SIS_BUFFER){ - fprintf(stderr, "XMesaDestroyBuffer: b=%lu\n", (DWORD)b); + fprintf(stderr, "SISDestroyBuffer: b=%lu\n", (DWORD)b); } if (b->backimage && b->backimage->data) diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h b/xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h index f7e5b667a..dc19c1be4 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h +++ b/xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h @@ -21,7 +21,7 @@ * 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. */ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_xmesaP.h,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ + #ifndef XMESAP_H #define XMESAP_H diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_xwin.c b/xc/lib/GL/mesa/src/drv/sis/sis_xwin.c index 5b6268179..c651b444b 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_xwin.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_xwin.c @@ -1,3 +1,36 @@ +/************************************************************************** + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +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, sub license, 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 (including the +next paragraph) 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 NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +**************************************************************************/ + +/* + * Authors: + * Sung-Ching Lin <sclin@sis.com.tw> + * + */ + #include "sis_ctx.h" #include "sis_mesa.h" diff --git a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile index 416e3e75e..133a0d363 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile +++ b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.10 2000/08/04 03:51:44 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.11 2000/08/24 22:20:08 tsi Exp $ #include <Threads.tmpl> @@ -22,7 +22,8 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -I../../../include -I../.. -I../../X #endif -MESA_INCLUDES = -I. -I.. -I../../include +MESA_INCLUDES = -I. -I.. -I../../include \ + -I../../../../dri/drm LinkSourceFile(fxclip.c, $(MESASRCDIR)/src/FX) LinkSourceFile(fxcliptmp.h, $(MESASRCDIR)/src/FX) @@ -279,7 +280,7 @@ LinkSourceFile(fxvs_tmp.h, $(MESASRCDIR)/src/FX) SRCS = $(DRISRCS) $(DRMSRCS) $(TDFXSRCS) $(MESASRCS) $(ASMSRCS) OBJS = $(DRIOBJS) $(DRMOBJS) $(TDFXOBJS) $(MESAOBJS) $(ASMOBJS) -REQUIREDLIBS = -lglide3x -lm +REQUIREDLIBS = -l$(GLIDE3LIBNAME) MathLibrary #if !GlxBuiltInTdfx REQUIREDLIBS += -L../../../.. -lGL #endif diff --git a/xc/lib/ICE/ICE-def.cpp b/xc/lib/ICE/ICE-def.cpp index 2461b9123..b6f5a7021 100644 --- a/xc/lib/ICE/ICE-def.cpp +++ b/xc/lib/ICE/ICE-def.cpp @@ -63,4 +63,4 @@ EXPORTS IceListenForWellKnownConnections _IceTransGetHostname /* $TOG: ICE-def.cpp /main/7 1998/01/04 12:31:53 kaleb $ */ -/* $XFree86: xc/lib/ICE/ICE-def.cpp,v 1.3 2000/08/09 23:40:12 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/ICE/ICElib.h b/xc/lib/ICE/ICElib.h index 8486d1293..587120b54 100644 --- a/xc/lib/ICE/ICElib.h +++ b/xc/lib/ICE/ICElib.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElib.h,v 3.2 1998/10/03 08:41:09 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.1 1996/12/23 05:58:57 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ diff --git a/xc/lib/ICE/ICElibint.h b/xc/lib/ICE/ICElibint.h index 7f7ed3035..dc73a0826 100644 --- a/xc/lib/ICE/ICElibint.h +++ b/xc/lib/ICE/ICElibint.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.3 2000/06/17 18:23:22 dawes Exp $ */ +/* $XFree86$ */ #ifndef _ICELIBINT_H_ #define _ICELIBINT_H_ diff --git a/xc/lib/ICE/ICEos2.def b/xc/lib/ICE/ICEos2.def index 987b19d34..e260af184 100644 --- a/xc/lib/ICE/ICEos2.def +++ b/xc/lib/ICE/ICEos2.def @@ -1,5 +1,5 @@ LIBRARY ICE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/ICE/ICEos2.def,v 3.7 1999/04/29 09:13:27 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/ICE/Imakefile b/xc/lib/ICE/Imakefile index 340496319..0a200dfa0 100644 --- a/xc/lib/ICE/Imakefile +++ b/xc/lib/ICE/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/21 1996/11/29 13:30:33 swick $ -XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.3 1998/12/20 11:56:49 dawes Exp $ +XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.2 1996/12/23 05:58:58 dawes Exp $ #define DoNormalLib NormalLibICE #define DoSharedLib SharedLibICE diff --git a/xc/lib/ICE/authutil.c b/xc/lib/ICE/authutil.c index 453ad0457..b029402cc 100644 --- a/xc/lib/ICE/authutil.c +++ b/xc/lib/ICE/authutil.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/authutil.c,v 3.5 1999/05/23 06:33:23 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/authutil.c,v 3.4 1998/10/03 08:41:09 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/ICE/connect.c b/xc/lib/ICE/connect.c index 780e133cf..5649a6e01 100644 --- a/xc/lib/ICE/connect.c +++ b/xc/lib/ICE/connect.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/connect.c,v 3.5 1999/03/21 07:34:27 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/connect.c,v 3.4 1998/10/03 08:41:09 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/ICE/error.c b/xc/lib/ICE/error.c index b14c3b998..2b9c79091 100644 --- a/xc/lib/ICE/error.c +++ b/xc/lib/ICE/error.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/error.c,v 1.2 1999/05/23 06:33:23 dawes Exp $ */ +/* $XFree86$ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/ICE/globals.h b/xc/lib/ICE/globals.h index 2bcc8bb45..331e27989 100644 --- a/xc/lib/ICE/globals.h +++ b/xc/lib/ICE/globals.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/globals.h,v 1.2 1998/12/20 11:56:49 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/globals.h,v 1.1.1.1.12.2 1998/10/19 20:57:04 hohndel Exp $ */ extern void _IceDefaultErrorHandler (); extern void _IceDefaultIOErrorHandler (); diff --git a/xc/lib/ICE/iceauth.c b/xc/lib/ICE/iceauth.c index 6ff0fa514..8fb7ff55e 100644 --- a/xc/lib/ICE/iceauth.c +++ b/xc/lib/ICE/iceauth.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/iceauth.c,v 3.2 1998/10/03 08:41:09 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/iceauth.c,v 3.1 1995/01/27 04:44:52 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/ICE/listenwk.c b/xc/lib/ICE/listenwk.c index 78b1b9368..f45a970bc 100644 --- a/xc/lib/ICE/listenwk.c +++ b/xc/lib/ICE/listenwk.c @@ -21,7 +21,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/lib/ICE/listenwk.c,v 1.2 1999/05/23 06:33:24 dawes Exp $ */ +/* $XFree86$ */ /* Author: Ralph Mor, X Consortium */ diff --git a/xc/lib/ICE/misc.c b/xc/lib/ICE/misc.c index b533c7f9e..037dfd7e5 100644 --- a/xc/lib/ICE/misc.c +++ b/xc/lib/ICE/misc.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/misc.c,v 1.2 1999/05/23 06:33:24 dawes Exp $ */ +/* $XFree86$ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/ICE/process.c b/xc/lib/ICE/process.c index 6f271d16e..3bb886aee 100644 --- a/xc/lib/ICE/process.c +++ b/xc/lib/ICE/process.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/process.c,v 3.4 2000/06/17 17:44:18 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/process.c,v 3.3 1999/05/23 06:33:24 dawes Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/ICE/setauth.c b/xc/lib/ICE/setauth.c index 5b9569f8b..0d353f991 100644 --- a/xc/lib/ICE/setauth.c +++ b/xc/lib/ICE/setauth.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/setauth.c,v 1.2 1998/12/20 11:56:50 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/setauth.c,v 1.1.1.1.12.2 1998/10/19 20:57:04 hohndel Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" diff --git a/xc/lib/Imakefile b/xc/lib/Imakefile index 780133c5f..84b05bf8b 100644 --- a/xc/lib/Imakefile +++ b/xc/lib/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/39 1997/02/26 18:09:44 kaleb $ -XCOMM $XFree86: xc/lib/Imakefile,v 3.38 2000/08/09 03:10:59 tsi Exp $ +XCOMM $XFree86: xc/lib/Imakefile,v 3.37 2000/08/09 02:12:02 mvojkovi Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -71,6 +71,10 @@ DPSTKLIBDIR = dpstk PSRESLIBDIR = psres #endif +#if BuildRenderLibrary +RENDERLIBDIR = Xrender +#endif + XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \ $(XF86DGALIBDIR) $(XF86RUSHLIBDIR) @@ -103,7 +107,7 @@ LINTSUBDIRS = Xau Xdmcp $(THRSTUBLIBDIR) X11 oldX ICE SM Xext Xt \ PEX5 $(XKBLIBDIR) $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) \ Xp $(XVLIBDIR) $(GLXLIBDIR) $(DPSLIBDIR) \ $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ - $(ZLIBDIR) $(REGEXDIR) + $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) #else #if XnestServer || BuildGLXLibrary XEXTDIR = Xext @@ -111,7 +115,7 @@ XEXTDIR = Xext LINTSUBDIRS = Xau Xdmcp X11 $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \ $(XKBUILIBDIR) $(LBXUTILDIR) $(XF86EXTLIBS) $(XVLIBDIR) \ - $(GLXLIBDIR) $(ZLIBDIR) $(REGEXDIR) + $(GLXLIBDIR) $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) #endif SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTCACHELIBDIR) diff --git a/xc/lib/PEX5/Imakefile b/xc/lib/PEX5/Imakefile index cf5f7967a..57a36369d 100644 --- a/xc/lib/PEX5/Imakefile +++ b/xc/lib/PEX5/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/18 1996/09/28 16:33:26 rws $ -XCOMM $XFree86: xc/lib/PEX5/Imakefile,v 1.3 1998/12/20 11:56:51 dawes Exp $ +XCOMM $XFree86: xc/lib/PEX5/Imakefile,v 1.2 1998/09/19 12:14:37 dawes Exp $ #define DoNormalLib NormalLibPex #define DoSharedLib SharedLibPex diff --git a/xc/lib/PEX5/PEX5os2.def b/xc/lib/PEX5/PEX5os2.def index 6f2d74314..faf55a0ec 100644 --- a/xc/lib/PEX5/PEX5os2.def +++ b/xc/lib/PEX5/PEX5os2.def @@ -1,5 +1,5 @@ LIBRARY PEX5 -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/PEX5/PEX5os2.def,v 3.6 1999/04/29 09:13:27 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/PEX5/jump_funcs b/xc/lib/PEX5/jump_funcs index 4afa711ac..5cdab0e45 100644 --- a/xc/lib/PEX5/jump_funcs +++ b/xc/lib/PEX5/jump_funcs @@ -1,5 +1,5 @@ # $XConsortium: jump_funcs,v 1.2 94/12/07 10:48:56 kaleb Exp $ -# $XFree86: xc/lib/PEX5/jump_funcs,v 3.1 1995/01/28 15:42:19 dawes Exp $ +# $XFree86: xc/lib/PEX5/jump_funcs,v 3.0 1994/04/28 12:30:31 dawes Exp $ # 00000000 T _PEXEscape libPEX5 pl_escape 00000000 T _PEXEscapeWithReply libPEX5 pl_escape diff --git a/xc/lib/PEX5/jump_ignore b/xc/lib/PEX5/jump_ignore index e31c55f51..782d4fdb1 100644 --- a/xc/lib/PEX5/jump_ignore +++ b/xc/lib/PEX5/jump_ignore @@ -1,3 +1,3 @@ # $XConsortium: jump_ignore,v 1.2 94/12/07 10:48:56 kaleb Exp $ -# $XFree86: xc/lib/PEX5/jump_ignore,v 3.1 1995/01/28 15:42:20 dawes Exp $ +# $XFree86: xc/lib/PEX5/jump_ignore,v 3.0 1994/04/28 12:30:32 dawes Exp $ # jump_ignore diff --git a/xc/lib/PEX5/jump_vars b/xc/lib/PEX5/jump_vars index 9a8e46e41..98ca618e5 100644 --- a/xc/lib/PEX5/jump_vars +++ b/xc/lib/PEX5/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:56 kaleb Exp $ -# $XFree86: xc/lib/PEX5/jump_vars,v 3.1 1995/01/28 15:42:22 dawes Exp $ +# $XFree86: xc/lib/PEX5/jump_vars,v 3.0 1994/04/28 12:30:33 dawes Exp $ # 00000004 D _PEXDisplayInfoHeader libPEX5 pl_startup 00000004 D _PEXPickCache libPEX5 pl_startup diff --git a/xc/lib/SM/Imakefile b/xc/lib/SM/Imakefile index 64cf1fc66..d96e56b75 100644 --- a/xc/lib/SM/Imakefile +++ b/xc/lib/SM/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/12 1996/12/04 10:22:18 lehors $ -XCOMM $XFree86: xc/lib/SM/Imakefile,v 1.2 1998/12/20 11:56:52 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibSM #define DoSharedLib SharedLibSM diff --git a/xc/lib/SM/SMos2.def b/xc/lib/SM/SMos2.def index 460ec3eda..87ae6e428 100644 --- a/xc/lib/SM/SMos2.def +++ b/xc/lib/SM/SMos2.def @@ -1,5 +1,5 @@ LIBRARY SM -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/SM/SMos2.def,v 3.5 1999/04/29 09:13:28 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/SM/globals.h b/xc/lib/SM/globals.h index 350d4144a..30daecafd 100644 --- a/xc/lib/SM/globals.h +++ b/xc/lib/SM/globals.h @@ -21,7 +21,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/lib/SM/globals.h,v 1.2 1998/12/20 11:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/SM/globals.h,v 1.1.1.1.12.2 1998/10/19 20:57:05 hohndel Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/xc/lib/SM/sm_genid.c b/xc/lib/SM/sm_genid.c index 0d964adbb..4dc9a7fc5 100644 --- a/xc/lib/SM/sm_genid.c +++ b/xc/lib/SM/sm_genid.c @@ -21,7 +21,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/lib/SM/sm_genid.c,v 3.10 1998/12/20 11:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_genid.c,v 3.9 1998/10/03 08:41:14 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/xc/lib/X11/AllowEv.c b/xc/lib/X11/AllowEv.c index e41223ecf..ea47ee2bb 100644 --- a/xc/lib/X11/AllowEv.c +++ b/xc/lib/X11/AllowEv.c @@ -20,7 +20,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/lib/X11/AllowEv.c,v 1.2 1999/05/09 10:48:55 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/AutoRep.c b/xc/lib/X11/AutoRep.c index 5b522e1ff..aa1035a0f 100644 --- a/xc/lib/X11/AutoRep.c +++ b/xc/lib/X11/AutoRep.c @@ -20,7 +20,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/lib/X11/AutoRep.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Backgnd.c b/xc/lib/X11/Backgnd.c index 02d47d606..286ebcca8 100644 --- a/xc/lib/X11/Backgnd.c +++ b/xc/lib/X11/Backgnd.c @@ -20,7 +20,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/lib/X11/Backgnd.c,v 1.2 1999/05/09 10:48:56 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/BdrWidth.c b/xc/lib/X11/BdrWidth.c index 7ad0f46e4..23b313122 100644 --- a/xc/lib/X11/BdrWidth.c +++ b/xc/lib/X11/BdrWidth.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Bell.c b/xc/lib/X11/Bell.c index bcaae6ee1..3ae8ad70c 100644 --- a/xc/lib/X11/Bell.c +++ b/xc/lib/X11/Bell.c @@ -20,7 +20,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/lib/X11/Bell.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Border.c b/xc/lib/X11/Border.c index 98456f472..146de6f6b 100644 --- a/xc/lib/X11/Border.c +++ b/xc/lib/X11/Border.c @@ -20,7 +20,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/lib/X11/Border.c,v 1.2 1999/05/09 10:48:57 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CCC.c b/xc/lib/X11/CCC.c index 257a1673d..5caf58c31 100644 --- a/xc/lib/X11/CCC.c +++ b/xc/lib/X11/CCC.c @@ -33,7 +33,7 @@ * * */ -/* $XFree86: xc/lib/X11/CCC.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */ +/* $XFree86$ */ /* diff --git a/xc/lib/X11/ChAccCon.c b/xc/lib/X11/ChAccCon.c index 570897d9a..c2b8b216c 100644 --- a/xc/lib/X11/ChAccCon.c +++ b/xc/lib/X11/ChAccCon.c @@ -20,7 +20,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/lib/X11/ChAccCon.c,v 1.2 1999/05/09 10:48:58 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChActPGb.c b/xc/lib/X11/ChActPGb.c index 271d5e8fd..79617b898 100644 --- a/xc/lib/X11/ChActPGb.c +++ b/xc/lib/X11/ChActPGb.c @@ -20,7 +20,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/lib/X11/ChActPGb.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChClMode.c b/xc/lib/X11/ChClMode.c index 2ac66355a..dcedd6f16 100644 --- a/xc/lib/X11/ChClMode.c +++ b/xc/lib/X11/ChClMode.c @@ -20,7 +20,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/lib/X11/ChClMode.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChCmap.c b/xc/lib/X11/ChCmap.c index 3eae3b1c9..4ac886cad 100644 --- a/xc/lib/X11/ChCmap.c +++ b/xc/lib/X11/ChCmap.c @@ -20,7 +20,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/lib/X11/ChCmap.c,v 1.2 1999/05/09 10:48:59 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChGC.c b/xc/lib/X11/ChGC.c index e38845414..9a6ce6f8a 100644 --- a/xc/lib/X11/ChGC.c +++ b/xc/lib/X11/ChGC.c @@ -20,7 +20,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/lib/X11/ChGC.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChKeyCon.c b/xc/lib/X11/ChKeyCon.c index 1f3c1b719..fcb731866 100644 --- a/xc/lib/X11/ChKeyCon.c +++ b/xc/lib/X11/ChKeyCon.c @@ -20,7 +20,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/lib/X11/ChKeyCon.c,v 1.2 1999/05/09 10:49:00 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChPntCon.c b/xc/lib/X11/ChPntCon.c index 9dfde201f..cbc2b2ca1 100644 --- a/xc/lib/X11/ChPntCon.c +++ b/xc/lib/X11/ChPntCon.c @@ -20,7 +20,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/lib/X11/ChPntCon.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChProp.c b/xc/lib/X11/ChProp.c index 7cca688bd..fc0ff7ad8 100644 --- a/xc/lib/X11/ChProp.c +++ b/xc/lib/X11/ChProp.c @@ -20,7 +20,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/lib/X11/ChProp.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChSaveSet.c b/xc/lib/X11/ChSaveSet.c index 4d526d498..e06aae3e4 100644 --- a/xc/lib/X11/ChSaveSet.c +++ b/xc/lib/X11/ChSaveSet.c @@ -20,7 +20,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/lib/X11/ChSaveSet.c,v 1.2 1999/05/09 10:49:01 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChWAttrs.c b/xc/lib/X11/ChWAttrs.c index 666817502..e16728478 100644 --- a/xc/lib/X11/ChWAttrs.c +++ b/xc/lib/X11/ChWAttrs.c @@ -20,7 +20,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/lib/X11/ChWAttrs.c,v 1.2 1999/05/09 10:49:02 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ChWindow.c b/xc/lib/X11/ChWindow.c index a6c9704e0..1baa44e08 100644 --- a/xc/lib/X11/ChWindow.c +++ b/xc/lib/X11/ChWindow.c @@ -20,7 +20,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/lib/X11/ChWindow.c,v 1.4 1999/05/09 10:49:02 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CirWin.c b/xc/lib/X11/CirWin.c index cc194bc49..5e7caffac 100644 --- a/xc/lib/X11/CirWin.c +++ b/xc/lib/X11/CirWin.c @@ -20,7 +20,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/lib/X11/CirWin.c,v 1.2 1999/05/09 10:49:03 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CirWinDn.c b/xc/lib/X11/CirWinDn.c index 6a2334d6f..bd46d9cde 100644 --- a/xc/lib/X11/CirWinDn.c +++ b/xc/lib/X11/CirWinDn.c @@ -20,7 +20,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/lib/X11/CirWinDn.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CirWinUp.c b/xc/lib/X11/CirWinUp.c index 389bacf0b..b986b4bab 100644 --- a/xc/lib/X11/CirWinUp.c +++ b/xc/lib/X11/CirWinUp.c @@ -20,7 +20,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/lib/X11/CirWinUp.c,v 1.2 1999/05/09 10:49:04 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ClDisplay.c b/xc/lib/X11/ClDisplay.c index 451d5f58c..3c6c8600c 100644 --- a/xc/lib/X11/ClDisplay.c +++ b/xc/lib/X11/ClDisplay.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Clear.c b/xc/lib/X11/Clear.c index 68b87a870..35a91e3de 100644 --- a/xc/lib/X11/Clear.c +++ b/xc/lib/X11/Clear.c @@ -20,7 +20,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/lib/X11/Clear.c,v 1.2 1999/05/09 10:49:05 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ClearArea.c b/xc/lib/X11/ClearArea.c index b0e9d7f73..8d677f04c 100644 --- a/xc/lib/X11/ClearArea.c +++ b/xc/lib/X11/ClearArea.c @@ -20,7 +20,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/lib/X11/ClearArea.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ConfWind.c b/xc/lib/X11/ConfWind.c index afe698ceb..412e179f6 100644 --- a/xc/lib/X11/ConfWind.c +++ b/xc/lib/X11/ConfWind.c @@ -20,7 +20,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/lib/X11/ConfWind.c,v 1.2 1999/05/09 10:49:06 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ConnDis.c b/xc/lib/X11/ConnDis.c index 3fd039fcb..b4c85fd43 100644 --- a/xc/lib/X11/ConnDis.c +++ b/xc/lib/X11/ConnDis.c @@ -20,7 +20,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/lib/X11/ConnDis.c,v 3.17 2000/01/29 18:58:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConnDis.c,v 3.16 1999/05/09 10:49:06 dawes Exp $ */ /* * This file contains operating system dependencies. diff --git a/xc/lib/X11/Context.c b/xc/lib/X11/Context.c index dd24ba000..37254a775 100644 --- a/xc/lib/X11/Context.c +++ b/xc/lib/X11/Context.c @@ -46,7 +46,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Context.c,v 1.2 1999/05/09 10:49:07 dawes Exp $ */ +/* $XFree86$ */ /* This module implements a simple sparse array. diff --git a/xc/lib/X11/ConvSel.c b/xc/lib/X11/ConvSel.c index 849065a93..c1e4eb9eb 100644 --- a/xc/lib/X11/ConvSel.c +++ b/xc/lib/X11/ConvSel.c @@ -20,7 +20,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/lib/X11/ConvSel.c,v 1.2 1999/05/09 10:49:07 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CopyArea.c b/xc/lib/X11/CopyArea.c index 45f982ca2..dbafe1566 100644 --- a/xc/lib/X11/CopyArea.c +++ b/xc/lib/X11/CopyArea.c @@ -20,7 +20,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/lib/X11/CopyArea.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CopyCmap.c b/xc/lib/X11/CopyCmap.c index 8acfe9d5c..56990517d 100644 --- a/xc/lib/X11/CopyCmap.c +++ b/xc/lib/X11/CopyCmap.c @@ -20,7 +20,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/lib/X11/CopyCmap.c,v 1.2 1999/05/09 10:49:08 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/CopyGC.c b/xc/lib/X11/CopyGC.c index 884398d03..62b6f6347 100644 --- a/xc/lib/X11/CopyGC.c +++ b/xc/lib/X11/CopyGC.c @@ -20,7 +20,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/lib/X11/CopyGC.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CopyPlane.c b/xc/lib/X11/CopyPlane.c index 594d8ba12..a9204a6ea 100644 --- a/xc/lib/X11/CopyPlane.c +++ b/xc/lib/X11/CopyPlane.c @@ -20,7 +20,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/lib/X11/CopyPlane.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CrCmap.c b/xc/lib/X11/CrCmap.c index dd845fdd8..c38059523 100644 --- a/xc/lib/X11/CrCmap.c +++ b/xc/lib/X11/CrCmap.c @@ -20,7 +20,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/lib/X11/CrCmap.c,v 1.2 1999/05/09 10:49:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/CrGC.c b/xc/lib/X11/CrGC.c index d16490780..cc04ba5d8 100644 --- a/xc/lib/X11/CrGC.c +++ b/xc/lib/X11/CrGC.c @@ -20,7 +20,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/lib/X11/CrGC.c,v 3.3 1999/05/09 10:49:10 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/CrGlCur.c b/xc/lib/X11/CrGlCur.c index bce043fdd..9af8cfb7e 100644 --- a/xc/lib/X11/CrGlCur.c +++ b/xc/lib/X11/CrGlCur.c @@ -20,7 +20,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/lib/X11/CrGlCur.c,v 1.2 2000/01/29 18:58:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Cursor.c b/xc/lib/X11/Cursor.c index 767970bd6..d20236ade 100644 --- a/xc/lib/X11/Cursor.c +++ b/xc/lib/X11/Cursor.c @@ -20,7 +20,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/lib/X11/Cursor.c,v 1.2 2000/01/29 18:58:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ diff --git a/xc/lib/X11/CvColW.c b/xc/lib/X11/CvColW.c index 4f139e5dd..3e6e9108b 100644 --- a/xc/lib/X11/CvColW.c +++ b/xc/lib/X11/CvColW.c @@ -33,7 +33,7 @@ * * */ -/* $XFree86: xc/lib/X11/CvColW.c,v 1.2 1999/05/09 10:49:10 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/CvCols.c b/xc/lib/X11/CvCols.c index 0a6708bdc..fdbea7201 100644 --- a/xc/lib/X11/CvCols.c +++ b/xc/lib/X11/CvCols.c @@ -33,7 +33,7 @@ * * */ -/* $XFree86: xc/lib/X11/CvCols.c,v 1.2 1999/05/09 10:49:11 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/DefCursor.c b/xc/lib/X11/DefCursor.c index be99698a5..a03f3d7a0 100644 --- a/xc/lib/X11/DefCursor.c +++ b/xc/lib/X11/DefCursor.c @@ -20,7 +20,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/lib/X11/DefCursor.c,v 1.2 1999/05/09 10:49:11 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DelProp.c b/xc/lib/X11/DelProp.c index 47e6274ed..dfc8e698d 100644 --- a/xc/lib/X11/DelProp.c +++ b/xc/lib/X11/DelProp.c @@ -20,7 +20,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/lib/X11/DelProp.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DestSubs.c b/xc/lib/X11/DestSubs.c index 0f2cb474c..4303d1d74 100644 --- a/xc/lib/X11/DestSubs.c +++ b/xc/lib/X11/DestSubs.c @@ -20,7 +20,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/lib/X11/DestSubs.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DestWind.c b/xc/lib/X11/DestWind.c index c6b003668..183d8be36 100644 --- a/xc/lib/X11/DestWind.c +++ b/xc/lib/X11/DestWind.c @@ -20,7 +20,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/lib/X11/DestWind.c,v 1.2 1999/05/09 10:49:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrArc.c b/xc/lib/X11/DrArc.c index 6e184828f..66e430b17 100644 --- a/xc/lib/X11/DrArc.c +++ b/xc/lib/X11/DrArc.c @@ -20,7 +20,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/lib/X11/DrArc.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */ +/* $XFree86$ */ /* Note to future maintainers: XDrawArc does NOT batch successive PolyArc requests into a single request like XDrawLine, XDrawPoint, etc. diff --git a/xc/lib/X11/DrArcs.c b/xc/lib/X11/DrArcs.c index 847efd24c..d55c1b195 100644 --- a/xc/lib/X11/DrArcs.c +++ b/xc/lib/X11/DrArcs.c @@ -20,7 +20,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/lib/X11/DrArcs.c,v 1.2 1999/05/09 10:49:13 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrLine.c b/xc/lib/X11/DrLine.c index 4538415db..70c32e75c 100644 --- a/xc/lib/X11/DrLine.c +++ b/xc/lib/X11/DrLine.c @@ -20,7 +20,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/lib/X11/DrLine.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrLines.c b/xc/lib/X11/DrLines.c index f7bd24678..b01eb4553 100644 --- a/xc/lib/X11/DrLines.c +++ b/xc/lib/X11/DrLines.c @@ -20,7 +20,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/lib/X11/DrLines.c,v 1.2 1999/05/09 10:49:14 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrPoint.c b/xc/lib/X11/DrPoint.c index 31d363cd9..3c6a76113 100644 --- a/xc/lib/X11/DrPoint.c +++ b/xc/lib/X11/DrPoint.c @@ -20,7 +20,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/lib/X11/DrPoint.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrPoints.c b/xc/lib/X11/DrPoints.c index 03145117b..a81c27010 100644 --- a/xc/lib/X11/DrPoints.c +++ b/xc/lib/X11/DrPoints.c @@ -20,7 +20,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/lib/X11/DrPoints.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrRect.c b/xc/lib/X11/DrRect.c index 9bafc6040..7b7f4a7ec 100644 --- a/xc/lib/X11/DrRect.c +++ b/xc/lib/X11/DrRect.c @@ -20,7 +20,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/lib/X11/DrRect.c,v 1.2 1999/05/09 10:49:15 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrRects.c b/xc/lib/X11/DrRects.c index 119120a0b..7ed901bb6 100644 --- a/xc/lib/X11/DrRects.c +++ b/xc/lib/X11/DrRects.c @@ -20,7 +20,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/lib/X11/DrRects.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/DrSegs.c b/xc/lib/X11/DrSegs.c index 23f155631..d3024fd97 100644 --- a/xc/lib/X11/DrSegs.c +++ b/xc/lib/X11/DrSegs.c @@ -20,7 +20,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/lib/X11/DrSegs.c,v 1.2 1999/05/09 10:49:16 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ErrDes.c b/xc/lib/X11/ErrDes.c index e7c82f2a7..1ad1a0c25 100644 --- a/xc/lib/X11/ErrDes.c +++ b/xc/lib/X11/ErrDes.c @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ErrDes.c,v 3.7 1999/05/09 10:49:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ErrDes.c,v 3.6 1998/10/03 08:41:16 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/xc/lib/X11/ErrHndlr.c b/xc/lib/X11/ErrHndlr.c index 080ae4cfb..84a913777 100644 --- a/xc/lib/X11/ErrHndlr.c +++ b/xc/lib/X11/ErrHndlr.c @@ -20,7 +20,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/lib/X11/ErrHndlr.c,v 1.3 1999/03/02 11:49:21 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/EvToWire.c b/xc/lib/X11/EvToWire.c index de9d63a6d..c1f75a88d 100644 --- a/xc/lib/X11/EvToWire.c +++ b/xc/lib/X11/EvToWire.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/EvToWire.c,v 1.2 1999/05/09 10:49:17 dawes Exp $ */ +/* $XFree86$ */ /* * XEvToWire.c - Internal support routines for the C subroutine diff --git a/xc/lib/X11/FSSaver.c b/xc/lib/X11/FSSaver.c index 08162422e..d9171b106 100644 --- a/xc/lib/X11/FSSaver.c +++ b/xc/lib/X11/FSSaver.c @@ -20,7 +20,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/lib/X11/FSSaver.c,v 1.2 1999/05/09 10:49:17 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FSWrap.c b/xc/lib/X11/FSWrap.c index 142a66869..3b3a40341 100644 --- a/xc/lib/X11/FSWrap.c +++ b/xc/lib/X11/FSWrap.c @@ -52,7 +52,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/FSWrap.c,v 1.4 1999/05/09 10:49:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FSWrap.c,v 1.3 1998/10/03 08:41:17 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/FillArc.c b/xc/lib/X11/FillArc.c index 6f89ae75a..6395616ea 100644 --- a/xc/lib/X11/FillArc.c +++ b/xc/lib/X11/FillArc.c @@ -20,7 +20,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/lib/X11/FillArc.c,v 1.2 1999/05/09 10:49:18 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FillArcs.c b/xc/lib/X11/FillArcs.c index c0e99441c..0bafb072e 100644 --- a/xc/lib/X11/FillArcs.c +++ b/xc/lib/X11/FillArcs.c @@ -20,7 +20,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/lib/X11/FillArcs.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FillPoly.c b/xc/lib/X11/FillPoly.c index afba3f03f..c51738fb6 100644 --- a/xc/lib/X11/FillPoly.c +++ b/xc/lib/X11/FillPoly.c @@ -20,7 +20,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/lib/X11/FillPoly.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FillRct.c b/xc/lib/X11/FillRct.c index a2bf1fd54..457e643de 100644 --- a/xc/lib/X11/FillRct.c +++ b/xc/lib/X11/FillRct.c @@ -20,7 +20,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/lib/X11/FillRct.c,v 1.2 1999/05/09 10:49:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FillRcts.c b/xc/lib/X11/FillRcts.c index 1fd9e5e77..cd7f8a71a 100644 --- a/xc/lib/X11/FillRcts.c +++ b/xc/lib/X11/FillRcts.c @@ -20,7 +20,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/lib/X11/FillRcts.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Flush.c b/xc/lib/X11/Flush.c index f823194b5..ff125f95c 100644 --- a/xc/lib/X11/Flush.c +++ b/xc/lib/X11/Flush.c @@ -20,7 +20,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/lib/X11/Flush.c,v 1.2 1999/05/09 10:49:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Font.c b/xc/lib/X11/Font.c index 5efa322f0..5bb9b7165 100644 --- a/xc/lib/X11/Font.c +++ b/xc/lib/X11/Font.c @@ -28,7 +28,7 @@ sale, use or other dealings in this Software without prior written authorization from the X Consortium and the XFree86 Project. */ -/* $XFree86: xc/lib/X11/Font.c,v 1.10 2000/08/09 23:40:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Font.c,v 1.9 2000/06/13 23:15:47 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/FontInfo.c b/xc/lib/X11/FontInfo.c index a10b5922e..de22af538 100644 --- a/xc/lib/X11/FontInfo.c +++ b/xc/lib/X11/FontInfo.c @@ -20,7 +20,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/lib/X11/FontInfo.c,v 1.3 2000/06/13 23:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FontInfo.c,v 1.2 1999/05/09 10:49:21 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/FontNames.c b/xc/lib/X11/FontNames.c index d3f63f9fe..13cddc2ad 100644 --- a/xc/lib/X11/FontNames.c +++ b/xc/lib/X11/FontNames.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FontNames.c,v 1.4 1999/05/09 10:49:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FontNames.c,v 1.3 1998/10/03 08:41:17 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/FreeCmap.c b/xc/lib/X11/FreeCmap.c index 4a58df557..d7d3834a8 100644 --- a/xc/lib/X11/FreeCmap.c +++ b/xc/lib/X11/FreeCmap.c @@ -20,7 +20,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/lib/X11/FreeCmap.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FreeCols.c b/xc/lib/X11/FreeCols.c index d6f2f069a..950ade0f7 100644 --- a/xc/lib/X11/FreeCols.c +++ b/xc/lib/X11/FreeCols.c @@ -20,7 +20,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/lib/X11/FreeCols.c,v 1.2 1999/05/09 10:49:22 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FreeCurs.c b/xc/lib/X11/FreeCurs.c index f2bd966de..c3b5d04c2 100644 --- a/xc/lib/X11/FreeCurs.c +++ b/xc/lib/X11/FreeCurs.c @@ -20,7 +20,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/lib/X11/FreeCurs.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FreeEData.c b/xc/lib/X11/FreeEData.c index 89069b3a4..f131ce6ef 100644 --- a/xc/lib/X11/FreeEData.c +++ b/xc/lib/X11/FreeEData.c @@ -20,7 +20,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/lib/X11/FreeEData.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FreeGC.c b/xc/lib/X11/FreeGC.c index 58e33765f..38e59f5d1 100644 --- a/xc/lib/X11/FreeGC.c +++ b/xc/lib/X11/FreeGC.c @@ -20,7 +20,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/lib/X11/FreeGC.c,v 1.2 1999/05/09 10:49:23 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/FreePix.c b/xc/lib/X11/FreePix.c index 9fd60239e..bc51b7762 100644 --- a/xc/lib/X11/FreePix.c +++ b/xc/lib/X11/FreePix.c @@ -20,7 +20,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/lib/X11/FreePix.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/GCMisc.c b/xc/lib/X11/GCMisc.c index 9b43412e8..d7909d40d 100644 --- a/xc/lib/X11/GCMisc.c +++ b/xc/lib/X11/GCMisc.c @@ -20,7 +20,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/lib/X11/GCMisc.c,v 1.2 1999/05/09 10:49:24 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/GetAtomNm.c b/xc/lib/X11/GetAtomNm.c index e03cbf14e..1a24ab4c4 100644 --- a/xc/lib/X11/GetAtomNm.c +++ b/xc/lib/X11/GetAtomNm.c @@ -20,7 +20,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/lib/X11/GetAtomNm.c,v 3.2 1999/05/09 10:49:24 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetColor.c b/xc/lib/X11/GetColor.c index adfb41977..d3f8da297 100644 --- a/xc/lib/X11/GetColor.c +++ b/xc/lib/X11/GetColor.c @@ -20,7 +20,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/lib/X11/GetColor.c,v 1.2 1999/05/09 10:49:25 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/lib/X11/GetDflt.c b/xc/lib/X11/GetDflt.c index 258d9c18a..e03295d47 100644 --- a/xc/lib/X11/GetDflt.c +++ b/xc/lib/X11/GetDflt.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetDflt.c,v 3.16 1999/05/09 10:49:25 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetDflt.c,v 3.15 1998/10/03 08:41:18 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/xc/lib/X11/GetFPath.c b/xc/lib/X11/GetFPath.c index 3a31174ee..c5f9e89ee 100644 --- a/xc/lib/X11/GetFPath.c +++ b/xc/lib/X11/GetFPath.c @@ -20,7 +20,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/lib/X11/GetFPath.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetHints.c b/xc/lib/X11/GetHints.c index 3e48f512d..d515f0902 100644 --- a/xc/lib/X11/GetHints.c +++ b/xc/lib/X11/GetHints.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetHints.c,v 1.2 1999/05/09 10:49:26 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlibint.h> #include <X11/Xos.h> diff --git a/xc/lib/X11/GetIFocus.c b/xc/lib/X11/GetIFocus.c index 4a2915671..281dbfd9f 100644 --- a/xc/lib/X11/GetIFocus.c +++ b/xc/lib/X11/GetIFocus.c @@ -20,7 +20,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/lib/X11/GetIFocus.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetImage.c b/xc/lib/X11/GetImage.c index 7d3d03eaf..815771345 100644 --- a/xc/lib/X11/GetImage.c +++ b/xc/lib/X11/GetImage.c @@ -20,7 +20,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/lib/X11/GetImage.c,v 1.2 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetKCnt.c b/xc/lib/X11/GetKCnt.c index 62fc6b529..b8bb48ee1 100644 --- a/xc/lib/X11/GetKCnt.c +++ b/xc/lib/X11/GetKCnt.c @@ -20,7 +20,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/lib/X11/GetKCnt.c,v 1.4 1999/05/09 10:49:27 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetPCnt.c b/xc/lib/X11/GetPCnt.c index 95637afa7..c3be07ede 100644 --- a/xc/lib/X11/GetPCnt.c +++ b/xc/lib/X11/GetPCnt.c @@ -20,7 +20,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/lib/X11/GetPCnt.c,v 1.2 1999/05/09 10:49:28 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetPntMap.c b/xc/lib/X11/GetPntMap.c index 93c6decdf..55bf1352a 100644 --- a/xc/lib/X11/GetPntMap.c +++ b/xc/lib/X11/GetPntMap.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.3 1998/10/03 08:41:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.2 1998/06/28 08:41:30 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetProp.c b/xc/lib/X11/GetProp.c index 9222f6c07..911ee1869 100644 --- a/xc/lib/X11/GetProp.c +++ b/xc/lib/X11/GetProp.c @@ -20,7 +20,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/lib/X11/GetProp.c,v 1.3 2000/06/15 23:59:06 keithp Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GetSSaver.c b/xc/lib/X11/GetSSaver.c index 79595e014..be659a78a 100644 --- a/xc/lib/X11/GetSSaver.c +++ b/xc/lib/X11/GetSSaver.c @@ -20,7 +20,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/lib/X11/GetSSaver.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/GrButton.c b/xc/lib/X11/GrButton.c index 37e6d0c56..957c10a86 100644 --- a/xc/lib/X11/GrButton.c +++ b/xc/lib/X11/GrButton.c @@ -20,7 +20,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/lib/X11/GrButton.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/GrKey.c b/xc/lib/X11/GrKey.c index f1bdc0a0d..91d0163fe 100644 --- a/xc/lib/X11/GrKey.c +++ b/xc/lib/X11/GrKey.c @@ -20,7 +20,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/lib/X11/GrKey.c,v 1.2 1999/05/09 10:49:29 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/GrServer.c b/xc/lib/X11/GrServer.c index 34aac9186..12c0a43e5 100644 --- a/xc/lib/X11/GrServer.c +++ b/xc/lib/X11/GrServer.c @@ -20,7 +20,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/lib/X11/GrServer.c,v 1.2 1999/05/09 10:49:30 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/HVC.c b/xc/lib/X11/HVC.c index 34b4106e8..cc17f7c86 100644 --- a/xc/lib/X11/HVC.c +++ b/xc/lib/X11/HVC.c @@ -47,7 +47,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/HVC.c,v 1.2 1999/05/09 10:49:30 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCGcC.c b/xc/lib/X11/HVCGcC.c index efe3ad385..4ca2d2e9f 100644 --- a/xc/lib/X11/HVCGcC.c +++ b/xc/lib/X11/HVCGcC.c @@ -43,7 +43,7 @@ * Source for XcmsTekHVCClipC() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.2 1999/05/09 10:49:31 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCGcV.c b/xc/lib/X11/HVCGcV.c index f2738c818..b38e8f0d8 100644 --- a/xc/lib/X11/HVCGcV.c +++ b/xc/lib/X11/HVCGcV.c @@ -43,7 +43,7 @@ * Source for XcmsTekHVCClipV() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.2 1999/05/09 10:49:31 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCGcVC.c b/xc/lib/X11/HVCGcVC.c index 1ee0cc8c3..1641577c9 100644 --- a/xc/lib/X11/HVCGcVC.c +++ b/xc/lib/X11/HVCGcVC.c @@ -43,7 +43,7 @@ * Source for XcmsTekHVCClipVC() gamut * compression function. */ -/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCMxC.c b/xc/lib/X11/HVCMxC.c index 9c2d524c0..5dd4b49e2 100644 --- a/xc/lib/X11/HVCMxC.c +++ b/xc/lib/X11/HVCMxC.c @@ -44,7 +44,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCMxV.c b/xc/lib/X11/HVCMxV.c index eb0e037a9..897189bfb 100644 --- a/xc/lib/X11/HVCMxV.c +++ b/xc/lib/X11/HVCMxV.c @@ -44,7 +44,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.2 1999/05/09 10:49:32 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/HVCMxVs.c b/xc/lib/X11/HVCMxVs.c index c32fc63ed..daf76251f 100644 --- a/xc/lib/X11/HVCMxVs.c +++ b/xc/lib/X11/HVCMxVs.c @@ -43,7 +43,7 @@ * Source for the XcmsTekHVCQueryMaxVSamples() gamut boundary * querying routine. */ -/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.2 1999/05/09 10:49:33 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/Host.c b/xc/lib/X11/Host.c index 0ff29a35e..1d6cd1963 100644 --- a/xc/lib/X11/Host.c +++ b/xc/lib/X11/Host.c @@ -20,7 +20,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/lib/X11/Host.c,v 1.2 1999/05/09 10:49:33 dawes Exp $ */ +/* $XFree86$ */ /* this might be rightly reguarded an os dependent file */ diff --git a/xc/lib/X11/IMWrap.c b/xc/lib/X11/IMWrap.c index 17562c22f..e6b4b6605 100644 --- a/xc/lib/X11/IMWrap.c +++ b/xc/lib/X11/IMWrap.c @@ -53,7 +53,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/IMWrap.c,v 3.6 1998/12/20 11:56:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IMWrap.c,v 3.5 1998/10/03 08:41:19 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/IfEvent.c b/xc/lib/X11/IfEvent.c index 096558bd7..69366e4fc 100644 --- a/xc/lib/X11/IfEvent.c +++ b/xc/lib/X11/IfEvent.c @@ -20,7 +20,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/lib/X11/IfEvent.c,v 1.2 1999/05/09 10:49:35 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/ImText.c b/xc/lib/X11/ImText.c index 48274986e..9f2df5e70 100644 --- a/xc/lib/X11/ImText.c +++ b/xc/lib/X11/ImText.c @@ -20,7 +20,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/lib/X11/ImText.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/ImText16.c b/xc/lib/X11/ImText16.c index 7bce69a9c..a42240340 100644 --- a/xc/lib/X11/ImText16.c +++ b/xc/lib/X11/ImText16.c @@ -20,7 +20,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/lib/X11/ImText16.c,v 1.2 1999/05/09 10:49:36 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/ImUtil.c b/xc/lib/X11/ImUtil.c index 4799c10d2..2669d4d93 100644 --- a/xc/lib/X11/ImUtil.c +++ b/xc/lib/X11/ImUtil.c @@ -20,7 +20,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/lib/X11/ImUtil.c,v 3.6 2000/01/29 18:58:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImUtil.c,v 3.5 1999/05/09 10:49:36 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/xc/lib/X11/Imakefile b/xc/lib/X11/Imakefile index e574c3a68..22f338c90 100644 --- a/xc/lib/X11/Imakefile +++ b/xc/lib/X11/Imakefile @@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/196 1997/05/20 10:06:09 kaleb $ -XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.31 2000/06/17 01:40:40 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.30 2000/06/13 02:28:28 dawes Exp $ #define DoNormalLib NormalLibX11 #define DoSharedLib SharedLibX11 #define DoExtraLib SharedLibX11 diff --git a/xc/lib/X11/InitExt.c b/xc/lib/X11/InitExt.c index 296b0b268..ee3c3d3c6 100644 --- a/xc/lib/X11/InitExt.c +++ b/xc/lib/X11/InitExt.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/InitExt.c,v 1.4 1999/05/09 10:49:37 dawes Exp $ */ +/* $XFree86: xc/lib/X11/InitExt.c,v 1.3 1998/10/06 10:35:12 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xos.h> diff --git a/xc/lib/X11/InsCmap.c b/xc/lib/X11/InsCmap.c index 100903d72..a35ff29ae 100644 --- a/xc/lib/X11/InsCmap.c +++ b/xc/lib/X11/InsCmap.c @@ -20,7 +20,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/lib/X11/InsCmap.c,v 1.2 1999/05/09 10:49:37 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/IntAtom.c b/xc/lib/X11/IntAtom.c index b1c3b8095..96ce5e635 100644 --- a/xc/lib/X11/IntAtom.c +++ b/xc/lib/X11/IntAtom.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/IntAtom.c,v 1.2 1999/05/09 10:49:38 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/KeyBind.c b/xc/lib/X11/KeyBind.c index 92894be2d..beaaa5237 100644 --- a/xc/lib/X11/KeyBind.c +++ b/xc/lib/X11/KeyBind.c @@ -20,7 +20,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/lib/X11/KeyBind.c,v 1.3 2000/01/31 14:40:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KeyBind.c,v 1.2 1999/05/09 10:49:38 dawes Exp $ */ /* Beware, here be monsters (still under construction... - JG */ diff --git a/xc/lib/X11/KeysymStr.c b/xc/lib/X11/KeysymStr.c index 80d63a3ba..097adbc45 100644 --- a/xc/lib/X11/KeysymStr.c +++ b/xc/lib/X11/KeysymStr.c @@ -21,7 +21,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/lib/X11/KeysymStr.c,v 3.3 1999/05/09 10:49:39 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/xc/lib/X11/KillCl.c b/xc/lib/X11/KillCl.c index 554f2a44e..a716d531f 100644 --- a/xc/lib/X11/KillCl.c +++ b/xc/lib/X11/KillCl.c @@ -20,7 +20,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/lib/X11/KillCl.c,v 1.2 1999/05/09 10:49:39 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/LRGB.c b/xc/lib/X11/LRGB.c index 259b1dac4..961681c1c 100644 --- a/xc/lib/X11/LRGB.c +++ b/xc/lib/X11/LRGB.c @@ -35,7 +35,7 @@ * 4. RGB intensity to CIE XYZ * */ -/* $XFree86: xc/lib/X11/LRGB.c,v 3.3 1999/05/09 10:49:40 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/xc/lib/X11/Lab.c b/xc/lib/X11/Lab.c index c07e0ce48..b1031c938 100644 --- a/xc/lib/X11/Lab.c +++ b/xc/lib/X11/Lab.c @@ -36,7 +36,7 @@ * * Note that the range for L* is 0 to 1. */ -/* $XFree86: xc/lib/X11/Lab.c,v 1.2 1999/05/09 10:49:40 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> diff --git a/xc/lib/X11/LabGcC.c b/xc/lib/X11/LabGcC.c index 57ad714fb..661b26565 100644 --- a/xc/lib/X11/LabGcC.c +++ b/xc/lib/X11/LabGcC.c @@ -30,7 +30,7 @@ * Source for XcmsCIELabClipuv() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LabGcC.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LabGcL.c b/xc/lib/X11/LabGcL.c index a146dfb1f..c5046ebc1 100644 --- a/xc/lib/X11/LabGcL.c +++ b/xc/lib/X11/LabGcL.c @@ -30,7 +30,7 @@ * Source for XcmsCIELabClipL() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LabGcL.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LabGcLC.c b/xc/lib/X11/LabGcLC.c index 2356519e4..372edf6f7 100644 --- a/xc/lib/X11/LabGcLC.c +++ b/xc/lib/X11/LabGcLC.c @@ -30,7 +30,7 @@ * Source for XcmsCIELabClipLab() gamut * compression function. */ -/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.2 1999/05/09 10:49:41 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LabMnL.c b/xc/lib/X11/LabMnL.c index 8ca56302c..2525004c3 100644 --- a/xc/lib/X11/LabMnL.c +++ b/xc/lib/X11/LabMnL.c @@ -31,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMnL.c,v 1.2 1999/05/09 10:49:42 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LabMxC.c b/xc/lib/X11/LabMxC.c index a792a8386..de757cf38 100644 --- a/xc/lib/X11/LabMxC.c +++ b/xc/lib/X11/LabMxC.c @@ -33,7 +33,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMxC.c,v 1.2 1999/05/09 10:49:42 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LabMxL.c b/xc/lib/X11/LabMxL.c index d0f472354..8f17ec001 100644 --- a/xc/lib/X11/LabMxL.c +++ b/xc/lib/X11/LabMxL.c @@ -31,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMxL.c,v 1.2 1999/05/09 10:49:43 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/ListExt.c b/xc/lib/X11/ListExt.c index 2f30bede9..44ee34995 100644 --- a/xc/lib/X11/ListExt.c +++ b/xc/lib/X11/ListExt.c @@ -20,7 +20,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/lib/X11/ListExt.c,v 1.2 1999/05/09 10:49:43 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/LookupCol.c b/xc/lib/X11/LookupCol.c index a63fce18f..b4a4e5b5e 100644 --- a/xc/lib/X11/LookupCol.c +++ b/xc/lib/X11/LookupCol.c @@ -20,7 +20,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/lib/X11/LookupCol.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/lib/X11/LowerWin.c b/xc/lib/X11/LowerWin.c index 3ebcf8e73..ffd72dfa5 100644 --- a/xc/lib/X11/LowerWin.c +++ b/xc/lib/X11/LowerWin.c @@ -20,7 +20,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/lib/X11/LowerWin.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Luv.c b/xc/lib/X11/Luv.c index a7e59d22b..469dd3161 100644 --- a/xc/lib/X11/Luv.c +++ b/xc/lib/X11/Luv.c @@ -38,7 +38,7 @@ * Fred W. Billmeyer & Max Saltzman, "Principles of Color * Technology", John Wily & Sons, Inc, 1981. */ -/* $XFree86: xc/lib/X11/Luv.c,v 1.2 1999/05/09 10:49:44 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include "Xlibint.h" diff --git a/xc/lib/X11/LuvGcC.c b/xc/lib/X11/LuvGcC.c index c4168bdb6..845ee2897 100644 --- a/xc/lib/X11/LuvGcC.c +++ b/xc/lib/X11/LuvGcC.c @@ -30,7 +30,7 @@ * Source for XcmsCIELuvClipuv() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.2 1999/05/09 10:49:45 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LuvGcL.c b/xc/lib/X11/LuvGcL.c index aceab8598..7f865ea6f 100644 --- a/xc/lib/X11/LuvGcL.c +++ b/xc/lib/X11/LuvGcL.c @@ -30,7 +30,7 @@ * Source for XcmsCIELuvClipL() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.2 1999/05/09 10:49:45 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LuvGcLC.c b/xc/lib/X11/LuvGcLC.c index 0e346116e..2ec5c9e75 100644 --- a/xc/lib/X11/LuvGcLC.c +++ b/xc/lib/X11/LuvGcLC.c @@ -30,7 +30,7 @@ * Source for XcmsCIELuvClipLuv() gamut * compression function. */ -/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.2 1999/05/09 10:49:46 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LuvMnL.c b/xc/lib/X11/LuvMnL.c index 1308498c5..287885592 100644 --- a/xc/lib/X11/LuvMnL.c +++ b/xc/lib/X11/LuvMnL.c @@ -31,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.2 1999/05/09 10:49:46 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LuvMxC.c b/xc/lib/X11/LuvMxC.c index 409d3e6e3..0f2412cf4 100644 --- a/xc/lib/X11/LuvMxC.c +++ b/xc/lib/X11/LuvMxC.c @@ -33,7 +33,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/LuvMxL.c b/xc/lib/X11/LuvMxL.c index 4a5f0f72f..5578b1aa0 100644 --- a/xc/lib/X11/LuvMxL.c +++ b/xc/lib/X11/LuvMxL.c @@ -31,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/Macros.c b/xc/lib/X11/Macros.c index 71a643745..bd6c799e2 100644 --- a/xc/lib/X11/Macros.c +++ b/xc/lib/X11/Macros.c @@ -20,7 +20,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/lib/X11/Macros.c,v 1.2 1999/05/09 10:49:47 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" /* diff --git a/xc/lib/X11/MapRaised.c b/xc/lib/X11/MapRaised.c index 69e9a2ede..82dd4db61 100644 --- a/xc/lib/X11/MapRaised.c +++ b/xc/lib/X11/MapRaised.c @@ -20,7 +20,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/lib/X11/MapRaised.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/MapSubs.c b/xc/lib/X11/MapSubs.c index 3aaf0867d..22a6593c3 100644 --- a/xc/lib/X11/MapSubs.c +++ b/xc/lib/X11/MapSubs.c @@ -20,7 +20,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/lib/X11/MapSubs.c,v 1.2 1999/05/09 10:49:48 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/MapWindow.c b/xc/lib/X11/MapWindow.c index 77fa79b5e..9ea403334 100644 --- a/xc/lib/X11/MapWindow.c +++ b/xc/lib/X11/MapWindow.c @@ -20,7 +20,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/lib/X11/MapWindow.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/MaskEvent.c b/xc/lib/X11/MaskEvent.c index 2960b795b..26ca18a96 100644 --- a/xc/lib/X11/MaskEvent.c +++ b/xc/lib/X11/MaskEvent.c @@ -20,7 +20,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/lib/X11/MaskEvent.c,v 3.2 1999/05/09 10:49:49 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/Misc.c b/xc/lib/X11/Misc.c index d6d898066..d0a74e95c 100644 --- a/xc/lib/X11/Misc.c +++ b/xc/lib/X11/Misc.c @@ -20,7 +20,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/lib/X11/Misc.c,v 1.2 1999/05/09 10:49:49 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ModMap.c b/xc/lib/X11/ModMap.c index 6370ad5c7..22fcf3dc8 100644 --- a/xc/lib/X11/ModMap.c +++ b/xc/lib/X11/ModMap.c @@ -20,7 +20,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/lib/X11/ModMap.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/MoveWin.c b/xc/lib/X11/MoveWin.c index 068d24ed4..a0976dcbd 100644 --- a/xc/lib/X11/MoveWin.c +++ b/xc/lib/X11/MoveWin.c @@ -20,7 +20,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/lib/X11/MoveWin.c,v 1.2 1999/05/09 10:49:50 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/NextEvent.c b/xc/lib/X11/NextEvent.c index 5eed79e6c..3e903ed5b 100644 --- a/xc/lib/X11/NextEvent.c +++ b/xc/lib/X11/NextEvent.c @@ -20,7 +20,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/lib/X11/NextEvent.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/OCWrap.c b/xc/lib/X11/OCWrap.c index 9510f19b9..36b240b4e 100644 --- a/xc/lib/X11/OCWrap.c +++ b/xc/lib/X11/OCWrap.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/OCWrap.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/OMWrap.c b/xc/lib/X11/OMWrap.c index 40d9db172..80e146c2d 100644 --- a/xc/lib/X11/OMWrap.c +++ b/xc/lib/X11/OMWrap.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/OMWrap.c,v 1.2 1999/05/09 10:49:51 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/OpenDis.c b/xc/lib/X11/OpenDis.c index 32d4b2136..f6f9add75 100644 --- a/xc/lib/X11/OpenDis.c +++ b/xc/lib/X11/OpenDis.c @@ -20,7 +20,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/lib/X11/OpenDis.c,v 3.7 2000/06/16 01:50:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/OpenDis.c,v 3.6 2000/06/15 23:59:06 keithp Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/xc/lib/X11/ParseCmd.c b/xc/lib/X11/ParseCmd.c index 6d8cf2e83..e448cb669 100644 --- a/xc/lib/X11/ParseCmd.c +++ b/xc/lib/X11/ParseCmd.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.2 1998/12/20 11:56:57 dawes Exp $ */ +/* $XFree86$ */ /* XrmParseCommand() diff --git a/xc/lib/X11/ParseCol.c b/xc/lib/X11/ParseCol.c index 4111ef68b..5d15d3775 100644 --- a/xc/lib/X11/ParseCol.c +++ b/xc/lib/X11/ParseCol.c @@ -20,7 +20,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/lib/X11/ParseCol.c,v 1.2 1999/05/09 10:49:52 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/lib/X11/PeekEvent.c b/xc/lib/X11/PeekEvent.c index 6bf6e8753..9bfcae028 100644 --- a/xc/lib/X11/PeekEvent.c +++ b/xc/lib/X11/PeekEvent.c @@ -20,7 +20,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/lib/X11/PeekEvent.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/PeekIfEv.c b/xc/lib/X11/PeekIfEv.c index 4b8b6c13b..6deb7a8f0 100644 --- a/xc/lib/X11/PeekIfEv.c +++ b/xc/lib/X11/PeekIfEv.c @@ -20,7 +20,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/lib/X11/PeekIfEv.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/PmapBgnd.c b/xc/lib/X11/PmapBgnd.c index 171bb2a73..08e0ac31d 100644 --- a/xc/lib/X11/PmapBgnd.c +++ b/xc/lib/X11/PmapBgnd.c @@ -20,7 +20,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/lib/X11/PmapBgnd.c,v 1.2 1999/05/09 10:49:53 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/PmapBord.c b/xc/lib/X11/PmapBord.c index eba7ac484..e3977a027 100644 --- a/xc/lib/X11/PmapBord.c +++ b/xc/lib/X11/PmapBord.c @@ -20,7 +20,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/lib/X11/PmapBord.c,v 1.2 1999/05/09 10:49:54 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/PolyReg.c b/xc/lib/X11/PolyReg.c index d44b61383..2f0b0ef14 100644 --- a/xc/lib/X11/PolyReg.c +++ b/xc/lib/X11/PolyReg.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/PolyReg.c,v 1.4 1998/10/03 08:41:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyReg.c,v 1.3 1998/08/20 13:58:53 dawes Exp $ */ #define LARGE_COORDINATE 1000000 #define SMALL_COORDINATE -LARGE_COORDINATE diff --git a/xc/lib/X11/PolyTxt.c b/xc/lib/X11/PolyTxt.c index a9ef121ed..b4215c7a4 100644 --- a/xc/lib/X11/PolyTxt.c +++ b/xc/lib/X11/PolyTxt.c @@ -20,7 +20,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/lib/X11/PolyTxt.c,v 3.3 1999/05/09 10:49:54 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.2 1998/10/03 08:41:21 dawes Exp $ */ #include "Xlibint.h" diff --git a/xc/lib/X11/PolyTxt16.c b/xc/lib/X11/PolyTxt16.c index 2bff5cbb0..f4e6751bb 100644 --- a/xc/lib/X11/PolyTxt16.c +++ b/xc/lib/X11/PolyTxt16.c @@ -20,7 +20,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/lib/X11/PolyTxt16.c,v 1.2 1999/05/09 10:49:54 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/PropAlloc.c b/xc/lib/X11/PropAlloc.c index 2c20ebe72..df4cc5f3b 100644 --- a/xc/lib/X11/PropAlloc.c +++ b/xc/lib/X11/PropAlloc.c @@ -20,7 +20,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/lib/X11/PropAlloc.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xutil.h" diff --git a/xc/lib/X11/PutBEvent.c b/xc/lib/X11/PutBEvent.c index d7f360082..f74ded2b1 100644 --- a/xc/lib/X11/PutBEvent.c +++ b/xc/lib/X11/PutBEvent.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.2 1999/05/09 10:49:55 dawes Exp $ */ +/* $XFree86$ */ /* XPutBackEvent puts an event back at the head of the queue. */ #define NEED_EVENTS diff --git a/xc/lib/X11/PutImage.c b/xc/lib/X11/PutImage.c index 597d28c36..6c062839b 100644 --- a/xc/lib/X11/PutImage.c +++ b/xc/lib/X11/PutImage.c @@ -20,7 +20,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/lib/X11/PutImage.c,v 3.5 1999/05/09 10:49:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PutImage.c,v 3.4 1998/10/03 08:41:21 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" diff --git a/xc/lib/X11/QuCol.c b/xc/lib/X11/QuCol.c index 44e22c5c1..4f2d85496 100644 --- a/xc/lib/X11/QuCol.c +++ b/xc/lib/X11/QuCol.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/QuCol.c,v 1.2 1999/05/09 10:49:56 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/QuColor.c b/xc/lib/X11/QuColor.c index 4524903a2..28777de1c 100644 --- a/xc/lib/X11/QuColor.c +++ b/xc/lib/X11/QuColor.c @@ -20,7 +20,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/lib/X11/QuColor.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/QuColors.c b/xc/lib/X11/QuColors.c index 781d7bae5..24213f4ee 100644 --- a/xc/lib/X11/QuColors.c +++ b/xc/lib/X11/QuColors.c @@ -20,7 +20,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/lib/X11/QuColors.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/QuCols.c b/xc/lib/X11/QuCols.c index f4a4df0d9..a7fed5fa2 100644 --- a/xc/lib/X11/QuCols.c +++ b/xc/lib/X11/QuCols.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/QuCols.c,v 1.2 1999/05/09 10:49:57 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/QuKeybd.c b/xc/lib/X11/QuKeybd.c index 23438e73a..7d684b6cb 100644 --- a/xc/lib/X11/QuKeybd.c +++ b/xc/lib/X11/QuKeybd.c @@ -20,7 +20,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/lib/X11/QuKeybd.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/QuTextE16.c b/xc/lib/X11/QuTextE16.c index 6b53eaf8c..688ff3a55 100644 --- a/xc/lib/X11/QuTextE16.c +++ b/xc/lib/X11/QuTextE16.c @@ -20,7 +20,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/lib/X11/QuTextE16.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/QuTextExt.c b/xc/lib/X11/QuTextExt.c index 96a4dad44..93db30e0f 100644 --- a/xc/lib/X11/QuTextExt.c +++ b/xc/lib/X11/QuTextExt.c @@ -20,7 +20,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/lib/X11/QuTextExt.c,v 1.2 1999/05/09 10:49:58 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/X11/Quarks.c b/xc/lib/X11/Quarks.c index 1d74f7554..903ae0efa 100644 --- a/xc/lib/X11/Quarks.c +++ b/xc/lib/X11/Quarks.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Quarks.c,v 1.2 1999/05/09 10:49:59 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/xc/lib/X11/RaiseWin.c b/xc/lib/X11/RaiseWin.c index 17b68d198..5307caeeb 100644 --- a/xc/lib/X11/RaiseWin.c +++ b/xc/lib/X11/RaiseWin.c @@ -20,7 +20,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/lib/X11/RaiseWin.c,v 1.2 1999/05/09 10:49:59 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/RdBitF.c b/xc/lib/X11/RdBitF.c index 1596b1d4e..f1d7d5e69 100644 --- a/xc/lib/X11/RdBitF.c +++ b/xc/lib/X11/RdBitF.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RdBitF.c,v 3.2 1999/05/09 10:50:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RdBitF.c,v 3.1 1998/10/03 08:41:22 dawes Exp $ */ /* * Code to read bitmaps from disk files. Interprets diff --git a/xc/lib/X11/RecolorC.c b/xc/lib/X11/RecolorC.c index 54469ed42..e59e0c254 100644 --- a/xc/lib/X11/RecolorC.c +++ b/xc/lib/X11/RecolorC.c @@ -20,7 +20,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/lib/X11/RecolorC.c,v 1.2 1999/05/09 10:50:00 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/ReconfWin.c b/xc/lib/X11/ReconfWin.c index 80ff67655..c393c6d17 100644 --- a/xc/lib/X11/ReconfWin.c +++ b/xc/lib/X11/ReconfWin.c @@ -20,7 +20,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/lib/X11/ReconfWin.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Region.c b/xc/lib/X11/Region.c index b08e6d7f7..908fb29dd 100644 --- a/xc/lib/X11/Region.c +++ b/xc/lib/X11/Region.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/Region.c,v 1.5 1999/05/09 10:50:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Region.c,v 1.4 1998/10/03 08:41:22 dawes Exp $ */ /* * The functions in this file implement the Region abstraction, similar to one * used in the X11 sample server. A Region is simply an area, as the name diff --git a/xc/lib/X11/RegstFlt.c b/xc/lib/X11/RegstFlt.c index 644a434a4..a8f8a180a 100644 --- a/xc/lib/X11/RegstFlt.c +++ b/xc/lib/X11/RegstFlt.c @@ -48,7 +48,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.2 1999/05/09 10:50:01 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/RepWindow.c b/xc/lib/X11/RepWindow.c index f00a1e94e..81c44b6ee 100644 --- a/xc/lib/X11/RepWindow.c +++ b/xc/lib/X11/RepWindow.c @@ -20,7 +20,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/lib/X11/RepWindow.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/RestackWs.c b/xc/lib/X11/RestackWs.c index c597259d3..b49b32334 100644 --- a/xc/lib/X11/RestackWs.c +++ b/xc/lib/X11/RestackWs.c @@ -20,7 +20,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/lib/X11/RestackWs.c,v 1.2 1999/05/09 10:50:02 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/RotProp.c b/xc/lib/X11/RotProp.c index 008d1d2b6..88c746608 100644 --- a/xc/lib/X11/RotProp.c +++ b/xc/lib/X11/RotProp.c @@ -20,7 +20,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/lib/X11/RotProp.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SelInput.c b/xc/lib/X11/SelInput.c index 13882ad26..bc2fa38a2 100644 --- a/xc/lib/X11/SelInput.c +++ b/xc/lib/X11/SelInput.c @@ -20,7 +20,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/lib/X11/SelInput.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetBack.c b/xc/lib/X11/SetBack.c index d1a3b0067..22d0cb8f3 100644 --- a/xc/lib/X11/SetBack.c +++ b/xc/lib/X11/SetBack.c @@ -20,7 +20,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/lib/X11/SetBack.c,v 1.2 1999/05/09 10:50:03 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetCRects.c b/xc/lib/X11/SetCRects.c index 5f1c87d99..69d1cb381 100644 --- a/xc/lib/X11/SetCRects.c +++ b/xc/lib/X11/SetCRects.c @@ -20,7 +20,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/lib/X11/SetCRects.c,v 1.2 1999/05/09 10:50:05 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetClMask.c b/xc/lib/X11/SetClMask.c index e97e7d2a7..c146e6efe 100644 --- a/xc/lib/X11/SetClMask.c +++ b/xc/lib/X11/SetClMask.c @@ -20,7 +20,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/lib/X11/SetClMask.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetClOrig.c b/xc/lib/X11/SetClOrig.c index d6514539e..f200986e0 100644 --- a/xc/lib/X11/SetClOrig.c +++ b/xc/lib/X11/SetClOrig.c @@ -20,7 +20,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/lib/X11/SetClOrig.c,v 1.2 1999/05/09 10:50:06 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetDashes.c b/xc/lib/X11/SetDashes.c index 20020adb1..dd4a99ba9 100644 --- a/xc/lib/X11/SetDashes.c +++ b/xc/lib/X11/SetDashes.c @@ -20,7 +20,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/lib/X11/SetDashes.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetFPath.c b/xc/lib/X11/SetFPath.c index 33338b2f4..5ca49c3af 100644 --- a/xc/lib/X11/SetFPath.c +++ b/xc/lib/X11/SetFPath.c @@ -20,7 +20,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/lib/X11/SetFPath.c,v 1.4 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetFont.c b/xc/lib/X11/SetFont.c index 74b77b4c4..8bf5ef295 100644 --- a/xc/lib/X11/SetFont.c +++ b/xc/lib/X11/SetFont.c @@ -20,7 +20,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/lib/X11/SetFont.c,v 1.2 1999/05/09 10:50:07 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetFore.c b/xc/lib/X11/SetFore.c index 24deb28dd..8c7b86839 100644 --- a/xc/lib/X11/SetFore.c +++ b/xc/lib/X11/SetFore.c @@ -20,7 +20,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/lib/X11/SetFore.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetFunc.c b/xc/lib/X11/SetFunc.c index df4d6035e..87f8219a7 100644 --- a/xc/lib/X11/SetFunc.c +++ b/xc/lib/X11/SetFunc.c @@ -20,7 +20,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/lib/X11/SetFunc.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetHints.c b/xc/lib/X11/SetHints.c index 8b6756771..037c19dc0 100644 --- a/xc/lib/X11/SetHints.c +++ b/xc/lib/X11/SetHints.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/SetHints.c,v 1.2 1999/05/09 10:50:08 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/xc/lib/X11/SetIFocus.c b/xc/lib/X11/SetIFocus.c index cd744d7c4..0e04df2fb 100644 --- a/xc/lib/X11/SetIFocus.c +++ b/xc/lib/X11/SetIFocus.c @@ -20,7 +20,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/lib/X11/SetIFocus.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetLStyle.c b/xc/lib/X11/SetLStyle.c index 3a5b31ec6..cb4283761 100644 --- a/xc/lib/X11/SetLStyle.c +++ b/xc/lib/X11/SetLStyle.c @@ -20,7 +20,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/lib/X11/SetLStyle.c,v 1.2 1999/05/09 10:50:09 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetLocale.c b/xc/lib/X11/SetLocale.c index fde2f8af6..1749b9525 100644 --- a/xc/lib/X11/SetLocale.c +++ b/xc/lib/X11/SetLocale.c @@ -51,7 +51,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetLocale.c,v 3.10 1998/10/03 08:41:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetLocale.c,v 3.9 1998/06/28 08:41:31 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" @@ -144,78 +144,90 @@ _XlcMapOSLocaleName(osname, siname) char *osname; char *siname; { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__) -#ifdef hpux -#ifndef _LastCategory -/* HPUX 9 and earlier */ -#define SKIPCOUNT 2 -#define STARTCHAR ':' -#define ENDCHAR ';' -#else -/* HPUX 10 */ -#define ENDCHAR ' ' -#endif -#else -#ifdef ultrix -#define SKIPCOUNT 2 -#define STARTCHAR '\001' -#define ENDCHAR '\001' -#else -#if defined(WIN32) || defined(__EMX__) -#define SKIPCOUNT 1 -#define STARTCHAR '=' -#define ENDCHAR ';' -#define WHITEFILL -#else -#if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) -#define STARTCHAR ' ' -#define ENDCHAR ' ' -#else -#if !defined(sun) || defined(SVR4) -#define STARTCHAR '/' -#endif -#define ENDCHAR '/' -#endif -#endif -#endif -#endif +#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__) || defined(linux) +# ifdef hpux +# ifndef _LastCategory + /* HPUX 9 and earlier */ +# define SKIPCOUNT 2 +# define STARTCHAR ':' +# define ENDCHAR ';' +# else + /* HPUX 10 */ +# define ENDCHAR ' ' +# endif +# else +# ifdef ultrix +# define SKIPCOUNT 2 +# define STARTCHAR '\001' +# define ENDCHAR '\001' +# else +# if defined(WIN32) || defined(__EMX__) +# define SKIPCOUNT 1 +# define STARTCHAR '=' +# define ENDCHAR ';' +# define WHITEFILL +# else +# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) +# define STARTCHAR ' ' +# define ENDCHAR ' ' +# else +# if defined(linux) +# define STARTSTR "LC_CTYPE=" +# define ENDCHAR ';' +# else +# if !defined(sun) || defined(SVR4) +# define STARTCHAR '/' +# define ENDCHAR '/' +# endif +# endif +# endif +# endif +# endif +# endif char *start; char *end; int len; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT int n; -#endif +# endif start = osname; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT for (n = SKIPCOUNT; --n >= 0 && start && (start = strchr (start, STARTCHAR)); start++) ; if (!start) start = osname; -#endif -#ifdef STARTCHAR - if (start && (start = strchr (start, STARTCHAR))) { +# endif +# ifdef STARTCHAR + if (start && (start = strchr (start, STARTCHAR))) + start++; +# elif defined (STARTSTR) + if (start && (start = strstr (start,STARTSTR))) +# endif + { +# ifdef STARTCHAR start++; -#endif +# elif defined (STARTSTR) + start += strlen(STARTSTR); +# endif if (end = strchr (start, ENDCHAR)) { len = end - start; if (len >= MAXLOCALE) len = MAXLOCALE - 1; strncpy(siname, start, len); *(siname + len) = '\0'; -#ifdef WHITEFILL +# ifdef WHITEFILL for (start = siname; start = strchr(start, ' '); ) *start++ = '-'; -#endif +# endif return siname; -#ifdef STARTCHAR - } -#endif + } else /* if no ENDCHAR is found we are at the end of the line */ + return start; } -#ifdef WHITEFILL +# ifdef WHITEFILL if (strchr(osname, ' ')) { len = strlen(osname); if (len >= MAXLOCALE - 1) @@ -226,10 +238,10 @@ _XlcMapOSLocaleName(osname, siname) *start++ = '-'; return siname; } -#endif -#undef STARTCHAR -#undef ENDCHAR -#undef WHITEFILL +# endif +# undef STARTCHAR +# undef ENDCHAR +# undef WHITEFILL #endif return osname; } diff --git a/xc/lib/X11/SetPMask.c b/xc/lib/X11/SetPMask.c index e14800a69..dfb051ff9 100644 --- a/xc/lib/X11/SetPMask.c +++ b/xc/lib/X11/SetPMask.c @@ -20,7 +20,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/lib/X11/SetPMask.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetPntMap.c b/xc/lib/X11/SetPntMap.c index b09f3053b..0301eb314 100644 --- a/xc/lib/X11/SetPntMap.c +++ b/xc/lib/X11/SetPntMap.c @@ -20,7 +20,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/lib/X11/SetPntMap.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/X11/SetSOwner.c b/xc/lib/X11/SetSOwner.c index ddad6b505..64f006df6 100644 --- a/xc/lib/X11/SetSOwner.c +++ b/xc/lib/X11/SetSOwner.c @@ -20,7 +20,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/lib/X11/SetSOwner.c,v 1.2 1999/05/09 10:50:10 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetSSaver.c b/xc/lib/X11/SetSSaver.c index 0eb3fa0ed..2f1aa0cac 100644 --- a/xc/lib/X11/SetSSaver.c +++ b/xc/lib/X11/SetSSaver.c @@ -20,7 +20,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/lib/X11/SetSSaver.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetState.c b/xc/lib/X11/SetState.c index fc683f28a..fda227446 100644 --- a/xc/lib/X11/SetState.c +++ b/xc/lib/X11/SetState.c @@ -20,7 +20,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/lib/X11/SetState.c,v 1.2 1999/05/09 10:50:11 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetStip.c b/xc/lib/X11/SetStip.c index 39c190ff7..378c5a417 100644 --- a/xc/lib/X11/SetStip.c +++ b/xc/lib/X11/SetStip.c @@ -20,7 +20,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/lib/X11/SetStip.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetTSOrig.c b/xc/lib/X11/SetTSOrig.c index 5d87e43bb..437fb657a 100644 --- a/xc/lib/X11/SetTSOrig.c +++ b/xc/lib/X11/SetTSOrig.c @@ -20,7 +20,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/lib/X11/SetTSOrig.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/SetTile.c b/xc/lib/X11/SetTile.c index dcd345836..0742cca64 100644 --- a/xc/lib/X11/SetTile.c +++ b/xc/lib/X11/SetTile.c @@ -20,7 +20,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/lib/X11/SetTile.c,v 1.2 1999/05/09 10:50:12 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/StBytes.c b/xc/lib/X11/StBytes.c index 5c8acf263..f70b04104 100644 --- a/xc/lib/X11/StBytes.c +++ b/xc/lib/X11/StBytes.c @@ -20,7 +20,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/lib/X11/StBytes.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/xc/lib/X11/StCol.c b/xc/lib/X11/StCol.c index a7592fb24..871b2c021 100644 --- a/xc/lib/X11/StCol.c +++ b/xc/lib/X11/StCol.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/StCol.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/StColor.c b/xc/lib/X11/StColor.c index 7f08b303f..bd43279b7 100644 --- a/xc/lib/X11/StColor.c +++ b/xc/lib/X11/StColor.c @@ -20,7 +20,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/lib/X11/StColor.c,v 1.2 1999/05/09 10:50:13 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/StColors.c b/xc/lib/X11/StColors.c index 437cc9ca2..ec0359ab8 100644 --- a/xc/lib/X11/StColors.c +++ b/xc/lib/X11/StColors.c @@ -20,7 +20,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/lib/X11/StColors.c,v 1.2 1999/05/09 10:50:14 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/StCols.c b/xc/lib/X11/StCols.c index 86f9b41ea..7aa9bd24c 100644 --- a/xc/lib/X11/StCols.c +++ b/xc/lib/X11/StCols.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/StCols.c,v 1.2 1999/05/09 10:50:14 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/StNColor.c b/xc/lib/X11/StNColor.c index f0593abd3..cf4a4159e 100644 --- a/xc/lib/X11/StNColor.c +++ b/xc/lib/X11/StNColor.c @@ -20,7 +20,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/lib/X11/StNColor.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include "Xlibint.h" diff --git a/xc/lib/X11/StName.c b/xc/lib/X11/StName.c index ddc21d292..4c8a8f7c9 100644 --- a/xc/lib/X11/StName.c +++ b/xc/lib/X11/StName.c @@ -20,7 +20,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/lib/X11/StName.c,v 1.2 1999/05/09 10:50:15 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/xc/lib/X11/StrKeysym.c b/xc/lib/X11/StrKeysym.c index 06250ca4b..c72b3f60a 100644 --- a/xc/lib/X11/StrKeysym.c +++ b/xc/lib/X11/StrKeysym.c @@ -20,7 +20,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/lib/X11/StrKeysym.c,v 3.2 1999/05/09 10:50:15 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include <X11/Xresource.h> diff --git a/xc/lib/X11/Sync.c b/xc/lib/X11/Sync.c index 779273860..4d2f41bad 100644 --- a/xc/lib/X11/Sync.c +++ b/xc/lib/X11/Sync.c @@ -20,7 +20,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/lib/X11/Sync.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/xc/lib/X11/Text.c b/xc/lib/X11/Text.c index bbf2bd5a6..ba0649c65 100644 --- a/xc/lib/X11/Text.c +++ b/xc/lib/X11/Text.c @@ -20,7 +20,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/lib/X11/Text.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/Text16.c b/xc/lib/X11/Text16.c index 7bd74c0c8..806466639 100644 --- a/xc/lib/X11/Text16.c +++ b/xc/lib/X11/Text16.c @@ -20,7 +20,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/lib/X11/Text16.c,v 1.2 1999/05/09 10:50:16 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/TextExt.c b/xc/lib/X11/TextExt.c index b72661176..142042674 100644 --- a/xc/lib/X11/TextExt.c +++ b/xc/lib/X11/TextExt.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/xc/lib/X11/TextExt16.c b/xc/lib/X11/TextExt16.c index 6656044d1..821a87575 100644 --- a/xc/lib/X11/TextExt16.c +++ b/xc/lib/X11/TextExt16.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt16.c,v 1.2 1999/05/09 10:50:17 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/xc/lib/X11/TextToStr.c b/xc/lib/X11/TextToStr.c index 42b6c61ba..8565bead3 100644 --- a/xc/lib/X11/TextToStr.c +++ b/xc/lib/X11/TextToStr.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/TextToStr.c,v 1.3 1998/10/03 08:41:23 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextToStr.c,v 1.2 1998/06/28 08:41:32 dawes Exp $ */ #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/xc/lib/X11/UndefCurs.c b/xc/lib/X11/UndefCurs.c index 56262f40a..e10f44e34 100644 --- a/xc/lib/X11/UndefCurs.c +++ b/xc/lib/X11/UndefCurs.c @@ -20,7 +20,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/lib/X11/UndefCurs.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UngrabBut.c b/xc/lib/X11/UngrabBut.c index 6175c48ea..41d092432 100644 --- a/xc/lib/X11/UngrabBut.c +++ b/xc/lib/X11/UngrabBut.c @@ -20,7 +20,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/lib/X11/UngrabBut.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UngrabKbd.c b/xc/lib/X11/UngrabKbd.c index c20d22f8f..dc2f16ef2 100644 --- a/xc/lib/X11/UngrabKbd.c +++ b/xc/lib/X11/UngrabKbd.c @@ -20,7 +20,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/lib/X11/UngrabKbd.c,v 1.2 1999/05/09 10:50:18 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UngrabKey.c b/xc/lib/X11/UngrabKey.c index f9075bbe8..8fcff781e 100644 --- a/xc/lib/X11/UngrabKey.c +++ b/xc/lib/X11/UngrabKey.c @@ -20,7 +20,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/lib/X11/UngrabKey.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UngrabPtr.c b/xc/lib/X11/UngrabPtr.c index 61ca84749..04e18dc6a 100644 --- a/xc/lib/X11/UngrabPtr.c +++ b/xc/lib/X11/UngrabPtr.c @@ -20,7 +20,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/lib/X11/UngrabPtr.c,v 1.2 1999/05/09 10:50:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UngrabSvr.c b/xc/lib/X11/UngrabSvr.c index fc60e1d71..8f8e90b4a 100644 --- a/xc/lib/X11/UngrabSvr.c +++ b/xc/lib/X11/UngrabSvr.c @@ -20,7 +20,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/lib/X11/UngrabSvr.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UninsCmap.c b/xc/lib/X11/UninsCmap.c index 426d4cba1..f2f3091cc 100644 --- a/xc/lib/X11/UninsCmap.c +++ b/xc/lib/X11/UninsCmap.c @@ -20,7 +20,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/lib/X11/UninsCmap.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UnldFont.c b/xc/lib/X11/UnldFont.c index 54ad6c12b..b5a5c502c 100644 --- a/xc/lib/X11/UnldFont.c +++ b/xc/lib/X11/UnldFont.c @@ -20,7 +20,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/lib/X11/UnldFont.c,v 1.2 1999/05/09 10:50:20 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UnmapSubs.c b/xc/lib/X11/UnmapSubs.c index c66fa1079..6c0b05140 100644 --- a/xc/lib/X11/UnmapSubs.c +++ b/xc/lib/X11/UnmapSubs.c @@ -20,7 +20,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/lib/X11/UnmapSubs.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/UnmapWin.c b/xc/lib/X11/UnmapWin.c index 30ee84e4e..17b66bff7 100644 --- a/xc/lib/X11/UnmapWin.c +++ b/xc/lib/X11/UnmapWin.c @@ -20,7 +20,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/lib/X11/UnmapWin.c,v 1.2 1999/05/09 10:50:21 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/WMProps.c b/xc/lib/X11/WMProps.c index e9f88a3b5..8c768b275 100644 --- a/xc/lib/X11/WMProps.c +++ b/xc/lib/X11/WMProps.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WMProps.c,v 3.3 2000/03/31 20:13:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WMProps.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., diff --git a/xc/lib/X11/WarpPtr.c b/xc/lib/X11/WarpPtr.c index 48fc3b740..4441bdfb9 100644 --- a/xc/lib/X11/WarpPtr.c +++ b/xc/lib/X11/WarpPtr.c @@ -20,7 +20,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/lib/X11/WarpPtr.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/WinEvent.c b/xc/lib/X11/WinEvent.c index 80e460ba8..8bd897e08 100644 --- a/xc/lib/X11/WinEvent.c +++ b/xc/lib/X11/WinEvent.c @@ -20,7 +20,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/lib/X11/WinEvent.c,v 3.2 1999/05/09 10:50:22 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #include "Xlibint.h" diff --git a/xc/lib/X11/Window.c b/xc/lib/X11/Window.c index 5228fcfc6..45e797a2f 100644 --- a/xc/lib/X11/Window.c +++ b/xc/lib/X11/Window.c @@ -20,7 +20,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/lib/X11/Window.c,v 1.2 1999/05/09 10:50:22 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" diff --git a/xc/lib/X11/WrBitF.c b/xc/lib/X11/WrBitF.c index 45a7bd116..b1409bffa 100644 --- a/xc/lib/X11/WrBitF.c +++ b/xc/lib/X11/WrBitF.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WrBitF.c,v 3.2 1998/10/03 08:41:24 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WrBitF.c,v 3.1 1996/04/15 11:15:50 dawes Exp $ */ #include "Xlibint.h" #include <X11/Xos.h> diff --git a/xc/lib/X11/X11-def.cpp b/xc/lib/X11/X11-def.cpp index 9c862e86f..fe5b70c3c 100644 --- a/xc/lib/X11/X11-def.cpp +++ b/xc/lib/X11/X11-def.cpp @@ -841,4 +841,4 @@ EXPORTS XkbUpdateMapFromCore XkbXlibControlsImplemented /* $TOG: X11-def.cpp /main/19 1998/06/16 16:04:58 kaleb $ */ -/* $XFree86: xc/lib/X11/X11-def.cpp,v 1.6 2000/08/09 23:40:12 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/X11/X11os2.def b/xc/lib/X11/X11os2.def index db4d00edb..bea0dc45d 100644 --- a/xc/lib/X11/X11os2.def +++ b/xc/lib/X11/X11os2.def @@ -1,5 +1,5 @@ LIBRARY X11 -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/X11/X11os2.def,v 3.8 1999/04/29 09:13:28 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/X11/X11os2.def,v 3.7 1998/06/28 08:41:32 dawes Exp $" CODE PRELOAD DATA diff --git a/xc/lib/X11/XErrorDB b/xc/lib/X11/XErrorDB index dfcffe3da..489c8144f 100644 --- a/xc/lib/X11/XErrorDB +++ b/xc/lib/X11/XErrorDB @@ -19,7 +19,7 @@ ! other dealings in this Software without prior written authorization ! from The Open Group. ! -! $XFree86: xc/lib/X11/XErrorDB,v 3.33 2000/04/17 16:29:48 eich Exp $ +! $XFree86: xc/lib/X11/XErrorDB,v 3.31 2000/02/29 18:25:40 dawes Exp $ ! ! these are used in XGetErrorMessage. XlibMessage.XError: X Error of failed request diff --git a/xc/lib/X11/XKB.c b/xc/lib/X11/XKB.c index 5865e870d..cb452de31 100644 --- a/xc/lib/X11/XKB.c +++ b/xc/lib/X11/XKB.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKB.c,v 1.3 1999/05/09 10:50:23 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_REPLIES diff --git a/xc/lib/X11/XKBAlloc.c b/xc/lib/X11/XKBAlloc.c index 18db21a1f..e26eae0bf 100644 --- a/xc/lib/X11/XKBAlloc.c +++ b/xc/lib/X11/XKBAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.4 1998/08/20 08:55:49 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.3 1997/10/26 13:24:43 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xc/lib/X11/XKBBind.c b/xc/lib/X11/XKBBind.c index 5d9c665ca..2366f067d 100644 --- a/xc/lib/X11/XKBBind.c +++ b/xc/lib/X11/XKBBind.c @@ -583,8 +583,6 @@ _XkbLoadDpy(dpy) LockDisplay(dpy); xkbi->desc = desc; - _XkbGetConverters(_XkbGetCharset(),&xkbi->cvt); - _XkbGetConverters("ISO8859-1",&xkbi->latin1cvt); UnlockDisplay(dpy); oldEvents= xkbi->selected_events; if (!(xkbi->xlib_ctrls&XkbLC_IgnoreNewKeyboards)) { @@ -670,35 +668,26 @@ XkbTranslateKeySym(dpy, sym_rtrn, mods, buffer, nbytes, extra_rtrn) XkbKSToMBFunc cvtr; XPointer priv; char tmp[4]; - register struct _XKeytrans *p; int n; + xkb= dpy->xkb_info; + if (!xkb->cvt.KSToMB) { + _XkbGetConverters(_XkbGetCharset(),&xkb->cvt); + _XkbGetConverters("ISO8859-1",&xkb->latin1cvt); + } + if (extra_rtrn) *extra_rtrn= 0; - if (_XkbUnavailable(dpy)) - return _XTranslateKeySym(dpy, *sym_rtrn, mods, buffer, nbytes); - _XkbCheckPendingRefresh(dpy,dpy->xkb_info); - - xkb= dpy->xkb_info; if ((buffer==NULL)||(nbytes==0)) { buffer= tmp; nbytes= 4; } /* see if symbol rebound, if so, return that string. */ - for (p = dpy->key_bindings; p; p = p->next) { - if (((mods & AllMods) == p->state) && (*sym_rtrn == p->key)) { - int tmp = p->len; - if (tmp > nbytes) { - if (extra_rtrn) - *extra_rtrn= tmp-nbytes; - tmp = nbytes; - } - memcpy (buffer, p->string, tmp); - return tmp; - } - } + n = XkbLookupKeyBinding(dpy,*sym_rtrn,mods,buffer,nbytes,extra_rtrn); + if (n) + return n; if ( nbytes>0 ) buffer[0]= '\0'; @@ -718,35 +707,23 @@ XkbTranslateKeySym(dpy, sym_rtrn, mods, buffer, nbytes, extra_rtrn) if ((!xkb->cvt.KSToUpper)&&( mods&LockMask )) { register int i; - - if (!xkb->cvt.KSToUpper) { - int change; - char ch; - for (i=change=0;i<n;i++) { - ch= toupper(buffer[i]); - change= (change||(buffer[i]!=ch)); - buffer[i] = ch; - } - if (change) { - if (n==1) - *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv, - buffer,n,0); - else *sym_rtrn= NoSymbol; - } + int change; + char ch; + for (i=change=0;i<n;i++) { + ch= toupper(buffer[i]); + change= (change||(buffer[i]!=ch)); + buffer[i] = ch; + } + if (change) { + if (n==1) + *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,0); + else *sym_rtrn= NoSymbol; } } if ( mods&ControlMask ) { if ( n==1 ) { - register char c = buffer[0]; - - if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F; - else if (c == '2') c = '\000'; - else if (c >= '3' && c <= '7') c -= ('3' - '\033'); - else if (c == '8') c = '\177'; - else if (c == '/') c = '_' & 0x1F; - - buffer[0]= c; + buffer[0]= XkbToControl(buffer[0]); if ( nbytes>1 ) buffer[1]= '\0'; return 1; @@ -780,14 +757,10 @@ XLookupString (event, buffer, nbytes, keysym, status) Display *dpy = event->display; XkbDescPtr xkb; - if (_XkbUnavailable(dpy)) - return _XLookupString(event, buffer, nbytes, keysym, status); - _XkbCheckPendingRefresh(dpy,dpy->xkb_info); - if (keysym==NULL) keysym= &dummy; xkb= dpy->xkb_info->desc; - if (!XkbTranslateKeyCode(xkb,event->keycode,event->state, &new_mods,keysym)) + if (!XkbLookupKeySym(dpy,event->keycode,event->state, &new_mods,keysym)) return 0; new_mods= (event->state&(~new_mods)); @@ -896,15 +869,24 @@ XLookupString (event, buffer, nbytes, keysym, status) return rtrnLen; rtrnLen = XkbTranslateKeySym(dpy,keysym,new_mods,buffer,nbytes,NULL); + if ((event->state&ControlMask)&&(nbytes>0)&& ((rtrnLen==0)|| ((rtrnLen==1)&&((unsigned char) buffer[0]>=' ')))&& - (XkbGroupForCoreState(event->state)!=XkbGroup1Index)&& (dpy->xkb_info->xlib_ctrls&XkbLC_ControlFallback)) { XKeyEvent tmp_ev; tmp_ev= *event; - tmp_ev.state= XkbBuildCoreState(event->state,XkbGroup1Index); - return XLookupString (&tmp_ev, buffer, nbytes, keysym, status); + if (_XkbUnavailable(dpy)) { + if (event->state & dpy->mode_switch) { + tmp_ev.state= event->state & ~dpy->mode_switch; + return XLookupString (&tmp_ev, buffer, nbytes, keysym, status); + } + } else { + if (XkbGroupForCoreState(event->state) != XkbGroup1Index) { + tmp_ev.state= XkbBuildCoreState(event->state,XkbGroup1Index); + return XLookupString (&tmp_ev, buffer, nbytes, keysym, status); + } + } } return rtrnLen; } @@ -950,12 +932,14 @@ XkbLookupKeyBinding(dpy, sym, mods, buffer, nbytes, extra_rtrn) char #if NeedFunctionPrototypes -XkbToControl( char c ) +XkbToControl( char ch ) #else -XkbToControl( c ) - char c; +XkbToControl( ch ) + char ch; #endif { + register char c = ch; + if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F; else if (c == '2') c = '\000'; else if (c >= '3' && c <= '7') c -= ('3' - '\033'); diff --git a/xc/lib/X11/XKBCtrls.c b/xc/lib/X11/XKBCtrls.c index e7f2c901d..6ba30930a 100644 --- a/xc/lib/X11/XKBCtrls.c +++ b/xc/lib/X11/XKBCtrls.c @@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86$ */ #include <stdio.h> #define NEED_REPLIES @@ -303,6 +304,14 @@ XkbGetControls(dpy, which, xkb) } if (which&XkbAccessXKeysMask) ctrls->ax_options= rep.axOptions; + if (which&XkbStickyKeysMask) { + ctrls->ax_options &= ~XkbAX_SKOptionsMask; + ctrls->ax_options |= rep.axOptions & XkbAX_SKOptionsMask; + } + if (which&XkbAccessXFeedbackMask) { + ctrls->ax_options &= ~XkbAX_FBOptionsMask; + ctrls->ax_options |= rep.axOptions & XkbAX_FBOptionsMask; + } if (which&XkbAccessXTimeoutMask) { ctrls->ax_timeout = rep.axTimeout; ctrls->axt_ctrls_mask = rep.axtCtrlsMask; diff --git a/xc/lib/X11/XKBCvt.c b/xc/lib/X11/XKBCvt.c index e3a35115c..768219db0 100644 --- a/xc/lib/X11/XKBCvt.c +++ b/xc/lib/X11/XKBCvt.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.26 2000/06/13 02:28:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.25 2000/02/18 12:18:50 tsi Exp $ */ #include <stdio.h> #include <sys/types.h> diff --git a/xc/lib/X11/XKBExtDev.c b/xc/lib/X11/XKBExtDev.c index d0056089a..37818143a 100644 --- a/xc/lib/X11/XKBExtDev.c +++ b/xc/lib/X11/XKBExtDev.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.2 1999/05/09 10:50:23 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_REPLIES diff --git a/xc/lib/X11/XKBGAlloc.c b/xc/lib/X11/XKBGAlloc.c index be3639afc..05e14a477 100644 --- a/xc/lib/X11/XKBGAlloc.c +++ b/xc/lib/X11/XKBGAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.3 1997/10/26 13:24:43 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.2 1996/10/13 11:17:25 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/lib/X11/XKBGeom.c b/xc/lib/X11/XKBGeom.c index ae4fd473b..8307e9eac 100644 --- a/xc/lib/X11/XKBGeom.c +++ b/xc/lib/X11/XKBGeom.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.2 1999/05/09 10:50:24 dawes Exp $ */ +/* $XFree86$ */ #ifdef DEBUG #include <stdio.h> diff --git a/xc/lib/X11/XKBGetMap.c b/xc/lib/X11/XKBGetMap.c index db447ed33..8cbadd783 100644 --- a/xc/lib/X11/XKBGetMap.c +++ b/xc/lib/X11/XKBGetMap.c @@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.5 2000/02/17 14:16:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.4 1998/10/03 08:41:26 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/xc/lib/X11/XKBMAlloc.c b/xc/lib/X11/XKBMAlloc.c index 3dd900145..7cd6148fc 100644 --- a/xc/lib/X11/XKBMAlloc.c +++ b/xc/lib/X11/XKBMAlloc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.10 1998/10/03 08:41:27 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.9 1998/08/20 08:55:49 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xc/lib/X11/XKBMisc.c b/xc/lib/X11/XKBMisc.c index f2a44aafe..b3a29be14 100644 --- a/xc/lib/X11/XKBMisc.c +++ b/xc/lib/X11/XKBMisc.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.2 1999/05/09 10:50:24 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.1 1999/03/14 03:21:03 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xc/lib/X11/XKBSetMap.c b/xc/lib/X11/XKBSetMap.c index 414e722e6..b93d7e1c3 100644 --- a/xc/lib/X11/XKBSetMap.c +++ b/xc/lib/X11/XKBSetMap.c @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.1 1999/05/09 10:50:25 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_REPLIES diff --git a/xc/lib/X11/XKBUse.c b/xc/lib/X11/XKBUse.c index c1c3465fd..e04c97b7f 100644 --- a/xc/lib/X11/XKBUse.c +++ b/xc/lib/X11/XKBUse.c @@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86$ */ #include <stdio.h> #include <ctype.h> @@ -672,7 +673,7 @@ XkbUseExtension(dpy,major_rtrn,minor_rtrn) static int debugMsg; static int been_here= 0; - if ( dpy->xkb_info ) { + if ( dpy->xkb_info && (!dpy->flags&XlibDisplayNoXkb)) { if (major_rtrn) *major_rtrn= dpy->xkb_info->srv_major; if (minor_rtrn) *minor_rtrn= dpy->xkb_info->srv_minor; return True; @@ -685,8 +686,79 @@ XkbUseExtension(dpy,major_rtrn,minor_rtrn) if (major_rtrn) *major_rtrn= 0; if (minor_rtrn) *minor_rtrn= 0; + if (!dpy->xkb_info) { + xkbi = _XkbTypedCalloc(1, XkbInfoRec); + if ( !xkbi ) + return False; + dpy->xkb_info = xkbi; + dpy->free_funcs->xkb = _XkbFreeInfo; + + xkbi->xlib_ctrls|= + (XkbLC_BeepOnComposeFail|XkbLC_ComposeLED|XkbLC_ControlFallback); + if ((str=getenv("_XKB_OPTIONS_ENABLE"))!=NULL) { + if ((str=getenv("_XKB_LATIN1_LOOKUP"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_ForceLatin1Lookup; + else xkbi->xlib_ctrls|= XkbLC_ForceLatin1Lookup; + } + if ((str=getenv("_XKB_CONSUME_LOOKUP_MODS"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_ConsumeLookupMods; + else xkbi->xlib_ctrls|= XkbLC_ConsumeLookupMods; + } + if ((str=getenv("_XKB_CONSUME_SHIFT_AND_LOCK"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_AlwaysConsumeShiftAndLock; + else xkbi->xlib_ctrls|= XkbLC_AlwaysConsumeShiftAndLock; + } + if ((str=getenv("_XKB_IGNORE_NEW_KEYBOARDS"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_IgnoreNewKeyboards; + else xkbi->xlib_ctrls|= XkbLC_IgnoreNewKeyboards; + } + if ((str=getenv("_XKB_CONTROL_FALLBACK"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_ControlFallback; + else xkbi->xlib_ctrls|= XkbLC_ControlFallback; + } + if ((str=getenv("_XKB_COMP_LED"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_ComposeLED; + else { + xkbi->xlib_ctrls|= XkbLC_ComposeLED; + if (strlen(str)>0) + xkbi->composeLED= XInternAtom(dpy,str,False); + } + } + if ((str=getenv("_XKB_COMP_FAIL_BEEP"))!=NULL) { + if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) + xkbi->xlib_ctrls&= ~XkbLC_BeepOnComposeFail; + else xkbi->xlib_ctrls|= XkbLC_BeepOnComposeFail; + } + } + if ((xkbi->composeLED==None)&&((xkbi->xlib_ctrls&XkbLC_ComposeLED)!=0)) + xkbi->composeLED= XInternAtom(dpy,"Compose",False); +#ifdef DEBUG + if (debugMsg) { + register unsigned c= xkbi->xlib_ctrls; + fprintf(stderr,"XKEYBOARD compose: beep on failure is %s, LED is %s\n", + ((c&XkbLC_BeepOnComposeFail)?"on":"off"), + ((c&XkbLC_ComposeLED)?"on":"off")); + fprintf(stderr,"XKEYBOARD XLookupString: %slatin-1, %s lookup modifiers\n", + ((c&XkbLC_ForceLatin1Lookup)?"allow non-":"force "), + ((c&XkbLC_ConsumeLookupMods)?"consume":"re-use")); + fprintf(stderr, + "XKEYBOARD XLookupString: %sconsume shift and lock, %scontrol fallback\n", + ((c&XkbLC_AlwaysConsumeShiftAndLock)?"always ":"don't "), + ((c&XkbLC_ControlFallback)?"":"no ")); + + } +#endif + } else + xkbi = dpy->xkb_info; + forceIgnore= (dpy->flags&XlibDisplayNoXkb)||dpy->keysyms; - forceIgnore= forceIgnore&(major_rtrn==NULL)&&(minor_rtrn==NULL); + forceIgnore= forceIgnore&&(major_rtrn==NULL)&&(minor_rtrn==NULL); if ( forceIgnore || _XkbIgnoreExtension || getenv("XKB_DISABLE")) { LockDisplay(dpy); dpy->flags |= XlibDisplayNoXkb; @@ -696,15 +768,10 @@ XkbUseExtension(dpy,major_rtrn,minor_rtrn) return False; } - xkbi = _XkbTypedCalloc(1, XkbInfoRec); - if ( !xkbi ) - return False; - if ( (codes=XInitExtension(dpy,XkbName))==NULL ) { LockDisplay(dpy); dpy->flags |= XlibDisplayNoXkb; UnlockDisplay(dpy); - Xfree(xkbi); if (debugMsg) fprintf(stderr,"XKEYBOARD extension not present\n"); return False; @@ -746,8 +813,7 @@ XkbUseExtension(dpy,major_rtrn,minor_rtrn) dpy->flags |= XlibDisplayNoXkb; UnlockDisplay(dpy); SyncHandle(); - Xfree(xkbi); - if (major_rtrn) *major_rtrn= rep.serverMajor; + if (major_rtrn) *major_rtrn= rep.serverMajor; if (minor_rtrn) *minor_rtrn= rep.serverMinor; return False; } @@ -766,70 +832,8 @@ XkbUseExtension(dpy,major_rtrn,minor_rtrn) fprintf(stderr,"XKEYBOARD (version %d.%02d/%d.%02d) OK!\n", XkbMajorVersion,XkbMinorVersion, rep.serverMajor,rep.serverMinor); - dpy->xkb_info = xkbi; - dpy->free_funcs->xkb = _XkbFreeInfo; - ev_base = codes->first_event; - xkbi->xlib_ctrls|= - (XkbLC_BeepOnComposeFail|XkbLC_ComposeLED|XkbLC_ControlFallback); - if ((str=getenv("_XKB_OPTIONS_ENABLE"))!=NULL) { - if ((str=getenv("_XKB_LATIN1_LOOKUP"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_ForceLatin1Lookup; - else xkbi->xlib_ctrls|= XkbLC_ForceLatin1Lookup; - } - if ((str=getenv("_XKB_CONSUME_LOOKUP_MODS"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_ConsumeLookupMods; - else xkbi->xlib_ctrls|= XkbLC_ConsumeLookupMods; - } - if ((str=getenv("_XKB_CONSUME_SHIFT_AND_LOCK"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_AlwaysConsumeShiftAndLock; - else xkbi->xlib_ctrls|= XkbLC_AlwaysConsumeShiftAndLock; - } - if ((str=getenv("_XKB_IGNORE_NEW_KEYBOARDS"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_IgnoreNewKeyboards; - else xkbi->xlib_ctrls|= XkbLC_IgnoreNewKeyboards; - } - if ((str=getenv("_XKB_CONTROL_FALLBACK"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_ControlFallback; - else xkbi->xlib_ctrls|= XkbLC_ControlFallback; - } - if ((str=getenv("_XKB_COMP_LED"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_ComposeLED; - else { - xkbi->xlib_ctrls|= XkbLC_ComposeLED; - if (strlen(str)>0) - xkbi->composeLED= XInternAtom(dpy,str,False); - } - } - if ((str=getenv("_XKB_COMP_FAIL_BEEP"))!=NULL) { - if ((strcmp(str,"off")==0)||(strcmp(str,"0")==0)) - xkbi->xlib_ctrls&= ~XkbLC_BeepOnComposeFail; - else xkbi->xlib_ctrls|= XkbLC_BeepOnComposeFail; - } - } - if ((xkbi->composeLED==None)&&((xkbi->xlib_ctrls&XkbLC_ComposeLED)!=0)) - xkbi->composeLED= XInternAtom(dpy,"Compose",False); -#ifdef DEBUG - if (debugMsg) { - register unsigned c= xkbi->xlib_ctrls; - fprintf(stderr,"XKEYBOARD compose: beep on failure is %s, LED is %s\n", - ((c&XkbLC_BeepOnComposeFail)?"on":"off"), - ((c&XkbLC_ComposeLED)?"on":"off")); - fprintf(stderr,"XKEYBOARD XLookupString: %slatin-1, %s lookup modifiers\n", - ((c&XkbLC_ForceLatin1Lookup)?"allow non-":"force "), - ((c&XkbLC_ConsumeLookupMods)?"consume":"re-use")); - fprintf(stderr, - "XKEYBOARD XLookupString: %sconsume shift and lock, %scontrol fallback\n", - ((c&XkbLC_AlwaysConsumeShiftAndLock)?"always ":"don't "), - ((c&XkbLC_ControlFallback)?"":"no ")); - } -#endif + ev_base = codes->first_event; XESetWireToEvent(dpy,ev_base+XkbEventCode,wire_to_event); SyncHandle(); return True; diff --git a/xc/lib/X11/XKBlibint.h b/xc/lib/X11/XKBlibint.h index 2945fc7cc..5062c6308 100644 --- a/xc/lib/X11/XKBlibint.h +++ b/xc/lib/X11/XKBlibint.h @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.3 1997/06/22 10:16:51 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.2 1997/03/10 10:10:08 hohndel Exp $ */ #ifndef _XKBLIBINT_H_ #define _XKBLIBINT_H_ diff --git a/xc/lib/X11/XKeysymDB b/xc/lib/X11/XKeysymDB index 96f68d846..3e8495249 100644 --- a/xc/lib/X11/XKeysymDB +++ b/xc/lib/X11/XKeysymDB @@ -11,7 +11,7 @@ ! suitability of this software for any purpose. It is provided "as is" ! without express or implied warranty. ! -! $XFree86: xc/lib/X11/XKeysymDB,v 3.5 2000/07/07 00:45:00 dawes Exp $ +! $XFree86: xc/lib/X11/XKeysymDB,v 3.4 2000/02/10 15:48:28 dawes Exp $ hpmute_acute :100000A8 hpmute_grave :100000A9 diff --git a/xc/lib/X11/XYZ.c b/xc/lib/X11/XYZ.c index 65e5e566f..996248e75 100644 --- a/xc/lib/X11/XYZ.c +++ b/xc/lib/X11/XYZ.c @@ -33,7 +33,7 @@ * * */ -/* $XFree86: xc/lib/X11/XYZ.c,v 1.2 1999/05/09 10:50:25 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include "Xlibint.h" diff --git a/xc/lib/X11/Xcms.h b/xc/lib/X11/Xcms.h index 3ce1733ff..335bf986f 100644 --- a/xc/lib/X11/Xcms.h +++ b/xc/lib/X11/Xcms.h @@ -27,7 +27,7 @@ * DESCRIPTION * Public include file for X Color Management System */ -/* $XFree86: xc/lib/X11/Xcms.h,v 1.4 1999/03/14 03:21:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xcms.h,v 1.3tsi Exp $ */ #ifndef _XCMS_H_ #define _XCMS_H_ diff --git a/xc/lib/X11/Xcmsint.h b/xc/lib/X11/Xcmsint.h index a3c06e3fb..aaa03160b 100644 --- a/xc/lib/X11/Xcmsint.h +++ b/xc/lib/X11/Xcmsint.h @@ -29,7 +29,7 @@ * (i.e., for API internal use only) * */ -/* $XFree86: xc/lib/X11/Xcmsint.h,v 3.1 2000/01/29 18:58:11 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XCMSINT_H_ #define _XCMSINT_H_ diff --git a/xc/lib/X11/Ximint.h b/xc/lib/X11/Ximint.h index aa9c92c6f..cbe00a808 100644 --- a/xc/lib/X11/Ximint.h +++ b/xc/lib/X11/Ximint.h @@ -30,7 +30,7 @@ PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/Ximint.h,v 3.5 2000/06/13 02:28:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Ximint.h,v 3.4 1998/10/03 08:41:27 dawes Exp $ */ #ifndef _XIMINT_H #define _XIMINT_H diff --git a/xc/lib/X11/XimintL.h b/xc/lib/X11/XimintL.h index 80ff05de0..c3958ea2f 100644 --- a/xc/lib/X11/XimintL.h +++ b/xc/lib/X11/XimintL.h @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/XimintL.h,v 1.3 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIMINTL_H #define _XIMINTL_H diff --git a/xc/lib/X11/XimintP.h b/xc/lib/X11/XimintP.h index ec873fab1..207df0a8b 100644 --- a/xc/lib/X11/XimintP.h +++ b/xc/lib/X11/XimintP.h @@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE. miyamoto@jrd.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/XimintP.h,v 1.3 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIMINTP_H #define _XIMINTP_H diff --git a/xc/lib/X11/XlcGeneric.h b/xc/lib/X11/XlcGeneric.h index f8992a541..402dacf75 100644 --- a/xc/lib/X11/XlcGeneric.h +++ b/xc/lib/X11/XlcGeneric.h @@ -31,7 +31,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/XlcGeneric.h,v 1.2 2000/02/25 18:27:53 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XLCGENERIC_H_ #define _XLCGENERIC_H_ diff --git a/xc/lib/X11/XlcPubI.h b/xc/lib/X11/XlcPubI.h index d78ac3ded..cf2181db7 100644 --- a/xc/lib/X11/XlcPubI.h +++ b/xc/lib/X11/XlcPubI.h @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.5 2000/02/12 02:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.4 1997/11/22 12:50:07 dawes Exp $ */ #ifndef _XLCPUBLICI_H_ #define _XLCPUBLICI_H_ diff --git a/xc/lib/X11/XlcPublic.h b/xc/lib/X11/XlcPublic.h index 36842a314..3706a6626 100644 --- a/xc/lib/X11/XlcPublic.h +++ b/xc/lib/X11/XlcPublic.h @@ -31,7 +31,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.5 2000/02/29 03:09:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.4 2000/02/25 18:27:54 dawes Exp $ */ /* * Most of this API is documented in i18n/Framework.PS */ diff --git a/xc/lib/X11/XlcUTF.h b/xc/lib/X11/XlcUTF.h index f58ecddbe..0bd2d9943 100644 --- a/xc/lib/X11/XlcUTF.h +++ b/xc/lib/X11/XlcUTF.h @@ -25,7 +25,7 @@ OR PERFORMANCE OF THIS SOFTWARE. Author: Hiromu Inukai (inukai@Japan.Sun.COM) SunSoft, inc. ******************************************************************/ -/* $XFree86: xc/lib/X11/XlcUTF.h,v 1.6 1999/06/06 14:05:52 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlcUTF.h,v 1.5 1999/05/30 15:28:19 dawes Exp $ */ #include "Xlibint.h" #include "XlcGeneric.h" diff --git a/xc/lib/X11/Xlcint.h b/xc/lib/X11/Xlcint.h index 49826cb2b..b39ec0a1d 100644 --- a/xc/lib/X11/Xlcint.h +++ b/xc/lib/X11/Xlcint.h @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlcint.h,v 3.5 2000/02/12 02:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlcint.h,v 3.4 1998/10/03 08:41:28 dawes Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, diff --git a/xc/lib/X11/Xlib.h b/xc/lib/X11/Xlib.h index 776f51fd5..8ac2d565f 100644 --- a/xc/lib/X11/Xlib.h +++ b/xc/lib/X11/Xlib.h @@ -20,7 +20,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/lib/X11/Xlib.h,v 3.16 2000/01/29 18:58:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlib.h,v 3.15 1999/05/15 06:24:47 dawes Exp $ */ /* diff --git a/xc/lib/X11/XlibInt.c b/xc/lib/X11/XlibInt.c index af2b76437..a7aded6bc 100644 --- a/xc/lib/X11/XlibInt.c +++ b/xc/lib/X11/XlibInt.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XlibInt.c,v 3.22 2000/06/17 00:27:30 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlibInt.c,v 3.21 2000/06/15 23:59:06 keithp Exp $ */ /* * XlibInt.c - Internal support routines for the C subroutine diff --git a/xc/lib/X11/Xlibint.h b/xc/lib/X11/Xlibint.h index ef106bba0..a2e51dcdd 100644 --- a/xc/lib/X11/Xlibint.h +++ b/xc/lib/X11/Xlibint.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlibint.h,v 3.15 2000/02/08 17:18:43 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlibint.h,v 3.14 2000/01/29 18:58:13 dawes Exp $ */ #ifndef _XLIBINT_H_ #define _XLIBINT_H_ 1 diff --git a/xc/lib/X11/Xresource.h b/xc/lib/X11/Xresource.h index 1699902f5..7be8ea11a 100644 --- a/xc/lib/X11/Xresource.h +++ b/xc/lib/X11/Xresource.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xresource.h,v 3.2 1998/10/03 08:41:30 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xresource.h,v 3.1 1996/12/23 05:59:51 dawes Exp $ */ #ifndef _XRESOURCE_H_ #define _XRESOURCE_H_ diff --git a/xc/lib/X11/Xrm.c b/xc/lib/X11/Xrm.c index 20353efb1..898dcda44 100644 --- a/xc/lib/X11/Xrm.c +++ b/xc/lib/X11/Xrm.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xrm.c,v 3.13 1999/05/30 03:03:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xrm.c,v 3.12 1999/05/09 10:50:27 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/X11/Xutil.h b/xc/lib/X11/Xutil.h index 9b217ca0f..1cf0de49f 100644 --- a/xc/lib/X11/Xutil.h +++ b/xc/lib/X11/Xutil.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xutil.h,v 3.1 1998/10/03 08:41:31 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xutil.h,v 3.0 1996/12/09 11:49:36 dawes Exp $ */ #ifndef _XUTIL_H_ #define _XUTIL_H_ diff --git a/xc/lib/X11/cmsAllCol.c b/xc/lib/X11/cmsAllCol.c index 2abdd282c..800a171d7 100644 --- a/xc/lib/X11/cmsAllCol.c +++ b/xc/lib/X11/cmsAllCol.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.2 1999/05/09 10:50:27 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/cmsAllNCol.c b/xc/lib/X11/cmsAllNCol.c index 47d5c5046..6c9a4b603 100644 --- a/xc/lib/X11/cmsAllNCol.c +++ b/xc/lib/X11/cmsAllNCol.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.2 1999/05/09 10:50:28 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/lib/X11/cmsColNm.c b/xc/lib/X11/cmsColNm.c index 373184ce4..48b7ff2ab 100644 --- a/xc/lib/X11/cmsColNm.c +++ b/xc/lib/X11/cmsColNm.c @@ -31,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.6 2000/01/29 18:58:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.5 1999/05/09 10:50:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/cmsGlobls.c b/xc/lib/X11/cmsGlobls.c index 962bce543..89d35cbc2 100644 --- a/xc/lib/X11/cmsGlobls.c +++ b/xc/lib/X11/cmsGlobls.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.3 2000/01/29 18:58:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.2 1999/05/09 10:50:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" diff --git a/xc/lib/X11/cmsInt.c b/xc/lib/X11/cmsInt.c index fc8808f2b..0a5b3fc1b 100644 --- a/xc/lib/X11/cmsInt.c +++ b/xc/lib/X11/cmsInt.c @@ -34,7 +34,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsInt.c,v 1.2 1999/05/09 10:50:29 dawes Exp $ */ +/* $XFree86$ */ /* #define NEED_EVENTS */ #include <stdio.h> diff --git a/xc/lib/X11/cmsLkCol.c b/xc/lib/X11/cmsLkCol.c index 428436f56..346241246 100644 --- a/xc/lib/X11/cmsLkCol.c +++ b/xc/lib/X11/cmsLkCol.c @@ -32,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.2 1999/05/09 10:50:29 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/lib/X11/cmsTrig.c b/xc/lib/X11/cmsTrig.c index f499e8503..e3633a9c3 100644 --- a/xc/lib/X11/cmsTrig.c +++ b/xc/lib/X11/cmsTrig.c @@ -24,7 +24,7 @@ * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.3 1999/05/09 10:50:30 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.4 2000/08/23 22:10:02 tsi Exp $ */ /* * It should be pointed out that for simplicity's sake, the * environment parameters are defined as floating point constants, @@ -90,13 +90,8 @@ double _XcmsArcTangent(); #ifdef _CRAY #define XCMS_DMAXPOWTWO ((double)(1 < 47)) #else -#ifdef __alpha__ #define XCMS_DMAXPOWTWO ((double)(XCMS_LONG_MAX) * \ (1L << ((XCMS_NBITS(double)-XCMS_DEXPLEN) - XCMS_NBITS(int) + 1))) -#else -#define XCMS_DMAXPOWTWO ((double)(XCMS_LONG_MAX) * \ - (1L << ((XCMS_NBITS(double)-XCMS_DEXPLEN) - XCMS_NBITS(long) + 1))) -#endif #endif /* diff --git a/xc/lib/X11/imCallbk.c b/xc/lib/X11/imCallbk.c index 0079ba4b7..0f24b4ad7 100644 --- a/xc/lib/X11/imCallbk.c +++ b/xc/lib/X11/imCallbk.c @@ -32,7 +32,7 @@ PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp ***********************************************************************/ -/* $XFree86: xc/lib/X11/imCallbk.c,v 3.4 1999/05/09 10:50:30 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imCallbk.c,v 3.3 1996/12/23 05:59:53 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/imConv.c b/xc/lib/X11/imConv.c index e46735c5d..0bd7d0622 100644 --- a/xc/lib/X11/imConv.c +++ b/xc/lib/X11/imConv.c @@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imConv.c,v 1.25 2000/06/23 19:50:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imConv.c,v 1.24 2000/06/13 02:28:28 dawes Exp $ */ #define NEED_EVENTS #include <stdio.h> diff --git a/xc/lib/X11/imDefFlt.c b/xc/lib/X11/imDefFlt.c index 63d610198..bb24ff44c 100644 --- a/xc/lib/X11/imDefFlt.c +++ b/xc/lib/X11/imDefFlt.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefFlt.c,v 1.3 1999/05/09 10:50:31 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xatom.h> #define NEED_EVENTS diff --git a/xc/lib/X11/imDefIc.c b/xc/lib/X11/imDefIc.c index 7193cf02e..6b9f430fc 100644 --- a/xc/lib/X11/imDefIc.c +++ b/xc/lib/X11/imDefIc.c @@ -28,7 +28,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefIc.c,v 3.6 1999/05/09 10:50:31 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/imDefIm.c b/xc/lib/X11/imDefIm.c index 4b58da348..6346ad80b 100644 --- a/xc/lib/X11/imDefIm.c +++ b/xc/lib/X11/imDefIm.c @@ -31,7 +31,7 @@ OF THIS SOFTWARE. makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefIm.c,v 1.4 2000/06/13 02:28:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefIm.c,v 1.3 1999/08/01 07:56:52 dawes Exp $ */ #include <X11/Xatom.h> #define NEED_EVENTS diff --git a/xc/lib/X11/imDefLkup.c b/xc/lib/X11/imDefLkup.c index c877e0af9..60fb98ed0 100644 --- a/xc/lib/X11/imDefLkup.c +++ b/xc/lib/X11/imDefLkup.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefLkup.c,v 3.6 1999/05/09 10:50:32 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefLkup.c,v 3.5 1998/10/03 08:41:33 dawes Exp $ */ #include <X11/Xatom.h> #define NEED_EVENTS diff --git a/xc/lib/X11/imDispch.c b/xc/lib/X11/imDispch.c index 9e45052c0..4e7b83dfb 100644 --- a/xc/lib/X11/imDispch.c +++ b/xc/lib/X11/imDispch.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDispch.c,v 1.2 1999/05/09 10:50:33 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlib.h> #include "Xlibint.h" diff --git a/xc/lib/X11/imImSw.c b/xc/lib/X11/imImSw.c index bed76f840..b041487b6 100644 --- a/xc/lib/X11/imImSw.c +++ b/xc/lib/X11/imImSw.c @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imImSw.c,v 1.2 1999/05/09 10:50:33 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/imInsClbk.c b/xc/lib/X11/imInsClbk.c index 2df4276f9..c253e721e 100644 --- a/xc/lib/X11/imInsClbk.c +++ b/xc/lib/X11/imInsClbk.c @@ -1,5 +1,5 @@ /* $XConsortium: imInsClbk.c /main/4 1995/11/18 16:08:11 kaleb $ */ -/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.0 1996/02/09 08:18:54 dawes Exp $ */ +/* $XFree86$ */ /****************************************************************** Copyright 1993, 1994 by Sony Corporation diff --git a/xc/lib/X11/imInt.c b/xc/lib/X11/imInt.c index df566db63..33e362807 100644 --- a/xc/lib/X11/imInt.c +++ b/xc/lib/X11/imInt.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imInt.c,v 3.8 2000/06/13 02:28:28 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imInt.c,v 3.7 2000/05/18 23:46:12 dawes Exp $ */ #include <X11/Xatom.h> #include <X11/Xlib.h> diff --git a/xc/lib/X11/imLcIc.c b/xc/lib/X11/imLcIc.c index 263868905..168a7e6d9 100644 --- a/xc/lib/X11/imLcIc.c +++ b/xc/lib/X11/imLcIc.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcIc.c,v 1.2 2000/02/18 16:23:11 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/xc/lib/X11/imLcIm.c b/xc/lib/X11/imLcIm.c index 7b978e8fb..bb345d562 100644 --- a/xc/lib/X11/imLcIm.c +++ b/xc/lib/X11/imLcIm.c @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcIm.c,v 1.5 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> /* diff --git a/xc/lib/X11/imLcLkup.c b/xc/lib/X11/imLcLkup.c index 641a03e17..1398e2cc4 100644 --- a/xc/lib/X11/imLcLkup.c +++ b/xc/lib/X11/imLcLkup.c @@ -29,7 +29,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcLkup.c,v 3.2 1999/05/09 10:50:36 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <X11/Xatom.h> diff --git a/xc/lib/X11/imLcPrs.c b/xc/lib/X11/imLcPrs.c index beaebea11..e321026dd 100644 --- a/xc/lib/X11/imLcPrs.c +++ b/xc/lib/X11/imLcPrs.c @@ -30,7 +30,7 @@ OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcPrs.c,v 1.4 1998/10/04 11:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imLcPrs.c,v 1.3 1998/10/03 08:41:35 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/xc/lib/X11/imRm.c b/xc/lib/X11/imRm.c index a00cf4acb..fd988a97c 100644 --- a/xc/lib/X11/imRm.c +++ b/xc/lib/X11/imRm.c @@ -30,7 +30,7 @@ PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imRm.c,v 3.8 2000/01/29 18:58:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imRm.c,v 3.7 1999/05/09 10:50:36 dawes Exp $ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/xc/lib/X11/imRmAttr.c b/xc/lib/X11/imRmAttr.c index ef01c17be..1cd5b0734 100644 --- a/xc/lib/X11/imRmAttr.c +++ b/xc/lib/X11/imRmAttr.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imRmAttr.c,v 1.3 1999/05/09 10:50:37 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/imThaiFlt.c b/xc/lib/X11/imThaiFlt.c index 14bad4db5..af8c2af0c 100644 --- a/xc/lib/X11/imThaiFlt.c +++ b/xc/lib/X11/imThaiFlt.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.3 2000/01/29 18:58:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.2 1999/05/09 10:50:37 dawes Exp $ */ /* **++ diff --git a/xc/lib/X11/imThaiIm.c b/xc/lib/X11/imThaiIm.c index 06ff28fca..c4dc3db75 100644 --- a/xc/lib/X11/imThaiIm.c +++ b/xc/lib/X11/imThaiIm.c @@ -32,7 +32,7 @@ THIS SOFTWARE. frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiIm.c,v 1.3 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/xc/lib/X11/imTransR.c b/xc/lib/X11/imTransR.c index 7f7a94621..4fb3a5849 100644 --- a/xc/lib/X11/imTransR.c +++ b/xc/lib/X11/imTransR.c @@ -28,7 +28,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imTransR.c,v 3.3 1999/05/09 10:50:37 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/jump_funcs b/xc/lib/X11/jump_funcs index afae6fac5..02e1d30c8 100644 --- a/xc/lib/X11/jump_funcs +++ b/xc/lib/X11/jump_funcs @@ -1,5 +1,5 @@ # $TOG: jump_funcs /main/8 1998/06/17 15:34:53 kaleb $ -# $XFree86: xc/lib/X11/jump_funcs,v 3.10 1998/10/03 08:41:36 dawes Exp $ +# $XFree86: xc/lib/X11/jump_funcs,v 3.9 1996/12/30 13:58:21 dawes Exp $ # 00000000 T _XSaveContext libX11 Context 00000000 T _XFindContext libX11 Context diff --git a/xc/lib/X11/jump_ignore b/xc/lib/X11/jump_ignore index f7468065f..bde82c727 100644 --- a/xc/lib/X11/jump_ignore +++ b/xc/lib/X11/jump_ignore @@ -1,5 +1,5 @@ # $XConsortium: jump_ignore,v 1.3 95/06/06 21:20:40 kaleb Exp $ -# $XFree86: xc/lib/X11/jump_ignore,v 3.10 1999/05/30 02:27:59 dawes Exp $ +# $XFree86: xc/lib/X11/jump_ignore,v 3.9 1999/03/14 03:21:05 dawes Exp $ # jump_ignore 00000000 T __XlcAddCT libX11 lcCT 00000000 T __XKeycodeToKeysym libX11 KeyBind diff --git a/xc/lib/X11/jump_vars b/xc/lib/X11/jump_vars index 46f2a9a3a..b042d56be 100644 --- a/xc/lib/X11/jump_vars +++ b/xc/lib/X11/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:48:04 kaleb Exp $ -# $XFree86: xc/lib/X11/jump_vars,v 3.1 1995/01/28 15:42:57 dawes Exp $ +# $XFree86: xc/lib/X11/jump_vars,v 3.0 1994/04/28 12:31:18 dawes Exp $ # 00008000 K __XkeyTable libX11 XStrKeysym 00000100 K __Xevent_to_mask libX11 evtomask diff --git a/xc/lib/X11/lcCT.c b/xc/lib/X11/lcCT.c index 883415e14..1388dc021 100644 --- a/xc/lib/X11/lcCT.c +++ b/xc/lib/X11/lcCT.c @@ -36,7 +36,7 @@ * Modifier: Ivan Pascal The XFree86 Project * Modifier: Bruno Haible The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcCT.c,v 3.17 2000/05/18 16:29:51 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcCT.c,v 3.16 2000/02/25 18:27:54 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcCharSet.c b/xc/lib/X11/lcCharSet.c index 4ee9c3413..5ddbe61eb 100644 --- a/xc/lib/X11/lcCharSet.c +++ b/xc/lib/X11/lcCharSet.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.5 2000/02/29 03:09:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.4 2000/02/12 02:54:09 dawes Exp $ */ #include <stdio.h> #include "Xlibint.h" diff --git a/xc/lib/X11/lcConv.c b/xc/lib/X11/lcConv.c index f824a87b5..688bb7d3b 100644 --- a/xc/lib/X11/lcConv.c +++ b/xc/lib/X11/lcConv.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcConv.c,v 1.3 2000/02/12 02:54:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcConv.c,v 1.2 1999/05/09 10:50:38 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcDB.c b/xc/lib/X11/lcDB.c index c6c7f7fb9..670043267 100644 --- a/xc/lib/X11/lcDB.c +++ b/xc/lib/X11/lcDB.c @@ -28,7 +28,7 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/lcDB.c,v 3.11 2000/01/29 18:58:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcDB.c,v 3.10 1999/05/09 10:50:39 dawes Exp $ */ diff --git a/xc/lib/X11/lcDefConv.c b/xc/lib/X11/lcDefConv.c index cbf7679fd..c4fa22666 100644 --- a/xc/lib/X11/lcDefConv.c +++ b/xc/lib/X11/lcDefConv.c @@ -27,7 +27,7 @@ * 2000 * Modifier: Ivan Pascal The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.4 2000/02/25 18:27:54 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.3 2000/02/12 02:54:10 dawes Exp $ */ /* * The default locale loader. diff --git a/xc/lib/X11/lcDynamic.c b/xc/lib/X11/lcDynamic.c index a5b409c99..51540c2a0 100644 --- a/xc/lib/X11/lcDynamic.c +++ b/xc/lib/X11/lcDynamic.c @@ -28,7 +28,7 @@ from The Open Group. * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.2 2000/02/12 02:54:11 dawes Exp $ */ +/* $XFree86$ */ /* * A dynamically loaded locale. diff --git a/xc/lib/X11/lcEuc.c b/xc/lib/X11/lcEuc.c index 709064bd2..0c2a2e02a 100644 --- a/xc/lib/X11/lcEuc.c +++ b/xc/lib/X11/lcEuc.c @@ -30,7 +30,7 @@ OF THIS SOFTWARE. Yoshiyuki Segawa (segawa@ossi.com) *****************************************************************/ -/* $XFree86: xc/lib/X11/lcEuc.c,v 3.7 2000/02/12 02:54:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcEuc.c,v 3.6 1998/10/03 08:41:38 dawes Exp $ */ /* * An EUC locale. diff --git a/xc/lib/X11/lcFile.c b/xc/lib/X11/lcFile.c index e9f773feb..da9c40bc2 100644 --- a/xc/lib/X11/lcFile.c +++ b/xc/lib/X11/lcFile.c @@ -23,7 +23,7 @@ * SOFTWARE. * */ -/* $XFree86: xc/lib/X11/lcFile.c,v 3.18 2000/01/29 18:58:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcFile.c,v 3.17 1999/05/09 10:50:39 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/X11/lcGenConv.c b/xc/lib/X11/lcGenConv.c index 7cdd6f00b..8c252eca9 100644 --- a/xc/lib/X11/lcGenConv.c +++ b/xc/lib/X11/lcGenConv.c @@ -35,7 +35,7 @@ * 2000 * Modifier: Ivan Pascal The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.15 2000/08/09 23:40:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.14 2000/02/25 18:27:55 dawes Exp $ */ /* * A generic locale loader for all kinds of ISO-2022 based codesets. diff --git a/xc/lib/X11/lcGeneric.c b/xc/lib/X11/lcGeneric.c index 0713adc79..98ba27846 100644 --- a/xc/lib/X11/lcGeneric.c +++ b/xc/lib/X11/lcGeneric.c @@ -28,7 +28,7 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.9 2000/02/25 18:27:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.8 2000/02/08 17:18:45 dawes Exp $ */ #include <stdio.h> #include "Xlibint.h" diff --git a/xc/lib/X11/lcInit.c b/xc/lib/X11/lcInit.c index 932b029b5..89d7199e2 100644 --- a/xc/lib/X11/lcInit.c +++ b/xc/lib/X11/lcInit.c @@ -31,7 +31,7 @@ * Modifier: Masayoshi Shimamura FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/lcInit.c,v 3.5 2000/02/12 02:54:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcInit.c,v 3.4 1997/11/22 12:50:10 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/lcJis.c b/xc/lib/X11/lcJis.c index 6d44996ec..602ea4ca6 100644 --- a/xc/lib/X11/lcJis.c +++ b/xc/lib/X11/lcJis.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcJis.c,v 1.5 2000/02/12 02:54:13 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcJis.c,v 1.4 1998/10/03 08:41:39 dawes Exp $ */ /* * A Japanese JIS locale. diff --git a/xc/lib/X11/lcPrTxt.c b/xc/lib/X11/lcPrTxt.c index effacff51..9161824c4 100644 --- a/xc/lib/X11/lcPrTxt.c +++ b/xc/lib/X11/lcPrTxt.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.3 2000/01/30 18:35:19 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcPubWrap.c b/xc/lib/X11/lcPubWrap.c index 3523c5033..1bb3f3691 100644 --- a/xc/lib/X11/lcPubWrap.c +++ b/xc/lib/X11/lcPubWrap.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.2 1997/11/22 12:50:11 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcPublic.c b/xc/lib/X11/lcPublic.c index 51ba8b2a9..aa210e541 100644 --- a/xc/lib/X11/lcPublic.c +++ b/xc/lib/X11/lcPublic.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPublic.c,v 1.6 2000/02/12 05:43:16 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include "Xlibint.h" diff --git a/xc/lib/X11/lcRM.c b/xc/lib/X11/lcRM.c index 3576c93f9..958128f3b 100644 --- a/xc/lib/X11/lcRM.c +++ b/xc/lib/X11/lcRM.c @@ -24,7 +24,7 @@ * mopi@osa.ilab.toshiba.co.jp * Bug fixes: Bruno Haible XFree86 Inc. */ -/* $XFree86: xc/lib/X11/lcRM.c,v 1.3 2000/02/12 05:43:16 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcSjis.c b/xc/lib/X11/lcSjis.c index 9d0b8a891..3acf27c45 100644 --- a/xc/lib/X11/lcSjis.c +++ b/xc/lib/X11/lcSjis.c @@ -35,7 +35,7 @@ OR PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp *****************************************************************/ -/* $XFree86: xc/lib/X11/lcSjis.c,v 3.6 2000/02/12 02:54:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcSjis.c,v 3.5 1998/10/03 08:41:40 dawes Exp $ */ /* * A Japanese SJIS locale. diff --git a/xc/lib/X11/lcStd.c b/xc/lib/X11/lcStd.c index 7ef3b34f9..11f022dda 100644 --- a/xc/lib/X11/lcStd.c +++ b/xc/lib/X11/lcStd.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcStd.c,v 1.3 1999/05/09 10:50:41 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "XlcPubI.h" diff --git a/xc/lib/X11/lcUTF.c b/xc/lib/X11/lcUTF.c index a900c28ad..7bdbce127 100644 --- a/xc/lib/X11/lcUTF.c +++ b/xc/lib/X11/lcUTF.c @@ -25,7 +25,7 @@ OR PERFORMANCE OF THIS SOFTWARE. Author: Hiromu Inukai (inukai@Japan.Sun.COM) SunSoft, inc. ******************************************************************/ -/* $XFree86: xc/lib/X11/lcUTF.c,v 3.14 2000/02/12 20:45:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcUTF.c,v 3.13 2000/02/12 02:54:14 dawes Exp $ */ /* * An UTF-1 locale loader. diff --git a/xc/lib/X11/lcUTF8.c b/xc/lib/X11/lcUTF8.c index 585593be1..368b94bf5 100644 --- a/xc/lib/X11/lcUTF8.c +++ b/xc/lib/X11/lcUTF8.c @@ -24,7 +24,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.5 2000/06/30 18:27:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.4 2000/06/26 23:00:31 dawes Exp $ */ /* * This file contains: diff --git a/xc/lib/X11/lcUniConv/iso8859_13.h b/xc/lib/X11/lcUniConv/iso8859_13.h index 87edbffd0..db5c12331 100644 --- a/xc/lib/X11/lcUniConv/iso8859_13.h +++ b/xc/lib/X11/lcUniConv/iso8859_13.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/X11/lcUniConv/iso8859_13.h,v 1.1 2000/06/23 19:50:59 dawes Exp $ */ +/* $XFree86$ */ /* * ISO-8859-13 diff --git a/xc/lib/X11/lcUniConv/utf8.h b/xc/lib/X11/lcUniConv/utf8.h index 0e6ad612f..0f120fb4f 100644 --- a/xc/lib/X11/lcUniConv/utf8.h +++ b/xc/lib/X11/lcUniConv/utf8.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.1 2000/06/23 23:13:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/utf8.h,v 1.1 2000/06/23 19:50:59 dawes Exp $ */ /* * UTF-8 diff --git a/xc/lib/X11/lcWrap.c b/xc/lib/X11/lcWrap.c index 00d37bef8..1af730742 100644 --- a/xc/lib/X11/lcWrap.c +++ b/xc/lib/X11/lcWrap.c @@ -49,7 +49,7 @@ from The Open Group. * * Katsuhisa Yano TOSHIBA Corp. */ -/* $XFree86: xc/lib/X11/lcWrap.c,v 3.7 2000/02/12 02:54:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcWrap.c,v 3.6 2000/01/29 18:58:18 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" diff --git a/xc/lib/X11/omGeneric.c b/xc/lib/X11/omGeneric.c index d2caa395f..291a6f0cb 100644 --- a/xc/lib/X11/omGeneric.c +++ b/xc/lib/X11/omGeneric.c @@ -1031,6 +1031,16 @@ parse_fontdata(oc, font_set, font_data, font_data_count, name_list, name_list_co found_num++; is_found = True; + /* We almost certainly should have 'break' here and should ignore + * the rest of the patterns. The problem is that we'll overwrite + * font_data->font and font_data->xlfd_name with later matches. + * But the general expectation would be that font_data->xlfd_name + * would correspond to to the returned value. (It's not clear + * why this routine modifies font_data and has a + * font_data_return...) + * + * Owen Taylor <otaylor@redhat.com> 12 Jul 2000 + */ } switch(class) { diff --git a/xc/lib/X11/omText.c b/xc/lib/X11/omText.c index cf75fa768..412746347 100644 --- a/xc/lib/X11/omText.c +++ b/xc/lib/X11/omText.c @@ -23,7 +23,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omText.c,v 1.2 1999/05/09 10:50:42 dawes Exp $ */ +/* $XFree86$ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint diff --git a/xc/lib/X11/omTextEsc.c b/xc/lib/X11/omTextEsc.c index fb2ca5eeb..6aa71281f 100644 --- a/xc/lib/X11/omTextEsc.c +++ b/xc/lib/X11/omTextEsc.c @@ -151,10 +151,29 @@ TextWidthWithFontSet(font_set, oc, text, length) is_xchar2b, FONTSCOPE); if(ptr_len <= 0) break; + + /* + * First, see if the "Best Match" font for the FontSet was set. + * If it was, use that font. If it was not set, then use the + * font defined by font_set->font_data[0] (which is what + * _XomGetFontDataFromFontSet() always seems to return for + * non-VW text). Note that given the new algorithm in + * parse_fontname() and parse_fontdata(), fs->font will + * *always* contain good data. We should probably remove + * the check for "fd->font", but we won't :-) -- jjw/pma (HP) + * + * Above comment and way this is done propagated from omText.c + * Note that fd->font is junk so using the result of the + * above call /needs/ to be ignored. + * + * Owen Taylor <otaylor@redhat.com> 12 Jul 2000 + * + */ + if(fd == (FontData) NULL || - (font = fd->font) == (XFontStruct *) NULL) { + (font = font_set->font) == (XFontStruct *) NULL) { - if((font = font_set->font) == (XFontStruct *) NULL) + if((font = fd->font) == (XFontStruct *) NULL) break; } diff --git a/xc/lib/X11/os2Stubs.c b/xc/lib/X11/os2Stubs.c index 493727e60..af41f2aa3 100644 --- a/xc/lib/X11/os2Stubs.c +++ b/xc/lib/X11/os2Stubs.c @@ -28,7 +28,7 @@ * */ -/* $XFree86: xc/lib/X11/os2Stubs.c,v 3.0 1996/05/13 06:37:17 dawes Exp $ */ +/* $XFree86$ */ /* A few OS/2 functions needed in the X11 lib. Mainly, the file path redirection * functions and the "optimized" select() for the clients */ diff --git a/xc/lib/X11/udcInf.c b/xc/lib/X11/udcInf.c index 2f3c23c1b..b875b2bf3 100644 --- a/xc/lib/X11/udcInf.c +++ b/xc/lib/X11/udcInf.c @@ -29,7 +29,7 @@ from The Open Group. * */ -/* $XFree86: xc/lib/X11/udcInf.c,v 1.4 1998/10/03 08:41:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/udcInf.c,v 1.3 1998/08/20 08:55:51 dawes Exp $ */ #include <stdio.h> #include <locale.h> diff --git a/xc/lib/X11/util/makekeys.c b/xc/lib/X11/util/makekeys.c index 82a8449e1..61cdcf25f 100644 --- a/xc/lib/X11/util/makekeys.c +++ b/xc/lib/X11/util/makekeys.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.4 1998/10/05 13:22:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.3 1998/10/03 08:41:55 dawes Exp $ */ /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ diff --git a/xc/lib/X11/uvY.c b/xc/lib/X11/uvY.c index 082afd7a0..27ff33b11 100644 --- a/xc/lib/X11/uvY.c +++ b/xc/lib/X11/uvY.c @@ -35,7 +35,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/uvY.c,v 1.2 1999/05/09 10:50:43 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include "Xlibint.h" diff --git a/xc/lib/X11/xyY.c b/xc/lib/X11/xyY.c index 57df63861..737198930 100644 --- a/xc/lib/X11/xyY.c +++ b/xc/lib/X11/xyY.c @@ -34,7 +34,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/xyY.c,v 1.2 1999/05/09 10:50:43 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/xc/lib/XIE/Imakefile b/xc/lib/XIE/Imakefile index 09c9e9edc..a4ece495a 100644 --- a/xc/lib/XIE/Imakefile +++ b/xc/lib/XIE/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/28 16:43:07 rws $ -XCOMM $XFree86: xc/lib/XIE/Imakefile,v 1.2 1998/12/20 11:56:58 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXie #define DoSharedLib SharedLibXie diff --git a/xc/lib/XIE/XIElibint.h b/xc/lib/XIE/XIElibint.h index 0e23c69f6..c3c7508fc 100644 --- a/xc/lib/XIE/XIElibint.h +++ b/xc/lib/XIE/XIElibint.h @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/XIElibint.h,v 3.3 1999/06/13 16:18:06 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIELIBINT_H_ #define _XIELIBINT_H_ diff --git a/xc/lib/XIE/XIEos2.def b/xc/lib/XIE/XIEos2.def index 8d09e930e..4d57aaa45 100644 --- a/xc/lib/XIE/XIEos2.def +++ b/xc/lib/XIE/XIEos2.def @@ -1,5 +1,5 @@ LIBRARY XIE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/XIE/XIEos2.def,v 3.6 1999/04/29 09:13:29 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/XIE/abort.c b/xc/lib/XIE/abort.c index e1e30d0a4..13b423cdd 100644 --- a/xc/lib/XIE/abort.c +++ b/xc/lib/XIE/abort.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/abort.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/await.c b/xc/lib/XIE/await.c index c451fe475..788c4f2d8 100644 --- a/xc/lib/XIE/await.c +++ b/xc/lib/XIE/await.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/await.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/clientdata.c b/xc/lib/XIE/clientdata.c index 2505c45f5..39836e9dd 100644 --- a/xc/lib/XIE/clientdata.c +++ b/xc/lib/XIE/clientdata.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/clientdata.c,v 1.3 1999/06/13 16:18:07 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/colorlist.c b/xc/lib/XIE/colorlist.c index 4381f6869..cf3a7dcaa 100644 --- a/xc/lib/XIE/colorlist.c +++ b/xc/lib/XIE/colorlist.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/colorlist.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/conven.c b/xc/lib/XIE/conven.c index 4f1886aa9..f265aa350 100644 --- a/xc/lib/XIE/conven.c +++ b/xc/lib/XIE/conven.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/conven.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/elements.c b/xc/lib/XIE/elements.c index c1f144f85..53f1698e5 100644 --- a/xc/lib/XIE/elements.c +++ b/xc/lib/XIE/elements.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/elements.c,v 1.3 1999/06/13 16:18:08 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" #include "elements.h" diff --git a/xc/lib/XIE/errors.c b/xc/lib/XIE/errors.c index fdd92837b..b50d11731 100644 --- a/xc/lib/XIE/errors.c +++ b/xc/lib/XIE/errors.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/errors.c,v 3.3 1999/06/13 16:18:09 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS /* so XErrorEvent will get pulled in */ diff --git a/xc/lib/XIE/events.c b/xc/lib/XIE/events.c index 0c27b1113..7d654f48e 100644 --- a/xc/lib/XIE/events.c +++ b/xc/lib/XIE/events.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/events.c,v 1.3 1999/06/13 16:18:09 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS /* so xEvent will get pulled in */ #include "XIElibint.h" diff --git a/xc/lib/XIE/free.c b/xc/lib/XIE/free.c index 4734f7d9d..7454e08c5 100644 --- a/xc/lib/XIE/free.c +++ b/xc/lib/XIE/free.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/free.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/globals.h b/xc/lib/XIE/globals.h index 58c399ad2..ecaa6d900 100644 --- a/xc/lib/XIE/globals.h +++ b/xc/lib/XIE/globals.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/globals.h,v 1.3 1999/06/13 13:47:01 dawes Exp $ */ +/* $XFree86: xc/lib/XIE/globals.h,v 1.2 1998/12/20 11:56:59 dawes Exp $ */ extern void _XieElemImportClientLUT (char **, XiePhotoElement *); extern void _XieElemImportClientPhoto (char **, XiePhotoElement *); diff --git a/xc/lib/XIE/ieee.c b/xc/lib/XIE/ieee.c index 1533e9365..f590fd66a 100644 --- a/xc/lib/XIE/ieee.c +++ b/xc/lib/XIE/ieee.c @@ -64,7 +64,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/ieee.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" #include <math.h> diff --git a/xc/lib/XIE/init.c b/xc/lib/XIE/init.c index 1760e82c2..b3c0b769d 100644 --- a/xc/lib/XIE/init.c +++ b/xc/lib/XIE/init.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/init.c,v 3.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS /* so XErrorEvent will get pulled in */ diff --git a/xc/lib/XIE/jump_funcs b/xc/lib/XIE/jump_funcs index e590f57c2..056cce33c 100644 --- a/xc/lib/XIE/jump_funcs +++ b/xc/lib/XIE/jump_funcs @@ -1,5 +1,5 @@ # $XConsortium: jump_funcs,v 1.2 94/12/07 10:44:37 kaleb Exp $ -# $XFree86: xc/lib/XIE/jump_funcs,v 3.1 1995/01/28 15:43:09 dawes Exp $ +# $XFree86: xc/lib/XIE/jump_funcs,v 3.0 1994/04/28 12:31:33 dawes Exp $ 00000000 T _XieAbort libXIE abort 00000000 T _XieAwait libXIE await 00000000 T _XiePutClientData libXIE clientdata diff --git a/xc/lib/XIE/jump_ignore b/xc/lib/XIE/jump_ignore index 939a888dc..1eec3d3b5 100644 --- a/xc/lib/XIE/jump_ignore +++ b/xc/lib/XIE/jump_ignore @@ -1,3 +1,3 @@ # $XConsortium: jump_ignore,v 1.2 94/12/07 10:44:37 kaleb Exp $ -# $XFree86: xc/lib/XIE/jump_ignore,v 3.1 1995/01/28 15:43:12 dawes Exp $ +# $XFree86: xc/lib/XIE/jump_ignore,v 3.0 1994/04/28 12:31:35 dawes Exp $ # jump_ignore diff --git a/xc/lib/XIE/jump_vars b/xc/lib/XIE/jump_vars index 481d2e3f4..5ea35a143 100644 --- a/xc/lib/XIE/jump_vars +++ b/xc/lib/XIE/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:44:37 kaleb Exp $ -# $XFree86: xc/lib/XIE/jump_vars,v 3.1 1995/01/28 15:43:13 dawes Exp $ +# $XFree86: xc/lib/XIE/jump_vars,v 3.0 1994/04/28 12:31:38 dawes Exp $ 00000004 D __XieExtInfoHeader libXIE init 000000b4 D __XieElemFuncs libXIE init 00000004 D __XieTechFuncsInitialized libXIE init diff --git a/xc/lib/XIE/lut.c b/xc/lib/XIE/lut.c index bcfa46cb8..61e04aa7e 100644 --- a/xc/lib/XIE/lut.c +++ b/xc/lib/XIE/lut.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/lut.c,v 1.3 1999/06/13 16:18:10 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/photoflo.c b/xc/lib/XIE/photoflo.c index 43ef91681..c587f56a4 100644 --- a/xc/lib/XIE/photoflo.c +++ b/xc/lib/XIE/photoflo.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/photoflo.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/photomap.c b/xc/lib/XIE/photomap.c index 3ad31dcaa..d513ad4fa 100644 --- a/xc/lib/XIE/photomap.c +++ b/xc/lib/XIE/photomap.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/photomap.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/photospace.c b/xc/lib/XIE/photospace.c index ff57e5f9e..b28fc6f85 100644 --- a/xc/lib/XIE/photospace.c +++ b/xc/lib/XIE/photospace.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/photospace.c,v 1.3 1999/06/13 16:18:11 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/roi.c b/xc/lib/XIE/roi.c index 82b9869a9..07455f8c8 100644 --- a/xc/lib/XIE/roi.c +++ b/xc/lib/XIE/roi.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/roi.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XIE/technique.c b/xc/lib/XIE/technique.c index b4c72c7a0..7d8f36c58 100644 --- a/xc/lib/XIE/technique.c +++ b/xc/lib/XIE/technique.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/technique.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" #include "technique.h" diff --git a/xc/lib/XIE/utils.c b/xc/lib/XIE/utils.c index dfd24be10..eb40c7fc9 100644 --- a/xc/lib/XIE/utils.c +++ b/xc/lib/XIE/utils.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/XIE/utils.c,v 1.3 1999/06/13 16:18:12 dawes Exp $ */ +/* $XFree86$ */ #include "XIElibint.h" diff --git a/xc/lib/XThrStub/Imakefile b/xc/lib/XThrStub/Imakefile index 1652e4605..ac5542389 100644 --- a/xc/lib/XThrStub/Imakefile +++ b/xc/lib/XThrStub/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/XThrStub/Imakefile,v 3.2 1998/12/20 11:57:00 dawes Exp $ +XCOMM $XFree86: xc/lib/XThrStub/Imakefile,v 3.1 1996/12/12 09:13:41 dawes Exp $ #define DoNormalLib NormalLibXThrStub #define DoSharedLib SharedLibXThrStub #define DoExtraLib SharedLibXThrStub diff --git a/xc/lib/XThrStub/UIThrStubs.c b/xc/lib/XThrStub/UIThrStubs.c index 6c764d2b5..cbf767f94 100644 --- a/xc/lib/XThrStub/UIThrStubs.c +++ b/xc/lib/XThrStub/UIThrStubs.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.1 2000/02/29 03:09:06 dawes Exp $ + * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.0 1995/11/02 00:27:07 dawes Exp $ * * Copyright (c) 1995 David E. Wexelblat. All rights reserved * diff --git a/xc/lib/Xau/AuDispose.c b/xc/lib/Xau/AuDispose.c index fa2afa99c..4f4974293 100644 --- a/xc/lib/Xau/AuDispose.c +++ b/xc/lib/Xau/AuDispose.c @@ -21,7 +21,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/lib/Xau/AuDispose.c,v 1.2 1999/03/14 03:21:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.0tsi Exp $ */ #include <X11/Xauth.h> diff --git a/xc/lib/Xau/AuFileName.c b/xc/lib/Xau/AuFileName.c index 26e86da6d..2ba550f5c 100644 --- a/xc/lib/Xau/AuFileName.c +++ b/xc/lib/Xau/AuFileName.c @@ -21,7 +21,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/lib/Xau/AuFileName.c,v 3.4 1999/05/09 10:51:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.3 1998/10/03 08:41:58 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/xc/lib/Xau/AuGetAddr.c b/xc/lib/Xau/AuGetAddr.c index 1dd8d610b..ad57cf43d 100644 --- a/xc/lib/Xau/AuGetAddr.c +++ b/xc/lib/Xau/AuGetAddr.c @@ -21,7 +21,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/lib/Xau/AuGetAddr.c,v 1.3 2000/06/14 00:16:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/xc/lib/Xau/AuGetBest.c b/xc/lib/Xau/AuGetBest.c index 8ab89a47b..b1ab48ec5 100644 --- a/xc/lib/Xau/AuGetBest.c +++ b/xc/lib/Xau/AuGetBest.c @@ -21,7 +21,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/lib/Xau/AuGetBest.c,v 1.3 2000/06/14 00:16:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.2 1999/05/09 10:51:33 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/xc/lib/Xau/AuLock.c b/xc/lib/Xau/AuLock.c index 8586e87f4..3ca6a0cac 100644 --- a/xc/lib/Xau/AuLock.c +++ b/xc/lib/Xau/AuLock.c @@ -21,7 +21,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/lib/Xau/AuLock.c,v 3.2 2000/02/14 17:43:40 robin Exp $ */ +/* $XFree86: xc/lib/Xau/AuLock.c,v 3.1 1998/10/03 08:41:58 dawes Exp $ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/xc/lib/Xau/AuRead.c b/xc/lib/Xau/AuRead.c index 7e5e8dfea..f4bf37b7b 100644 --- a/xc/lib/Xau/AuRead.c +++ b/xc/lib/Xau/AuRead.c @@ -21,7 +21,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/lib/Xau/AuRead.c,v 1.3 1999/05/09 10:51:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuRead.c,v 1.2 1999/03/14 03:21:06 dawes Exp $ */ #include <X11/Xauth.h> diff --git a/xc/lib/Xau/AuUnlock.c b/xc/lib/Xau/AuUnlock.c index 00ff9108b..0d48b6430 100644 --- a/xc/lib/Xau/AuUnlock.c +++ b/xc/lib/Xau/AuUnlock.c @@ -21,7 +21,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/lib/Xau/AuUnlock.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xauth.h> #include <X11/Xos.h> diff --git a/xc/lib/Xau/AuWrite.c b/xc/lib/Xau/AuWrite.c index f02008415..8647e5726 100644 --- a/xc/lib/Xau/AuWrite.c +++ b/xc/lib/Xau/AuWrite.c @@ -21,7 +21,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/lib/Xau/AuWrite.c,v 1.2 1999/05/09 10:51:34 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xauth.h> diff --git a/xc/lib/Xau/Imakefile b/xc/lib/Xau/Imakefile index a94ff94fc..d7a510a01 100644 --- a/xc/lib/Xau/Imakefile +++ b/xc/lib/Xau/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/27 1996/09/28 16:43:28 rws $ -XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $ +XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.4 1998/12/20 11:57:01 dawes Exp $ #define DoNormalLib NormalLibXau #define DoSharedLib SharedLibXau #define DoExtraLib SharedLibXau diff --git a/xc/lib/Xau/Xauth.h b/xc/lib/Xau/Xauth.h index c20860f08..4af99a7f1 100644 --- a/xc/lib/Xau/Xauth.h +++ b/xc/lib/Xau/Xauth.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.3 1998/10/11 11:23:43 dawes Exp $ */ +/* $XFree86$ */ #ifndef _Xauth_h #define _Xauth_h diff --git a/xc/lib/Xaw/Actions.c b/xc/lib/Xaw/Actions.c index 92c4966eb..0891d897b 100644 --- a/xc/lib/Xaw/Actions.c +++ b/xc/lib/Xaw/Actions.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Actions.c,v 3.14 1999/06/06 08:47:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Actions.c,v 3.13 1999/03/14 03:21:09 dawes Exp $ */ #include <ctype.h> #include <stdio.h> diff --git a/xc/lib/Xaw/AsciiSink.c b/xc/lib/Xaw/AsciiSink.c index deb298b67..0072e6777 100644 --- a/xc/lib/Xaw/AsciiSink.c +++ b/xc/lib/Xaw/AsciiSink.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.21 1999/09/27 06:29:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.20 1999/08/28 09:00:25 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/AsciiSink.h b/xc/lib/Xaw/AsciiSink.h index a25282063..7ac6ae7a1 100644 --- a/xc/lib/Xaw/AsciiSink.h +++ b/xc/lib/Xaw/AsciiSink.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.4 1998/10/03 08:41:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.3 1998/08/20 13:58:54 dawes Exp $ */ #ifndef _XawAsciiSink_h #define _XawAsciiSink_h diff --git a/xc/lib/Xaw/AsciiSinkP.h b/xc/lib/Xaw/AsciiSinkP.h index 7bb45bd73..ac89ea56b 100644 --- a/xc/lib/Xaw/AsciiSinkP.h +++ b/xc/lib/Xaw/AsciiSinkP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.8 1999/06/20 08:40:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.7 1999/06/06 08:47:51 dawes Exp $ */ #ifndef _XawAsciiSinkP_h #define _XawAsciiSinkP_h diff --git a/xc/lib/Xaw/AsciiSrc.c b/xc/lib/Xaw/AsciiSrc.c index 9d8f30d91..d97c4ef82 100644 --- a/xc/lib/Xaw/AsciiSrc.c +++ b/xc/lib/Xaw/AsciiSrc.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.24 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.23 1999/09/27 06:29:10 dawes Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). diff --git a/xc/lib/Xaw/AsciiSrc.h b/xc/lib/Xaw/AsciiSrc.h index e4d11e60f..bcc244d62 100644 --- a/xc/lib/Xaw/AsciiSrc.h +++ b/xc/lib/Xaw/AsciiSrc.h @@ -21,7 +21,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/lib/Xaw/AsciiSrc.h,v 1.6 1999/05/09 10:51:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.5 1998/10/03 08:42:00 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/AsciiSrcP.h b/xc/lib/Xaw/AsciiSrcP.h index 4513eb4b5..16b61ff45 100644 --- a/xc/lib/Xaw/AsciiSrcP.h +++ b/xc/lib/Xaw/AsciiSrcP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.6 1999/06/06 08:47:52 dawes Exp $ */ /* * AsciiSrcP.h - Private Header for Ascii Text Source. diff --git a/xc/lib/Xaw/AsciiText.c b/xc/lib/Xaw/AsciiText.c index f4d6d52bb..bda9b966e 100644 --- a/xc/lib/Xaw/AsciiText.c +++ b/xc/lib/Xaw/AsciiText.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.8 1999/06/13 13:47:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.7 1999/06/06 08:47:52 dawes Exp $ */ /* * AsciiText.c - Source code for AsciiText Widget diff --git a/xc/lib/Xaw/AsciiText.h b/xc/lib/Xaw/AsciiText.h index 3772b0f10..5c5b542c5 100644 --- a/xc/lib/Xaw/AsciiText.h +++ b/xc/lib/Xaw/AsciiText.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.4 1998/10/03 08:42:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.3 1998/08/20 13:58:55 dawes Exp $ */ /* * AsciiText.h - Public header file for AsciiText Widget diff --git a/xc/lib/Xaw/AsciiTextP.h b/xc/lib/Xaw/AsciiTextP.h index 806dfe640..09c675fcd 100644 --- a/xc/lib/Xaw/AsciiTextP.h +++ b/xc/lib/Xaw/AsciiTextP.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.7 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.6 1999/06/13 13:47:15 dawes Exp $ */ /* * AsciiText.c - Private header file for AsciiText Widget. diff --git a/xc/lib/Xaw/Box.c b/xc/lib/Xaw/Box.c index 1ff4c1734..24587babc 100644 --- a/xc/lib/Xaw/Box.c +++ b/xc/lib/Xaw/Box.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.13 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.c,v 1.12 1999/05/09 10:51:36 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Box.h b/xc/lib/Xaw/Box.h index baaf140c6..03488bee9 100644 --- a/xc/lib/Xaw/Box.h +++ b/xc/lib/Xaw/Box.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.h,v 1.6 1999/06/06 08:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.h,v 1.5 1998/10/03 08:42:02 dawes Exp $ */ #ifndef _XawBox_h #define _XawBox_h diff --git a/xc/lib/Xaw/BoxP.h b/xc/lib/Xaw/BoxP.h index 479b71237..58ef57ac0 100644 --- a/xc/lib/Xaw/BoxP.h +++ b/xc/lib/Xaw/BoxP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.9 1999/06/20 08:40:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.8 1999/06/06 08:47:53 dawes Exp $ */ #ifndef _XawBoxP_h #define _XawBoxP_h diff --git a/xc/lib/Xaw/Changelog b/xc/lib/Xaw/Changelog index 5a1d67408..178176194 100644 --- a/xc/lib/Xaw/Changelog +++ b/xc/lib/Xaw/Changelog @@ -1367,4 +1367,4 @@ xedit.c: -$XFree86: xc/lib/Xaw/Changelog,v 3.32 1999/08/28 09:00:26 dawes Exp $ +$XFree86: xc/lib/Xaw/Changelog,v 3.31 1999/08/15 13:00:31 dawes Exp $ diff --git a/xc/lib/Xaw/Command.c b/xc/lib/Xaw/Command.c index c29d1e89f..d11d2051b 100644 --- a/xc/lib/Xaw/Command.c +++ b/xc/lib/Xaw/Command.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.11 1999/06/13 13:47:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.10 1999/06/06 08:47:54 dawes Exp $ */ /* * Command.c - Command button widget diff --git a/xc/lib/Xaw/Command.h b/xc/lib/Xaw/Command.h index 38d417914..9d084df2c 100644 --- a/xc/lib/Xaw/Command.h +++ b/xc/lib/Xaw/Command.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.h,v 1.4 1998/10/03 08:42:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.h,v 1.3 1998/08/20 13:58:57 dawes Exp $ */ #ifndef _XawCommand_h #define _XawCommand_h diff --git a/xc/lib/Xaw/CommandP.h b/xc/lib/Xaw/CommandP.h index 516b86146..df367bf8a 100644 --- a/xc/lib/Xaw/CommandP.h +++ b/xc/lib/Xaw/CommandP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.6 1999/06/20 08:40:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.5 1999/06/06 08:47:54 dawes Exp $ */ #ifndef _XawCommandP_h #define _XawCommandP_h diff --git a/xc/lib/Xaw/Converters.c b/xc/lib/Xaw/Converters.c index 99ea5aa94..11a9aab81 100644 --- a/xc/lib/Xaw/Converters.c +++ b/xc/lib/Xaw/Converters.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Converters.c,v 3.14 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Converters.c,v 3.13 1999/06/06 08:47:54 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/Dialog.c b/xc/lib/Xaw/Dialog.c index aabd161bd..d719b88e7 100644 --- a/xc/lib/Xaw/Dialog.c +++ b/xc/lib/Xaw/Dialog.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.6 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.5 1999/06/06 08:47:55 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Dialog.h b/xc/lib/Xaw/Dialog.h index 4a5863b86..78a9bad21 100644 --- a/xc/lib/Xaw/Dialog.h +++ b/xc/lib/Xaw/Dialog.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.4 1998/10/03 08:42:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.3 1998/08/20 13:58:58 dawes Exp $ */ #ifndef _XawDialog_h #define _XawDialog_h diff --git a/xc/lib/Xaw/DialogP.h b/xc/lib/Xaw/DialogP.h index 3e4054ba0..60cce86e7 100644 --- a/xc/lib/Xaw/DialogP.h +++ b/xc/lib/Xaw/DialogP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.7 1999/06/20 08:40:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.6 1999/06/06 08:47:55 dawes Exp $ */ #ifndef _DialogP_h #define _DialogP_h diff --git a/xc/lib/Xaw/DisplayList.c b/xc/lib/Xaw/DisplayList.c index e791de74f..69cb32106 100644 --- a/xc/lib/Xaw/DisplayList.c +++ b/xc/lib/Xaw/DisplayList.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.15 1999/08/28 09:00:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DisplayList.c,v 3.14 1999/06/20 08:40:59 dawes Exp $ */ #include <ctype.h> #include <string.h> diff --git a/xc/lib/Xaw/Form.c b/xc/lib/Xaw/Form.c index d94f28669..76b51f32d 100644 --- a/xc/lib/Xaw/Form.c +++ b/xc/lib/Xaw/Form.c @@ -1099,7 +1099,7 @@ XawFormDoLayout(Widget w, Widget nw = *childP; if (XtIsManaged(nw)) { - FormConstraints form = (FormConstraints)w->core.constraints; + FormConstraints form = (FormConstraints)nw->core.constraints; /* * Xt Configure widget is too smart, and optimizes out diff --git a/xc/lib/Xaw/Form.h b/xc/lib/Xaw/Form.h index 56dfbb30e..30c4464b7 100644 --- a/xc/lib/Xaw/Form.h +++ b/xc/lib/Xaw/Form.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.h,v 1.7 1999/06/06 08:47:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.h,v 1.6 1999/05/03 12:15:39 dawes Exp $ */ #ifndef _XawForm_h #define _XawForm_h diff --git a/xc/lib/Xaw/FormP.h b/xc/lib/Xaw/FormP.h index 8134ce5c1..6ec8b4d1c 100644 --- a/xc/lib/Xaw/FormP.h +++ b/xc/lib/Xaw/FormP.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/FormP.h,v 1.11 1999/06/20 08:41:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/FormP.h,v 1.10 1999/06/13 13:47:19 dawes Exp $ */ /* Form widget private definitions */ diff --git a/xc/lib/Xaw/Grip.c b/xc/lib/Xaw/Grip.c index c8ac68c3d..f106cd075 100644 --- a/xc/lib/Xaw/Grip.c +++ b/xc/lib/Xaw/Grip.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.6 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.c,v 1.5 1998/10/03 08:42:05 dawes Exp $ */ /* * Grip.c - Grip Widget (Used by Paned Widget) diff --git a/xc/lib/Xaw/Grip.h b/xc/lib/Xaw/Grip.h index fe861ac7d..61d713e7b 100644 --- a/xc/lib/Xaw/Grip.h +++ b/xc/lib/Xaw/Grip.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.h,v 1.5 1999/06/06 08:47:57 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.h,v 1.4 1998/10/03 08:42:05 dawes Exp $ */ /* * Grip.h - Public Definitions for Grip widget (used by VPane Widget) diff --git a/xc/lib/Xaw/GripP.h b/xc/lib/Xaw/GripP.h index ac2d82c27..5f7e38b71 100644 --- a/xc/lib/Xaw/GripP.h +++ b/xc/lib/Xaw/GripP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/GripP.h,v 1.6 1999/06/20 08:41:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/GripP.h,v 1.5 1999/06/06 08:47:57 dawes Exp $ */ #ifndef _XawGripP_h #define _XawGripP_h diff --git a/xc/lib/Xaw/Imakefile b/xc/lib/Xaw/Imakefile index 73df2c7cb..79377f73a 100644 --- a/xc/lib/Xaw/Imakefile +++ b/xc/lib/Xaw/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/87 1996/09/28 16:43:34 rws $ -XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.9 2000/05/18 16:29:52 dawes Exp $ +XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.8 1999/06/27 14:07:33 dawes Exp $ #define DoNormalLib NormalLibXaw #define DoSharedLib SharedLibXaw #define DoExtraLib SharedLibXaw diff --git a/xc/lib/Xaw/Label.c b/xc/lib/Xaw/Label.c index b62fa46ad..54fdfa93d 100644 --- a/xc/lib/Xaw/Label.c +++ b/xc/lib/Xaw/Label.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.11 1999/06/27 14:07:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.10 1999/06/06 08:47:58 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/Xaw/Label.h b/xc/lib/Xaw/Label.h index 649d39b9a..5ff79dfd4 100644 --- a/xc/lib/Xaw/Label.h +++ b/xc/lib/Xaw/Label.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.h,v 1.5 1998/10/03 08:42:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.h,v 1.4 1998/08/20 13:59:00 dawes Exp $ */ #ifndef _XawLabel_h #define _XawLabel_h diff --git a/xc/lib/Xaw/LabelP.h b/xc/lib/Xaw/LabelP.h index 55b20ac6f..c95a7bb44 100644 --- a/xc/lib/Xaw/LabelP.h +++ b/xc/lib/Xaw/LabelP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.5 1999/06/06 08:47:58 dawes Exp $ */ #ifndef _XawLabelP_h #define _XawLabelP_h diff --git a/xc/lib/Xaw/List.c b/xc/lib/Xaw/List.c index 41876abff..65bca9387 100644 --- a/xc/lib/Xaw/List.c +++ b/xc/lib/Xaw/List.c @@ -19,7 +19,7 @@ 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/lib/Xaw/List.c,v 1.15 2000/04/04 22:36:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.c,v 1.14 2000/02/25 23:20:46 dawes Exp $ */ /* * List.c - List widget diff --git a/xc/lib/Xaw/List.h b/xc/lib/Xaw/List.h index 3c695a18e..89b32cb2d 100644 --- a/xc/lib/Xaw/List.h +++ b/xc/lib/Xaw/List.h @@ -19,7 +19,7 @@ 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/lib/Xaw/List.h,v 1.6 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/List.h,v 1.5 1999/05/03 12:15:40 dawes Exp $ */ /* This is the List widget, it is useful to display a list, without the * overhead of having a widget for each item in the list. It allows diff --git a/xc/lib/Xaw/ListP.h b/xc/lib/Xaw/ListP.h index ad68726ac..f4d510b74 100644 --- a/xc/lib/Xaw/ListP.h +++ b/xc/lib/Xaw/ListP.h @@ -19,7 +19,7 @@ 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/lib/Xaw/ListP.h,v 1.7 2000/02/25 18:27:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ListP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/MenuButtoP.h b/xc/lib/Xaw/MenuButtoP.h index 7110fa0c9..9fc41eb15 100644 --- a/xc/lib/Xaw/MenuButtoP.h +++ b/xc/lib/Xaw/MenuButtoP.h @@ -18,7 +18,7 @@ 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/lib/Xaw/MenuButtoP.h,v 1.6 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.5 1999/06/06 08:47:59 dawes Exp $ */ /* * MenuButtonP.h - Private Header file for MenuButton widget. diff --git a/xc/lib/Xaw/MenuButton.c b/xc/lib/Xaw/MenuButton.c index 361667333..e1cd715ff 100644 --- a/xc/lib/Xaw/MenuButton.c +++ b/xc/lib/Xaw/MenuButton.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.7 1999/06/06 08:47:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.6 1998/10/03 08:42:08 dawes Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. diff --git a/xc/lib/Xaw/MenuButton.h b/xc/lib/Xaw/MenuButton.h index b7ff60cef..8cebfc1d0 100644 --- a/xc/lib/Xaw/MenuButton.h +++ b/xc/lib/Xaw/MenuButton.h @@ -19,7 +19,7 @@ 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/lib/Xaw/MenuButton.h,v 1.4 1998/10/03 08:42:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.3 1998/08/20 13:59:02 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xaw/MultiSink.c b/xc/lib/Xaw/MultiSink.c index 90e7bb959..48b1e7b17 100644 --- a/xc/lib/Xaw/MultiSink.c +++ b/xc/lib/Xaw/MultiSink.c @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.17 1999/06/13 13:47:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.16 1999/06/06 08:48:00 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/MultiSink.h b/xc/lib/Xaw/MultiSink.h index 679329fde..337ad6730 100644 --- a/xc/lib/Xaw/MultiSink.h +++ b/xc/lib/Xaw/MultiSink.h @@ -66,7 +66,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.4 1998/10/03 08:42:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.3 1998/08/20 13:59:03 dawes Exp $ */ #ifndef _XawMultiSink_h #define _XawMultiSink_h diff --git a/xc/lib/Xaw/MultiSinkP.h b/xc/lib/Xaw/MultiSinkP.h index 436aeccf4..cd7f22a8b 100644 --- a/xc/lib/Xaw/MultiSinkP.h +++ b/xc/lib/Xaw/MultiSinkP.h @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.7 1999/06/20 08:41:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.6 1999/06/06 08:48:00 dawes Exp $ */ #ifndef _XawMultiSinkP_h #define _XawMultiSinkP_h diff --git a/xc/lib/Xaw/MultiSrc.c b/xc/lib/Xaw/MultiSrc.c index b917e671c..2f32049e6 100644 --- a/xc/lib/Xaw/MultiSrc.c +++ b/xc/lib/Xaw/MultiSrc.c @@ -27,7 +27,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19 1999/07/19 13:36:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.18 1999/06/20 08:41:03 dawes Exp $ */ /* diff --git a/xc/lib/Xaw/MultiSrc.h b/xc/lib/Xaw/MultiSrc.h index 586c06d50..d4161cae0 100644 --- a/xc/lib/Xaw/MultiSrc.h +++ b/xc/lib/Xaw/MultiSrc.h @@ -45,7 +45,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/lib/Xaw/MultiSrc.h,v 1.5 1999/05/09 10:51:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.4 1998/10/03 08:42:12 dawes Exp $ */ /* * This file was modified from AsciiSrc.h. diff --git a/xc/lib/Xaw/MultiSrcP.h b/xc/lib/Xaw/MultiSrcP.h index 71e58c0bb..3ed461773 100644 --- a/xc/lib/Xaw/MultiSrcP.h +++ b/xc/lib/Xaw/MultiSrcP.h @@ -67,7 +67,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.7 1999/06/20 08:41:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.6 1999/06/06 08:48:01 dawes Exp $ */ /* * MultiSrcP.h - Private Header for Multi Text Source. diff --git a/xc/lib/Xaw/OS.c b/xc/lib/Xaw/OS.c index e91f36d0d..628372d46 100644 --- a/xc/lib/Xaw/OS.c +++ b/xc/lib/Xaw/OS.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xaw/OS.c,v 1.2 1998/12/06 11:24:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/OS.c,v 1.1 1998/12/06 10:44:34 dawes Exp $ */ /* Some OS-dependent utility code */ diff --git a/xc/lib/Xaw/Paned.c b/xc/lib/Xaw/Paned.c index 6fb6bb52b..192e978fc 100644 --- a/xc/lib/Xaw/Paned.c +++ b/xc/lib/Xaw/Paned.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.9 1999/06/06 08:48:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.8 1999/05/03 12:15:41 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/xc/lib/Xaw/Paned.h b/xc/lib/Xaw/Paned.h index aa6763b5e..47b702731 100644 --- a/xc/lib/Xaw/Paned.h +++ b/xc/lib/Xaw/Paned.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.h,v 1.4 1998/10/03 08:42:13 dawes Exp $ */ /* * Paned.h - Paned Composite Widget's public header file. diff --git a/xc/lib/Xaw/PanedP.h b/xc/lib/Xaw/PanedP.h index 9a4ea3236..943cdb7c0 100644 --- a/xc/lib/Xaw/PanedP.h +++ b/xc/lib/Xaw/PanedP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.5 1999/06/06 08:48:02 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. diff --git a/xc/lib/Xaw/Panner.c b/xc/lib/Xaw/Panner.c index 6be4ac896..dbcdac743 100644 --- a/xc/lib/Xaw/Panner.c +++ b/xc/lib/Xaw/Panner.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.c,v 3.5 1999/06/06 08:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.4 1998/10/03 08:42:14 dawes Exp $ */ #include <ctype.h> #include <math.h> diff --git a/xc/lib/Xaw/Panner.h b/xc/lib/Xaw/Panner.h index 5af7ca759..5e2e035c4 100644 --- a/xc/lib/Xaw/Panner.h +++ b/xc/lib/Xaw/Panner.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.h,v 1.4 1998/10/03 08:42:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.h,v 1.3 1998/08/20 13:59:05 dawes Exp $ */ #ifndef _XawPanner_h #define _XawPanner_h diff --git a/xc/lib/Xaw/PannerP.h b/xc/lib/Xaw/PannerP.h index 50951e88d..fb8be018a 100644 --- a/xc/lib/Xaw/PannerP.h +++ b/xc/lib/Xaw/PannerP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.5 1999/06/06 08:48:06 dawes Exp $ */ #ifndef _XawPannerP_h #define _XawPannerP_h diff --git a/xc/lib/Xaw/Pixmap.c b/xc/lib/Xaw/Pixmap.c index 16e6fbfb2..7a0ff2094 100644 --- a/xc/lib/Xaw/Pixmap.c +++ b/xc/lib/Xaw/Pixmap.c @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.14 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.13 1999/07/11 08:49:14 dawes Exp $ */ #include <string.h> #include <stdio.h> diff --git a/xc/lib/Xaw/Porthole.c b/xc/lib/Xaw/Porthole.c index 02a4307dd..4f2fd2563 100644 --- a/xc/lib/Xaw/Porthole.c +++ b/xc/lib/Xaw/Porthole.c @@ -24,7 +24,7 @@ in this Software without prior written authorization from The Open Group. * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ -/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.5 1999/06/06 08:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.4 1998/10/03 08:42:15 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Porthole.h b/xc/lib/Xaw/Porthole.h index fb929145b..a3d524e02 100644 --- a/xc/lib/Xaw/Porthole.h +++ b/xc/lib/Xaw/Porthole.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.4 1998/10/03 08:42:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.3 1998/08/20 13:59:06 dawes Exp $ */ #ifndef _XawPorthole_h #define _XawPorthole_h diff --git a/xc/lib/Xaw/PortholeP.h b/xc/lib/Xaw/PortholeP.h index a6dabd82c..1713362df 100644 --- a/xc/lib/Xaw/PortholeP.h +++ b/xc/lib/Xaw/PortholeP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.6 1999/06/20 08:41:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.5 1999/06/06 08:48:07 dawes Exp $ */ #ifndef _XawPortholeP_h #define _XawPortholeP_h diff --git a/xc/lib/Xaw/Private.h b/xc/lib/Xaw/Private.h index 5bdf73cb4..a76207a4d 100644 --- a/xc/lib/Xaw/Private.h +++ b/xc/lib/Xaw/Private.h @@ -25,7 +25,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Private.h,v 3.10 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Private.h,v 3.9 1999/05/16 10:12:48 dawes Exp $ */ #ifndef _XawPrivate_h #define _XawPrivate_h diff --git a/xc/lib/Xaw/Repeater.c b/xc/lib/Xaw/Repeater.c index f8fc16cdc..fb2400435 100644 --- a/xc/lib/Xaw/Repeater.c +++ b/xc/lib/Xaw/Repeater.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * * This widget is used for press-and-hold style buttons. */ -/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.5 1999/06/06 08:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.4 1998/10/03 08:42:16 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Repeater.h b/xc/lib/Xaw/Repeater.h index e2cf08f2d..4910aa2b7 100644 --- a/xc/lib/Xaw/Repeater.h +++ b/xc/lib/Xaw/Repeater.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.4 1998/10/03 08:42:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.3 1998/08/20 13:59:06 dawes Exp $ */ #ifndef _XawRepeater_h #define _XawRepeater_h diff --git a/xc/lib/Xaw/RepeaterP.h b/xc/lib/Xaw/RepeaterP.h index 4fcbb51a7..cc7499ea7 100644 --- a/xc/lib/Xaw/RepeaterP.h +++ b/xc/lib/Xaw/RepeaterP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.5 1999/06/06 08:48:08 dawes Exp $ */ #ifndef _XawRepeaterP_h #define _XawRepeaterP_h diff --git a/xc/lib/Xaw/Scrollbar.c b/xc/lib/Xaw/Scrollbar.c index 3e204a450..65acce036 100644 --- a/xc/lib/Xaw/Scrollbar.c +++ b/xc/lib/Xaw/Scrollbar.c @@ -831,6 +831,10 @@ static void NotifyThumb(Widget gw, XEvent *event, String *params, Cardinal *num_params) { ScrollbarWidget w = (ScrollbarWidget)gw; + union { + XtPointer xtp; + float xtf; + } xtpf; if (w->scrollbar.direction == 0) /* if no StartScroll */ return; @@ -841,7 +845,8 @@ NotifyThumb(Widget gw, XEvent *event, String *params, Cardinal *num_params) /* thumbProc is not pretty, but is necessary for backwards compatibility on those architectures for which it work{s,ed}; the intent is to pass a (truncated) float by value. */ - XtCallCallbacks(gw, XtNthumbProc, *(XtPointer*)&w->scrollbar.top); + xtpf.xtf = w->scrollbar.top; + XtCallCallbacks(gw, XtNthumbProc, xtpf.xtp); XtCallCallbacks(gw, XtNjumpProc, (XtPointer)&w->scrollbar.top); PaintThumb(w); diff --git a/xc/lib/Xaw/Scrollbar.h b/xc/lib/Xaw/Scrollbar.h index b67f2fde7..d13d929d9 100644 --- a/xc/lib/Xaw/Scrollbar.h +++ b/xc/lib/Xaw/Scrollbar.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.5 1999/05/03 12:15:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.4 1998/10/03 08:42:17 dawes Exp $ */ #ifndef _Scrollbar_h #define _Scrollbar_h diff --git a/xc/lib/Xaw/ScrollbarP.h b/xc/lib/Xaw/ScrollbarP.h index 45a34d618..5a6ad6fc9 100644 --- a/xc/lib/Xaw/ScrollbarP.h +++ b/xc/lib/Xaw/ScrollbarP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.6 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.5 1999/06/06 08:48:08 dawes Exp $ */ #ifndef _ScrollbarP_h #define _ScrollbarP_h diff --git a/xc/lib/Xaw/Simple.c b/xc/lib/Xaw/Simple.c index 66cfa55e0..841cfdb45 100644 --- a/xc/lib/Xaw/Simple.c +++ b/xc/lib/Xaw/Simple.c @@ -43,7 +43,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.14 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.13 1999/06/20 08:41:05 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/Simple.h b/xc/lib/Xaw/Simple.h index 6c1794170..65e294efc 100644 --- a/xc/lib/Xaw/Simple.h +++ b/xc/lib/Xaw/Simple.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.h,v 1.7 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.h,v 1.6 1999/06/06 08:48:09 dawes Exp $ */ #ifndef _Simple_h #define _Simple_h diff --git a/xc/lib/Xaw/SimpleMenP.h b/xc/lib/Xaw/SimpleMenP.h index 058e91952..1dd5d16f0 100644 --- a/xc/lib/Xaw/SimpleMenP.h +++ b/xc/lib/Xaw/SimpleMenP.h @@ -20,7 +20,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/lib/Xaw/SimpleMenP.h,v 1.11 1999/06/20 08:41:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.10 1999/06/13 13:47:20 dawes Exp $ */ /* * SimpleMenuP.h - Private Header file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleMenu.c b/xc/lib/Xaw/SimpleMenu.c index 500b210bb..b855161b0 100644 --- a/xc/lib/Xaw/SimpleMenu.c +++ b/xc/lib/Xaw/SimpleMenu.c @@ -20,7 +20,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/lib/Xaw/SimpleMenu.c,v 3.19 1999/07/11 08:49:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.18 1999/06/20 08:41:06 dawes Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleMenu.h b/xc/lib/Xaw/SimpleMenu.h index cf8979ef6..cf13ac0e0 100644 --- a/xc/lib/Xaw/SimpleMenu.h +++ b/xc/lib/Xaw/SimpleMenu.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.6 1999/06/13 13:47:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.5 1998/10/03 08:42:19 dawes Exp $ */ /* * SimpleMenu.h - Public Header file for SimpleMenu widget. diff --git a/xc/lib/Xaw/SimpleP.h b/xc/lib/Xaw/SimpleP.h index 9b6a8c86b..d3c4f3605 100644 --- a/xc/lib/Xaw/SimpleP.h +++ b/xc/lib/Xaw/SimpleP.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.10 1999/06/27 14:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.9 1999/06/20 08:41:06 dawes Exp $ */ #ifndef _SimpleP_h #define _SimpleP_h diff --git a/xc/lib/Xaw/Sme.c b/xc/lib/Xaw/Sme.c index 118957268..9bc405704 100644 --- a/xc/lib/Xaw/Sme.c +++ b/xc/lib/Xaw/Sme.c @@ -19,7 +19,7 @@ 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/lib/Xaw/Sme.c,v 1.5 1999/06/06 08:48:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.c,v 1.4 1998/10/03 08:42:20 dawes Exp $ */ /* * Date: September 26, 1989 diff --git a/xc/lib/Xaw/Sme.h b/xc/lib/Xaw/Sme.h index c592742dd..2fa9954bc 100644 --- a/xc/lib/Xaw/Sme.h +++ b/xc/lib/Xaw/Sme.h @@ -19,7 +19,7 @@ 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/lib/Xaw/Sme.h,v 1.4 1998/10/03 08:42:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.h,v 1.3 1998/08/20 13:59:11 dawes Exp $ */ /* * This is the public header file for the Athena Sme object. diff --git a/xc/lib/Xaw/SmeBSB.c b/xc/lib/Xaw/SmeBSB.c index f8c65a2df..a5dc305e5 100644 --- a/xc/lib/Xaw/SmeBSB.c +++ b/xc/lib/Xaw/SmeBSB.c @@ -20,7 +20,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/lib/Xaw/SmeBSB.c,v 1.10 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.9 1999/04/25 10:01:25 dawes Exp $ */ /* * SmeBSB.c - Source code file for BSB Menu Entry object. diff --git a/xc/lib/Xaw/SmeBSB.h b/xc/lib/Xaw/SmeBSB.h index 886258085..d0a877097 100644 --- a/xc/lib/Xaw/SmeBSB.h +++ b/xc/lib/Xaw/SmeBSB.h @@ -19,7 +19,7 @@ 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/lib/Xaw/SmeBSB.h,v 1.5 1999/04/25 10:01:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.4 1998/10/03 08:42:21 dawes Exp $ */ /* * SmeBSB.h - Public Header file for SmeBSB object. diff --git a/xc/lib/Xaw/SmeBSBP.h b/xc/lib/Xaw/SmeBSBP.h index aa2de9f23..3268c641d 100644 --- a/xc/lib/Xaw/SmeBSBP.h +++ b/xc/lib/Xaw/SmeBSBP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.7 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.6 1999/06/06 08:48:11 dawes Exp $ */ #ifndef _XawSmeBSBP_h #define _XawSmeBSBP_h diff --git a/xc/lib/Xaw/SmeLine.c b/xc/lib/Xaw/SmeLine.c index bc7578082..bc3e16346 100644 --- a/xc/lib/Xaw/SmeLine.c +++ b/xc/lib/Xaw/SmeLine.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.6 1999/06/06 08:48:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.5 1998/10/03 08:42:21 dawes Exp $ */ /* * Sme.c - Source code for the generic menu entry diff --git a/xc/lib/Xaw/SmeLine.h b/xc/lib/Xaw/SmeLine.h index 10d411c80..c076158cb 100644 --- a/xc/lib/Xaw/SmeLine.h +++ b/xc/lib/Xaw/SmeLine.h @@ -20,7 +20,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/lib/Xaw/SmeLine.h,v 1.4 1998/10/03 08:42:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.3 1998/08/20 13:59:12 dawes Exp $ */ /* * This is the public header file for the Athena SmeLine object. diff --git a/xc/lib/Xaw/SmeLineP.h b/xc/lib/Xaw/SmeLineP.h index 50e89768a..d234a0409 100644 --- a/xc/lib/Xaw/SmeLineP.h +++ b/xc/lib/Xaw/SmeLineP.h @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ #ifndef _XawSmeLineP_h #define _XawSmeLineP_h diff --git a/xc/lib/Xaw/SmeP.h b/xc/lib/Xaw/SmeP.h index 798a8f26a..18bc16ce8 100644 --- a/xc/lib/Xaw/SmeP.h +++ b/xc/lib/Xaw/SmeP.h @@ -19,7 +19,7 @@ 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/lib/Xaw/SmeP.h,v 1.6 1999/06/20 08:41:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ /* * This is the private header file for the Athena Sme object. diff --git a/xc/lib/Xaw/StripCharP.h b/xc/lib/Xaw/StripCharP.h index 4aec11ce2..3ac7e662f 100644 --- a/xc/lib/Xaw/StripCharP.h +++ b/xc/lib/Xaw/StripCharP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.6 1999/06/20 08:41:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.5 1999/06/06 08:48:12 dawes Exp $ */ #ifndef _XawStripChartP_h #define _XawStripChartP_h diff --git a/xc/lib/Xaw/StripChart.c b/xc/lib/Xaw/StripChart.c index cee988f44..c2e27ef37 100644 --- a/xc/lib/Xaw/StripChart.c +++ b/xc/lib/Xaw/StripChart.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.6 1999/06/06 08:48:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.5 1999/01/31 12:21:18 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> diff --git a/xc/lib/Xaw/StripChart.h b/xc/lib/Xaw/StripChart.h index 531c43852..faf9afe53 100644 --- a/xc/lib/Xaw/StripChart.h +++ b/xc/lib/Xaw/StripChart.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.3 1998/08/20 13:59:13 dawes Exp $ */ #ifndef _XawStripChart_h #define _XawStripChart_h diff --git a/xc/lib/Xaw/Template.c b/xc/lib/Xaw/Template.c index 82fcb9f83..db044bb1b 100644 --- a/xc/lib/Xaw/Template.c +++ b/xc/lib/Xaw/Template.c @@ -21,7 +21,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/lib/Xaw/Template.c,v 1.6 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.c,v 1.5 1999/03/21 07:34:28 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Template.h b/xc/lib/Xaw/Template.h index 3b5281a16..21dc1eec0 100644 --- a/xc/lib/Xaw/Template.h +++ b/xc/lib/Xaw/Template.h @@ -21,7 +21,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/lib/Xaw/Template.h,v 1.4 1998/10/03 08:42:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.h,v 1.3 1998/08/20 13:59:14 dawes Exp $ */ #ifndef _Template_h #define _Template_h diff --git a/xc/lib/Xaw/TemplateP.h b/xc/lib/Xaw/TemplateP.h index 8c900ac31..4dd820dc3 100644 --- a/xc/lib/Xaw/TemplateP.h +++ b/xc/lib/Xaw/TemplateP.h @@ -21,7 +21,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/lib/Xaw/TemplateP.h,v 1.5 1999/06/06 08:48:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.4 1998/10/03 08:42:24 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h diff --git a/xc/lib/Xaw/Text.c b/xc/lib/Xaw/Text.c index ee6694405..afee90f71 100644 --- a/xc/lib/Xaw/Text.c +++ b/xc/lib/Xaw/Text.c @@ -70,7 +70,7 @@ SOFTWARE. * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.35 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.36 2000/08/25 21:51:00 dawes Exp $ */ #include <stdio.h> #include <X11/IntrinsicP.h> @@ -2723,8 +2723,6 @@ DisplayText(Widget w, XawTextPosition left, XawTextPosition right) TextWidget ctx = (TextWidget)w; int y, line; XawTextPosition from, to, lastPos; - XmuScanline *scan; - XmuSegment *seg; Bool cleol = ctx->text.clear_to_eol; Bool has_selection = ctx->text.s.right > ctx->text.s.left; XawTextPaintList *paint_list; @@ -3026,7 +3024,8 @@ _XawTextClearAndCenterDisplay(TextWidget ctx) _XawTextShowPosition(ctx); - if (visible && left_margin == ctx->text.left_margin) { + if (XtIsRealized((Widget)ctx) && visible && + left_margin == ctx->text.left_margin) { int insert_line = LineForPosition(ctx, ctx->text.insertPos); int scroll_by = insert_line - (ctx->text.lt.lines >> 1); Boolean clear_to_eol = ctx->text.clear_to_eol; diff --git a/xc/lib/Xaw/Text.h b/xc/lib/Xaw/Text.h index 7bb3ff0fc..8771ead8a 100644 --- a/xc/lib/Xaw/Text.h +++ b/xc/lib/Xaw/Text.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Text.h,v 1.13 1999/08/15 13:00:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.h,v 1.12 1999/06/06 08:48:14 dawes Exp $ */ #ifndef _XawText_h #define _XawText_h diff --git a/xc/lib/Xaw/TextAction.c b/xc/lib/Xaw/TextAction.c index 5b5683afe..80b1ffa30 100644 --- a/xc/lib/Xaw/TextAction.c +++ b/xc/lib/Xaw/TextAction.c @@ -21,7 +21,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/lib/Xaw/TextAction.c,v 3.34 1999/09/27 06:29:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.33 1999/08/15 13:00:35 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xc/lib/Xaw/TextP.h b/xc/lib/Xaw/TextP.h index 3b9e32d30..7b08036c6 100644 --- a/xc/lib/Xaw/TextP.h +++ b/xc/lib/Xaw/TextP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextP.h,v 3.18 1999/06/20 08:41:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextP.h,v 3.17 1999/06/06 08:48:15 dawes Exp $ */ #ifndef _XawTextP_h #define _XawTextP_h diff --git a/xc/lib/Xaw/TextPop.c b/xc/lib/Xaw/TextPop.c index ec49be14e..e90a910a9 100644 --- a/xc/lib/Xaw/TextPop.c +++ b/xc/lib/Xaw/TextPop.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.15 1999/08/28 09:00:27 dawes Exp $ */ /* * This file is broken up into three sections one dealing with diff --git a/xc/lib/Xaw/TextSink.c b/xc/lib/Xaw/TextSink.c index d3b8aab9d..71d89d88f 100644 --- a/xc/lib/Xaw/TextSink.c +++ b/xc/lib/Xaw/TextSink.c @@ -20,7 +20,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/lib/Xaw/TextSink.c,v 1.15 2000/06/15 20:49:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.14 1999/08/28 09:00:27 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/xc/lib/Xaw/TextSink.h b/xc/lib/Xaw/TextSink.h index 13d026697..1cb71aafe 100644 --- a/xc/lib/Xaw/TextSink.h +++ b/xc/lib/Xaw/TextSink.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.8 1999/08/15 13:00:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.7 1999/06/06 08:48:17 dawes Exp $ */ #ifndef _XawTextSink_h #define _XawTextSink_h diff --git a/xc/lib/Xaw/TextSinkP.h b/xc/lib/Xaw/TextSinkP.h index e409721e7..b4a52d836 100644 --- a/xc/lib/Xaw/TextSinkP.h +++ b/xc/lib/Xaw/TextSinkP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.10 1999/09/06 13:02:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.9 1999/08/28 09:00:28 dawes Exp $ */ #ifndef _XawTextSinkP_h #define _XawTextSinkP_h diff --git a/xc/lib/Xaw/TextSrc.c b/xc/lib/Xaw/TextSrc.c index e3d513376..0d39d0046 100644 --- a/xc/lib/Xaw/TextSrc.c +++ b/xc/lib/Xaw/TextSrc.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.24 2000/03/31 22:55:18 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.23 1999/09/27 06:29:11 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. diff --git a/xc/lib/Xaw/TextSrc.h b/xc/lib/Xaw/TextSrc.h index 26955e934..8e8a9ac6f 100644 --- a/xc/lib/Xaw/TextSrc.h +++ b/xc/lib/Xaw/TextSrc.h @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.10 1999/08/15 13:00:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.9 1999/06/06 08:48:18 dawes Exp $ */ #ifndef _XawTextSrc_h #define _XawTextSrc_h diff --git a/xc/lib/Xaw/TextSrcP.h b/xc/lib/Xaw/TextSrcP.h index 25ddb1163..81e2391e1 100644 --- a/xc/lib/Xaw/TextSrcP.h +++ b/xc/lib/Xaw/TextSrcP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.12 1999/09/27 06:29:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ #ifndef _XawTextSrcP_h #define _XawTextSrcP_h diff --git a/xc/lib/Xaw/TextTr.c b/xc/lib/Xaw/TextTr.c index c7adda2af..2ed2a60ba 100644 --- a/xc/lib/Xaw/TextTr.c +++ b/xc/lib/Xaw/TextTr.c @@ -21,7 +21,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/lib/Xaw/TextTr.c,v 3.14 2000/06/13 23:15:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.13 1999/06/06 08:48:18 dawes Exp $ */ /* INTERNATIONALIZATION: diff --git a/xc/lib/Xaw/Tip.c b/xc/lib/Xaw/Tip.c index 761492a56..97c527bd9 100644 --- a/xc/lib/Xaw/Tip.c +++ b/xc/lib/Xaw/Tip.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tip.c,v 1.4 1999/07/11 08:49:16 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Tip.h b/xc/lib/Xaw/Tip.h index 5fb56f591..0d7121cd3 100644 --- a/xc/lib/Xaw/Tip.h +++ b/xc/lib/Xaw/Tip.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XawTip_h #define _XawTip_h diff --git a/xc/lib/Xaw/TipP.h b/xc/lib/Xaw/TipP.h index 0c1abc69a..397d24180 100644 --- a/xc/lib/Xaw/TipP.h +++ b/xc/lib/Xaw/TipP.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/TipP.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XawTipP_h #define _XawTipP_h diff --git a/xc/lib/Xaw/Toggle.c b/xc/lib/Xaw/Toggle.c index 9f3de2d98..a70deb280 100644 --- a/xc/lib/Xaw/Toggle.c +++ b/xc/lib/Xaw/Toggle.c @@ -21,7 +21,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/lib/Xaw/Toggle.c,v 1.6 1999/06/06 08:48:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.5 1998/10/03 08:42:29 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/xc/lib/Xaw/Toggle.h b/xc/lib/Xaw/Toggle.h index 3ef138646..c0f36f086 100644 --- a/xc/lib/Xaw/Toggle.h +++ b/xc/lib/Xaw/Toggle.h @@ -19,7 +19,7 @@ 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/lib/Xaw/Toggle.h,v 1.4 1998/10/03 08:42:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.3 1998/08/20 13:59:17 dawes Exp $ */ /* * ToggleP.h - Private definitions for Toggle widget diff --git a/xc/lib/Xaw/ToggleP.h b/xc/lib/Xaw/ToggleP.h index 1cc564bc7..8005c606b 100644 --- a/xc/lib/Xaw/ToggleP.h +++ b/xc/lib/Xaw/ToggleP.h @@ -21,7 +21,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/lib/Xaw/ToggleP.h,v 1.6 1999/06/20 08:41:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.5 1999/06/06 08:48:19 dawes Exp $ */ /* * Author: Chris D. Peterson diff --git a/xc/lib/Xaw/Tree.c b/xc/lib/Xaw/Tree.c index 4a9b0ecd4..f528c86d1 100644 --- a/xc/lib/Xaw/Tree.c +++ b/xc/lib/Xaw/Tree.c @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.c,v 1.8 1999/07/04 06:38:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.c,v 1.7 1999/06/13 13:47:24 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Tree.h b/xc/lib/Xaw/Tree.h index 5071cfa78..736af7616 100644 --- a/xc/lib/Xaw/Tree.h +++ b/xc/lib/Xaw/Tree.h @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.h,v 1.5 1999/06/06 08:48:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.h,v 1.4 1998/10/03 08:42:30 dawes Exp $ */ #ifndef _XawTree_h diff --git a/xc/lib/Xaw/TreeP.h b/xc/lib/Xaw/TreeP.h index 3e8b14d7a..c6920aebc 100644 --- a/xc/lib/Xaw/TreeP.h +++ b/xc/lib/Xaw/TreeP.h @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.5 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.4 1999/06/13 13:47:25 dawes Exp $ */ #ifndef _XawTreeP_h diff --git a/xc/lib/Xaw/Vendor.c b/xc/lib/Xaw/Vendor.c index 96d753568..300bc6086 100644 --- a/xc/lib/Xaw/Vendor.c +++ b/xc/lib/Xaw/Vendor.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.6 1999/03/21 07:34:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.5 1998/10/03 08:42:30 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize diff --git a/xc/lib/Xaw/VendorEP.h b/xc/lib/Xaw/VendorEP.h index 309162c16..fd19f5f83 100644 --- a/xc/lib/Xaw/VendorEP.h +++ b/xc/lib/Xaw/VendorEP.h @@ -47,7 +47,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/lib/Xaw/VendorEP.h,v 1.4 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.3 1999/06/06 15:35:48 dawes Exp $ */ #ifndef _VendorEP_h #define _VendorEP_h diff --git a/xc/lib/Xaw/Viewport.c b/xc/lib/Xaw/Viewport.c index 24e2fb7cc..9b3fadd73 100644 --- a/xc/lib/Xaw/Viewport.c +++ b/xc/lib/Xaw/Viewport.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.7 1999/06/06 08:48:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.6 1999/05/03 12:15:46 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xaw/Viewport.h b/xc/lib/Xaw/Viewport.h index c01e456bf..d57f37fe3 100644 --- a/xc/lib/Xaw/Viewport.h +++ b/xc/lib/Xaw/Viewport.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.5 1999/05/03 12:15:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.4 1998/10/03 08:42:31 dawes Exp $ */ #ifndef _XawViewport_h #define _XawViewport_h diff --git a/xc/lib/Xaw/ViewportP.h b/xc/lib/Xaw/ViewportP.h index c138822d6..6f1f861d9 100644 --- a/xc/lib/Xaw/ViewportP.h +++ b/xc/lib/Xaw/ViewportP.h @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.6 1999/06/20 08:41:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.5 1999/06/06 08:48:21 dawes Exp $ */ #ifndef _ViewportP_h #define _ViewportP_h diff --git a/xc/lib/Xaw/Xaw.man b/xc/lib/Xaw/Xaw.man index ff21215f8..da52e1c2f 100644 --- a/xc/lib/Xaw/Xaw.man +++ b/xc/lib/Xaw/Xaw.man @@ -26,7 +26,7 @@ .\" .\" Author: Paulo César Pereira de Andrade .\" -.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.4 1999/06/27 14:07:35 dawes Exp $ +.\" $XFree86: xc/lib/Xaw/Xaw.man,v 1.3 1999/06/20 08:41:13 dawes Exp $ .\" .de TQ .br diff --git a/xc/lib/Xaw/XawI18n.c b/xc/lib/Xaw/XawI18n.c index 5fdd0a3c5..70d5d8dcc 100644 --- a/xc/lib/Xaw/XawI18n.c +++ b/xc/lib/Xaw/XawI18n.c @@ -49,7 +49,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/lib/Xaw/XawI18n.c,v 1.6 1999/07/19 13:36:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.5 1999/05/03 12:15:47 dawes Exp $ */ #include <X11/IntrinsicP.h> #include "XawI18n.h" diff --git a/xc/lib/Xaw/XawI18n.h b/xc/lib/Xaw/XawI18n.h index d5ae88722..824e869b9 100644 --- a/xc/lib/Xaw/XawI18n.h +++ b/xc/lib/Xaw/XawI18n.h @@ -21,7 +21,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/lib/Xaw/XawI18n.h,v 3.10 1999/12/27 00:39:23 robin Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.9 1999/07/19 13:36:04 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include <wctype.h> diff --git a/xc/lib/Xaw/XawIm.c b/xc/lib/Xaw/XawIm.c index fa1d11195..9225c3e68 100644 --- a/xc/lib/Xaw/XawIm.c +++ b/xc/lib/Xaw/XawIm.c @@ -88,8 +88,6 @@ in this Software without prior written authorization from The Open Group. * *****************************************************/ -#define SetVaArg(arg, value) (*((XtPointer *)arg) = (XtPointer)(value)) - /* * Prototypes */ @@ -724,15 +722,15 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) if (p->input_style & XIMPreeditArea) { pe_attr = XVaCreateNestedList(0, XNAreaNeeded, &pe_area_needed, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (p->input_style & XIMStatusArea) { st_attr = XVaCreateNestedList(0, XNAreaNeeded, &st_area_needed, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; if (ic_cnt > 0) { XGetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]); @@ -756,8 +754,8 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) XFree(st_area_needed); st_attr = XVaCreateNestedList(0, XNArea, &st_area, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } if (p->input_style & XIMPreeditArea) { if (p->input_style & XIMStatusArea) { @@ -771,10 +769,10 @@ SizeNegotiation(XawIcTableList p, unsigned int width, unsigned int height) XFree(pe_area_needed); pe_area.y = height - pe_area.height; pe_attr = XVaCreateNestedList(0, XNArea, &pe_area, NULL); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4]); if (pe_attr) XFree(pe_attr); if (st_attr) XFree(st_attr); @@ -808,37 +806,37 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) if (p->input_style & (XIMPreeditArea|XIMPreeditPosition|XIMStatusArea)) { if (p->flg & CIFontSet) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNFontSet); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->font_set); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNFontSet); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->font_set); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNFontSet; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->font_set; pe_cnt++; + st_a[st_cnt] = (XPointer) XNFontSet; st_cnt++; + st_a[st_cnt] = (XPointer) p->font_set; st_cnt++; height = maxAscentOfFontSet(p->font_set) + maxDescentOfFontSet(p->font_set); height = SetVendorShellHeight(ve, height); } if (p->flg & CIFg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNForeground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->foreground); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNForeground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->foreground); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNForeground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->foreground; pe_cnt++; + st_a[st_cnt] = (XPointer) XNForeground; st_cnt++; + st_a[st_cnt] = (XPointer) p->foreground; st_cnt++; } if (p->flg & CIBg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->background); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->background); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->background; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackground; st_cnt++; + st_a[st_cnt] = (XPointer) p->background; st_cnt++; } if (p->flg & CIBgPixmap) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackgroundPixmap); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->bg_pixmap); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackgroundPixmap); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->bg_pixmap); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackgroundPixmap; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->bg_pixmap; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackgroundPixmap; st_cnt++; + st_a[st_cnt] = (XPointer) p->bg_pixmap; st_cnt++; } if (p->flg & CILineS) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNLineSpace); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->line_spacing); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNLineSpace); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->line_spacing); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNLineSpace; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->line_spacing; pe_cnt++; + st_a[st_cnt] = (XPointer) XNLineSpace; st_cnt++; + st_a[st_cnt] = (XPointer) p->line_spacing; st_cnt++; } } if (p->input_style & XIMPreeditArea) { @@ -846,8 +844,8 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) pe_area.y = ve->parent->core.height - height; pe_area.width = ve->parent->core.width; pe_area.height = height; - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; } if (p->input_style & XIMPreeditPosition) { pe_area.x = 0; @@ -859,54 +857,54 @@ CreateIC(Widget w, XawVendorShellExtPart *ve) pe_area.y += margin->top; pe_area.width -= (margin->left + margin->right - 1); pe_area.height -= (margin->top + margin->bottom - 1); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; if (p->flg & CICursorP) { _XawMultiSinkPosToXY(w, p->cursor_position, &position.x, &position.y); } else { position.x = position.y = 0; } - SetVaArg( &pe_a[pe_cnt], (XPointer) XNSpotLocation); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &position); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNSpotLocation; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &position; pe_cnt++; } if (p->input_style & XIMStatusArea) { st_area.x = 0; st_area.y = ve->parent->core.height - height; st_area.width = ve->parent->core.width; st_area.height = height; - SetVaArg( &st_a[st_cnt], (XPointer) XNArea); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) &st_area); st_cnt++; + st_a[st_cnt] = (XPointer) XNArea; st_cnt++; + st_a[st_cnt] = (XPointer) &st_area; st_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) XNInputStyle); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) p->input_style); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XNClientWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(ve->parent)); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XNFocusWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(w)); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNInputStyle; ic_cnt++; + ic_a[ic_cnt] = (XPointer) p->input_style; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNClientWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(ve->parent); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNFocusWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(w); ic_cnt++; if (pe_cnt > 0) { - SetVaArg( &pe_a[pe_cnt], (XPointer) NULL); + pe_a[pe_cnt] = (XPointer) NULL; pe_attr = XVaCreateNestedList(0, pe_a[0], pe_a[1], pe_a[2], pe_a[3], pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8], pe_a[9], pe_a[10], pe_a[11], pe_a[12], pe_a[13], pe_a[14], pe_a[15], pe_a[16], pe_a[17], pe_a[18], pe_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (st_cnt > 0) { - SetVaArg( &st_a[st_cnt], (XPointer) NULL); + st_a[st_cnt] = (XPointer) NULL; st_attr = XVaCreateNestedList(0, st_a[0], st_a[1], st_a[2], st_a[3], st_a[4], st_a[5], st_a[6], st_a[7], st_a[8], st_a[9], st_a[10], st_a[11], st_a[12], st_a[13], st_a[14], st_a[15], st_a[16], st_a[17], st_a[18], st_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; p->xic = XCreateIC(ve->im.xim, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], @@ -965,44 +963,44 @@ SetICValues(Widget w, XawVendorShellExtPart *ve, Bool focus) if (p->input_style & (XIMPreeditArea|XIMPreeditPosition|XIMStatusArea)) { if (p->flg & CIFontSet) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNFontSet); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->font_set); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNFontSet); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->font_set); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNFontSet; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->font_set; pe_cnt++; + st_a[st_cnt] = (XPointer) XNFontSet; st_cnt++; + st_a[st_cnt] = (XPointer) p->font_set; st_cnt++; height = maxAscentOfFontSet(p->font_set) + maxDescentOfFontSet(p->font_set); height = SetVendorShellHeight(ve, height); } if (p->flg & CIFg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNForeground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->foreground); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNForeground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->foreground); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNForeground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->foreground; pe_cnt++; + st_a[st_cnt] = (XPointer) XNForeground; st_cnt++; + st_a[st_cnt] = (XPointer) p->foreground; st_cnt++; } if (p->flg & CIBg) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackground); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->background); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackground); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->background); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackground; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->background; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackground; st_cnt++; + st_a[st_cnt] = (XPointer) p->background; st_cnt++; } if (p->flg & CIBgPixmap) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNBackgroundPixmap); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->bg_pixmap); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNBackgroundPixmap); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->bg_pixmap); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNBackgroundPixmap; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->bg_pixmap; pe_cnt++; + st_a[st_cnt] = (XPointer) XNBackgroundPixmap; st_cnt++; + st_a[st_cnt] = (XPointer) p->bg_pixmap; st_cnt++; } if (p->flg & CILineS) { - SetVaArg( &pe_a[pe_cnt], (XPointer) XNLineSpace); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) p->line_spacing); pe_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) XNLineSpace); st_cnt++; - SetVaArg( &st_a[st_cnt], (XPointer) p->line_spacing); st_cnt++; + pe_a[pe_cnt] = (XPointer) XNLineSpace; pe_cnt++; + pe_a[pe_cnt] = (XPointer) p->line_spacing; pe_cnt++; + st_a[st_cnt] = (XPointer) XNLineSpace; st_cnt++; + st_a[st_cnt] = (XPointer) p->line_spacing; st_cnt++; } } if (p->input_style & XIMPreeditPosition) { if (p->flg & CICursorP) { _XawMultiSinkPosToXY(w, p->cursor_position, &position.x, &position.y); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNSpotLocation); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &position); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNSpotLocation; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &position; pe_cnt++; } } if (IsSharedIC(ve)) { @@ -1016,37 +1014,37 @@ SetICValues(Widget w, XawVendorShellExtPart *ve, Bool focus) pe_area.y += margin->top; pe_area.width -= (margin->left + margin->right - 1); pe_area.height -= (margin->top + margin->bottom - 1); - SetVaArg( &pe_a[pe_cnt], (XPointer) XNArea); pe_cnt++; - SetVaArg( &pe_a[pe_cnt], (XPointer) &pe_area); pe_cnt++; + pe_a[pe_cnt] = (XPointer) XNArea; pe_cnt++; + pe_a[pe_cnt] = (XPointer) &pe_area; pe_cnt++; } } if (pe_cnt > 0) { - SetVaArg( &pe_a[pe_cnt], (XPointer) NULL); + pe_a[pe_cnt] = (XPointer) NULL; pe_attr = XVaCreateNestedList(0, pe_a[0], pe_a[1], pe_a[2], pe_a[3], pe_a[4], pe_a[5], pe_a[6], pe_a[7], pe_a[8], pe_a[9], pe_a[10], pe_a[11], pe_a[12], pe_a[13], pe_a[14], pe_a[15], pe_a[16], pe_a[17], pe_a[18], pe_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNPreeditAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) pe_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNPreeditAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) pe_attr; ic_cnt++; } if (st_cnt > 0) { - SetVaArg( &st_a[st_cnt], (XPointer) NULL); + st_a[st_cnt] = (XPointer) NULL; st_attr = XVaCreateNestedList(0, st_a[0], st_a[1], st_a[2], st_a[3], st_a[4], st_a[5], st_a[6], st_a[7], st_a[8], st_a[9], st_a[10], st_a[11], st_a[12], st_a[13], st_a[14], st_a[15], st_a[16], st_a[17], st_a[18], st_a[19]); - SetVaArg( &ic_a[ic_cnt], (XPointer) XNStatusAttributes); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) st_attr); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNStatusAttributes; ic_cnt++; + ic_a[ic_cnt] = (XPointer) st_attr; ic_cnt++; } if (focus == TRUE) { - SetVaArg( &ic_a[ic_cnt], (XPointer) XNFocusWindow); ic_cnt++; - SetVaArg( &ic_a[ic_cnt], (XPointer) XtWindow(w)); ic_cnt++; + ic_a[ic_cnt] = (XPointer) XNFocusWindow; ic_cnt++; + ic_a[ic_cnt] = (XPointer) XtWindow(w); ic_cnt++; } if (ic_cnt > 0) { - SetVaArg( &ic_a[ic_cnt], (XPointer) NULL); + ic_a[ic_cnt] = (XPointer) NULL; XSetICValues(p->xic, ic_a[0], ic_a[1], ic_a[2], ic_a[3], ic_a[4], ic_a[5], ic_a[6], ic_a[7], ic_a[8], ic_a[9], ic_a[10], ic_a[11], ic_a[12], ic_a[13], ic_a[14], ic_a[15], diff --git a/xc/lib/Xaw/XawImP.h b/xc/lib/Xaw/XawImP.h index ae6901cc6..a3e5854ec 100644 --- a/xc/lib/Xaw/XawImP.h +++ b/xc/lib/Xaw/XawImP.h @@ -47,7 +47,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/lib/Xaw/XawImP.h,v 3.7 1999/03/14 11:17:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.6 1999/03/14 03:21:13 dawes Exp $ */ #ifndef _XawImP_h #define _XawImP_h diff --git a/xc/lib/Xaw/XawInit.c b/xc/lib/Xaw/XawInit.c index 7b8a55251..5ff0a08aa 100644 --- a/xc/lib/Xaw/XawInit.c +++ b/xc/lib/Xaw/XawInit.c @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * call this routine from their ClassInitialize procs (this routine may be * used as the class init proc). */ -/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.8 1999/06/06 08:48:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.7 1998/10/03 08:42:33 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Vendor.h> diff --git a/xc/lib/Xaw/XawInit.h b/xc/lib/Xaw/XawInit.h index b58996a47..469ddd245 100644 --- a/xc/lib/Xaw/XawInit.h +++ b/xc/lib/Xaw/XawInit.h @@ -18,7 +18,7 @@ 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/lib/Xaw/XawInit.h,v 1.11 1999/08/28 09:00:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.10 1999/08/15 13:00:39 dawes Exp $ */ #ifndef _XawInit_h #define _XawInit_h diff --git a/xc/lib/Xaw/Xawos2.def b/xc/lib/Xaw/Xawos2.def index d62f79705..cafc5067a 100644 --- a/xc/lib/Xaw/Xawos2.def +++ b/xc/lib/Xaw/Xawos2.def @@ -1,5 +1,5 @@ LIBRARY Xaw INITINSTANCE TERMINSTANCE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.8 2000/04/05 18:13:17 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw/Xawos2.def,v 3.7 1999/04/29 09:13:30 dawes Exp $" CODE PRELOAD DATA diff --git a/xc/lib/Xaw/jump_funcs b/xc/lib/Xaw/jump_funcs index df6d0e529..775a88e14 100644 --- a/xc/lib/Xaw/jump_funcs +++ b/xc/lib/Xaw/jump_funcs @@ -1,5 +1,5 @@ # $XConsortium: jump_funcs,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_funcs,v 3.2 1996/02/12 11:11:15 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_funcs,v 3.1 1995/01/28 15:43:31 dawes Exp $ # 00000000 T _XawAsciiSourceFreeString libXaw AsciiSrc 00000000 T _XawAsciiSave libXaw AsciiSrc diff --git a/xc/lib/Xaw/jump_ignore b/xc/lib/Xaw/jump_ignore index 253b63da1..cf0567d46 100644 --- a/xc/lib/Xaw/jump_ignore +++ b/xc/lib/Xaw/jump_ignore @@ -1,3 +1,3 @@ # $XConsortium: jump_ignore,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_ignore,v 3.1 1995/01/28 15:43:32 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_ignore,v 3.0 1994/04/28 12:31:53 dawes Exp $ # jump_ignore diff --git a/xc/lib/Xaw/jump_vars b/xc/lib/Xaw/jump_vars index 2edecda2e..3d7372b64 100644 --- a/xc/lib/Xaw/jump_vars +++ b/xc/lib/Xaw/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:46:47 kaleb Exp $ -# $XFree86: xc/lib/Xaw/jump_vars,v 3.1 1995/01/28 15:43:33 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_vars,v 3.0 1994/04/28 12:31:54 dawes Exp $ # 00001400 D _XawWidgetArray libXaw AllWidgets 00000004 D _XawWidgetCount libXaw AllWidgets diff --git a/xc/lib/Xaw6/Imakefile b/xc/lib/Xaw6/Imakefile index 1ee723933..9287a5460 100644 --- a/xc/lib/Xaw6/Imakefile +++ b/xc/lib/Xaw6/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v 1.2 1999/06/06 14:05:55 dawes Exp $ +XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v 1.1 1999/06/06 08:48:36 dawes Exp $ #define DoNormalLib NormalLibXaw6 #define DoSharedLib SharedLibXaw6 #define DoExtraLib SharedLibXaw6 diff --git a/xc/lib/Xaw6/Xaw6os2.def b/xc/lib/Xaw6/Xaw6os2.def index 8a92a2c28..2aed8af2e 100644 --- a/xc/lib/Xaw6/Xaw6os2.def +++ b/xc/lib/Xaw6/Xaw6os2.def @@ -1,5 +1,5 @@ LIBRARY Xaw6 INITINSTANCE TERMINSTANCE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xaw6/Xaw6os2.def,v 1.1 2000/04/05 18:13:18 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xbsd/Berklib.c b/xc/lib/Xbsd/Berklib.c index 254428fe6..7981b0df3 100644 --- a/xc/lib/Xbsd/Berklib.c +++ b/xc/lib/Xbsd/Berklib.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.6 1998/10/03 08:42:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.5 1996/10/06 13:10:57 dawes Exp $ */ /* diff --git a/xc/lib/Xbsd/Imakefile b/xc/lib/Xbsd/Imakefile index 13c6056af..dcfae6ae5 100644 --- a/xc/lib/Xbsd/Imakefile +++ b/xc/lib/Xbsd/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.6 94/11/21 18:24:13 kaleb Exp $ -XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.2 1999/04/17 09:08:11 dawes Exp $ +XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.1 1995/01/28 15:43:40 dawes Exp $ SRCS = Berklib.c OBJS = Berklib.o diff --git a/xc/lib/Xdmcp/AA16.c b/xc/lib/Xdmcp/AA16.c index b8ebfb865..fcfb05364 100644 --- a/xc/lib/Xdmcp/AA16.c +++ b/xc/lib/Xdmcp/AA16.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/AA32.c b/xc/lib/Xdmcp/AA32.c index ce7d29d4f..f5c365c60 100644 --- a/xc/lib/Xdmcp/AA32.c +++ b/xc/lib/Xdmcp/AA32.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.2 1998/10/10 15:25:11 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/AA8.c b/xc/lib/Xdmcp/AA8.c index 0437e6cc9..29f36e6e1 100644 --- a/xc/lib/Xdmcp/AA8.c +++ b/xc/lib/Xdmcp/AA8.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.2 1998/10/10 15:25:12 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Alloc.c b/xc/lib/Xdmcp/Alloc.c index 9e5898402..84cf15cd1 100644 --- a/xc/lib/Xdmcp/Alloc.c +++ b/xc/lib/Xdmcp/Alloc.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.2 1998/10/10 15:25:13 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.1 1998/10/03 08:42:50 dawes Exp $ */ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */ diff --git a/xc/lib/Xdmcp/AofA8.c b/xc/lib/Xdmcp/AofA8.c index b0597b1e0..059ea3f35 100644 --- a/xc/lib/Xdmcp/AofA8.c +++ b/xc/lib/Xdmcp/AofA8.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.2 1998/10/10 15:25:13 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/CmpKey.c b/xc/lib/Xdmcp/CmpKey.c index dafe102de..bd5aeba00 100644 --- a/xc/lib/Xdmcp/CmpKey.c +++ b/xc/lib/Xdmcp/CmpKey.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/DA16.c b/xc/lib/Xdmcp/DA16.c index 67333652a..cfb559be9 100644 --- a/xc/lib/Xdmcp/DA16.c +++ b/xc/lib/Xdmcp/DA16.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.4 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/DecKey.c b/xc/lib/Xdmcp/DecKey.c index 351bccaa8..6379ce7e4 100644 --- a/xc/lib/Xdmcp/DecKey.c +++ b/xc/lib/Xdmcp/DecKey.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.2 1998/10/10 15:25:14 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Fill.c b/xc/lib/Xdmcp/Fill.c index 15470bd86..62f84d46b 100644 --- a/xc/lib/Xdmcp/Fill.c +++ b/xc/lib/Xdmcp/Fill.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.6 2000/05/11 18:14:10 tsi Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.5 1998/10/03 08:42:51 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/Xdmcp/Flush.c b/xc/lib/Xdmcp/Flush.c index 9de902aab..5e22d8b8a 100644 --- a/xc/lib/Xdmcp/Flush.c +++ b/xc/lib/Xdmcp/Flush.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.5 1998/10/03 08:42:51 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.4 1997/01/18 06:52:07 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/Xdmcp/GenKey.c b/xc/lib/Xdmcp/GenKey.c index 9c0f3add3..3ab2676dd 100644 --- a/xc/lib/Xdmcp/GenKey.c +++ b/xc/lib/Xdmcp/GenKey.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.4 1998/10/21 06:12:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.3 1998/10/10 15:25:14 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Imakefile b/xc/lib/Xdmcp/Imakefile index 62e042db0..b4fc6c5bf 100644 --- a/xc/lib/Xdmcp/Imakefile +++ b/xc/lib/Xdmcp/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/25 1996/09/28 16:43:40 rws $ -XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.3 1998/12/20 11:57:03 dawes Exp $ #define DoNormalLib NormalLibXdmcp #define DoSharedLib SharedLibXdmcp #define DoExtraLib SharedLibXdmcp diff --git a/xc/lib/Xdmcp/IncKey.c b/xc/lib/Xdmcp/IncKey.c index 688051951..aea4f0e72 100644 --- a/xc/lib/Xdmcp/IncKey.c +++ b/xc/lib/Xdmcp/IncKey.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/RaA16.c b/xc/lib/Xdmcp/RaA16.c index 7a3db5b61..ae0731ce4 100644 --- a/xc/lib/Xdmcp/RaA16.c +++ b/xc/lib/Xdmcp/RaA16.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.2 1998/10/10 15:25:15 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/RaA32.c b/xc/lib/Xdmcp/RaA32.c index ad53585d1..5f0c6c33f 100644 --- a/xc/lib/Xdmcp/RaA32.c +++ b/xc/lib/Xdmcp/RaA32.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/RaA8.c b/xc/lib/Xdmcp/RaA8.c index eee2b37d9..397eac908 100644 --- a/xc/lib/Xdmcp/RaA8.c +++ b/xc/lib/Xdmcp/RaA8.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/RaAoA8.c b/xc/lib/Xdmcp/RaAoA8.c index 21f6f96c3..cc3aa69be 100644 --- a/xc/lib/Xdmcp/RaAoA8.c +++ b/xc/lib/Xdmcp/RaAoA8.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Unwrap.c b/xc/lib/Xdmcp/Unwrap.c index 76049a049..b91234ad4 100644 --- a/xc/lib/Xdmcp/Unwrap.c +++ b/xc/lib/Xdmcp/Unwrap.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.2 1998/10/10 15:25:16 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/WC16.c b/xc/lib/Xdmcp/WC16.c index d89b813a8..eb7130acc 100644 --- a/xc/lib/Xdmcp/WC16.c +++ b/xc/lib/Xdmcp/WC16.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.3 1998/10/25 07:11:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.2 1998/10/10 15:25:17 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/WC32.c b/xc/lib/Xdmcp/WC32.c index ba8f50fea..0739a5b0c 100644 --- a/xc/lib/Xdmcp/WC32.c +++ b/xc/lib/Xdmcp/WC32.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.3 1998/10/25 12:47:52 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/WC8.c b/xc/lib/Xdmcp/WC8.c index b1a5a9b3a..372ca41fe 100644 --- a/xc/lib/Xdmcp/WC8.c +++ b/xc/lib/Xdmcp/WC8.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.3 1998/10/25 07:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.2 1998/10/10 15:25:17 dawes Exp $ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Whead.c b/xc/lib/Xdmcp/Whead.c index 980d92c12..d8eed38cc 100644 --- a/xc/lib/Xdmcp/Whead.c +++ b/xc/lib/Xdmcp/Whead.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.2 1998/10/10 15:25:17 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Wrap.c b/xc/lib/Xdmcp/Wrap.c index a9ba4e3f6..b5ce2986e 100644 --- a/xc/lib/Xdmcp/Wrap.c +++ b/xc/lib/Xdmcp/Wrap.c @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.2 1998/10/10 15:25:18 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xos.h> #include <X11/X.h> diff --git a/xc/lib/Xdmcp/Wrap.h b/xc/lib/Xdmcp/Wrap.h index 3e3d0552d..13f8f1f77 100644 --- a/xc/lib/Xdmcp/Wrap.h +++ b/xc/lib/Xdmcp/Wrap.h @@ -3,7 +3,7 @@ * header file for compatibility with something useful */ -/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.2 1998/10/10 15:25:18 dawes Exp $ */ +/* $XFree86$ */ typedef unsigned char auth_cblock[8]; /* block size */ diff --git a/xc/lib/Xdmcp/Xdmcp.h b/xc/lib/Xdmcp/Xdmcp.h index a84874536..aa647c517 100644 --- a/xc/lib/Xdmcp/Xdmcp.h +++ b/xc/lib/Xdmcp/Xdmcp.h @@ -13,7 +13,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.3 1998/10/25 07:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.2 1998/10/10 15:25:18 dawes Exp $ */ #ifndef _XDMCP_H_ #define _XDMCP_H_ diff --git a/xc/lib/Xext/DPMS.c b/xc/lib/Xext/DPMS.c index f4592459b..fd78524f5 100644 --- a/xc/lib/Xext/DPMS.c +++ b/xc/lib/Xext/DPMS.c @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xext/DPMS.c,v 3.3 1999/03/07 14:23:31 dawes Exp $ */ +/* $XFree86$ */ /* * HISTORY diff --git a/xc/lib/Xext/Imakefile b/xc/lib/Xext/Imakefile index 67b86be21..c4653bd0b 100644 --- a/xc/lib/Xext/Imakefile +++ b/xc/lib/Xext/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/62 1997/11/24 16:48:16 kaleb $ -XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.10 2000/02/27 23:10:03 mvojkovi Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXext #define DoSharedLib SharedLibXext #define DoExtraLib SharedLibXext diff --git a/xc/lib/Xext/XAppgroup.c b/xc/lib/Xext/XAppgroup.c index ed1ee8374..8afddc75b 100644 --- a/xc/lib/Xext/XAppgroup.c +++ b/xc/lib/Xext/XAppgroup.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.6 1999/07/12 05:57:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.5 1998/10/03 08:42:54 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/xc/lib/Xext/XLbx.c b/xc/lib/Xext/XLbx.c index 496eddbe9..f4abbe44c 100644 --- a/xc/lib/Xext/XLbx.c +++ b/xc/lib/Xext/XLbx.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, Network Computing Devices */ -/* $XFree86: xc/lib/Xext/XLbx.c,v 1.2 1999/07/12 05:57:21 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/lib/Xext/XMultibuf.c b/xc/lib/Xext/XMultibuf.c index 6508b21b1..fae6dbe51 100644 --- a/xc/lib/Xext/XMultibuf.c +++ b/xc/lib/Xext/XMultibuf.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Authors: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.2 1999/07/12 05:57:22 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/lib/Xext/XSecurity.c b/xc/lib/Xext/XSecurity.c index adae1f793..30e402134 100644 --- a/xc/lib/Xext/XSecurity.c +++ b/xc/lib/Xext/XSecurity.c @@ -20,7 +20,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/lib/Xext/XSecurity.c,v 1.2 1999/07/12 05:57:22 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlibint.h> #include <stdio.h> diff --git a/xc/lib/Xext/XShm.c b/xc/lib/Xext/XShm.c index c817e7964..e901a3ff6 100644 --- a/xc/lib/Xext/XShm.c +++ b/xc/lib/Xext/XShm.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Bob Scheifler and Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xext/XShm.c,v 1.2 1999/07/12 05:57:23 dawes Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/lib/Xext/XSync.c b/xc/lib/Xext/XSync.c index 1ce3cbeb4..97d87286e 100644 --- a/xc/lib/Xext/XSync.c +++ b/xc/lib/Xext/XSync.c @@ -46,7 +46,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xext/XSync.c,v 1.3 1999/07/12 10:11:45 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #define NEED_EVENTS diff --git a/xc/lib/Xext/XTestExt1.c b/xc/lib/Xext/XTestExt1.c index d1c274a47..c0b3e36b9 100644 --- a/xc/lib/Xext/XTestExt1.c +++ b/xc/lib/Xext/XTestExt1.c @@ -47,7 +47,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.2 1999/07/12 05:57:24 dawes Exp $ */ +/* $XFree86$ */ /****************************************************************************** * include files diff --git a/xc/lib/Xext/Xcup.c b/xc/lib/Xext/Xcup.c index 5423d1424..6f3e28c0c 100644 --- a/xc/lib/Xext/Xcup.c +++ b/xc/lib/Xext/Xcup.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xext/Xcup.c,v 1.4 1999/07/12 05:57:24 dawes Exp $ */ +/* $XFree86$ */ /* Copyright 1987, 1988, 1998 The Open Group diff --git a/xc/lib/Xext/Xdbe.c b/xc/lib/Xext/Xdbe.c index b502ce752..ebb8bf5eb 100644 --- a/xc/lib/Xext/Xdbe.c +++ b/xc/lib/Xext/Xdbe.c @@ -30,7 +30,7 @@ * Xlib DBE code * *****************************************************************************/ -/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.1 1999/07/12 05:57:24 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS diff --git a/xc/lib/Xext/Xext-def.cpp b/xc/lib/Xext/Xext-def.cpp index ad9bb8e14..2c3bb3fda 100644 --- a/xc/lib/Xext/Xext-def.cpp +++ b/xc/lib/Xext/Xext-def.cpp @@ -139,4 +139,4 @@ EXPORTS XeviQueryVersion XeviGetVisualInfo /* $TOG: Xext-def.cpp /main/10 1998/01/04 12:31:45 kaleb $ */ -/* $XFree86: xc/lib/Xext/Xext-def.cpp,v 1.6 2000/08/09 23:40:13 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xext/Xextos2.def b/xc/lib/Xext/Xextos2.def index 54003944b..48517fcaa 100644 --- a/xc/lib/Xext/Xextos2.def +++ b/xc/lib/Xext/Xextos2.def @@ -1,5 +1,5 @@ LIBRARY XEXT -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xext/Xextos2.def,v 3.9 2000/04/05 18:13:18 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xext/Xextos2.def,v 3.8 1999/04/29 09:13:31 dawes Exp $" CODE PRELOAD DATA diff --git a/xc/lib/Xi/Imakefile b/xc/lib/Xi/Imakefile index 9a8b87332..914f97c45 100644 --- a/xc/lib/Xi/Imakefile +++ b/xc/lib/Xi/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.17 94/03/27 15:54:53 rws Exp $ -XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1.3 1998/12/20 22:18:56 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXi #define DoSharedLib SharedLibXi #define DoExtraLib SharedLibXi diff --git a/xc/lib/Xi/XAllowDv.c b/xc/lib/Xi/XAllowDv.c index 35aebc859..030c812c1 100644 --- a/xc/lib/Xi/XAllowDv.c +++ b/xc/lib/Xi/XAllowDv.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.1 1998/10/03 09:06:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.0 1996/08/25 13:52:20 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgDCtl.c b/xc/lib/Xi/XChgDCtl.c index ba56e68bb..4f4250ce6 100644 --- a/xc/lib/Xi/XChgDCtl.c +++ b/xc/lib/Xi/XChgDCtl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.1 1998/10/03 09:06:04 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.0 1996/08/25 13:52:22 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgFCtl.c b/xc/lib/Xi/XChgFCtl.c index d81e3ecb3..828126b78 100644 --- a/xc/lib/Xi/XChgFCtl.c +++ b/xc/lib/Xi/XChgFCtl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.0 1996/08/25 13:52:23 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgKMap.c b/xc/lib/Xi/XChgKMap.c index a10067172..557729d70 100644 --- a/xc/lib/Xi/XChgKMap.c +++ b/xc/lib/Xi/XChgKMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.0 1996/08/25 13:52:25 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgKbd.c b/xc/lib/Xi/XChgKbd.c index f7c2ca693..333948f55 100644 --- a/xc/lib/Xi/XChgKbd.c +++ b/xc/lib/Xi/XChgKbd.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.0 1996/08/25 13:52:26 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgPnt.c b/xc/lib/Xi/XChgPnt.c index 59a245c06..e31b82915 100644 --- a/xc/lib/Xi/XChgPnt.c +++ b/xc/lib/Xi/XChgPnt.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.1 1998/10/03 09:06:05 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.0 1996/08/25 13:52:27 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XChgProp.c b/xc/lib/Xi/XChgProp.c index 8ad8ccaa6..9e88b747e 100644 --- a/xc/lib/Xi/XChgProp.c +++ b/xc/lib/Xi/XChgProp.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.0 1996/08/25 13:52:29 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XCloseDev.c b/xc/lib/Xi/XCloseDev.c index f117dc3c8..d657363a8 100644 --- a/xc/lib/Xi/XCloseDev.c +++ b/xc/lib/Xi/XCloseDev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.0 1996/08/25 13:52:31 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XDevBell.c b/xc/lib/Xi/XDevBell.c index 150bf27fc..38828a41a 100644 --- a/xc/lib/Xi/XDevBell.c +++ b/xc/lib/Xi/XDevBell.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.1 1998/10/03 09:06:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.0 1996/08/25 13:52:32 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XExtInt.c b/xc/lib/Xi/XExtInt.c index 7dd80bc1e..d0b79115c 100644 --- a/xc/lib/Xi/XExtInt.c +++ b/xc/lib/Xi/XExtInt.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.3 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.2 1997/05/03 09:15:09 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XExtToWire.c b/xc/lib/Xi/XExtToWire.c index 4c7909e86..2410bdef3 100644 --- a/xc/lib/Xi/XExtToWire.c +++ b/xc/lib/Xi/XExtToWire.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.1 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.0 1996/08/25 13:52:35 dawes Exp $ */ /**************************************************************** * diff --git a/xc/lib/Xi/XGMotion.c b/xc/lib/Xi/XGMotion.c index 14ce0cd5b..52c15a029 100644 --- a/xc/lib/Xi/XGMotion.c +++ b/xc/lib/Xi/XGMotion.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.1 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.0 1996/08/25 13:52:37 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetBMap.c b/xc/lib/Xi/XGetBMap.c index 6ee5a2d16..5e2626ab7 100644 --- a/xc/lib/Xi/XGetBMap.c +++ b/xc/lib/Xi/XGetBMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.1 1998/10/03 09:06:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.0 1996/08/25 13:52:38 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetDCtl.c b/xc/lib/Xi/XGetDCtl.c index d329a6fc7..593f6e43d 100644 --- a/xc/lib/Xi/XGetDCtl.c +++ b/xc/lib/Xi/XGetDCtl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.0 1996/08/25 13:52:40 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetFCtl.c b/xc/lib/Xi/XGetFCtl.c index 4f3e671eb..ea41ad479 100644 --- a/xc/lib/Xi/XGetFCtl.c +++ b/xc/lib/Xi/XGetFCtl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.0 1996/08/25 13:52:41 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetKMap.c b/xc/lib/Xi/XGetKMap.c index f3a4d2e26..748a8fb81 100644 --- a/xc/lib/Xi/XGetKMap.c +++ b/xc/lib/Xi/XGetKMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.1 1998/10/03 09:06:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.0 1996/08/25 13:52:42 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetMMap.c b/xc/lib/Xi/XGetMMap.c index 69e151743..40cff9778 100644 --- a/xc/lib/Xi/XGetMMap.c +++ b/xc/lib/Xi/XGetMMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.0 1996/08/25 13:52:44 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetProp.c b/xc/lib/Xi/XGetProp.c index 051e1d92d..826eec2a0 100644 --- a/xc/lib/Xi/XGetProp.c +++ b/xc/lib/Xi/XGetProp.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.0 1996/08/25 13:52:46 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGetVers.c b/xc/lib/Xi/XGetVers.c index abaa5785c..1294cafa5 100644 --- a/xc/lib/Xi/XGetVers.c +++ b/xc/lib/Xi/XGetVers.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.1 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.0 1996/08/25 13:52:47 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGrDvBut.c b/xc/lib/Xi/XGrDvBut.c index fedeed09a..3e35566bf 100644 --- a/xc/lib/Xi/XGrDvBut.c +++ b/xc/lib/Xi/XGrDvBut.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.2 1998/10/03 09:06:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.1 1996/08/26 10:46:32 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGrDvKey.c b/xc/lib/Xi/XGrDvKey.c index e24323fc7..261fb2b21 100644 --- a/xc/lib/Xi/XGrDvKey.c +++ b/xc/lib/Xi/XGrDvKey.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.0 1996/08/25 13:52:50 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGrabDev.c b/xc/lib/Xi/XGrabDev.c index beb363a6e..577861de5 100644 --- a/xc/lib/Xi/XGrabDev.c +++ b/xc/lib/Xi/XGrabDev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.0 1996/08/25 13:52:51 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGtFocus.c b/xc/lib/Xi/XGtFocus.c index 70d91854f..551779995 100644 --- a/xc/lib/Xi/XGtFocus.c +++ b/xc/lib/Xi/XGtFocus.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.1 1998/10/03 09:06:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.0 1996/08/25 13:52:52 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XGtSelect.c b/xc/lib/Xi/XGtSelect.c index 4ea0cf068..ae25f426b 100644 --- a/xc/lib/Xi/XGtSelect.c +++ b/xc/lib/Xi/XGtSelect.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.1 1998/10/03 09:06:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.0 1996/08/25 13:52:54 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XIint.h b/xc/lib/Xi/XIint.h index 5c810b262..e11dd1c79 100644 --- a/xc/lib/Xi/XIint.h +++ b/xc/lib/Xi/XIint.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xi/XIint.h,v 3.0 1996/08/25 13:52:55 dawes Exp $ */ +/* $XFree86$ */ /* * XIint.h - Header definition and support file for the internal diff --git a/xc/lib/Xi/XListDev.c b/xc/lib/Xi/XListDev.c index 545a38ef6..246f63dc5 100644 --- a/xc/lib/Xi/XListDev.c +++ b/xc/lib/Xi/XListDev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XListDev.c,v 3.1 1998/10/03 09:06:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XListDev.c,v 3.0 1996/08/25 13:52:56 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XOpenDev.c b/xc/lib/Xi/XOpenDev.c index 3d0bc0daa..287b84c53 100644 --- a/xc/lib/Xi/XOpenDev.c +++ b/xc/lib/Xi/XOpenDev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.1 1998/10/03 09:06:11 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.0 1996/08/25 13:52:57 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XQueryDv.c b/xc/lib/Xi/XQueryDv.c index 30f955df3..1395c610e 100644 --- a/xc/lib/Xi/XQueryDv.c +++ b/xc/lib/Xi/XQueryDv.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.0 1996/08/25 13:52:59 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSelect.c b/xc/lib/Xi/XSelect.c index 8eed2c7cd..398b81305 100644 --- a/xc/lib/Xi/XSelect.c +++ b/xc/lib/Xi/XSelect.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSelect.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSelect.c,v 3.0 1996/08/25 13:53:01 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSetBMap.c b/xc/lib/Xi/XSetBMap.c index c8f581950..b47d0080a 100644 --- a/xc/lib/Xi/XSetBMap.c +++ b/xc/lib/Xi/XSetBMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.1 1998/10/03 09:06:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.0 1996/08/25 13:53:02 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSetDVal.c b/xc/lib/Xi/XSetDVal.c index 768636301..0032d2353 100644 --- a/xc/lib/Xi/XSetDVal.c +++ b/xc/lib/Xi/XSetDVal.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.0 1996/08/25 13:53:03 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSetMMap.c b/xc/lib/Xi/XSetMMap.c index 192ad6392..a24becf68 100644 --- a/xc/lib/Xi/XSetMMap.c +++ b/xc/lib/Xi/XSetMMap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.0 1996/08/25 13:53:05 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSetMode.c b/xc/lib/Xi/XSetMode.c index 8cd484d24..802bd3bc0 100644 --- a/xc/lib/Xi/XSetMode.c +++ b/xc/lib/Xi/XSetMode.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.0 1996/08/25 13:53:06 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XSndExEv.c b/xc/lib/Xi/XSndExEv.c index a1ee390e2..7f46b303b 100644 --- a/xc/lib/Xi/XSndExEv.c +++ b/xc/lib/Xi/XSndExEv.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.1 1998/10/03 09:06:14 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.0 1996/08/25 13:53:07 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XStFocus.c b/xc/lib/Xi/XStFocus.c index 166df78bf..e1b0c4f4b 100644 --- a/xc/lib/Xi/XStFocus.c +++ b/xc/lib/Xi/XStFocus.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.0 1996/08/25 13:53:08 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XUngrDev.c b/xc/lib/Xi/XUngrDev.c index 4d39c3911..4ad24859e 100644 --- a/xc/lib/Xi/XUngrDev.c +++ b/xc/lib/Xi/XUngrDev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.0 1996/08/25 13:53:10 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XUngrDvB.c b/xc/lib/Xi/XUngrDvB.c index a6536474d..40c8ac783 100644 --- a/xc/lib/Xi/XUngrDvB.c +++ b/xc/lib/Xi/XUngrDvB.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.1 1998/10/03 09:06:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.0 1996/08/25 13:53:11 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/XUngrDvK.c b/xc/lib/Xi/XUngrDvK.c index 4ba0ee976..41fc64164 100644 --- a/xc/lib/Xi/XUngrDvK.c +++ b/xc/lib/Xi/XUngrDvK.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.1 1998/10/03 09:06:16 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.0 1996/08/25 13:53:13 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/lib/Xi/Xios2.def b/xc/lib/Xi/Xios2.def index be668a960..2a3bd6191 100644 --- a/xc/lib/Xi/Xios2.def +++ b/xc/lib/Xi/Xios2.def @@ -1,5 +1,5 @@ LIBRARY XI -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xi/Xios2.def,v 3.6 1999/04/29 09:13:31 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xinerama/Imakefile b/xc/lib/Xinerama/Imakefile index 1c4854f34..c8b6294a1 100644 --- a/xc/lib/Xinerama/Imakefile +++ b/xc/lib/Xinerama/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.2 2000/02/29 18:38:42 dawes Exp $ +XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.1 2000/02/27 23:10:03 mvojkovi Exp $ #define DoNormalLib NormalLibXinerama #define DoSharedLib SharedLibXinerama diff --git a/xc/lib/Xinerama/Xinerama.c b/xc/lib/Xinerama/Xinerama.c index 72970c613..9f4b8796d 100644 --- a/xc/lib/Xinerama/Xinerama.c +++ b/xc/lib/Xinerama/Xinerama.c @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.1 2000/02/27 23:10:04 mvojkovi Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/lib/Xmu/AllCmap.c b/xc/lib/Xmu/AllCmap.c index f0e3dad09..bc9520567 100644 --- a/xc/lib/Xmu/AllCmap.c +++ b/xc/lib/Xmu/AllCmap.c @@ -21,7 +21,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/lib/Xmu/AllCmap.c,v 1.6 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.5 1998/10/03 09:06:20 dawes Exp $ */ #include <stdio.h> #include <X11/Xlib.h> diff --git a/xc/lib/Xmu/Atoms.c b/xc/lib/Xmu/Atoms.c index f6ed51b8e..1fb76c2b2 100644 --- a/xc/lib/Xmu/Atoms.c +++ b/xc/lib/Xmu/Atoms.c @@ -21,7 +21,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/lib/Xmu/Atoms.c,v 3.4 1998/10/03 09:06:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.3 1998/09/05 06:36:10 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple diff --git a/xc/lib/Xmu/Atoms.h b/xc/lib/Xmu/Atoms.h index ae0c1f0bc..95b7d689b 100644 --- a/xc/lib/Xmu/Atoms.h +++ b/xc/lib/Xmu/Atoms.h @@ -21,7 +21,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/lib/Xmu/Atoms.h,v 1.4 1998/10/03 09:06:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.3 1998/08/20 13:59:31 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/CharSet.h b/xc/lib/Xmu/CharSet.h index 732406a9f..33ee06d6c 100644 --- a/xc/lib/Xmu/CharSet.h +++ b/xc/lib/Xmu/CharSet.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.6 1998/10/03 09:06:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.5 1998/08/16 10:25:03 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/ClientWin.c b/xc/lib/Xmu/ClientWin.c index 4741e224b..fe3e36118 100644 --- a/xc/lib/Xmu/ClientWin.c +++ b/xc/lib/Xmu/ClientWin.c @@ -21,7 +21,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/lib/Xmu/ClientWin.c,v 1.5 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.4 1998/10/03 09:06:21 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xatom.h> diff --git a/xc/lib/Xmu/Clip.c b/xc/lib/Xmu/Clip.c index 0f6d410b4..1c849c449 100644 --- a/xc/lib/Xmu/Clip.c +++ b/xc/lib/Xmu/Clip.c @@ -24,7 +24,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/Xmu/Clip.c,v 1.2 1999/08/15 13:00:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Clip.c,v 1.1 1998/08/16 10:25:03 dawes Exp $ */ #include <stdlib.h> diff --git a/xc/lib/Xmu/CloseHook.c b/xc/lib/Xmu/CloseHook.c index 68aeb333c..0f8eac236 100644 --- a/xc/lib/Xmu/CloseHook.c +++ b/xc/lib/Xmu/CloseHook.c @@ -20,7 +20,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/lib/Xmu/CloseHook.c,v 3.3 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.2 1998/09/05 06:36:11 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay diff --git a/xc/lib/Xmu/CloseHook.h b/xc/lib/Xmu/CloseHook.h index 7684e9918..29e7ce076 100644 --- a/xc/lib/Xmu/CloseHook.h +++ b/xc/lib/Xmu/CloseHook.h @@ -21,7 +21,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/lib/Xmu/CloseHook.h,v 1.5 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.4 1998/08/20 13:59:32 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/CmapAlloc.c b/xc/lib/Xmu/CmapAlloc.c index dab0b770b..fa9fe645a 100644 --- a/xc/lib/Xmu/CmapAlloc.c +++ b/xc/lib/Xmu/CmapAlloc.c @@ -21,7 +21,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/lib/Xmu/CmapAlloc.c,v 1.5 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.4 1998/09/05 06:36:11 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/Converters.h b/xc/lib/Xmu/Converters.h index 3604ad3c6..0176d5afb 100644 --- a/xc/lib/Xmu/Converters.h +++ b/xc/lib/Xmu/Converters.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Converters.h,v 1.4 1998/10/03 09:06:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Converters.h,v 1.3 1998/08/16 10:25:06 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/CrCmap.c b/xc/lib/Xmu/CrCmap.c index bd571018a..c16abc934 100644 --- a/xc/lib/Xmu/CrCmap.c +++ b/xc/lib/Xmu/CrCmap.c @@ -21,7 +21,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/lib/Xmu/CrCmap.c,v 3.5 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.4 1998/10/03 09:06:23 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/CrPixFBit.c b/xc/lib/Xmu/CrPixFBit.c index a5121f389..1522ae20c 100644 --- a/xc/lib/Xmu/CrPixFBit.c +++ b/xc/lib/Xmu/CrPixFBit.c @@ -21,7 +21,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/lib/Xmu/CrPixFBit.c,v 1.5 1998/10/03 09:06:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.4 1998/09/05 06:36:12 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/xc/lib/Xmu/CurUtil.h b/xc/lib/Xmu/CurUtil.h index b8291ce18..50ef1733e 100644 --- a/xc/lib/Xmu/CurUtil.h +++ b/xc/lib/Xmu/CurUtil.h @@ -21,7 +21,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/lib/Xmu/CurUtil.h,v 1.4 1998/10/03 09:06:23 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.3 1998/08/20 13:59:32 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/CursorName.c b/xc/lib/Xmu/CursorName.c index 3724b0f95..0492f247a 100644 --- a/xc/lib/Xmu/CursorName.c +++ b/xc/lib/Xmu/CursorName.c @@ -21,7 +21,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/lib/Xmu/CursorName.c,v 3.4 1999/03/21 07:34:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.3 1998/10/03 09:06:24 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/CharSet.h> diff --git a/xc/lib/Xmu/CvtCache.c b/xc/lib/Xmu/CvtCache.c index 15206230b..a21235f57 100644 --- a/xc/lib/Xmu/CvtCache.c +++ b/xc/lib/Xmu/CvtCache.c @@ -21,7 +21,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/lib/Xmu/CvtCache.c,v 3.3 1998/10/03 09:06:24 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.2 1998/08/16 10:25:08 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/CvtCache.h b/xc/lib/Xmu/CvtCache.h index e239beee2..1a5295e37 100644 --- a/xc/lib/Xmu/CvtCache.h +++ b/xc/lib/Xmu/CvtCache.h @@ -21,7 +21,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/lib/Xmu/CvtCache.h,v 1.5 1999/03/21 07:34:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.4 1998/10/03 09:06:24 dawes Exp $ */ /* * Public Interfaces diff --git a/xc/lib/Xmu/CvtStdSel.c b/xc/lib/Xmu/CvtStdSel.c index 7b282d527..5bc227f79 100644 --- a/xc/lib/Xmu/CvtStdSel.c +++ b/xc/lib/Xmu/CvtStdSel.c @@ -21,7 +21,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/lib/Xmu/CvtStdSel.c,v 3.13 1999/03/21 07:34:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.12 1998/10/03 09:06:25 dawes Exp $ */ /* * This file contains routines to handle common selection targets. diff --git a/xc/lib/Xmu/DefErrMsg.c b/xc/lib/Xmu/DefErrMsg.c index 1ff23ebdf..0fabda534 100644 --- a/xc/lib/Xmu/DefErrMsg.c +++ b/xc/lib/Xmu/DefErrMsg.c @@ -21,7 +21,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/lib/Xmu/DefErrMsg.c,v 1.6 1998/10/03 09:06:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.5 1998/09/05 06:36:12 dawes Exp $ */ #include <stdio.h> #define NEED_EVENTS diff --git a/xc/lib/Xmu/DelCmap.c b/xc/lib/Xmu/DelCmap.c index f3432c056..03d61c65b 100644 --- a/xc/lib/Xmu/DelCmap.c +++ b/xc/lib/Xmu/DelCmap.c @@ -21,7 +21,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/lib/Xmu/DelCmap.c,v 1.5 1998/10/03 09:06:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.4 1998/09/05 06:36:12 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/DisplayQue.c b/xc/lib/Xmu/DisplayQue.c index 80bf56a10..c6867cdd1 100644 --- a/xc/lib/Xmu/DisplayQue.c +++ b/xc/lib/Xmu/DisplayQue.c @@ -21,7 +21,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/lib/Xmu/DisplayQue.c,v 3.2 1998/10/03 09:06:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.1 1998/08/16 10:25:09 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/DisplayQue.h b/xc/lib/Xmu/DisplayQue.h index 714e5392d..2511ae924 100644 --- a/xc/lib/Xmu/DisplayQue.h +++ b/xc/lib/Xmu/DisplayQue.h @@ -21,7 +21,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/lib/Xmu/DisplayQue.h,v 1.4 1998/10/03 09:06:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.3 1998/08/20 13:59:34 dawes Exp $ */ #ifndef _XMU_DISPLAYQUE_H_ #define _XMU_DISPLAYQUE_H_ diff --git a/xc/lib/Xmu/Distinct.c b/xc/lib/Xmu/Distinct.c index 17544107e..0a920f132 100644 --- a/xc/lib/Xmu/Distinct.c +++ b/xc/lib/Xmu/Distinct.c @@ -21,7 +21,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/lib/Xmu/Distinct.c,v 3.3 1998/10/03 09:06:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.2 1998/09/05 06:36:12 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/Xmu/DrRndRect.c b/xc/lib/Xmu/DrRndRect.c index 8ac43337e..914122345 100644 --- a/xc/lib/Xmu/DrRndRect.c +++ b/xc/lib/Xmu/DrRndRect.c @@ -21,7 +21,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/lib/Xmu/DrRndRect.c,v 1.5 1998/10/03 09:06:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.4 1998/09/05 06:36:13 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle diff --git a/xc/lib/Xmu/DrawLogo.c b/xc/lib/Xmu/DrawLogo.c index f99c0d258..b1485b624 100644 --- a/xc/lib/Xmu/DrawLogo.c +++ b/xc/lib/Xmu/DrawLogo.c @@ -21,7 +21,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/lib/Xmu/DrawLogo.c,v 1.6 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.5 1998/09/05 06:36:13 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/Xmu/Drawing.h> diff --git a/xc/lib/Xmu/Drawing.h b/xc/lib/Xmu/Drawing.h index 1e5b6837a..b1ef8870c 100644 --- a/xc/lib/Xmu/Drawing.h +++ b/xc/lib/Xmu/Drawing.h @@ -21,7 +21,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/lib/Xmu/Drawing.h,v 1.4 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.3 1998/08/20 13:59:34 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/Editres.h b/xc/lib/Xmu/Editres.h index a28cfa013..a36cba237 100644 --- a/xc/lib/Xmu/Editres.h +++ b/xc/lib/Xmu/Editres.h @@ -21,7 +21,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/lib/Xmu/Editres.h,v 1.4 1998/10/03 09:06:27 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Editres.h,v 1.3 1998/08/20 13:59:35 dawes Exp $ */ #include <X11/Xfuncproto.h> diff --git a/xc/lib/Xmu/EditresCom.c b/xc/lib/Xmu/EditresCom.c index 0d620f54f..bd1b5ccff 100644 --- a/xc/lib/Xmu/EditresCom.c +++ b/xc/lib/Xmu/EditresCom.c @@ -21,7 +21,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/lib/Xmu/EditresCom.c,v 1.12 1999/12/27 00:39:24 robin Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.11 1999/03/21 07:34:36 dawes Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium diff --git a/xc/lib/Xmu/EditresP.h b/xc/lib/Xmu/EditresP.h index b5c811d59..51a8acb86 100644 --- a/xc/lib/Xmu/EditresP.h +++ b/xc/lib/Xmu/EditresP.h @@ -21,7 +21,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/lib/Xmu/EditresP.h,v 1.4 1998/10/03 09:06:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.3 1998/08/20 13:59:35 dawes Exp $ */ /* * Author: Chris D. Peterson, MIT X Consortium diff --git a/xc/lib/Xmu/Error.h b/xc/lib/Xmu/Error.h index d857ad498..eb108ffde 100644 --- a/xc/lib/Xmu/Error.h +++ b/xc/lib/Xmu/Error.h @@ -21,7 +21,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/lib/Xmu/Error.h,v 1.4 1998/10/03 09:06:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Error.h,v 1.3 1998/08/20 13:59:35 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/ExtAgent.c b/xc/lib/Xmu/ExtAgent.c index ce3f9568e..73e6ef552 100644 --- a/xc/lib/Xmu/ExtAgent.c +++ b/xc/lib/Xmu/ExtAgent.c @@ -21,7 +21,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/lib/Xmu/ExtAgent.c,v 1.5 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.4 1998/09/05 06:36:14 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/ExtAgent.h> diff --git a/xc/lib/Xmu/ExtAgent.h b/xc/lib/Xmu/ExtAgent.h index 3e7767581..3bb4bab54 100644 --- a/xc/lib/Xmu/ExtAgent.h +++ b/xc/lib/Xmu/ExtAgent.h @@ -21,7 +21,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/lib/Xmu/ExtAgent.h,v 1.4 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.3 1998/08/20 13:59:36 dawes Exp $ */ #include <X11/Xfuncproto.h> diff --git a/xc/lib/Xmu/FToCback.c b/xc/lib/Xmu/FToCback.c index 2db2db1b8..bf2a77ae8 100644 --- a/xc/lib/Xmu/FToCback.c +++ b/xc/lib/Xmu/FToCback.c @@ -21,7 +21,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/lib/Xmu/FToCback.c,v 1.5 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.4 1998/09/05 06:36:14 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/xc/lib/Xmu/GetHost.c b/xc/lib/Xmu/GetHost.c index f129669fe..3e160449c 100644 --- a/xc/lib/Xmu/GetHost.c +++ b/xc/lib/Xmu/GetHost.c @@ -21,7 +21,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/lib/Xmu/GetHost.c,v 3.5 1998/10/03 09:06:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.4 1998/09/05 06:36:14 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/GrayPixmap.c b/xc/lib/Xmu/GrayPixmap.c index e6d0c081f..d96222006 100644 --- a/xc/lib/Xmu/GrayPixmap.c +++ b/xc/lib/Xmu/GrayPixmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.4 1998/10/03 09:06:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.3 1998/08/20 13:59:36 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/xc/lib/Xmu/Imakefile b/xc/lib/Xmu/Imakefile index af1d83bb6..7439b58b2 100644 --- a/xc/lib/Xmu/Imakefile +++ b/xc/lib/Xmu/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/82 1996/09/28 16:43:59 rws $ -XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1.7 1999/04/28 15:04:50 dawes Exp $ +XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1.6 1999/03/21 07:34:37 dawes Exp $ #define DoNormalLib NormalLibXmu #define DoSharedLib SharedLibXmu diff --git a/xc/lib/Xmu/Initer.c b/xc/lib/Xmu/Initer.c index c68070ab2..2e1c4b71e 100644 --- a/xc/lib/Xmu/Initer.c +++ b/xc/lib/Xmu/Initer.c @@ -21,7 +21,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/lib/Xmu/Initer.c,v 1.5 1999/03/21 07:34:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.c,v 1.4 1998/10/03 09:06:30 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium diff --git a/xc/lib/Xmu/Initer.h b/xc/lib/Xmu/Initer.h index a7d521228..2ba4563ac 100644 --- a/xc/lib/Xmu/Initer.h +++ b/xc/lib/Xmu/Initer.h @@ -21,7 +21,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/lib/Xmu/Initer.h,v 1.4 1998/10/03 09:06:30 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.h,v 1.3 1998/08/20 13:59:37 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/LocBitmap.c b/xc/lib/Xmu/LocBitmap.c index ee040bb3d..0455ff54d 100644 --- a/xc/lib/Xmu/LocBitmap.c +++ b/xc/lib/Xmu/LocBitmap.c @@ -21,7 +21,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/lib/Xmu/LocBitmap.c,v 3.5 1998/10/03 09:06:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.4 1998/08/16 10:25:15 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/Lookup.c b/xc/lib/Xmu/Lookup.c index a20e848d5..acaf997dd 100644 --- a/xc/lib/Xmu/Lookup.c +++ b/xc/lib/Xmu/Lookup.c @@ -21,7 +21,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/lib/Xmu/Lookup.c,v 3.6 1999/03/21 07:34:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.5 1999/01/31 12:21:20 dawes Exp $ */ #include <X11/Xmu/Lookup.h> diff --git a/xc/lib/Xmu/Lookup.h b/xc/lib/Xmu/Lookup.h index 88ca4d40d..3699a2719 100644 --- a/xc/lib/Xmu/Lookup.h +++ b/xc/lib/Xmu/Lookup.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xmu/Lookup.h,v 1.1 1999/03/21 07:34:38 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/xc/lib/Xmu/LookupCmap.c b/xc/lib/Xmu/LookupCmap.c index ccdfc3937..f415c5ac4 100644 --- a/xc/lib/Xmu/LookupCmap.c +++ b/xc/lib/Xmu/LookupCmap.c @@ -21,7 +21,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/lib/Xmu/LookupCmap.c,v 1.5 1998/10/03 09:06:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.4 1998/08/20 13:59:37 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/Lower.c b/xc/lib/Xmu/Lower.c index 50cf73ef0..b3f714c75 100644 --- a/xc/lib/Xmu/Lower.c +++ b/xc/lib/Xmu/Lower.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.9 1999/07/11 08:49:17 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lower.c,v 1.8 1999/04/28 15:04:50 dawes Exp $ */ #define XK_LATIN1 #include <X11/keysymdef.h> diff --git a/xc/lib/Xmu/RdBitF.c b/xc/lib/Xmu/RdBitF.c index 9c969f0bc..6d60058a7 100644 --- a/xc/lib/Xmu/RdBitF.c +++ b/xc/lib/Xmu/RdBitF.c @@ -21,7 +21,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/lib/Xmu/RdBitF.c,v 3.10 1999/01/31 12:21:20 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.9 1998/10/03 09:06:32 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the diff --git a/xc/lib/Xmu/ScrOfWin.c b/xc/lib/Xmu/ScrOfWin.c index 3629d5555..32885cdfe 100644 --- a/xc/lib/Xmu/ScrOfWin.c +++ b/xc/lib/Xmu/ScrOfWin.c @@ -21,7 +21,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/lib/Xmu/ScrOfWin.c,v 1.5 1998/10/03 09:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.4 1998/09/05 06:36:15 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/ShapeWidg.c b/xc/lib/Xmu/ShapeWidg.c index cd1a2aac7..1206aa56b 100644 --- a/xc/lib/Xmu/ShapeWidg.c +++ b/xc/lib/Xmu/ShapeWidg.c @@ -21,7 +21,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/lib/Xmu/ShapeWidg.c,v 1.6 1998/10/03 09:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.5 1998/09/05 06:36:15 dawes Exp $ */ #include <X11/IntrinsicP.h> #include <X11/extensions/shape.h> diff --git a/xc/lib/Xmu/StdCmap.c b/xc/lib/Xmu/StdCmap.c index 6f232e663..22d4d93b2 100644 --- a/xc/lib/Xmu/StdCmap.c +++ b/xc/lib/Xmu/StdCmap.c @@ -21,7 +21,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/lib/Xmu/StdCmap.c,v 1.4 1998/10/03 09:06:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.3 1998/08/20 13:59:38 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/StdCmap.h b/xc/lib/Xmu/StdCmap.h index bc5825372..a640e00dc 100644 --- a/xc/lib/Xmu/StdCmap.h +++ b/xc/lib/Xmu/StdCmap.h @@ -21,7 +21,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/lib/Xmu/StdCmap.h,v 1.6 1999/03/21 07:34:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.5 1998/10/03 09:06:33 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/StdSel.h b/xc/lib/Xmu/StdSel.h index 42a7ac5bc..7e751c8e4 100644 --- a/xc/lib/Xmu/StdSel.h +++ b/xc/lib/Xmu/StdSel.h @@ -21,7 +21,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/lib/Xmu/StdSel.h,v 1.6 1999/06/06 08:48:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.5 1999/03/21 07:34:38 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/StrToBS.c b/xc/lib/Xmu/StrToBS.c index 4d9c601d3..b26b0ced6 100644 --- a/xc/lib/Xmu/StrToBS.c +++ b/xc/lib/Xmu/StrToBS.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.5 1998/10/03 09:06:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.4 1998/08/16 10:25:18 dawes Exp $ */ #include <X11/Intrinsic.h> #include "Converters.h" diff --git a/xc/lib/Xmu/StrToBmap.c b/xc/lib/Xmu/StrToBmap.c index 262c02b63..a14153437 100644 --- a/xc/lib/Xmu/StrToBmap.c +++ b/xc/lib/Xmu/StrToBmap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.4 1998/10/03 09:06:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.3 1998/08/20 13:59:39 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xmu/StrToCurs.c b/xc/lib/Xmu/StrToCurs.c index 4aa55c7d6..526c3d9d7 100644 --- a/xc/lib/Xmu/StrToCurs.c +++ b/xc/lib/Xmu/StrToCurs.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.6 1998/10/03 09:06:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.5 1998/08/16 10:25:19 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xmu/StrToGrav.c b/xc/lib/Xmu/StrToGrav.c index cc6ebd6f6..20d6b35af 100644 --- a/xc/lib/Xmu/StrToGrav.c +++ b/xc/lib/Xmu/StrToGrav.c @@ -21,7 +21,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/lib/Xmu/StrToGrav.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.4 1998/08/20 13:59:39 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/Xmu/Converters.h> diff --git a/xc/lib/Xmu/StrToJust.c b/xc/lib/Xmu/StrToJust.c index c23d682ff..cad03aafd 100644 --- a/xc/lib/Xmu/StrToJust.c +++ b/xc/lib/Xmu/StrToJust.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.4 1998/08/16 10:25:19 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/xc/lib/Xmu/StrToLong.c b/xc/lib/Xmu/StrToLong.c index 9bf6fb17b..7f9ad0cb2 100644 --- a/xc/lib/Xmu/StrToLong.c +++ b/xc/lib/Xmu/StrToLong.c @@ -21,7 +21,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/lib/Xmu/StrToLong.c,v 1.6 1999/03/21 07:34:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff --git a/xc/lib/Xmu/StrToOrnt.c b/xc/lib/Xmu/StrToOrnt.c index ae01968b8..403b12582 100644 --- a/xc/lib/Xmu/StrToOrnt.c +++ b/xc/lib/Xmu/StrToOrnt.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.5 1998/10/03 09:06:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.4 1998/08/16 10:25:20 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff --git a/xc/lib/Xmu/StrToShap.c b/xc/lib/Xmu/StrToShap.c index 2accd46e7..929eb7f6d 100644 --- a/xc/lib/Xmu/StrToShap.c +++ b/xc/lib/Xmu/StrToShap.c @@ -21,7 +21,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/lib/Xmu/StrToShap.c,v 1.5 1998/10/03 09:06:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.4 1998/08/20 13:59:41 dawes Exp $ */ #include <string.h> #include <X11/Intrinsic.h> diff --git a/xc/lib/Xmu/StrToWidg.c b/xc/lib/Xmu/StrToWidg.c index b63736523..8fcfbc6be 100644 --- a/xc/lib/Xmu/StrToWidg.c +++ b/xc/lib/Xmu/StrToWidg.c @@ -21,7 +21,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/lib/Xmu/StrToWidg.c,v 1.5 1998/10/03 09:06:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.4 1998/09/05 06:36:16 dawes Exp $ */ /* * XmuCvtStringToWidget diff --git a/xc/lib/Xmu/SysUtil.h b/xc/lib/Xmu/SysUtil.h index 85cacf287..bae0b294c 100644 --- a/xc/lib/Xmu/SysUtil.h +++ b/xc/lib/Xmu/SysUtil.h @@ -21,7 +21,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/lib/Xmu/SysUtil.h,v 1.6 1998/10/03 09:06:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.5 1998/09/05 06:36:16 dawes Exp $ */ #ifndef _SYSUTIL_H_ #define _SYSUTIL_H_ diff --git a/xc/lib/Xmu/UpdMapHint.c b/xc/lib/Xmu/UpdMapHint.c index dc2b0f7b8..7d5352873 100644 --- a/xc/lib/Xmu/UpdMapHint.c +++ b/xc/lib/Xmu/UpdMapHint.c @@ -21,7 +21,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/lib/Xmu/UpdMapHint.c,v 1.5 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.4 1998/09/05 06:36:16 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/VisCmap.c b/xc/lib/Xmu/VisCmap.c index 5b1ddc5ca..dca9435a9 100644 --- a/xc/lib/Xmu/VisCmap.c +++ b/xc/lib/Xmu/VisCmap.c @@ -21,7 +21,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/lib/Xmu/VisCmap.c,v 1.5 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.4 1998/08/20 13:59:42 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium diff --git a/xc/lib/Xmu/WidgetNode.c b/xc/lib/Xmu/WidgetNode.c index f0ce194f4..46d20d1e3 100644 --- a/xc/lib/Xmu/WidgetNode.c +++ b/xc/lib/Xmu/WidgetNode.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.7 1999/12/27 00:39:24 robin Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.6 1999/03/21 07:34:39 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/WidgetNode.h b/xc/lib/Xmu/WidgetNode.h index 232b2025b..43d48b471 100644 --- a/xc/lib/Xmu/WidgetNode.h +++ b/xc/lib/Xmu/WidgetNode.h @@ -21,7 +21,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/lib/Xmu/WidgetNode.h,v 1.4 1998/10/03 09:06:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.3 1998/08/20 13:59:42 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium diff --git a/xc/lib/Xmu/WinUtil.h b/xc/lib/Xmu/WinUtil.h index 5ea10e66d..ebe3b8f1b 100644 --- a/xc/lib/Xmu/WinUtil.h +++ b/xc/lib/Xmu/WinUtil.h @@ -21,7 +21,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/lib/Xmu/WinUtil.h,v 1.5 1998/10/03 09:06:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.4 1998/08/20 13:59:42 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/Xct.c b/xc/lib/Xmu/Xct.c index 6cec0db2e..d0506bca8 100644 --- a/xc/lib/Xmu/Xct.c +++ b/xc/lib/Xmu/Xct.c @@ -21,7 +21,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/lib/Xmu/Xct.c,v 1.6 1999/03/21 07:34:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.c,v 1.5 1998/10/03 09:06:38 dawes Exp $ */ #include <X11/Xfuncs.h> #include "Xct.h" diff --git a/xc/lib/Xmu/Xct.h b/xc/lib/Xmu/Xct.h index 8e22db01e..54f400346 100644 --- a/xc/lib/Xmu/Xct.h +++ b/xc/lib/Xmu/Xct.h @@ -21,7 +21,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/lib/Xmu/Xct.h,v 1.5 1999/03/21 07:34:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.h,v 1.4 1998/10/03 09:06:38 dawes Exp $ */ #ifndef _Xct_h #define _Xct_h diff --git a/xc/lib/Xmu/Xmu-def.cpp b/xc/lib/Xmu/Xmu-def.cpp index 9e2c9d177..821256cb2 100644 --- a/xc/lib/Xmu/Xmu-def.cpp +++ b/xc/lib/Xmu/Xmu-def.cpp @@ -97,4 +97,4 @@ XctFree XctNextItem XctReset -/* $XFree86: xc/lib/Xmu/Xmu-def.cpp,v 1.1 2000/08/09 23:40:13 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xmu/Xmu.h b/xc/lib/Xmu/Xmu.h index 8fe0764df..85b84420c 100644 --- a/xc/lib/Xmu/Xmu.h +++ b/xc/lib/Xmu/Xmu.h @@ -21,7 +21,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/lib/Xmu/Xmu.h,v 1.5 1998/10/03 09:06:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.4 1998/09/05 06:36:17 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities diff --git a/xc/lib/Xmu/Xmuos2.def b/xc/lib/Xmu/Xmuos2.def index 0c74dc1ee..3662d9198 100644 --- a/xc/lib/Xmu/Xmuos2.def +++ b/xc/lib/Xmu/Xmuos2.def @@ -1,5 +1,5 @@ LIBRARY Xmu -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xmu/Xmuos2.def,v 3.6 1999/04/29 09:13:32 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xp/Imakefile b/xc/lib/Xp/Imakefile index d50466175..0a999377b 100644 --- a/xc/lib/Xp/Imakefile +++ b/xc/lib/Xp/Imakefile @@ -36,7 +36,7 @@ XCOMM $XConsortium: Imakefile /main/2 1996/11/16 15:20:42 rws $ ** ****************************************************************************** *****************************************************************************/ -XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1.2 1998/12/20 11:57:06 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXp diff --git a/xc/lib/Xp/Xp-def.cpp b/xc/lib/Xp/Xp-def.cpp index c8d5050c9..98cbc8472 100644 --- a/xc/lib/Xp/Xp-def.cpp +++ b/xc/lib/Xp/Xp-def.cpp @@ -39,4 +39,4 @@ EXPORTS XpStartJob XpStartPage /* $XConsortium: Xp-def.cpp /main/1 1996/11/13 14:44:46 lehors $ */ -/* $XFree86: xc/lib/Xp/Xp-def.cpp,v 1.2 2000/08/09 23:40:13 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xp/XpAttr.c b/xc/lib/Xp/XpAttr.c index 44f545abe..a1ee66fbd 100644 --- a/xc/lib/Xp/XpAttr.c +++ b/xc/lib/Xp/XpAttr.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.4 2000/01/25 18:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.3 1996/12/29 13:43:18 dawes Exp $ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpContext.c b/xc/lib/Xp/XpContext.c index 6bbad0dc9..3b2c33fbc 100644 --- a/xc/lib/Xp/XpContext.c +++ b/xc/lib/Xp/XpContext.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpContext.c,v 1.3 2000/01/25 18:37:32 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpExtUtil.c b/xc/lib/Xp/XpExtUtil.c index ede71a311..c3188bc11 100644 --- a/xc/lib/Xp/XpExtUtil.c +++ b/xc/lib/Xp/XpExtUtil.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtUtil.c,v 1.2 2000/01/25 18:37:32 dawes Exp $ */ +/* $XFree86$ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/lib/Xp/XpExtVer.c b/xc/lib/Xp/XpExtVer.c index b5a28a1f9..72878c0f0 100644 --- a/xc/lib/Xp/XpExtVer.c +++ b/xc/lib/Xp/XpExtVer.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtVer.c,v 1.2 2000/01/25 18:37:32 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpGetData.c b/xc/lib/Xp/XpGetData.c index 4ae556cf4..22fe8a9b1 100644 --- a/xc/lib/Xp/XpGetData.c +++ b/xc/lib/Xp/XpGetData.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpGetData.c,v 1.2 2000/01/25 18:37:33 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpImageRes.c b/xc/lib/Xp/XpImageRes.c index 64273ced4..a90b18bb3 100644 --- a/xc/lib/Xp/XpImageRes.c +++ b/xc/lib/Xp/XpImageRes.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpImageRes.c,v 1.2 2000/01/25 18:37:33 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpInput.c b/xc/lib/Xp/XpInput.c index 0562b739c..637692a19 100644 --- a/xc/lib/Xp/XpInput.c +++ b/xc/lib/Xp/XpInput.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpInput.c,v 1.2 2000/01/25 18:37:33 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpJob.c b/xc/lib/Xp/XpJob.c index b1a5d130e..bf86b64b0 100644 --- a/xc/lib/Xp/XpJob.c +++ b/xc/lib/Xp/XpJob.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpJob.c,v 1.2 1997/01/12 10:39:56 dawes Exp $ */ +/* $XFree86$ */ #if defined(sun) && defined(i386) && defined(SVR4) #define __EXTENSIONS__ diff --git a/xc/lib/Xp/XpPageDim.c b/xc/lib/Xp/XpPageDim.c index bbd73e977..ff7afa8b5 100644 --- a/xc/lib/Xp/XpPageDim.c +++ b/xc/lib/Xp/XpPageDim.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPageDim.c,v 1.2 2000/01/25 18:37:34 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpPrinter.c b/xc/lib/Xp/XpPrinter.c index fa301b9b3..ed898624b 100644 --- a/xc/lib/Xp/XpPrinter.c +++ b/xc/lib/Xp/XpPrinter.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.5 2000/01/25 18:37:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.4 1997/05/31 13:51:17 dawes Exp $ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/XpScreens.c b/xc/lib/Xp/XpScreens.c index d7903d057..bfc8d387f 100644 --- a/xc/lib/Xp/XpScreens.c +++ b/xc/lib/Xp/XpScreens.c @@ -34,7 +34,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpScreens.c,v 1.2 2000/01/25 18:37:34 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES diff --git a/xc/lib/Xp/Xpos2.def b/xc/lib/Xp/Xpos2.def index fb3334efc..bccb0314b 100644 --- a/xc/lib/Xp/Xpos2.def +++ b/xc/lib/Xp/Xpos2.def @@ -1,5 +1,5 @@ LIBRARY XP -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xp/Xpos2.def,v 1.2 1999/04/29 09:13:33 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xpm/Imakefile b/xc/lib/Xpm/Imakefile index 3c4c47bf8..6c2f198a0 100644 --- a/xc/lib/Xpm/Imakefile +++ b/xc/lib/Xpm/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.2 1999/01/31 12:21:22 dawes Exp $ +XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $ /* This is a simplified version of the standard Xpm Imakefile */ @@ -22,8 +22,13 @@ REQUIREDLIBS = SharedXpmReqs * if your system doesn't provide pipe add -DNO_ZPIPE * if on your system sprintf doesn't return the number of bytes transmitted * add -DVOID_SPRINTF + * if you want xpm to try name.xpm.Z and name.xpm.gz when asked to read + * name.xpm , add -DSTAT_ZFILE */ +#if defined(LinuxArchitecture) +ZFILEDEF = -DSTAT_ZFILE +#endif #if defined(UltrixArchitecture) || \ (defined(MipsArchitecture) && !defined(SGIArchitecture)) STRDUPDEF = -DNEED_STRDUP @@ -41,7 +46,7 @@ SPRINTFDEF = -DVOID_SPRINTF ZPIPEDEF = -DNO_ZPIPE #endif -DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) +DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF) HEADERS = xpm.h diff --git a/xc/lib/Xpm/Xpm-def.cpp b/xc/lib/Xpm/Xpm-def.cpp index 12b86d63e..84cf843ed 100644 --- a/xc/lib/Xpm/Xpm-def.cpp +++ b/xc/lib/Xpm/Xpm-def.cpp @@ -36,4 +36,4 @@ EXPORTS XpmWriteFileFromPixmap XpmWriteFileFromXpmImage -/* $XFree86: xc/lib/Xpm/Xpm-def.cpp,v 1.1 2000/08/09 23:40:13 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xpm/Xpmos2.def b/xc/lib/Xpm/Xpmos2.def index 9ff1ca080..ff53f20f3 100644 --- a/xc/lib/Xpm/Xpmos2.def +++ b/xc/lib/Xpm/Xpmos2.def @@ -1,5 +1,5 @@ LIBRARY XPM -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xpm/Xpmos2.def,v 1.1 1999/04/29 09:26:37 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xrender/Composite.c b/xc/lib/Xrender/Composite.c new file mode 100644 index 000000000..b2c65db50 --- /dev/null +++ b/xc/lib/Xrender/Composite.c @@ -0,0 +1,65 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#include "Xrenderint.h" + +void +XRenderComposite (Display *dpy, + int op, + Picture src, + Picture mask, + Picture dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderCompositeReq *req; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderComposite, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderComposite; + req->op = (CARD8) op; + req->src = src; + req->mask = mask; + req->dst = dst; + req->xSrc = src_x; + req->ySrc = src_y; + req->xMask = mask_x; + req->yMask = mask_y; + req->xDst = dst_x; + req->yDst = dst_y; + req->width = width; + req->height = height; + UnlockDisplay(dpy); + SyncHandle(); +} diff --git a/xc/lib/Xrender/Glyph.c b/xc/lib/Xrender/Glyph.c new file mode 100644 index 000000000..217a3bb6c --- /dev/null +++ b/xc/lib/Xrender/Glyph.c @@ -0,0 +1,176 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#include "Xrenderint.h" + +GlyphSet +XRenderCreateGlyphSet (Display *dpy, XRenderPictFormat *format) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + GlyphSet gsid; + xRenderCreateGlyphSetReq *req; + + RenderCheckExtension (dpy, info, 0); + LockDisplay(dpy); + GetReq(RenderCreateGlyphSet, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderCreateGlyphSet; + req->gsid = gsid = _XAllocID(dpy); + req->format = format->id; + UnlockDisplay(dpy); + SyncHandle(); + return gsid; +} + +GlyphSet +XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + GlyphSet gsid; + xRenderReferenceGlyphSetReq *req; + + RenderCheckExtension (dpy, info, 0); + LockDisplay(dpy); + GetReq(RenderReferenceGlyphSet, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderReferenceGlyphSet; + req->gsid = gsid = _XAllocID(dpy); + req->existing = existing; + UnlockDisplay(dpy); + SyncHandle(); + return gsid; +} + +void +XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderFreeGlyphSetReq *req; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderFreeGlyphSet, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderFreeGlyphSet; + req->glyphset = glyphset; + UnlockDisplay(dpy); + SyncHandle(); +} + +void +XRenderAddGlyphs (Display *dpy, + GlyphSet glyphset, + Glyph *gids, + XGlyphInfo *glyphs, + int nglyphs, + char *images, + int nbyte_images) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderAddGlyphsReq *req; + long len; + + if (nbyte_images & 3) + nbyte_images += 4 - (nbyte_images & 3); + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderAddGlyphs, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderAddGlyphs; + req->glyphset = glyphset; + req->nglyphs = nglyphs; + len = (nglyphs * (SIZEOF (xGlyphInfo) + 4) + nbyte_images) >> 2; + SetReqLen(req, len, len); + Data32 (dpy, (long *) gids, nglyphs * 4); + Data16 (dpy, (short *) glyphs, nglyphs * SIZEOF (xGlyphInfo)); + Data (dpy, images, nbyte_images); + UnlockDisplay(dpy); + SyncHandle(); +} + +void +XRenderFreeGlyphs (Display *dpy, + GlyphSet glyphset, + Glyph *gids, + int nglyphs) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderFreeGlyphsReq *req; + long len; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderFreeGlyphs, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderFreeGlyphs; + len = nglyphs; + SetReqLen(req, len, len); + len <<= 2; + Data32 (dpy, (long *) gids, len); + UnlockDisplay(dpy); + SyncHandle(); +} + +void +XRenderCompositeString8 (Display *dpy, + int op, + Picture src, + Picture dst, + XRenderPictFormat *maskFormat, + GlyphSet glyphset, + int xSrc, + int ySrc, + int xDst, + int yDst, + char *string, + int nchar) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderCompositeGlyphs8Req *req; + long len; + xGlyphElt *elt; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReqExtra(RenderCompositeGlyphs8, SIZEOF (xGlyphElt), req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderCompositeGlyphs8; + req->op = op; + req->src = src; + req->dst = dst; + req->maskFormat = maskFormat ? maskFormat->id : None; + req->glyphset = glyphset; + req->xSrc = xSrc; + req->ySrc = ySrc; + elt = (xGlyphElt *) (req + 1); + elt->len = nchar; + elt->deltax = xDst; + elt->deltay = yDst; + len = (nchar + 3) >> 2; + SetReqLen(req, len, len); + Data(dpy, string, nchar); + UnlockDisplay(dpy); + SyncHandle(); +} diff --git a/xc/lib/Xrender/Imakefile b/xc/lib/Xrender/Imakefile new file mode 100644 index 000000000..b18b1cfb1 --- /dev/null +++ b/xc/lib/Xrender/Imakefile @@ -0,0 +1,39 @@ +XCOMM $XFree86: xc/lib/Xrender/Imakefile,v 1.1 2000/08/26 00:38:36 keithp Exp $ + + +#define DoNormalLib NormalLibXrender +#define DoSharedLib SharedLibXrender +#define DoDebugLib DebugLibXrender +#define DoProfileLib ProfileLibXrender +#define LibName Xrender +#define SoRev SOXRENDERREV +#define IncSubdir X11 +#define IncSubSubdir extensions + +#include <Threads.tmpl> + +#ifdef SharedXrenderReqs +REQUIREDLIBS = SharedXrenderReqs +#endif + +#if Malloc0ReturnsNull +ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL +#endif + + DEFINES = $(ALLOC_DEFINES) + INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) + SRCS = Xrender.c \ + Composite.c \ + Glyph.c \ + Picture.c + OBJS = Xrender.o \ + Composite.o \ + Glyph.o \ + Picture.o + LINTLIBS = $(LINTXLIB) + +HEADERS = Xrender.h + +#include <Library.tmpl> + +DependTarget() diff --git a/xc/lib/Xrender/Picture.c b/xc/lib/Xrender/Picture.c new file mode 100644 index 000000000..59b9aaa1d --- /dev/null +++ b/xc/lib/Xrender/Picture.c @@ -0,0 +1,136 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#include "Xrenderint.h" + +void +_XRenderProcessPictureAttributes (Display *dpy, + xRenderChangePictureReq *req, + unsigned long valuemask, + XRenderPictureAttributes *attributes) +{ + unsigned long values[32]; + register unsigned long *value = values; + unsigned int nvalues; + + if (valuemask & CPRepeat) + *value++ = attributes->repeat; + if (valuemask & CPAlphaMap) + *value++ = attributes->alpha_map; + if (valuemask & CPAlphaXOrigin) + *value++ = attributes->alpha_x_origin; + if (valuemask & CPAlphaYOrigin) + *value++ = attributes->alpha_y_origin; + if (valuemask & CPClipXOrigin) + *value++ = attributes->clip_x_origin; + if (valuemask & CPClipYOrigin) + *value++ = attributes->clip_y_origin; + if (valuemask & CPClipMask) + *value++ = attributes->clip_mask; + if (valuemask & CPGraphicsExposure) + *value++ = attributes->graphics_exposures; + if (valuemask & CPSubwindowMode) + *value++ = attributes->subwindow_mode; + if (valuemask & CPPolyEdge) + *value++ = attributes->poly_edge; + if (valuemask & CPPolyMode) + *value++ = attributes->poly_mode; + if (valuemask & CPDither) + *value++ = attributes->dither; + + req->length += (nvalues = value - values); + + nvalues <<= 2; /* watch out for macros... */ + Data32 (dpy, (long *) values, (long)nvalues); +} + +Picture +XRenderCreatePicture (Display *dpy, + Drawable drawable, + XRenderPictFormat *format, + unsigned long valuemask, + XRenderPictureAttributes *attributes) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + Picture pid; + xRenderCreatePictureReq *req; + + RenderCheckExtension (dpy, info, 0); + LockDisplay(dpy); + GetReq(RenderCreatePicture, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderCreatePicture; + req->pid = pid = _XAllocID(dpy); + req->drawable = drawable; + req->format = format->id; + if ((req->mask = valuemask)) + _XRenderProcessPictureAttributes (dpy, + (xRenderChangePictureReq *) req, + valuemask, + attributes); + UnlockDisplay(dpy); + SyncHandle(); + return pid; +} + +void +XRenderChangePicture (Display *dpy, + Picture picture, + unsigned long valuemask, + XRenderPictureAttributes *attributes) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderChangePictureReq *req; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderChangePicture, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderChangePicture; + req->picture = picture; + _XRenderProcessPictureAttributes (dpy, + req, + valuemask, + attributes); + UnlockDisplay(dpy); + SyncHandle(); +} + +void +XRenderFreePicture (Display *dpy, + Picture picture) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderFreePictureReq *req; + + RenderSimpleCheckExtension (dpy, info); + LockDisplay(dpy); + GetReq(RenderFreePicture, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderFreePicture; + req->picture = picture; + UnlockDisplay(dpy); + SyncHandle(); +} diff --git a/xc/lib/Xrender/Xrender.c b/xc/lib/Xrender/Xrender.c new file mode 100644 index 000000000..6294012fd --- /dev/null +++ b/xc/lib/Xrender/Xrender.c @@ -0,0 +1,336 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#include "Xrenderint.h" + +XExtensionInfo XRenderExtensionInfo; +char XRenderExtensionName[] = RENDER_NAME; + +static int XRenderCloseDisplay(); + +static /* const */ XExtensionHooks render_extension_hooks = { + NULL, /* create_gc */ + NULL, /* copy_gc */ + NULL, /* flush_gc */ + NULL, /* free_gc */ + NULL, /* create_font */ + NULL, /* free_font */ + XRenderCloseDisplay, /* close_display */ + NULL, /* wire_to_event */ + NULL, /* event_to_wire */ + NULL, /* error */ + NULL, /* error_string */ +}; + +XExtDisplayInfo * +XRenderFindDisplay (Display *dpy) +{ + XExtDisplayInfo *dpyinfo; + + dpyinfo = XextFindDisplay (&XRenderExtensionInfo, dpy); + if (!dpyinfo) + dpyinfo = XextAddDisplay (&XRenderExtensionInfo, dpy, + XRenderExtensionName, + &render_extension_hooks, + 0, 0); + return dpyinfo; +} + +static int +XRenderCloseDisplay (Display *dpy, XExtCodes *codes) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + if (info->data) XFree (info->data); + + return XextRemoveDisplay (&XRenderExtensionInfo, dpy); +} + +/**************************************************************************** + * * + * Render public interfaces * + * * + ****************************************************************************/ + +Bool XRenderQueryExtension (Display *dpy, int *event_basep, int *error_basep) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + + if (XextHasExtension(info)) { + *event_basep = info->codes->first_event; + *error_basep = info->codes->first_error; + return True; + } else { + return False; + } +} + + +Status XRenderQueryVersion (Display *dpy, + int *major_versionp, + int *minor_versionp) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderQueryVersionReply rep; + xRenderQueryVersionReq *req; + + RenderCheckExtension (dpy, info, 0); + + LockDisplay (dpy); + GetReq (RenderQueryVersion, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderQueryVersion; + req->majorVersion = RENDER_MAJOR; + req->minorVersion = RENDER_MINOR; + if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { + UnlockDisplay (dpy); + SyncHandle (); + return 0; + } + *major_versionp = rep.majorVersion; + *minor_versionp = rep.minorVersion; + UnlockDisplay (dpy); + SyncHandle (); + return 1; +} + +XRenderPictFormat * +_XRenderFindFormat (XRenderInfo *xri, PictFormat format) +{ + int nf; + + for (nf = 0; nf < xri->nformat; nf++) + if (xri->format[nf].id == format) + return &xri->format[nf]; + return 0; +} + +Visual * +_XRenderFindVisual (Display *dpy, VisualID vid) +{ + XVisualInfo temp, *vi; + Visual *v; + int nvi; + + temp.visualid = vid; + vi = XGetVisualInfo (dpy, VisualIDMask, &temp, &nvi); + if (vi) + { + v = vi->visual; + XFree (vi); + } + else + v = 0; + return v; +} + +Status +XRenderQueryFormats (Display *dpy) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderQueryPictFormatsReply rep; + xRenderQueryPictFormatsReq *req; + XRenderInfo *xri; + XRenderPictFormat *format; + XRenderScreen *screen; + XRenderDepth *depth; + XRenderVisual *visual; + xPictFormInfo *xFormat; + xPictScreen *xScreen; + xPictDepth *xDepth; + xPictVisual *xVisual; + int nf, ns, nd, nv; + int rlength; + + RenderCheckExtension (dpy, info, 0); + LockDisplay (dpy); + GetReq (RenderQueryPictFormats, req); + req->reqType = info->codes->major_opcode; + req->renderReqType = X_RenderQueryPictFormats; + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { + UnlockDisplay (dpy); + SyncHandle (); + return 0; + } + xri = (XRenderInfo *) Xmalloc (sizeof (XRenderInfo) + + rep.numFormats * sizeof (XRenderPictFormat) + + rep.numScreens * sizeof (XRenderScreen) + + rep.numDepths * sizeof (XRenderDepth) + + rep.numVisuals * sizeof (XRenderVisual)); + xri->format = (XRenderPictFormat *) (xri + 1); + xri->nformat = rep.numFormats; + xri->screen = (XRenderScreen *) (xri->format + rep.numFormats); + xri->nscreen = rep.numScreens; + xri->depth = (XRenderDepth *) (xri->screen + rep.numScreens); + xri->ndepth = rep.numDepths; + xri->visual = (XRenderVisual *) (xri->depth + rep.numDepths); + xri->nvisual = rep.numVisuals; + rlength = (rep.numFormats * sizeof (xPictFormInfo) + + rep.numScreens * sizeof (xPictScreen) + + rep.numDepths * sizeof (xPictDepth) + + rep.numVisuals * sizeof (xPictVisual)); + xFormat = (xPictFormInfo *) Xmalloc (rlength); + + if (!xri || !xFormat) + { + if (xri) Xfree (xri); + if (xFormat) Xfree (xFormat); + _XEatData (dpy, rlength); + UnlockDisplay (dpy); + SyncHandle (); + return 0; + } + _XRead (dpy, (char *) xFormat, rlength); + format = xri->format; + for (nf = 0; nf < rep.numFormats; nf++) + { + format->id = xFormat->id; + format->type = xFormat->type; + format->depth = xFormat->depth; + format->direct.red = xFormat->direct.red; + format->direct.redMask = xFormat->direct.redMask; + format->direct.green = xFormat->direct.green; + format->direct.greenMask = xFormat->direct.greenMask; + format->direct.blue = xFormat->direct.blue; + format->direct.blueMask = xFormat->direct.blueMask; + format->direct.alpha = xFormat->direct.alpha; + format->direct.alphaMask = xFormat->direct.alphaMask; + format->colormap = xFormat->colormap; + format++; + xFormat++; + } + xScreen = (xPictScreen *) xFormat; + screen = xri->screen; + depth = xri->depth; + visual = xri->visual; + for (ns = 0; ns < xri->nscreen; ns++) + { + screen->depths = depth; + screen->ndepths = xScreen->nDepth; + screen->fallback = _XRenderFindFormat (xri, xScreen->fallback); + xDepth = (xPictDepth *) (xScreen + 1); + for (nd = 0; nd < screen->ndepths; nd++) + { + depth->depth = xDepth->depth; + depth->nvisuals = xDepth->nPictVisuals; + depth->visuals = visual; + xVisual = (xPictVisual *) (xDepth + 1); + for (nv = 0; nv < depth->nvisuals; nv++) + { + visual->visual = _XRenderFindVisual (dpy, xVisual->visual); + visual->format = _XRenderFindFormat (xri, xVisual->format); + visual++; + xVisual++; + } + depth++; + xDepth = (xPictDepth *) xVisual; + } + xScreen = (xPictScreen *) xDepth; + } + info->data = (XPointer) xri; + return 1; +} + +XRenderPictFormat * +XRenderFindVisualFormat (Display *dpy, Visual *visual) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + int nv; + XRenderInfo *xri; + XRenderVisual *xrv; + + RenderCheckExtension (dpy, info, 0); + if (!info->data) + { + if (!XRenderQueryFormats (dpy)) + return 0; + } + xri = (XRenderInfo *) info->data; + for (nv = 0, xrv = xri->visual; nv < xri->nvisual; nv++, xrv++) + if (xrv->visual == visual) + return xrv->format; + return 0; +} + +XRenderPictFormat * +XRenderFindFormat (Display *dpy, + unsigned long mask, + XRenderPictFormat *template, + int count) +{ + XExtDisplayInfo *info = XRenderFindDisplay (dpy); + int nf; + XRenderInfo *xri; + + RenderCheckExtension (dpy, info, 0); + if (!info->data) + { + if (!XRenderQueryFormats (dpy)) + return 0; + } + xri = (XRenderInfo *) info->data; + for (nf = 0; nf < xri->nformat; nf++) + { + if (mask & PictFormatID) + if (template->id != xri->format[nf].id) + continue; + if (mask & PictFormatType) + if (template->type != xri->format[nf].type) + continue; + if (mask & PictFormatDepth) + if (template->depth != xri->format[nf].depth) + continue; + if (mask & PictFormatRed) + if (template->direct.red != xri->format[nf].direct.red) + continue; + if (mask & PictFormatRedMask) + if (template->direct.redMask != xri->format[nf].direct.redMask) + continue; + if (mask & PictFormatGreen) + if (template->direct.green != xri->format[nf].direct.green) + continue; + if (mask & PictFormatGreenMask) + if (template->direct.greenMask != xri->format[nf].direct.greenMask) + continue; + if (mask & PictFormatBlue) + if (template->direct.blue != xri->format[nf].direct.blue) + continue; + if (mask & PictFormatBlueMask) + if (template->direct.blueMask != xri->format[nf].direct.blueMask) + continue; + if (mask & PictFormatAlpha) + if (template->direct.alpha != xri->format[nf].direct.alpha) + continue; + if (mask & PictFormatAlphaMask) + if (template->direct.alphaMask != xri->format[nf].direct.alphaMask) + continue; + if (mask & PictFormatColormap) + if (template->colormap != xri->format[nf].colormap) + continue; + if (count-- == 0) + return &xri->format[nf]; + } + return 0; +} + diff --git a/xc/lib/Xrender/Xrender.h b/xc/lib/Xrender/Xrender.h new file mode 100644 index 000000000..c65b9d46a --- /dev/null +++ b/xc/lib/Xrender/Xrender.h @@ -0,0 +1,203 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _XRENDER_H_ +#define _XRENDER_H_ + +#include "render.h" + +typedef struct { + short red; + short redMask; + short green; + short greenMask; + short blue; + short blueMask; + short alpha; + short alphaMask; +} XRenderDirectFormat; + +typedef struct { + PictFormat id; + int type; + int depth; + XRenderDirectFormat direct; + Colormap colormap; +} XRenderPictFormat; + +#define PictFormatID (1 << 0) +#define PictFormatType (1 << 1) +#define PictFormatDepth (1 << 2) +#define PictFormatRed (1 << 3) +#define PictFormatRedMask (1 << 4) +#define PictFormatGreen (1 << 5) +#define PictFormatGreenMask (1 << 6) +#define PictFormatBlue (1 << 7) +#define PictFormatBlueMask (1 << 8) +#define PictFormatAlpha (1 << 9) +#define PictFormatAlphaMask (1 << 10) +#define PictFormatColormap (1 << 11) + +typedef struct { + Visual *visual; + XRenderPictFormat *format; +} XRenderVisual; + +typedef struct { + int depth; + int nvisuals; + XRenderVisual *visuals; +} XRenderDepth; + +typedef struct { + XRenderDepth *depths; + int ndepths; + XRenderPictFormat *fallback; +} XRenderScreen; + +typedef struct _XRenderInfo { + XRenderPictFormat *format; + int nformat; + XRenderScreen *screen; + int nscreen; + XRenderDepth *depth; + int ndepth; + XRenderVisual *visual; + int nvisual; +} XRenderInfo; + +typedef struct _XRenderPictureAttributes { + Bool repeat; + Picture alpha_map; + int alpha_x_origin; + int alpha_y_origin; + int clip_x_origin; + int clip_y_origin; + Pixmap clip_mask; + Bool graphics_exposures; + int subwindow_mode; + int poly_edge; + int poly_mode; + Atom dither; +} XRenderPictureAttributes; + +typedef struct _XGlyphInfo { + unsigned short width; + unsigned short height; + short x; + short y; + short xOff; + short yOff; +} XGlyphInfo; + +Bool XRenderQueryExtension (Display *dpy, int *event_basep, int *error_basep); + +Status XRenderQueryVersion (Display *dpy, + int *major_versionp, + int *minor_versionp); + +Status XRenderQueryFormats (Display *dpy); + +XRenderPictFormat * +XRenderFindVisualFormat (Display *dpy, Visual *visual); + +XRenderPictFormat * +XRenderFindFormat (Display *dpy, + unsigned long mask, + XRenderPictFormat *template, + int count); + +Picture +XRenderCreatePicture (Display *dpy, + Drawable drawable, + XRenderPictFormat *format, + unsigned long valuemask, + XRenderPictureAttributes *attributes); + +void +XRenderChangePicture (Display *dpy, + Picture picture, + unsigned long valuemask, + XRenderPictureAttributes *attributes); + +void +XRenderFreePicture (Display *dpy, + Picture picture); + +void +XRenderComposite (Display *dpy, + int op, + Picture src, + Picture mask, + Picture dst, + int src_x, + int src_y, + int mask_x, + int mask_y, + int dst_x, + int dst_y, + unsigned int width, + unsigned int height); + +GlyphSet +XRenderCreateGlyphSet (Display *dpy, XRenderPictFormat *format); + +GlyphSet +XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing); + +void +XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset); + +void +XRenderAddGlyphs (Display *dpy, + GlyphSet glyphset, + Glyph *gids, + XGlyphInfo *glyphs, + int nglyphs, + char *images, + int nbyte_images); + +void +XRenderFreeGlyphs (Display *dpy, + GlyphSet glyphset, + Glyph *gids, + int nglyphs); + +void +XRenderCompositeString8 (Display *dpy, + int op, + Picture src, + Picture dst, + XRenderPictFormat *maskFormat, + GlyphSet glyphset, + int xSrc, + int ySrc, + int xDst, + int yDst, + char *string, + int nchar); + + +#endif /* _XRENDER_H_ */ diff --git a/xc/lib/Xrender/Xrenderint.h b/xc/lib/Xrender/Xrenderint.h new file mode 100644 index 000000000..e366c8c07 --- /dev/null +++ b/xc/lib/Xrender/Xrenderint.h @@ -0,0 +1,50 @@ +/* + * $XFree86$ + * + * Copyright © 2000 SuSE, Inc. + * + * 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 SuSE not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. SuSE makes no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE + * 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. + * + * Author: Keith Packard, SuSE, Inc. + */ + +#ifndef _XRENDERINT_H_ +#define _XRENDERINT_H_ + +#define NEED_EVENTS +#define NEED_REPLIES +#include <X11/Xlibint.h> +#include <X11/Xutil.h> +#include "Xext.h" /* in ../include */ +#include "extutil.h" /* in ../include */ +#include "Xrender.h" +#include "renderproto.h" + +extern XExtensionInfo XRenderExtensionInfo; +extern char XRenderExtensionName[]; + +#define RenderCheckExtension(dpy,i,val) \ + XextCheckExtension (dpy, i, XRenderExtensionName, val) + +#define RenderSimpleCheckExtension(dpy,i) \ + XextSimpleCheckExtension (dpy, i, XRenderExtensionName) + +XExtDisplayInfo * +XRenderFindDisplay (Display *dpy); + +#endif /* _XRENDERINT_H_ */ diff --git a/xc/lib/Xss/Imakefile b/xc/lib/Xss/Imakefile index 7a0fb00aa..369659c02 100644 --- a/xc/lib/Xss/Imakefile +++ b/xc/lib/Xss/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.2 2000/06/15 20:49:58 dawes Exp $ +XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.1 1998/12/20 11:57:06 dawes Exp $ #define DoNormalLib NormalLibXss #define DoSharedLib SharedLibXss #define DoExtraLib SharedLibXss diff --git a/xc/lib/Xss/Xss-def.cpp b/xc/lib/Xss/Xss-def.cpp index 3aa6839d7..838c47175 100644 --- a/xc/lib/Xss/Xss-def.cpp +++ b/xc/lib/Xss/Xss-def.cpp @@ -11,4 +11,4 @@ EXPORTS XScreenSaverUnregister XScreenSaverGetRegistered -/* $XFree86: xc/lib/Xss/Xss-def.cpp,v 1.1 2000/08/09 23:40:13 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xss/Xssos2.def b/xc/lib/Xss/Xssos2.def index 88b95ec2e..0330426b7 100644 --- a/xc/lib/Xss/Xssos2.def +++ b/xc/lib/Xss/Xssos2.def @@ -1,5 +1,5 @@ LIBRARY XSS -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xss/Xssos2.def,v 3.2 1999/04/29 09:13:33 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xt/Callback.c b/xc/lib/Xt/Callback.c index d0d0e8ba3..971ee72bf 100644 --- a/xc/lib/Xt/Callback.c +++ b/xc/lib/Xt/Callback.c @@ -54,7 +54,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/lib/Xt/Callback.c,v 1.5 1998/12/20 22:18:57 dawes Exp $ */ +/* $XFree86$ */ #include "IntrinsicI.h" diff --git a/xc/lib/Xt/Convert.c b/xc/lib/Xt/Convert.c index b2c0cbc07..c4287a56b 100644 --- a/xc/lib/Xt/Convert.c +++ b/xc/lib/Xt/Convert.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Convert.c,v 3.4 1998/12/20 11:57:07 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Convert.c,v 3.3 1998/10/03 09:06:50 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Converters.c b/xc/lib/Xt/Converters.c index b4c70233d..89dc5bef8 100644 --- a/xc/lib/Xt/Converters.c +++ b/xc/lib/Xt/Converters.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Converters.c,v 3.7 1999/03/28 15:31:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.6 1998/12/20 11:57:08 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Create.c b/xc/lib/Xt/Create.c index 3885d8df0..fe046de5f 100644 --- a/xc/lib/Xt/Create.c +++ b/xc/lib/Xt/Create.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Create.c,v 3.6 1998/12/20 11:57:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Create.c,v 3.5 1998/10/03 09:06:50 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Display.c b/xc/lib/Xt/Display.c index f83817e8b..6455de6ea 100644 --- a/xc/lib/Xt/Display.c +++ b/xc/lib/Xt/Display.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Display.c,v 3.8 1998/10/03 09:06:51 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Display.c,v 3.7 1998/04/05 02:28:21 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Error.c b/xc/lib/Xt/Error.c index 93796f486..a716b05a3 100644 --- a/xc/lib/Xt/Error.c +++ b/xc/lib/Xt/Error.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Error.c,v 3.9 1998/10/03 09:06:51 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Error.c,v 3.8 1997/07/26 12:59:01 dawes Exp $ */ /* diff --git a/xc/lib/Xt/GetResList.c b/xc/lib/Xt/GetResList.c index c31263e29..3ba533e17 100644 --- a/xc/lib/Xt/GetResList.c +++ b/xc/lib/Xt/GetResList.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/GetResList.c,v 3.3 1998/12/20 11:57:08 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/GetResList.c,v 3.2 1998/10/03 09:06:53 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Imakefile b/xc/lib/Xt/Imakefile index f2837fc1b..45ce7ea53 100644 --- a/xc/lib/Xt/Imakefile +++ b/xc/lib/Xt/Imakefile @@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/121 1998/05/11 14:35:32 barstow $ -XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.14 1999/12/30 03:56:17 robin Exp $ +XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.13 1998/12/20 11:57:09 dawes Exp $ #define DoNormalLib NormalLibXt #define DoSharedLib SharedLibXt #define DoExtraLib SharedLibXt diff --git a/xc/lib/Xt/Initialize.c b/xc/lib/Xt/Initialize.c index e95d308b7..68299cdbb 100644 --- a/xc/lib/Xt/Initialize.c +++ b/xc/lib/Xt/Initialize.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Initialize.c,v 3.15 1998/10/03 09:06:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Initialize.c,v 3.14 1998/06/28 09:00:03 dawes Exp $ */ /* diff --git a/xc/lib/Xt/Intrinsic.c b/xc/lib/Xt/Intrinsic.c index 1f9333883..d46195e90 100644 --- a/xc/lib/Xt/Intrinsic.c +++ b/xc/lib/Xt/Intrinsic.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.14 2000/04/05 18:13:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.13 1998/10/03 09:06:54 dawes Exp $ */ /* @@ -1176,68 +1176,82 @@ static char *ExtractLocaleName(lang) String lang; { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__) -#ifdef hpux +#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__EMX__) || defined (linux) +# ifdef hpux /* * We need to discriminated between HPUX 9 and HPUX 10. The equivalent * code in Xlib in SetLocale.c does include locale.h via X11/Xlocale.h. */ -#include <locale.h> -#ifndef _LastCategory -/* HPUX 9 and earlier */ -#define SKIPCOUNT 2 -#define STARTCHAR ':' -#define ENDCHAR ';' -#else -/* HPUX 10 */ -#define ENDCHAR ' ' -#endif -#else -#ifdef ultrix -#define SKIPCOUNT 2 -#define STARTCHAR '\001' -#define ENDCHAR '\001' -#else -#if defined(WIN32) || defined(__EMX__) -#define SKIPCOUNT 1 -#define STARTCHAR '=' -#define ENDCHAR ';' -#define WHITEFILL -#else -#if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) -#define STARTCHAR ' ' -#define ENDCHAR ' ' -#else -#if !defined(sun) || defined(SVR4) -#define STARTCHAR '/' -#endif -#define ENDCHAR '/' -#endif -#endif -#endif -#endif +# include <locale.h> +# ifndef _LastCategory + /* HPUX 9 and earlier */ +# define SKIPCOUNT 2 +# define STARTCHAR ':' +# define ENDCHAR ';' +# else + /* HPUX 10 */ + #define ENDCHAR ' ' + #endif +# else +# ifdef ultrix +# define SKIPCOUNT 2 +# define STARTCHAR '\001' +# define ENDCHAR '\001' +# else +# if defined(WIN32) || defined(__EMX__) +# define SKIPCOUNT 1 +# define STARTCHAR '=' +# define ENDCHAR ';' +# define WHITEFILL +# else +# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) +# define STARTCHAR ' ' +# define ENDCHAR ' ' +# else +# if defined(linux) +# define STARTSTR "LC_CTYPE=" +# define ENDCHAR ';' +# else +# if !defined(sun) || defined(SVR4) +# define STARTCHAR '/' +# define ENDCHAR '/' +# endif +# endif +# endif +# endif +# endif +# endif char *start; char *end; int len; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT int n; -#endif +# endif static char* buf = NULL; start = lang; -#ifdef SKIPCOUNT +# ifdef SKIPCOUNT for (n = SKIPCOUNT; --n >= 0 && start && (start = strchr (start, STARTCHAR)); start++) ; if (!start) start = lang; -#endif -#ifdef STARTCHAR - if (start && (start = strchr (start, STARTCHAR))) { +# endif +# ifdef STARTCHAR + if (start && (start = strchr (start, STARTCHAR))) start++; -#endif +# elif defined (STARTSTR) + if (start && (start = strstr (start,STARTSTR))) +# endif + { +# ifdef STARTCHAR + start++; +# elif defined (STARTSTR) + start += strlen(STARTSTR); +# endif + if (end = strchr (start, ENDCHAR)) { len = end - start; if (buf != NULL) XtFree (buf); @@ -1245,16 +1259,15 @@ static char *ExtractLocaleName(lang) if (buf == NULL) return NULL; strncpy(buf, start, len); *(buf + len) = '\0'; -#ifdef WHITEFILL +# ifdef WHITEFILL for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; -#endif +# endif return buf; - } -#ifdef STARTCHAR + } else /* if no ENDCHAR is found we are at the end of the line */ + return start; } -#endif -#ifdef WHITEFILL +# ifdef WHITEFILL if (strchr(lang, ' ')) { if (buf != NULL) XtFree (buf); else buf = XtMalloc (strlen (lang) + 1); @@ -1264,10 +1277,10 @@ static char *ExtractLocaleName(lang) *start++ = '-'; return buf; } -#endif -#undef STARTCHAR -#undef ENDCHAR -#undef WHITEFILL +# endif +# undef STARTCHAR +# undef ENDCHAR +# undef WHITEFILL #endif return lang; diff --git a/xc/lib/Xt/Intrinsic.h b/xc/lib/Xt/Intrinsic.h index ff3deb187..ecefe0de8 100644 --- a/xc/lib/Xt/Intrinsic.h +++ b/xc/lib/Xt/Intrinsic.h @@ -44,7 +44,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/lib/Xt/Intrinsic.h,v 3.4 1998/10/03 09:06:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.3 1998/01/25 04:00:01 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h diff --git a/xc/lib/Xt/IntrinsicI.h b/xc/lib/Xt/IntrinsicI.h index 71d3e9f42..c12e6bbf4 100644 --- a/xc/lib/Xt/IntrinsicI.h +++ b/xc/lib/Xt/IntrinsicI.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.4 1998/10/03 09:06:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.3 1997/05/17 12:52:12 dawes Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h diff --git a/xc/lib/Xt/Manage.c b/xc/lib/Xt/Manage.c index 9ef494482..02d813534 100644 --- a/xc/lib/Xt/Manage.c +++ b/xc/lib/Xt/Manage.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Manage.c,v 3.5 1998/10/03 09:06:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Manage.c,v 3.4 1997/05/17 12:52:12 dawes Exp $ */ /* diff --git a/xc/lib/Xt/NextEvent.c b/xc/lib/Xt/NextEvent.c index f7abccb07..74d1e311a 100644 --- a/xc/lib/Xt/NextEvent.c +++ b/xc/lib/Xt/NextEvent.c @@ -54,7 +54,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/lib/Xt/NextEvent.c,v 3.15 1999/03/14 03:21:15 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.14tsi Exp $ */ #include "IntrinsicI.h" #include <stdio.h> diff --git a/xc/lib/Xt/Object.c b/xc/lib/Xt/Object.c index 6048a3085..21450971e 100644 --- a/xc/lib/Xt/Object.c +++ b/xc/lib/Xt/Object.c @@ -54,7 +54,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/lib/Xt/Object.c,v 1.4 1998/12/20 11:57:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Object.c,v 1.1.1.1.12.3 1998/10/04 15:22:54 hohndel Exp $ */ #define OBJECT #include "IntrinsicI.h" diff --git a/xc/lib/Xt/Resources.c b/xc/lib/Xt/Resources.c index d10879d23..ea1248ea8 100644 --- a/xc/lib/Xt/Resources.c +++ b/xc/lib/Xt/Resources.c @@ -55,7 +55,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Resources.c,v 1.6 1998/12/20 11:57:09 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.5 1998/10/03 09:06:57 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" diff --git a/xc/lib/Xt/Shell.c b/xc/lib/Xt/Shell.c index dfc0b1bea..0f1494679 100644 --- a/xc/lib/Xt/Shell.c +++ b/xc/lib/Xt/Shell.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Shell.c,v 3.8 1998/10/03 09:06:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Shell.c,v 3.7 1997/05/17 12:52:15 dawes Exp $ */ /* diff --git a/xc/lib/Xt/TMparse.c b/xc/lib/Xt/TMparse.c index bc30803e4..c9735bb6f 100644 --- a/xc/lib/Xt/TMparse.c +++ b/xc/lib/Xt/TMparse.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TMparse.c,v 3.4 1998/10/03 09:07:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/TMparse.c,v 3.3 1998/06/28 09:00:05 dawes Exp $ */ /* diff --git a/xc/lib/Xt/TMstate.c b/xc/lib/Xt/TMstate.c index 9bb41830d..53bad040b 100644 --- a/xc/lib/Xt/TMstate.c +++ b/xc/lib/Xt/TMstate.c @@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TMstate.c,v 1.4 1998/12/20 11:57:10 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/TMstate.c,v 1.1.1.3.6.3 1998/10/19 20:57:06 hohndel Exp $ */ /* diff --git a/xc/lib/Xt/Vendor.c b/xc/lib/Xt/Vendor.c index 960a1c3dc..88a55f7fd 100644 --- a/xc/lib/Xt/Vendor.c +++ b/xc/lib/Xt/Vendor.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Vendor.c,v 1.4 1998/10/03 09:07:02 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Vendor.c,v 1.3 1997/07/19 07:08:25 dawes Exp $ */ /* Make sure all wm properties can make it out of the resource manager */ diff --git a/xc/lib/Xt/Xtos.h b/xc/lib/Xt/Xtos.h index 59a020651..67c16f497 100644 --- a/xc/lib/Xt/Xtos.h +++ b/xc/lib/Xt/Xtos.h @@ -57,7 +57,8 @@ SOFTWARE. #define WORD64 #endif -#if defined(__alpha) || defined(__alpha__) +#if defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) #define LONG64 #endif diff --git a/xc/lib/Xt/Xtos2.def b/xc/lib/Xt/Xtos2.def index c6c3da3ca..8265ea0c0 100644 --- a/xc/lib/Xt/Xtos2.def +++ b/xc/lib/Xt/Xtos2.def @@ -1,5 +1,5 @@ LIBRARY Xt INITINSTANCE TERMINSTANCE -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xt/Xtos2.def,v 3.7 1999/04/29 09:13:33 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xt/Xtos2.def,v 3.6 1997/07/19 05:43:04 dawes Exp $" CODE PRELOAD DATA diff --git a/xc/lib/Xt/jump_funcs b/xc/lib/Xt/jump_funcs index 44d91a7c4..862a16146 100644 --- a/xc/lib/Xt/jump_funcs +++ b/xc/lib/Xt/jump_funcs @@ -1,5 +1,5 @@ # $XConsortium: jump_funcs,v 1.4 95/06/30 18:48:53 kaleb Exp $ -# $XFree86: xc/lib/Xt/jump_funcs,v 3.5 1996/12/30 13:58:31 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_funcs,v 3.4 1996/02/12 11:11:22 dawes Exp $ # 00000000 T _XtAppAddActionHook libXt ActionHook 00000000 T _XtRemoveActionHook libXt ActionHook diff --git a/xc/lib/Xt/jump_ignore b/xc/lib/Xt/jump_ignore index 881952a89..145199741 100644 --- a/xc/lib/Xt/jump_ignore +++ b/xc/lib/Xt/jump_ignore @@ -1,5 +1,5 @@ # $XConsortium: jump_ignore,v 1.3 95/06/30 18:48:53 kaleb Exp $ -# $XFree86: xc/lib/Xt/jump_ignore,v 3.7 1996/12/30 13:58:32 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_ignore,v 3.6 1996/08/27 03:11:43 dawes Exp $ # jump_ignore 00000000 T __XtFreeArgList libXt Varargs 00000000 T __XtClearAncestorCache libXt Keyboard diff --git a/xc/lib/Xt/jump_vars b/xc/lib/Xt/jump_vars index c3eb91170..4e8114619 100644 --- a/xc/lib/Xt/jump_vars +++ b/xc/lib/Xt/jump_vars @@ -1,5 +1,5 @@ # $XConsortium: jump_vars,v 1.2 94/12/07 10:45:51 kaleb Exp $ -# $XFree86: xc/lib/Xt/jump_vars,v 3.2 1995/01/28 15:44:05 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_vars,v 3.1 1994/05/04 14:56:48 dawes Exp $ # 00000100 D _compositeClassRec libXt Composite 00000004 D _compositeWidgetClass libXt Composite diff --git a/xc/lib/Xt/sharedlib.c b/xc/lib/Xt/sharedlib.c index 64c19f993..85fda4975 100644 --- a/xc/lib/Xt/sharedlib.c +++ b/xc/lib/Xt/sharedlib.c @@ -21,7 +21,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/lib/Xt/sharedlib.c,v 3.2 1998/10/03 09:07:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.1 1996/08/20 12:12:05 dawes Exp $ */ #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE) #include "IntrinsicI.h" diff --git a/xc/lib/Xtst/Imakefile b/xc/lib/Xtst/Imakefile index 4d8f58262..d28421813 100644 --- a/xc/lib/Xtst/Imakefile +++ b/xc/lib/Xtst/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/11 1995/12/08 11:56:32 dpw $ -XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXtst #define DoSharedLib SharedLibXtst #define DoExtraLib SharedLibXtst diff --git a/xc/lib/Xtst/XTest.c b/xc/lib/Xtst/XTest.c index 2cb880444..9e0491195 100644 --- a/xc/lib/Xtst/XTest.c +++ b/xc/lib/Xtst/XTest.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xtst/XTest.c,v 1.2 1998/12/20 11:57:12 dawes Exp $ */ +/* $XFree86: xc/lib/Xtst/XTest.c,v 1.1.1.1.12.2 1998/10/04 15:22:55 hohndel Exp $ */ #define NEED_REPLIES #include "Xlibint.h" diff --git a/xc/lib/Xtst/Xtstos2.def b/xc/lib/Xtst/Xtstos2.def index 55a1c089c..456dae39b 100644 --- a/xc/lib/Xtst/Xtstos2.def +++ b/xc/lib/Xtst/Xtstos2.def @@ -1,5 +1,5 @@ LIBRARY XTST -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xtst/Xtstos2.def,v 3.5 1999/04/29 09:13:34 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xv/Imakefile b/xc/lib/Xv/Imakefile index 9975c85db..59883d9bd 100644 --- a/xc/lib/Xv/Imakefile +++ b/xc/lib/Xv/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.5 1999/05/23 08:23:10 dawes Exp $ +XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.4 1999/05/23 06:33:31 dawes Exp $ #define DoNormalLib NormalLibXv #define DoSharedLib SharedLibXv diff --git a/xc/lib/Xv/Xv.c b/xc/lib/Xv/Xv.c index 65f005e4f..69a59f624 100644 --- a/xc/lib/Xv/Xv.c +++ b/xc/lib/Xv/Xv.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xv.c,v 1.14 2000/05/25 20:47:39 mvojkovi Exp $ */ +/* $XFree86: xc/lib/Xv/Xv.c,v 1.10 1999/12/27 00:39:25 robin Exp $ */ /* ** File: ** diff --git a/xc/lib/Xv/Xvlibint.h b/xc/lib/Xv/Xvlibint.h index 690a3e5bc..89d5da13e 100644 --- a/xc/lib/Xv/Xvlibint.h +++ b/xc/lib/Xv/Xvlibint.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.4 2000/06/07 22:02:57 tsi Exp $ */ +/* $XFree86$ */ #ifndef XVLIBINT_H #define XVLIBINT_H diff --git a/xc/lib/Xxf86dga/Imakefile b/xc/lib/Xxf86dga/Imakefile index e3eb0ff99..c9012a9f1 100644 --- a/xc/lib/Xxf86dga/Imakefile +++ b/xc/lib/Xxf86dga/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xxf86dga/Imakefile,v 3.2 1999/03/28 15:31:35 dawes Exp $ +XCOMM $XFree86: xc/lib/Xxf86dga/Imakefile,v 3.1 1998/12/20 11:57:13 dawes Exp $ #define DoNormalLib NormalLibXxf86dga #define DoSharedLib SharedLibXxf86dga #define DoExtraLib SharedLibXxf86dga diff --git a/xc/lib/Xxf86dga/XF86DGA.c b/xc/lib/Xxf86dga/XF86DGA.c index 017de6eb4..656a53646 100644 --- a/xc/lib/Xxf86dga/XF86DGA.c +++ b/xc/lib/Xxf86dga/XF86DGA.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.16 1999/05/03 12:15:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.15 1999/04/11 13:10:34 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs diff --git a/xc/lib/Xxf86dga/XF86DGA2.c b/xc/lib/Xxf86dga/XF86DGA2.c index c17d62248..16c42a2f0 100644 --- a/xc/lib/Xxf86dga/XF86DGA2.c +++ b/xc/lib/Xxf86dga/XF86DGA2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.14 2000/05/23 04:47:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.13 1999/11/30 18:06:19 mvojkovi Exp $ */ /* Copyright (c) 1995 Jon Tombs diff --git a/xc/lib/Xxf86dga/Xxf86dga-def.cpp b/xc/lib/Xxf86dga/Xxf86dga-def.cpp index 7bbd72d2c..2318b39c3 100644 --- a/xc/lib/Xxf86dga/Xxf86dga-def.cpp +++ b/xc/lib/Xxf86dga/Xxf86dga-def.cpp @@ -13,4 +13,4 @@ EXPORTS XF86DGADirectVideo XF86DGAGetVideo -/* $XFree86: xc/lib/Xxf86dga/Xxf86dga-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xxf86dga/Xxf86dgaos2.def b/xc/lib/Xxf86dga/Xxf86dgaos2.def index 81fc09ee4..2157eb185 100644 --- a/xc/lib/Xxf86dga/Xxf86dgaos2.def +++ b/xc/lib/Xxf86dga/Xxf86dgaos2.def @@ -1,5 +1,5 @@ LIBRARY XXF86DGA -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xxf86dga/Xxf86dgaos2.def,v 3.2 1999/04/29 09:13:35 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xxf86misc/Imakefile b/xc/lib/Xxf86misc/Imakefile index b7d5e03d0..52eca3c85 100644 --- a/xc/lib/Xxf86misc/Imakefile +++ b/xc/lib/Xxf86misc/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xxf86misc/Imakefile,v 3.1 1998/12/20 11:57:13 dawes Exp $ +XCOMM $XFree86: xc/lib/Xxf86misc/Imakefile,v 3.0 1996/01/16 15:01:46 dawes Exp $ #define DoNormalLib NormalLibXxf86misc #define DoSharedLib SharedLibXxf86misc #define DoExtraLib SharedLibXxf86misc diff --git a/xc/lib/Xxf86misc/XF86Misc.c b/xc/lib/Xxf86misc/XF86Misc.c index 35c77a5e4..089fd580a 100644 --- a/xc/lib/Xxf86misc/XF86Misc.c +++ b/xc/lib/Xxf86misc/XF86Misc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.7 1998/06/28 03:52:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.6 1998/06/27 12:53:25 hohndel Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xc/lib/Xxf86misc/Xxf86misc-def.cpp b/xc/lib/Xxf86misc/Xxf86misc-def.cpp index 10f9116b7..49ae53ecd 100644 --- a/xc/lib/Xxf86misc/Xxf86misc-def.cpp +++ b/xc/lib/Xxf86misc/Xxf86misc-def.cpp @@ -10,4 +10,4 @@ EXPORTS ; XF86MiscGetSaver -/* $XFree86: xc/lib/Xxf86misc/Xxf86misc-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xxf86misc/Xxf86miscos2.def b/xc/lib/Xxf86misc/Xxf86miscos2.def index 8fc881b4b..cdefb959f 100644 --- a/xc/lib/Xxf86misc/Xxf86miscos2.def +++ b/xc/lib/Xxf86misc/Xxf86miscos2.def @@ -1,5 +1,5 @@ LIBRARY XXF86MISC -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xxf86misc/Xxf86miscos2.def,v 3.2 1999/04/29 09:13:35 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/Xxf86rush/Imakefile b/xc/lib/Xxf86rush/Imakefile index 014cdcb45..29fe3b9a3 100644 --- a/xc/lib/Xxf86rush/Imakefile +++ b/xc/lib/Xxf86rush/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xxf86rush/Imakefile,v 1.1 1999/09/04 09:14:09 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalLibXxf86rush #define DoSharedLib SharedLibXxf86rush #define DoDebugLib DebugLibXxf86rush diff --git a/xc/lib/Xxf86rush/XF86Rush.c b/xc/lib/Xxf86rush/XF86Rush.c index 5caba014d..ace1f8e21 100644 --- a/xc/lib/Xxf86rush/XF86Rush.c +++ b/xc/lib/Xxf86rush/XF86Rush.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.4 2000/02/29 03:09:06 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.3 2000/02/11 22:35:45 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss diff --git a/xc/lib/Xxf86vm/Imakefile b/xc/lib/Xxf86vm/Imakefile index 7edb2d50a..2a5621947 100644 --- a/xc/lib/Xxf86vm/Imakefile +++ b/xc/lib/Xxf86vm/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xxf86vm/Imakefile,v 3.1 1998/12/20 11:57:13 dawes Exp $ +XCOMM $XFree86: xc/lib/Xxf86vm/Imakefile,v 3.0 1996/01/16 15:01:52 dawes Exp $ #define DoNormalLib NormalLibXxf86vm #define DoSharedLib SharedLibXxf86vm #define DoExtraLib SharedLibXxf86vm diff --git a/xc/lib/Xxf86vm/XF86VMode.c b/xc/lib/Xxf86vm/XF86VMode.c index 313a8d63a..6cd7da614 100644 --- a/xc/lib/Xxf86vm/XF86VMode.c +++ b/xc/lib/Xxf86vm/XF86VMode.c @@ -278,7 +278,7 @@ XF86VidModeGetModeLine(dpy, screen, dotclock, modeline) Xfree(modeline->private); return False; } - _XRead32(dpy, modeline->private, modeline->privsize * sizeof(INT32)); + _XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32)); } else { modeline->private = NULL; } @@ -354,7 +354,7 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr) for (i = 0; i < rep.modecount; i++) { modelines[i] = mdinfptr++; if (majorVersion < 2) { - _XRead32(dpy, &oldxmdline, sizeof(xXF86OldVidModeModeInfo)); + _XRead(dpy, (char*)&oldxmdline, sizeof(xXF86OldVidModeModeInfo)); modelines[i]->dotclock = oldxmdline.dotclock; modelines[i]->hdisplay = oldxmdline.hdisplay; modelines[i]->hsyncstart = oldxmdline.hsyncstart; @@ -377,7 +377,7 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr) _XEatData(dpy, (oldxmdline.privsize) * sizeof(INT32)); Xfree(modelines[i]->private); } else { - _XRead32(dpy, modelines[i]->private, + _XRead(dpy, (char*)modelines[i]->private, oldxmdline.privsize * sizeof(INT32)); } } else { @@ -385,7 +385,7 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr) } } } else { - _XRead32(dpy, &xmdline, sizeof(xXF86VidModeModeInfo)); + _XRead(dpy, (char*)&xmdline, sizeof(xXF86VidModeModeInfo)); modelines[i]->dotclock = xmdline.dotclock; modelines[i]->hdisplay = xmdline.hdisplay; modelines[i]->hsyncstart = xmdline.hsyncstart; @@ -408,7 +408,7 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr) _XEatData(dpy, (xmdline.privsize) * sizeof(INT32)); Xfree(modelines[i]->private); } else { - _XRead32(dpy, modelines[i]->private, + _XRead(dpy, (char*)modelines[i]->private, xmdline.privsize * sizeof(INT32)); } } else { @@ -962,12 +962,12 @@ XF86VidModeGetMonitor(dpy, screen, monitor) return False; } for (i = 0; i < rep.nhsync; i++) { - _XRead32(dpy, (long *)&syncrange, 4); + _XRead(dpy, (char *)&syncrange, 4); monitor->hsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; monitor->hsync[i].hi = (float)(syncrange >> 16) / 100.0; } for (i = 0; i < rep.nvsync; i++) { - _XRead32(dpy, (long *)&syncrange, 4); + _XRead(dpy, (char *)&syncrange, 4); monitor->vsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; monitor->vsync[i].hi = (float)(syncrange >> 16) / 100.0; } @@ -1100,7 +1100,7 @@ XF86VidModeGetDotClocks(dpy, screen, } for (i = 0; i < rep.clocks; i++) { - _XRead32(dpy, &dotclk, 4); + _XRead(dpy, (char*)&dotclk, 4); dotclocks[i] = dotclk; } *clocksPtr = dotclocks; diff --git a/xc/lib/Xxf86vm/Xxf86vm-def.cpp b/xc/lib/Xxf86vm/Xxf86vm-def.cpp index 9f08eb85f..0f7b4f335 100644 --- a/xc/lib/Xxf86vm/Xxf86vm-def.cpp +++ b/xc/lib/Xxf86vm/Xxf86vm-def.cpp @@ -13,4 +13,4 @@ EXPORTS XF86VidModeSwitchToMode XF86VidModeAddModeLine -/* $XFree86: xc/lib/Xxf86vm/Xxf86vm-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/Xxf86vm/Xxf86vmos2.def b/xc/lib/Xxf86vm/Xxf86vmos2.def index 4d389c74e..f7749e585 100644 --- a/xc/lib/Xxf86vm/Xxf86vmos2.def +++ b/xc/lib/Xxf86vm/Xxf86vmos2.def @@ -1,5 +1,5 @@ LIBRARY XXF86VM -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/Xxf86vm/Xxf86vmos2.def,v 3.2 1999/04/29 09:13:36 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/dps/Imakefile b/xc/lib/dps/Imakefile index 0202c0eb0..280bcd544 100644 --- a/xc/lib/dps/Imakefile +++ b/xc/lib/dps/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.12 2000/05/23 19:32:52 dawes Exp $ +XCOMM $XFree86: xc/lib/dps/Imakefile,v 1.11 2000/05/23 04:47:36 dawes Exp $ #define DoNormalLib NormalLibDps #define DoSharedLib SharedLibDps diff --git a/xc/lib/dps/Xlibnet.h b/xc/lib/dps/Xlibnet.h index d93b3bc1c..74cee79d0 100644 --- a/xc/lib/dps/Xlibnet.h +++ b/xc/lib/dps/Xlibnet.h @@ -13,7 +13,7 @@ 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. */ -/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.5 2000/05/18 23:46:12 dawes Exp $ */ +/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.4 2000/04/05 18:13:20 dawes Exp $ */ /* * Xlibnet.h - Xlib networking include files for UNIX Systems. */ diff --git a/xc/lib/dps/Xstreams.h b/xc/lib/dps/Xstreams.h index a45c13028..a7419131b 100644 --- a/xc/lib/dps/Xstreams.h +++ b/xc/lib/dps/Xstreams.h @@ -22,7 +22,7 @@ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/dps/Xstreams.h,v 1.1 2000/02/15 14:51:21 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XSTREAMS_H_ diff --git a/xc/lib/dps/csconndi.c b/xc/lib/dps/csconndi.c index 2550cd396..3d8a2c34f 100644 --- a/xc/lib/dps/csconndi.c +++ b/xc/lib/dps/csconndi.c @@ -481,7 +481,10 @@ static int MakeDECnetConnection (phostname, iagent, retries, #ifdef UNIXCONN + +#ifndef __CYGWIN__ /* causes conflicts with cygwin headers */ #include <sys/un.h> +#endif #ifndef CSDPS_UNIX_PATH #ifdef hpux diff --git a/xc/lib/dps/csfindNX.c b/xc/lib/dps/csfindNX.c index 4bd6bb77c..3a682ccb2 100644 --- a/xc/lib/dps/csfindNX.c +++ b/xc/lib/dps/csfindNX.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/csfindNX.c,v 1.4 2000/05/18 23:46:12 dawes Exp $ */ +/* $XFree86: xc/lib/dps/csfindNX.c,v 1.3 2000/02/18 12:18:53 tsi Exp $ */ #include <sys/param.h> /* for MAXHOSTNAMELEN */ #include <stdlib.h> diff --git a/xc/lib/dps/cslibint.c b/xc/lib/dps/cslibint.c index 89fe102fb..f892d0b77 100644 --- a/xc/lib/dps/cslibint.c +++ b/xc/lib/dps/cslibint.c @@ -47,7 +47,7 @@ * * Author: Adobe Systems Incorporated and MIT X Consortium */ -/* $XFree86: xc/lib/dps/cslibint.c,v 1.4 2000/05/18 23:46:12 dawes Exp $ */ +/* $XFree86: xc/lib/dps/cslibint.c,v 1.3 2000/02/21 18:05:34 dawes Exp $ */ /* * XlibInternal.c - Internal support routines for the C subroutine diff --git a/xc/lib/dps/dps-def.cpp b/xc/lib/dps/dps-def.cpp index 75501a8a7..d88841d66 100644 --- a/xc/lib/dps/dps-def.cpp +++ b/xc/lib/dps/dps-def.cpp @@ -988,4 +988,4 @@ PSsetuserparams PSstartjob PSundefineresource -/* $XFree86: xc/lib/dps/dps-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/dps/dpsXcmu.c b/xc/lib/dps/dpsXcmu.c index a53cc1156..08e6ddeca 100644 --- a/xc/lib/dps/dpsXcmu.c +++ b/xc/lib/dps/dpsXcmu.c @@ -104,7 +104,7 @@ static Bool CheckCube(XColor *, XColor *, XStandardColormap *); static Bool CubicCube(XStandardColormap *); static Bool GetColorCubeFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *); static Bool GetGrayRampFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *); -static Status XDPSCreateStandardColormaps(Display *, Drawable, Visual *, int, int, int, int, XStandardColormap *, XStandardColormap *, Bool); +Status XDPSCreateStandardColormaps(Display *, Drawable, Visual *, int, int, int, int, XStandardColormap *, XStandardColormap *, Bool); static Status contiguous(unsigned long *, int, int *, unsigned long, int *, int *); static XVisualInfo *PickCorrectVisual(Display *, XVisualInfo *, int, Colormap); static int FindRampSize(XColor *, XColor *); @@ -168,7 +168,7 @@ void XDPSGetDefaultColorMaps( 0, 0, 0, 0, colorCube, grayRamp, True); } -static Status XDPSCreateStandardColormaps( +Status XDPSCreateStandardColormaps( Display *dpy, Drawable drawable, Visual *visual, diff --git a/xc/lib/dps/dpsXpriv.c b/xc/lib/dps/dpsXpriv.c index f62023af5..f6c2e8713 100644 --- a/xc/lib/dps/dpsXpriv.c +++ b/xc/lib/dps/dpsXpriv.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/dpsXpriv.c,v 1.3 2000/05/18 23:46:13 dawes Exp $ */ +/* $XFree86: xc/lib/dps/dpsXpriv.c,v 1.2 2000/02/21 18:05:35 dawes Exp $ */ #include <stdlib.h> #include <stdio.h> diff --git a/xc/lib/dps/dpsexcept.c b/xc/lib/dps/dpsexcept.c index 1b347e318..cd404dd86 100644 --- a/xc/lib/dps/dpsexcept.c +++ b/xc/lib/dps/dpsexcept.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/dpsexcept.c,v 1.2 2000/02/18 12:18:55 tsi Exp $ */ +/* $XFree86: $ */ /* Original version: Jeffrey Mogul, Stanford, 18 February 1983 diff --git a/xc/lib/dps/dpsos2.def b/xc/lib/dps/dpsos2.def index 309481c16..29bee1827 100644 --- a/xc/lib/dps/dpsos2.def +++ b/xc/lib/dps/dpsos2.def @@ -1,5 +1,5 @@ LIBRARY dps -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/dps/dpsos2.def,v 1.1 2000/04/05 18:13:21 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/dps/genheader.cmd b/xc/lib/dps/genheader.cmd index 9bcc394ff..b1784e232 100644 --- a/xc/lib/dps/genheader.cmd +++ b/xc/lib/dps/genheader.cmd @@ -1,6 +1,6 @@ REM /* OS/2 generate header files */ -/* $XFree86: xc/lib/dps/genheader.cmd,v 1.2 2000/05/18 23:46:14 dawes Exp $ */ +/* $XFree86: xc/lib/dps/genheader.cmd,v 1.1 2000/04/05 18:13:22 dawes Exp $ */ cat psclrops.h psctrlops.h psctxtops.h psdataops.h psfontops.h psgsttops.h psioops.h psmathops.h psmtrxops.h psmiscops.h pspntops.h pspathops.h pssysops.h pswinops.h psopstack.h psXops.h psl2ops.h >.ph sed -e "/^$$/D" -e "/#/D" -e "/^\//D" -e "/^ gener/D" -e "/^.\//D" .ph | sort >.sort awk "/;/ {print;printf(\"\n\");}" .sort >.ttt diff --git a/xc/lib/dps/psXops.psw b/xc/lib/dps/psXops.psw index d0ce24e34..5d350418f 100644 --- a/xc/lib/dps/psXops.psw +++ b/xc/lib/dps/psXops.psw @@ -34,7 +34,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/psXops.psw,v 1.2 2000/06/07 22:02:57 tsi Exp $ */ +/* $XFree86$ */ defineps PSclientsync() clientsync diff --git a/xc/lib/dps/psops.h.os2 b/xc/lib/dps/psops.h.os2 index 20ff44844..54695dc83 100644 --- a/xc/lib/dps/psops.h.os2 +++ b/xc/lib/dps/psops.h.os2 @@ -36,7 +36,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/psops.h.os2,v 1.2 2000/06/07 22:02:57 tsi Exp $ */ +/* $XFree86$ */ #ifndef PSOPS_H #define PSOPS_H diff --git a/xc/lib/dps/publictypes.h b/xc/lib/dps/publictypes.h index 45c81347a..eb691bcc5 100644 --- a/xc/lib/dps/publictypes.h +++ b/xc/lib/dps/publictypes.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/publictypes.h,v 1.2 2000/06/07 22:02:58 tsi Exp $ */ +/* $XFree86$ */ #ifndef PUBLICTYPES_H #define PUBLICTYPES_H diff --git a/xc/lib/dpstk/ColorSB.c b/xc/lib/dpstk/ColorSB.c index f0d41bb13..d2d71088e 100644 --- a/xc/lib/dpstk/ColorSB.c +++ b/xc/lib/dpstk/ColorSB.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/ColorSB.c,v 1.2 2000/06/07 22:02:58 tsi Exp $ */ +/* $XFree86$ */ #ifndef X_NOT_POSIX #include <unistd.h> diff --git a/xc/lib/dpstk/DPSScrollW.c b/xc/lib/dpstk/DPSScrollW.c index 92f131344..9c2f7e005 100644 --- a/xc/lib/dpstk/DPSScrollW.c +++ b/xc/lib/dpstk/DPSScrollW.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/DPSScrollW.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */ +/* $XFree86$ */ #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/xc/lib/dpstk/FontCreato.c b/xc/lib/dpstk/FontCreato.c index e2299f65e..5164665cc 100644 --- a/xc/lib/dpstk/FontCreato.c +++ b/xc/lib/dpstk/FontCreato.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/FontCreato.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/dpstk/FontSB.c b/xc/lib/dpstk/FontSB.c index eaf855978..a529f3af0 100644 --- a/xc/lib/dpstk/FontSB.c +++ b/xc/lib/dpstk/FontSB.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/FontSB.c,v 1.2 2000/06/07 22:02:59 tsi Exp $ */ +/* $XFree86$ */ #include <stdlib.h> #include <unistd.h> diff --git a/xc/lib/dpstk/FontSBI.h b/xc/lib/dpstk/FontSBI.h index d54a9a116..87d59df40 100644 --- a/xc/lib/dpstk/FontSBI.h +++ b/xc/lib/dpstk/FontSBI.h @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/FontSBI.h,v 1.2 2000/06/07 22:03:00 tsi Exp $ */ +/* $XFree86$ */ #ifndef _FontSelectionBoxI_H #define _FontSelectionBoxI_H diff --git a/xc/lib/dpstk/FontSample.c b/xc/lib/dpstk/FontSample.c index b9dc99f3d..9bccdf30d 100644 --- a/xc/lib/dpstk/FontSample.c +++ b/xc/lib/dpstk/FontSample.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/FontSample.c,v 1.2 2000/06/07 22:03:00 tsi Exp $ */ +/* $XFree86$ */ #include <ctype.h> #include <stdio.h> diff --git a/xc/lib/dpstk/Imakefile b/xc/lib/dpstk/Imakefile index f3c8cf79b..162b246b6 100644 --- a/xc/lib/dpstk/Imakefile +++ b/xc/lib/dpstk/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.6 2000/06/07 22:03:00 tsi Exp $ +XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.5 2000/05/23 19:32:52 dawes Exp $ #define DoNormalLib NormalLibDpsTk #define DoSharedLib SharedLibDpsTk diff --git a/xc/lib/dpstk/XDPSpreview.c b/xc/lib/dpstk/XDPSpreview.c index 11aaaf082..d36331b71 100644 --- a/xc/lib/dpstk/XDPSpreview.c +++ b/xc/lib/dpstk/XDPSpreview.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/XDPSpreview.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */ +/* $XFree86$ */ #include <X11/Xlib.h> #include <DPS/dpsXclient.h> diff --git a/xc/lib/dpstk/XDPSshare.c b/xc/lib/dpstk/XDPSshare.c index 2022cb47f..4d639b55c 100644 --- a/xc/lib/dpstk/XDPSshare.c +++ b/xc/lib/dpstk/XDPSshare.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/XDPSshare.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <stdlib.h> diff --git a/xc/lib/dpstk/XDPSuserpath.c b/xc/lib/dpstk/XDPSuserpath.c index 62c80214c..251f74574 100644 --- a/xc/lib/dpstk/XDPSuserpath.c +++ b/xc/lib/dpstk/XDPSuserpath.c @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dpstk/XDPSuserpath.c,v 1.2 2000/06/07 22:03:01 tsi Exp $ */ +/* $XFree86$ */ #include <DPS/dpsXclient.h> #include <DPS/dpsops.h> diff --git a/xc/lib/dpstk/dpstk-def.cpp b/xc/lib/dpstk/dpstk-def.cpp index 8304cfdf4..ada432c37 100644 --- a/xc/lib/dpstk/dpstk-def.cpp +++ b/xc/lib/dpstk/dpstk-def.cpp @@ -62,4 +62,4 @@ DPSHitUserPath PSDoUserPath PSHitUserPath -/* $XFree86: xc/lib/dpstk/dpstk-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/dpstk/dpstkos2.def b/xc/lib/dpstk/dpstkos2.def index ef5beda5f..0fcf3acf0 100644 --- a/xc/lib/dpstk/dpstkos2.def +++ b/xc/lib/dpstk/dpstkos2.def @@ -1,5 +1,5 @@ LIBRARY DPSTK -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/dpstk/dpstkos2.def,v 1.1 2000/04/05 18:13:23 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/font/FreeType/Imakefile b/xc/lib/font/FreeType/Imakefile index 674f0e4f4..5357ab035 100644 --- a/xc/lib/font/FreeType/Imakefile +++ b/xc/lib/font/FreeType/Imakefile @@ -1,10 +1,10 @@ -XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.15 1999/08/30 01:24:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.14 1999/03/02 02:49:13 dawes Exp $ XCOMM Imakefile created for the Freetype TrueType renderer. XCOMM Mark Leisher <mleisher@crl.nmsu.edu> XCOMM Juliusz Chroboczek <jec@dcs.ed.ac.uk> -#if DoLoadableServer +#if BuildServer && DoLoadableServer #define IHaveSubdirs #define NoLibSubdirs #define PassCDebugFlags @@ -48,7 +48,7 @@ NormalLintTarget($(SRCS)) LinkSourceFile(freetype.c,$(FTSOURCEDIR)/lib/arch/unix) LinkSourceFile(ftxcmap.c,$(FTSOURCEDIR)/lib/extend) -#if DoLoadableServer +#if BuildServer && DoLoadableServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif diff --git a/xc/lib/font/FreeType/ft.h b/xc/lib/font/FreeType/ft.h index 6e456e6b5..3cb7d57fa 100644 --- a/xc/lib/font/FreeType/ft.h +++ b/xc/lib/font/FreeType/ft.h @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.12 1999/10/13 04:20:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.11 1999/04/25 10:01:34 dawes Exp $ */ #undef DEBUG_TRUETYPE diff --git a/xc/lib/font/FreeType/ft_conf.h b/xc/lib/font/FreeType/ft_conf.h index b6c5fe1dd..7f4cc258b 100644 --- a/xc/lib/font/FreeType/ft_conf.h +++ b/xc/lib/font/FreeType/ft_conf.h @@ -1,6 +1,6 @@ /* ft_conf.h. Xserver-specific version. */ -/* $XFree86: xc/lib/font/FreeType/ft_conf.h,v 1.7 1999/04/25 10:01:35 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ft_conf.h,v 1.6 1999/03/14 03:21:16 dawes Exp $ */ /* we need the following because there are some typedefs in this file */ #ifndef FT_CONF_H diff --git a/xc/lib/font/FreeType/ftenc.c b/xc/lib/font/FreeType/ftenc.c index 388b33928..cb2fb937e 100644 --- a/xc/lib/font/FreeType/ftenc.c +++ b/xc/lib/font/FreeType/ftenc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.16 2000/04/06 15:27:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.15 2000/04/05 18:13:23 dawes Exp $ */ /* Copyright (c) 1998 by Juliusz Chroboczek diff --git a/xc/lib/font/FreeType/ftfuncs.c b/xc/lib/font/FreeType/ftfuncs.c index 5bf19f22e..e489563ee 100644 --- a/xc/lib/font/FreeType/ftfuncs.c +++ b/xc/lib/font/FreeType/ftfuncs.c @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.15 2000/08/11 21:12:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.14 2000/04/05 18:13:24 dawes Exp $ */ #ifndef FONT_MODULE #include <string.h> diff --git a/xc/lib/font/FreeType/ftfuncs.h b/xc/lib/font/FreeType/ftfuncs.h index 133f81126..804b77bd9 100644 --- a/xc/lib/font/FreeType/ftfuncs.h +++ b/xc/lib/font/FreeType/ftfuncs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.8 1999/10/13 04:20:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.7 1999/04/25 15:54:25 dawes Exp $ */ /* Number of buckets in the hashtable holding faces */ #define NUMFACEBUCKETS 32 diff --git a/xc/lib/font/FreeType/ftutil.c b/xc/lib/font/FreeType/ftutil.c index da2fcd940..ecccbaee1 100644 --- a/xc/lib/font/FreeType/ftutil.c +++ b/xc/lib/font/FreeType/ftutil.c @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftutil.c,v 1.11 2000/08/11 21:12:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftutil.c,v 1.10 1999/10/13 04:20:50 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/xc/lib/font/FreeType/module/Imakefile b/xc/lib/font/FreeType/module/Imakefile index 3f90080ec..05dfecfd0 100644 --- a/xc/lib/font/FreeType/module/Imakefile +++ b/xc/lib/font/FreeType/module/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/FreeType/module/Imakefile,v 1.6 1999/08/14 10:49:17 dawes Exp $ +XCOMM $XFree86: xc/lib/font/FreeType/module/Imakefile,v 1.5 1999/01/31 04:59:25 dawes Exp $ XCOMM Imakefile created for the Freetype TrueType renderer. XCOMM Mark Leisher <mleisher@crl.nmsu.edu> diff --git a/xc/lib/font/FreeType/module/ftmodule.c b/xc/lib/font/FreeType/module/ftmodule.c index eac212c89..55b71dd50 100644 --- a/xc/lib/font/FreeType/module/ftmodule.c +++ b/xc/lib/font/FreeType/module/ftmodule.c @@ -23,7 +23,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.7 1999/10/13 04:20:51 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.6 1999/01/26 05:53:45 dawes Exp $ */ #include "misc.h" diff --git a/xc/lib/font/Imakefile b/xc/lib/font/Imakefile index 982588f71..7b2f6c069 100644 --- a/xc/lib/font/Imakefile +++ b/xc/lib/font/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/14 1998/06/16 15:23:15 msr $ -XCOMM $XFree86: xc/lib/font/Imakefile,v 3.29 2000/02/13 06:15:23 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Imakefile,v 3.28 1999/11/19 13:53:27 hohndel Exp $ #include <Server.tmpl> #define IHaveSubdirs @@ -95,7 +95,7 @@ FREETYPEPROFILEOBJS = FreeType/profiled/?*.o $(FREETYPEDONES) $(XTTDONES) \ $(BUILTINDONES) util/DONE -#if DoLoadableServer +#if BuildServer && DoLoadableServer BASEDIRS = fontfile fc util fontcache BASELIBOBJS = fontfile/$(STATIC_OBJSDIR)?*.o fc/$(STATIC_OBJSDIR)?*.o \ util/$(STATIC_OBJSDIR)?*.o fontcache/$(STATIC_OBJSDIR)?*.o @@ -138,7 +138,7 @@ ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS)) InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) #endif /* ProfileLibFont */ -#if DoLoadableServer +#if BuildServer && DoLoadableServer NormalDepLibraryTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASELIBOBJS)) NormalDepRelocatableTarget(fontbase,$(BASEDIRS) $(BASEDONES),$(BASEOBJS)) #endif diff --git a/xc/lib/font/Speedo/Imakefile b/xc/lib/font/Speedo/Imakefile index 3db6754e4..3519c0579 100644 --- a/xc/lib/font/Speedo/Imakefile +++ b/xc/lib/font/Speedo/Imakefile @@ -1,7 +1,7 @@ XCOMM $XConsortium: Imakefile,v 1.10 93/09/04 16:42:59 rws Exp $ -XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.7 1999/03/02 02:49:14 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.6 1999/01/31 04:59:25 dawes Exp $ -#if DoLoadableServer +#if BuildServer && DoLoadableServer #define IHaveSubdirs #define NoLibSubdirs #define PassCDebugFlags @@ -32,7 +32,7 @@ LibraryObjectRule() SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer +#if BuildServer && DoLoadableServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif diff --git a/xc/lib/font/Speedo/bics-iso.h b/xc/lib/font/Speedo/bics-iso.h index 09c1d883a..12c89a451 100644 --- a/xc/lib/font/Speedo/bics-iso.h +++ b/xc/lib/font/Speedo/bics-iso.h @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.5 1999/01/31 04:59:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.4 1998/10/03 09:07:11 dawes Exp $ */ int sp_bics_map[] = { 32, 0, diff --git a/xc/lib/font/Speedo/bics-unicode.c b/xc/lib/font/Speedo/bics-unicode.c index 22eed8816..d1733cbf1 100644 --- a/xc/lib/font/Speedo/bics-unicode.c +++ b/xc/lib/font/Speedo/bics-unicode.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Speedo/bics-unicode.c,v 1.1 1999/01/31 04:59:25 dawes Exp $ */ +/* $XFree86$ */ /* These data are very dodgy. */ diff --git a/xc/lib/font/Speedo/bics-unicode.h b/xc/lib/font/Speedo/bics-unicode.h index 3cf2ae445..90fa1885b 100644 --- a/xc/lib/font/Speedo/bics-unicode.h +++ b/xc/lib/font/Speedo/bics-unicode.h @@ -1,3 +1,3 @@ -/* $XFree86: xc/lib/font/Speedo/bics-unicode.h,v 1.1 1999/01/31 04:59:26 dawes Exp $ */ +/* $XFree86$ */ int unicode_to_bics(unsigned); diff --git a/xc/lib/font/Speedo/do_char.c b/xc/lib/font/Speedo/do_char.c index ef7d61b1a..adf28685c 100644 --- a/xc/lib/font/Speedo/do_char.c +++ b/xc/lib/font/Speedo/do_char.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.2 1999/02/07 06:18:14 dawes Exp $ */ +/* $XFree86$ */ /***************************** D O - C H A R . C ***************************** * * diff --git a/xc/lib/font/Speedo/do_trns.c b/xc/lib/font/Speedo/do_trns.c index 00b36585b..7f4ab4c9f 100644 --- a/xc/lib/font/Speedo/do_trns.c +++ b/xc/lib/font/Speedo/do_trns.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.2 1999/02/07 06:18:15 dawes Exp $ */ +/* $XFree86$ */ /**************************** D O _ T R N S . C ****************************** * * diff --git a/xc/lib/font/Speedo/iface.c b/xc/lib/font/Speedo/iface.c index cbcc6fa12..033059099 100644 --- a/xc/lib/font/Speedo/iface.c +++ b/xc/lib/font/Speedo/iface.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/iface.c,v 1.2 1998/07/25 06:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/iface.c,v 1.1.1.1.14.2 1998/07/12 13:47:42 dawes Exp $ */ /***************************** I F A C E . C ********************************* * * diff --git a/xc/lib/font/Speedo/module/Imakefile b/xc/lib/font/Speedo/module/Imakefile index 480d9087d..8be0cb9da 100644 --- a/xc/lib/font/Speedo/module/Imakefile +++ b/xc/lib/font/Speedo/module/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/Speedo/module/Imakefile,v 1.5 1999/08/14 10:49:18 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Speedo/module/Imakefile,v 1.4 1999/01/31 12:53:35 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/lib/font/Speedo/module/speedomod.c b/xc/lib/font/Speedo/module/speedomod.c index 4a5429231..29d6ef2f6 100644 --- a/xc/lib/font/Speedo/module/speedomod.c +++ b/xc/lib/font/Speedo/module/speedomod.c @@ -23,7 +23,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/font/Speedo/module/speedomod.c,v 1.7 1999/01/26 05:53:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/module/speedomod.c,v 1.6 1999/01/23 09:55:35 dawes Exp $ */ #include "misc.h" diff --git a/xc/lib/font/Speedo/out_bl2d.c b/xc/lib/font/Speedo/out_bl2d.c index 2bd20874e..7d2f3d7b6 100644 --- a/xc/lib/font/Speedo/out_bl2d.c +++ b/xc/lib/font/Speedo/out_bl2d.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.3 1999/02/07 11:47:14 dawes Exp $ */ +/* $XFree86$ */ /*************************** O U T _ B L 2 D . C ***************************** * * diff --git a/xc/lib/font/Speedo/out_blk.c b/xc/lib/font/Speedo/out_blk.c index 29269e11b..11af195b7 100644 --- a/xc/lib/font/Speedo/out_blk.c +++ b/xc/lib/font/Speedo/out_blk.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.2 1999/02/07 06:18:16 dawes Exp $ */ +/* $XFree86$ */ /*************************** O U T _ B L K . C ********************************* diff --git a/xc/lib/font/Speedo/out_scrn.c b/xc/lib/font/Speedo/out_scrn.c index bd40a9714..801e4e274 100644 --- a/xc/lib/font/Speedo/out_scrn.c +++ b/xc/lib/font/Speedo/out_scrn.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.4 1999/12/27 00:39:25 robin Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.3 1999/03/14 03:21:17 dawes Exp $ */ /*************************** O U T _ S C R N . C ***************************** diff --git a/xc/lib/font/Speedo/out_util.c b/xc/lib/font/Speedo/out_util.c index fc2c1c603..a4205a5c0 100644 --- a/xc/lib/font/Speedo/out_util.c +++ b/xc/lib/font/Speedo/out_util.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */ +/* $XFree86$ */ #define DEBUG 0 diff --git a/xc/lib/font/Speedo/reset.c b/xc/lib/font/Speedo/reset.c index b610d699f..2236c7793 100644 --- a/xc/lib/font/Speedo/reset.c +++ b/xc/lib/font/Speedo/reset.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.2 1999/02/07 06:18:17 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/font/Speedo/set_spcs.c b/xc/lib/font/Speedo/set_spcs.c index ad2f50302..3e33ceb42 100644 --- a/xc/lib/font/Speedo/set_spcs.c +++ b/xc/lib/font/Speedo/set_spcs.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.2 1999/02/07 06:18:18 dawes Exp $ */ +/* $XFree86$ */ /*************************** S E T _ S P C S . C ***************************** diff --git a/xc/lib/font/Speedo/set_trns.c b/xc/lib/font/Speedo/set_trns.c index fff65dc91..c26ba45be 100644 --- a/xc/lib/font/Speedo/set_trns.c +++ b/xc/lib/font/Speedo/set_trns.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.2 1999/02/07 06:18:18 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/font/Speedo/spdo_prv.h b/xc/lib/font/Speedo/spdo_prv.h index 8fd022ef1..48971bbff 100644 --- a/xc/lib/font/Speedo/spdo_prv.h +++ b/xc/lib/font/Speedo/spdo_prv.h @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.4 1999/03/14 03:21:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.3tsi Exp $ */ diff --git a/xc/lib/font/Speedo/speedo.h b/xc/lib/font/Speedo/speedo.h index 5998878c9..e7c3751d6 100644 --- a/xc/lib/font/Speedo/speedo.h +++ b/xc/lib/font/Speedo/speedo.h @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.4 1999/03/14 03:21:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.3tsi Exp $ */ #ifndef _SPEEDO_H_ #define _SPEEDO_H_ diff --git a/xc/lib/font/Speedo/spencode.c b/xc/lib/font/Speedo/spencode.c index 62309c51b..64badff79 100644 --- a/xc/lib/font/Speedo/spencode.c +++ b/xc/lib/font/Speedo/spencode.c @@ -43,7 +43,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.5 1999/01/31 04:59:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.4 1998/10/03 09:07:11 dawes Exp $ */ #include "spint.h" diff --git a/xc/lib/font/Speedo/sperr.c b/xc/lib/font/Speedo/sperr.c index 1dbbd2878..17b47f7e4 100644 --- a/xc/lib/font/Speedo/sperr.c +++ b/xc/lib/font/Speedo/sperr.c @@ -48,7 +48,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.3 2000/04/05 18:13:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.2 1999/02/07 06:18:19 dawes Exp $ */ #include "spint.h" diff --git a/xc/lib/font/Speedo/spfile.c b/xc/lib/font/Speedo/spfile.c index 45f2f3c56..40dc0978d 100644 --- a/xc/lib/font/Speedo/spfile.c +++ b/xc/lib/font/Speedo/spfile.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.11 1999/04/25 10:01:40 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.10 1999/02/07 06:18:20 dawes Exp $ */ #include "fntfilst.h" #include "fontenc.h" diff --git a/xc/lib/font/Speedo/spfont.c b/xc/lib/font/Speedo/spfont.c index 0cb4f2f65..4e91e5e5e 100644 --- a/xc/lib/font/Speedo/spfont.c +++ b/xc/lib/font/Speedo/spfont.c @@ -21,7 +21,7 @@ * * Author: Dave Lemke, Network Computing Devices Inc */ -/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.9 1999/06/13 13:47:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.8 1999/03/14 11:17:43 dawes Exp $ */ /* diff --git a/xc/lib/font/Speedo/spfuncs.c b/xc/lib/font/Speedo/spfuncs.c index 6ed69c771..190f0b98a 100644 --- a/xc/lib/font/Speedo/spfuncs.c +++ b/xc/lib/font/Speedo/spfuncs.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.5 1999/03/14 11:17:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.4 1999/02/07 06:18:20 dawes Exp $ */ #ifndef FONTMODULE #include <X11/Xos.h> diff --git a/xc/lib/font/Speedo/spglyph.c b/xc/lib/font/Speedo/spglyph.c index e3812d55d..58647fc92 100644 --- a/xc/lib/font/Speedo/spglyph.c +++ b/xc/lib/font/Speedo/spglyph.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.5 1999/03/14 11:17:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.4 1999/03/14 03:21:18 dawes Exp $ */ #include <X11/X.h> /* for bit order #defines */ #include "spint.h" diff --git a/xc/lib/font/Speedo/spinfo.c b/xc/lib/font/Speedo/spinfo.c index e816f30ec..4c6445d03 100644 --- a/xc/lib/font/Speedo/spinfo.c +++ b/xc/lib/font/Speedo/spinfo.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.9 2000/02/25 18:28:00 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.8 1999/03/14 11:17:43 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/xc/lib/font/Speedo/spint.h b/xc/lib/font/Speedo/spint.h index 453025e75..038960cbb 100644 --- a/xc/lib/font/Speedo/spint.h +++ b/xc/lib/font/Speedo/spint.h @@ -43,7 +43,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.8 1999/02/07 06:18:21 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.7 1999/01/31 04:59:27 dawes Exp $ */ #ifndef _SPINT_H_ #define _SPINT_H_ diff --git a/xc/lib/font/Type1/Imakefile b/xc/lib/font/Type1/Imakefile index cd54fad68..d3ebea0ca 100644 --- a/xc/lib/font/Type1/Imakefile +++ b/xc/lib/font/Type1/Imakefile @@ -1,7 +1,7 @@ XCOMM $XConsortium: Imakefile,v 1.5 93/09/04 16:43:32 rws Exp $ -XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.8 1999/05/03 05:58:44 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.7 1999/03/02 02:49:14 dawes Exp $ -#if DoLoadableServer +#if BuildServer && DoLoadableServer #define IHaveSubdirs #define NoLibSubdirs #define PassCDebugFlags @@ -77,7 +77,7 @@ LibraryObjectRule() SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer +#if BuildServer && DoLoadableServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif diff --git a/xc/lib/font/Type1/afm.c b/xc/lib/font/Type1/afm.c index 5f97ef0f5..b4e9ef6ba 100644 --- a/xc/lib/font/Type1/afm.c +++ b/xc/lib/font/Type1/afm.c @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/afm.c,v 1.2 1999/08/21 13:47:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/afm.c,v 1.1 1999/05/03 05:58:44 dawes Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE diff --git a/xc/lib/font/Type1/arith.c b/xc/lib/font/Type1/arith.c index 05f0b6545..c41757c09 100644 --- a/xc/lib/font/Type1/arith.c +++ b/xc/lib/font/Type1/arith.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.c,v 1.4 1999/08/22 08:58:49 dawes Exp $ */ +/* $XFree86$ */ /* ARITH CWEB V0006 ******** */ /* diff --git a/xc/lib/font/Type1/arith.h b/xc/lib/font/Type1/arith.h index a7d1ab3de..e17c448a0 100644 --- a/xc/lib/font/Type1/arith.h +++ b/xc/lib/font/Type1/arith.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.h,v 1.4 1999/08/21 13:47:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/arith.h,v 1.3 1999/02/13 01:13:36 dawes Exp $ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/blues.h b/xc/lib/font/Type1/blues.h index 62229b1c3..4875790da 100644 --- a/xc/lib/font/Type1/blues.h +++ b/xc/lib/font/Type1/blues.h @@ -28,7 +28,7 @@ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/blues.h,v 1.3 1999/08/22 08:58:49 dawes Exp $ */ +/* $XFree86$ */ extern psobj *GetType1CharString ( psfont *fontP, unsigned char code ); diff --git a/xc/lib/font/Type1/cidchar.c b/xc/lib/font/Type1/cidchar.c index 75e5264ca..a40af3ec3 100644 --- a/xc/lib/font/Type1/cidchar.c +++ b/xc/lib/font/Type1/cidchar.c @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.8 1999/08/21 13:47:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.7 1999/07/10 12:17:13 dawes Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE diff --git a/xc/lib/font/Type1/curves.c b/xc/lib/font/Type1/curves.c index 063eefb1c..e5051bb38 100644 --- a/xc/lib/font/Type1/curves.c +++ b/xc/lib/font/Type1/curves.c @@ -29,7 +29,7 @@ /* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT */ /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS */ /* SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.c,v 1.5 1999/09/04 09:14:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/curves.c,v 1.4 1999/08/22 08:58:50 dawes Exp $ */ /* :h1.CURVES Module - Stepping Beziers diff --git a/xc/lib/font/Type1/curves.h b/xc/lib/font/Type1/curves.h index 6f8d86716..e866f1dbc 100644 --- a/xc/lib/font/Type1/curves.h +++ b/xc/lib/font/Type1/curves.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.h,v 1.3 1999/08/22 08:58:50 dawes Exp $ */ +/* $XFree86$ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/fontfcn.c b/xc/lib/font/Type1/fontfcn.c index f6cb8e970..0abaadb96 100644 --- a/xc/lib/font/Type1/fontfcn.c +++ b/xc/lib/font/Type1/fontfcn.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.8 1999/08/21 13:47:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.7 1999/05/04 09:35:21 dawes Exp $ */ #ifndef FONTMODULE #include <stdio.h> diff --git a/xc/lib/font/Type1/fontfcn.h b/xc/lib/font/Type1/fontfcn.h index 3f8adbbec..6047f8ad2 100644 --- a/xc/lib/font/Type1/fontfcn.h +++ b/xc/lib/font/Type1/fontfcn.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.4 1999/08/22 08:58:50 dawes Exp $ */ +/* $XFree86$ */ #ifdef BUILDCID diff --git a/xc/lib/font/Type1/hints.c b/xc/lib/font/Type1/hints.c index 957d28c76..62b72b318 100644 --- a/xc/lib/font/Type1/hints.c +++ b/xc/lib/font/Type1/hints.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.c,v 1.4 1999/08/22 08:58:51 dawes Exp $ */ +/* $XFree86$ */ /* HINTS CWEB V0006 ******** */ /* diff --git a/xc/lib/font/Type1/hints.h b/xc/lib/font/Type1/hints.h index 7b814d12a..0b05f8dbc 100644 --- a/xc/lib/font/Type1/hints.h +++ b/xc/lib/font/Type1/hints.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.h,v 1.3 1999/08/22 08:58:51 dawes Exp $ */ +/* $XFree86$ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/lines.c b/xc/lib/font/Type1/lines.c index fbe863b73..793f932c5 100644 --- a/xc/lib/font/Type1/lines.c +++ b/xc/lib/font/Type1/lines.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.c,v 1.3 1999/08/22 08:58:51 dawes Exp $ */ +/* $XFree86$ */ /* LINES CWEB V0003 ******** */ /* diff --git a/xc/lib/font/Type1/lines.h b/xc/lib/font/Type1/lines.h index 600f4915e..c736f9e94 100644 --- a/xc/lib/font/Type1/lines.h +++ b/xc/lib/font/Type1/lines.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.h,v 1.3 1999/08/22 08:58:52 dawes Exp $ */ +/* $XFree86$ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/module/Imakefile b/xc/lib/font/Type1/module/Imakefile index b76d9124c..e1a84b895 100644 --- a/xc/lib/font/Type1/module/Imakefile +++ b/xc/lib/font/Type1/module/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/Type1/module/Imakefile,v 1.6 1999/08/14 10:49:18 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Type1/module/Imakefile,v 1.5 1999/05/03 05:58:52 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/lib/font/Type1/module/type1mod.c b/xc/lib/font/Type1/module/type1mod.c index 5ff5382b3..5eee06c53 100644 --- a/xc/lib/font/Type1/module/type1mod.c +++ b/xc/lib/font/Type1/module/type1mod.c @@ -23,7 +23,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.8 1999/05/15 12:10:08 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.7 1999/01/26 05:53:46 dawes Exp $ */ #include "misc.h" diff --git a/xc/lib/font/Type1/objects.c b/xc/lib/font/Type1/objects.c index a548ac79a..fc44ac2b5 100644 --- a/xc/lib/font/Type1/objects.c +++ b/xc/lib/font/Type1/objects.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/objects.c,v 1.8 1999/09/25 14:36:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.c,v 1.7 1999/08/22 05:35:42 dawes Exp $ */ /* OBJECTS CWEB V0025 ******** */ /* :h1.OBJECTS Module - TYPE1IMAGER Objects Common Routines diff --git a/xc/lib/font/Type1/objects.h b/xc/lib/font/Type1/objects.h index 9e281033f..5b0c1c5e8 100644 --- a/xc/lib/font/Type1/objects.h +++ b/xc/lib/font/Type1/objects.h @@ -43,7 +43,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/objects.h,v 1.7 1999/08/22 05:35:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.h,v 1.6 1999/08/21 13:47:43 dawes Exp $ */ /*SHARED*/ /*END SHARED*/ diff --git a/xc/lib/font/Type1/paths.c b/xc/lib/font/Type1/paths.c index 17a4f5172..769413460 100644 --- a/xc/lib/font/Type1/paths.c +++ b/xc/lib/font/Type1/paths.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.c,v 1.4 1999/08/22 08:58:52 dawes Exp $ */ +/* $XFree86$ */ /* PATHS CWEB V0021 ******** */ /* diff --git a/xc/lib/font/Type1/paths.h b/xc/lib/font/Type1/paths.h index 9bf8b93d1..0406b1454 100644 --- a/xc/lib/font/Type1/paths.h +++ b/xc/lib/font/Type1/paths.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */ +/* $XFree86$ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/pictures.h b/xc/lib/font/Type1/pictures.h index 673bab680..eae939665 100644 --- a/xc/lib/font/Type1/pictures.h +++ b/xc/lib/font/Type1/pictures.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */ +/* $XFree86$ */ /* STUB */ diff --git a/xc/lib/font/Type1/regions.c b/xc/lib/font/Type1/regions.c index 78b86862b..272fb5c13 100644 --- a/xc/lib/font/Type1/regions.c +++ b/xc/lib/font/Type1/regions.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.c,v 3.4 2000/04/28 18:19:20 eich Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.c,v 3.2 1999/08/21 13:47:45 dawes Exp $ */ /* REGIONS CWEB V0023 LOTS */ /* :h1 id=regions.REGIONS Module - Regions Operator Handler diff --git a/xc/lib/font/Type1/regions.h b/xc/lib/font/Type1/regions.h index 1aece83d3..a2363b48b 100644 --- a/xc/lib/font/Type1/regions.h +++ b/xc/lib/font/Type1/regions.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.h,v 1.6 2000/08/09 23:40:15 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.h,v 1.5 2000/04/28 18:19:20 eich Exp $ */ /*SHARED*/ #define Interior(p,rule) t1_Interior(p,rule) diff --git a/xc/lib/font/Type1/scanfont.c b/xc/lib/font/Type1/scanfont.c index 9de13970f..f3faf6d9a 100644 --- a/xc/lib/font/Type1/scanfont.c +++ b/xc/lib/font/Type1/scanfont.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.13 1999/08/21 13:47:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.12 1999/05/23 06:33:32 dawes Exp $ */ #ifndef FONTMODULE #include <string.h> diff --git a/xc/lib/font/Type1/spaces.c b/xc/lib/font/Type1/spaces.c index 903b60f97..94dbc3cd3 100644 --- a/xc/lib/font/Type1/spaces.c +++ b/xc/lib/font/Type1/spaces.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.7 1999/09/25 14:36:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.6 1999/08/22 05:35:44 dawes Exp $ */ /* SPACES CWEB V0021 ******** */ /* :h1 id=spaces.SPACES Module - Handles Coordinate Spaces diff --git a/xc/lib/font/Type1/spaces.h b/xc/lib/font/Type1/spaces.h index 4c6a5c14b..02dadf5ee 100644 --- a/xc/lib/font/Type1/spaces.h +++ b/xc/lib/font/Type1/spaces.h @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.3 1999/08/22 08:58:53 dawes Exp $ */ +/* $XFree86$ */ /*SHARED*/ diff --git a/xc/lib/font/Type1/t1funcs.c b/xc/lib/font/Type1/t1funcs.c index df8bf7f1d..7780c697b 100644 --- a/xc/lib/font/Type1/t1funcs.c +++ b/xc/lib/font/Type1/t1funcs.c @@ -71,7 +71,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.21 1999/09/25 14:36:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.20 1999/09/04 09:14:10 dawes Exp $ */ /* diff --git a/xc/lib/font/Type1/t1imager.h b/xc/lib/font/Type1/t1imager.h index e7576e48b..1c3d373de 100644 --- a/xc/lib/font/Type1/t1imager.h +++ b/xc/lib/font/Type1/t1imager.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.3 1999/08/22 08:58:53 dawes Exp $ */ +/* $XFree86$ */ #include "objects.h" diff --git a/xc/lib/font/Type1/t1info.c b/xc/lib/font/Type1/t1info.c index 57d671999..d4484205c 100644 --- a/xc/lib/font/Type1/t1info.c +++ b/xc/lib/font/Type1/t1info.c @@ -95,7 +95,7 @@ from The Open Group. * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.14 2000/02/25 18:28:00 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.13 1999/08/21 13:47:48 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" diff --git a/xc/lib/font/Type1/t1intf.h b/xc/lib/font/Type1/t1intf.h index c008ab9ac..ad13455b0 100644 --- a/xc/lib/font/Type1/t1intf.h +++ b/xc/lib/font/Type1/t1intf.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.5 1999/08/21 13:47:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.4 1999/05/15 12:10:07 dawes Exp $ */ #ifdef BUILDCID #include "AFM.h" diff --git a/xc/lib/font/Type1/t1io.c b/xc/lib/font/Type1/t1io.c index e6c03675b..3989a4ca6 100644 --- a/xc/lib/font/Type1/t1io.c +++ b/xc/lib/font/Type1/t1io.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.7 1999/08/21 13:47:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.6 1999/05/23 06:33:33 dawes Exp $ */ /******************************************************************* * I/O package for Type 1 font reading ********************************************************************/ diff --git a/xc/lib/font/Type1/t1malloc.c b/xc/lib/font/Type1/t1malloc.c index 63ca3657e..364af05f1 100644 --- a/xc/lib/font/Type1/t1malloc.c +++ b/xc/lib/font/Type1/t1malloc.c @@ -26,7 +26,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.8 1999/09/25 14:36:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.7 1999/08/22 05:35:45 dawes Exp $ */ /* MALLOC CWEB V0004 LOTS */ /* :h1.MALLOC - Fast Memory Allocation diff --git a/xc/lib/font/Type1/t1snap.c b/xc/lib/font/Type1/t1snap.c index 0a6d20843..77f76349e 100644 --- a/xc/lib/font/Type1/t1snap.c +++ b/xc/lib/font/Type1/t1snap.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ +/* $XFree86$ */ #include "objects.h" diff --git a/xc/lib/font/Type1/t1stdio.h b/xc/lib/font/Type1/t1stdio.h index 39d093e7a..d541b4c1e 100644 --- a/xc/lib/font/Type1/t1stdio.h +++ b/xc/lib/font/Type1/t1stdio.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.8 1999/08/21 13:47:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.7 1999/05/23 06:33:33 dawes Exp $ */ /* T1IO FILE structure and related stuff */ #ifdef XFree86LOADER #undef FILE diff --git a/xc/lib/font/Type1/t1stub.c b/xc/lib/font/Type1/t1stub.c index 9ec81826b..a398aa44b 100644 --- a/xc/lib/font/Type1/t1stub.c +++ b/xc/lib/font/Type1/t1stub.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.7 1999/09/25 14:36:40 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.6 1999/08/22 05:35:45 dawes Exp $ */ #ifdef FONTMODULE #include "Xdefs.h" /* Bool declaration */ diff --git a/xc/lib/font/Type1/t1unicode.c b/xc/lib/font/Type1/t1unicode.c index c6b1cd9d8..96f646d45 100644 --- a/xc/lib/font/Type1/t1unicode.c +++ b/xc/lib/font/Type1/t1unicode.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1unicode.c,v 1.1 1999/01/31 04:59:30 dawes Exp $ */ +/* $XFree86$ */ #include "t1unicode.h" diff --git a/xc/lib/font/Type1/t1unicode.h b/xc/lib/font/Type1/t1unicode.h index f2a13fd83..bad0274a0 100644 --- a/xc/lib/font/Type1/t1unicode.h +++ b/xc/lib/font/Type1/t1unicode.h @@ -20,6 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1unicode.h,v 1.1 1999/01/31 04:59:31 dawes Exp $ */ +/* $XFree86$ */ char *unicodetoPSname(unsigned short code); diff --git a/xc/lib/font/Type1/token.c b/xc/lib/font/Type1/token.c index 99895625c..2cbae8ff2 100644 --- a/xc/lib/font/Type1/token.c +++ b/xc/lib/font/Type1/token.c @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.c,v 1.4 1999/08/21 13:47:51 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/token.c,v 1.3 1999/03/02 11:49:22 dawes Exp $ */ /* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */ #include "t1stdio.h" #include "util.h" diff --git a/xc/lib/font/Type1/token.h b/xc/lib/font/Type1/token.h index 620eafb1c..a801a85b3 100644 --- a/xc/lib/font/Type1/token.h +++ b/xc/lib/font/Type1/token.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ +/* $XFree86$ */ #ifndef TOKEN_H #define TOKEN_H diff --git a/xc/lib/font/Type1/tokst.h b/xc/lib/font/Type1/tokst.h index e757f6a65..39267264f 100644 --- a/xc/lib/font/Type1/tokst.h +++ b/xc/lib/font/Type1/tokst.h @@ -27,7 +27,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.3 1999/08/22 08:58:54 dawes Exp $ */ +/* $XFree86$ */ /* -------------------------------------- */ /* --- MACHINE GENERATED, DO NOT EDIT --- */ diff --git a/xc/lib/font/Type1/trig.h b/xc/lib/font/Type1/trig.h index 8434caea1..c79e97f2a 100644 --- a/xc/lib/font/Type1/trig.h +++ b/xc/lib/font/Type1/trig.h @@ -29,7 +29,7 @@ */ /*SHARED*/ -/* $XFree86: xc/lib/font/Type1/trig.h,v 1.2 1998/07/25 06:57:00 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/trig.h,v 1.1.1.1.14.1 1998/07/18 17:53:09 dawes Exp $ */ #undef DegreeCos #undef DegreeSin diff --git a/xc/lib/font/Type1/type1.c b/xc/lib/font/Type1/type1.c index 46092b89e..21450801b 100644 --- a/xc/lib/font/Type1/type1.c +++ b/xc/lib/font/Type1/type1.c @@ -45,7 +45,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/type1.c,v 1.8 1999/08/21 13:47:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/type1.c,v 1.7 1999/05/03 05:58:48 dawes Exp $ */ /*********************************************************************/ /* */ diff --git a/xc/lib/font/Type1/util.c b/xc/lib/font/Type1/util.c index d1786d497..b8e46873f 100644 --- a/xc/lib/font/Type1/util.c +++ b/xc/lib/font/Type1/util.c @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.c,v 1.5 1999/08/21 13:47:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/util.c,v 1.4 1999/05/03 05:58:49 dawes Exp $ */ /* Author: Katherine A. Hitchcock IBM Almaden Research Laboratory */ #ifndef FONTMODULE diff --git a/xc/lib/font/Type1/util.h b/xc/lib/font/Type1/util.h index 1f8191e69..87b29303e 100644 --- a/xc/lib/font/Type1/util.h +++ b/xc/lib/font/Type1/util.h @@ -44,7 +44,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.h,v 1.4 1999/08/22 08:58:55 dawes Exp $ */ +/* $XFree86$ */ #ifndef UTIL_H #define UTIL_H diff --git a/xc/lib/font/X-TrueType/ARABIC/Imakefile b/xc/lib/font/X-TrueType/ARABIC/Imakefile index 3e8dfdc4c..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ARABIC/Imakefile +++ b/xc/lib/font/X-TrueType/ARABIC/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ARABIC/Imakefile,v 1.3 1999/03/28 15:59:32 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ARABIC/Imakefile.inc b/xc/lib/font/X-TrueType/ARABIC/Imakefile.inc index 471af8d13..dc97c468b 100644 --- a/xc/lib/font/X-TrueType/ARABIC/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ARABIC/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ARABIC/Imakefile.inc,v 1.1 1999/03/28 15:31:37 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ARABIC MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ARABIC/module/Imakefile b/xc/lib/font/X-TrueType/ARABIC/module/Imakefile index d6f268ed4..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ARABIC/module/Imakefile +++ b/xc/lib/font/X-TrueType/ARABIC/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ARABIC/module/Imakefile,v 1.3 1999/03/28 15:59:32 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ARMSCII8/Imakefile b/xc/lib/font/X-TrueType/ARMSCII8/Imakefile index 8db543c16..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ARMSCII8/Imakefile +++ b/xc/lib/font/X-TrueType/ARMSCII8/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ARMSCII8/Imakefile,v 1.3 1999/03/28 15:59:33 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ARMSCII8/Imakefile.inc b/xc/lib/font/X-TrueType/ARMSCII8/Imakefile.inc index 0d8537e96..d608306b2 100644 --- a/xc/lib/font/X-TrueType/ARMSCII8/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ARMSCII8/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ARMSCII8/Imakefile.inc,v 1.1 1999/03/28 15:31:38 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ARMSCII8 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ARMSCII8/module/Imakefile b/xc/lib/font/X-TrueType/ARMSCII8/module/Imakefile index 300029046..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ARMSCII8/module/Imakefile +++ b/xc/lib/font/X-TrueType/ARMSCII8/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ARMSCII8/module/Imakefile,v 1.2 1999/03/28 15:59:33 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/BIG5/Imakefile b/xc/lib/font/X-TrueType/BIG5/Imakefile index 220e58c50..dd128acb7 100644 --- a/xc/lib/font/X-TrueType/BIG5/Imakefile +++ b/xc/lib/font/X-TrueType/BIG5/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/BIG5/Imakefile,v 1.2 1999/03/28 15:59:33 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.obj"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/BIG5/Imakefile.inc b/xc/lib/font/X-TrueType/BIG5/Imakefile.inc index 0cec7006c..edf863186 100644 --- a/xc/lib/font/X-TrueType/BIG5/Imakefile.inc +++ b/xc/lib/font/X-TrueType/BIG5/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/BIG5/Imakefile.inc,v 1.1 1999/03/28 15:31:39 dawes Exp $ +XCOMM $XFree86$ #define ModuleName BIG5 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/BIG5/module/Imakefile b/xc/lib/font/X-TrueType/BIG5/module/Imakefile index 662197fd7..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/BIG5/module/Imakefile +++ b/xc/lib/font/X-TrueType/BIG5/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/BIG5/module/Imakefile,v 1.2 1999/03/28 15:59:34 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/DOSENCODING/Imakefile b/xc/lib/font/X-TrueType/DOSENCODING/Imakefile index bdb3d2fd9..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/DOSENCODING/Imakefile +++ b/xc/lib/font/X-TrueType/DOSENCODING/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/DOSENCODING/Imakefile,v 1.3 1999/03/28 15:59:34 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/DOSENCODING/Imakefile.inc b/xc/lib/font/X-TrueType/DOSENCODING/Imakefile.inc index b30a96117..827963e41 100644 --- a/xc/lib/font/X-TrueType/DOSENCODING/Imakefile.inc +++ b/xc/lib/font/X-TrueType/DOSENCODING/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/DOSENCODING/Imakefile.inc,v 1.1 1999/03/28 15:31:40 dawes Exp $ +XCOMM $XFree86$ #define ModuleName DOSENCODING MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/DOSENCODING/module/Imakefile b/xc/lib/font/X-TrueType/DOSENCODING/module/Imakefile index a9b21ffdf..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/DOSENCODING/module/Imakefile +++ b/xc/lib/font/X-TrueType/DOSENCODING/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/DOSENCODING/module/Imakefile,v 1.2 1999/03/28 15:59:34 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/GB2312/Imakefile b/xc/lib/font/X-TrueType/GB2312/Imakefile index 3d757fcca..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/GB2312/Imakefile +++ b/xc/lib/font/X-TrueType/GB2312/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/GB2312/Imakefile,v 1.3 1999/03/28 15:59:35 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/GB2312/Imakefile.inc b/xc/lib/font/X-TrueType/GB2312/Imakefile.inc index b9bbb9b89..cb057080e 100644 --- a/xc/lib/font/X-TrueType/GB2312/Imakefile.inc +++ b/xc/lib/font/X-TrueType/GB2312/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/GB2312/Imakefile.inc,v 1.1 1999/03/28 15:31:41 dawes Exp $ +XCOMM $XFree86$ #define ModuleName GB2312 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/GB2312/module/Imakefile b/xc/lib/font/X-TrueType/GB2312/module/Imakefile index a22d70e67..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/GB2312/module/Imakefile +++ b/xc/lib/font/X-TrueType/GB2312/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/GB2312/module/Imakefile,v 1.3 1999/03/28 15:59:35 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/GEORGIAN/Imakefile b/xc/lib/font/X-TrueType/GEORGIAN/Imakefile index 8fe677224..36f32994e 100644 --- a/xc/lib/font/X-TrueType/GEORGIAN/Imakefile +++ b/xc/lib/font/X-TrueType/GEORGIAN/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/GEORGIAN/Imakefile,v 1.1 2000/02/13 06:15:26 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/GEORGIAN/Imakefile$ /*#include "Imakefile.obj"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/GEORGIAN/Imakefile.inc b/xc/lib/font/X-TrueType/GEORGIAN/Imakefile.inc index 52a3141b4..a50ab9cad 100644 --- a/xc/lib/font/X-TrueType/GEORGIAN/Imakefile.inc +++ b/xc/lib/font/X-TrueType/GEORGIAN/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/GEORGIAN/Imakefile.inc,v 1.1 2000/02/13 06:15:26 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/BIG5/Imakefile.inc,v 1.1 1999/03/28 15:31:39 dawes Exp $ #define ModuleName GEORGIAN MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile b/xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile index 6fd19d13f..96dfe3332 100644 --- a/xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile +++ b/xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile,v 1.1 2000/02/13 06:15:26 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/GEORGIAN/module/Imakefile$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.1/Imakefile b/xc/lib/font/X-TrueType/ISO8859.1/Imakefile index 624ab7126..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.1/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.1/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.1/Imakefile,v 1.3 1999/03/28 15:59:35 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.1/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.1/Imakefile.inc index 18bafccd5..bcde6a26b 100644 --- a/xc/lib/font/X-TrueType/ISO8859.1/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.1/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.1/Imakefile.inc,v 1.1 1999/03/28 15:31:44 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_1 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.1/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.1/module/Imakefile index 8e27a16f3..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.1/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.1/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.1/module/Imakefile,v 1.2 1999/03/28 15:59:36 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.10/Imakefile b/xc/lib/font/X-TrueType/ISO8859.10/Imakefile index 2cafe7761..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.10/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.10/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.10/Imakefile,v 1.3 1999/03/28 15:59:36 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.10/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.10/Imakefile.inc index 4fdd7126a..d69bf6d59 100644 --- a/xc/lib/font/X-TrueType/ISO8859.10/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.10/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.10/Imakefile.inc,v 1.1 1999/03/28 15:31:44 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_10 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.10/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.10/module/Imakefile index f772d5e06..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.10/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.10/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.10/module/Imakefile,v 1.3 1999/03/28 15:59:36 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.11/Imakefile b/xc/lib/font/X-TrueType/ISO8859.11/Imakefile index d11d0bc8e..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.11/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.11/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.11/Imakefile,v 1.3 1999/03/28 15:59:37 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.11/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.11/Imakefile.inc index 3af0ff289..6d86b67a0 100644 --- a/xc/lib/font/X-TrueType/ISO8859.11/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.11/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.11/Imakefile.inc,v 1.1 1999/03/28 15:31:46 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_11 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.11/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.11/module/Imakefile index d0bfb5387..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.11/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.11/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.11/module/Imakefile,v 1.2 1999/03/28 15:59:37 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.14/Imakefile b/xc/lib/font/X-TrueType/ISO8859.14/Imakefile index bb82a741b..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.14/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.14/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.14/Imakefile,v 1.3 1999/03/28 15:59:37 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.14/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.14/Imakefile.inc index f4048aef8..640a3818f 100644 --- a/xc/lib/font/X-TrueType/ISO8859.14/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.14/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.14/Imakefile.inc,v 1.1 1999/03/28 15:31:47 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_14 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.14/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.14/module/Imakefile index 9252624c8..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.14/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.14/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.14/module/Imakefile,v 1.3 1999/03/28 15:59:38 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.15/Imakefile b/xc/lib/font/X-TrueType/ISO8859.15/Imakefile index 1c9576aa4..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.15/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.15/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.15/Imakefile,v 1.3 1999/03/28 15:59:38 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.15/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.15/Imakefile.inc index 66b9f5a8d..95eb2252f 100644 --- a/xc/lib/font/X-TrueType/ISO8859.15/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.15/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.15/Imakefile.inc,v 1.1 1999/03/28 15:31:48 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_15 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.15/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.15/module/Imakefile index 84769109a..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.15/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.15/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.15/module/Imakefile,v 1.2 1999/03/28 15:59:39 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.2/Imakefile b/xc/lib/font/X-TrueType/ISO8859.2/Imakefile index 69e138f59..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.2/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.2/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.2/Imakefile,v 1.3 1999/03/28 15:59:39 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.2/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.2/Imakefile.inc index 722dc6030..f3f867638 100644 --- a/xc/lib/font/X-TrueType/ISO8859.2/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.2/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.2/Imakefile.inc,v 1.1 1999/03/28 15:31:49 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_2 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.2/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.2/module/Imakefile index 98817cf72..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.2/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.2/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.2/module/Imakefile,v 1.3 1999/03/28 15:59:39 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.3/Imakefile b/xc/lib/font/X-TrueType/ISO8859.3/Imakefile index 8b558c513..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.3/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.3/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.3/Imakefile,v 1.3 1999/03/28 15:59:40 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.3/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.3/Imakefile.inc index 666e7fe08..e30beb630 100644 --- a/xc/lib/font/X-TrueType/ISO8859.3/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.3/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.3/Imakefile.inc,v 1.1 1999/03/28 15:31:50 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_3 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.3/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.3/module/Imakefile index d27298763..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.3/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.3/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.3/module/Imakefile,v 1.2 1999/03/28 15:59:40 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.4/Imakefile b/xc/lib/font/X-TrueType/ISO8859.4/Imakefile index 3948d0a41..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.4/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.4/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.4/Imakefile,v 1.3 1999/03/28 15:59:40 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.4/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.4/Imakefile.inc index fdc0afdbf..d6f84e137 100644 --- a/xc/lib/font/X-TrueType/ISO8859.4/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.4/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.4/Imakefile.inc,v 1.1 1999/03/28 15:31:51 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_4 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.4/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.4/module/Imakefile index a42818500..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.4/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.4/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.4/module/Imakefile,v 1.3 1999/03/28 15:59:41 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.5/Imakefile b/xc/lib/font/X-TrueType/ISO8859.5/Imakefile index 68076f9e5..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.5/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.5/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.5/Imakefile,v 1.3 1999/03/28 15:59:41 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.5/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.5/Imakefile.inc index 4c2eb1a67..e0361fbeb 100644 --- a/xc/lib/font/X-TrueType/ISO8859.5/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.5/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.5/Imakefile.inc,v 1.1 1999/03/28 15:31:52 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_5 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.5/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.5/module/Imakefile index 220216734..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.5/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.5/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.5/module/Imakefile,v 1.2 1999/03/28 15:59:41 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.6/Imakefile b/xc/lib/font/X-TrueType/ISO8859.6/Imakefile index 6f3863d40..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.6/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.6/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.6/Imakefile,v 1.3 1999/03/28 15:59:42 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.6/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.6/Imakefile.inc index bacd6ebbe..ecdf80217 100644 --- a/xc/lib/font/X-TrueType/ISO8859.6/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.6/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.6/Imakefile.inc,v 1.1 1999/03/28 15:31:53 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_6 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.6/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.6/module/Imakefile index acfb3d890..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.6/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.6/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.6/module/Imakefile,v 1.3 1999/03/28 15:59:42 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.7/Imakefile b/xc/lib/font/X-TrueType/ISO8859.7/Imakefile index 5ef870f54..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.7/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.7/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.7/Imakefile,v 1.3 1999/03/28 15:59:42 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.7/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.7/Imakefile.inc index b6467154f..ce54b0cb4 100644 --- a/xc/lib/font/X-TrueType/ISO8859.7/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.7/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.7/Imakefile.inc,v 1.1 1999/03/28 15:31:54 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_7 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.7/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.7/module/Imakefile index 74ea987af..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.7/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.7/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.7/module/Imakefile,v 1.2 1999/03/28 15:59:43 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.8/Imakefile b/xc/lib/font/X-TrueType/ISO8859.8/Imakefile index df0a6ed22..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.8/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.8/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.8/Imakefile,v 1.3 1999/03/28 15:59:43 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.8/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.8/Imakefile.inc index 6790459e8..ccb8639a8 100644 --- a/xc/lib/font/X-TrueType/ISO8859.8/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.8/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.8/Imakefile.inc,v 1.1 1999/03/28 15:31:55 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_8 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.8/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.8/module/Imakefile index 0e9fd7cc0..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.8/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.8/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.8/module/Imakefile,v 1.3 1999/03/28 15:59:44 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.9/Imakefile b/xc/lib/font/X-TrueType/ISO8859.9/Imakefile index a9c130d34..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/ISO8859.9/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.9/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.9/Imakefile,v 1.3 1999/03/28 15:59:44 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/ISO8859.9/Imakefile.inc b/xc/lib/font/X-TrueType/ISO8859.9/Imakefile.inc index 206ebe2aa..956b712e0 100644 --- a/xc/lib/font/X-TrueType/ISO8859.9/Imakefile.inc +++ b/xc/lib/font/X-TrueType/ISO8859.9/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.9/Imakefile.inc,v 1.1 1999/03/28 15:31:56 dawes Exp $ +XCOMM $XFree86$ #define ModuleName ISO8859_9 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/ISO8859.9/module/Imakefile b/xc/lib/font/X-TrueType/ISO8859.9/module/Imakefile index 1e9448921..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/ISO8859.9/module/Imakefile +++ b/xc/lib/font/X-TrueType/ISO8859.9/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/ISO8859.9/module/Imakefile,v 1.2 1999/03/28 15:59:44 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/Imakefile b/xc/lib/font/X-TrueType/Imakefile index c9bfe2ddf..c02b402db 100644 --- a/xc/lib/font/X-TrueType/Imakefile +++ b/xc/lib/font/X-TrueType/Imakefile @@ -1,10 +1,10 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.5 2000/02/13 06:15:24 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile,v 1.4 1999/03/28 15:59:31 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -#if DoLoadableServer +#if BuildServer && DoLoadableServer MODULE_SUBDIRS = module #endif diff --git a/xc/lib/font/X-TrueType/Imakefile.inc b/xc/lib/font/X-TrueType/Imakefile.inc index c1abca19c..3c214147d 100644 --- a/xc/lib/font/X-TrueType/Imakefile.inc +++ b/xc/lib/font/X-TrueType/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile.inc,v 1.3 2000/02/14 19:20:24 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/Imakefile.inc,v 1.2 2000/02/13 06:15:24 dawes Exp $ /* -*- Makefile -*- */ DEFAULT_CCONV_SUBDIR = ISO8859.1 diff --git a/xc/lib/font/X-TrueType/JISX0201/Imakefile b/xc/lib/font/X-TrueType/JISX0201/Imakefile index 3d15fc175..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/JISX0201/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0201/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0201/Imakefile,v 1.3 1999/03/28 15:59:45 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/JISX0201/Imakefile.inc b/xc/lib/font/X-TrueType/JISX0201/Imakefile.inc index 72e3b58b8..8edfd9a91 100644 --- a/xc/lib/font/X-TrueType/JISX0201/Imakefile.inc +++ b/xc/lib/font/X-TrueType/JISX0201/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0201/Imakefile.inc,v 1.1 1999/03/28 15:31:57 dawes Exp $ +XCOMM $XFree86$ #define ModuleName JISX0201 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/JISX0201/module/Imakefile b/xc/lib/font/X-TrueType/JISX0201/module/Imakefile index 44ec458be..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/JISX0201/module/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0201/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0201/module/Imakefile,v 1.3 1999/03/28 15:59:45 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/JISX0208/Imakefile b/xc/lib/font/X-TrueType/JISX0208/Imakefile index fbb34ea02..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/JISX0208/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0208/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0208/Imakefile,v 1.3 1999/03/28 15:59:45 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/JISX0208/Imakefile.inc b/xc/lib/font/X-TrueType/JISX0208/Imakefile.inc index 71f97316c..6f15bba4e 100644 --- a/xc/lib/font/X-TrueType/JISX0208/Imakefile.inc +++ b/xc/lib/font/X-TrueType/JISX0208/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0208/Imakefile.inc,v 1.1 1999/03/28 15:31:58 dawes Exp $ +XCOMM $XFree86$ #define ModuleName JISX0208 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/JISX0208/module/Imakefile b/xc/lib/font/X-TrueType/JISX0208/module/Imakefile index a7b966423..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/JISX0208/module/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0208/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0208/module/Imakefile,v 1.2 1999/03/28 15:59:46 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/JISX0212/Imakefile b/xc/lib/font/X-TrueType/JISX0212/Imakefile index 7b1a284ab..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/JISX0212/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0212/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0212/Imakefile,v 1.3 1999/03/28 15:59:46 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/JISX0212/Imakefile.inc b/xc/lib/font/X-TrueType/JISX0212/Imakefile.inc index be8da14d9..8667b4e67 100644 --- a/xc/lib/font/X-TrueType/JISX0212/Imakefile.inc +++ b/xc/lib/font/X-TrueType/JISX0212/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0212/Imakefile.inc,v 1.1 1999/03/28 15:31:59 dawes Exp $ +XCOMM $XFree86$ #define ModuleName JISX0212 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/JISX0212/module/Imakefile b/xc/lib/font/X-TrueType/JISX0212/module/Imakefile index 0b2ef1ecb..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/JISX0212/module/Imakefile +++ b/xc/lib/font/X-TrueType/JISX0212/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/JISX0212/module/Imakefile,v 1.3 1999/03/28 15:59:46 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KOI8/Imakefile b/xc/lib/font/X-TrueType/KOI8/Imakefile index 3e8c7ab6b..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/KOI8/Imakefile +++ b/xc/lib/font/X-TrueType/KOI8/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KOI8/Imakefile,v 1.3 1999/03/28 15:59:47 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KOI8/Imakefile.inc b/xc/lib/font/X-TrueType/KOI8/Imakefile.inc index 85cbf3751..6d079d7b5 100644 --- a/xc/lib/font/X-TrueType/KOI8/Imakefile.inc +++ b/xc/lib/font/X-TrueType/KOI8/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/KOI8/Imakefile.inc,v 1.1 1999/03/28 15:32:00 dawes Exp $ +XCOMM $XFree86$ #define ModuleName KOI8 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/KOI8/module/Imakefile b/xc/lib/font/X-TrueType/KOI8/module/Imakefile index 8ccecba5a..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/KOI8/module/Imakefile +++ b/xc/lib/font/X-TrueType/KOI8/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KOI8/module/Imakefile,v 1.2 1999/03/28 15:59:47 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KSC5601/Imakefile b/xc/lib/font/X-TrueType/KSC5601/Imakefile index 8c6450d39..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/KSC5601/Imakefile +++ b/xc/lib/font/X-TrueType/KSC5601/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KSC5601/Imakefile,v 1.3 1999/03/28 15:59:47 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KSC5601/Imakefile.inc b/xc/lib/font/X-TrueType/KSC5601/Imakefile.inc index 165cee06f..b16dc9b25 100644 --- a/xc/lib/font/X-TrueType/KSC5601/Imakefile.inc +++ b/xc/lib/font/X-TrueType/KSC5601/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/KSC5601/Imakefile.inc,v 1.1 1999/03/28 15:32:01 dawes Exp $ +XCOMM $XFree86$ #define ModuleName KSC5601 MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/KSC5601/module/Imakefile b/xc/lib/font/X-TrueType/KSC5601/module/Imakefile index c337b48b8..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/KSC5601/module/Imakefile +++ b/xc/lib/font/X-TrueType/KSC5601/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KSC5601/module/Imakefile,v 1.3 1999/03/28 15:59:48 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile b/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile index 99d9f2d7b..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile +++ b/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KSCJOHAB/Imakefile,v 1.3 1999/03/28 15:59:48 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile.inc b/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile.inc index c2dbc1b74..459f8f180 100644 --- a/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile.inc +++ b/xc/lib/font/X-TrueType/KSCJOHAB/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/KSCJOHAB/Imakefile.inc,v 1.1 1999/03/28 15:32:02 dawes Exp $ +XCOMM $XFree86$ #define ModuleName KSCJOHAB MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/KSCJOHAB/module/Imakefile b/xc/lib/font/X-TrueType/KSCJOHAB/module/Imakefile index ed8a97423..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/KSCJOHAB/module/Imakefile +++ b/xc/lib/font/X-TrueType/KSCJOHAB/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/KSCJOHAB/module/Imakefile,v 1.2 1999/03/28 15:59:48 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/MULEENCODING/Imakefile b/xc/lib/font/X-TrueType/MULEENCODING/Imakefile index b92335149..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/MULEENCODING/Imakefile +++ b/xc/lib/font/X-TrueType/MULEENCODING/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/MULEENCODING/Imakefile,v 1.3 1999/03/28 15:59:49 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/MULEENCODING/Imakefile.inc b/xc/lib/font/X-TrueType/MULEENCODING/Imakefile.inc index 46f2cf7cc..0e548c513 100644 --- a/xc/lib/font/X-TrueType/MULEENCODING/Imakefile.inc +++ b/xc/lib/font/X-TrueType/MULEENCODING/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/MULEENCODING/Imakefile.inc,v 1.1 1999/03/28 15:32:03 dawes Exp $ +XCOMM $XFree86$ #define ModuleName MULEENCODING MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/MULEENCODING/module/Imakefile b/xc/lib/font/X-TrueType/MULEENCODING/module/Imakefile index 8cdb6dbb4..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/MULEENCODING/module/Imakefile +++ b/xc/lib/font/X-TrueType/MULEENCODING/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/MULEENCODING/module/Imakefile,v 1.3 1999/03/28 15:59:49 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/TCVN/Imakefile b/xc/lib/font/X-TrueType/TCVN/Imakefile index 568cc9416..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/TCVN/Imakefile +++ b/xc/lib/font/X-TrueType/TCVN/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/TCVN/Imakefile,v 1.3 1999/03/28 15:59:50 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/TCVN/Imakefile.inc b/xc/lib/font/X-TrueType/TCVN/Imakefile.inc index 12f5d5e5f..58ae06bd3 100644 --- a/xc/lib/font/X-TrueType/TCVN/Imakefile.inc +++ b/xc/lib/font/X-TrueType/TCVN/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/TCVN/Imakefile.inc,v 1.1 1999/03/28 15:32:05 dawes Exp $ +XCOMM $XFree86$ #define ModuleName TCVN MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/TCVN/module/Imakefile b/xc/lib/font/X-TrueType/TCVN/module/Imakefile index 57ea778c6..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/TCVN/module/Imakefile +++ b/xc/lib/font/X-TrueType/TCVN/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/TCVN/module/Imakefile,v 1.2 1999/03/28 15:59:50 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/VISCII/Imakefile b/xc/lib/font/X-TrueType/VISCII/Imakefile index 2d2007ec8..b37a4fe5c 100644 --- a/xc/lib/font/X-TrueType/VISCII/Imakefile +++ b/xc/lib/font/X-TrueType/VISCII/Imakefile @@ -1,4 +1,4 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/VISCII/Imakefile,v 1.3 1999/03/28 15:59:50 dawes Exp $ +XCOMM $XFree86$ /*#include "Imakefile.inc"*/ #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/VISCII/Imakefile.inc b/xc/lib/font/X-TrueType/VISCII/Imakefile.inc index 9009b8a85..2492ba9f1 100644 --- a/xc/lib/font/X-TrueType/VISCII/Imakefile.inc +++ b/xc/lib/font/X-TrueType/VISCII/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/X-TrueType/VISCII/Imakefile.inc,v 1.1 1999/03/28 15:32:05 dawes Exp $ +XCOMM $XFree86$ #define ModuleName VISCII MODULENAME = ModuleName diff --git a/xc/lib/font/X-TrueType/VISCII/module/Imakefile b/xc/lib/font/X-TrueType/VISCII/module/Imakefile index 08074494f..7dab2f01a 100644 --- a/xc/lib/font/X-TrueType/VISCII/module/Imakefile +++ b/xc/lib/font/X-TrueType/VISCII/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/VISCII/module/Imakefile,v 1.3 1999/03/28 15:59:51 dawes Exp $ +XCOMM $XFree86$ #define IHaveModules #include "../Imakefile.inc" #include <xttMod.tmpl> diff --git a/xc/lib/font/X-TrueType/module/Imakefile b/xc/lib/font/X-TrueType/module/Imakefile index bf4b86593..401ced66b 100644 --- a/xc/lib/font/X-TrueType/module/Imakefile +++ b/xc/lib/font/X-TrueType/module/Imakefile @@ -1,5 +1,5 @@ XCOMM X-TrueType Server - TrueType rasterizer for X -XCOMM $XFree86: xc/lib/font/X-TrueType/module/Imakefile,v 1.6 2000/02/13 06:50:35 dawes Exp $ +XCOMM $XFree86: xc/lib/font/X-TrueType/module/Imakefile,v 1.5 1999/08/14 10:49:19 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/lib/font/bitmap/Imakefile b/xc/lib/font/bitmap/Imakefile index a2a068843..3055cf037 100644 --- a/xc/lib/font/bitmap/Imakefile +++ b/xc/lib/font/bitmap/Imakefile @@ -1,7 +1,7 @@ XCOMM $XConsortium: Imakefile /main/9 1996/11/03 19:31:58 kaleb $ -XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.8 1999/11/19 13:53:27 hohndel Exp $ +XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.6 1999/01/11 09:39:26 dawes Exp $ -#if DoLoadableServer +#if BuildServer && DoLoadableServer #define IHaveSubdirs #define NoLibSubdirs #define PassCDebugFlags @@ -52,7 +52,7 @@ SpecialCLibObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS)) SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer +#if BuildServer && DoLoadableServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif diff --git a/xc/lib/font/bitmap/bdfint.h b/xc/lib/font/bitmap/bdfint.h index 62e8d880a..69718b245 100644 --- a/xc/lib/font/bitmap/bdfint.h +++ b/xc/lib/font/bitmap/bdfint.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.3 1999/07/17 08:55:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.2 1999/07/17 05:30:29 dawes Exp $ */ #ifndef BDFINT_H #define BDFINT_H diff --git a/xc/lib/font/bitmap/bdfread.c b/xc/lib/font/bitmap/bdfread.c index 588ac9857..b93014684 100644 --- a/xc/lib/font/bitmap/bdfread.c +++ b/xc/lib/font/bitmap/bdfread.c @@ -46,7 +46,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.8 1999/08/01 07:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.7 1999/07/17 08:55:11 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/xc/lib/font/bitmap/bdfutils.c b/xc/lib/font/bitmap/bdfutils.c index 39020b8aa..b92a03281 100644 --- a/xc/lib/font/bitmap/bdfutils.c +++ b/xc/lib/font/bitmap/bdfutils.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.6 2000/04/05 18:13:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.5 1999/07/17 08:55:11 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/xc/lib/font/bitmap/bitmap.c b/xc/lib/font/bitmap/bitmap.c index 745e0f16b..ea7c5e5e4 100644 --- a/xc/lib/font/bitmap/bitmap.c +++ b/xc/lib/font/bitmap/bitmap.c @@ -21,7 +21,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/lib/font/bitmap/bitmap.c,v 1.5 1999/08/01 07:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.4 1999/07/17 05:30:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/bitmapfunc.c b/xc/lib/font/bitmap/bitmapfunc.c index 5dea5cf7d..b01b6b357 100644 --- a/xc/lib/font/bitmap/bitmapfunc.c +++ b/xc/lib/font/bitmap/bitmapfunc.c @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.9 1999/11/19 13:53:28 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.7 1999/06/13 13:47:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/bitmaputil.c b/xc/lib/font/bitmap/bitmaputil.c index 803e269a1..af4711c4d 100644 --- a/xc/lib/font/bitmap/bitmaputil.c +++ b/xc/lib/font/bitmap/bitmaputil.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.4 1999/08/21 13:47:59 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.3 1999/08/01 07:56:54 dawes Exp $ */ #include "fntfilst.h" #include "bitmap.h" diff --git a/xc/lib/font/bitmap/bitscale.c b/xc/lib/font/bitmap/bitscale.c index 456e1ec0b..c2138792f 100644 --- a/xc/lib/font/bitmap/bitscale.c +++ b/xc/lib/font/bitmap/bitscale.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.16 1999/11/19 13:53:28 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.14 1999/08/01 07:56:54 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/fontink.c b/xc/lib/font/bitmap/fontink.c index 6766424f1..279f13b1c 100644 --- a/xc/lib/font/bitmap/fontink.c +++ b/xc/lib/font/bitmap/fontink.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.5 1999/11/19 13:53:29 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.3 1998/10/03 09:07:22 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/module/Imakefile b/xc/lib/font/bitmap/module/Imakefile index b94b676e1..ec54ab211 100644 --- a/xc/lib/font/bitmap/module/Imakefile +++ b/xc/lib/font/bitmap/module/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/bitmap/module/Imakefile,v 1.5 1999/12/03 19:17:18 eich Exp $ +XCOMM $XFree86: xc/lib/font/bitmap/module/Imakefile,v 1.3 1999/01/03 03:58:16 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/lib/font/bitmap/module/bitmapmod.c b/xc/lib/font/bitmap/module/bitmapmod.c index 27fc23d32..bae429dda 100644 --- a/xc/lib/font/bitmap/module/bitmapmod.c +++ b/xc/lib/font/bitmap/module/bitmapmod.c @@ -23,7 +23,7 @@ * dealings in this Software without prior written authorization from the * XFree86 Project. */ -/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.7 1999/01/26 05:53:47 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.6 1999/01/23 09:55:36 dawes Exp $ */ #include "misc.h" diff --git a/xc/lib/font/bitmap/pcf.h b/xc/lib/font/bitmap/pcf.h index 89d62ba10..952e24094 100644 --- a/xc/lib/font/bitmap/pcf.h +++ b/xc/lib/font/bitmap/pcf.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.2 1999/07/17 05:30:32 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/pcfread.c b/xc/lib/font/bitmap/pcfread.c index ee210c134..dfa9532a5 100644 --- a/xc/lib/font/bitmap/pcfread.c +++ b/xc/lib/font/bitmap/pcfread.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.12 1999/11/19 13:53:29 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.10 1999/08/01 07:56:55 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -32,6 +32,7 @@ from The Open Group. #include "fntfilst.h" #include "bitmap.h" #include "pcf.h" + #ifndef MAX #define MAX(a,b) (((a)>(b)) ? a : b) #endif @@ -41,6 +42,11 @@ from The Open Group. static void pcfUnloadFont ( FontPtr pFont ); static int position; + +#define IS_EOF(file) ((file)->eof == BUFFILEEOF) + +#define FONT_FILE_GETC_ERR(f) (tmp = FontFileGetc(f), BAIL_ON_EOF) + static int pcfGetLSB32(FontFilePtr file) { @@ -105,6 +111,7 @@ pcfReadTOC(FontFilePtr file, int *countp) if (version != PCF_FILE_VERSION) return (PCFTablePtr) NULL; count = pcfGetLSB32(file); + if (IS_EOF(file)) return (PCFTablePtr) NULL; tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec)); if (!tables) return (PCFTablePtr) NULL; @@ -113,9 +120,15 @@ pcfReadTOC(FontFilePtr file, int *countp) tables[i].format = pcfGetLSB32(file); tables[i].size = pcfGetLSB32(file); tables[i].offset = pcfGetLSB32(file); + if (IS_EOF(file)) goto Bail; } + *countp = count; return tables; + + Bail: + xfree(tables); + return (PCFTablePtr) NULL; } /* @@ -125,7 +138,7 @@ pcfReadTOC(FontFilePtr file, int *countp) * metrics */ -static void +static Bool pcfGetMetric(FontFilePtr file, CARD32 format, xCharInfo *metric) { metric->leftSideBearing = pcfGetINT16(file, format); @@ -134,9 +147,12 @@ pcfGetMetric(FontFilePtr file, CARD32 format, xCharInfo *metric) metric->ascent = pcfGetINT16(file, format); metric->descent = pcfGetINT16(file, format); metric->attributes = pcfGetINT16(file, format); + if (IS_EOF(file)) return FALSE; + + return TRUE; } -static void +static Bool pcfGetCompressedMetric(FontFilePtr file, CARD32 format, xCharInfo *metric) { metric->leftSideBearing = pcfGetINT8(file, format) - 0x80; @@ -145,6 +161,9 @@ pcfGetCompressedMetric(FontFilePtr file, CARD32 format, xCharInfo *metric) metric->ascent = pcfGetINT8(file, format) - 0x80; metric->descent = pcfGetINT8(file, format) - 0x80; metric->attributes = 0; + if (IS_EOF(file)) return FALSE; + + return TRUE; } /* @@ -210,6 +229,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) goto Bail; nprops = pcfGetINT32(file, format); + if (IS_EOF(file)) goto Bail; props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec)); if (!props) goto Bail; @@ -220,6 +240,7 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, props[i].name = pcfGetINT32(file, format); isStringProp[i] = pcfGetINT8(file, format); props[i].value = pcfGetINT32(file, format); + if (IS_EOF(file)) goto Bail; } /* pad the property array */ /* @@ -232,12 +253,15 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, (void)FontFileSkip(file, i); position += i; } + if (IS_EOF(file)) goto Bail; string_size = pcfGetINT32(file, format); + if (IS_EOF(file)) goto Bail; strings = (char *) xalloc(string_size); if (!strings) { goto Bail; } FontFileRead(file, strings, string_size); + if (IS_EOF(file)) goto Bail; position += string_size; for (i = 0; i < nprops; i++) { props[i].name = MakeAtom(strings + props[i].name, @@ -273,7 +297,8 @@ pcfGetAccel(FontInfoPtr pFontInfo, FontFilePtr file, CARD32 format; CARD32 size; - if (!pcfSeekToType(file, tables, ntables, type, &format, &size)) + if (!pcfSeekToType(file, tables, ntables, type, &format, &size) || + IS_EOF(file)) goto Bail; format = pcfGetLSB32(file); if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT) && @@ -294,11 +319,16 @@ pcfGetAccel(FontInfoPtr pFontInfo, FontFilePtr file, pFontInfo->fontAscent = pcfGetINT32(file, format); pFontInfo->fontDescent = pcfGetINT32(file, format); pFontInfo->maxOverlap = pcfGetINT32(file, format); - pcfGetMetric(file, format, &pFontInfo->minbounds); - pcfGetMetric(file, format, &pFontInfo->maxbounds); + if (IS_EOF(file)) goto Bail; + if (!pcfGetMetric(file, format, &pFontInfo->minbounds)) + goto Bail; + if (!pcfGetMetric(file, format, &pFontInfo->maxbounds)) + goto Bail; if (PCF_FORMAT_MATCH(format, PCF_ACCEL_W_INKBOUNDS)) { - pcfGetMetric(file, format, &pFontInfo->ink_minbounds); - pcfGetMetric(file, format, &pFontInfo->ink_maxbounds); + if (!pcfGetMetric(file, format, &pFontInfo->ink_minbounds)) + goto Bail; + if (!pcfGetMetric(file, format, &pFontInfo->ink_maxbounds)) + goto Bail; } else { pFontInfo->ink_minbounds = pFontInfo->minbounds; pFontInfo->ink_maxbounds = pFontInfo->maxbounds; @@ -362,16 +392,20 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, nmetrics = pcfGetINT32(file, format); else nmetrics = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); if (!metrics) { goto Bail; } for (i = 0; i < nmetrics; i++) - if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - pcfGetMetric(file, format, &(metrics + i)->metrics); - else - pcfGetCompressedMetric(file, format, &(metrics + i)->metrics); - + if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) { + if (!pcfGetMetric(file, format, &(metrics + i)->metrics)) + goto Bail; + } else { + if (!pcfGetCompressedMetric(file, format, &(metrics + i)->metrics)) + goto Bail; + } + /* bitmaps */ if (!pcfSeekToType(file, tables, ntables, PCF_BITMAPS, &format, &size)) @@ -381,24 +415,30 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, goto Bail; nbitmaps = pcfGetINT32(file, format); - if (nbitmaps != nmetrics) + if (nbitmaps != nmetrics || IS_EOF(file)) goto Bail; offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32)); if (!offsets) goto Bail; - for (i = 0; i < nbitmaps; i++) + for (i = 0; i < nbitmaps; i++) { offsets[i] = pcfGetINT32(file, format); + if (IS_EOF(file)) goto Bail; + } - for (i = 0; i < GLYPHPADOPTIONS; i++) + for (i = 0; i < GLYPHPADOPTIONS; i++) { bitmapSizes[i] = pcfGetINT32(file, format); + if (IS_EOF(file)) goto Bail; + } + sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)]; /* guard against completely empty font */ bitmaps = xalloc(sizebitmaps ? sizebitmaps : 1); if (!bitmaps) goto Bail; FontFileRead(file, bitmaps, sizebitmaps); + if (IS_EOF(file)) goto Bail; position += sizebitmaps; if (PCF_BIT_ORDER(format) != bit) @@ -459,16 +499,20 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, nink_metrics = pcfGetINT32(file, format); else nink_metrics = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; if (nink_metrics != nmetrics) goto Bail; ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo)); if (!ink_metrics) goto Bail; for (i = 0; i < nink_metrics; i++) - if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - pcfGetMetric(file, format, ink_metrics + i); - else - pcfGetCompressedMetric(file, format, ink_metrics + i); + if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) { + if (!pcfGetMetric(file, format, ink_metrics + i)) + goto Bail; + } else { + if (!pcfGetCompressedMetric(file, format, ink_metrics + i)) + goto Bail; + } } /* encoding */ @@ -484,6 +528,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, pFont->info.firstRow = pcfGetINT16(file, format); pFont->info.lastRow = pcfGetINT16(file, format); pFont->info.defaultCh = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) * (pFont->info.lastRow - pFont->info.firstRow + 1); @@ -496,6 +541,7 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, pFont->info.allExist = TRUE; for (i = 0; i < nencoding; i++) { encodingOffset = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; if (encodingOffset == 0xFFFF) { pFont->info.allExist = FALSE; } else { @@ -563,12 +609,13 @@ Bail: } xfree(encoding); xfree(bitmaps); - xfree(offsets); xfree(metrics); xfree(pFont->info.props); pFont->info.props = 0; + xfree (pFont->info.isStringProp); xfree(bitmapFont); xfree(tables); + xfree(offsets); return AllocError; } @@ -613,6 +660,7 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file) pFontInfo->firstRow = pcfGetINT16(file, format); pFontInfo->lastRow = pcfGetINT16(file, format); pFontInfo->defaultCh = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) * (pFontInfo->lastRow - pFontInfo->firstRow + 1); @@ -621,7 +669,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file) while (nencoding--) { if (pcfGetINT16(file, format) == 0xFFFF) pFontInfo->allExist = FALSE; + if (IS_EOF(file)) goto Bail; } + if (IS_EOF(file)) goto Bail; /* BDF style accelerators (i.e. bounds based on encoded glyphs) */ @@ -684,6 +734,7 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, CharInfoPtr pci; pFont->info.props = 0; + if (!(tables = pcfReadTOC(file, &ntables))) goto Bail; @@ -713,16 +764,20 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, nmetrics = pcfGetINT32(file, format); else nmetrics = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); if (!metrics) { goto Bail; } for (i = 0; i < nmetrics; i++) - if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - pcfGetMetric(file, format, &(metrics + i)->metrics); - else - pcfGetCompressedMetric(file, format, &(metrics + i)->metrics); - + if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) { + if (!pcfGetMetric(file, format, &(metrics + i)->metrics)) + goto Bail; + } else { + if (!pcfGetCompressedMetric(file, format, &(metrics + i)->metrics)) + goto Bail; + } + /* Set the bitmaps to all point to the same zero filled array * that is the size of the largest bitmap. */ @@ -764,14 +819,18 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, nink_metrics = pcfGetINT16(file, format); if (nink_metrics != nmetrics) goto Bail; + if (IS_EOF(file)) goto Bail; ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo)); if (!ink_metrics) goto Bail; for (i = 0; i < nink_metrics; i++) - if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - pcfGetMetric(file, format, ink_metrics + i); - else - pcfGetCompressedMetric(file, format, ink_metrics + i); + if (PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) { + if (!pcfGetMetric(file, format, ink_metrics + i)) + goto Bail; + } else { + if (!pcfGetCompressedMetric(file, format, ink_metrics + i)) + goto Bail; + } } /* encoding */ @@ -787,6 +846,7 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, pFont->info.firstRow = pcfGetINT16(file, format); pFont->info.lastRow = pcfGetINT16(file, format); pFont->info.defaultCh = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) * (pFont->info.lastRow - pFont->info.firstRow + 1); @@ -799,6 +859,7 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, pFont->info.allExist = TRUE; for (i = 0; i < nencoding; i++) { encodingOffset = pcfGetINT16(file, format); + if (IS_EOF(file)) goto Bail; if (encodingOffset == 0xFFFF) { pFont->info.allExist = FALSE; encoding[i] = 0; @@ -812,6 +873,7 @@ pmfReadFont(FontPtr pFont, FontFilePtr file, } ACCESSENCODINGL(encoding, i) = metrics + encodingOffset; } + if (IS_EOF(file)) goto Bail; /* BDF style accelerators (i.e. bounds based on encoded glyphs) */ @@ -865,10 +927,12 @@ Bail: xfree(encoding[i]); } xfree(encoding); + xfree(bitmaps); xfree(metrics); xfree(pFont->info.props); - xfree(bitmapFont); pFont->info.props = 0; + xfree (pFont->info.isStringProp); + xfree(bitmapFont); xfree(tables); return AllocError; } diff --git a/xc/lib/font/bitmap/pcfwrite.c b/xc/lib/font/bitmap/pcfwrite.c index cb08cee73..90b8c6da9 100644 --- a/xc/lib/font/bitmap/pcfwrite.c +++ b/xc/lib/font/bitmap/pcfwrite.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.4 1999/11/19 13:53:29 hohndel Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.2 1999/07/17 05:30:32 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/bitmap/snfread.c b/xc/lib/font/bitmap/snfread.c index 7f826e709..e55011998 100644 --- a/xc/lib/font/bitmap/snfread.c +++ b/xc/lib/font/bitmap/snfread.c @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.7 1999/08/01 07:56:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.6 1999/07/17 05:30:33 dawes Exp $ */ #ifndef FONTMODULE #include <ctype.h> diff --git a/xc/lib/font/bitmap/snfstr.h b/xc/lib/font/bitmap/snfstr.h index 412b135d8..8b779a6f9 100644 --- a/xc/lib/font/bitmap/snfstr.h +++ b/xc/lib/font/bitmap/snfstr.h @@ -45,7 +45,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.2 1999/07/17 05:30:33 dawes Exp $ */ +/* $XFree86$ */ #ifndef SNFSTR_H #define SNFSTR_H 1 diff --git a/xc/lib/font/builtins/Imakefile b/xc/lib/font/builtins/Imakefile index b809bbdfd..f6fd6df43 100644 --- a/xc/lib/font/builtins/Imakefile +++ b/xc/lib/font/builtins/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/builtins/Imakefile,v 1.2 1999/11/19 14:59:08 hohndel Exp $ +XCOMM $XFree86: $ XCOMM XCOMM XCOMM $XConsortium: Imakefile /main/14 1996/11/03 19:58:41 kaleb $ diff --git a/xc/lib/font/builtins/builtin.h b/xc/lib/font/builtins/builtin.h index caee81caa..f29a82cbd 100644 --- a/xc/lib/font/builtins/builtin.h +++ b/xc/lib/font/builtins/builtin.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include <X11/Xdefs.h> #include <font.h> diff --git a/xc/lib/font/builtins/dir.c b/xc/lib/font/builtins/dir.c index c657710a3..52b195826 100644 --- a/xc/lib/font/builtins/dir.c +++ b/xc/lib/font/builtins/dir.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/dir.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/xc/lib/font/builtins/file.c b/xc/lib/font/builtins/file.c index 6fcaa79e3..b5a99bdb1 100644 --- a/xc/lib/font/builtins/file.c +++ b/xc/lib/font/builtins/file.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/file.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/xc/lib/font/builtins/fonts.c b/xc/lib/font/builtins/fonts.c index cc7928eb5..6fef13f84 100644 --- a/xc/lib/font/builtins/fonts.c +++ b/xc/lib/font/builtins/fonts.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.4 2000/02/23 20:29:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/xc/lib/font/builtins/fpe.c b/xc/lib/font/builtins/fpe.c index d96fc3d5b..219d9981a 100644 --- a/xc/lib/font/builtins/fpe.c +++ b/xc/lib/font/builtins/fpe.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" diff --git a/xc/lib/font/builtins/render.c b/xc/lib/font/builtins/render.c index 5f63c66ee..7e7180e66 100644 --- a/xc/lib/font/builtins/render.c +++ b/xc/lib/font/builtins/render.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/render.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" #include "builtin.h" diff --git a/xc/lib/font/fc/Imakefile b/xc/lib/font/fc/Imakefile index 9bd586324..306a3cf1f 100644 --- a/xc/lib/font/fc/Imakefile +++ b/xc/lib/font/fc/Imakefile @@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile /main/20 1995/12/13 18:07:57 kaleb $ XCOMM XCOMM Make file for font handling routines XCOMM -XCOMM $XFree86: xc/lib/font/fc/Imakefile,v 1.4 1999/12/13 02:52:50 robin Exp $ +XCOMM $XFree86: xc/lib/font/fc/Imakefile,v 1.3 1999/01/11 05:13:17 dawes Exp $ #include <Server.tmpl> INCLUDES = -I$(FONTINCSRC) -I../include $(TRANS_INCLUDES) diff --git a/xc/lib/font/fc/fsconvert.c b/xc/lib/font/fc/fsconvert.c index 8259332a2..36f31ccfd 100644 --- a/xc/lib/font/fc/fsconvert.c +++ b/xc/lib/font/fc/fsconvert.c @@ -22,7 +22,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.9 1999/12/27 01:14:09 robin Exp $ */ +/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.8 1999/12/13 02:52:51 robin Exp $ */ /* * FS data conversion */ diff --git a/xc/lib/font/fc/fserve.c b/xc/lib/font/fc/fserve.c index 17c556c7f..442aa1ae2 100644 --- a/xc/lib/font/fc/fserve.c +++ b/xc/lib/font/fc/fserve.c @@ -20,7 +20,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/lib/font/fc/fserve.c,v 3.17 2000/01/21 01:11:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.16 1999/12/27 01:14:09 robin Exp $ */ /* * Copyright 1990 Network Computing Devices diff --git a/xc/lib/font/fc/fserve.h b/xc/lib/font/fc/fserve.h index 3b761996b..f98cdeb66 100644 --- a/xc/lib/font/fc/fserve.h +++ b/xc/lib/font/fc/fserve.h @@ -24,7 +24,7 @@ * Author: Dave Lemke, Network Computing Devices, Inc * */ -/* $XFree86: xc/lib/font/fc/fserve.h,v 1.3 1999/12/13 02:52:52 robin Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.h,v 1.2 1999/07/17 05:30:36 dawes Exp $ */ #ifndef _FSERVE_H_ #define _FSERVE_H_ diff --git a/xc/lib/font/fc/fservestr.h b/xc/lib/font/fc/fservestr.h index 4d9a990ac..3e174f6ac 100644 --- a/xc/lib/font/fc/fservestr.h +++ b/xc/lib/font/fc/fservestr.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.2 1999/12/13 02:52:52 robin Exp $ */ +/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.1 1999/07/17 05:30:37 dawes Exp $ */ #ifndef _FSERVESTR_H_ #define _FSERVESTR_H_ diff --git a/xc/lib/font/fc/fsio.c b/xc/lib/font/fc/fsio.c index 07453e86c..bd38ba456 100644 --- a/xc/lib/font/fc/fsio.c +++ b/xc/lib/font/fc/fsio.c @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.c,v 3.11 1999/12/27 01:14:10 robin Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.c,v 3.10 1999/12/27 00:39:27 robin Exp $ */ /* * font server i/o routines */ diff --git a/xc/lib/font/fc/fsio.h b/xc/lib/font/fc/fsio.h index 282c3732f..1bbe2b26f 100644 --- a/xc/lib/font/fc/fsio.h +++ b/xc/lib/font/fc/fsio.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.h,v 1.4 1999/12/27 01:14:11 robin Exp $ */ #ifndef _FSIO_H_ #define _FSIO_H_ diff --git a/xc/lib/font/fc/fslibos.h b/xc/lib/font/fc/fslibos.h index b5537e028..7ccb54749 100644 --- a/xc/lib/font/fc/fslibos.h +++ b/xc/lib/font/fc/fslibos.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.4 1998/10/03 09:07:25 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.3 1996/12/23 06:02:08 dawes Exp $ */ /* * FSlib networking & os include file diff --git a/xc/lib/font/fontfile/Imakefile b/xc/lib/font/fontfile/Imakefile index 73fb4027b..4377c7283 100644 --- a/xc/lib/font/fontfile/Imakefile +++ b/xc/lib/font/fontfile/Imakefile @@ -1,8 +1,8 @@ XCOMM $XConsortium: Imakefile /main/14 1996/11/03 19:58:41 kaleb $ -XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.16 2000/02/13 06:15:28 dawes Exp $ +XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.15 1999/08/21 13:48:01 dawes Exp $ #include <Server.tmpl> -#if DoLoadableServer +#if BuildServer && DoLoadableServer #define IHaveSubdirs #define NoLibSubdirs SUBDIRS = module @@ -66,7 +66,7 @@ SpecialCLibObjectRule(fileio,$(ICONFIGFILES),$(GZIP_DEFS)) SubdirLibraryRule($(OBJS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer +#if BuildServer && DoLoadableServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif diff --git a/xc/lib/font/fontfile/bitsource.c b/xc/lib/font/fontfile/bitsource.c index 8b694af6e..e8d632ee3 100644 --- a/xc/lib/font/fontfile/bitsource.c +++ b/xc/lib/font/fontfile/bitsource.c @@ -21,7 +21,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/lib/font/fontfile/bitsource.c,v 1.2 1999/07/17 05:30:39 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/bufio.c b/xc/lib/font/fontfile/bufio.c index 2d26101c5..a630fcbf1 100644 --- a/xc/lib/font/fontfile/bufio.c +++ b/xc/lib/font/fontfile/bufio.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.5 1999/07/17 05:30:39 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.4 1998/12/20 11:57:15 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -56,6 +56,7 @@ BufFileCreate (char *private, f->input = input; f->output = output; f->skip = skip; + f->eof = 0; f->close = close; return f; } diff --git a/xc/lib/font/fontfile/decompress.c b/xc/lib/font/fontfile/decompress.c index cbdd3d3a5..830fea9a8 100644 --- a/xc/lib/font/fontfile/decompress.c +++ b/xc/lib/font/fontfile/decompress.c @@ -41,7 +41,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/lib/font/fontfile/decompress.c,v 1.2 1999/07/17 05:30:39 dawes Exp $ */ +/* $XFree86$ */ /* * decompress - cat a compressed file */ @@ -147,6 +147,8 @@ BufFilePushCompressed (BufFilePtr f) return 0; } code = BufFileGet (f); + if (code == BUFFILEEOF) return 0; + maxbits = code & BIT_MASK; if (maxbits > BITS || maxbits < 12) return 0; @@ -392,7 +394,7 @@ main (int argc, char *argv[]) inputraw = BufFileOpenRead (0); input = BufFilePushCompressed (inputraw); output = BufFileOpenWrite (1); - while ((c = BufFileGet (input)) != -1) + while ((c = BufFileGet (input)) != BUFFILEEOF) BufFilePut (c, output); BufFileClose (input, FALSE); BufFileClose (output, FALSE); diff --git a/xc/lib/font/fontfile/defaults.c b/xc/lib/font/fontfile/defaults.c index 01b0564d4..664dd2dff 100644 --- a/xc/lib/font/fontfile/defaults.c +++ b/xc/lib/font/fontfile/defaults.c @@ -21,7 +21,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/lib/font/fontfile/defaults.c,v 1.6 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.5 1999/07/17 05:30:40 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/dirfile.c b/xc/lib/font/fontfile/dirfile.c index 0883b2c5a..b80788ba7 100644 --- a/xc/lib/font/fontfile/dirfile.c +++ b/xc/lib/font/fontfile/dirfile.c @@ -21,7 +21,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/lib/font/fontfile/dirfile.c,v 3.10 1999/09/04 09:14:11 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.9 1999/07/17 08:55:13 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/encparse.c b/xc/lib/font/fontfile/encparse.c index 9d1e830d2..0d9b95082 100644 --- a/xc/lib/font/fontfile/encparse.c +++ b/xc/lib/font/fontfile/encparse.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.12 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.11 1999/05/15 12:10:09 dawes Exp $ */ /* Parser for encoding files */ @@ -71,7 +71,7 @@ static void skipEndOfLine(FontFilePtr f, int c) { if(c==0) - c==FontFileGetc(f); + c=FontFileGetc(f); for(;;) if(c<=0 || c=='\n') diff --git a/xc/lib/font/fontfile/ffcheck.c b/xc/lib/font/fontfile/ffcheck.c index f49e9c144..db27e016e 100644 --- a/xc/lib/font/fontfile/ffcheck.c +++ b/xc/lib/font/fontfile/ffcheck.c @@ -21,7 +21,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/lib/font/fontfile/ffcheck.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.12 1999/08/21 13:48:02 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/fileio.c b/xc/lib/font/fontfile/fileio.c index 3d5dc8aba..8572f3906 100644 --- a/xc/lib/font/fontfile/fileio.c +++ b/xc/lib/font/fontfile/fileio.c @@ -21,7 +21,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/lib/font/fontfile/fileio.c,v 3.7 1999/08/21 13:48:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.6 1999/07/17 05:30:41 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/filewr.c b/xc/lib/font/fontfile/filewr.c index 72adbd10c..bea66a1ce 100644 --- a/xc/lib/font/fontfile/filewr.c +++ b/xc/lib/font/fontfile/filewr.c @@ -21,7 +21,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/lib/font/fontfile/filewr.c,v 3.4 2000/08/09 23:40:15 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.3 1999/08/21 13:48:03 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/fontdir.c b/xc/lib/font/fontfile/fontdir.c index 8c5a7e919..59fa92d22 100644 --- a/xc/lib/font/fontfile/fontdir.c +++ b/xc/lib/font/fontfile/fontdir.c @@ -21,7 +21,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/lib/font/fontfile/fontdir.c,v 3.12 1999/07/17 05:30:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.11 1998/10/03 09:07:27 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/fontenc.c b/xc/lib/font/fontfile/fontenc.c index a8f471034..36a6988a3 100644 --- a/xc/lib/font/fontfile/fontenc.c +++ b/xc/lib/font/fontfile/fontenc.c @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.9 1999/10/13 04:20:51 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.8 1999/08/21 13:48:03 dawes Exp $ */ /* Backend-independent encoding code */ diff --git a/xc/lib/font/fontfile/fontencI.h b/xc/lib/font/fontfile/fontencI.h index 74d1d12be..8ad3eb91f 100644 --- a/xc/lib/font/fontfile/fontencI.h +++ b/xc/lib/font/fontfile/fontencI.h @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/fontfile/fontencI.h,v 1.3 1999/04/25 10:01:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontencI.h,v 1.2 1999/02/07 06:18:28 dawes Exp $ */ /* Private types and functions for the encoding code. */ /* Used by the files `fontenc.h' and `encparse.h' */ diff --git a/xc/lib/font/fontfile/fontfile.c b/xc/lib/font/fontfile/fontfile.c index 84f6bcbcb..41201f67d 100644 --- a/xc/lib/font/fontfile/fontfile.c +++ b/xc/lib/font/fontfile/fontfile.c @@ -21,7 +21,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/lib/font/fontfile/fontfile.c,v 3.13 1999/08/21 13:48:03 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.12 1999/07/17 05:30:42 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/fontscale.c b/xc/lib/font/fontfile/fontscale.c index 88bf29835..e970bc5f9 100644 --- a/xc/lib/font/fontfile/fontscale.c +++ b/xc/lib/font/fontfile/fontscale.c @@ -21,7 +21,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/lib/font/fontfile/fontscale.c,v 3.7 1999/12/13 03:00:51 robin Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.6 1999/07/17 05:30:42 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/gunzip.c b/xc/lib/font/fontfile/gunzip.c index c66b3a044..2eb0a6fd4 100644 --- a/xc/lib/font/fontfile/gunzip.c +++ b/xc/lib/font/fontfile/gunzip.c @@ -2,7 +2,7 @@ /* lib/font/fontfile/gunzip.c written by Mark Eichin <eichin@kitten.gen.ma.us> September 1996. intended for inclusion in X11 public releases. */ -/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.3 1999/07/17 05:30:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.2 1999/03/14 03:21:19 dawes Exp $ */ #include "fontmisc.h" #include <bufio.h> @@ -102,7 +102,8 @@ BufZipFileFill (BufFilePtr f) case Z_STREAM_END: case Z_DATA_ERROR: case Z_ERRNO: - return BUFFILEEOF; + f->left = 0; + return BUFFILEEOF; default: return BUFFILEEOF; } diff --git a/xc/lib/font/fontfile/module/Imakefile b/xc/lib/font/fontfile/module/Imakefile index 6c2ac1bc2..243439f80 100644 --- a/xc/lib/font/fontfile/module/Imakefile +++ b/xc/lib/font/fontfile/module/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/fontfile/module/Imakefile,v 1.3 1999/06/13 13:47:35 dawes Exp $ +XCOMM $XFree86: xc/lib/font/fontfile/module/Imakefile,v 1.2 1998/07/25 06:57:08 dawes Exp $ #include <Server.tmpl> INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \ diff --git a/xc/lib/font/fontfile/printerfont.c b/xc/lib/font/fontfile/printerfont.c index ff961099f..cf2b71f01 100644 --- a/xc/lib/font/fontfile/printerfont.c +++ b/xc/lib/font/fontfile/printerfont.c @@ -21,7 +21,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/lib/font/fontfile/printerfont.c,v 1.3 1999/08/21 13:48:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.2 1999/07/17 05:30:43 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/fontfile/register.c b/xc/lib/font/fontfile/register.c index 4e85dae17..a9c062b92 100644 --- a/xc/lib/font/fontfile/register.c +++ b/xc/lib/font/fontfile/register.c @@ -21,7 +21,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/lib/font/fontfile/register.c,v 1.13 2000/02/13 06:15:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/register.c,v 1.12 1999/08/21 13:48:04 dawes Exp $ */ /* * This is in a separate source file so that small programs diff --git a/xc/lib/font/fontfile/renderers.c b/xc/lib/font/fontfile/renderers.c index 38c8fad8d..00e01f984 100644 --- a/xc/lib/font/fontfile/renderers.c +++ b/xc/lib/font/fontfile/renderers.c @@ -21,7 +21,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/lib/font/fontfile/renderers.c,v 1.2 1999/07/17 05:30:43 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/bitmap.h b/xc/lib/font/include/bitmap.h index 3fb46dbd4..14072e31d 100644 --- a/xc/lib/font/include/bitmap.h +++ b/xc/lib/font/include/bitmap.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bitmap.h,v 1.7 1999/08/01 07:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bitmap.h,v 1.6 1999/07/17 05:30:46 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/bufio.h b/xc/lib/font/include/bufio.h index 513991eba..3ef4f4ecc 100644 --- a/xc/lib/font/include/bufio.h +++ b/xc/lib/font/include/bufio.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bufio.h,v 1.3 1999/07/17 05:30:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bufio.h,v 1.2 1999/03/14 03:21:19 dawes Exp $ */ #ifndef ___BUFIO_H___ #define ___BUFIO_H___ 1 @@ -46,6 +46,7 @@ typedef struct _buffile *BufFilePtr; typedef struct _buffile { BufChar *bufp; int left; + int eof; BufChar buffer[BUFFILESIZE]; int (*input)( BufFilePtr /* f */); int (*output)( int /* c */, BufFilePtr /* f */); @@ -72,9 +73,9 @@ extern int BufFileRead ( BufFilePtr, char*, int ); extern int BufFileWrite ( BufFilePtr, char*, int ); extern void BufFileFree ( BufFilePtr ); -#define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : (*(f)->input) (f)) +#define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : ((f)->eof = (*(f)->input) (f))) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = (c) : (*(f)->output) (c,f)) -#define BufFileSkip(f,c) ((*(f)->skip) (f, c)) +#define BufFileSkip(f,c) ((f)->eof = (*(f)->skip) (f, c)) #ifndef TRUE #define TRUE 1 @@ -84,3 +85,4 @@ extern void BufFileFree ( BufFilePtr ); #endif #endif /* ___BUFIO_H___ */ + diff --git a/xc/lib/font/include/fntfil.h b/xc/lib/font/include/fntfil.h index 390eb6fce..667497ecc 100644 --- a/xc/lib/font/include/fntfil.h +++ b/xc/lib/font/include/fntfil.h @@ -21,7 +21,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/lib/font/include/fntfil.h,v 1.5 1999/08/21 13:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfil.h,v 1.4 1999/07/17 05:30:47 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/fntfilio.h b/xc/lib/font/include/fntfilio.h index a7d96ebb2..1a78cc405 100644 --- a/xc/lib/font/include/fntfilio.h +++ b/xc/lib/font/include/fntfilio.h @@ -21,7 +21,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/lib/font/include/fntfilio.h,v 1.3 1999/08/21 13:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.2 1999/07/17 05:30:47 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/fntfilst.h b/xc/lib/font/include/fntfilst.h index bd8bccb3f..973f9c0de 100644 --- a/xc/lib/font/include/fntfilst.h +++ b/xc/lib/font/include/fntfilst.h @@ -21,7 +21,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/lib/font/include/fntfilst.h,v 3.5 1999/07/17 05:30:47 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.4 1998/10/03 09:07:30 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/fontenc.h b/xc/lib/font/include/fontenc.h index 75f02b18c..51286840c 100644 --- a/xc/lib/font/include/fontenc.h +++ b/xc/lib/font/include/fontenc.h @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/include/fontenc.h,v 1.6 1999/05/03 12:15:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontenc.h,v 1.5 1999/04/27 07:08:58 dawes Exp $ */ /* Header for backend-independent encoding code */ diff --git a/xc/lib/font/include/fontmisc.h b/xc/lib/font/include/fontmisc.h index 6abbc05d1..3ec8e3c5f 100644 --- a/xc/lib/font/include/fontmisc.h +++ b/xc/lib/font/include/fontmisc.h @@ -21,7 +21,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/lib/font/include/fontmisc.h,v 3.12 1999/09/04 09:14:12 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.11 1999/08/21 13:48:06 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/include/fontmod.h b/xc/lib/font/include/fontmod.h index 64bf757b1..42d277fd4 100644 --- a/xc/lib/font/include/fontmod.h +++ b/xc/lib/font/include/fontmod.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/include/fontmod.h,v 1.3 1998/12/13 05:32:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmod.h,v 1.2 1998/07/25 06:57:09 dawes Exp $ */ #ifndef _FONTMOD_H_ #define _FONTMOD_H_ diff --git a/xc/lib/font/include/fontutil.h b/xc/lib/font/include/fontutil.h index 7d3cfe99f..daa8815bf 100644 --- a/xc/lib/font/include/fontutil.h +++ b/xc/lib/font/include/fontutil.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/include/fontutil.h,v 1.2 1999/08/21 13:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */ #ifndef _FONTUTIL_H_ #define _FONTUTIL_H_ diff --git a/xc/lib/font/include/fontxlfd.h b/xc/lib/font/include/fontxlfd.h index 0643e372f..8920643ac 100644 --- a/xc/lib/font/include/fontxlfd.h +++ b/xc/lib/font/include/fontxlfd.h @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.4 1999/07/17 05:30:48 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.3 1999/03/14 14:39:40 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/stubs/Imakefile b/xc/lib/font/stubs/Imakefile index dd92d1cb5..90aac6dd2 100644 --- a/xc/lib/font/stubs/Imakefile +++ b/xc/lib/font/stubs/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/stubs/Imakefile,v 1.3 1999/12/15 01:14:35 robin Exp $ +XCOMM $XFree86: xc/lib/font/stubs/Imakefile,v 1.2 1999/08/30 01:24:57 dawes Exp $ #include <Server.tmpl> diff --git a/xc/lib/font/stubs/cauthgen.c b/xc/lib/font/stubs/cauthgen.c index b40a440ec..690416e00 100644 --- a/xc/lib/font/stubs/cauthgen.c +++ b/xc/lib/font/stubs/cauthgen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/cauthgen.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/csignal.c b/xc/lib/font/stubs/csignal.c index 668f4f526..a2919f72c 100644 --- a/xc/lib/font/stubs/csignal.c +++ b/xc/lib/font/stubs/csignal.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/csignal.c,v 1.1 1999/01/11 05:13:18 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/delfntcid.c b/xc/lib/font/stubs/delfntcid.c index a9aaf3521..7e9276a11 100644 --- a/xc/lib/font/stubs/delfntcid.c +++ b/xc/lib/font/stubs/delfntcid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/delfntcid.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/errorf.c b/xc/lib/font/stubs/errorf.c index 44d675ce6..b974937f5 100644 --- a/xc/lib/font/stubs/errorf.c +++ b/xc/lib/font/stubs/errorf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/errorf.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/fatalerror.c b/xc/lib/font/stubs/fatalerror.c index 62f571cfd..fc5180632 100644 --- a/xc/lib/font/stubs/fatalerror.c +++ b/xc/lib/font/stubs/fatalerror.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/fatalerror.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/findoldfnt.c b/xc/lib/font/stubs/findoldfnt.c index ce8a9debd..1b26797e8 100644 --- a/xc/lib/font/stubs/findoldfnt.c +++ b/xc/lib/font/stubs/findoldfnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/findoldfnt.c,v 1.1 1999/01/11 05:13:19 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/getcres.c b/xc/lib/font/stubs/getcres.c index e1ce5775a..e08ec48dc 100644 --- a/xc/lib/font/stubs/getcres.c +++ b/xc/lib/font/stubs/getcres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getcres.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/getdefptsize.c b/xc/lib/font/stubs/getdefptsize.c index ada6c6a4b..b55a408ea 100644 --- a/xc/lib/font/stubs/getdefptsize.c +++ b/xc/lib/font/stubs/getdefptsize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getdefptsize.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/getnewfntcid.c b/xc/lib/font/stubs/getnewfntcid.c index a65fd2767..7253d2156 100644 --- a/xc/lib/font/stubs/getnewfntcid.c +++ b/xc/lib/font/stubs/getnewfntcid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/getnewfntcid.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/gettime.c b/xc/lib/font/stubs/gettime.c index 023441f80..c92a98056 100644 --- a/xc/lib/font/stubs/gettime.c +++ b/xc/lib/font/stubs/gettime.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/gettime.c,v 1.1 1999/12/15 01:14:36 robin Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/initfshdl.c b/xc/lib/font/stubs/initfshdl.c index 13d22300f..88b025cf3 100644 --- a/xc/lib/font/stubs/initfshdl.c +++ b/xc/lib/font/stubs/initfshdl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/initfshdl.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/regfpefunc.c b/xc/lib/font/stubs/regfpefunc.c index 96f4b921b..0c6741ae5 100644 --- a/xc/lib/font/stubs/regfpefunc.c +++ b/xc/lib/font/stubs/regfpefunc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.2 1999/08/21 13:48:07 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/regfpefunc.c,v 1.1 1999/01/11 05:13:20 dawes Exp $ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/rmfshdl.c b/xc/lib/font/stubs/rmfshdl.c index 4e6d1da13..b473fbeaf 100644 --- a/xc/lib/font/stubs/rmfshdl.c +++ b/xc/lib/font/stubs/rmfshdl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/rmfshdl.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/servclient.c b/xc/lib/font/stubs/servclient.c index 7f3e78613..25c853f87 100644 --- a/xc/lib/font/stubs/servclient.c +++ b/xc/lib/font/stubs/servclient.c @@ -1,3 +1,3 @@ -/* $XFree86: xc/lib/font/stubs/servclient.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ void *serverClient = 0; diff --git a/xc/lib/font/stubs/setfntauth.c b/xc/lib/font/stubs/setfntauth.c index 75e59c4b7..b0eb94e1f 100644 --- a/xc/lib/font/stubs/setfntauth.c +++ b/xc/lib/font/stubs/setfntauth.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/setfntauth.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/stfntcfnt.c b/xc/lib/font/stubs/stfntcfnt.c index cbb544f0c..7cfa12db3 100644 --- a/xc/lib/font/stubs/stfntcfnt.c +++ b/xc/lib/font/stubs/stfntcfnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/stfntcfnt.c,v 1.1 1999/01/11 05:13:21 dawes Exp $ */ +/* $XFree86$ */ #include "stubs.h" diff --git a/xc/lib/font/stubs/stubs.h b/xc/lib/font/stubs/stubs.h index e88dc395a..97cbf7b69 100644 --- a/xc/lib/font/stubs/stubs.h +++ b/xc/lib/font/stubs/stubs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.3 1999/12/15 01:14:36 robin Exp $ */ +/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.2 1999/08/21 13:48:07 dawes Exp $ */ /* This directory includes dummy entry for bdftopcf and mkfontdir */ diff --git a/xc/lib/font/stubs/xpstubs.c b/xc/lib/font/stubs/xpstubs.c index c692bbca2..5ac9117c7 100644 --- a/xc/lib/font/stubs/xpstubs.c +++ b/xc/lib/font/stubs/xpstubs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/font/stubs/xpstubs.c,v 1.1 1999/01/11 05:13:22 dawes Exp $ */ +/* $XFree86$ */ /* stub for XpClient* functions. diff --git a/xc/lib/font/util/Imakefile b/xc/lib/font/util/Imakefile index 64d9378be..eb7836cc8 100644 --- a/xc/lib/font/util/Imakefile +++ b/xc/lib/font/util/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.11 94/02/07 16:07:31 gildea Exp $ -XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.4 1999/04/27 07:08:59 dawes Exp $ +XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.3 1999/01/11 12:42:51 dawes Exp $ #include <Server.tmpl> INCLUDES = -I$(FONTINCSRC) -I../include diff --git a/xc/lib/font/util/atom.c b/xc/lib/font/util/atom.c index 973d768c6..f1044e94c 100644 --- a/xc/lib/font/util/atom.c +++ b/xc/lib/font/util/atom.c @@ -21,7 +21,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/lib/font/util/atom.c,v 1.3 1999/08/22 08:58:57 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/fontaccel.c b/xc/lib/font/util/fontaccel.c index 40b4ff86f..2f9934cb9 100644 --- a/xc/lib/font/util/fontaccel.c +++ b/xc/lib/font/util/fontaccel.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.5 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/fontnames.c b/xc/lib/font/util/fontnames.c index 95a5b1118..1175f85d8 100644 --- a/xc/lib/font/util/fontnames.c +++ b/xc/lib/font/util/fontnames.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontnames.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/fontutil.c b/xc/lib/font/util/fontutil.c index 79badfdad..04a77d541 100644 --- a/xc/lib/font/util/fontutil.c +++ b/xc/lib/font/util/fontutil.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontutil.c,v 3.4 1999/08/21 13:48:09 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontutil.c,v 3.3 1999/04/27 07:08:59 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/fontxlfd.c b/xc/lib/font/util/fontxlfd.c index 5b3c1e10c..565b78ad0 100644 --- a/xc/lib/font/util/fontxlfd.c +++ b/xc/lib/font/util/fontxlfd.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.7 1999/08/21 13:48:09 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.8 2000/08/23 22:10:04 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -201,7 +201,9 @@ xlfd_round_double(double x) significant digits. How do you round to n significant digits on a binary machine? */ -#if defined(i386) || defined(__i386__) || defined(__alpha__) +#if defined(i386) || defined(__i386__) || \ + defined(ia64) || defined(__ia64__) || \ + defined(__alpha__) || defined(__alpha) #if !defined(__EMX__) #include <float.h> diff --git a/xc/lib/font/util/format.c b/xc/lib/font/util/format.c index e596ad904..d263ba84f 100644 --- a/xc/lib/font/util/format.c +++ b/xc/lib/font/util/format.c @@ -46,7 +46,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/format.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86$ */ #include "FSproto.h" #include "font.h" diff --git a/xc/lib/font/util/miscutil.c b/xc/lib/font/util/miscutil.c index 47e7665e3..f269e47ef 100644 --- a/xc/lib/font/util/miscutil.c +++ b/xc/lib/font/util/miscutil.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/miscutil.c,v 1.5 1999/09/04 09:14:12 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/miscutil.c,v 1.4 1999/08/01 12:17:39 dawes Exp $ */ #include <X11/Xosdefs.h> #ifndef X_NOT_STDC_ENV diff --git a/xc/lib/font/util/patcache.c b/xc/lib/font/util/patcache.c index 4462e5ed9..ec067f74f 100644 --- a/xc/lib/font/util/patcache.c +++ b/xc/lib/font/util/patcache.c @@ -21,7 +21,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/lib/font/util/patcache.c,v 3.3 1999/08/21 13:48:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/patcache.c,v 3.2 1998/10/03 09:07:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/private.c b/xc/lib/font/util/private.c index 8ad25cf5a..e6964c804 100644 --- a/xc/lib/font/util/private.c +++ b/xc/lib/font/util/private.c @@ -21,7 +21,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/lib/font/util/private.c,v 1.6 1999/10/13 05:27:10 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/private.c,v 1.5 1999/10/13 04:20:52 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/font/util/utilbitmap.c b/xc/lib/font/util/utilbitmap.c index f4ba4663f..3d95dbfd5 100644 --- a/xc/lib/font/util/utilbitmap.c +++ b/xc/lib/font/util/utilbitmap.c @@ -21,7 +21,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/lib/font/util/utilbitmap.c,v 1.3 1999/08/22 08:58:58 dawes Exp $ */ +/* $XFree86$ */ /* * Author: Keith Packard, MIT X Consortium diff --git a/xc/lib/lbxutil/Imakefile b/xc/lib/lbxutil/Imakefile index ee511f8ed..4400696c6 100644 --- a/xc/lib/lbxutil/Imakefile +++ b/xc/lib/lbxutil/Imakefile @@ -4,7 +4,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/11/03 19:32:12 kaleb $ -XCOMM $XFree86: xc/lib/lbxutil/Imakefile,v 1.7 1999/04/17 09:08:13 dawes Exp $ +XCOMM $XFree86: xc/lib/lbxutil/Imakefile,v 1.6 1998/01/01 14:51:32 robin Exp $ #include <Server.tmpl> #define IHaveSubdirs diff --git a/xc/lib/lbxutil/delta/lbxdelta.c b/xc/lib/lbxutil/delta/lbxdelta.c index f2cc77cdd..3bad55946 100644 --- a/xc/lib/lbxutil/delta/lbxdelta.c +++ b/xc/lib/lbxutil/delta/lbxdelta.c @@ -22,7 +22,7 @@ * * Author: Dale Tonogai, Network Computing Devices */ -/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.5 2000/06/07 22:03:02 tsi Exp $ */ +/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.4 2000/05/18 23:46:16 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/xc/lib/lbxutil/image/Imakefile b/xc/lib/lbxutil/image/Imakefile index 77bff9cff..4ec81d89f 100644 --- a/xc/lib/lbxutil/image/Imakefile +++ b/xc/lib/lbxutil/image/Imakefile @@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/12/04 10:23:58 lehors $ -XCOMM $XFree86: xc/lib/lbxutil/image/Imakefile,v 1.2 1997/01/05 11:52:20 dawes Exp $ +XCOMM $XFree86$ #define IncSubdir X11 #include <Library.tmpl> diff --git a/xc/lib/lbxutil/image/dfaxg42d.c b/xc/lib/lbxutil/image/dfaxg42d.c index 8dff1670f..b61f8f5de 100644 --- a/xc/lib/lbxutil/image/dfaxg42d.c +++ b/xc/lib/lbxutil/image/dfaxg42d.c @@ -22,7 +22,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.4 2000/05/18 23:46:16 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.3 1998/12/20 11:57:16 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xfuncproto.h> diff --git a/xc/lib/lbxutil/image/dpackbits.c b/xc/lib/lbxutil/image/dpackbits.c index ee8b2e742..cb7e98a4b 100644 --- a/xc/lib/lbxutil/image/dpackbits.c +++ b/xc/lib/lbxutil/image/dpackbits.c @@ -22,7 +22,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.3 2000/05/18 23:46:16 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.2 1998/12/20 11:57:16 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xfuncproto.h> diff --git a/xc/lib/lbxutil/image/efaxg42d.c b/xc/lib/lbxutil/image/efaxg42d.c index 9aa8a5dc9..79a8b7f9e 100644 --- a/xc/lib/lbxutil/image/efaxg42d.c +++ b/xc/lib/lbxutil/image/efaxg42d.c @@ -22,7 +22,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.3 2000/05/18 23:46:16 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.2 1998/12/20 11:57:16 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xfuncproto.h> diff --git a/xc/lib/lbxutil/image/mkg3states.c b/xc/lib/lbxutil/image/mkg3states.c index 39d8abae0..53d044d80 100644 --- a/xc/lib/lbxutil/image/mkg3states.c +++ b/xc/lib/lbxutil/image/mkg3states.c @@ -22,7 +22,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.3 1999/02/01 11:55:49 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.2 1998/10/05 13:22:02 dawes Exp $ */ /* * Program to construct Group 3 & Group 4 decoding tables. diff --git a/xc/lib/lbxutil/lbx_zlib/lbx_zlib.c b/xc/lib/lbxutil/lbx_zlib/lbx_zlib.c index a76ec7619..55735f0a3 100644 --- a/xc/lib/lbxutil/lbx_zlib/lbx_zlib.c +++ b/xc/lib/lbxutil/lbx_zlib/lbx_zlib.c @@ -46,7 +46,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.6 2000/05/18 23:46:17 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.5 1998/12/20 11:57:19 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/lbxutil/lbx_zlib/lbx_zlib.h b/xc/lib/lbxutil/lbx_zlib/lbx_zlib.h index c42329466..13d1f73c4 100644 --- a/xc/lib/lbxutil/lbx_zlib/lbx_zlib.h +++ b/xc/lib/lbxutil/lbx_zlib/lbx_zlib.h @@ -46,7 +46,7 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.7 2000/06/07 22:03:02 tsi Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.6 2000/05/18 23:46:17 dawes Exp $ */ #include "zlib.h" #include "Xfuncproto.h" diff --git a/xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c b/xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c index 6b30eb258..2257c4335 100644 --- a/xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c +++ b/xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c @@ -22,7 +22,7 @@ * * Author: Dale Tonogai, Network Computing Devices */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.10 2000/06/07 22:03:02 tsi Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.9 1999/03/14 03:21:20 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/lib/lbxutil/lbx_zlib/reqstats.c b/xc/lib/lbxutil/lbx_zlib/reqstats.c index 7400ae81a..c45cb775b 100644 --- a/xc/lib/lbxutil/lbx_zlib/reqstats.c +++ b/xc/lib/lbxutil/lbx_zlib/reqstats.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.3 2000/06/27 21:26:33 tsi Exp $ */ +/* $XFree86$ */ #ifdef LBXREQSTATS diff --git a/xc/lib/misc/snprintf.c b/xc/lib/misc/snprintf.c index b612ea240..d980bc562 100644 --- a/xc/lib/misc/snprintf.c +++ b/xc/lib/misc/snprintf.c @@ -51,7 +51,7 @@ * All Rights Reserved */ -/* $XFree86: xc/lib/misc/snprintf.c,v 3.1 1999/04/28 15:04:51 dawes Exp $ */ +/* $XFree86$ */ /* diff --git a/xc/lib/misc/snprintf.h b/xc/lib/misc/snprintf.h index 4500b2559..7bb2926ac 100644 --- a/xc/lib/misc/snprintf.h +++ b/xc/lib/misc/snprintf.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/misc/snprintf.h,v 3.2 1999/04/28 15:04:51 dawes Exp $ */ +/* $XFree86: xc/lib/misc/snprintf.h,v 3.1 1996/08/26 14:42:33 dawes Exp $ */ #ifndef SNPRINTF_H #define SNPRINTF_H diff --git a/xc/lib/oldX/Imakefile b/xc/lib/oldX/Imakefile index 9ca0955fa..4abc2027f 100644 --- a/xc/lib/oldX/Imakefile +++ b/xc/lib/oldX/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/28 1996/09/28 16:49:50 rws $ -XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.2 1998/12/20 11:57:19 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib NormalOldX #define DoSharedLib SharedOldX #define DoExtraLib SharedOldX diff --git a/xc/lib/oldX/XDelAssoc.c b/xc/lib/oldX/XDelAssoc.c index c1ad4928a..f1df29b11 100644 --- a/xc/lib/oldX/XDelAssoc.c +++ b/xc/lib/oldX/XDelAssoc.c @@ -20,7 +20,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/lib/oldX/XDelAssoc.c,v 1.2 1999/05/23 06:33:34 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "X10.h" diff --git a/xc/lib/oldX/XDestAssoc.c b/xc/lib/oldX/XDestAssoc.c index 1dc066683..382a0f0c8 100644 --- a/xc/lib/oldX/XDestAssoc.c +++ b/xc/lib/oldX/XDestAssoc.c @@ -20,7 +20,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/lib/oldX/XDestAssoc.c,v 1.2 1999/05/23 06:33:34 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "X10.h" diff --git a/xc/lib/oldX/XDraw.c b/xc/lib/oldX/XDraw.c index 9fd20bfb1..18c225c1a 100644 --- a/xc/lib/oldX/XDraw.c +++ b/xc/lib/oldX/XDraw.c @@ -26,7 +26,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/lib/oldX/XDraw.c,v 1.2 1999/05/23 06:33:35 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "Xlib.h" diff --git a/xc/lib/oldX/XMakeAssoc.c b/xc/lib/oldX/XMakeAssoc.c index d4e32778f..5f3451e5a 100644 --- a/xc/lib/oldX/XMakeAssoc.c +++ b/xc/lib/oldX/XMakeAssoc.c @@ -20,7 +20,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/lib/oldX/XMakeAssoc.c,v 1.2 1999/05/23 06:33:35 dawes Exp $ */ +/* $XFree86$ */ #include "Xlibint.h" #include "X10.h" diff --git a/xc/lib/psres/Imakefile b/xc/lib/psres/Imakefile index 7af8837be..158cd116e 100644 --- a/xc/lib/psres/Imakefile +++ b/xc/lib/psres/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/psres/Imakefile,v 1.4 2000/08/09 23:40:15 dawes Exp $ +XCOMM $XFree86: xc/lib/psres/Imakefile,v 1.3 2000/02/15 01:44:57 dawes Exp $ #define DoNormalLib NormalLibPSRes #define DoSharedLib SharedLibPSRes diff --git a/xc/lib/psres/psres-def.cpp b/xc/lib/psres/psres-def.cpp index e9f690f9d..2107d1eab 100644 --- a/xc/lib/psres/psres-def.cpp +++ b/xc/lib/psres/psres-def.cpp @@ -8,4 +8,4 @@ ListPSResourceFiles ListPSResourceTypes SetPSResourcePolicy -/* $XFree86: xc/lib/psres/psres-def.cpp,v 1.1 2000/08/09 23:40:15 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/psres/psresos2.def b/xc/lib/psres/psresos2.def index 27cbda37b..9d60d18e5 100644 --- a/xc/lib/psres/psresos2.def +++ b/xc/lib/psres/psresos2.def @@ -1,5 +1,5 @@ LIBRARY psres -DESCRIPTION "@#XFREE86:4.0#@ $XFree86: xc/lib/psres/psresos2.def,v 1.1 2000/04/05 18:13:25 dawes Exp $" +DESCRIPTION "@#XFREE86:4.0#@ $XFree86$" CODE PRELOAD DATA diff --git a/xc/lib/regex/Imakefile b/xc/lib/regex/Imakefile index 2a17f740d..434e8f645 100644 --- a/xc/lib/regex/Imakefile +++ b/xc/lib/regex/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/regex/Imakefile,v 1.1 1999/01/03 03:58:16 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib YES #define DoSharedLib NO diff --git a/xc/lib/xkbfile/Imakefile b/xc/lib/xkbfile/Imakefile index 3c800a57f..d4fadafa5 100644 --- a/xc/lib/xkbfile/Imakefile +++ b/xc/lib/xkbfile/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:49:56 rws $ -XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.2 1998/12/20 11:57:20 dawes Exp $ +XCOMM $XFree86$ #define DoNormalLib YES #define DoSharedLib NO #define DoExtraLib NO diff --git a/xc/lib/xkbfile/XKBconfig.h b/xc/lib/xkbfile/XKBconfig.h index 97a4cfb4a..c971675ce 100644 --- a/xc/lib/xkbfile/XKBconfig.h +++ b/xc/lib/xkbfile/XKBconfig.h @@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.4 2000/06/19 15:00:44 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.3 2000/06/14 18:20:33 dawes Exp $ */ typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr; diff --git a/xc/lib/xkbfile/cout.c b/xc/lib/xkbfile/cout.c index 6d8677bb7..a61701b37 100644 --- a/xc/lib/xkbfile/cout.c +++ b/xc/lib/xkbfile/cout.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/cout.c,v 3.4 1997/10/26 13:24:56 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/cout.c,v 3.3 1997/06/22 10:16:54 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/xkbfile/maprules.c b/xc/lib/xkbfile/maprules.c index e4fcac0a5..5d590e021 100644 --- a/xc/lib/xkbfile/maprules.c +++ b/xc/lib/xkbfile/maprules.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.11 1997/10/26 13:24:56 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.10 1997/07/05 15:15:48 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/xkbfile/xkbatom.c b/xc/lib/xkbfile/xkbatom.c index 92cf7f2a7..aee9684d2 100644 --- a/xc/lib/xkbfile/xkbatom.c +++ b/xc/lib/xkbfile/xkbatom.c @@ -67,7 +67,7 @@ SOFTWARE. THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.5 1998/10/03 09:07:33 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.4 1997/10/26 13:24:56 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/xkbfile/xkbconfig.c b/xc/lib/xkbfile/xkbconfig.c index 58a0d2519..cb25acce2 100644 --- a/xc/lib/xkbfile/xkbconfig.c +++ b/xc/lib/xkbfile/xkbconfig.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.4 2000/06/14 18:20:33 dawes Exp $ */ +/* $XFree86$ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/xkbfile/xkbtext.c b/xc/lib/xkbfile/xkbtext.c index dcc5bb1b0..1b1288035 100644 --- a/xc/lib/xkbfile/xkbtext.c +++ b/xc/lib/xkbfile/xkbtext.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.6 1996/12/29 13:43:41 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.5 1996/12/28 11:12:49 dawes Exp $ */ #include <stdio.h> #include <ctype.h> diff --git a/xc/lib/xkbui/Imakefile b/xc/lib/xkbui/Imakefile index 725d11eed..09feb5239 100644 --- a/xc/lib/xkbui/Imakefile +++ b/xc/lib/xkbui/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/1 1995/11/30 19:00:42 kaleb $ -XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.3 1999/03/14 03:21:21 dawes Exp $ +XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.2tsi Exp $ #define DoNormalLib YES #define DoSharedLib NO #define DoExtraLib NO diff --git a/xc/lib/xkbui/XKBui.c b/xc/lib/xkbui/XKBui.c index 9dc755310..2e1a34770 100644 --- a/xc/lib/xkbui/XKBui.c +++ b/xc/lib/xkbui/XKBui.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.6 1999/06/20 07:14:08 dawes Exp $ */ +/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.5 1999/03/14 03:21:21 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> diff --git a/xc/lib/xtrans/Xtrans.c b/xc/lib/xtrans/Xtrans.c index 8959bf68d..d6e871dee 100644 --- a/xc/lib/xtrans/Xtrans.c +++ b/xc/lib/xtrans/Xtrans.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.22 1999/12/27 00:39:28 robin Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.21 1999/06/20 08:41:20 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtrans.h b/xc/lib/xtrans/Xtrans.h index 646689c64..70d0a477b 100644 --- a/xc/lib/xtrans/Xtrans.h +++ b/xc/lib/xtrans/Xtrans.h @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.14 1999/12/13 02:52:54 robin Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.13 1999/06/20 08:41:21 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtransam.c b/xc/lib/xtrans/Xtransam.c index fe9f2bccf..1a6547739 100644 --- a/xc/lib/xtrans/Xtransam.c +++ b/xc/lib/xtrans/Xtransam.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransam.c,v 3.2 1998/10/03 09:07:34 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransam.c,v 3.1 1996/05/10 06:55:45 dawes Exp $ */ /* Copyright 1994 Vrije Universiteit Amsterdam, Netherlands * diff --git a/xc/lib/xtrans/Xtransdnet.c b/xc/lib/xtrans/Xtransdnet.c index ebaadaa2e..882ff82de 100644 --- a/xc/lib/xtrans/Xtransdnet.c +++ b/xc/lib/xtrans/Xtransdnet.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.4 1999/06/20 08:41:21 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.3 1998/10/03 09:07:34 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtransint.h b/xc/lib/xtrans/Xtransint.h index 88455590e..4d5e4aae1 100644 --- a/xc/lib/xtrans/Xtransint.h +++ b/xc/lib/xtrans/Xtransint.h @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.27 1999/12/27 00:39:28 robin Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.26 1999/06/20 08:41:21 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtranslcl.c b/xc/lib/xtrans/Xtranslcl.c index 485994d5f..271a80c03 100644 --- a/xc/lib/xtrans/Xtranslcl.c +++ b/xc/lib/xtrans/Xtranslcl.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.33 1999/06/20 08:41:22 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.32 1999/03/28 15:32:07 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtransmnx.c b/xc/lib/xtrans/Xtransmnx.c index 9e5b5e616..9120c29c1 100644 --- a/xc/lib/xtrans/Xtransmnx.c +++ b/xc/lib/xtrans/Xtransmnx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/xtrans/Xtransmnx.c,v 3.3 1996/05/10 06:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransmnx.c,v 3.2 1995/07/07 15:33:07 dawes Exp $ */ /* Xtransmnx.c diff --git a/xc/lib/xtrans/Xtransos2.c b/xc/lib/xtrans/Xtransos2.c index 6b3c87ae1..d067902fb 100644 --- a/xc/lib/xtrans/Xtransos2.c +++ b/xc/lib/xtrans/Xtransos2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/xtrans/Xtransos2.c,v 3.6 1999/06/20 08:41:22 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransos2.c,v 3.5 1997/01/28 10:53:32 dawes Exp $ */ /* * (c) Copyright 1996 by Sebastien Marineau and Holger Veit diff --git a/xc/lib/xtrans/Xtranssock.c b/xc/lib/xtrans/Xtranssock.c index c38ead27d..520d6ca5d 100644 --- a/xc/lib/xtrans/Xtranssock.c +++ b/xc/lib/xtrans/Xtranssock.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.47 2000/05/11 18:14:10 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.46 2000/04/05 18:13:26 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtranstli.c b/xc/lib/xtrans/Xtranstli.c index 17edadd2c..b41307606 100644 --- a/xc/lib/xtrans/Xtranstli.c +++ b/xc/lib/xtrans/Xtranstli.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.8 1999/06/20 08:41:23 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.7 1998/10/03 09:07:36 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/Xtransutil.c b/xc/lib/xtrans/Xtransutil.c index 54746223b..e0bce689f 100644 --- a/xc/lib/xtrans/Xtransutil.c +++ b/xc/lib/xtrans/Xtransutil.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.16 2000/08/09 23:40:15 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.15 2000/04/05 18:13:27 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/xtrans/transport.c b/xc/lib/xtrans/transport.c index 7aeadfc0f..62087305d 100644 --- a/xc/lib/xtrans/transport.c +++ b/xc/lib/xtrans/transport.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/transport.c,v 3.4 1998/10/03 09:07:37 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/transport.c,v 3.3 1996/05/06 05:55:14 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/xc/lib/zlib/Imakefile b/xc/lib/zlib/Imakefile index a710cbcbf..12aaae8ed 100644 --- a/xc/lib/zlib/Imakefile +++ b/xc/lib/zlib/Imakefile @@ -4,7 +4,7 @@ XCOMM $TOG: Imakefile /main/4 1998/02/04 14:32:56 kaleb $ -XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.7 2000/08/09 23:40:16 dawes Exp $ +XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.6 1999/04/17 09:08:13 dawes Exp $ #ifndef cygwinArchitecture #define DoNormalLib YES diff --git a/xc/lib/zlib/z-def.cpp b/xc/lib/zlib/z-def.cpp index eeae2c8d2..6ea43d065 100644 --- a/xc/lib/zlib/z-def.cpp +++ b/xc/lib/zlib/z-def.cpp @@ -44,4 +44,4 @@ EXPORTS zlibVersion @ 41 ; #endif -/* $XFree86: xc/lib/zlib/z-def.cpp,v 1.1 2000/08/09 23:40:16 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/lib/zlib/zconf.h b/xc/lib/zlib/zconf.h index 1b2a54fc3..206b8d7c6 100644 --- a/xc/lib/zlib/zconf.h +++ b/xc/lib/zlib/zconf.h @@ -5,7 +5,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $XFree86: xc/lib/zlib/zconf.h,v 1.6 2000/08/09 23:40:16 dawes Exp $ */ +/* $XFree86$ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/xc/nls/Compose/Imakefile b/xc/nls/Compose/Imakefile index ce387c75c..338ac853a 100644 --- a/xc/nls/Compose/Imakefile +++ b/xc/nls/Compose/Imakefile @@ -1,5 +1,5 @@ XCOMM $TOG: Imakefile /main/9 1998/06/29 09:17:20 kaleb $ -XCOMM $XFree86: xc/nls/Compose/Imakefile,v 1.9 2000/03/16 21:59:40 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/Imakefile,v 1.8 1999/08/28 09:00:33 dawes Exp $ #ifndef Win32Architecture #ifndef OS2Architecture diff --git a/xc/nls/Compose/armscii-8 b/xc/nls/Compose/armscii-8 index 40fd86ff9..0f16ef98f 100644 --- a/xc/nls/Compose/armscii-8 +++ b/xc/nls/Compose/armscii-8 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/armscii-8,v 1.1 1999/08/28 09:00:33 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/en_US.utf b/xc/nls/Compose/en_US.utf index 3d5e4a130..e8466a05f 100644 --- a/xc/nls/Compose/en_US.utf +++ b/xc/nls/Compose/en_US.utf @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/en_US.utf,v 1.1 1999/08/28 09:00:34 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/georgian-academy b/xc/nls/Compose/georgian-academy index 25cf6220d..212169ad8 100644 --- a/xc/nls/Compose/georgian-academy +++ b/xc/nls/Compose/georgian-academy @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/georgian-academy,v 1.1 1999/08/28 09:00:34 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/georgian-ps b/xc/nls/Compose/georgian-ps index 754c9a919..b1341487d 100644 --- a/xc/nls/Compose/georgian-ps +++ b/xc/nls/Compose/georgian-ps @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/georgian-ps,v 1.1 1999/08/28 09:00:34 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/ibm-cp1133 b/xc/nls/Compose/ibm-cp1133 index ed1ac4ac7..3cb42c4fb 100644 --- a/xc/nls/Compose/ibm-cp1133 +++ b/xc/nls/Compose/ibm-cp1133 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/ibm-cp1133,v 1.1 1999/08/28 09:00:34 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-1 b/xc/nls/Compose/iso8859-1 index 3c580b827..f934a759d 100644 --- a/xc/nls/Compose/iso8859-1 +++ b/xc/nls/Compose/iso8859-1 @@ -3,7 +3,7 @@ # ISO 8859-1 (Latin1) Compose Sequence # # -# $XFree86: xc/nls/Compose/iso8859-1,v 1.4 2000/06/13 23:15:49 dawes Exp $ +# $XFree86:$ # # Sequence Definition # diff --git a/xc/nls/Compose/iso8859-10 b/xc/nls/Compose/iso8859-10 index 17097aa32..744ae5478 100644 --- a/xc/nls/Compose/iso8859-10 +++ b/xc/nls/Compose/iso8859-10 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-10,v 1.1 1999/08/28 09:00:35 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-14 b/xc/nls/Compose/iso8859-14 index 9bb768d2b..e3bab09a8 100644 --- a/xc/nls/Compose/iso8859-14 +++ b/xc/nls/Compose/iso8859-14 @@ -3,7 +3,7 @@ # # ISO 8859-14 (Latin-8) Compose Sequence # -# $XFree86: xc/nls/Compose/iso8859-14,v 1.2 2000/02/08 17:18:48 dawes Exp $ +# $XFree86$ # # The following is from the Latin-1 definitions # Sequence Definition diff --git a/xc/nls/Compose/iso8859-15 b/xc/nls/Compose/iso8859-15 index 84e243960..3dab826f9 100644 --- a/xc/nls/Compose/iso8859-15 +++ b/xc/nls/Compose/iso8859-15 @@ -2,7 +2,7 @@ # # ISO 8859-15 (Latin1) Compose Sequence # -# $XFree86: xc/nls/Compose/iso8859-15,v 1.2 1999/08/28 09:00:35 dawes Exp $ +# $XFree86$ # # Sequence Definition # diff --git a/xc/nls/Compose/iso8859-3 b/xc/nls/Compose/iso8859-3 index 3b15ebe21..c5bc36618 100644 --- a/xc/nls/Compose/iso8859-3 +++ b/xc/nls/Compose/iso8859-3 @@ -4,7 +4,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-3,v 1.1 1999/06/06 14:05:57 dawes Exp $ +# $XFree86$ # # <Multi_key> Means <Compose> # Special Character diff --git a/xc/nls/Compose/iso8859-4 b/xc/nls/Compose/iso8859-4 index 728ebc5f4..0611c7528 100644 --- a/xc/nls/Compose/iso8859-4 +++ b/xc/nls/Compose/iso8859-4 @@ -1,4 +1,4 @@ -# $XFree86: xc/nls/Compose/iso8859-4,v 1.1 1998/01/11 03:48:18 dawes Exp $ +# $XFree86$ # # ISO 8859-4 (Latin4) Compose Sequence # diff --git a/xc/nls/Compose/iso8859-5 b/xc/nls/Compose/iso8859-5 index 8f7196a27..7ea2c92ad 100644 --- a/xc/nls/Compose/iso8859-5 +++ b/xc/nls/Compose/iso8859-5 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-5,v 1.1 1999/08/28 09:00:36 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-6 b/xc/nls/Compose/iso8859-6 index d625d49cb..b5f526678 100644 --- a/xc/nls/Compose/iso8859-6 +++ b/xc/nls/Compose/iso8859-6 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-6,v 1.1 1999/08/28 09:00:36 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-7 b/xc/nls/Compose/iso8859-7 index a447f6df4..c19c753cd 100644 --- a/xc/nls/Compose/iso8859-7 +++ b/xc/nls/Compose/iso8859-7 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-7,v 1.1 1999/08/28 09:00:36 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-8 b/xc/nls/Compose/iso8859-8 index 6aaad5db2..668012a8e 100644 --- a/xc/nls/Compose/iso8859-8 +++ b/xc/nls/Compose/iso8859-8 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-8,v 1.1 1999/08/28 09:00:36 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/iso8859-9 b/xc/nls/Compose/iso8859-9 index be1ddb140..c40dd49c3 100644 --- a/xc/nls/Compose/iso8859-9 +++ b/xc/nls/Compose/iso8859-9 @@ -4,7 +4,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/iso8859-9,v 1.1 1999/06/06 14:05:57 dawes Exp $ +# $XFree86$ # # <Multi_key> Means <Compose> # Special Character diff --git a/xc/nls/Compose/ja b/xc/nls/Compose/ja index 47bd403b9..e27654803 100644 --- a/xc/nls/Compose/ja +++ b/xc/nls/Compose/ja @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/ja,v 1.1 1999/08/28 09:00:37 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/ja.JIS b/xc/nls/Compose/ja.JIS index c88514779..5f150a957 100644 --- a/xc/nls/Compose/ja.JIS +++ b/xc/nls/Compose/ja.JIS @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/ja.JIS,v 1.1 1999/08/28 09:00:37 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/ja.SJIS b/xc/nls/Compose/ja.SJIS index 64f60acd0..e8af28c2f 100644 --- a/xc/nls/Compose/ja.SJIS +++ b/xc/nls/Compose/ja.SJIS @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/ja.SJIS,v 1.1 1999/08/28 09:00:37 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/ko b/xc/nls/Compose/ko index 2e91d7446..27a241435 100644 --- a/xc/nls/Compose/ko +++ b/xc/nls/Compose/ko @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/ko,v 1.1 1999/08/28 09:00:38 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/koi8-r b/xc/nls/Compose/koi8-r index 5fd0119c7..8d1a2ba51 100644 --- a/xc/nls/Compose/koi8-r +++ b/xc/nls/Compose/koi8-r @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/koi8-r,v 1.1 1999/08/28 09:00:38 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/koi8-u b/xc/nls/Compose/koi8-u index 8625b72f2..529b5af4f 100644 --- a/xc/nls/Compose/koi8-u +++ b/xc/nls/Compose/koi8-u @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/koi8-u,v 1.1 1999/08/28 09:00:38 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/mulelao-1 b/xc/nls/Compose/mulelao-1 index 72f696702..6b466fca5 100644 --- a/xc/nls/Compose/mulelao-1 +++ b/xc/nls/Compose/mulelao-1 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/mulelao-1,v 1.1 1999/08/28 09:00:38 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/th_TH.TACTIS b/xc/nls/Compose/th_TH.TACTIS index 6cde8283f..ed98bfcc5 100644 --- a/xc/nls/Compose/th_TH.TACTIS +++ b/xc/nls/Compose/th_TH.TACTIS @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/th_TH.TACTIS,v 1.1 1999/08/28 09:00:39 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/vi_VN.tcvn b/xc/nls/Compose/vi_VN.tcvn index 70725e24f..2374bb3cb 100644 --- a/xc/nls/Compose/vi_VN.tcvn +++ b/xc/nls/Compose/vi_VN.tcvn @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/vi_VN.tcvn,v 1.1 1999/08/28 09:00:39 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/vi_VN.viscii b/xc/nls/Compose/vi_VN.viscii index 725bfdb43..e4d7915f5 100644 --- a/xc/nls/Compose/vi_VN.viscii +++ b/xc/nls/Compose/vi_VN.viscii @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/vi_VN.viscii,v 1.1 1999/08/28 09:00:39 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/zh b/xc/nls/Compose/zh index 339139481..cfa598a66 100644 --- a/xc/nls/Compose/zh +++ b/xc/nls/Compose/zh @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/zh,v 1.1 1999/08/28 09:00:40 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/zh_TW b/xc/nls/Compose/zh_TW index 2c3733323..e42c800cb 100644 --- a/xc/nls/Compose/zh_TW +++ b/xc/nls/Compose/zh_TW @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/zh_TW,v 1.1 1999/08/28 09:00:40 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Compose/zh_TW.big5 b/xc/nls/Compose/zh_TW.big5 index 3308a02eb..6a479b6d3 100644 --- a/xc/nls/Compose/zh_TW.big5 +++ b/xc/nls/Compose/zh_TW.big5 @@ -3,7 +3,7 @@ # # Sequence Definition # -# $XFree86: xc/nls/Compose/zh_TW.big5,v 1.1 1999/08/28 09:00:40 dawes Exp $ +# $XFree86$ # # This file currently has no entries. It appears that a compose file (even # just an empty one) is required for the appropriate keysyms to work for diff --git a/xc/nls/Imakefile b/xc/nls/Imakefile index 341e6c96a..f673d8c77 100644 --- a/xc/nls/Imakefile +++ b/xc/nls/Imakefile @@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/11/13 14:45:33 lehors $ -XCOMM $XFree86: xc/nls/Imakefile,v 1.4 1999/08/22 13:04:24 dawes Exp $ +XCOMM $XFree86: xc/nls/Imakefile,v 1.3 1997/01/28 11:19:14 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags diff --git a/xc/nls/XLC_LOCALE/C b/xc/nls/XLC_LOCALE/C index d9fd8bab7..8fa6dba4c 100644 --- a/xc/nls/XLC_LOCALE/C +++ b/xc/nls/XLC_LOCALE/C @@ -1,6 +1,6 @@ XCOMM $XConsortium: C /main/8 1996/09/28 16:50:43 rws $ XCOMM XLocale Database Sample for C. -XCOMM $XFree86: xc/nls/XLC_LOCALE/C,v 1.3 2000/02/25 21:02:32 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM diff --git a/xc/nls/XLC_LOCALE/Imakefile b/xc/nls/XLC_LOCALE/Imakefile index f202a6cf8..5966647ee 100644 --- a/xc/nls/XLC_LOCALE/Imakefile +++ b/xc/nls/XLC_LOCALE/Imakefile @@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/17 1998/05/21 07:51:40 kaleb $ -XCOMM $XFree86: xc/nls/XLC_LOCALE/Imakefile,v 1.13 2000/02/12 02:54:29 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/Imakefile,v 1.12 1999/06/06 14:05:58 dawes Exp $ WCHAR32 = HasWChar32 TBLDIR = $(XLOCALEDIR)/tbl_data diff --git a/xc/nls/XLC_LOCALE/armscii-8 b/xc/nls/XLC_LOCALE/armscii-8 index 0ec1a284d..d21b1e4e4 100644 --- a/xc/nls/XLC_LOCALE/armscii-8 +++ b/xc/nls/XLC_LOCALE/armscii-8 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/armscii-8,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for armscii-8. XCOMM diff --git a/xc/nls/XLC_LOCALE/en_US.UTF-8 b/xc/nls/XLC_LOCALE/en_US.UTF-8 index 6779498a4..8747b5983 100644 --- a/xc/nls/XLC_LOCALE/en_US.UTF-8 +++ b/xc/nls/XLC_LOCALE/en_US.UTF-8 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.2 2000/02/29 03:09:07 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.1 2000/02/12 02:54:29 dawes Exp $ XCOMM XLocale Database Sample for en_US.UTF-8 XCOMM diff --git a/xc/nls/XLC_LOCALE/georgian-academy b/xc/nls/XLC_LOCALE/georgian-academy index 418c0700a..81b816362 100644 --- a/xc/nls/XLC_LOCALE/georgian-academy +++ b/xc/nls/XLC_LOCALE/georgian-academy @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-academy,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for georgian-academy XCOMM diff --git a/xc/nls/XLC_LOCALE/georgian-ps b/xc/nls/XLC_LOCALE/georgian-ps index 835b1638c..81dd01cb2 100644 --- a/xc/nls/XLC_LOCALE/georgian-ps +++ b/xc/nls/XLC_LOCALE/georgian-ps @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/georgian-ps,v 1.1 1999/06/06 14:05:58 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for georgian-ps XCOMM diff --git a/xc/nls/XLC_LOCALE/ibm-cp1133 b/xc/nls/XLC_LOCALE/ibm-cp1133 index ecde71205..43df7a197 100644 --- a/xc/nls/XLC_LOCALE/ibm-cp1133 +++ b/xc/nls/XLC_LOCALE/ibm-cp1133 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ibm-cp1133,v 1.1 1999/06/06 14:05:59 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for ibm-cp1133. XCOMM diff --git a/xc/nls/XLC_LOCALE/iso8859-14 b/xc/nls/XLC_LOCALE/iso8859-14 index 56afe7019..1f7b2f5d1 100644 --- a/xc/nls/XLC_LOCALE/iso8859-14 +++ b/xc/nls/XLC_LOCALE/iso8859-14 @@ -1,7 +1,7 @@ XCOMM $TOG: iso8859-14 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for iso8859-14. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-14,v 1.1 1999/06/06 14:05:59 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM XLC_FONTSET category diff --git a/xc/nls/XLC_LOCALE/iso8859-15 b/xc/nls/XLC_LOCALE/iso8859-15 index a65259747..fa3e13c54 100644 --- a/xc/nls/XLC_LOCALE/iso8859-15 +++ b/xc/nls/XLC_LOCALE/iso8859-15 @@ -6,7 +6,7 @@ XCOMM This file is provided as preliminary support for the Latin-9 XCOMM (a.k.a. Latin-0) character set so that Europeans who want XCOMM the Euro currency character can do so. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-15,v 1.3 1998/10/25 12:47:53 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM diff --git a/xc/nls/XLC_LOCALE/ja b/xc/nls/XLC_LOCALE/ja index 42a3641ff..1cadadeb0 100644 --- a/xc/nls/XLC_LOCALE/ja +++ b/xc/nls/XLC_LOCALE/ja @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja,v 1.3 1997/08/26 11:57:22 hohndel Exp $ +XCOMM $XFree86: $ XCOMM XCOMM XCOMM $XConsortium: ja /main/7 1996/09/28 16:51:56 rws $ diff --git a/xc/nls/XLC_LOCALE/ja.JIS b/xc/nls/XLC_LOCALE/ja.JIS index 7360b736d..6d8909ad5 100644 --- a/xc/nls/XLC_LOCALE/ja.JIS +++ b/xc/nls/XLC_LOCALE/ja.JIS @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.JIS,v 1.3 1997/08/26 11:57:23 hohndel Exp $ +XCOMM $XFree86: $ XCOMM XCOMM XCOMM $XConsortium: ja.JIS /main/8 1996/09/28 16:52:05 rws $ diff --git a/xc/nls/XLC_LOCALE/ja.SJIS b/xc/nls/XLC_LOCALE/ja.SJIS index b05a4cfe1..715b648f0 100644 --- a/xc/nls/XLC_LOCALE/ja.SJIS +++ b/xc/nls/XLC_LOCALE/ja.SJIS @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.SJIS,v 1.3 1997/08/26 11:57:23 hohndel Exp $ +XCOMM $XFree86: $ XCOMM XCOMM XCOMM $XConsortium: ja.SJIS /main/8 1996/10/23 07:16:28 kaleb $ diff --git a/xc/nls/XLC_LOCALE/koi8-r b/xc/nls/XLC_LOCALE/koi8-r index 0e09f6497..0d2a15c24 100644 --- a/xc/nls/XLC_LOCALE/koi8-r +++ b/xc/nls/XLC_LOCALE/koi8-r @@ -2,7 +2,7 @@ XCOMM $TOG: koi8-r /main/2 1997/09/29 13:14:37 kaleb $ XCOMM XLocale Database Sample for koi8-r. XCOMM XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.2 1997/11/16 06:17:47 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.1 1996/12/28 08:10:21 dawes Exp $ XCOMM XCOMM XLC_FONTSET category diff --git a/xc/nls/XLC_LOCALE/koi8-u b/xc/nls/XLC_LOCALE/koi8-u index a3cd7e9d3..a902c1247 100644 --- a/xc/nls/XLC_LOCALE/koi8-u +++ b/xc/nls/XLC_LOCALE/koi8-u @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-u,v 1.1 1999/05/30 02:28:03 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for koi8-u. XCOMM diff --git a/xc/nls/XLC_LOCALE/mulelao-1 b/xc/nls/XLC_LOCALE/mulelao-1 index 78c96900a..c6aa8a3ac 100644 --- a/xc/nls/XLC_LOCALE/mulelao-1 +++ b/xc/nls/XLC_LOCALE/mulelao-1 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/mulelao-1,v 1.1 1999/06/06 14:05:59 dawes Exp $ +XCOMM $XFree86$ XCOMM XLocale Database Sample for mulelao-1. XCOMM diff --git a/xc/nls/XLC_LOCALE/th_TH.TACTIS b/xc/nls/XLC_LOCALE/th_TH.TACTIS index 6b343f64f..7c8ca2702 100644 --- a/xc/nls/XLC_LOCALE/th_TH.TACTIS +++ b/xc/nls/XLC_LOCALE/th_TH.TACTIS @@ -1,7 +1,7 @@ XCOMM $XConsortium: th_TH.TACTIS /main/7 1996/09/28 16:52:32 rws $ XCOMM XLocale Database Sample for th_TH.TACTIS XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH.TACTIS,v 1.2 1999/06/06 14:06:02 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM diff --git a/xc/nls/XLC_LOCALE/vi_VN.tcvn b/xc/nls/XLC_LOCALE/vi_VN.tcvn index af3d0ea8a..425177bad 100644 --- a/xc/nls/XLC_LOCALE/vi_VN.tcvn +++ b/xc/nls/XLC_LOCALE/vi_VN.tcvn @@ -1,6 +1,6 @@ XCOMM XLocale Database Sample for vi_VN.TCVN XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.tcvn,v 1.1 1999/06/06 14:06:02 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM XLC_FONTSET category diff --git a/xc/nls/XLC_LOCALE/vi_VN.viscii b/xc/nls/XLC_LOCALE/vi_VN.viscii index 061b16bcd..363fde34a 100644 --- a/xc/nls/XLC_LOCALE/vi_VN.viscii +++ b/xc/nls/XLC_LOCALE/vi_VN.viscii @@ -1,6 +1,6 @@ XCOMM XLocale Database Sample for vi_VN.VISCII XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/vi_VN.viscii,v 1.1 1999/06/06 14:06:02 dawes Exp $ +XCOMM $XFree86$ XCOMM XCOMM XLC_FONTSET category diff --git a/xc/nls/XLC_LOCALE/zh_TW.big5 b/xc/nls/XLC_LOCALE/zh_TW.big5 index 266bdbf5c..afc3c96f5 100644 --- a/xc/nls/XLC_LOCALE/zh_TW.big5 +++ b/xc/nls/XLC_LOCALE/zh_TW.big5 @@ -3,7 +3,7 @@ # # modified for X11R6.3 by Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw> 1998/01/10 # -# $XFree86: xc/nls/XLC_LOCALE/zh_TW.big5,v 1.1 1999/08/28 09:00:41 dawes Exp $ +# $XFree86$ # # XLC_FONTSET category # diff --git a/xc/nls/compose.dir b/xc/nls/compose.dir index 88caf00c4..001473609 100644 --- a/xc/nls/compose.dir +++ b/xc/nls/compose.dir @@ -4,7 +4,7 @@ XCOMM This file contains compose table file name. XCOMM The first word is the compose table file name and XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/compose.dir,v 1.8 2000/02/08 17:18:46 dawes Exp $ +XCOMM $XFree86: xc/nls/compose.dir,v 1.7 2000/01/21 02:29:37 dawes Exp $ XCOMM #ifdef R63_COMPAT XCOMM These entries are in the old format (no ':') diff --git a/xc/nls/locale.alias b/xc/nls/locale.alias index 8a309c628..24c959c4f 100644 --- a/xc/nls/locale.alias +++ b/xc/nls/locale.alias @@ -5,7 +5,7 @@ XCOMM Each alias name is described within one line. XCOMM The first word is the alias name (simplified locale name) XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.alias,v 1.24 2000/04/04 19:24:45 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.alias,v 1.23 2000/03/17 16:51:43 dawes Exp $ XCOMM #ifdef R63_COMPAT XCOMM These entries are in the old format (no ':') diff --git a/xc/nls/locale.dir b/xc/nls/locale.dir index aaec3bd17..4214bec2e 100644 --- a/xc/nls/locale.dir +++ b/xc/nls/locale.dir @@ -4,7 +4,7 @@ XCOMM This file contains locale database file name XCOMM The first word is the locale database file name and XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.dir,v 1.13 2000/08/09 20:19:32 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.dir,v 1.12 2000/02/12 02:54:28 dawes Exp $ XCOMM #ifdef R63_COMPAT XCOMM These entries are in the old format (no ':') diff --git a/xc/programs/Imakefile b/xc/programs/Imakefile index 33a60c4f5..1e33bfc15 100644 --- a/xc/programs/Imakefile +++ b/xc/programs/Imakefile @@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/85 1998/02/26 17:14:44 kaleb $ XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/programs/Imakefile,v 3.29 2000/06/15 20:49:59 dawes Exp $ +XCOMM $XFree86: xc/programs/Imakefile,v 3.30 2000/09/18 19:03:39 mvojkovi Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -46,6 +46,9 @@ XFINDPROXYSRCDIR = xfindproxy #if BuildXF86VidModeExt XGAMMASRCDIR = xgamma #endif +#if BuildXvExt + XVINFOSRCDIR = xvinfo +#endif XHOSTSRCDIR = xhost #if BuildPlugin XRXSRCDIR = xrx @@ -84,8 +87,9 @@ SUBDIRS = \ xrefresh $(XRXSRCDIR) xset \ xsetroot $(XSMSRCDIR) xstdcmap xsetmode xsetpointer \ $(XTERMSRCDIR) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ - $(XPMCLIENTDIRS) \ - $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) + $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ + $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \ + glxinfo #endif MakeSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/GL/Imakefile b/xc/programs/Xserver/GL/Imakefile index e757143f6..4b4c0066c 100644 --- a/xc/programs/Xserver/GL/Imakefile +++ b/xc/programs/Xserver/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.6 2000/02/23 04:46:51 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.6tsi Exp $ #define IHaveModules #include <Server.tmpl> @@ -42,7 +42,7 @@ $(DONES): $(SUBDIRS) ModuleObjectRule() -NormalDepLibraryTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS)) +DepLibraryModuleTarget(glx,$(SUBDIRS) $(DONES) $(MOBJS),$(OBJS)) InstallLibraryModule(glx,$(MODULEDIR),extensions) ForceSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/GL/dri/Imakefile b/xc/programs/Xserver/GL/dri/Imakefile index 0bda344d3..b7a1701fd 100644 --- a/xc/programs/Xserver/GL/dri/Imakefile +++ b/xc/programs/Xserver/GL/dri/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/dri/Imakefile,v 1.5 2000/02/23 04:46:52 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/dri/Imakefile,v 1.4 1999/08/14 10:49:23 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/dri/dri-def.cpp b/xc/programs/Xserver/GL/dri/dri-def.cpp index 3389a8aa4..0d1ab6872 100644 --- a/xc/programs/Xserver/GL/dri/dri-def.cpp +++ b/xc/programs/Xserver/GL/dri/dri-def.cpp @@ -47,4 +47,4 @@ DRIUnlock DRIValidateTree DRIWakeupHandler -/* $XFree86: xc/programs/Xserver/GL/dri/dri-def.cpp,v 1.1 2000/08/09 23:40:16 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/programs/Xserver/GL/dri/dri.c b/xc/programs/Xserver/GL/dri/dri.c index 2d1ee7bc9..d13ab96ff 100644 --- a/xc/programs/Xserver/GL/dri/dri.c +++ b/xc/programs/Xserver/GL/dri/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.19 2000/06/25 16:03:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.18 2000/06/23 19:29:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/dri/dri.h b/xc/programs/Xserver/GL/dri/dri.h index e50b6119f..7541a7b5d 100644 --- a/xc/programs/Xserver/GL/dri/dri.h +++ b/xc/programs/Xserver/GL/dri/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.12 2000/06/23 19:29:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.11 2000/06/17 00:03:12 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/dri/drimodule.c b/xc/programs/Xserver/GL/dri/drimodule.c index e4e12df8b..fc3f69a27 100644 --- a/xc/programs/Xserver/GL/dri/drimodule.c +++ b/xc/programs/Xserver/GL/dri/drimodule.c @@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.3 2000/02/23 04:46:52 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.2 2000/01/25 18:37:36 dawes Exp $ */ /* * Authors: diff --git a/xc/programs/Xserver/GL/dri/dristruct.h b/xc/programs/Xserver/GL/dri/dristruct.h index 02d62ae49..d576f40af 100644 --- a/xc/programs/Xserver/GL/dri/dristruct.h +++ b/xc/programs/Xserver/GL/dri/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.8 2000/06/17 00:03:12 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.7 2000/03/02 16:07:38 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/dri/sarea.h b/xc/programs/Xserver/GL/dri/sarea.h index c1054f0a0..b47104dc6 100644 --- a/xc/programs/Xserver/GL/dri/sarea.h +++ b/xc/programs/Xserver/GL/dri/sarea.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.4 2000/02/23 04:46:52 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.3 2000/02/14 06:27:14 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/dri/xf86dri.c b/xc/programs/Xserver/GL/dri/xf86dri.c index 4fd33c2ec..2464ad60a 100644 --- a/xc/programs/Xserver/GL/dri/xf86dri.c +++ b/xc/programs/Xserver/GL/dri/xf86dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.8 2000/06/25 16:03:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.7 2000/06/17 00:03:12 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/glx/Imakefile b/xc/programs/Xserver/GL/glx/Imakefile index be20058f1..becff924c 100644 --- a/xc/programs/Xserver/GL/glx/Imakefile +++ b/xc/programs/Xserver/GL/glx/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.7 2000/02/23 04:46:53 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.7tsi Exp $ #define IHaveModules #include <Server.tmpl> @@ -43,7 +43,7 @@ ModuleObjectRule() NormalLibraryObjectRule() #endif SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(glx,$(OBJS)) +LibraryModuleTarget(glx,$(OBJS)) LintLibraryTarget(glx,$(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/GL/glx/g_disptab.c b/xc/programs/Xserver/GL/glx/g_disptab.c index f05e213f3..ec3c5ed88 100644 --- a/xc/programs/Xserver/GL/glx/g_disptab.c +++ b/xc/programs/Xserver/GL/glx/g_disptab.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.2 1999/06/14 07:31:22 dawes Exp $ */ +/* $XFree86$ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 diff --git a/xc/programs/Xserver/GL/glx/g_disptab.h b/xc/programs/Xserver/GL/glx/g_disptab.h index 247b27ea9..aa9bee2f7 100644 --- a/xc/programs/Xserver/GL/glx/g_disptab.h +++ b/xc/programs/Xserver/GL/glx/g_disptab.h @@ -1,7 +1,7 @@ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_h_ #define _GLX_g_disptab_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.2 1999/06/14 07:31:22 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c index 1ac56e678..4dd2fee00 100644 --- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c +++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.2 1999/06/14 07:31:22 dawes Exp $ */ +/* $XFree86$ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h index 59c7e3024..70efc7c73 100644 --- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h +++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h @@ -1,7 +1,7 @@ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_EXT_h_ #define _GLX_g_disptab_EXT_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.2 1999/06/14 07:31:23 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/g_render.c b/xc/programs/Xserver/GL/glx/g_render.c index d8214d02a..fea2e8a7c 100644 --- a/xc/programs/Xserver/GL/glx/g_render.c +++ b/xc/programs/Xserver/GL/glx/g_render.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.2 1999/03/14 03:21:22 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* by SGI when creating the GLX sample implementation */ /* diff --git a/xc/programs/Xserver/GL/glx/g_renderswap.c b/xc/programs/Xserver/GL/glx/g_renderswap.c index 5b57a07a3..b39a59f36 100644 --- a/xc/programs/Xserver/GL/glx/g_renderswap.c +++ b/xc/programs/Xserver/GL/glx/g_renderswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.2 1999/03/14 03:21:22 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* by SGI when creating the GLX sample implementation */ /* diff --git a/xc/programs/Xserver/GL/glx/g_single.c b/xc/programs/Xserver/GL/glx/g_single.c index e86d68f86..048d7f97e 100644 --- a/xc/programs/Xserver/GL/glx/g_single.c +++ b/xc/programs/Xserver/GL/glx/g_single.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.3 1999/06/14 07:31:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.2 1999/03/14 03:21:23 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* by SGI when creating the GLX sample implementation */ /* diff --git a/xc/programs/Xserver/GL/glx/g_singleswap.c b/xc/programs/Xserver/GL/glx/g_singleswap.c index 98f8631a6..1e6611058 100644 --- a/xc/programs/Xserver/GL/glx/g_singleswap.c +++ b/xc/programs/Xserver/GL/glx/g_singleswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.3 1999/06/14 07:31:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.2 1999/03/14 03:21:23 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* by SGI when creating the GLX sample implementation */ /* diff --git a/xc/programs/Xserver/GL/glx/global.c b/xc/programs/Xserver/GL/glx/global.c index 5a7ae7ff9..129cd78d3 100644 --- a/xc/programs/Xserver/GL/glx/global.c +++ b/xc/programs/Xserver/GL/glx/global.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.2 1999/06/14 07:31:24 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glx-def.cpp b/xc/programs/Xserver/GL/glx/glx-def.cpp index 9f31ecd04..993fffe1e 100644 --- a/xc/programs/Xserver/GL/glx/glx-def.cpp +++ b/xc/programs/Xserver/GL/glx/glx-def.cpp @@ -660,4 +660,4 @@ __glXDispSwap_NewList __glXDispSwap_PixelStoref __glXDispSwap_PixelStorei -/* $XFree86: xc/programs/Xserver/GL/glx/glx-def.cpp,v 1.1 2000/08/10 17:40:29 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/programs/Xserver/GL/glx/glxbuf.c b/xc/programs/Xserver/GL/glx/glxbuf.c index 6c42e588a..c48d2aa13 100644 --- a/xc/programs/Xserver/GL/glx/glxbuf.c +++ b/xc/programs/Xserver/GL/glx/glxbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.3 1999/06/14 07:31:24 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxbuf.h b/xc/programs/Xserver/GL/glx/glxbuf.h index 05cea4a44..b2ad23692 100644 --- a/xc/programs/Xserver/GL/glx/glxbuf.h +++ b/xc/programs/Xserver/GL/glx/glxbuf.h @@ -1,7 +1,7 @@ #ifndef _glxbuf_h_ #define _glxbuf_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.2 1999/06/14 07:31:25 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxcmds.c b/xc/programs/Xserver/GL/glx/glxcmds.c index 64b28a206..6c23fe534 100644 --- a/xc/programs/Xserver/GL/glx/glxcmds.c +++ b/xc/programs/Xserver/GL/glx/glxcmds.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.5 2000/06/17 00:03:12 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxcmdsswap.c b/xc/programs/Xserver/GL/glx/glxcmdsswap.c index 6437c2938..677a81b7b 100644 --- a/xc/programs/Xserver/GL/glx/glxcmdsswap.c +++ b/xc/programs/Xserver/GL/glx/glxcmdsswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.4 1999/07/18 08:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.3 1999/06/14 07:31:25 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxcontext.h b/xc/programs/Xserver/GL/glx/glxcontext.h index c3e353fc7..8c7cac844 100644 --- a/xc/programs/Xserver/GL/glx/glxcontext.h +++ b/xc/programs/Xserver/GL/glx/glxcontext.h @@ -1,7 +1,7 @@ #ifndef _GLX_context_h_ #define _GLX_context_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxdrawable.h b/xc/programs/Xserver/GL/glx/glxdrawable.h index 89fe4dbcb..f6c02ffd9 100644 --- a/xc/programs/Xserver/GL/glx/glxdrawable.h +++ b/xc/programs/Xserver/GL/glx/glxdrawable.h @@ -1,7 +1,7 @@ #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxerror.h b/xc/programs/Xserver/GL/glx/glxerror.h index d6adf95a6..b52361642 100644 --- a/xc/programs/Xserver/GL/glx/glxerror.h +++ b/xc/programs/Xserver/GL/glx/glxerror.h @@ -1,7 +1,7 @@ #ifndef _GLX_error_h_ #define _GLX_error_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.2 1999/06/14 07:31:26 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxext.c b/xc/programs/Xserver/GL/glx/glxext.c index bc09e1c53..51a293ad4 100644 --- a/xc/programs/Xserver/GL/glx/glxext.c +++ b/xc/programs/Xserver/GL/glx/glxext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.4 1999/06/14 07:31:26 dawes Exp $ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.3 1999/04/11 13:10:36 dawes Exp $ ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., diff --git a/xc/programs/Xserver/GL/glx/glxext.h b/xc/programs/Xserver/GL/glx/glxext.h index 543eefcd6..23677b059 100644 --- a/xc/programs/Xserver/GL/glx/glxext.h +++ b/xc/programs/Xserver/GL/glx/glxext.h @@ -1,7 +1,7 @@ #ifndef _glxext_h_ #define _glxext_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.3 1999/06/14 07:31:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.2 1999/04/11 13:10:36 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxfb.c b/xc/programs/Xserver/GL/glx/glxfb.c index 67ea31434..197629148 100644 --- a/xc/programs/Xserver/GL/glx/glxfb.c +++ b/xc/programs/Xserver/GL/glx/glxfb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.2 1999/06/14 07:31:27 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxfb.h b/xc/programs/Xserver/GL/glx/glxfb.h index 9b6022591..f4153f8c1 100644 --- a/xc/programs/Xserver/GL/glx/glxfb.h +++ b/xc/programs/Xserver/GL/glx/glxfb.h @@ -1,7 +1,7 @@ #ifndef _glxfb_h_ #define _glxfb_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.2 1999/06/14 07:31:30 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glximports.c b/xc/programs/Xserver/GL/glx/glximports.c index 2dc836571..160bbadae 100644 --- a/xc/programs/Xserver/GL/glx/glximports.c +++ b/xc/programs/Xserver/GL/glx/glximports.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.3 1999/06/14 07:31:30 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glximports.h b/xc/programs/Xserver/GL/glx/glximports.h index b6a1580c7..4999dff40 100644 --- a/xc/programs/Xserver/GL/glx/glximports.h +++ b/xc/programs/Xserver/GL/glx/glximports.h @@ -1,7 +1,7 @@ #ifndef _glximports_h_ #define _glximports_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.2 1999/06/14 07:31:30 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxmem.c b/xc/programs/Xserver/GL/glx/glxmem.c index 52a60f848..42733133b 100644 --- a/xc/programs/Xserver/GL/glx/glxmem.c +++ b/xc/programs/Xserver/GL/glx/glxmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.3 1999/06/14 07:31:31 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxmem.h b/xc/programs/Xserver/GL/glx/glxmem.h index 1c208a2f5..5f8248102 100644 --- a/xc/programs/Xserver/GL/glx/glxmem.h +++ b/xc/programs/Xserver/GL/glx/glxmem.h @@ -1,7 +1,7 @@ #ifndef _glxmem_h_ #define _glxmem_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.2 1999/06/14 07:31:31 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxpix.c b/xc/programs/Xserver/GL/glx/glxpix.c index 1383263bd..3f55e7058 100644 --- a/xc/programs/Xserver/GL/glx/glxpix.c +++ b/xc/programs/Xserver/GL/glx/glxpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.2 1999/06/14 07:31:31 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxpix.h b/xc/programs/Xserver/GL/glx/glxpix.h index 09a33a80a..ac08ad787 100644 --- a/xc/programs/Xserver/GL/glx/glxpix.h +++ b/xc/programs/Xserver/GL/glx/glxpix.h @@ -1,7 +1,7 @@ #ifndef _glxpix_h_ #define _glxpix_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.2 1999/06/14 07:31:31 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxscreens.c b/xc/programs/Xserver/GL/glx/glxscreens.c index d68bca06e..80f27a222 100644 --- a/xc/programs/Xserver/GL/glx/glxscreens.c +++ b/xc/programs/Xserver/GL/glx/glxscreens.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.4 2000/06/17 00:03:12 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.3 2000/04/05 18:13:28 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxscreens.h b/xc/programs/Xserver/GL/glx/glxscreens.h index 771ecf866..c20b76552 100644 --- a/xc/programs/Xserver/GL/glx/glxscreens.h +++ b/xc/programs/Xserver/GL/glx/glxscreens.h @@ -1,7 +1,7 @@ #ifndef _GLX_screens_h_ #define _GLX_screens_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.2 1999/06/14 07:31:32 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxserver.h b/xc/programs/Xserver/GL/glx/glxserver.h index 80a23ce1a..dbee801d1 100644 --- a/xc/programs/Xserver/GL/glx/glxserver.h +++ b/xc/programs/Xserver/GL/glx/glxserver.h @@ -1,7 +1,7 @@ #ifndef _GLX_server_h_ #define _GLX_server_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.2 1999/06/14 07:31:32 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxutil.c b/xc/programs/Xserver/GL/glx/glxutil.c index c5d33d604..0d1dabc5b 100644 --- a/xc/programs/Xserver/GL/glx/glxutil.c +++ b/xc/programs/Xserver/GL/glx/glxutil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.4 1999/07/18 08:34:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.3 1999/06/14 07:31:32 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/glxutil.h b/xc/programs/Xserver/GL/glx/glxutil.h index d074d77ce..fd98f4264 100644 --- a/xc/programs/Xserver/GL/glx/glxutil.h +++ b/xc/programs/Xserver/GL/glx/glxutil.h @@ -1,7 +1,7 @@ #ifndef _glxcmds_h_ #define _glxcmds_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.2 1999/06/14 07:31:33 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/impsize.h b/xc/programs/Xserver/GL/glx/impsize.h index 597da569e..61fd39b3a 100644 --- a/xc/programs/Xserver/GL/glx/impsize.h +++ b/xc/programs/Xserver/GL/glx/impsize.h @@ -1,7 +1,7 @@ #ifndef _impsize_h_ #define _impsize_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.2 1999/06/14 07:31:33 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/render2.c b/xc/programs/Xserver/GL/glx/render2.c index 01a57411d..386866b83 100644 --- a/xc/programs/Xserver/GL/glx/render2.c +++ b/xc/programs/Xserver/GL/glx/render2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.3 1999/06/14 07:31:33 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/render2swap.c b/xc/programs/Xserver/GL/glx/render2swap.c index 040a24594..57779f2f4 100644 --- a/xc/programs/Xserver/GL/glx/render2swap.c +++ b/xc/programs/Xserver/GL/glx/render2swap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.3 1999/06/14 07:31:33 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/renderpix.c b/xc/programs/Xserver/GL/glx/renderpix.c index bbaab81a9..5f72dae30 100644 --- a/xc/programs/Xserver/GL/glx/renderpix.c +++ b/xc/programs/Xserver/GL/glx/renderpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.3 1999/06/14 07:31:34 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/renderpixswap.c b/xc/programs/Xserver/GL/glx/renderpixswap.c index 51e96844e..7efa9dc00 100644 --- a/xc/programs/Xserver/GL/glx/renderpixswap.c +++ b/xc/programs/Xserver/GL/glx/renderpixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.4 1999/07/18 08:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.3 1999/06/14 07:31:34 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/rensize.c b/xc/programs/Xserver/GL/glx/rensize.c index 484a16eab..0c7146578 100644 --- a/xc/programs/Xserver/GL/glx/rensize.c +++ b/xc/programs/Xserver/GL/glx/rensize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.2 1999/06/14 07:31:34 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/rensizetab.c b/xc/programs/Xserver/GL/glx/rensizetab.c index 229fa3c30..c128bb350 100644 --- a/xc/programs/Xserver/GL/glx/rensizetab.c +++ b/xc/programs/Xserver/GL/glx/rensizetab.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.2 1999/06/14 07:31:34 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/single2.c b/xc/programs/Xserver/GL/glx/single2.c index d62c22a1b..d157a640b 100644 --- a/xc/programs/Xserver/GL/glx/single2.c +++ b/xc/programs/Xserver/GL/glx/single2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.3 1999/06/14 07:31:35 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/single2swap.c b/xc/programs/Xserver/GL/glx/single2swap.c index 3aa1af0f7..f621b00cf 100644 --- a/xc/programs/Xserver/GL/glx/single2swap.c +++ b/xc/programs/Xserver/GL/glx/single2swap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.3 1999/06/14 07:31:35 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/singlepix.c b/xc/programs/Xserver/GL/glx/singlepix.c index 830bdd50c..9fb96cdb8 100644 --- a/xc/programs/Xserver/GL/glx/singlepix.c +++ b/xc/programs/Xserver/GL/glx/singlepix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.3 1999/06/14 07:31:35 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/singlepixswap.c b/xc/programs/Xserver/GL/glx/singlepixswap.c index 39ca57ef4..abd2fe8dc 100644 --- a/xc/programs/Xserver/GL/glx/singlepixswap.c +++ b/xc/programs/Xserver/GL/glx/singlepixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.4 1999/07/18 08:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.3 1999/06/14 07:31:35 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/singlesize.c b/xc/programs/Xserver/GL/glx/singlesize.c index 1cff4c3a7..e2d540888 100644 --- a/xc/programs/Xserver/GL/glx/singlesize.c +++ b/xc/programs/Xserver/GL/glx/singlesize.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.2 1999/06/14 07:31:35 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/singlesize.h b/xc/programs/Xserver/GL/glx/singlesize.h index 97381639a..62764f2d3 100644 --- a/xc/programs/Xserver/GL/glx/singlesize.h +++ b/xc/programs/Xserver/GL/glx/singlesize.h @@ -1,7 +1,7 @@ #ifndef _singlesize_h_ #define _singlesize_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.2 1999/06/14 07:31:36 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/unpack.h b/xc/programs/Xserver/GL/glx/unpack.h index 80a805aab..14a2c72b7 100644 --- a/xc/programs/Xserver/GL/glx/unpack.h +++ b/xc/programs/Xserver/GL/glx/unpack.h @@ -1,7 +1,7 @@ #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.2 1999/06/14 07:31:36 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glx/xfont.c b/xc/programs/Xserver/GL/glx/xfont.c index 8bf6e8116..0e99e1dc3 100644 --- a/xc/programs/Xserver/GL/glx/xfont.c +++ b/xc/programs/Xserver/GL/glx/xfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.2 1999/06/14 07:31:36 dawes Exp $ */ +/* $XFree86$ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/glxmodule.c b/xc/programs/Xserver/GL/glxmodule.c index a874bb6c9..67a947ea3 100644 --- a/xc/programs/Xserver/GL/glxmodule.c +++ b/xc/programs/Xserver/GL/glxmodule.c @@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.9 2000/02/23 04:46:51 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.8 2000/02/18 16:23:12 dawes Exp $ */ /* * Authors: diff --git a/xc/programs/Xserver/GL/include/GL/glx_ansic.h b/xc/programs/Xserver/GL/include/GL/glx_ansic.h index e6ccd3a2f..50b7c39c2 100644 --- a/xc/programs/Xserver/GL/include/GL/glx_ansic.h +++ b/xc/programs/Xserver/GL/include/GL/glx_ansic.h @@ -1,7 +1,7 @@ #ifndef _glx_ansic_h_ #define _glx_ansic_h_ -/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.3 1999/07/11 08:49:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.2 1999/06/14 07:31:40 dawes Exp $ */ /* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/GL/include/GL/xf86glx.h b/xc/programs/Xserver/GL/include/GL/xf86glx.h index 7a467b9b5..08e2a9f6c 100644 --- a/xc/programs/Xserver/GL/include/GL/xf86glx.h +++ b/xc/programs/Xserver/GL/include/GL/xf86glx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/mesa/Imakefile b/xc/programs/Xserver/GL/mesa/Imakefile index 45a2e7721..28e2f0547 100644 --- a/xc/programs/Xserver/GL/mesa/Imakefile +++ b/xc/programs/Xserver/GL/mesa/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.4 2000/02/23 04:46:54 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.3 1999/06/14 14:37:12 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/mesa/include/GL/Imakefile b/xc/programs/Xserver/GL/mesa/include/GL/Imakefile index 03c5ad314..714c07b7d 100644 --- a/xc/programs/Xserver/GL/mesa/include/GL/Imakefile +++ b/xc/programs/Xserver/GL/mesa/include/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.6 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.5 2000/06/30 18:27:01 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/mesa/include/Imakefile b/xc/programs/Xserver/GL/mesa/include/Imakefile index 01129e606..d8c21d470 100644 --- a/xc/programs/Xserver/GL/mesa/include/Imakefile +++ b/xc/programs/Xserver/GL/mesa/include/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/Imakefile,v 1.3 2000/02/23 04:46:54 martin Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/Imakefile,v 1.2 1999/06/14 07:31:41 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp b/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp index 67822f290..f9927a838 100644 --- a/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp +++ b/xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp @@ -1480,4 +1480,4 @@ xmesa_get_line_func xmesa_get_points_func xmesa_get_triangle_func -/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcore-def.cpp,v 1.1 2000/08/10 17:40:29 dawes Exp $ */ +/* $XFree86$ */ diff --git a/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c b/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c index 422da4820..99eb5f533 100644 --- a/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c +++ b/xc/programs/Xserver/GL/mesa/src/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.4 2000/02/18 16:23:12 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/mesa/src/Imakefile b/xc/programs/Xserver/GL/mesa/src/Imakefile index 59b2c4c14..819229991 100644 --- a/xc/programs/Xserver/GL/mesa/src/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.15 2000/08/01 20:28:39 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.14 2000/06/17 00:03:13 martin Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/mesa/src/X/Imakefile b/xc/programs/Xserver/GL/mesa/src/X/Imakefile index 7704ffecc..8a67a4fee 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/X/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.8 2000/08/01 20:28:40 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.7 2000/02/23 04:46:56 martin Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c b/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c index 00e151147..d53ed5a12 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c +++ b/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.9 2000/06/17 00:03:13 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.8 2000/05/23 04:47:36 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c b/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c index ff2654830..b093eb9df 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c +++ b/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c,v 1.5 2000/03/02 16:07:39 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.c,v 1.4 2000/02/23 04:46:57 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h b/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h index 0716d6c7d..30ed501fc 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h +++ b/xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h,v 1.5 2000/08/10 17:40:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx_util.h,v 1.4 2000/03/02 16:07:39 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h b/xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h index c403c00fd..06674fd03 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h +++ b/xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h,v 1.3 2000/02/23 04:46:57 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glxint.h,v 1.2 1999/06/14 07:31:44 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/xc/programs/Xserver/GL/opengl/Imakefile b/xc/programs/Xserver/GL/opengl/Imakefile index ec21bc7f0..420405d9c 100644 --- a/xc/programs/Xserver/GL/opengl/Imakefile +++ b/xc/programs/Xserver/GL/opengl/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/opengl/Imakefile,v 1.2 1999/06/14 07:31:44 dawes Exp $ +XCOMM $XFree86$ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile index bcccf3203..efc467672 100644 --- a/xc/programs/Xserver/Imakefile +++ b/xc/programs/Xserver/Imakefile @@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/249 1997/12/11 11:18:14 kaleb $ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.186 2000/08/11 17:25:02 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.191 2000/08/31 22:47:20 tsi Exp $ #ifndef InstallXserverSetUID #define InstallXserverSetUID NO @@ -46,6 +46,8 @@ INSTPGMFLAGS = #define FbPostFbLibs $(FB) NoMfbPostFbLibs #define FBLibs PreFbLibs FbPostFbLibs +#define MiExtLibs $(SHADOW) + #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs #if BuildPexExt @@ -183,20 +185,24 @@ XPDDXFBLIBS = $(MFB) $(CFB32) XPFBLIBS = dix/LibraryTargetName(xpstubs) #endif +#if BuildRender + RENDERDIR = render + RENDERLIB = $(RENDERDIR)/librender.a +#endif #if DoLoadableServer - EXTENSIONS = $(OTHEREXTS) + EXTENSIONS = $(OTHEREXTS) $(RENDERLIB) LOADABLEEXTS = $(PEXLIBS) $(XIEEXT) $(MISCEXT) $(DBEEXT) $(RECORDEXT) \ $(GLXEXT) MISCEXT = Xext/LibraryTargetName(ext) OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \ $(LBXEXT) $(SITEEXTS) #else - EXTENSIONS = $(OTHEREXTS) $(PEXLIBS) $(GLXEXT) + EXTENSIONS = $(OTHEREXTS) $(PEXLIBS) $(GLXEXT) $(RENDERLIB) OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \ $(XIEEXT) $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS) #endif EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(XIEDIR) $(PEXDIR) $(GLXDIR) \ - $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) + $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) $(RENDERDIR) XAULIB = $(XAUTHSRC)/LibraryTargetName(Xau) XDMCPLIB = $(XDMCPLIBSRC)/LibraryTargetName(Xdmcp) #if BuildLBX || GzipFontCompression @@ -220,6 +226,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs) cfb24/ModuleLibraryTargetName(cfb24) CFB32 = cfb/ModuleLibraryTargetName(cfb) \ cfb32/ModuleLibraryTargetName(cfb32) + SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) #else MFB = mfb/LibraryTargetName(mfb) FB = fb/LibraryTargetName(fb) @@ -230,6 +237,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs) CFB16 = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb16) CFB24 = cfb/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb24) CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb32) + SHADOW = miext/shadow/LibraryTargetName(shadow) #endif #if BuildLowMem LMFCFB = lmfcfb/LibraryTargetName(cfb) @@ -527,16 +535,19 @@ XCOMM #if XF86Server XF86SERVER = XFree86 #endif -#if XnestServer && !MakeDllModules +#if XnestServer XNEST = Xnest #endif -#if XVirtualFramebufferServer && !MakeDllModules +#if XVirtualFramebufferServer XVFB = Xvfb #endif #if XWinServer && !MakeDllModules XWIN = XWin #endif -#if defined(XF86Server) || (!MakeDllModules && (defined(XnestServer) || defined(XVirtualFramebufferServer) || defined(XWinServer))) +#if defined(XF86Server) || \ + defined(XnestServer) || \ + defined(XVirtualFramebufferServer) || \ + (!MakeDllModules && defined(XWinServer)) MakeMutex($(XF86SERVER) $(XNEST) $(XVFB) $(XWIN)) #endif MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32) @@ -553,11 +564,12 @@ CFB8DIR = cfb CFB16DIR = cfb16 CFB24DIR = cfb24 CFB32DIR = cfb32 +SHADOWDIR = miext/shadow #if XF86AFB AFBDIR = afb #endif DDXDIR1 = hw/xfree86 -XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(AFBDIR) $(DDXDIR1) $(DEPDIRS) +XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(AFBDIR) $(SHADOWDIR) $(DDXDIR1) $(DEPDIRS) XF86INIT = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86) XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config) @@ -628,17 +640,16 @@ XF86LIBS = $(XF86INIT) $(XF86COMLIB) $(XF86PARSLIB) $(XF86OSLIB) #endif #if DoLoadableServer XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader) -XF86MAINLIBS = PreFbLibsNoFont $(FONTBASE) $(OTHEREXTS) $(XF86COMLIB) \ +XF86MAINLIBS = MiExtLibs PreFbLibsNoFont $(FONTBASE) $(OTHEREXTS) $(XF86COMLIB) \ NoMfbPostFbLibs XF86SERVERSYSLIBS = $(SYSLIBS) $(LIBDL) $(LIBREGEX) #else -XF86MAINLIBS = AllFBLibs $(XF86COMLIB) $(MI) +XF86MAINLIBS = MiExtLibs AllFBLibs $(XF86COMLIB) $(MI) XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX) #endif XF86SERVEROBJS = $(XF86DRVOBJS) $(XF86IDRVOBJS) XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \ - $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \ - $(XF86DDCLIB) + $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) #if HasParallelMake MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS)) #endif @@ -655,6 +666,7 @@ ServerDriverSDKTarget(XFree86) #endif #endif /* XF86Server */ +#ifdef KDriveXServer XCOMM XCOMM Tiny X server section XCOMM @@ -674,13 +686,14 @@ XCOMM PSEUDO8 = $(KDRIVE)/pseudo8/LibraryTargetName(pseudo8) PSEUDO8DIR = $(KDRIVE)/pseudo8 #endif + SHADOWDIR = miext/shadow KD = $(KDRIVE)/LibraryTargetName(kdrive) KDFBDEV = $(KDRIVE)/fbdev/LibraryTargetName(fbdev) #define StdKdDirs $(KDRIVE) $(KDOSDIR) $(PSEUDO8DIR) fb $(DEPDIRS) #define StdKdSysLibs $(FONTLIBS) $(SYSLIBS) -#define KdLibs $(KD) $(KDOS) $(PSEUDO8) +#define KdLibs $(KD) $(KDOS) $(PSEUDO8) MiExtLibs $(RENDERLIB) #if XfbdevServer XCOMM @@ -764,14 +777,17 @@ XCOMM FBDEVDIR = $(KDRIVE)/fbdev FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + VESADIR = $(KDRIVE)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + SHADOWDIR = miext/shadow TRIDENTDIR = $(KDRIVE)/trident TRIDENT = $(TRIDENTDIR)/LibraryTargetName(trident) KDDIRS = StdKdDirs - TRIDENTDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR) $(TRIDENTDIR) + TRIDENTDIRS = $(STDDIRS) $(KDDIRS) $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) $(TRIDENTDIR) - TRIDENTLIBS = PreFbLibs $(TRIDENT) $(FBDEV) KdLibs FbPostFbLibs + TRIDENTLIBS = PreFbLibs $(TRIDENT) $(FBDEV) $(VESA) KdLibs FbPostFbLibs TRIDENTSYSLIBS = StdKdSysLibs #if HasParallelMake @@ -889,10 +905,38 @@ $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS) ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS),$(ITSYLIBS),$(ITSYSYSLIBS)) #endif /* XItsyServer */ +#if XvesaServer +XCOMM +XCOMM server with vesa driver only based on Keith's server +XCOMM + + VESADIR = $(KDRIVE)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + + KDDIRS = StdKdDirs + + SHADOWDIR = miext/shadow + + VESADIRS = $(STDDIRS) $(KDDIRS) $(VESADIR) $(SHADOWDIR) + + VESALIBS = PreFbLibs $(VESA) KdLibs FbPostFbLibs +VESASYSLIBS = StdKdSysLibs + +#if HasParallelMake +MakeMutex($(VESADIRS) $(VESAOBJS) $(VESALIBS) $(VESASYSLIBS)) +#endif +#if ForceServerRemake +$(VESAOBJS) $(XVESA) $(VESALIBS) $(VESASYSLIBS):: $(VESADIRS) + @if [ -f $@ ]; then touch $@; fi +#endif +ServerTarget(Xvesa,$(VESADIRS),$(VESAOBJS),$(VESALIBS),$(VESASYSLIBS)) +#endif /* XvesaServer */ + KDRIVEDIRS=$(KDDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(SIS530DIR) \ - $(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR) + $(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR) $(VESADIR) +#endif /* KDriveXServer */ -#if XprtServer && !MakeDllModules +#if XprtServer XCOMM XCOMM Print Server XCOMM @@ -925,7 +969,7 @@ $(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS) ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XPSYSLIBS)) #endif /* XprtServer */ -#if XnestServer && !MakeDllModules +#if XnestServer XCOMM XCOMM Server with Xlib-based ddx XCOMM @@ -974,7 +1018,7 @@ Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS) #endif /* XnonServer */ -#if XVirtualFramebufferServer && !MakeDllModules +#if XVirtualFramebufferServer XCOMM XCOMM server with Virtual (malloced) framebuffer XCOMM @@ -1056,10 +1100,11 @@ ServerTarget(XWin,$(XWINDIRS),$(XWINOBJS), \ CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) +MIEXTDIRS = $(SHADOWDIR) IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR) SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \ - $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) + $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) #if defined(ServerToInstall) && !defined(OS2Architecture) && !defined(QNX4Architecture) install:: diff --git a/xc/programs/Xserver/PEX5/Imakefile b/xc/programs/Xserver/PEX5/Imakefile index b0840fd94..facb48bd0 100644 --- a/xc/programs/Xserver/PEX5/Imakefile +++ b/xc/programs/Xserver/PEX5/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/11 1996/12/02 10:18:28 lehors $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/Imakefile,v 3.13 1999/08/14 10:49:24 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/Imakefile,v 3.12 1999/01/03 03:58:17 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h index 5abed9142..f246514cb 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h +++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h,v 1.2 1999/01/31 12:21:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h,v 1.0tsi Exp $ */ /* * font internal format */ diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h index 65edb6b19..31668152f 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h +++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h,v 1.4 1998/10/04 09:34:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h,v 1.3 1998/07/26 09:56:03 dawes Exp $ */ #ifndef MI_LIGHT_H #define MI_LIGHT_H diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h index edf4c13fc..c8623328c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h +++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h @@ -59,8 +59,9 @@ typedef struct { /* concatenate imp. dep. data definitions here */ /* sample server definitions are listed later in this file */ - /* do the following to pad to 64 bit alignment for alpha */ -#if defined(__alpha) || defined(__alpha__) + /* do the following to pad to 64 bit alignment for alpha and ia64 */ +#if defined(__alpha) || defined(__alpha__) || \ + defined(ia64) || defined(__ia64__) ddUSHORT unused0; ddUSHORT unused1; #endif diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h index 8af5996af..9bfbe495a 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h +++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h,v 3.1 1998/10/04 09:34:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h,v 3.0 1995/07/07 15:34:01 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile index 7aa86e3f1..1a91c8714 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/10 1996/09/28 16:54:08 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile,v 3.10 1999/04/17 09:08:15 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile,v 3.10tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -72,7 +72,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ddpex1,$(OBJS)) +LibraryModuleTarget(ddpex1,$(OBJS)) LintLibraryTarget(dp1, $(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c index 68f8a34b2..1e2cd8a7a 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c,v 3.6 1998/10/04 09:34:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c,v 3.5 1998/07/26 13:13:41 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c index 952e5a7d2..a8ee0fcfb 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c,v 3.5 1998/10/04 09:34:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c,v 3.4 1998/07/26 13:13:42 dawes Exp $ */ #include "miRender.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c index 013bdd38d..a7eb240a1 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c,v 3.6 1998/10/04 09:34:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c,v 3.5 1998/07/26 13:13:43 dawes Exp $ */ #define NEED_EVENTS #include "miRender.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c index 0ed05fcee..b03167a26 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c,v 3.5 1998/10/04 09:34:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c,v 3.4 1998/07/26 13:13:44 dawes Exp $ */ #define NEED_EVENTS #include "miRender.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile index b9ed7c86c..2bdd18950 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/8 1996/09/28 16:54:14 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile,v 3.9 1999/04/17 09:08:16 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile,v 3.9tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -108,7 +108,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ddpex2,$(OBJS)) +LibraryModuleTarget(ddpex2,$(OBJS)) LintLibraryTarget(dp2, $(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c index 1322cce00..894340d24 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c @@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c,v 3.5 1998/10/04 09:34:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c,v 3.4 1998/07/26 13:13:45 dawes Exp $ */ #include "miWks.h" #include "miStruct.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c index 9bca71000..023725390 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c,v 3.5 1998/10/04 09:34:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c,v 3.4 1998/07/26 13:13:46 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c index b0f51733d..57df8a497 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c,v 3.6 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c,v 3.5 1998/07/26 13:13:46 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c index 8866cc04f..5fe1792e2 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c,v 3.5 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c,v 3.4 1998/07/26 13:13:46 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c index 65c093643..43e3d5fd1 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c,v 1.7 1998/10/04 09:34:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c,v 1.6 1998/07/26 13:13:47 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c index 477010e66..4cfe3cce0 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c,v 3.6 1998/10/04 09:34:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c,v 3.5 1998/07/26 13:13:47 dawes Exp $ */ #include "ddpex.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c index 1d39115f6..be5879640 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c,v 3.5 1998/10/04 09:34:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c,v 3.4 1998/07/26 13:13:48 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c index 54ef871a7..26b75ae05 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c,v 3.6 1998/10/04 09:34:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c,v 3.5 1998/07/26 13:13:48 dawes Exp $ */ #include "ddpex.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c index a3065b0b2..356232f92 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c,v 1.7 1998/10/04 09:34:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c,v 1.6 1998/07/26 13:13:48 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c index 49f427708..67245fcaa 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c,v 3.5 1998/10/04 09:34:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c,v 3.4 1998/07/26 13:13:49 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c index c422157da..46b2d167c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c,v 3.6 1998/10/04 09:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c,v 3.5 1998/07/26 13:13:49 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c index 30354c1b9..123492d1d 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c,v 3.5 1998/10/04 09:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c,v 3.4 1998/07/26 13:13:50 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c index eaa65e949..1b8a4f912 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.7 2000/04/05 18:13:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c,v 3.6 1998/10/04 09:34:23 dawes Exp $ */ #define TRIMING 1 diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c index f5a2530ef..4b6e1ce2b 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c,v 3.6 1999/01/31 12:21:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c,v 3.5 1998/10/04 09:34:23 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c index 2c9b78133..2ca7a527a 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c,v 3.5 1998/10/04 09:34:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c,v 3.4 1998/07/26 13:13:51 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c index 6183580b6..404d7deae 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c,v 3.6 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c,v 3.5 1998/07/26 13:13:51 dawes Exp $ */ #include "miWks.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c index 7b8d6ff5e..c225815ae 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c,v 3.5 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c,v 3.4 1998/07/26 13:13:51 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c index 7597cd9b6..7c47a78a8 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c,v 3.6 1998/10/04 09:34:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c,v 3.5 1998/07/26 13:13:52 dawes Exp $ */ #include "miLUT.h" #include "ddpex2.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c index febda7820..5b4049614 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c,v 3.6 1998/10/04 09:34:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c,v 3.5 1998/07/26 13:13:52 dawes Exp $ */ #include "ddpex2.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c index 46080f59c..649134322 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c,v 3.6 1998/10/04 09:34:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c,v 3.5 1998/07/26 13:13:52 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c index ab119a907..48662a84c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c,v 3.5 1998/10/04 09:34:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c,v 3.4 1998/07/26 13:13:52 dawes Exp $ */ #include "miWks.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c index 45b415eed..21768e17d 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c,v 3.6 1998/10/04 09:34:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c,v 3.5 1998/07/26 13:13:53 dawes Exp $ */ #include "miLUT.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c index 8c5f041e7..e82a97b4b 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c,v 1.7 1998/10/04 09:34:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c,v 1.6 1998/07/26 13:13:54 dawes Exp $ */ #include "mipex.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c index 5ab54c137..84a4581d5 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c,v 3.5 1998/10/04 09:34:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c,v 3.4 1998/07/26 13:13:54 dawes Exp $ */ #include "miClip.h" #include "misc.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c index 7719736f6..aae744800 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c,v 3.6 1998/10/04 09:34:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c,v 3.5 1998/07/26 13:13:54 dawes Exp $ */ #include "miStruct.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile index d11e1e072..2e8dd498c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/9 1996/09/28 16:54:20 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile,v 3.9 1999/04/17 09:08:16 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile,v 3.9tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -54,7 +54,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ddpex3,$(OBJS)) +LibraryModuleTarget(ddpex3,$(OBJS)) LintLibraryTarget(dp3, $(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c index 037328e10..86f6aca85 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c,v 3.5 1998/10/04 09:34:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c,v 3.4 1998/07/26 13:14:00 dawes Exp $ */ #include "miLUT.h" #include "dipex.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c index 302b33be5..c15833d59 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c @@ -21,7 +21,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/PEX5/ddpex/mi/level3/miRndrPick.c,v 1.8 1999/12/27 00:39:31 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c,v 1.7 1998/10/04 09:34:37 dawes Exp $ */ #include "miLUT.h" #include "ddpex3.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile index 2d81ad09d..2391bdb59 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/11 1996/09/28 16:54:25 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile,v 3.11 1999/07/04 06:38:31 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile,v 3.11tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -72,7 +72,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ddpex4,$(OBJS)) +LibraryModuleTarget(ddpex4,$(OBJS)) LintLibraryTarget(dp4,$(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c index 285f86f1f..a1c2fc64c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c,v 1.8 1999/01/31 12:21:28 dawes Exp $ */ +/* $XFree86$ */ /* * this file contains the element handling procedures for * the execute structure element. It is stored in PEX format diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c index 42363e44f..1c2d01feb 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86$ */ /* * this file contains the element handling procedures for elements * which are stored in the format they are received. This includes diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c index 198f90ce8..fca2e6fdc 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c,v 1.7 1998/10/04 09:34:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c,v 1.6 1998/07/26 13:14:03 dawes Exp $ */ #include "miWks.h" /* miPickMeasureStr is defined in here */ #include "miNS.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c index 4e58e5534..2571ee480 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86$ */ #include "ddpex4.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c index 68ebb9415..698302e1c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c,v 3.5 1998/10/04 09:34:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c,v 3.4 1998/07/26 13:14:03 dawes Exp $ */ #include "mipex.h" #include "ddpex4.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c index 3c4f41952..29ab3227e 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c,v 1.8 1999/01/31 12:21:29 dawes Exp $ */ +/* $XFree86$ */ #include "miWks.h" #include "PEXproto.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c index b94deeb3d..0747978e9 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c,v 1.8 2000/01/26 22:05:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c,v 1.7 1998/10/04 09:34:43 dawes Exp $ */ #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile index 4bb11c1a7..2e60eb23d 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/12 1996/09/28 16:54:42 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile,v 3.11 1999/07/04 06:38:31 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile,v 3.11tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -88,7 +88,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ddpexs,$(OBJS)) +LibraryModuleTarget(ddpexs,$(OBJS)) LintLibraryTarget(dps, $(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c index 51aea512b..75f2e3834 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c,v 1.7 1998/10/04 09:34:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c,v 1.6 1998/07/26 13:14:06 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c index fb8a06ee1..4b72f163d 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c,v 1.7 1998/10/04 09:34:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c,v 1.6 1998/07/26 13:14:06 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c index 4f9a00e81..811f91f0a 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c,v 1.7 1998/10/04 09:34:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c,v 1.6 1998/07/26 13:14:06 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c index d3163a41c..7be3e5a98 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c,v 1.7 1998/10/04 09:34:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c,v 1.6 1998/07/26 13:14:07 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c index b24eab108..5e66b9815 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c,v 3.5 1998/10/04 09:34:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c,v 3.4 1998/07/26 13:14:07 dawes Exp $ */ #include "miFont.h" #include "miLUT.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c index 33bb41b93..7ad3f5cb1 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c,v 1.7 1998/10/04 09:34:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c,v 1.6 1998/07/26 13:14:07 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c index 37b267166..6ef731311 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c,v 1.7 1998/10/04 09:34:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c,v 1.6 1998/07/26 13:14:07 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c index e6d17d0ca..7b08f8908 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c,v 1.9 1999/07/18 08:34:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c,v 1.8 1999/01/31 12:21:30 dawes Exp $ */ #include "miLUT.h" #include "pexUtils.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c index aefec9e48..c56b6d40c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c,v 1.7 1998/10/04 09:34:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c,v 1.6 1998/07/26 13:14:08 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c index 149c91e53..b6b05789b 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c,v 1.7 1998/10/04 09:34:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c,v 1.6 1998/07/26 13:14:08 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c index d9ee160a0..5f438a922 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c,v 1.7 1998/10/04 09:34:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c,v 1.6 1998/07/26 13:14:09 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c index 40cb827c4..7e3fa9e1a 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c,v 1.7 1998/10/04 09:34:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c,v 1.6 1998/07/26 13:14:09 dawes Exp $ */ #include "mipex.h" #include "miInfo.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c index fb745162e..cb25940b8 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c,v 1.8 1999/01/31 12:21:31 dawes Exp $ */ +/* $XFree86$ */ #include "mipex.h" #include "miNS.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c index ccf236de3..c42f7789c 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c,v 1.7 1998/10/04 09:34:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c,v 1.6 1998/07/26 13:14:09 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c index 0f0b0af19..4f580c9bc 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c,v 1.7 1998/10/04 09:34:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c,v 1.6 1998/07/26 13:14:10 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c index ae716fd41..e38c0eff0 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c,v 1.7 1998/10/04 09:34:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c,v 1.6 1998/07/26 13:14:10 dawes Exp $ */ #include "mipex.h" #include "PEX.h" diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c index 3f5c13f89..b9fcdf925 100644 --- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c +++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c,v 1.7 1998/10/04 09:34:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c,v 1.6 1998/07/26 13:14:10 dawes Exp $ */ #include "miLUT.h" #include "miWks.h" diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile b/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile index d6ba88f2c..256909d39 100644 --- a/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile +++ b/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/8 1996/09/28 16:54:48 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile,v 3.11 1999/04/17 09:08:18 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile,v 3.11tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium. @@ -59,7 +59,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(didipex,$(OBJS)) +LibraryModuleTarget(didipex,$(OBJS)) LintLibraryTarget(dsp,$(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c index 4b9b78a6d..54835ff57 100644 --- a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c +++ b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c,v 3.18 1998/12/20 11:57:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c,v 3.17 1998/10/04 09:34:58 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c b/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c index 2d991aede..f1df13bd2 100644 --- a/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c +++ b/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c,v 3.6 1998/10/04 09:34:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c,v 3.5 1998/07/26 13:14:14 dawes Exp $ */ #include "ddpex.h" #include "pexUtils.h" diff --git a/xc/programs/Xserver/PEX5/dipex/objects/Imakefile b/xc/programs/Xserver/PEX5/dipex/objects/Imakefile index e94e8ce42..0e0807430 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/Imakefile +++ b/xc/programs/Xserver/PEX5/dipex/objects/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/13 1996/09/28 16:54:53 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/objects/Imakefile,v 3.14 1999/07/04 06:38:32 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/objects/Imakefile,v 3.14tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -59,7 +59,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(diobpex,$(OBJS)) +LibraryModuleTarget(diobpex,$(OBJS)) LintLibraryTarget(obj,$(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c b/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c index 9831847e7..72c8858dc 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexFont.c,v 3.7 1998/10/04 09:35:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexFont.c,v 3.6 1998/07/26 13:14:15 dawes Exp $ */ /*++ pexFont.c diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c b/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c index be7fae4de..ba0c14168 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c,v 1.7 1998/10/04 09:35:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c,v 1.6 1998/07/26 13:14:15 dawes Exp $ */ /*++ pexInfo.c diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c b/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c index c383df562..e9fbcaf4c 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexLut.c,v 3.7 1999/01/31 12:21:31 dawes Exp $ */ +/* $XFree86$ */ /*++ diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c b/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c index c79758f62..67c64c8cd 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexNs.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c index 59e74b79d..88596e47c 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPc.c,v 3.5 1998/10/04 09:35:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPc.c,v 3.4 1998/07/26 13:14:16 dawes Exp $ */ /*++ diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c index c8cbfd218..4aaada6d5 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86$ */ /*++ diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c index a616ccdb9..376d2b6b8 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexPick.c,v 3.6 1999/01/31 12:21:32 dawes Exp $ */ +/* $XFree86$ */ /*++ diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c b/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c index d5840c5cd..ba6bd3c2d 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c,v 3.6 1998/10/04 09:35:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c,v 3.5 1998/07/26 13:14:17 dawes Exp $ */ /*++ * PEXCreateRenderer diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c b/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c index 96fbf800f..84b72172a 100644 --- a/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c +++ b/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexSc.c,v 3.5 1998/10/04 09:35:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/dipex/objects/pexSc.c,v 3.4 1998/07/26 13:14:18 dawes Exp $ */ /*++ diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Imakefile b/xc/programs/Xserver/PEX5/dipex/swap/Imakefile index 8a819d35c..a9f46b3a3 100644 --- a/xc/programs/Xserver/PEX5/dipex/swap/Imakefile +++ b/xc/programs/Xserver/PEX5/dipex/swap/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/13 1996/09/28 16:55:03 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/swap/Imakefile,v 3.9 1999/04/17 09:08:19 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/dipex/swap/Imakefile,v 3.9tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -61,7 +61,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(diswapex,$(OBJS)) +LibraryModuleTarget(diswapex,$(OBJS)) LintLibraryTarget(dsw,$(SRCS)) NormalLintTarget($(SRCS)) diff --git a/xc/programs/Xserver/PEX5/include/pexos.h b/xc/programs/Xserver/PEX5/include/pexos.h index 95680de58..bfd7ebb4a 100644 --- a/xc/programs/Xserver/PEX5/include/pexos.h +++ b/xc/programs/Xserver/PEX5/include/pexos.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/PEX5/include/pexos.h,v 1.2 1999/01/31 12:21:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/include/pexos.h,v 1.1 1998/07/26 13:14:26 dawes Exp $ */ /* * This file contains all external OS/ANSI header includes, prototypes and diff --git a/xc/programs/Xserver/PEX5/ospex/Imakefile b/xc/programs/Xserver/PEX5/ospex/Imakefile index 55bda1ea2..3f40bf4bd 100644 --- a/xc/programs/Xserver/PEX5/ospex/Imakefile +++ b/xc/programs/Xserver/PEX5/ospex/Imakefile @@ -1,6 +1,6 @@ XCOMM XCOMM $XConsortium: Imakefile /main/8 1996/09/28 16:55:19 rws $ -XCOMM $XFree86: xc/programs/Xserver/PEX5/ospex/Imakefile,v 3.13 1999/07/04 06:38:33 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/PEX5/ospex/Imakefile,v 3.13tsi Exp $ XCOMM XCOMM XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium @@ -70,7 +70,7 @@ ModuleObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryTarget(ospex,$(OBJS)) +LibraryModuleTarget(ospex,$(OBJS)) SpecialCObjectRule(osPexFont,$(ICONFIGFILES),NullParameter) diff --git a/xc/programs/Xserver/PEX5/ospex/osPexFont.c b/xc/programs/Xserver/PEX5/ospex/osPexFont.c index bde39bbbb..ae17a0408 100644 --- a/xc/programs/Xserver/PEX5/ospex/osPexFont.c +++ b/xc/programs/Xserver/PEX5/ospex/osPexFont.c @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/PEX5/ospex/osPexFont.c,v 3.16 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/ospex/osPexFont.c,v 3.15 1998/10/04 09:35:23 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ diff --git a/xc/programs/Xserver/PEX5/pexmodule.c b/xc/programs/Xserver/PEX5/pexmodule.c index 88a549596..2287d4aca 100644 --- a/xc/programs/Xserver/PEX5/pexmodule.c +++ b/xc/programs/Xserver/PEX5/pexmodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/PEX5/pexmodule.c,v 1.6 2000/01/25 18:37:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/PEX5/pexmodule.c,v 1.5 1999/01/26 05:53:47 dawes Exp $ */ #include "xf86Module.h" #include "PEX.h" diff --git a/xc/programs/Xserver/XIE/Imakefile b/xc/programs/Xserver/XIE/Imakefile index b816f1dc4..e87b4e801 100644 --- a/xc/programs/Xserver/XIE/Imakefile +++ b/xc/programs/Xserver/XIE/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.3 93/11/07 10:56:36 rws Exp $ -XCOMM $XFree86: xc/programs/Xserver/XIE/Imakefile,v 3.16 1999/08/14 10:49:24 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/Imakefile,v 3.15 1999/03/21 13:18:16 dawes Exp $ #define IHaveModules #include <Server.tmpl> diff --git a/xc/programs/Xserver/XIE/dixie/Imakefile b/xc/programs/Xserver/XIE/dixie/Imakefile index edb80d861..29e090dbc 100644 --- a/xc/programs/Xserver/XIE/dixie/Imakefile +++ b/xc/programs/Xserver/XIE/dixie/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1995/12/07 21:15:29 gildea $ -XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/Imakefile,v 3.14 1999/04/29 09:13:37 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/Imakefile,v 3.14tsi Exp $ XCOMM build dixie archive #define IHaveModules @@ -20,7 +20,7 @@ MakeMutex($(SUBDIRS) $(OBJS) $(DONES)) $(DONES): $(SUBDIRS) #endif -NormalDepLibraryTarget(dixie,$(SUBDIRS) $(DONES),$(OBJS)) +DepLibraryModuleTarget(dixie,$(SUBDIRS) $(DONES),$(OBJS)) ForceSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/XIE/dixie/export/Imakefile b/xc/programs/Xserver/XIE/dixie/export/Imakefile index ee98f587a..775d4d0cc 100644 --- a/xc/programs/Xserver/XIE/dixie/export/Imakefile +++ b/xc/programs/Xserver/XIE/dixie/export/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:55:25 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/export/Imakefile,v 3.5 1998/07/25 08:05:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/export/Imakefile,v 3.4.2.1 1998/06/03 15:49:33 dawes Exp $ XCOMM build device independent export element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/dixie/export/echist.c b/xc/programs/Xserver/XIE/dixie/export/echist.c index 00e4028ad..189d6d557 100644 --- a/xc/programs/Xserver/XIE/dixie/export/echist.c +++ b/xc/programs/Xserver/XIE/dixie/export/echist.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/echist.c,v 3.3 1998/10/25 07:11:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/echist.c,v 3.2 1998/10/05 13:22:03 dawes Exp $ */ #define _XIEC_ECHIST diff --git a/xc/programs/Xserver/XIE/dixie/export/eclut.c b/xc/programs/Xserver/XIE/dixie/export/eclut.c index ef92f77f5..f5bdf69eb 100644 --- a/xc/programs/Xserver/XIE/dixie/export/eclut.c +++ b/xc/programs/Xserver/XIE/dixie/export/eclut.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eclut.c,v 3.3 1998/10/25 07:11:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eclut.c,v 3.2 1998/10/05 13:22:03 dawes Exp $ */ #define _XIEC_ECLUT diff --git a/xc/programs/Xserver/XIE/dixie/export/ecphoto.c b/xc/programs/Xserver/XIE/dixie/export/ecphoto.c index 6c6304c1b..fc367eb41 100644 --- a/xc/programs/Xserver/XIE/dixie/export/ecphoto.c +++ b/xc/programs/Xserver/XIE/dixie/export/ecphoto.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecphoto.c,v 3.4 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecphoto.c,v 3.3 1998/10/05 13:22:03 dawes Exp $ */ #define _XIEC_ECPHOTO diff --git a/xc/programs/Xserver/XIE/dixie/export/ecroi.c b/xc/programs/Xserver/XIE/dixie/export/ecroi.c index 9dac44906..cb0a6a10b 100644 --- a/xc/programs/Xserver/XIE/dixie/export/ecroi.c +++ b/xc/programs/Xserver/XIE/dixie/export/ecroi.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecroi.c,v 3.3 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ecroi.c,v 3.2 1998/10/05 13:22:04 dawes Exp $ */ #define _XIEC_ECROI diff --git a/xc/programs/Xserver/XIE/dixie/export/edraw.c b/xc/programs/Xserver/XIE/dixie/export/edraw.c index 7b5663fa6..d3feddabc 100644 --- a/xc/programs/Xserver/XIE/dixie/export/edraw.c +++ b/xc/programs/Xserver/XIE/dixie/export/edraw.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edraw.c,v 3.3 1998/10/25 07:11:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edraw.c,v 3.2 1998/10/05 13:22:04 dawes Exp $ */ #define _XIEC_EDRAW diff --git a/xc/programs/Xserver/XIE/dixie/export/edrawp.c b/xc/programs/Xserver/XIE/dixie/export/edrawp.c index 93168c21f..b8428e881 100644 --- a/xc/programs/Xserver/XIE/dixie/export/edrawp.c +++ b/xc/programs/Xserver/XIE/dixie/export/edrawp.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edrawp.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/edrawp.c,v 3.2 1998/10/05 13:22:04 dawes Exp $ */ #define _XIEC_EDRAWP diff --git a/xc/programs/Xserver/XIE/dixie/export/elut.c b/xc/programs/Xserver/XIE/dixie/export/elut.c index 1791c58fc..e4d4b9bb9 100644 --- a/xc/programs/Xserver/XIE/dixie/export/elut.c +++ b/xc/programs/Xserver/XIE/dixie/export/elut.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/elut.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/elut.c,v 3.2 1998/10/05 13:22:05 dawes Exp $ */ #define _XIEC_ELUT diff --git a/xc/programs/Xserver/XIE/dixie/export/ephoto.c b/xc/programs/Xserver/XIE/dixie/export/ephoto.c index 43f3956bb..452a001ee 100644 --- a/xc/programs/Xserver/XIE/dixie/export/ephoto.c +++ b/xc/programs/Xserver/XIE/dixie/export/ephoto.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley && Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ephoto.c,v 3.4 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/ephoto.c,v 3.3 1998/10/05 13:22:05 dawes Exp $ */ #define _XIEC_EPHOTO diff --git a/xc/programs/Xserver/XIE/dixie/export/eroi.c b/xc/programs/Xserver/XIE/dixie/export/eroi.c index 2bfe17e56..9c790ea48 100644 --- a/xc/programs/Xserver/XIE/dixie/export/eroi.c +++ b/xc/programs/Xserver/XIE/dixie/export/eroi.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eroi.c,v 3.3 1998/10/25 07:11:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/export/eroi.c,v 3.2 1998/10/05 13:22:05 dawes Exp $ */ #define _XIEC_EROI diff --git a/xc/programs/Xserver/XIE/dixie/import/Imakefile b/xc/programs/Xserver/XIE/dixie/import/Imakefile index b318d454e..fe7245a20 100644 --- a/xc/programs/Xserver/XIE/dixie/import/Imakefile +++ b/xc/programs/Xserver/XIE/dixie/import/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:55:32 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/import/Imakefile,v 3.5 1998/07/25 08:05:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/import/Imakefile,v 3.4.2.1 1998/06/03 15:49:33 dawes Exp $ XCOMM build device independent import element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/dixie/import/iclut.c b/xc/programs/Xserver/XIE/dixie/import/iclut.c index 79ce30973..8599631e9 100644 --- a/xc/programs/Xserver/XIE/dixie/import/iclut.c +++ b/xc/programs/Xserver/XIE/dixie/import/iclut.c @@ -68,7 +68,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iclut.c,v 3.3 1998/10/25 07:11:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iclut.c,v 3.2 1998/10/05 13:22:06 dawes Exp $ */ #define _XIEC_ICLUT diff --git a/xc/programs/Xserver/XIE/dixie/import/icphoto.c b/xc/programs/Xserver/XIE/dixie/import/icphoto.c index 817d7e552..a9ff3a5ae 100644 --- a/xc/programs/Xserver/XIE/dixie/import/icphoto.c +++ b/xc/programs/Xserver/XIE/dixie/import/icphoto.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icphoto.c,v 3.3 1998/10/25 07:11:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icphoto.c,v 3.2 1998/10/05 13:22:07 dawes Exp $ */ #define _XIEC_ICPHOTO diff --git a/xc/programs/Xserver/XIE/dixie/import/icroi.c b/xc/programs/Xserver/XIE/dixie/import/icroi.c index c9fe8f313..0cb0255ab 100644 --- a/xc/programs/Xserver/XIE/dixie/import/icroi.c +++ b/xc/programs/Xserver/XIE/dixie/import/icroi.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icroi.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/icroi.c,v 3.2 1998/10/05 13:22:07 dawes Exp $ */ #define _XIEC_ICROI diff --git a/xc/programs/Xserver/XIE/dixie/import/idraw.c b/xc/programs/Xserver/XIE/dixie/import/idraw.c index efe0e742d..b82d9051a 100644 --- a/xc/programs/Xserver/XIE/dixie/import/idraw.c +++ b/xc/programs/Xserver/XIE/dixie/import/idraw.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idraw.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idraw.c,v 3.2 1998/10/05 13:22:07 dawes Exp $ */ #define _XIEC_IDRAW diff --git a/xc/programs/Xserver/XIE/dixie/import/idrawp.c b/xc/programs/Xserver/XIE/dixie/import/idrawp.c index fa04024b7..6e0550ce6 100644 --- a/xc/programs/Xserver/XIE/dixie/import/idrawp.c +++ b/xc/programs/Xserver/XIE/dixie/import/idrawp.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idrawp.c,v 3.3 1998/10/25 07:11:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/idrawp.c,v 3.2 1998/10/05 13:22:08 dawes Exp $ */ #define _XIEC_IDRAWP diff --git a/xc/programs/Xserver/XIE/dixie/import/ilut.c b/xc/programs/Xserver/XIE/dixie/import/ilut.c index ed260abd6..93415f6dd 100644 --- a/xc/programs/Xserver/XIE/dixie/import/ilut.c +++ b/xc/programs/Xserver/XIE/dixie/import/ilut.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/ilut.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/ilut.c,v 3.2 1998/10/05 13:22:08 dawes Exp $ */ #define _XIEC_ILUT diff --git a/xc/programs/Xserver/XIE/dixie/import/iphoto.c b/xc/programs/Xserver/XIE/dixie/import/iphoto.c index 9102e6f95..d76c58195 100644 --- a/xc/programs/Xserver/XIE/dixie/import/iphoto.c +++ b/xc/programs/Xserver/XIE/dixie/import/iphoto.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iphoto.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iphoto.c,v 3.2 1998/10/05 13:22:08 dawes Exp $ */ #define _XIEC_IPHOTO diff --git a/xc/programs/Xserver/XIE/dixie/import/iroi.c b/xc/programs/Xserver/XIE/dixie/import/iroi.c index 0a7452457..e41b29091 100644 --- a/xc/programs/Xserver/XIE/dixie/import/iroi.c +++ b/xc/programs/Xserver/XIE/dixie/import/iroi.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iroi.c,v 3.3 1998/10/25 07:11:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/import/iroi.c,v 3.2 1998/10/05 13:22:08 dawes Exp $ */ #define _XIEC_IROI diff --git a/xc/programs/Xserver/XIE/dixie/process/Imakefile b/xc/programs/Xserver/XIE/dixie/process/Imakefile index d1174931f..b1b41119f 100644 --- a/xc/programs/Xserver/XIE/dixie/process/Imakefile +++ b/xc/programs/Xserver/XIE/dixie/process/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:55:42 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/process/Imakefile,v 3.5 1998/07/25 08:05:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/process/Imakefile,v 3.4.2.1 1998/06/03 15:49:34 dawes Exp $ XCOMM build device independent processing element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/dixie/process/parith.c b/xc/programs/Xserver/XIE/dixie/process/parith.c index e416acb66..cd8c7163b 100644 --- a/xc/programs/Xserver/XIE/dixie/process/parith.c +++ b/xc/programs/Xserver/XIE/dixie/process/parith.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/parith.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/parith.c,v 3.2 1998/10/05 13:22:10 dawes Exp $ */ #define _XIEC_PARITH diff --git a/xc/programs/Xserver/XIE/dixie/process/pbandc.c b/xc/programs/Xserver/XIE/dixie/process/pbandc.c index 278517ba9..8ca7ee147 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pbandc.c +++ b/xc/programs/Xserver/XIE/dixie/process/pbandc.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbandc.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbandc.c,v 3.2 1998/10/05 13:22:10 dawes Exp $ */ #define _XIEC_PBANDC diff --git a/xc/programs/Xserver/XIE/dixie/process/pbande.c b/xc/programs/Xserver/XIE/dixie/process/pbande.c index 47a03fe33..4cd106c78 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pbande.c +++ b/xc/programs/Xserver/XIE/dixie/process/pbande.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbande.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbande.c,v 3.2 1998/10/05 13:22:10 dawes Exp $ */ #define _XIEC_PBANDE diff --git a/xc/programs/Xserver/XIE/dixie/process/pbands.c b/xc/programs/Xserver/XIE/dixie/process/pbands.c index a6d3d8d3f..41d4af4d0 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pbands.c +++ b/xc/programs/Xserver/XIE/dixie/process/pbands.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbands.c,v 3.3 1998/10/25 07:11:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pbands.c,v 3.2 1998/10/05 13:22:11 dawes Exp $ */ #define _XIEC_PBANDS diff --git a/xc/programs/Xserver/XIE/dixie/process/pblend.c b/xc/programs/Xserver/XIE/dixie/process/pblend.c index 281a12baa..99d05f01a 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pblend.c +++ b/xc/programs/Xserver/XIE/dixie/process/pblend.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pblend.c,v 3.3 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pblend.c,v 3.2 1998/10/05 13:22:11 dawes Exp $ */ #define _XIEC_PBLEND diff --git a/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c b/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c index 7a49cc5f9..a77e369e0 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c +++ b/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfrgb.c,v 3.4 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfrgb.c,v 3.3 1998/10/05 13:22:11 dawes Exp $ */ #define _XIEC_PCFRGB diff --git a/xc/programs/Xserver/XIE/dixie/process/pcfromi.c b/xc/programs/Xserver/XIE/dixie/process/pcfromi.c index b62be2216..5abbe16f6 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pcfromi.c +++ b/xc/programs/Xserver/XIE/dixie/process/pcfromi.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfromi.c,v 3.3 1998/10/25 07:11:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcfromi.c,v 3.2 1998/10/05 13:22:11 dawes Exp $ */ #define _XIEC_PCFROMI #define _XIEC_PCI diff --git a/xc/programs/Xserver/XIE/dixie/process/pcnst.c b/xc/programs/Xserver/XIE/dixie/process/pcnst.c index 9df55d1e0..7fcbb93b5 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pcnst.c +++ b/xc/programs/Xserver/XIE/dixie/process/pcnst.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcnst.c,v 3.4 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcnst.c,v 3.3 1998/10/05 13:22:12 dawes Exp $ */ #define _XIEC_PCNST diff --git a/xc/programs/Xserver/XIE/dixie/process/pcomp.c b/xc/programs/Xserver/XIE/dixie/process/pcomp.c index 27f377041..0c8fea6b4 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pcomp.c +++ b/xc/programs/Xserver/XIE/dixie/process/pcomp.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcomp.c,v 3.3 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pcomp.c,v 3.2 1998/10/05 13:22:12 dawes Exp $ */ #define _XIEC_PCOMP diff --git a/xc/programs/Xserver/XIE/dixie/process/pconv.c b/xc/programs/Xserver/XIE/dixie/process/pconv.c index efed241b1..73b9412ed 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pconv.c +++ b/xc/programs/Xserver/XIE/dixie/process/pconv.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pconv.c,v 3.4 1998/10/25 07:11:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pconv.c,v 3.3 1998/10/05 13:22:12 dawes Exp $ */ #define _XIEC_PCONV diff --git a/xc/programs/Xserver/XIE/dixie/process/pctoi.c b/xc/programs/Xserver/XIE/dixie/process/pctoi.c index 8301e5167..f7e519d2a 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pctoi.c +++ b/xc/programs/Xserver/XIE/dixie/process/pctoi.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctoi.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctoi.c,v 3.3 1998/10/05 13:22:13 dawes Exp $ */ #define _XIEC_PCTOI #define _XIEC_PCI diff --git a/xc/programs/Xserver/XIE/dixie/process/pctrgb.c b/xc/programs/Xserver/XIE/dixie/process/pctrgb.c index a9f1b24bf..e89b92630 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pctrgb.c +++ b/xc/programs/Xserver/XIE/dixie/process/pctrgb.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctrgb.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pctrgb.c,v 3.3 1998/10/05 13:22:13 dawes Exp $ */ #define _XIEC_PCTRGB diff --git a/xc/programs/Xserver/XIE/dixie/process/pdither.c b/xc/programs/Xserver/XIE/dixie/process/pdither.c index cbd455cdc..c4a66bf50 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pdither.c +++ b/xc/programs/Xserver/XIE/dixie/process/pdither.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pdither.c,v 3.3 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pdither.c,v 3.2 1998/10/05 13:22:13 dawes Exp $ */ #define _XIEC_PDITHER diff --git a/xc/programs/Xserver/XIE/dixie/process/pgeom.c b/xc/programs/Xserver/XIE/dixie/process/pgeom.c index 72304824b..e70fa4b88 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pgeom.c +++ b/xc/programs/Xserver/XIE/dixie/process/pgeom.c @@ -66,7 +66,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pgeom.c,v 3.4 1998/10/25 07:11:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pgeom.c,v 3.3 1998/10/05 13:22:14 dawes Exp $ */ #define _XIEC_PGEOM diff --git a/xc/programs/Xserver/XIE/dixie/process/phist.c b/xc/programs/Xserver/XIE/dixie/process/phist.c index 9605a4416..9c6c52ed9 100644 --- a/xc/programs/Xserver/XIE/dixie/process/phist.c +++ b/xc/programs/Xserver/XIE/dixie/process/phist.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/phist.c,v 3.4 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/phist.c,v 3.3 1998/10/05 13:22:14 dawes Exp $ */ #define _XIEC_PHIST diff --git a/xc/programs/Xserver/XIE/dixie/process/plogic.c b/xc/programs/Xserver/XIE/dixie/process/plogic.c index 0c339cfa2..975d162f1 100644 --- a/xc/programs/Xserver/XIE/dixie/process/plogic.c +++ b/xc/programs/Xserver/XIE/dixie/process/plogic.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/plogic.c,v 3.3 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/plogic.c,v 3.2 1998/10/05 13:22:14 dawes Exp $ */ #define _XIEC_PLOGIC diff --git a/xc/programs/Xserver/XIE/dixie/process/pmath.c b/xc/programs/Xserver/XIE/dixie/process/pmath.c index 44b0ef0b5..fea6789c3 100644 --- a/xc/programs/Xserver/XIE/dixie/process/pmath.c +++ b/xc/programs/Xserver/XIE/dixie/process/pmath.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pmath.c,v 3.3 1998/10/25 07:11:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/pmath.c,v 3.2 1998/10/05 13:22:14 dawes Exp $ */ #define _XIEC_PMATH diff --git a/xc/programs/Xserver/XIE/dixie/process/ppaste.c b/xc/programs/Xserver/XIE/dixie/process/ppaste.c index 43af9c9d5..790e4592f 100644 --- a/xc/programs/Xserver/XIE/dixie/process/ppaste.c +++ b/xc/programs/Xserver/XIE/dixie/process/ppaste.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppaste.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppaste.c,v 3.2 1998/10/05 13:22:15 dawes Exp $ */ #define _XIEC_PPASTE diff --git a/xc/programs/Xserver/XIE/dixie/process/ppoint.c b/xc/programs/Xserver/XIE/dixie/process/ppoint.c index 0c584faa7..3a67ba440 100644 --- a/xc/programs/Xserver/XIE/dixie/process/ppoint.c +++ b/xc/programs/Xserver/XIE/dixie/process/ppoint.c @@ -67,7 +67,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppoint.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/ppoint.c,v 3.2 1998/10/05 13:22:15 dawes Exp $ */ #define _XIEC_PPOINT #define _XIEC_POINT diff --git a/xc/programs/Xserver/XIE/dixie/process/puncnst.c b/xc/programs/Xserver/XIE/dixie/process/puncnst.c index 73783224b..8c72087c2 100644 --- a/xc/programs/Xserver/XIE/dixie/process/puncnst.c +++ b/xc/programs/Xserver/XIE/dixie/process/puncnst.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. May 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/process/puncnst.c,v 3.3 1998/10/25 07:11:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/process/puncnst.c,v 3.2 1998/10/05 13:22:15 dawes Exp $ */ #define _XIEC_PUNCNST diff --git a/xc/programs/Xserver/XIE/dixie/request/Imakefile b/xc/programs/Xserver/XIE/dixie/request/Imakefile index d79d130dc..6f989ef30 100644 --- a/xc/programs/Xserver/XIE/dixie/request/Imakefile +++ b/xc/programs/Xserver/XIE/dixie/request/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:55:47 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/request/Imakefile,v 3.7 1998/07/25 08:05:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/dixie/request/Imakefile,v 3.6.2.1 1998/06/03 15:49:34 dawes Exp $ XCOMM build device independent request objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/dixie/request/colorlst.c b/xc/programs/Xserver/XIE/dixie/request/colorlst.c index 964c51a26..31446f4c4 100644 --- a/xc/programs/Xserver/XIE/dixie/request/colorlst.c +++ b/xc/programs/Xserver/XIE/dixie/request/colorlst.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. March, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/colorlst.c,v 3.3 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/colorlst.c,v 3.2 1998/10/05 13:22:18 dawes Exp $ */ #define _XIEC_COLORLST diff --git a/xc/programs/Xserver/XIE/dixie/request/difloat.c b/xc/programs/Xserver/XIE/dixie/request/difloat.c index 93b1d224a..d35d195c4 100644 --- a/xc/programs/Xserver/XIE/dixie/request/difloat.c +++ b/xc/programs/Xserver/XIE/dixie/request/difloat.c @@ -67,7 +67,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/difloat.c,v 1.6 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/difloat.c,v 1.5 1998/10/06 10:35:14 dawes Exp $ */ #ifndef XIE_IEEE_IS_NATIVE #define _XIEC_DIFLOAT diff --git a/xc/programs/Xserver/XIE/dixie/request/error.c b/xc/programs/Xserver/XIE/dixie/request/error.c index cb823ffdb..7e1141557 100644 --- a/xc/programs/Xserver/XIE/dixie/request/error.c +++ b/xc/programs/Xserver/XIE/dixie/request/error.c @@ -61,7 +61,7 @@ terms and conditions: Title to this software shall at all times remain with AGE Logic, Inc. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/error.c,v 3.3 1998/10/10 15:25:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/error.c,v 3.2 1998/10/05 13:22:18 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/dixie/request/event.c b/xc/programs/Xserver/XIE/dixie/request/event.c index 3e5e84f56..0c57a69e7 100644 --- a/xc/programs/Xserver/XIE/dixie/request/event.c +++ b/xc/programs/Xserver/XIE/dixie/request/event.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/event.c,v 3.3 1998/10/25 07:11:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/event.c,v 3.2 1998/10/05 13:22:19 dawes Exp $ */ #define _XIEC_EVENT diff --git a/xc/programs/Xserver/XIE/dixie/request/flo.c b/xc/programs/Xserver/XIE/dixie/request/flo.c index 5e1009849..4f904930d 100644 --- a/xc/programs/Xserver/XIE/dixie/request/flo.c +++ b/xc/programs/Xserver/XIE/dixie/request/flo.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/flo.c,v 3.4 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/flo.c,v 3.3 1998/10/05 13:22:19 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/dixie/request/lut.c b/xc/programs/Xserver/XIE/dixie/request/lut.c index 730c0bbfc..d76dec4c1 100644 --- a/xc/programs/Xserver/XIE/dixie/request/lut.c +++ b/xc/programs/Xserver/XIE/dixie/request/lut.c @@ -60,7 +60,7 @@ terms and conditions: Title to this software shall at all times remain with AGE Logic, Inc. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/lut.c,v 3.3 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/lut.c,v 3.2 1998/10/05 13:22:19 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/dixie/request/memory.c b/xc/programs/Xserver/XIE/dixie/request/memory.c index 0584d7e4e..63364eb9a 100644 --- a/xc/programs/Xserver/XIE/dixie/request/memory.c +++ b/xc/programs/Xserver/XIE/dixie/request/memory.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc., April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/memory.c,v 3.5 1998/10/25 07:11:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/memory.c,v 3.4 1998/10/05 13:22:20 dawes Exp $ */ #define _XIEC_MEMORY diff --git a/xc/programs/Xserver/XIE/dixie/request/photomap.c b/xc/programs/Xserver/XIE/dixie/request/photomap.c index edf8404e5..662c5883d 100644 --- a/xc/programs/Xserver/XIE/dixie/request/photomap.c +++ b/xc/programs/Xserver/XIE/dixie/request/photomap.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/photomap.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/photomap.c,v 3.2 1998/10/05 13:22:20 dawes Exp $ */ #define _XIEC_PHOTOMAP diff --git a/xc/programs/Xserver/XIE/dixie/request/protoflo.c b/xc/programs/Xserver/XIE/dixie/request/protoflo.c index 7322e58c2..5ae3f0421 100644 --- a/xc/programs/Xserver/XIE/dixie/request/protoflo.c +++ b/xc/programs/Xserver/XIE/dixie/request/protoflo.c @@ -67,7 +67,7 @@ terms and conditions: Robert NC Shelley, Dean Verheiden -- AGE Logic, Inc., May 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/protoflo.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/protoflo.c,v 3.2 1998/10/05 13:22:20 dawes Exp $ */ #include <protoflo.h> diff --git a/xc/programs/Xserver/XIE/dixie/request/roi.c b/xc/programs/Xserver/XIE/dixie/request/roi.c index df2262538..98785ee76 100644 --- a/xc/programs/Xserver/XIE/dixie/request/roi.c +++ b/xc/programs/Xserver/XIE/dixie/request/roi.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc., April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/roi.c,v 3.3 1998/10/25 07:11:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/roi.c,v 3.2 1998/10/05 13:22:21 dawes Exp $ */ #define _XIEC_ROI diff --git a/xc/programs/Xserver/XIE/dixie/request/session.c b/xc/programs/Xserver/XIE/dixie/request/session.c index b03f9e65b..0cb183e99 100644 --- a/xc/programs/Xserver/XIE/dixie/request/session.c +++ b/xc/programs/Xserver/XIE/dixie/request/session.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc March, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/session.c,v 3.12 1999/01/31 12:21:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/session.c,v 3.11 1998/10/25 07:11:42 dawes Exp $ */ #define _XIEC_SESSION diff --git a/xc/programs/Xserver/XIE/dixie/request/tables.c b/xc/programs/Xserver/XIE/dixie/request/tables.c index a5eb56cc8..f271d78df 100644 --- a/xc/programs/Xserver/XIE/dixie/request/tables.c +++ b/xc/programs/Xserver/XIE/dixie/request/tables.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden, AGE Logic, Inc March 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/tables.c,v 3.4 1999/01/31 12:21:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/tables.c,v 3.3 1998/10/25 07:11:42 dawes Exp $ */ #define _XIEC_TABLES diff --git a/xc/programs/Xserver/XIE/dixie/request/technq.c b/xc/programs/Xserver/XIE/dixie/request/technq.c index b534c2aa8..440f3e44f 100644 --- a/xc/programs/Xserver/XIE/dixie/request/technq.c +++ b/xc/programs/Xserver/XIE/dixie/request/technq.c @@ -64,7 +64,7 @@ terms and conditions: Dean Verheiden AGE Logic, Inc. April 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/dixie/request/technq.c,v 3.5 1998/10/25 07:11:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/dixie/request/technq.c,v 3.4 1998/10/05 13:22:21 dawes Exp $ */ #define _XIEC_TECHNQ diff --git a/xc/programs/Xserver/XIE/include/corex.h b/xc/programs/Xserver/XIE/include/corex.h index fddc63de9..74b02c652 100644 --- a/xc/programs/Xserver/XIE/include/corex.h +++ b/xc/programs/Xserver/XIE/include/corex.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April, 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/corex.h,v 1.3 1998/10/25 12:47:53 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_COREX #define _XIEH_COREX diff --git a/xc/programs/Xserver/XIE/include/difloat.h b/xc/programs/Xserver/XIE/include/difloat.h index 2e5db67df..6b7855376 100644 --- a/xc/programs/Xserver/XIE/include/difloat.h +++ b/xc/programs/Xserver/XIE/include/difloat.h @@ -67,7 +67,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/difloat.h,v 1.3 1998/10/25 12:47:53 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIE_DIFLOAT #define _XIE_DIFLOAT diff --git a/xc/programs/Xserver/XIE/include/dixie_e.h b/xc/programs/Xserver/XIE/include/dixie_e.h index 2c00eecf1..6e00cd85a 100644 --- a/xc/programs/Xserver/XIE/include/dixie_e.h +++ b/xc/programs/Xserver/XIE/include/dixie_e.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/XIE/include/dixie_e.h,v 1.1 1998/10/25 07:11:45 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/xc/programs/Xserver/XIE/include/dixie_i.h b/xc/programs/Xserver/XIE/include/dixie_i.h index 842829a4d..103284477 100644 --- a/xc/programs/Xserver/XIE/include/dixie_i.h +++ b/xc/programs/Xserver/XIE/include/dixie_i.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/XIE/include/dixie_i.h,v 1.1 1998/10/25 07:11:45 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/xc/programs/Xserver/XIE/include/dixie_p.h b/xc/programs/Xserver/XIE/include/dixie_p.h index c56d93ae9..61fa8480a 100644 --- a/xc/programs/Xserver/XIE/include/dixie_p.h +++ b/xc/programs/Xserver/XIE/include/dixie_p.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/XIE/include/dixie_p.h,v 1.1 1998/10/25 07:11:45 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/xc/programs/Xserver/XIE/include/error.h b/xc/programs/Xserver/XIE/include/error.h index 11785db02..4e73b379a 100644 --- a/xc/programs/Xserver/XIE/include/error.h +++ b/xc/programs/Xserver/XIE/include/error.h @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/error.h,v 3.3 1998/10/05 13:22:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/error.h,v 3.2 1998/10/04 09:35:58 dawes Exp $ */ #ifndef _XIEH_ERROR #define _XIEH_ERROR diff --git a/xc/programs/Xserver/XIE/include/flo.h b/xc/programs/Xserver/XIE/include/flo.h index 08e73bb97..dd92e261c 100644 --- a/xc/programs/Xserver/XIE/include/flo.h +++ b/xc/programs/Xserver/XIE/include/flo.h @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/flo.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_FLO #define _XIEH_FLO diff --git a/xc/programs/Xserver/XIE/include/macro.h b/xc/programs/Xserver/XIE/include/macro.h index 89ba80d07..46db0fdc0 100644 --- a/xc/programs/Xserver/XIE/include/macro.h +++ b/xc/programs/Xserver/XIE/include/macro.h @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. March 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/macro.h,v 1.8 1998/10/25 07:11:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/include/macro.h,v 1.7 1998/10/05 13:22:23 dawes Exp $ */ #ifndef _XIEH_MACRO #define _XIEH_MACRO diff --git a/xc/programs/Xserver/XIE/include/memory.h b/xc/programs/Xserver/XIE/include/memory.h index ee7544f8b..f41a67523 100644 --- a/xc/programs/Xserver/XIE/include/memory.h +++ b/xc/programs/Xserver/XIE/include/memory.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/memory.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_MEMORY #define _XIEH_MEMORY diff --git a/xc/programs/Xserver/XIE/include/protoflo.h b/xc/programs/Xserver/XIE/include/protoflo.h index 4559fc3cd..8f001dbc7 100644 --- a/xc/programs/Xserver/XIE/include/protoflo.h +++ b/xc/programs/Xserver/XIE/include/protoflo.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/XIE/include/protoflo.h,v 1.1 1998/10/25 07:11:47 dawes Exp $ + * $XFree86$ */ /************************************************************ diff --git a/xc/programs/Xserver/XIE/include/tables.h b/xc/programs/Xserver/XIE/include/tables.h index af5843b88..cc81eb0b2 100644 --- a/xc/programs/Xserver/XIE/include/tables.h +++ b/xc/programs/Xserver/XIE/include/tables.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/tables.h,v 1.3 1998/10/25 12:47:54 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_TABLES #define _XIEH_TABLES diff --git a/xc/programs/Xserver/XIE/include/technq.h b/xc/programs/Xserver/XIE/include/technq.h index 6481d7398..4db8ef510 100644 --- a/xc/programs/Xserver/XIE/include/technq.h +++ b/xc/programs/Xserver/XIE/include/technq.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/include/technq.h,v 1.3 1998/10/25 12:47:55 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_TECHNQ #define _XIEH_TECHNQ diff --git a/xc/programs/Xserver/XIE/mixie/Imakefile b/xc/programs/Xserver/XIE/mixie/Imakefile index 6e6cd3a56..50bbc22d5 100644 --- a/xc/programs/Xserver/XIE/mixie/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1995/12/07 21:15:34 gildea $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/Imakefile,v 3.15 1999/04/29 09:13:37 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/Imakefile,v 3.15tsi Exp $ #define IHaveModules #include <Server.tmpl> @@ -25,7 +25,7 @@ MakeMutex($(SUBDIRS) $(OBJS) $(DONES)) $(DONES): $(SUBDIRS) #endif -NormalDepLibraryTarget(mixie,$(SUBDIRS) $(DONES),$(OBJS)) +DepLibraryModuleTarget(mixie,$(SUBDIRS) $(DONES),$(OBJS)) ForceSubdirs($(SUBDIRS)) diff --git a/xc/programs/Xserver/XIE/mixie/control/Imakefile b/xc/programs/Xserver/XIE/mixie/control/Imakefile index f1bea6c42..2971a3a55 100644 --- a/xc/programs/Xserver/XIE/mixie/control/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/control/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:55:55 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/control/Imakefile,v 3.5 1998/07/25 08:05:09 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/control/Imakefile,v 3.4.2.1 1998/06/03 15:49:37 dawes Exp $ XCOMM build device dependent machine independent control objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/control/analyze.c b/xc/programs/Xserver/XIE/mixie/control/analyze.c index a8879513c..ae030cfce 100644 --- a/xc/programs/Xserver/XIE/mixie/control/analyze.c +++ b/xc/programs/Xserver/XIE/mixie/control/analyze.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/analyze.c,v 1.3 1998/10/06 10:35:15 dawes Exp $ */ +/* $XFree86$ */ #define _XIEC_ANALYZE diff --git a/xc/programs/Xserver/XIE/mixie/control/domain.c b/xc/programs/Xserver/XIE/mixie/control/domain.c index 3e0f5a7eb..31c93f5d5 100644 --- a/xc/programs/Xserver/XIE/mixie/control/domain.c +++ b/xc/programs/Xserver/XIE/mixie/control/domain.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/domain.c,v 1.3 1998/10/06 10:35:16 dawes Exp $ */ +/* $XFree86$ */ #define _XIEC_DOMAIN diff --git a/xc/programs/Xserver/XIE/mixie/control/floman.c b/xc/programs/Xserver/XIE/mixie/control/floman.c index 3194e1249..adbcb3f2b 100644 --- a/xc/programs/Xserver/XIE/mixie/control/floman.c +++ b/xc/programs/Xserver/XIE/mixie/control/floman.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/floman.c,v 3.3 1998/10/25 07:11:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/floman.c,v 3.2 1998/10/05 13:22:25 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/mixie/control/sched.c b/xc/programs/Xserver/XIE/mixie/control/sched.c index a7d8a08c6..742c61672 100644 --- a/xc/programs/Xserver/XIE/mixie/control/sched.c +++ b/xc/programs/Xserver/XIE/mixie/control/sched.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden, Robert NC Shelley -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/sched.c,v 1.4 1998/10/25 07:11:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/sched.c,v 1.3 1998/10/06 10:35:16 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/mixie/control/strip.c b/xc/programs/Xserver/XIE/mixie/control/strip.c index 1910701df..1638a5a0d 100644 --- a/xc/programs/Xserver/XIE/mixie/control/strip.c +++ b/xc/programs/Xserver/XIE/mixie/control/strip.c @@ -67,7 +67,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/control/strip.c,v 3.5 1999/01/31 12:21:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/control/strip.c,v 3.4 1998/10/25 07:11:52 dawes Exp $ */ /* * Include files diff --git a/xc/programs/Xserver/XIE/mixie/export/Imakefile b/xc/programs/Xserver/XIE/mixie/export/Imakefile index 54a0a042a..2f2ddf8e9 100644 --- a/xc/programs/Xserver/XIE/mixie/export/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/export/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:56:01 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/export/Imakefile,v 3.5 1998/07/25 08:05:10 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/export/Imakefile,v 3.4.2.1 1998/06/03 15:49:40 dawes Exp $ XCOMM build device dependent machine independent export element objs #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/export/mechist.c b/xc/programs/Xserver/XIE/mixie/export/mechist.c index 76f820b2f..8c621543e 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mechist.c +++ b/xc/programs/Xserver/XIE/mixie/export/mechist.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mechist.c,v 3.4 1998/10/25 07:11:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mechist.c,v 3.3 1998/10/05 13:22:28 dawes Exp $ */ #define _XIEC_MECHIST #define _XIEC_ECHIST diff --git a/xc/programs/Xserver/XIE/mixie/export/meclut.c b/xc/programs/Xserver/XIE/mixie/export/meclut.c index 06832c655..fedb904f8 100644 --- a/xc/programs/Xserver/XIE/mixie/export/meclut.c +++ b/xc/programs/Xserver/XIE/mixie/export/meclut.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meclut.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meclut.c,v 3.3 1998/10/05 13:22:29 dawes Exp $ */ #define _XIEC_MECLUT #define _XIEC_ECLUT diff --git a/xc/programs/Xserver/XIE/mixie/export/mecphoto.c b/xc/programs/Xserver/XIE/mixie/export/mecphoto.c index 9045b9e23..2a2e333fb 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mecphoto.c +++ b/xc/programs/Xserver/XIE/mixie/export/mecphoto.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley && Dean Verheiden -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecphoto.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecphoto.c,v 3.3 1998/10/05 13:22:29 dawes Exp $ */ #define _XIEC_MECPHOTO #define _XIEC_ECPHOTO #define _XIEC_EPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/export/mecroi.c b/xc/programs/Xserver/XIE/mixie/export/mecroi.c index e198e12f3..5d65415f5 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mecroi.c +++ b/xc/programs/Xserver/XIE/mixie/export/mecroi.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare && Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecroi.c,v 3.4 1998/10/25 07:11:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mecroi.c,v 3.3 1998/10/05 13:22:29 dawes Exp $ */ #define _XIEC_MECROI #define _XIEC_ECROI diff --git a/xc/programs/Xserver/XIE/mixie/export/medraw.c b/xc/programs/Xserver/XIE/mixie/export/medraw.c index a337c7963..202f2de4d 100644 --- a/xc/programs/Xserver/XIE/mixie/export/medraw.c +++ b/xc/programs/Xserver/XIE/mixie/export/medraw.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medraw.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medraw.c,v 3.3 1998/10/05 13:22:30 dawes Exp $ */ #define _XIEC_MEDRAW #define _XIEC_EDRAW diff --git a/xc/programs/Xserver/XIE/mixie/export/medrawp.c b/xc/programs/Xserver/XIE/mixie/export/medrawp.c index 9db5d9a32..0ebc8aaa4 100644 --- a/xc/programs/Xserver/XIE/mixie/export/medrawp.c +++ b/xc/programs/Xserver/XIE/mixie/export/medrawp.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley && Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medrawp.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/medrawp.c,v 3.3 1998/10/05 13:22:30 dawes Exp $ */ #define _XIEC_MEDRAWP #define _XIEC_EDRAWP diff --git a/xc/programs/Xserver/XIE/mixie/export/mefax.c b/xc/programs/Xserver/XIE/mixie/export/mefax.c index bd7c80185..60dd4401c 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mefax.c +++ b/xc/programs/Xserver/XIE/mixie/export/mefax.c @@ -67,7 +67,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mefax.c,v 3.4 1998/10/25 07:11:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mefax.c,v 3.3 1998/10/05 13:22:30 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/export/mejpeg.c b/xc/programs/Xserver/XIE/mixie/export/mejpeg.c index e16ce5f69..c36280f49 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mejpeg.c +++ b/xc/programs/Xserver/XIE/mixie/export/mejpeg.c @@ -66,7 +66,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mejpeg.c,v 3.6 1999/01/31 12:21:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mejpeg.c,v 3.5 1998/10/25 07:11:55 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/export/melut.c b/xc/programs/Xserver/XIE/mixie/export/melut.c index bf32d682e..c282f12a5 100644 --- a/xc/programs/Xserver/XIE/mixie/export/melut.c +++ b/xc/programs/Xserver/XIE/mixie/export/melut.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/melut.c,v 3.4 1998/10/25 07:11:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/melut.c,v 3.3 1998/10/05 13:22:31 dawes Exp $ */ #define _XIEC_MELUT #define _XIEC_ELUT diff --git a/xc/programs/Xserver/XIE/mixie/export/mephoto.c b/xc/programs/Xserver/XIE/mixie/export/mephoto.c index 5b7ec7141..464aa93a6 100644 --- a/xc/programs/Xserver/XIE/mixie/export/mephoto.c +++ b/xc/programs/Xserver/XIE/mixie/export/mephoto.c @@ -67,7 +67,7 @@ terms and conditions: Dean && Ben - various additions to handle different techniques *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mephoto.c,v 3.4 1998/10/25 07:11:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/mephoto.c,v 3.3 1998/10/05 13:22:31 dawes Exp $ */ #define _XIEC_MEPHOTO #define _XIEC_EPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/export/meroi.c b/xc/programs/Xserver/XIE/mixie/export/meroi.c index 6420e5e47..e84436b32 100644 --- a/xc/programs/Xserver/XIE/mixie/export/meroi.c +++ b/xc/programs/Xserver/XIE/mixie/export/meroi.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meroi.c,v 3.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meroi.c,v 3.3 1998/10/05 13:22:32 dawes Exp $ */ #define _XIEC_MEROI diff --git a/xc/programs/Xserver/XIE/mixie/export/meuncomp.c b/xc/programs/Xserver/XIE/mixie/export/meuncomp.c index 55c3de917..ef377c933 100644 --- a/xc/programs/Xserver/XIE/mixie/export/meuncomp.c +++ b/xc/programs/Xserver/XIE/mixie/export/meuncomp.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. October 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meuncomp.c,v 1.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/meuncomp.c,v 1.3 1998/10/06 10:35:17 dawes Exp $ */ #define _XIEC_MEUNCOMP diff --git a/xc/programs/Xserver/XIE/mixie/export/schoice.c b/xc/programs/Xserver/XIE/mixie/export/schoice.c index 4ac0eaf07..71861561b 100644 --- a/xc/programs/Xserver/XIE/mixie/export/schoice.c +++ b/xc/programs/Xserver/XIE/mixie/export/schoice.c @@ -64,7 +64,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley AGE Logic, Inc. Jan 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/export/schoice.c,v 3.4 1998/10/25 07:11:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/export/schoice.c,v 3.3 1998/10/05 13:22:32 dawes Exp $ */ #define _XIEC_SCHOICE #define _XIEC_IPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/fax/Imakefile b/xc/programs/Xserver/XIE/mixie/fax/Imakefile index af586e3b9..d9830c7fe 100644 --- a/xc/programs/Xserver/XIE/mixie/fax/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/fax/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:56:07 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/fax/Imakefile,v 3.5 1998/07/25 08:05:10 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/fax/Imakefile,v 3.4.2.1 1998/06/03 15:49:40 dawes Exp $ XCOMM build device dependent machine independent fax processing element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/import/Imakefile b/xc/programs/Xserver/XIE/mixie/import/Imakefile index 1ce4545c8..00d419696 100644 --- a/xc/programs/Xserver/XIE/mixie/import/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/import/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:56:13 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/import/Imakefile,v 3.5 1998/07/25 08:05:11 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/import/Imakefile,v 3.4.2.1 1998/06/03 15:49:41 dawes Exp $ XCOMM build device dependent machine independent import element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/import/miclut.c b/xc/programs/Xserver/XIE/mixie/import/miclut.c index e6ca69dbb..c66e79dd1 100644 --- a/xc/programs/Xserver/XIE/mixie/import/miclut.c +++ b/xc/programs/Xserver/XIE/mixie/import/miclut.c @@ -66,7 +66,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miclut.c,v 3.4 1998/10/25 07:11:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miclut.c,v 3.3 1998/10/05 13:22:34 dawes Exp $ */ #define _XIEC_MICLUT #define _XIEC_ICLUT diff --git a/xc/programs/Xserver/XIE/mixie/import/micphoto.c b/xc/programs/Xserver/XIE/mixie/import/micphoto.c index 70bcf2ab6..c9e7d9c5d 100644 --- a/xc/programs/Xserver/XIE/mixie/import/micphoto.c +++ b/xc/programs/Xserver/XIE/mixie/import/micphoto.c @@ -68,7 +68,7 @@ terms and conditions: Fax stuff added by Ben Fahy *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/micphoto.c,v 3.3 1998/10/05 13:22:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/micphoto.c,v 3.2 1998/10/04 09:36:12 dawes Exp $ */ #define _XIEC_MICPHOTO #define _XIEC_ICPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/import/microi.c b/xc/programs/Xserver/XIE/mixie/import/microi.c index 0f4c45388..6c65d6ae5 100644 --- a/xc/programs/Xserver/XIE/mixie/import/microi.c +++ b/xc/programs/Xserver/XIE/mixie/import/microi.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/microi.c,v 3.3 1998/10/05 13:22:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/microi.c,v 3.2 1998/10/04 09:36:12 dawes Exp $ */ #define _XIEC_MICROI diff --git a/xc/programs/Xserver/XIE/mixie/import/midraw.c b/xc/programs/Xserver/XIE/mixie/import/midraw.c index c4d0248b2..d8a461e78 100644 --- a/xc/programs/Xserver/XIE/mixie/import/midraw.c +++ b/xc/programs/Xserver/XIE/mixie/import/midraw.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/midraw.c,v 3.4 1999/09/25 14:36:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/midraw.c,v 3.3 1998/10/05 13:22:35 dawes Exp $ */ #define _XIEC_IDRAW #define _XIEC_MIDRAW diff --git a/xc/programs/Xserver/XIE/mixie/import/mifax.c b/xc/programs/Xserver/XIE/mixie/import/mifax.c index ca679701d..9ac3d6b29 100644 --- a/xc/programs/Xserver/XIE/mixie/import/mifax.c +++ b/xc/programs/Xserver/XIE/mixie/import/mifax.c @@ -69,7 +69,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mifax.c,v 3.3 1998/10/05 13:22:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mifax.c,v 3.2 1998/10/04 09:36:13 dawes Exp $ */ #define _XIEC_MICPHOTO #define _XIEC_ICPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/import/mijpeg.c b/xc/programs/Xserver/XIE/mixie/import/mijpeg.c index eeb917a03..9f5bb8946 100644 --- a/xc/programs/Xserver/XIE/mixie/import/mijpeg.c +++ b/xc/programs/Xserver/XIE/mixie/import/mijpeg.c @@ -68,7 +68,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. Oct, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mijpeg.c,v 3.5 1999/01/31 12:21:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/mijpeg.c,v 3.4 1998/10/05 13:22:36 dawes Exp $ */ #define _XIEC_MIPHOTO #define _XIEC_IPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/import/milut.c b/xc/programs/Xserver/XIE/mixie/import/milut.c index a0f88a420..9a49bc43e 100644 --- a/xc/programs/Xserver/XIE/mixie/import/milut.c +++ b/xc/programs/Xserver/XIE/mixie/import/milut.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/milut.c,v 3.3 1998/10/05 13:22:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/milut.c,v 3.2 1998/10/04 09:36:14 dawes Exp $ */ #define _XIEC_ILUT #define _XIEC_MILUT diff --git a/xc/programs/Xserver/XIE/mixie/import/miphoto.c b/xc/programs/Xserver/XIE/mixie/import/miphoto.c index c76b31c98..11e215a1b 100644 --- a/xc/programs/Xserver/XIE/mixie/import/miphoto.c +++ b/xc/programs/Xserver/XIE/mixie/import/miphoto.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miphoto.c,v 3.3 1998/10/05 13:22:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miphoto.c,v 3.2 1998/10/04 09:36:15 dawes Exp $ */ #define _XIEC_MIPHOTO #define _XIEC_IPHOTO diff --git a/xc/programs/Xserver/XIE/mixie/import/miregion.c b/xc/programs/Xserver/XIE/mixie/import/miregion.c index b906c5ba8..1f6a5cc62 100644 --- a/xc/programs/Xserver/XIE/mixie/import/miregion.c +++ b/xc/programs/Xserver/XIE/mixie/import/miregion.c @@ -117,7 +117,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miregion.c,v 3.5 1999/01/31 12:21:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miregion.c,v 3.4 1998/10/05 13:22:37 dawes Exp $ */ #define _XIEC_MIREGION diff --git a/xc/programs/Xserver/XIE/mixie/import/miroi.c b/xc/programs/Xserver/XIE/mixie/import/miroi.c index d6432e94e..110474ca3 100644 --- a/xc/programs/Xserver/XIE/mixie/import/miroi.c +++ b/xc/programs/Xserver/XIE/mixie/import/miroi.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. April, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miroi.c,v 3.3 1998/10/05 13:22:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miroi.c,v 3.2 1998/10/04 09:36:16 dawes Exp $ */ #define _XIEC_MIROI #define _XIEC_IROI diff --git a/xc/programs/Xserver/XIE/mixie/import/miuncomp.c b/xc/programs/Xserver/XIE/mixie/import/miuncomp.c index 777c57f54..6601b9d23 100644 --- a/xc/programs/Xserver/XIE/mixie/import/miuncomp.c +++ b/xc/programs/Xserver/XIE/mixie/import/miuncomp.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miuncomp.c,v 1.4 1998/10/25 07:11:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/import/miuncomp.c,v 1.3 1998/10/06 10:35:18 dawes Exp $ */ #define _XIEC_MIUNCOMP diff --git a/xc/programs/Xserver/XIE/mixie/include/domain.h b/xc/programs/Xserver/XIE/mixie/include/domain.h index d954e833c..a2f3757fe 100644 --- a/xc/programs/Xserver/XIE/mixie/include/domain.h +++ b/xc/programs/Xserver/XIE/mixie/include/domain.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. August 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/domain.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_DOMAIN diff --git a/xc/programs/Xserver/XIE/mixie/include/fax.h b/xc/programs/Xserver/XIE/mixie/include/fax.h index 0c8b5bd9d..d140b37b9 100644 --- a/xc/programs/Xserver/XIE/mixie/include/fax.h +++ b/xc/programs/Xserver/XIE/mixie/include/fax.h @@ -66,7 +66,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. May 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/fax.h,v 1.2 1998/10/05 13:22:39 dawes Exp $ */ +/* $XFree86$ */ #ifndef XFree86LOADER #include <stdio.h> diff --git a/xc/programs/Xserver/XIE/mixie/include/meuncomp.h b/xc/programs/Xserver/XIE/mixie/include/meuncomp.h index ca1966a28..d51d7702e 100644 --- a/xc/programs/Xserver/XIE/mixie/include/meuncomp.h +++ b/xc/programs/Xserver/XIE/mixie/include/meuncomp.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. October 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/meuncomp.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86$ */ typedef struct _meuncompdef { void (*action)(); diff --git a/xc/programs/Xserver/XIE/mixie/include/miuncomp.h b/xc/programs/Xserver/XIE/mixie/include/miuncomp.h index bed22caa2..379adb3e6 100644 --- a/xc/programs/Xserver/XIE/mixie/include/miuncomp.h +++ b/xc/programs/Xserver/XIE/mixie/include/miuncomp.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. September 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/miuncomp.h,v 1.3 1998/10/25 12:47:56 dawes Exp $ */ +/* $XFree86$ */ #define MIUNCOMP_BP_ARGS \ BytePixel *src, \ diff --git a/xc/programs/Xserver/XIE/mixie/include/sched.h b/xc/programs/Xserver/XIE/mixie/include/sched.h index 5e858898d..6c03264d1 100644 --- a/xc/programs/Xserver/XIE/mixie/include/sched.h +++ b/xc/programs/Xserver/XIE/mixie/include/sched.h @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. May 1993 ******************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/sched.h,v 1.3 1998/10/25 12:47:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_SCHED #define _XIEH_SCHED diff --git a/xc/programs/Xserver/XIE/mixie/include/tex.h b/xc/programs/Xserver/XIE/mixie/include/tex.h index 4a123edca..606b14e89 100644 --- a/xc/programs/Xserver/XIE/mixie/include/tex.h +++ b/xc/programs/Xserver/XIE/mixie/include/tex.h @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. April 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/include/tex.h,v 1.3 1998/10/25 12:47:57 dawes Exp $ */ +/* $XFree86$ */ #ifndef _XIEH_TEX #define _XIEH_TEX diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile b/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile index 61b5a0a3c..772b1e043 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/8 1996/09/28 16:56:19 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/Imakefile,v 3.5 1998/07/25 08:05:11 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/Imakefile,v 3.4.2.1 1998/06/03 15:49:42 dawes Exp $ XCOMM build device dependent machine independent fax processing element objects #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c index cafa3b108..19b189bae 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c +++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c @@ -66,7 +66,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c,v 1.3 1998/10/04 09:36:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c,v 1.2 1998/07/25 08:05:11 dawes Exp $ */ /* * jcdeflts.c * diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h b/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h index c4378534e..820057c73 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h +++ b/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h @@ -467,7 +467,7 @@ typedef short INT16; /* to have 64-bit longs, you might want to change this. */ #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -#if defined(__alpha) || defined(__alpha__) +#if defined(LONG64) || defined(WORD64) typedef int INT32; #else typedef long INT32; diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h b/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h index e833ffe27..f1bc08039 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h +++ b/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h @@ -66,7 +66,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h,v 1.5 1999/01/31 12:21:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h,v 1.4 1998/10/04 09:36:22 dawes Exp $ */ /* * jinclude.h diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c index 330acf228..b1b46a49b 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c +++ b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c @@ -66,7 +66,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., January 1994 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c,v 3.2 1998/10/04 09:36:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c,v 3.1 1996/08/20 13:16:31 dawes Exp $ */ /* * jmemnobs.c (jmemsys.c) diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c b/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c index 6f50f7901..45bd446ee 100644 --- a/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c +++ b/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c @@ -66,7 +66,7 @@ terms and conditions: Gary Rogers, AGE Logic, Inc., October 1993 ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c,v 1.3 1998/10/04 09:36:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c,v 1.2 1998/07/25 08:05:12 dawes Exp $ */ /* * jrdjfif.c diff --git a/xc/programs/Xserver/XIE/mixie/process/Imakefile b/xc/programs/Xserver/XIE/mixie/process/Imakefile index ed52bbe5d..3b78586a9 100644 --- a/xc/programs/Xserver/XIE/mixie/process/Imakefile +++ b/xc/programs/Xserver/XIE/mixie/process/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/28 16:56:25 rws $ -XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/process/Imakefile,v 3.5 1998/07/25 08:05:13 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XIE/mixie/process/Imakefile,v 3.4.2.1 1998/06/03 15:49:42 dawes Exp $ XCOMM build device dependent machine independent process element objs #define IHaveModules diff --git a/xc/programs/Xserver/XIE/mixie/process/bitfun.c b/xc/programs/Xserver/XIE/mixie/process/bitfun.c index 509f3c015..a3f125bde 100644 --- a/xc/programs/Xserver/XIE/mixie/process/bitfun.c +++ b/xc/programs/Xserver/XIE/mixie/process/bitfun.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/bitfun.c,v 1.3 1998/10/06 10:35:19 dawes Exp $ */ +/* $XFree86$ */ #define _XIEC_MPBITFUN diff --git a/xc/programs/Xserver/XIE/mixie/process/mparith.c b/xc/programs/Xserver/XIE/mixie/process/mparith.c index 1e3aeafec..c08d3e280 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mparith.c +++ b/xc/programs/Xserver/XIE/mixie/process/mparith.c @@ -67,7 +67,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mparith.c,v 3.3 1998/10/05 13:22:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mparith.c,v 3.2 1998/10/04 09:36:26 dawes Exp $ */ #define _XIEC_MPARITH diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbandc.c b/xc/programs/Xserver/XIE/mixie/process/mpbandc.c index ab8d7d455..77ab352e0 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpbandc.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpbandc.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbandc.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbandc.c,v 3.2 1998/10/04 09:36:27 dawes Exp $ */ #define _XIEC_MPBANDC #define _XIEC_PBANDC diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbande.c b/xc/programs/Xserver/XIE/mixie/process/mpbande.c index 44b0d3a4f..83e1e1537 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpbande.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpbande.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbande.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbande.c,v 3.2 1998/10/04 09:36:27 dawes Exp $ */ #define _XIEC_MPBANDE #define _XIEC_PBANDE diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbands.c b/xc/programs/Xserver/XIE/mixie/process/mpbands.c index c62d3ab96..b5d8dc4a5 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpbands.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpbands.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. September, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbands.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpbands.c,v 3.2 1998/10/04 09:36:28 dawes Exp $ */ #define _XIEC_MPBANDS #define _XIEC_PBANDS diff --git a/xc/programs/Xserver/XIE/mixie/process/mpblend.c b/xc/programs/Xserver/XIE/mixie/process/mpblend.c index 4ac4aedfe..b0322ae33 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpblend.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpblend.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpblend.c,v 3.3 1998/10/05 13:22:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpblend.c,v 3.2 1998/10/04 09:36:29 dawes Exp $ */ #define _XIEC_MPBLEND #define _XIEC_PBLEND diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c b/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c index eafb04e80..d7cd65a74 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c @@ -66,7 +66,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcfromi.c,v 3.3 1998/10/05 13:22:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcfromi.c,v 3.2 1998/10/04 09:36:29 dawes Exp $ */ #define _XIEC_MPCFROMI #define _XIEC_PCFROMI diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcnst.c b/xc/programs/Xserver/XIE/mixie/process/mpcnst.c index b19ecd204..fc2a98f18 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpcnst.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpcnst.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden && Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcnst.c,v 3.3 1998/10/05 13:22:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcnst.c,v 3.2 1998/10/04 09:36:30 dawes Exp $ */ #define _XIEC_MPCNST diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcomp.c b/xc/programs/Xserver/XIE/mixie/process/mpcomp.c index 1efc0dabf..16d929fb7 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpcomp.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpcomp.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcomp.c,v 3.3 1998/10/05 13:22:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpcomp.c,v 3.2 1998/10/04 09:36:31 dawes Exp $ */ #define _XIEC_MPCOMP diff --git a/xc/programs/Xserver/XIE/mixie/process/mpconv.c b/xc/programs/Xserver/XIE/mixie/process/mpconv.c index 06906c3e7..3d1291512 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpconv.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpconv.c @@ -67,7 +67,7 @@ terms and conditions: Dean Verheiden && Robert NC Shelley -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpconv.c,v 3.3 1998/10/05 13:22:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpconv.c,v 3.2 1998/10/04 09:36:31 dawes Exp $ */ #define _XIEC_MPCONV diff --git a/xc/programs/Xserver/XIE/mixie/process/mpctoi.c b/xc/programs/Xserver/XIE/mixie/process/mpctoi.c index 55761a1c1..843472c66 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpctoi.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpctoi.c @@ -67,7 +67,7 @@ terms and conditions: Robert NC Shelley -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpctoi.c,v 3.3 1998/10/05 13:22:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpctoi.c,v 3.2 1998/10/04 09:36:32 dawes Exp $ */ #define _XIEC_MPCTOI #define _XIEC_PCTOI diff --git a/xc/programs/Xserver/XIE/mixie/process/mpdither.c b/xc/programs/Xserver/XIE/mixie/process/mpdither.c index e3a174d16..4d6d3e586 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpdither.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpdither.c @@ -67,7 +67,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpdither.c,v 3.3 1998/10/05 13:22:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpdither.c,v 3.2 1998/10/04 09:36:32 dawes Exp $ */ #define _XIEC_MPDITHER diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeom.c b/xc/programs/Xserver/XIE/mixie/process/mpgeom.c index 8d34099c1..4af06e956 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpgeom.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpgeom.c @@ -66,7 +66,7 @@ terms and conditions: Ben Fahy -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeom.c,v 1.3 1998/10/06 10:35:19 dawes Exp $ */ +/* $XFree86$ */ #define _XIEC_MPGEOM diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c b/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c index 0476a0610..660e280aa 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c @@ -67,7 +67,7 @@ terms and conditions: Ben Fahy && Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c,v 3.4 1998/10/05 13:22:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c,v 3.3 1998/10/04 09:36:33 dawes Exp $ */ #define _XIEC_MPGEOM diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c b/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c index f53110702..4f92bd9f4 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c @@ -73,7 +73,7 @@ terms and conditions: Ben Fahy && Larry Hare -- AGE Logic, Inc. June, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c,v 3.3 1998/10/05 13:22:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c,v 3.2 1998/10/04 09:36:34 dawes Exp $ */ #define _XIEC_MPGEOM diff --git a/xc/programs/Xserver/XIE/mixie/process/mphist.c b/xc/programs/Xserver/XIE/mixie/process/mphist.c index bd5324c7d..b226834cc 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mphist.c +++ b/xc/programs/Xserver/XIE/mixie/process/mphist.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mphist.c,v 3.3 1998/10/05 13:22:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mphist.c,v 3.2 1998/10/04 09:36:34 dawes Exp $ */ #define _XIEC_MPHIST #define _XIEC_PHIST diff --git a/xc/programs/Xserver/XIE/mixie/process/mplogic.c b/xc/programs/Xserver/XIE/mixie/process/mplogic.c index 39e826a93..435247ffd 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mplogic.c +++ b/xc/programs/Xserver/XIE/mixie/process/mplogic.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mplogic.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mplogic.c,v 3.2 1998/10/04 09:36:35 dawes Exp $ */ #define _XIEC_MPLOGIC diff --git a/xc/programs/Xserver/XIE/mixie/process/mppaste.c b/xc/programs/Xserver/XIE/mixie/process/mppaste.c index cf8eeb5c3..9c89bbfa6 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mppaste.c +++ b/xc/programs/Xserver/XIE/mixie/process/mppaste.c @@ -67,7 +67,7 @@ terms and conditions: July, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppaste.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppaste.c,v 3.2 1998/10/04 09:36:36 dawes Exp $ */ #define _XIEC_MPPASTE #define _XIEC_PPASTE diff --git a/xc/programs/Xserver/XIE/mixie/process/mppoint.c b/xc/programs/Xserver/XIE/mixie/process/mppoint.c index 55b6822ea..415487658 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mppoint.c +++ b/xc/programs/Xserver/XIE/mixie/process/mppoint.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppoint.c,v 3.3 1998/10/05 13:22:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mppoint.c,v 3.2 1998/10/04 09:36:36 dawes Exp $ */ #define _XIEC_MPPOINT diff --git a/xc/programs/Xserver/XIE/mixie/process/mprgb.c b/xc/programs/Xserver/XIE/mixie/process/mprgb.c index 6d864eccc..92c1a7480 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mprgb.c +++ b/xc/programs/Xserver/XIE/mixie/process/mprgb.c @@ -66,7 +66,7 @@ terms and conditions: Larry Hare -- AGE Logic, Inc. August, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mprgb.c,v 3.3 1998/10/05 13:22:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mprgb.c,v 3.2 1998/10/04 09:36:37 dawes Exp $ */ #define _XIEC_MPRGB diff --git a/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c b/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c index 909f1ca09..8fdcfa8bb 100644 --- a/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c +++ b/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c @@ -66,7 +66,7 @@ terms and conditions: Dean Verheiden && Larry Hare -- AGE Logic, Inc. May, 1993 *****************************************************************************/ -/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpuncnst.c,v 3.3 1998/10/05 13:22:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/mixie/process/mpuncnst.c,v 3.2 1998/10/04 09:36:39 dawes Exp $ */ #define _XIEC_MPUNCNST diff --git a/xc/programs/Xserver/XIE/xiemodule.c b/xc/programs/Xserver/XIE/xiemodule.c index edaef0e96..901cd0614 100644 --- a/xc/programs/Xserver/XIE/xiemodule.c +++ b/xc/programs/Xserver/XIE/xiemodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XIE/xiemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XIE/xiemodule.c,v 1.6 1999/01/26 05:53:47 dawes Exp $ */ #include "xf86Module.h" #include "XIE.h" diff --git a/xc/programs/Xserver/Xext/Imakefile b/xc/programs/Xserver/Xext/Imakefile index e70e39457..a1ee35f06 100644 --- a/xc/programs/Xserver/Xext/Imakefile +++ b/xc/programs/Xserver/Xext/Imakefile @@ -120,6 +120,8 @@ XF86INCLUDES = -I$(XF86COMSRC) $(FONTCACHEINCLUDES) LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln + DEFINES = $(EXT_DEFINES) + NormalLibraryObjectRule() /* diff --git a/xc/programs/Xserver/Xext/appgroup.c b/xc/programs/Xserver/Xext/appgroup.c index c626799b7..4fb328560 100644 --- a/xc/programs/Xserver/Xext/appgroup.c +++ b/xc/programs/Xserver/Xext/appgroup.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.3 2000/08/11 23:59:47 dawes Exp $ */ +/* $XFree86$ */ /* Copyright 1996, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/bigreq.c b/xc/programs/Xserver/Xext/bigreq.c index 9753a3f6f..0dc9d036e 100644 --- a/xc/programs/Xserver/Xext/bigreq.c +++ b/xc/programs/Xserver/Xext/bigreq.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.3 1998/10/04 09:36:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.2 1996/12/23 06:28:58 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/xc/programs/Xserver/Xext/cup.c b/xc/programs/Xserver/Xext/cup.c index 2211ad259..8eff957b6 100644 --- a/xc/programs/Xserver/Xext/cup.c +++ b/xc/programs/Xserver/Xext/cup.c @@ -20,7 +20,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/Xext/cup.c,v 1.5 1998/12/06 13:30:39 dawes Exp $ */ +/* $XFree86$ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/xc/programs/Xserver/Xext/dgaproc.h b/xc/programs/Xserver/Xext/dgaproc.h index 2b0118f15..252021972 100644 --- a/xc/programs/Xserver/Xext/dgaproc.h +++ b/xc/programs/Xserver/Xext/dgaproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.20 2000/06/19 15:00:46 tsi Exp $ */ #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/xc/programs/Xserver/Xext/dpms.c b/xc/programs/Xserver/Xext/dpms.c index 17f5f59f7..831fce9c3 100644 --- a/xc/programs/Xserver/Xext/dpms.c +++ b/xc/programs/Xserver/Xext/dpms.c @@ -32,7 +32,7 @@ Equipment Corporation. * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00 */ -/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.7 2000/08/11 21:12:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.6 1999/03/07 11:40:25 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/xc/programs/Xserver/Xext/dpmsproc.h b/xc/programs/Xserver/Xext/dpmsproc.h index f35aa15b4..970f11f9a 100644 --- a/xc/programs/Xserver/Xext/dpmsproc.h +++ b/xc/programs/Xserver/Xext/dpmsproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.2 1998/07/25 08:48:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.1.2.1 1998/06/11 16:01:07 dawes Exp $ */ /* Prototypes for functions that the DDX must provide */ diff --git a/xc/programs/Xserver/Xext/dpmsstubs.c b/xc/programs/Xserver/Xext/dpmsstubs.c index 4faf4c3c3..094d7f0c6 100644 --- a/xc/programs/Xserver/Xext/dpmsstubs.c +++ b/xc/programs/Xserver/Xext/dpmsstubs.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.3 1999/12/16 02:26:23 robin Exp $ */ +/* $XFree86: $ */ /* $TOG: dpmsstubs.c /main/3 1997/11/14 11:08:23 kaleb $ */ /***************************************************************** diff --git a/xc/programs/Xserver/Xext/extmod/Imakefile b/xc/programs/Xserver/Xext/extmod/Imakefile index bbd67bb71..70d5ada41 100644 --- a/xc/programs/Xserver/Xext/extmod/Imakefile +++ b/xc/programs/Xserver/Xext/extmod/Imakefile @@ -87,7 +87,7 @@ LinkSourceFile(cup.c,..) $(CUPOBJS) $(DPMSOBJS) $(FONTCACHEOBJS) \ $(EVIOBJS) $(XVOBJS) - DEFINES = -DEXTMODULE + DEFINES = -DEXTMODULE $(EXT_DEFINES) XF86INCLUDES = -I$(XF86COMSRC) INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ diff --git a/xc/programs/Xserver/Xext/extmod/modinit.c b/xc/programs/Xserver/Xext/extmod/modinit.c index 6d999b3b1..9cac58480 100644 --- a/xc/programs/Xserver/Xext/extmod/modinit.c +++ b/xc/programs/Xserver/Xext/extmod/modinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.14 2000/08/09 03:06:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.13 2000/02/13 06:15:31 dawes Exp $ */ /* * diff --git a/xc/programs/Xserver/Xext/fontcache.c b/xc/programs/Xserver/Xext/fontcache.c index cad7dcfba..e16ff9b83 100644 --- a/xc/programs/Xserver/Xext/fontcache.c +++ b/xc/programs/Xserver/Xext/fontcache.c @@ -27,7 +27,7 @@ * * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.5 2000/02/23 20:29:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.4 2000/02/18 16:16:51 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/xc/programs/Xserver/Xext/mbuf.c b/xc/programs/Xserver/Xext/mbuf.c index 39b53a894..6c8e7c216 100644 --- a/xc/programs/Xserver/Xext/mbuf.c +++ b/xc/programs/Xserver/Xext/mbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.9 2000/01/18 16:35:37 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.8 2000/01/02 00:18:20 mvojkovi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/mbufbf.c b/xc/programs/Xserver/Xext/mbufbf.c index 35a150c2d..ce546fab6 100644 --- a/xc/programs/Xserver/Xext/mbufbf.c +++ b/xc/programs/Xserver/Xext/mbufbf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.1 1998/10/04 09:36:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.0 1994/05/08 05:17:30 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/mbufpx.c b/xc/programs/Xserver/Xext/mbufpx.c index 37516b94e..970f3914b 100644 --- a/xc/programs/Xserver/Xext/mbufpx.c +++ b/xc/programs/Xserver/Xext/mbufpx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.1 1998/10/04 09:36:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.0 1994/05/08 05:17:32 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/mitmisc.c b/xc/programs/Xserver/Xext/mitmisc.c index 462c1c16f..57fc7be8d 100644 --- a/xc/programs/Xserver/Xext/mitmisc.c +++ b/xc/programs/Xserver/Xext/mitmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.2 1998/10/04 09:36:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.1 1996/05/06 05:55:29 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/panoramiX.c b/xc/programs/Xserver/Xext/panoramiX.c index c4c2e447f..5d557c46a 100644 --- a/xc/programs/Xserver/Xext/panoramiX.c +++ b/xc/programs/Xserver/Xext/panoramiX.c @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.22 2000/05/25 21:12:30 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.19 2000/03/28 22:37:34 mvojkovi Exp $ */ #define NEED_REPLIES #include <stdio.h> diff --git a/xc/programs/Xserver/Xext/panoramiX.h b/xc/programs/Xserver/Xext/panoramiX.h index 063eda3bf..07e65bda3 100644 --- a/xc/programs/Xserver/Xext/panoramiX.h +++ b/xc/programs/Xserver/Xext/panoramiX.h @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.4 2000/01/22 01:59:03 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/panoramiX.h,v 3.6 1999/06/27 14:07:20 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/programs/Xserver/Xext/panoramiXSwap.c b/xc/programs/Xserver/Xext/panoramiXSwap.c index 84b741a6c..94d0bd8ef 100644 --- a/xc/programs/Xserver/Xext/panoramiXSwap.c +++ b/xc/programs/Xserver/Xext/panoramiXSwap.c @@ -19,7 +19,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.6 2000/02/27 23:15:30 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.4 1999/01/13 08:30:48 dawes Exp $ */ #include <stdio.h> #include "X.h" diff --git a/xc/programs/Xserver/Xext/panoramiXprocs.c b/xc/programs/Xserver/Xext/panoramiXprocs.c index 414d895c8..c59b8a7af 100644 --- a/xc/programs/Xserver/Xext/panoramiXprocs.c +++ b/xc/programs/Xserver/Xext/panoramiXprocs.c @@ -22,7 +22,7 @@ /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.27 2000/04/08 19:18:54 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.19 2000/01/02 18:39:00 mvojkovi Exp $ */ #include <stdio.h> #include "X.h" diff --git a/xc/programs/Xserver/Xext/panoramiXsrv.h b/xc/programs/Xserver/Xext/panoramiXsrv.h index afdc4055f..857932da8 100644 --- a/xc/programs/Xserver/Xext/panoramiXsrv.h +++ b/xc/programs/Xserver/Xext/panoramiXsrv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.6 2000/03/30 18:20:35 mvojkovi Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXsrv.h,v 1.3 1999/09/06 11:27:16 dawes Exp $ */ #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ diff --git a/xc/programs/Xserver/Xext/saver.c b/xc/programs/Xserver/Xext/saver.c index 6b862cd66..f6fd8c52b 100644 --- a/xc/programs/Xserver/Xext/saver.c +++ b/xc/programs/Xserver/Xext/saver.c @@ -1,6 +1,6 @@ /* * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ - * $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.3 2000/04/05 18:13:29 dawes Exp $ + * $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.2 1996/06/10 09:11:17 dawes Exp $ * Copyright (c) 1992 X Consortium diff --git a/xc/programs/Xserver/Xext/security.c b/xc/programs/Xserver/Xext/security.c index 316770eec..4bfad7c63 100644 --- a/xc/programs/Xserver/Xext/security.c +++ b/xc/programs/Xserver/Xext/security.c @@ -20,7 +20,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/Xext/security.c,v 1.5 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.4 1998/10/04 09:36:47 dawes Exp $ */ #include "dixstruct.h" #include "extnsionst.h" diff --git a/xc/programs/Xserver/Xext/shape.c b/xc/programs/Xserver/Xext/shape.c index a7819c1e0..4b13e3771 100644 --- a/xc/programs/Xserver/Xext/shape.c +++ b/xc/programs/Xserver/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.11 2000/03/03 20:50:25 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.9 1999/05/30 03:03:24 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/shm.c b/xc/programs/Xserver/Xext/shm.c index eb96a4e58..db493dea5 100644 --- a/xc/programs/Xserver/Xext/shm.c +++ b/xc/programs/Xserver/Xext/shm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.27 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.26 2000/04/27 16:26:44 eich Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xext/sleepuntil.c b/xc/programs/Xserver/Xext/sleepuntil.c index 1c1b1fb79..f7f5db8b1 100644 --- a/xc/programs/Xserver/Xext/sleepuntil.c +++ b/xc/programs/Xserver/Xext/sleepuntil.c @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.1 1998/10/04 09:36:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.0 1996/05/06 05:55:34 dawes Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ diff --git a/xc/programs/Xserver/Xext/sync.c b/xc/programs/Xserver/Xext/sync.c index f1a100499..53ea64aa5 100644 --- a/xc/programs/Xserver/Xext/sync.c +++ b/xc/programs/Xserver/Xext/sync.c @@ -46,7 +46,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.7 1999/03/06 13:12:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.6 1998/10/04 09:36:49 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/xc/programs/Xserver/Xext/vidmodeproc.h b/xc/programs/Xserver/Xext/vidmodeproc.h index 7f6720204..ad3ff3e9e 100644 --- a/xc/programs/Xserver/Xext/vidmodeproc.h +++ b/xc/programs/Xserver/Xext/vidmodeproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.4 1999/12/13 01:39:40 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.3 1999/12/03 19:17:18 eich Exp $ */ /* Prototypes for DGA functions that the DDX must provide */ diff --git a/xc/programs/Xserver/Xext/xcmisc.c b/xc/programs/Xserver/Xext/xcmisc.c index 9cb5f1c2e..9fa58948a 100644 --- a/xc/programs/Xserver/Xext/xcmisc.c +++ b/xc/programs/Xserver/Xext/xcmisc.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.3 1998/10/04 09:36:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.2 1996/12/23 06:29:03 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xc/programs/Xserver/Xext/xf86bigfont.c b/xc/programs/Xserver/Xext/xf86bigfont.c index 3fea6e3f8..a427485ba 100644 --- a/xc/programs/Xserver/Xext/xf86bigfont.c +++ b/xc/programs/Xserver/Xext/xf86bigfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.10 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.9 2000/06/22 16:59:25 tsi Exp $ */ /* * BIGFONT extension for sharing font metrics between clients (if possible) * and for transmitting font metrics to clients in a compressed form. diff --git a/xc/programs/Xserver/Xext/xf86dga.c b/xc/programs/Xserver/Xext/xf86dga.c index 9593c4a40..38d59e410 100644 --- a/xc/programs/Xserver/Xext/xf86dga.c +++ b/xc/programs/Xserver/Xext/xf86dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.19 1999/08/01 07:56:59 dawes Exp $ */ /* diff --git a/xc/programs/Xserver/Xext/xf86dga2.c b/xc/programs/Xserver/Xext/xf86dga2.c index 9ae96a63e..89978a457 100644 --- a/xc/programs/Xserver/Xext/xf86dga2.c +++ b/xc/programs/Xserver/Xext/xf86dga2.c @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.16 2000/06/30 19:06:54 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.15 2000/06/08 17:02:40 mvojkovi Exp $ */ #define NEED_REPLIES diff --git a/xc/programs/Xserver/Xext/xf86misc.c b/xc/programs/Xserver/Xext/xf86misc.c index 7bc360f0e..a3a7fac07 100644 --- a/xc/programs/Xserver/Xext/xf86misc.c +++ b/xc/programs/Xserver/Xext/xf86misc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.33 2000/05/03 00:43:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.32 2000/04/17 16:29:48 eich Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/xc/programs/Xserver/Xext/xf86miscproc.h b/xc/programs/Xserver/Xext/xf86miscproc.h index 28ea5ecd1..46f3add2b 100644 --- a/xc/programs/Xserver/Xext/xf86miscproc.h +++ b/xc/programs/Xserver/Xext/xf86miscproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.2 2000/04/17 16:29:48 eich Exp $ */ +/* $XFree86$ */ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ diff --git a/xc/programs/Xserver/Xext/xf86vmode.c b/xc/programs/Xserver/Xext/xf86vmode.c index 79907477f..0964261f6 100644 --- a/xc/programs/Xserver/Xext/xf86vmode.c +++ b/xc/programs/Xserver/Xext/xf86vmode.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.50 1999/12/13 01:39:40 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.49 1999/12/03 19:17:18 eich Exp $ */ /* diff --git a/xc/programs/Xserver/Xext/xprint.c b/xc/programs/Xserver/Xext/xprint.c index 036d0f5d1..efcdf6661 100644 --- a/xc/programs/Xserver/Xext/xprint.c +++ b/xc/programs/Xserver/Xext/xprint.c @@ -64,7 +64,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.8 2000/01/18 16:35:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.7 1999/12/13 02:12:44 robin Exp $ */ #include "X.h" #include "Xos.h" diff --git a/xc/programs/Xserver/Xext/xtest.c b/xc/programs/Xserver/Xext/xtest.c index 379b18c49..7a6d706e0 100644 --- a/xc/programs/Xserver/Xext/xtest.c +++ b/xc/programs/Xserver/Xext/xtest.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.3 1999/01/31 12:21:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.2 1998/10/04 09:36:52 dawes Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/xc/programs/Xserver/Xext/xtest1dd.c b/xc/programs/Xserver/Xext/xtest1dd.c index 3a0961aa5..3a998ea8c 100644 --- a/xc/programs/Xserver/Xext/xtest1dd.c +++ b/xc/programs/Xserver/Xext/xtest1dd.c @@ -48,7 +48,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.2 1999/03/14 03:21:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.1tsi Exp $ */ /*************************************************************** * include files diff --git a/xc/programs/Xserver/Xext/xtest1dd.h b/xc/programs/Xserver/Xext/xtest1dd.h index 17d891fdc..688fc0b85 100644 --- a/xc/programs/Xserver/Xext/xtest1dd.h +++ b/xc/programs/Xserver/Xext/xtest1dd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.1 1999/03/14 03:21:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.0tsi Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xext/xtest1di.c b/xc/programs/Xserver/Xext/xtest1di.c index f5f359239..292b6e2f6 100644 --- a/xc/programs/Xserver/Xext/xtest1di.c +++ b/xc/programs/Xserver/Xext/xtest1di.c @@ -48,7 +48,7 @@ Telephone and Telegraph Company or of the Regents of the University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.1 1998/10/04 09:36:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.0 1996/05/06 05:55:45 dawes Exp $ */ /***************************************************************************** * include files diff --git a/xc/programs/Xserver/Xext/xvdisp.c b/xc/programs/Xserver/Xext/xvdisp.c index 2d58d8b50..7e0d44064 100644 --- a/xc/programs/Xserver/Xext/xvdisp.c +++ b/xc/programs/Xserver/Xext/xvdisp.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.16 2000/08/10 17:40:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.15 2000/06/10 22:00:26 mvojkovi Exp $ */ /* ** File: diff --git a/xc/programs/Xserver/Xext/xvdix.h b/xc/programs/Xserver/Xext/xvdix.h index d1bd6e20f..b16c769de 100644 --- a/xc/programs/Xserver/Xext/xvdix.h +++ b/xc/programs/Xserver/Xext/xvdix.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.6 2000/01/18 16:35:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.5 1999/12/11 19:26:32 mvojkovi Exp $ */ #ifndef XVDIX_H #define XVDIX_H diff --git a/xc/programs/Xserver/Xext/xvmain.c b/xc/programs/Xserver/Xext/xvmain.c index 2403ad7a0..d4472d02d 100644 --- a/xc/programs/Xserver/Xext/xvmain.c +++ b/xc/programs/Xserver/Xext/xvmain.c @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.9 2000/03/30 18:20:36 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.10 2000/09/04 00:22:54 mvojkovi Exp $ */ /* ** File: @@ -610,7 +610,7 @@ XvdiPutVideo( DrawablePtr pOldDraw; if(!drw_w || !drw_h || !vid_w || !vid_h) - return BadValue; + return Success; /* UPDATE TIME VARIABLES FOR USE IN EVENTS */ @@ -664,7 +664,7 @@ XvdiPutStill( int status; if(!drw_w || !drw_h || !vid_w || !vid_h) - return BadValue; + return Success; /* UPDATE TIME VARIABLES FOR USE IN EVENTS */ @@ -705,7 +705,7 @@ XvdiPutImage( CARD16 width, CARD16 height ){ if(!drw_w || !drw_h || !src_w || !src_h) - return BadValue; + return Success; /* UPDATE TIME VARIABLES FOR USE IN EVENTS */ @@ -744,7 +744,7 @@ XvdiGetVideo( DrawablePtr pOldDraw; if(!drw_w || !drw_h || !vid_w || !vid_h) - return BadValue; + return Success; /* UPDATE TIME VARIABLES FOR USE IN EVENTS */ @@ -798,7 +798,7 @@ XvdiGetStill( int status; if(!drw_w || !drw_h || !vid_w || !vid_h) - return BadValue; + return Success; /* UPDATE TIME VARIABLES FOR USE IN EVENTS */ @@ -1125,9 +1125,12 @@ XvdiMatchPort( while (nf--) { - if ((pf->depth == pDraw->depth) && - ((pDraw->type == DRAWABLE_PIXMAP) || - (wVisual(((WindowPtr)pDraw)) == pf->visual))) + if ((pf->depth == pDraw->depth) +#if 0 + && ((pDraw->type == DRAWABLE_PIXMAP) || + (wVisual(((WindowPtr)pDraw)) == pf->visual)) +#endif + ) return Success; pf++; } diff --git a/xc/programs/Xserver/Xext/xvmod.c b/xc/programs/Xserver/Xext/xvmod.c index c8846eb8a..21b115bd2 100644 --- a/xc/programs/Xserver/Xext/xvmod.c +++ b/xc/programs/Xserver/Xext/xvmod.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ +/* $XFree86$ */ #include "X.h" #include "misc.h" diff --git a/xc/programs/Xserver/Xext/xvmodproc.h b/xc/programs/Xserver/Xext/xvmodproc.h index 978c400f2..991365816 100644 --- a/xc/programs/Xserver/Xext/xvmodproc.h +++ b/xc/programs/Xserver/Xext/xvmodproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ +/* $XFree86$ */ extern int (*XvGetScreenIndexProc)(void); extern unsigned long (*XvGetRTPortProc)(void); diff --git a/xc/programs/Xserver/Xi/Imakefile b/xc/programs/Xserver/Xi/Imakefile index 51245ff40..1e43714df 100644 --- a/xc/programs/Xserver/Xi/Imakefile +++ b/xc/programs/Xserver/Xi/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile /main/8 1996/09/28 16:56:49 rws $ -XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.2 1999/04/17 09:08:22 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.1 1996/12/23 06:29:11 dawes Exp $ #include <Server.tmpl> SRCS = allowev.c \ diff --git a/xc/programs/Xserver/Xi/allowev.c b/xc/programs/Xserver/Xi/allowev.c index 455be1705..001fe2fae 100644 --- a/xc/programs/Xserver/Xi/allowev.c +++ b/xc/programs/Xserver/Xi/allowev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.2 1998/10/04 09:36:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.1 1996/04/15 11:18:22 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/allowev.h b/xc/programs/Xserver/Xi/allowev.h index 950824927..c8fc9b0be 100644 --- a/xc/programs/Xserver/Xi/allowev.h +++ b/xc/programs/Xserver/Xi/allowev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.0 1996/03/29 22:12:48 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgdctl.c b/xc/programs/Xserver/Xi/chgdctl.c index 3d386d023..8b4834aac 100644 --- a/xc/programs/Xserver/Xi/chgdctl.c +++ b/xc/programs/Xserver/Xi/chgdctl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.2 1998/10/04 09:36:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.1 1996/05/06 05:56:00 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgdctl.h b/xc/programs/Xserver/Xi/chgdctl.h index 4d245388d..66d73faa7 100644 --- a/xc/programs/Xserver/Xi/chgdctl.h +++ b/xc/programs/Xserver/Xi/chgdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.0 1996/03/29 22:12:51 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgfctl.c b/xc/programs/Xserver/Xi/chgfctl.c index 9a8c0f0b9..3678a5df7 100644 --- a/xc/programs/Xserver/Xi/chgfctl.c +++ b/xc/programs/Xserver/Xi/chgfctl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.2 1998/10/04 09:36:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.1 1996/05/06 05:56:01 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgfctl.h b/xc/programs/Xserver/Xi/chgfctl.h index ebf41976c..3db61dfcb 100644 --- a/xc/programs/Xserver/Xi/chgfctl.h +++ b/xc/programs/Xserver/Xi/chgfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.0 1996/03/29 22:12:54 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgkbd.c b/xc/programs/Xserver/Xi/chgkbd.c index 2f9522caf..468228f2c 100644 --- a/xc/programs/Xserver/Xi/chgkbd.c +++ b/xc/programs/Xserver/Xi/chgkbd.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.3 1998/10/04 09:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.2 1996/03/29 22:12:55 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgkbd.h b/xc/programs/Xserver/Xi/chgkbd.h index 98b95a6b0..64d41499f 100644 --- a/xc/programs/Xserver/Xi/chgkbd.h +++ b/xc/programs/Xserver/Xi/chgkbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.0 1996/03/29 22:12:56 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgkmap.c b/xc/programs/Xserver/Xi/chgkmap.c index 5862a51e2..c38449029 100644 --- a/xc/programs/Xserver/Xi/chgkmap.c +++ b/xc/programs/Xserver/Xi/chgkmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.1 1998/10/04 09:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.0 1996/03/29 22:12:57 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgkmap.h b/xc/programs/Xserver/Xi/chgkmap.h index fa7035988..d82f366a1 100644 --- a/xc/programs/Xserver/Xi/chgkmap.h +++ b/xc/programs/Xserver/Xi/chgkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.0 1996/03/29 22:12:59 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgprop.c b/xc/programs/Xserver/Xi/chgprop.c index 89a6515a5..fce0c7e7b 100644 --- a/xc/programs/Xserver/Xi/chgprop.c +++ b/xc/programs/Xserver/Xi/chgprop.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.1 1998/10/04 09:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.0 1996/03/29 22:13:00 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgprop.h b/xc/programs/Xserver/Xi/chgprop.h index a72c6f036..3f180ade5 100644 --- a/xc/programs/Xserver/Xi/chgprop.h +++ b/xc/programs/Xserver/Xi/chgprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.0 1996/03/29 22:13:01 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/chgptr.c b/xc/programs/Xserver/Xi/chgptr.c index 0022e99f0..34e215a33 100644 --- a/xc/programs/Xserver/Xi/chgptr.c +++ b/xc/programs/Xserver/Xi/chgptr.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.4 1998/10/04 09:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.3 1996/04/15 11:18:30 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/chgptr.h b/xc/programs/Xserver/Xi/chgptr.h index 93f5822fc..aaa7d87f5 100644 --- a/xc/programs/Xserver/Xi/chgptr.h +++ b/xc/programs/Xserver/Xi/chgptr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.0 1996/03/29 22:13:03 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/closedev.c b/xc/programs/Xserver/Xi/closedev.c index 2e89c5a1c..d6a0f3210 100644 --- a/xc/programs/Xserver/Xi/closedev.c +++ b/xc/programs/Xserver/Xi/closedev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.1 1998/10/04 09:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.0 1996/03/29 22:13:05 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/closedev.h b/xc/programs/Xserver/Xi/closedev.h index f71336e96..ab2d3a993 100644 --- a/xc/programs/Xserver/Xi/closedev.h +++ b/xc/programs/Xserver/Xi/closedev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.0 1996/03/29 22:13:07 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/devbell.c b/xc/programs/Xserver/Xi/devbell.c index 08c294d5f..d0bb1f281 100644 --- a/xc/programs/Xserver/Xi/devbell.c +++ b/xc/programs/Xserver/Xi/devbell.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.1 1998/10/04 09:37:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.0 1996/03/29 22:13:08 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/devbell.h b/xc/programs/Xserver/Xi/devbell.h index cccb31de9..0beaad400 100644 --- a/xc/programs/Xserver/Xi/devbell.h +++ b/xc/programs/Xserver/Xi/devbell.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.0 1996/03/29 22:13:09 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/exevents.c b/xc/programs/Xserver/Xi/exevents.c index fa0d0012d..7d7dc8538 100644 --- a/xc/programs/Xserver/Xi/exevents.c +++ b/xc/programs/Xserver/Xi/exevents.c @@ -40,7 +40,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.7 1998/12/05 14:39:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.6 1998/10/04 09:37:01 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/exglobals.h b/xc/programs/Xserver/Xi/exglobals.h index f07618b84..6f397a2d0 100644 --- a/xc/programs/Xserver/Xi/exglobals.h +++ b/xc/programs/Xserver/Xi/exglobals.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.2 1996/05/06 05:56:03 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/extinit.c b/xc/programs/Xserver/Xi/extinit.c index 09aa9470f..5eaefd515 100644 --- a/xc/programs/Xserver/Xi/extinit.c +++ b/xc/programs/Xserver/Xi/extinit.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.4 1998/10/04 09:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.3 1997/05/17 12:52:24 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/getbmap.c b/xc/programs/Xserver/Xi/getbmap.c index d72241fcb..572801d68 100644 --- a/xc/programs/Xserver/Xi/getbmap.c +++ b/xc/programs/Xserver/Xi/getbmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.1 1998/10/04 09:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.0 1996/03/29 22:13:14 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/getbmap.h b/xc/programs/Xserver/Xi/getbmap.h index 30de6f5c6..b44652657 100644 --- a/xc/programs/Xserver/Xi/getbmap.h +++ b/xc/programs/Xserver/Xi/getbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.0 1996/03/29 22:13:16 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getdctl.c b/xc/programs/Xserver/Xi/getdctl.c index 0d9494055..6d56e9974 100644 --- a/xc/programs/Xserver/Xi/getdctl.c +++ b/xc/programs/Xserver/Xi/getdctl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.2 1998/10/04 09:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.1 1996/03/29 22:13:17 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/getdctl.h b/xc/programs/Xserver/Xi/getdctl.h index d22675f4f..6ac2911a5 100644 --- a/xc/programs/Xserver/Xi/getdctl.h +++ b/xc/programs/Xserver/Xi/getdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.0 1996/03/29 22:13:18 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getfctl.c b/xc/programs/Xserver/Xi/getfctl.c index de314f6cf..7f1003073 100644 --- a/xc/programs/Xserver/Xi/getfctl.c +++ b/xc/programs/Xserver/Xi/getfctl.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.2 1998/10/04 09:37:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.1 1996/03/29 22:13:19 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/getfctl.h b/xc/programs/Xserver/Xi/getfctl.h index e51830d49..3b8e4d920 100644 --- a/xc/programs/Xserver/Xi/getfctl.h +++ b/xc/programs/Xserver/Xi/getfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.0 1996/03/29 22:13:20 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getfocus.c b/xc/programs/Xserver/Xi/getfocus.c index 28a261486..529ecdac3 100644 --- a/xc/programs/Xserver/Xi/getfocus.c +++ b/xc/programs/Xserver/Xi/getfocus.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.1 1998/10/04 09:37:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.0 1996/03/29 22:13:22 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/getfocus.h b/xc/programs/Xserver/Xi/getfocus.h index 8a21c860c..a0240c640 100644 --- a/xc/programs/Xserver/Xi/getfocus.h +++ b/xc/programs/Xserver/Xi/getfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.0 1996/03/29 22:13:23 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getkmap.c b/xc/programs/Xserver/Xi/getkmap.c index be06a12eb..8ef8f9a45 100644 --- a/xc/programs/Xserver/Xi/getkmap.c +++ b/xc/programs/Xserver/Xi/getkmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.2 1998/10/04 09:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.1 1996/04/15 11:18:40 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/getkmap.h b/xc/programs/Xserver/Xi/getkmap.h index 780a2e016..33176ec70 100644 --- a/xc/programs/Xserver/Xi/getkmap.h +++ b/xc/programs/Xserver/Xi/getkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.0 1996/03/29 22:13:25 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getmmap.c b/xc/programs/Xserver/Xi/getmmap.c index e2794c9fd..e9fbfee86 100644 --- a/xc/programs/Xserver/Xi/getmmap.c +++ b/xc/programs/Xserver/Xi/getmmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.1 1998/10/04 09:37:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.0 1996/03/29 22:13:27 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/getmmap.h b/xc/programs/Xserver/Xi/getmmap.h index cf9ca000d..cee83defa 100644 --- a/xc/programs/Xserver/Xi/getmmap.h +++ b/xc/programs/Xserver/Xi/getmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.0 1996/03/29 22:13:28 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getprop.c b/xc/programs/Xserver/Xi/getprop.c index 19dfd110a..a7968d76f 100644 --- a/xc/programs/Xserver/Xi/getprop.c +++ b/xc/programs/Xserver/Xi/getprop.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.3 1998/10/04 09:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.2 1996/04/15 11:18:43 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/getprop.h b/xc/programs/Xserver/Xi/getprop.h index 4f467e041..f71f621c7 100644 --- a/xc/programs/Xserver/Xi/getprop.h +++ b/xc/programs/Xserver/Xi/getprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.0 1996/03/29 22:13:30 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getselev.c b/xc/programs/Xserver/Xi/getselev.c index 9c0839e34..c6fe42d71 100644 --- a/xc/programs/Xserver/Xi/getselev.c +++ b/xc/programs/Xserver/Xi/getselev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.3 1998/10/04 09:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.2 1996/04/15 11:18:48 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/xc/programs/Xserver/Xi/getselev.h b/xc/programs/Xserver/Xi/getselev.h index 0d4e6a467..bda408f86 100644 --- a/xc/programs/Xserver/Xi/getselev.h +++ b/xc/programs/Xserver/Xi/getselev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.0 1996/03/29 22:13:32 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/getvers.c b/xc/programs/Xserver/Xi/getvers.c index 1828eb6fa..e10f83329 100644 --- a/xc/programs/Xserver/Xi/getvers.c +++ b/xc/programs/Xserver/Xi/getvers.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.1 1998/10/04 09:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.0 1996/03/29 22:13:34 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/getvers.h b/xc/programs/Xserver/Xi/getvers.h index 1646633e9..9daaf3033 100644 --- a/xc/programs/Xserver/Xi/getvers.h +++ b/xc/programs/Xserver/Xi/getvers.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.0 1996/03/29 22:13:35 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/grabdev.c b/xc/programs/Xserver/Xi/grabdev.c index 088b0c698..0894d6746 100644 --- a/xc/programs/Xserver/Xi/grabdev.c +++ b/xc/programs/Xserver/Xi/grabdev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.1 1998/10/04 09:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.0 1996/03/29 22:13:37 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/grabdev.h b/xc/programs/Xserver/Xi/grabdev.h index 382e06b99..9faade83d 100644 --- a/xc/programs/Xserver/Xi/grabdev.h +++ b/xc/programs/Xserver/Xi/grabdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.0 1996/03/29 22:13:38 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/grabdevb.c b/xc/programs/Xserver/Xi/grabdevb.c index 72c6a7c42..aad7230da 100644 --- a/xc/programs/Xserver/Xi/grabdevb.c +++ b/xc/programs/Xserver/Xi/grabdevb.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.1 1998/10/04 09:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.0 1996/03/29 22:13:40 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/grabdevb.h b/xc/programs/Xserver/Xi/grabdevb.h index 39b96bcf1..a86750ee8 100644 --- a/xc/programs/Xserver/Xi/grabdevb.h +++ b/xc/programs/Xserver/Xi/grabdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.0 1996/03/29 22:13:41 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/grabdevk.c b/xc/programs/Xserver/Xi/grabdevk.c index 22246fc8f..06a29c2db 100644 --- a/xc/programs/Xserver/Xi/grabdevk.c +++ b/xc/programs/Xserver/Xi/grabdevk.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.1 1998/10/04 09:37:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.0 1996/03/29 22:13:42 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/grabdevk.h b/xc/programs/Xserver/Xi/grabdevk.h index 7e533fe16..41c5aa7d9 100644 --- a/xc/programs/Xserver/Xi/grabdevk.h +++ b/xc/programs/Xserver/Xi/grabdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.0 1996/03/29 22:13:43 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/gtmotion.c b/xc/programs/Xserver/Xi/gtmotion.c index 9c9696a6e..f2fed7d7f 100644 --- a/xc/programs/Xserver/Xi/gtmotion.c +++ b/xc/programs/Xserver/Xi/gtmotion.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.4 1998/10/04 09:37:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.3 1997/05/03 09:15:49 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/gtmotion.h b/xc/programs/Xserver/Xi/gtmotion.h index 1139a1a76..5bb8abd97 100644 --- a/xc/programs/Xserver/Xi/gtmotion.h +++ b/xc/programs/Xserver/Xi/gtmotion.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.0 1996/03/29 22:13:46 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/listdev.c b/xc/programs/Xserver/Xi/listdev.c index 204e510e2..f37250b15 100644 --- a/xc/programs/Xserver/Xi/listdev.c +++ b/xc/programs/Xserver/Xi/listdev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.2 1998/10/04 09:37:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.1 1996/03/29 22:13:47 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/listdev.h b/xc/programs/Xserver/Xi/listdev.h index d1ecde2ab..ce587167b 100644 --- a/xc/programs/Xserver/Xi/listdev.h +++ b/xc/programs/Xserver/Xi/listdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.0 1996/03/29 22:13:48 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/opendev.c b/xc/programs/Xserver/Xi/opendev.c index c02f4a469..c600b7d6c 100644 --- a/xc/programs/Xserver/Xi/opendev.c +++ b/xc/programs/Xserver/Xi/opendev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.1 1998/10/04 09:37:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.0 1996/03/29 22:13:49 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/opendev.h b/xc/programs/Xserver/Xi/opendev.h index 0813e59ad..1702fae6a 100644 --- a/xc/programs/Xserver/Xi/opendev.h +++ b/xc/programs/Xserver/Xi/opendev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.0 1996/03/29 22:13:51 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/queryst.c b/xc/programs/Xserver/Xi/queryst.c index f2187d391..65de0601f 100644 --- a/xc/programs/Xserver/Xi/queryst.c +++ b/xc/programs/Xserver/Xi/queryst.c @@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.3 1998/10/04 09:37:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.2 1996/04/15 11:18:59 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/queryst.h b/xc/programs/Xserver/Xi/queryst.h index 6d6b4b65b..e57dc412d 100644 --- a/xc/programs/Xserver/Xi/queryst.h +++ b/xc/programs/Xserver/Xi/queryst.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.0 1996/03/29 22:13:53 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/selectev.c b/xc/programs/Xserver/Xi/selectev.c index 5260bcd83..06244fab5 100644 --- a/xc/programs/Xserver/Xi/selectev.c +++ b/xc/programs/Xserver/Xi/selectev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.1 1998/10/04 09:37:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.0 1996/03/29 22:13:54 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/selectev.h b/xc/programs/Xserver/Xi/selectev.h index 79332e199..390c74f26 100644 --- a/xc/programs/Xserver/Xi/selectev.h +++ b/xc/programs/Xserver/Xi/selectev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.0 1996/03/29 22:13:56 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/sendexev.c b/xc/programs/Xserver/Xi/sendexev.c index 9a94c78ad..f829cce7e 100644 --- a/xc/programs/Xserver/Xi/sendexev.c +++ b/xc/programs/Xserver/Xi/sendexev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.1 1998/10/04 09:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.0 1996/03/29 22:13:57 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/sendexev.h b/xc/programs/Xserver/Xi/sendexev.h index 876bbe647..3b9d23b29 100644 --- a/xc/programs/Xserver/Xi/sendexev.h +++ b/xc/programs/Xserver/Xi/sendexev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.0 1996/03/29 22:13:58 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/setbmap.c b/xc/programs/Xserver/Xi/setbmap.c index 6c2102891..91c1ed734 100644 --- a/xc/programs/Xserver/Xi/setbmap.c +++ b/xc/programs/Xserver/Xi/setbmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.1 1998/10/04 09:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.0 1996/03/29 22:14:00 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/setbmap.h b/xc/programs/Xserver/Xi/setbmap.h index 3e85c0a58..6785bbd59 100644 --- a/xc/programs/Xserver/Xi/setbmap.h +++ b/xc/programs/Xserver/Xi/setbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.0 1996/03/29 22:14:01 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/setdval.c b/xc/programs/Xserver/Xi/setdval.c index d8f55484f..a08dbc6b6 100644 --- a/xc/programs/Xserver/Xi/setdval.c +++ b/xc/programs/Xserver/Xi/setdval.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.1 1998/10/04 09:37:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.0 1996/03/29 22:14:02 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/setdval.h b/xc/programs/Xserver/Xi/setdval.h index 5a8b42192..e8c9ce20e 100644 --- a/xc/programs/Xserver/Xi/setdval.h +++ b/xc/programs/Xserver/Xi/setdval.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.0 1996/03/29 22:14:03 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/setfocus.c b/xc/programs/Xserver/Xi/setfocus.c index 290994e88..80bce2b16 100644 --- a/xc/programs/Xserver/Xi/setfocus.c +++ b/xc/programs/Xserver/Xi/setfocus.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.1 1998/10/04 09:37:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.0 1996/03/29 22:14:05 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/setfocus.h b/xc/programs/Xserver/Xi/setfocus.h index 44a98193a..0ae14b42d 100644 --- a/xc/programs/Xserver/Xi/setfocus.h +++ b/xc/programs/Xserver/Xi/setfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.0 1996/03/29 22:14:07 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/setmmap.c b/xc/programs/Xserver/Xi/setmmap.c index 4c6de8b62..cfe05414c 100644 --- a/xc/programs/Xserver/Xi/setmmap.c +++ b/xc/programs/Xserver/Xi/setmmap.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.1 1998/10/04 09:37:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.0 1996/03/29 22:14:08 dawes Exp $ */ /******************************************************************** * diff --git a/xc/programs/Xserver/Xi/setmmap.h b/xc/programs/Xserver/Xi/setmmap.h index 925373e9e..51724ee8e 100644 --- a/xc/programs/Xserver/Xi/setmmap.h +++ b/xc/programs/Xserver/Xi/setmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.0 1996/03/29 22:14:09 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/setmode.c b/xc/programs/Xserver/Xi/setmode.c index 34bdc6748..40b9b45b8 100644 --- a/xc/programs/Xserver/Xi/setmode.c +++ b/xc/programs/Xserver/Xi/setmode.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.1 1998/10/04 09:37:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.0 1996/03/29 22:14:11 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/setmode.h b/xc/programs/Xserver/Xi/setmode.h index cd27ba146..05c0122dd 100644 --- a/xc/programs/Xserver/Xi/setmode.h +++ b/xc/programs/Xserver/Xi/setmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.0 1996/03/29 22:14:12 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/stubs.c b/xc/programs/Xserver/Xi/stubs.c index 00b3fbc25..1590cdaf4 100644 --- a/xc/programs/Xserver/Xi/stubs.c +++ b/xc/programs/Xserver/Xi/stubs.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.2 1998/10/04 09:37:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.1 1996/03/30 05:25:21 dawes Exp $ */ /* * stubs.c -- stub routines for the X server side of the XINPUT diff --git a/xc/programs/Xserver/Xi/ungrdev.c b/xc/programs/Xserver/Xi/ungrdev.c index 79cc349e2..cc5447482 100644 --- a/xc/programs/Xserver/Xi/ungrdev.c +++ b/xc/programs/Xserver/Xi/ungrdev.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.1 1998/10/04 09:37:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.0 1996/03/29 22:14:15 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/ungrdev.h b/xc/programs/Xserver/Xi/ungrdev.h index 6b00a3ef6..4ecafbf52 100644 --- a/xc/programs/Xserver/Xi/ungrdev.h +++ b/xc/programs/Xserver/Xi/ungrdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.0 1996/03/29 22:14:16 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/ungrdevb.c b/xc/programs/Xserver/Xi/ungrdevb.c index 3bbec1f6a..6f31be9b4 100644 --- a/xc/programs/Xserver/Xi/ungrdevb.c +++ b/xc/programs/Xserver/Xi/ungrdevb.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.2 1998/10/04 09:37:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.1 1996/04/15 11:19:09 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/ungrdevb.h b/xc/programs/Xserver/Xi/ungrdevb.h index d416c73c6..7c786f2aa 100644 --- a/xc/programs/Xserver/Xi/ungrdevb.h +++ b/xc/programs/Xserver/Xi/ungrdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.0 1996/03/29 22:14:19 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xi/ungrdevk.c b/xc/programs/Xserver/Xi/ungrdevk.c index c9eec4d4c..a787f64f3 100644 --- a/xc/programs/Xserver/Xi/ungrdevk.c +++ b/xc/programs/Xserver/Xi/ungrdevk.c @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.2 1998/10/04 09:37:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.1 1996/04/15 11:19:11 dawes Exp $ */ /*********************************************************************** * diff --git a/xc/programs/Xserver/Xi/ungrdevk.h b/xc/programs/Xserver/Xi/ungrdevk.h index 26dc14ae0..6d2d31827 100644 --- a/xc/programs/Xserver/Xi/ungrdevk.h +++ b/xc/programs/Xserver/Xi/ungrdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.0 1996/03/29 22:14:21 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey <dickey@clark.net> diff --git a/xc/programs/Xserver/Xserver.man b/xc/programs/Xserver/Xserver.man index 593082718..e35d7f333 100644 --- a/xc/programs/Xserver/Xserver.man +++ b/xc/programs/Xserver/Xserver.man @@ -18,7 +18,7 @@ .\" 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/Xserver/Xserver.man,v 3.12 1999/03/14 03:21:21 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.11tsi Exp $ .TH XSERVER 1 "Release 6.4" "X Version 11" .SH NAME Xserver \- X Window System display server |