Index: config/cf/OpenBSDLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/OpenBSDLib.tmpl,v retrieving revision 1.5 diff -u -u -r1.5 OpenBSDLib.tmpl --- config/cf/OpenBSDLib.tmpl 11 Aug 2004 19:46:20 -0000 1.5 +++ config/cf/OpenBSDLib.tmpl 2 Sep 2004 01:05:12 -0000 @@ -105,7 +105,10 @@ # define SharedXaRev 2.0 # endif # ifndef SharedXawRev -# define SharedXawRev 8.0 +# define SharedXawRev 9.0 +# endif +# ifndef SharedXaw7Rev +# define SharedXaw7Rev 8.0 # endif # ifndef SharedXaw6Rev # define SharedXaw6Rev 7.1 Index: config/cf/WinLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/WinLib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 WinLib.tmpl --- config/cf/WinLib.tmpl 16 Aug 2004 16:36:13 -0000 1.3 +++ config/cf/WinLib.tmpl 2 Sep 2004 01:05:12 -0000 @@ -6,7 +6,7 @@ #define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) -#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXiReqs $(LDPRELIBS) $(XLIB) Index: config/cf/X11.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v retrieving revision 1.32 diff -u -u -r1.32 X11.tmpl --- config/cf/X11.tmpl 29 Aug 2004 21:06:00 -0000 1.32 +++ config/cf/X11.tmpl 2 Sep 2004 01:05:13 -0000 @@ -2961,6 +2961,14 @@ UnsharedLibReferences(XA,Xa,$(XALIBSRC)) #endif +#ifndef BuildXaw +#define BuildXaw YES +#endif + + /* AWIDGETSRC is needed by libXaw6 and libXaw7 */ + AWIDGETSRC = $(LIBSRC)/Xaw + +#if BuildXaw #ifndef SharedLibXaw #define SharedLibXaw HasSharedLibraries #endif @@ -2973,15 +2981,50 @@ #ifndef ProfileLibXaw #define ProfileLibXaw NO /* profiled widget library */ #endif - AWIDGETSRC = $(LIBSRC)/Xaw #if SharedLibXaw #ifndef SharedXawRev -#define SharedXawRev 7.0 +#define SharedXawRev 8.0 #endif SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) #else ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir) #endif +#endif + +#ifndef BuildXaw7 +#define BuildXaw7 HasSharedLibraries +#endif + +#if BuildXaw7 +#ifndef SharedLibXaw7 +#define SharedLibXaw7 HasSharedLibraries +#endif +#ifndef NormalLibXaw7 +#define NormalLibXaw7 NO +#endif +#ifndef DebugLibXaw7 +#define DebugLibXaw7 NO /* debugged widget library */ +#endif +#ifndef ProfileLibXaw7 +#define ProfileLibXaw7 NO /* profiled widget library */ +#endif + AWIDGET7SRC = $(LIBSRC)/Xaw7 +#if SharedLibXaw7 +#ifndef SharedXaw7Rev +#define SharedXaw7Rev 7.0 +#endif +SharedDSLibReferences(XAW7,Xaw,$(AWIDGET7SRC),SOXAW7REV,SharedXaw7Rev) +#if !BuildXaw +SharedDSLibReferences(XAW,Xaw,$(AWIDGET7SRC),SOXAWREV,SharedXawRev) +#endif +#else +ProjectUnsharedLibReferences(XAW7,Xaw,$(AWIDGET7SRC),XBuildLibDir) +#if !BuildXaw +ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET7SRC),XBuildLibDir) +#endif +#endif +#endif + #ifndef BuildXaw6 #define BuildXaw6 HasSharedLibraries @@ -3006,8 +3049,14 @@ #define SharedXaw6Rev 6.1 #endif SharedDSLibReferences(XAW6,Xaw,$(AWIDGET6SRC),SOXAW6REV,SharedXaw6Rev) +#if !BuildXaw && !BuildXaw7 +SharedDSLibReferences(XAW,Xaw,$(AWIDGET6SRC),SOXAWREV,SharedXawRev) +#endif #else ProjectUnsharedLibReferences(XAW6,Xaw,$(AWIDGET6SRC),XBuildLibDir) +#if !BuildXaw && !BuildXaw7 +ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGET6SRC),XBuildLibDir) +#endif #endif #endif @@ -3862,11 +3911,42 @@ # define XkbuiDepLibs $(DEPXKBFILELIB) #endif +#ifndef ExtraXawReqs +# if BuildXaw +# define ExtraXawReqs $(XPLIB) +# else +# define ExtraXawReqs /**/ +# endif +#endif + +EXTRAXAWREQS = ExtraXawReqs + +#ifndef ExtraXawClientDepLibs +# if BuildXaw +# define ExtraXawClientDepLibs $(DEPXPLIB) +# else +# define ExtraXawClientDepLibs /**/ +# endif +#endif + +EXTRAXAWCLIENTDEPLIBS = ExtraXawClientDepLibs + #ifndef XawClientDepLibs -#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(DEPXLIB) +#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(EXTRAXAWCLIENTDEPLIBS) $(DEPXLIB) #endif + +#ifndef ExtraXawClientLibs +# if BuildXaw +# define ExtraXawClientLibs $(XPLIB) +# else +# define ExtraXawClientLibs /**/ +# endif +#endif + +EXTRAXAWCLIENTLIBS = ExtraXawClientLibs + #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #ifndef SharedLibXTrap Index: config/cf/bsdLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/bsdLib.tmpl,v retrieving revision 1.4 diff -u -u -r1.4 bsdLib.tmpl --- config/cf/bsdLib.tmpl 16 Aug 2004 16:36:13 -0000 1.4 +++ config/cf/bsdLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -43,7 +43,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif /* Allow for libpthread, as overridden by OS definitions */ @@ -56,7 +56,10 @@ #ifndef SharedXtReqs #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) #endif -#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#ifndef SharedXawReqs +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) +#endif +#define SharedXaw7Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) Index: config/cf/bsdiLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/bsdiLib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 bsdiLib.tmpl --- config/cf/bsdiLib.tmpl 16 Aug 2004 16:36:13 -0000 1.3 +++ config/cf/bsdiLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -16,7 +16,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #define FrescoSysLibs CplusplusLibC MathLibrary @@ -25,7 +25,8 @@ #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) Index: config/cf/cygwin.rules =================================================================== RCS file: /cvs/xorg/xc/config/cf/cygwin.rules,v retrieving revision 1.8 diff -u -u -r1.8 cygwin.rules --- config/cf/cygwin.rules 27 Jul 2004 09:53:14 -0000 1.8 +++ config/cf/cygwin.rules 2 Sep 2004 01:05:13 -0000 @@ -15,6 +15,7 @@ #define SharedLibXmu YES #define SharedLibXt YES #define SharedLibFont NO +#define SharedLibXaw7 YES #define SharedLibXaw6 YES #define SharedLibSM YES #define SharedLibICE YES Index: config/cf/cygwin.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/cygwin.tmpl,v retrieving revision 1.6 diff -u -u -r1.6 cygwin.tmpl --- config/cf/cygwin.tmpl 17 Aug 2004 18:15:46 -0000 1.6 +++ config/cf/cygwin.tmpl 2 Sep 2004 01:05:13 -0000 @@ -5,7 +5,8 @@ #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XONLYLIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) @@ -56,7 +57,7 @@ #endif #ifndef XawClientLibs -# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif Index: config/cf/darwinLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/darwinLib.tmpl,v retrieving revision 1.5 diff -u -u -r1.5 darwinLib.tmpl --- config/cf/darwinLib.tmpl 18 Aug 2004 23:12:49 -0000 1.5 +++ config/cf/darwinLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -10,7 +10,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif /* Allow for libpthread, as overridden by OS definitions */ @@ -27,7 +27,8 @@ #define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) #define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) Index: config/cf/gnuLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/gnuLib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 gnuLib.tmpl --- config/cf/gnuLib.tmpl 16 Aug 2004 16:36:13 -0000 1.3 +++ config/cf/gnuLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -11,7 +11,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #define SharedX11Reqs @@ -19,7 +19,8 @@ #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) Index: config/cf/hpLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/hpLib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 hpLib.tmpl --- config/cf/hpLib.tmpl 16 Aug 2004 16:36:13 -0000 1.3 +++ config/cf/hpLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -12,7 +12,7 @@ #define SharedOldXReqs $(XONLYLIB) #define SharedX11Reqs SharedThreadReqs #define SharedXtReqs $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs -#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) #define SharedXmuReqs $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(XONLYLIB) #define SharedXiReqs $(XLIB) Index: config/cf/ibmLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/ibmLib.tmpl,v retrieving revision 1.4 diff -u -u -r1.4 ibmLib.tmpl --- config/cf/ibmLib.tmpl 30 Aug 2004 13:32:51 -0000 1.4 +++ config/cf/ibmLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -35,7 +35,8 @@ #define SharedXmuuReqs $(XLIBONLY) #define SharedOldXReqs $(XLIBONLY) #define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs -#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB) +#define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) $(XPMLIB) +#define SharedXaw7Reqs $(XMULIB) $(XTOOLLIB) $(XLIB) $(XPMLIB) #define SharedXaw6Reqs $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXiReqs $(XLIB) #define SharedXtstReqs $(XLIB) Index: config/cf/lnxLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/lnxLib.tmpl,v retrieving revision 1.4 diff -u -u -r1.4 lnxLib.tmpl --- config/cf/lnxLib.tmpl 16 Aug 2004 16:36:13 -0000 1.4 +++ config/cf/lnxLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -14,7 +14,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #define SharedX11Reqs @@ -22,7 +22,8 @@ #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) Index: config/cf/os2Lib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/os2Lib.tmpl,v retrieving revision 1.4 diff -u -u -r1.4 os2Lib.tmpl --- config/cf/os2Lib.tmpl 16 Aug 2004 16:36:13 -0000 1.4 +++ config/cf/os2Lib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -18,7 +18,8 @@ #define SharedOldXReqs $(LDPRELIB) $(XONLYLIB) #define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) @@ -72,6 +73,7 @@ #define SharedXtRev /**/ #define SharedXaRev /**/ #define SharedXawRev /**/ +#define SharedXaw7Rev 7 #define SharedXaw6Rev 6 #define SharedXiRev /**/ #define SharedXtstRev /**/ @@ -110,6 +112,7 @@ #define SDlibXmu -lXmu_s #define SDlibXt -lXt_s #define SDlibXaw -lXaw_s +#define SDlibXaw7 -lXaw_s #define SDlibXaw6 -lXaw_s #define SDlibXi -lXi_s #define SDlibXtst -lXtst_s @@ -124,6 +127,7 @@ #define SDlibXmu -lXmu #define SDlibXt -lXt #define SDlibXaw -lXaw +#define SDlibXaw7 -lXaw #define SDlibXaw6 -lXaw #define SDlibXi -lXi #define SDlibXtst -lXtst @@ -150,7 +154,7 @@ DEPXMULIB = XMULIB = _Use(SDlibXmu,-L$(XMUSRC) SDlibXmu) $(XLIB) #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #endif #if SharedOldX @@ -165,6 +169,10 @@ DEPXAWLIB = XAWLIB = _Use(SDlibXaw,-L$(AWIDGETSRC) SDlibXaw) #endif +#if SharedLibXaw7 + DEPXAW7LIB = + XAW7LIB = _Use(SDlibXaw7,-L$(AWIDGETSRC) SDlibXaw7) +#endif #if SharedLibXaw6 DEPXAW6LIB = XAW6LIB = _Use(SDlibXaw6,-L$(AWIDGETSRC) SDlibXaw6) Index: config/cf/osfLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/osfLib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 osfLib.tmpl --- config/cf/osfLib.tmpl 16 Aug 2004 16:36:13 -0000 1.3 +++ config/cf/osfLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -20,9 +20,9 @@ #endif #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs #if ModernOSF1 -#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) #else -#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) -init _XawFixupVendorShell +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(EXTRAXAWREQS) $(XLIB) -init _XawFixupVendorShell #endif #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) Index: config/cf/sco5.cf =================================================================== RCS file: /cvs/xorg/xc/config/cf/sco5.cf,v retrieving revision 1.4 diff -u -u -r1.4 sco5.cf --- config/cf/sco5.cf 16 Aug 2004 16:36:13 -0000 1.4 +++ config/cf/sco5.cf 2 Sep 2004 01:05:13 -0000 @@ -216,7 +216,7 @@ #endif #ifndef XawClientLibs -#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) @@ -229,7 +229,8 @@ #define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedX11Reqs $(LDPRELIB) -lsocket -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) +#define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) Index: config/cf/sunLib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/sunLib.tmpl,v retrieving revision 1.5 diff -u -u -r1.5 sunLib.tmpl --- config/cf/sunLib.tmpl 16 Aug 2004 16:36:13 -0000 1.5 +++ config/cf/sunLib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -58,7 +58,8 @@ # define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc # define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc -# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc +# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc +# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc # define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc # define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc # define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc Index: config/cf/sv4Lib.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/sv4Lib.tmpl,v retrieving revision 1.3 diff -u -u -r1.3 sv4Lib.tmpl --- config/cf/sv4Lib.tmpl 16 Aug 2004 16:36:14 -0000 1.3 +++ config/cf/sv4Lib.tmpl 2 Sep 2004 01:05:13 -0000 @@ -13,7 +13,7 @@ XMULIB = $(XMULIBONLY) -z nodefs #endif #ifndef XawClientLibs -# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) #endif #if 0 Index: lib/Imakefile =================================================================== RCS file: /cvs/xorg/xc/lib/Imakefile,v retrieving revision 1.9 diff -u -u -r1.9 Imakefile --- lib/Imakefile 16 Aug 2004 16:36:14 -0000 1.9 +++ lib/Imakefile 2 Sep 2004 01:05:15 -0000 @@ -12,6 +12,14 @@ XAW6LIBDIR = Xaw6 #endif +#if BuildXaw7 && BuildLibraries +XAW7LIBDIR = Xaw7 +#endif + +#if BuildXaw && BuildLibraries +XAWLIBDIR = Xaw +#endif + #ifndef NeedBerklib #define NeedBerklib NO #endif @@ -210,7 +218,6 @@ XMULIBDIR = Xmu XMUULIBDIR = Xmuu XPMLIBDIR = Xpm -XAWLIBDIR = Xaw XTSTLIBDIR = Xtst FSLIBDIR = FS #endif @@ -220,8 +227,8 @@ $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \ $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \ $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \ - $(XPRINTLIBDIRS) $(XAW6LIBDIR) $(XAWLIBDIR) $(XINPUTLIBDIR) \ - $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \ + $(XPRINTLIBDIRS) $(XAW6LIBDIR) $(XAW7LIBDIR) $(XAWLIBDIR) \ + $(XINPUTLIBDIR) $(XTSTLIBDIR) $(FSLIBDIR) $(XKBLIBDIR) \ $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \ $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ Index: lib/Xaw/AllWidgets.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xaw/AllWidgets.c,v retrieving revision 1.4 diff -u -u -r1.4 AllWidgets.c --- lib/Xaw/AllWidgets.c 16 Aug 2004 16:36:14 -0000 1.4 +++ lib/Xaw/AllWidgets.c 2 Sep 2004 01:05:15 -0000 @@ -67,11 +67,9 @@ extern WidgetClass vendorShellWidgetClass; extern WidgetClass viewportWidgetClass; extern WidgetClass wmShellWidgetClass; -#ifndef OLDXAW -#ifdef XPRINT_IN_XAW +#if !defined(OLDXAW) && !defined(XAW7) extern WidgetClass xawPrintShellWidgetClass; #endif -#endif XmuWidgetNode XawWidgetArray[] = { { "applicationShell", &applicationShellWidgetClass }, @@ -116,11 +114,9 @@ { "vendorShell", &vendorShellWidgetClass }, { "viewport", &viewportWidgetClass }, { "wmShell", &wmShellWidgetClass }, -#ifndef OLDXAW -#ifdef XPRINT_IN_XAW +#if !defined(OLDXAW) && !defined(XAW7) { "printShell", &xawPrintShellWidgetClass }, #endif -#endif }; int XawWidgetCount = XtNumber(XawWidgetArray); Index: lib/Xaw/Imakefile =================================================================== RCS file: /cvs/xorg/xc/lib/Xaw/Imakefile,v retrieving revision 1.4 diff -u -u -r1.4 Imakefile --- lib/Xaw/Imakefile 16 Aug 2004 16:36:14 -0000 1.4 +++ lib/Xaw/Imakefile 2 Sep 2004 01:05:15 -0000 @@ -59,6 +59,8 @@ PannerP.h \ Porthole.h \ PortholeP.h \ + Print.h \ + PrintSP.h \ Repeater.h \ RepeaterP.h \ Reports.h \ @@ -120,6 +122,7 @@ Panner.c \ Pixmap.c \ Porthole.c \ + PrintShell.c \ Repeater.c \ Scrollbar.c \ Simple.c \ @@ -171,6 +174,7 @@ Panner.o \ Pixmap.o \ Porthole.o \ + PrintShell.o \ Repeater.o \ Scrollbar.o \ Simple.o \ Index: lib/Xaw/sharedlib.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xaw/sharedlib.c,v retrieving revision 1.3 diff -u -u -r1.3 sharedlib.c --- lib/Xaw/sharedlib.c 29 Jun 2004 15:53:10 -0000 1.3 +++ lib/Xaw/sharedlib.c 2 Sep 2004 01:05:15 -0000 @@ -59,7 +59,9 @@ #include #include #include +#if !defined(OLDXAW) && !defined(XAW7) #include +#endif extern AsciiSinkClassRec asciiSinkClassRec; WidgetClass asciiSinkObjectClass = (WidgetClass)&asciiSinkClassRec; @@ -169,7 +171,7 @@ extern ViewportClassRec viewportClassRec; WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec; -#ifndef OLDXAW +#if !defined(OLDXAW) && !defined(XAW7) extern XawPrintShellClassRec xawPrintShellClassRec; WidgetClass xawPrintShellWidgetClass = (WidgetClass) &xawPrintShellClassRec; #endif Index: lib/Xaw7/Imakefile =================================================================== RCS file: lib/Xaw7/Imakefile diff -N lib/Xaw7/Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lib/Xaw7/Imakefile 2 Sep 2004 01:05:15 -0000 @@ -0,0 +1,336 @@ +XCOMM $Xorg$ +#define DoNormalLib NormalLibXaw7 +#define DoSharedLib SharedLibXaw7 +#define DoExtraLib SharedLibXaw7 +#define DoDebugLib DebugLibXaw7 +#define DoProfileLib ProfileLibXaw7 +#define HasSharedData YES +#define LibName Xaw +#define SoRev SOXAW7REV + +#if BuildXaw +# define LibHeaders NO +# define NoSoSymlink +#else /* !BuildXaw */ +# define IncSubdir X11 +# define IncSubSubdir Xaw + +HEADERS = \ + AllWidgets.h \ + AsciiSink.h \ + AsciiSinkP.h \ + AsciiSrc.h \ + AsciiSrcP.h \ + AsciiText.h \ + AsciiTextP.h \ + Box.h \ + BoxP.h \ + Cardinals.h \ + Command.h \ + CommandP.h \ + Dialog.h \ + DialogP.h \ + Form.h \ + FormP.h \ + Grip.h \ + GripP.h \ + Label.h \ + LabelP.h \ + List.h \ + ListP.h \ + MenuButton.h \ + MenuButtoP.h \ + MultiSrc.h \ + MultiSrcP.h \ + MultiSink.h \ + MultiSinkP.h \ + Paned.h \ + PanedP.h \ + Panner.h \ + PannerP.h \ + Porthole.h \ + PortholeP.h \ + Repeater.h \ + RepeaterP.h \ + Reports.h \ + Scrollbar.h \ + ScrollbarP.h \ + Simple.h \ + SimpleP.h \ + SimpleMenu.h \ + SimpleMenP.h \ + Sme.h \ + SmeP.h \ + SmeBSB.h \ + SmeBSBP.h \ + SmeLine.h \ + SmeLineP.h \ + StripChart.h \ + StripCharP.h \ + Template.c \ + Template.h \ + TemplateP.h \ + Text.h \ + TextP.h \ + TextSink.h \ + TextSinkP.h \ + TextSrc.h \ + TextSrcP.h \ + Tip.h \ + TipP.h \ + Toggle.h \ + ToggleP.h \ + Tree.h \ + TreeP.h \ + VendorEP.h \ + Viewport.h \ + ViewportP.h \ + XawImP.h \ + XawInit.h +#endif /* !BuildXaw */ + +#ifdef SharedXaw7Reqs +REQUIREDLIBS = SharedXaw7Reqs +#endif + +DEFINES = XawI18nDefines -DXAW7 -DPROJECT_ROOT=\"$(PROJECTROOT)\" $(VENDOR_DEFINES) + + LINTLIBS = $(LINTXLIB) $(LINTXTOOL) + +SRCS = \ + Actions.c \ + AllWidgets.c \ + AsciiSink.c \ + AsciiSrc.c \ + AsciiText.c \ + Box.c \ + Command.c \ + Converters.c \ + Dialog.c \ + DisplayList.c \ + Form.c \ + Grip.c \ + Label.c \ + List.c \ + MenuButton.c \ + MultiSrc.c \ + MultiSink.c \ + OS.c \ + Paned.c \ + Panner.c \ + Pixmap.c \ + Porthole.c \ + Repeater.c \ + Scrollbar.c \ + Simple.c \ + SimpleMenu.c \ + Sme.c \ + SmeBSB.c \ + SmeLine.c \ + StripChart.c \ + Text.c \ + TextSink.c \ + TextSrc.c \ + TextAction.c \ + TextPop.c \ + TextTr.c \ + Tip.c \ + Toggle.c \ + Tree.c \ + Vendor.c \ + Viewport.c \ + XawIm.c \ + XawInit.c \ + XawI18n.c \ + sharedlib.c + +#if SharedDataSeparation +UNSHAREDOBJS = AllWidgets.o sharedlib.o +#endif + +OBJS = \ + Actions.o \ + AllWidgets.o \ + AsciiSink.o \ + AsciiSrc.o \ + AsciiText.o \ + Box.o \ + Command.o \ + Converters.o \ + Dialog.o \ + DisplayList.o \ + Form.o \ + Grip.o \ + Label.o \ + List.o \ + MenuButton.o \ + MultiSrc.o \ + MultiSink.o \ + OS.o \ + Paned.o \ + Panner.o \ + Pixmap.o \ + Porthole.o \ + Repeater.o \ + Scrollbar.o \ + Simple.o \ + SimpleMenu.o \ + Sme.o \ + SmeBSB.o \ + SmeLine.o \ + StripChart.o \ + Text.o \ + TextSink.o \ + TextSrc.o \ + TextAction.o \ + TextPop.o \ + TextTr.o \ + Tip.o \ + Toggle.o \ + Tree.o \ + Vendor.o \ + Viewport.o \ + XawIm.o \ + XawI18n.o \ + XawInit.o + +#include + +#if DoSharedLib && SharedDataSeparation +SpecialCObjectRule(sharedlib,NullParameter,$(SHLIBDEF)) +#endif + +#if !BuildXaw +MANSUFFIX = $(LIBMANSUFFIX) +InstallManPage(Xaw,$(LIBMANDIR)) +#endif + +#if SharedDataSeparation +UNSHAREDOBJS = AllWidgets.o sharedlib.o +#endif + +LinkSourceFile(Actions.c,$(AWIDGETSRC)) +LinkSourceFile(AllWidgets.c,$(AWIDGETSRC)) +LinkSourceFile(AsciiSink.c,$(AWIDGETSRC)) +LinkSourceFile(AsciiSrc.c,$(AWIDGETSRC)) +LinkSourceFile(AsciiText.c,$(AWIDGETSRC)) +LinkSourceFile(Box.c,$(AWIDGETSRC)) +LinkSourceFile(Command.c,$(AWIDGETSRC)) +LinkSourceFile(Converters.c,$(AWIDGETSRC)) +LinkSourceFile(Dialog.c,$(AWIDGETSRC)) +LinkSourceFile(DisplayList.c,$(AWIDGETSRC)) +LinkSourceFile(Form.c,$(AWIDGETSRC)) +LinkSourceFile(Grip.c,$(AWIDGETSRC)) +LinkSourceFile(Label.c,$(AWIDGETSRC)) +LinkSourceFile(List.c,$(AWIDGETSRC)) +LinkSourceFile(MenuButton.c,$(AWIDGETSRC)) +LinkSourceFile(MultiSrc.c,$(AWIDGETSRC)) +LinkSourceFile(MultiSink.c,$(AWIDGETSRC)) +LinkSourceFile(OS.c,$(AWIDGETSRC)) +LinkSourceFile(Paned.c,$(AWIDGETSRC)) +LinkSourceFile(Panner.c,$(AWIDGETSRC)) +LinkSourceFile(Pixmap.c,$(AWIDGETSRC)) +LinkSourceFile(Porthole.c,$(AWIDGETSRC)) +LinkSourceFile(Repeater.c,$(AWIDGETSRC)) +LinkSourceFile(Scrollbar.c,$(AWIDGETSRC)) +LinkSourceFile(Simple.c,$(AWIDGETSRC)) +LinkSourceFile(SimpleMenu.c,$(AWIDGETSRC)) +LinkSourceFile(Sme.c,$(AWIDGETSRC)) +LinkSourceFile(SmeBSB.c,$(AWIDGETSRC)) +LinkSourceFile(SmeLine.c,$(AWIDGETSRC)) +LinkSourceFile(StripChart.c,$(AWIDGETSRC)) +LinkSourceFile(Text.c,$(AWIDGETSRC)) +LinkSourceFile(TextSink.c,$(AWIDGETSRC)) +LinkSourceFile(TextSrc.c,$(AWIDGETSRC)) +LinkSourceFile(TextAction.c,$(AWIDGETSRC)) +LinkSourceFile(TextPop.c,$(AWIDGETSRC)) +LinkSourceFile(TextTr.c,$(AWIDGETSRC)) +LinkSourceFile(Tip.c,$(AWIDGETSRC)) +LinkSourceFile(Toggle.c,$(AWIDGETSRC)) +LinkSourceFile(Tree.c,$(AWIDGETSRC)) +LinkSourceFile(Vendor.c,$(AWIDGETSRC)) +LinkSourceFile(Viewport.c,$(AWIDGETSRC)) +LinkSourceFile(XawIm.c,$(AWIDGETSRC)) +LinkSourceFile(XawInit.c,$(AWIDGETSRC)) +LinkSourceFile(XawI18n.c,$(AWIDGETSRC)) +LinkSourceFile(sharedlib.c,$(AWIDGETSRC)) + +LinkSourceFile(AllWidgets.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiSink.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiSinkP.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiSrc.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiSrcP.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiText.h,$(AWIDGETSRC)) +LinkSourceFile(AsciiTextP.h,$(AWIDGETSRC)) +LinkSourceFile(Box.h,$(AWIDGETSRC)) +LinkSourceFile(BoxP.h,$(AWIDGETSRC)) +LinkSourceFile(Cardinals.h,$(AWIDGETSRC)) +LinkSourceFile(Command.h,$(AWIDGETSRC)) +LinkSourceFile(CommandP.h,$(AWIDGETSRC)) +LinkSourceFile(Dialog.h,$(AWIDGETSRC)) +LinkSourceFile(DialogP.h,$(AWIDGETSRC)) +LinkSourceFile(Form.h,$(AWIDGETSRC)) +LinkSourceFile(FormP.h,$(AWIDGETSRC)) +LinkSourceFile(Grip.h,$(AWIDGETSRC)) +LinkSourceFile(GripP.h,$(AWIDGETSRC)) +LinkSourceFile(Label.h,$(AWIDGETSRC)) +LinkSourceFile(LabelP.h,$(AWIDGETSRC)) +LinkSourceFile(List.h,$(AWIDGETSRC)) +LinkSourceFile(ListP.h,$(AWIDGETSRC)) +LinkSourceFile(MenuButton.h,$(AWIDGETSRC)) +LinkSourceFile(MenuButtoP.h,$(AWIDGETSRC)) +LinkSourceFile(MultiSrc.h,$(AWIDGETSRC)) +LinkSourceFile(MultiSrcP.h,$(AWIDGETSRC)) +LinkSourceFile(MultiSink.h,$(AWIDGETSRC)) +LinkSourceFile(MultiSinkP.h,$(AWIDGETSRC)) +LinkSourceFile(Paned.h,$(AWIDGETSRC)) +LinkSourceFile(PanedP.h,$(AWIDGETSRC)) +LinkSourceFile(Panner.h,$(AWIDGETSRC)) +LinkSourceFile(PannerP.h,$(AWIDGETSRC)) +LinkSourceFile(Porthole.h,$(AWIDGETSRC)) +LinkSourceFile(PortholeP.h,$(AWIDGETSRC)) +LinkSourceFile(Private.h,$(AWIDGETSRC)) +LinkSourceFile(Repeater.h,$(AWIDGETSRC)) +LinkSourceFile(RepeaterP.h,$(AWIDGETSRC)) +LinkSourceFile(Reports.h,$(AWIDGETSRC)) +LinkSourceFile(Scrollbar.h,$(AWIDGETSRC)) +LinkSourceFile(ScrollbarP.h,$(AWIDGETSRC)) +LinkSourceFile(Simple.h,$(AWIDGETSRC)) +LinkSourceFile(SimpleP.h,$(AWIDGETSRC)) +LinkSourceFile(SimpleMenu.h,$(AWIDGETSRC)) +LinkSourceFile(SimpleMenP.h,$(AWIDGETSRC)) +LinkSourceFile(Sme.h,$(AWIDGETSRC)) +LinkSourceFile(SmeP.h,$(AWIDGETSRC)) +LinkSourceFile(SmeBSB.h,$(AWIDGETSRC)) +LinkSourceFile(SmeBSBP.h,$(AWIDGETSRC)) +LinkSourceFile(SmeLine.h,$(AWIDGETSRC)) +LinkSourceFile(SmeLineP.h,$(AWIDGETSRC)) +LinkSourceFile(StripChart.h,$(AWIDGETSRC)) +LinkSourceFile(StripCharP.h,$(AWIDGETSRC)) +LinkSourceFile(Template.c,$(AWIDGETSRC)) +LinkSourceFile(Template.h,$(AWIDGETSRC)) +LinkSourceFile(TemplateP.h,$(AWIDGETSRC)) +LinkSourceFile(Text.h,$(AWIDGETSRC)) +LinkSourceFile(TextP.h,$(AWIDGETSRC)) +LinkSourceFile(TextSink.h,$(AWIDGETSRC)) +LinkSourceFile(TextSinkP.h,$(AWIDGETSRC)) +LinkSourceFile(TextSrc.h,$(AWIDGETSRC)) +LinkSourceFile(TextSrcP.h,$(AWIDGETSRC)) +LinkSourceFile(Tip.h,$(AWIDGETSRC)) +LinkSourceFile(TipP.h,$(AWIDGETSRC)) +LinkSourceFile(Toggle.h,$(AWIDGETSRC)) +LinkSourceFile(ToggleP.h,$(AWIDGETSRC)) +LinkSourceFile(Tree.h,$(AWIDGETSRC)) +LinkSourceFile(TreeP.h,$(AWIDGETSRC)) +LinkSourceFile(VendorEP.h,$(AWIDGETSRC)) +LinkSourceFile(Viewport.h,$(AWIDGETSRC)) +LinkSourceFile(ViewportP.h,$(AWIDGETSRC)) +LinkSourceFile(XawI18n.h,$(AWIDGETSRC)) +LinkSourceFile(XawImP.h,$(AWIDGETSRC)) +LinkSourceFile(XawInit.h,$(AWIDGETSRC)) + +#if !BuildXaw +LinkSourceFile(Xaw.man,$(AWIDGETSRC)) +#endif + +DependTarget() Index: lib/Xaw7/Xaw-def.cpp =================================================================== RCS file: lib/Xaw7/Xaw-def.cpp diff -N lib/Xaw7/Xaw-def.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lib/Xaw7/Xaw-def.cpp 2 Sep 2004 01:05:15 -0000 @@ -0,0 +1,156 @@ +LIBRARY Xaw +VERSION LIBRARY_VERSION +EXPORTS + asciiSinkClassRec DATA + asciiSinkObjectClass DATA + asciiSrcClassRec DATA + asciiSrcObjectClass DATA + asciiTextClassRec DATA + asciiTextWidgetClass DATA + boxClassRec DATA + boxWidgetClass DATA + commandClassRec DATA + commandWidgetClass DATA + dialogClassRec DATA + dialogWidgetClass DATA + FMT8BIT DATA + formClassRec DATA + formWidgetClass DATA + gripClassRec DATA + gripWidgetClass DATA + labelClassRec DATA + labelWidgetClass DATA + listClassRec DATA + listWidgetClass DATA + menuButtonClassRec DATA + menuButtonWidgetClass DATA + multiSinkClassRec DATA + multiSinkObjectClass DATA + multiSrcClassRec DATA + multiSrcObjectClass DATA + panedClassRec DATA + panedWidgetClass DATA + pannerClassRec DATA + pannerWidgetClass DATA + portholeClassRec DATA + portholeWidgetClass DATA + repeaterClassRec DATA + repeaterWidgetClass DATA + scrollbarClassRec DATA + scrollbarWidgetClass DATA + simpleClassRec DATA + simpleMenuClassRec DATA + simpleMenuWidgetClass DATA + simpleWidgetClass DATA + smeBSBClassRec DATA + smeBSBObjectClass DATA + smeClassRec DATA + smeLineClassRec DATA + smeLineObjectClass DATA + smeObjectClass DATA + stripChartClassRec DATA + stripChartWidgetClass DATA + textClassRec DATA + textSinkClassRec DATA + textSinkObjectClass DATA + textSrcClassRec DATA + textSrcObjectClass DATA + textWidgetClass DATA + toggleClassRec DATA + toggleWidgetClass DATA + treeClassRec DATA + treeWidgetClass DATA +#ifndef __UNIXOS2__ + vendorShellClassRec DATA + vendorShellWidgetClass DATA +#endif + viewportClassRec DATA + viewportWidgetClass DATA + XawAsciiSave + XawAsciiSaveAsFile + XawAsciiSourceChanged + XawAsciiSourceFreeString + XawDialogAddButton + XawDialogGetValueString + XawFmt8Bit + XawFmtWide + XawFormDoLayout + XawInitializeWidgetSet + XawListChange + XawListHighlight + XawListShowCurrent + XawListUnhighlight + XawPanedAllowResize + XawPanedGetMinMax + XawPanedGetNumSub + XawPanedSetMinMax + XawPanedSetRefigureMode + XawScrollbarSetThumb + XawSimpleMenuAddGlobalActions + XawSimpleMenuClearActiveEntry + XawSimpleMenuGetActiveEntry + XawTextDisableRedisplay + XawTextDisplay + XawTextDisplayCaret + XawTextEnableRedisplay + XawTextGetInsertionPoint + XawTextGetSelectionPos + XawTextGetSource + XawTextInvalidate + XawTextReplace + XawTextSearch + XawTextSetInsertionPoint + XawTextSetSelection + XawTextSetSelectionArray + XawTextSetSource + XawTextSinkClearToBackground + XawTextSinkDisplayText + XawTextSinkFindDistance + XawTextSinkFindPosition + XawTextSinkGetCursorBounds + XawTextSinkInsertCursor + XawTextSinkMaxHeight + XawTextSinkMaxLines + XawTextSinkResolve + XawTextSinkSetTabs + XawTextSourceConvertSelection + XawTextSourceRead + XawTextSourceReplace + XawTextSourceScan + XawTextSourceSearch + XawTextSourceSetSelection + XawTextTopPosition + XawTextUnsetSelection + XawToggleChangeRadioGroup + XawToggleGetCurrent + XawToggleSetCurrent + XawToggleUnsetCurrent + XawTreeForceLayout + xawvendorShellExtClassRec + XawVendorShellExtResize + xawvendorShellExtWidgetClass + XawViewportSetCoordinates + XawViewportSetLocation + XawWidgetArray + XawWidgetCount +#ifdef __UNIXOS2__ /* xconsole */ + _XawTextGetSTRING + XawTextSourceAddEntity + XawTextSourceAnchorAndEntity + XawTextSourceNextAnchor + XawTextSourcePrevAnchor + XawTextSourceFindAnchor + _XawTextShowPosition + _XawTextSrcUndo + XawTextSinkConvertPropertyList + XawTextGetSink + _XawTextBuildLineTable + XawTextSourceClearEntities + _XawTextNeedsUpdating + XawTextSinkCopyProperty + XawTextSinkGetProperty + XawTextSinkCombineProperty + XawTextSinkAddProperty + XawTextLastPosition +#endif +/* $Xorg$ */ Index: programs/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Imakefile,v retrieving revision 1.7 diff -u -u -r1.7 Imakefile --- programs/Imakefile 16 Aug 2004 16:36:15 -0000 1.7 +++ programs/Imakefile 2 Sep 2004 01:05:15 -0000 @@ -118,6 +118,10 @@ XDRIINFO = xdriinfo #endif +#if BuildXaw + XMORE = xmore +#endif + #if BuildServersOnly || !BuildClients SUBDIRS = $(XSSRCDIR) #else @@ -135,8 +139,8 @@ $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \ $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \ $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \ - xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \ - xrefresh $(XRXSRCDIR) xset \ + xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \ + xrdb xrefresh $(XRXSRCDIR) xset \ xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ Index: programs/Xserver/hw/xfree86/xf86cfg/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v retrieving revision 1.2 diff -u -u -r1.2 Imakefile --- programs/Xserver/hw/xfree86/xf86cfg/Imakefile 23 Apr 2004 19:54:18 -0000 1.2 +++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2 Sep 2004 01:05:16 -0000 @@ -129,8 +129,8 @@ LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ - $(XPMLIB) $(LOADERLIB) $(DLLIB) $(XLIB) $(CURSESLIB) \ - RegexLibrary -lm + $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \ + $(XLIB) $(CURSESLIB) RegexLibrary -lm NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) Index: programs/glxgears/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/glxgears/Imakefile,v retrieving revision 1.6 diff -u -u -r1.6 Imakefile --- programs/glxgears/Imakefile 17 Aug 2004 17:55:02 -0000 1.6 +++ programs/glxgears/Imakefile 2 Sep 2004 01:05:16 -0000 @@ -2,7 +2,7 @@ XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.3 2001/03/21 20:56:32 dawes Exp $ #include -#if BuildXprintLib +#if BuildXprintLib && BuildXprintClients XPRINTLIBS = -lXprintUtil $(XPLIB) XPRINTDEFINES = -DXPRINT #endif Index: programs/xdpyinfo/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xdpyinfo/Imakefile,v retrieving revision 1.5 diff -u -u -r1.5 Imakefile --- programs/xdpyinfo/Imakefile 16 Aug 2004 16:36:15 -0000 1.5 +++ programs/xdpyinfo/Imakefile 2 Sep 2004 01:05:17 -0000 @@ -62,7 +62,7 @@ DMXLIBS = $(DMXLIB) #endif -#if BuildXprintLib +#if BuildXprintLib && BuildXprintClients XPRINTDEFINES = -DXPRINT XPRINTLIBS = $(XPLIB) #endif Index: programs/xlogo/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xlogo/Imakefile,v retrieving revision 1.5 diff -u -u -r1.5 Imakefile --- programs/xlogo/Imakefile 16 Aug 2004 16:36:16 -0000 1.5 +++ programs/xlogo/Imakefile 2 Sep 2004 01:05:17 -0000 @@ -8,6 +8,14 @@ #define XLogoUseRender BuildRenderLibrary #endif +#if BuildXprintLib && BuildXprintClients && BuildXaw + XPRINTLIBS = -lXprintUtil $(XPLIB) + XPRINTDEFS = -DXPRINT + XPRINTSRCS = print.c + XPRINTOBJS = print.o + XPRINTHEADERS = print.h +#endif + #if XLogoUseRender XRENDERDEFS = -DXRENDER -DXFREE86_FT2 XRENDERDEPS = XftClientDepLibs @@ -19,12 +27,12 @@ #endif DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs -LOCAL_LIBRARIES = $(XRENDERLIBS) XawClientLibs XkbClientLibs - SRCS = xlogo.c Logo.c $(RENDER_SRCS) - OBJS = xlogo.o Logo.o $(RENDER_OBJS) - HEADERS = LogoP.h Logo.h RenderLogo.h +LOCAL_LIBRARIES = $(XRENDERLIBS) $(XPRINTLIBS) XawClientLibs XkbClientLibs + SRCS = xlogo.c Logo.c $(XPRINTSRCS) $(RENDER_SRCS) + OBJS = xlogo.o Logo.o $(XPRINTOBJS) $(RENDER_OBJS) + HEADERS = LogoP.h Logo.h $(XPRINTHEADERS) RenderLogo.h INCLUDES = $(XRENDERINCS) - DEFINES = $(XRENDERDEFS) XkbClientDefines + DEFINES = $(XRENDERDEFS) $(XPRINTDEFS) XkbClientDefines CDEBUGFLAGS = -g ComplexProgramTarget(xlogo) Index: programs/xlogo/XLogo.ad =================================================================== RCS file: /cvs/xorg/xc/programs/xlogo/XLogo.ad,v retrieving revision 1.3 diff -u -u -r1.3 XLogo.ad --- programs/xlogo/XLogo.ad 16 Aug 2004 16:36:16 -0000 1.3 +++ programs/xlogo/XLogo.ad 2 Sep 2004 01:05:17 -0000 @@ -1 +1,4 @@ -XLogo.input: false +XLogo*iconPixmap: xlogo32 +XLogo*iconMask: xlogo32 +XLogo*baseTranslations: #override \ +q,Escape: quit() Index: programs/xlogo/xlogo.c =================================================================== RCS file: /cvs/xorg/xc/programs/xlogo/xlogo.c,v retrieving revision 1.4 diff -u -u -r1.4 xlogo.c --- programs/xlogo/xlogo.c 16 Aug 2004 16:36:16 -0000 1.4 +++ programs/xlogo/xlogo.c 2 Sep 2004 01:05:17 -0000 @@ -27,18 +27,28 @@ /* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */ -#include #include +#include #include +#include "xlogo.h" #include "Logo.h" #include +#ifdef XPRINT +#include "print.h" +#endif #ifdef XKB #include #endif +#include #include -static void quit(Widget w, XEvent *event, String *params, - Cardinal *num_params); +/* Global vars*/ +const char *ProgramName; /* program name (from argv[0]) */ + +static void quit(Widget w, XEvent *event, String *params, Cardinal *num_params); +#ifdef XPRINT +static void print(Widget w, XEvent *event, String *params, Cardinal *num_params); +#endif static XrmOptionDescRec options[] = { { "-shape", "*shapeWindow", XrmoptionNoArg, (XPointer) "on" }, @@ -46,25 +56,55 @@ {"-render", "*render",XrmoptionNoArg, "TRUE"}, {"-sharp", "*sharp", XrmoptionNoArg, "TRUE"}, #endif +{"-v", "Verbose", XrmoptionNoArg, "TRUE"}, +#ifdef XPRINT +{"-print", "Print", XrmoptionNoArg, "TRUE"}, +{"-printer", "printer", XrmoptionSepArg, NULL}, +{"-printfile", "printFile", XrmoptionSepArg, NULL}, +#endif }; static XtActionsRec actions[] = { - {"quit", quit} + {"quit", quit }, +#ifdef XPRINT + {"print", print} +#endif }; static Atom wm_delete_window; +/* See xlogo.h */ +XLogoResourceData userOptions; + +#define Offset(field) XtOffsetOf(XLogoResourceData, field) + +XtResource resources[] = { + {"verbose", "Verbose", XtRBoolean, sizeof(Boolean), Offset(verbose), XtRImmediate, (XtPointer)False}, +#ifdef XPRINT + {"print", "Print", XtRBoolean, sizeof(Boolean), Offset(printAndExit), XtRImmediate, (XtPointer)False}, + {"printer", "Printer", XtRString, sizeof(String), Offset(printername), XtRImmediate, (XtPointer)NULL}, + {"printFile", "PrintFile", XtRString, sizeof(String), Offset(printfile), XtRImmediate, (XtPointer)NULL} +#endif +}; + + String fallback_resources[] = { "*iconPixmap: xlogo32", "*iconMask: xlogo32", + "*baseTranslations: #override \\" +#ifdef XPRINT + "\tq: quit()\\n\\" + "\tp: print()", +#else + "\tq: quit()", +#endif NULL, }; static void die(Widget w, XtPointer client_data, XtPointer call_data) { - XCloseDisplay(XtDisplay(w)); - exit(0); + XtAppSetExitFlag(XtWidgetToApplicationContext(w)); } static void @@ -78,34 +118,35 @@ */ static void -Syntax(Widget toplevel, char *call) +Syntax(Widget toplevel) { Arg arg; SmcConn connection; - String reasons[7]; - int i, num_reasons = 7; + String reasons[10]; + int i, n = 0; - reasons[0] = "Usage: "; - reasons[1] = call; - reasons[2] = " [-fg ] [-bg ] [-rv] [-bw ] [-bd ]\n"; - reasons[3] = " [-d []:[]]\n"; - reasons[4] = " [-g [][x][<+->[<+->]]]\n"; -#ifdef XRENDER - reasons[5] = " [-render] [-sharp]\n"; -#else - reasons[5] = ""; + reasons[n++] = "Usage: "; + reasons[n++] = (String)ProgramName; + reasons[n++] = " [-fg ] [-bg ] [-rv] [-bw ] [-bd ]\n"; + reasons[n++] = " [-d []:[]]\n"; + reasons[n++] = " [-g [][x][<+->[<+->]]]\n"; +#ifdef XPRINT + reasons[n++] = " [-print] [-printname ] [-printfile ]\n"; #endif - reasons[6] = " [-shape]\n\n"; +#ifdef XRENDER + reasons[n++] = " [-render] [-sharp]\n"; +#endif /* XRENDER */ + reasons[n++] = " [-shape]\n\n"; XtSetArg(arg, XtNconnection, &connection); XtGetValues(toplevel, &arg, (Cardinal)1); if (connection) - SmcCloseConnection(connection, num_reasons, reasons); + SmcCloseConnection(connection, n, reasons); else { - for (i=0; i < num_reasons; i++) + for (i=0; i < n; i++) printf(reasons[i]); } - exit(1); + exit(EXIT_FAILURE); } int @@ -114,27 +155,42 @@ Widget toplevel; XtAppContext app_con; + ProgramName = argv[0]; + toplevel = XtOpenApplication(&app_con, "XLogo", options, XtNumber(options), &argc, argv, fallback_resources, sessionShellWidgetClass, NULL, ZERO); if (argc != 1) - Syntax(toplevel, argv[0]); + Syntax(toplevel); + + XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources, + XtNumber(resources), NULL, 0); + + XtAppAddActions(app_con, actions, XtNumber(actions)); + +#ifdef XPRINT + if (userOptions.printAndExit) { + XtCallActionProc(toplevel, "print", NULL, NULL, 0); + } + else +#endif + { + XtAddCallback(toplevel, XtNsaveCallback, save, NULL); + XtAddCallback(toplevel, XtNdieCallback, die, NULL); + XtOverrideTranslations + (toplevel, XtParseTranslationTable ("WM_PROTOCOLS: quit()")); + XtCreateManagedWidget("xlogo", logoWidgetClass, toplevel, NULL, ZERO); + XtRealizeWidget(toplevel); + wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", + False); + (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel), + &wm_delete_window, 1); + } - XtAddCallback(toplevel, XtNsaveCallback, save, NULL); - XtAddCallback(toplevel, XtNdieCallback, die, NULL); - XtAppAddActions - (XtWidgetToApplicationContext(toplevel), actions, XtNumber(actions)); - XtOverrideTranslations - (toplevel, XtParseTranslationTable ("WM_PROTOCOLS: quit()")); - XtCreateManagedWidget("xlogo", logoWidgetClass, toplevel, NULL, ZERO); - XtRealizeWidget(toplevel); - wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", - False); - (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel), - &wm_delete_window, 1); XtAppMainLoop(app_con); - exit(0); + + return EXIT_SUCCESS; } /*ARGSUSED*/ @@ -142,9 +198,9 @@ quit(Widget w, XEvent *event, String *params, Cardinal *num_params) { Arg arg; - + if (event->type == ClientMessage && - event->xclient.data.l[0] != wm_delete_window) { + (Atom)event->xclient.data.l[0] != wm_delete_window) { #ifdef XKB XkbStdBell(XtDisplay(w), XtWindow(w), 0, XkbBI_BadValue); #else @@ -158,3 +214,11 @@ } } +#ifdef XPRINT +/*ARGSUSED*/ +static void +print(Widget w, XEvent *event, String *params, Cardinal *num_params) +{ + DoPrint(w, userOptions.printername, userOptions.printfile); +} +#endif Index: programs/xphelloworld/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xphelloworld/Imakefile,v retrieving revision 1.4 diff -u -u -r1.4 Imakefile --- programs/xphelloworld/Imakefile 17 Aug 2004 05:29:34 -0000 1.4 +++ programs/xphelloworld/Imakefile 2 Sep 2004 01:05:17 -0000 @@ -5,12 +5,9 @@ #if HasMotif2 XPXMHELLOWORLDDIR = xpxmhelloworld #endif /* HasMotif2 */ -#if 0 -XCOMM xpawhelloworld is disabled until Xaw/Xprint library is ready -#if HasMotif +#if HasMotif && BuildXaw XPAWHELLOWORLDDIR = xpawhelloworld -#endif /* HasMotif*/ -#endif +#endif /* HasMotif && BuildXaw */ XPXTHELLOWORLDDIR = xpxthelloworld XPHELLOWORLDDIR = xphelloworld XPSIMPLEHELLOWORLDDIR = xpsimplehelloworld Index: programs/xset/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xset/Imakefile,v retrieving revision 1.4 diff -u -u -r1.4 Imakefile --- programs/xset/Imakefile 16 Aug 2004 16:36:27 -0000 1.4 +++ programs/xset/Imakefile 2 Sep 2004 01:05:17 -0000 @@ -19,7 +19,7 @@ DEPFONTLIBS = $(DEPXFONTCACHELIB) FONTLIBS = $(XFONTCACHELIB) #endif -#if BuildXprintLib +#if BuildXprintLib && BuildXprintClients DEPXPRINTLIBS = $(DEPXPRINTLIB) XPRINTLIBS = $(XPLIB) XPRINTDEFINES = -DXPRINT