Index: xc/config/cf/host.def =================================================================== RCS file: /cvs/xorg/xc/config/cf/host.def,v retrieving revision 1.1.10.2 diff -u -2 -0 -r1.1.10.2 host.def --- xc/config/cf/host.def 5 Mar 2004 20:17:24 -0000 1.1.10.2 +++ xc/config/cf/host.def 20 Jun 2004 22:06:05 -0000 @@ -0,0 +1 @@ +#define BuildFonts NO Index: xc/lib/Xst/Imakefile =================================================================== RCS file: /cvs/xorg/xc/lib/Xst/Attic/Imakefile,v retrieving revision 1.1.4.2 diff -u -2 -0 -r1.1.4.2 Imakefile --- xc/lib/Xst/Imakefile 15 Apr 2004 01:33:22 -0000 1.1.4.2 +++ xc/lib/Xst/Imakefile 20 Jun 2004 22:06:12 -0000 @@ -46,41 +46,41 @@ #define DoSharedLib SharedLibXst #define DoDebugLib DebugLibXst #define DoProfileLib ProfileLibXst #define DoExtraLib SharedLibXt #define LibName Xst #define SoRev SOXSTREV #ifndef XBuildIncDir #define IncSubdir Xst #else #define IncSubdir X11 #define IncSubSubdir Xst #endif #include #ifdef SharedXstReqs REQUIREDLIBS = SharedXstReqs #else -REQUIREDLIBS = $(STLIB) $(XONLYLIB) +REQUIREDLIBS = $(LDPRELIBS) $(STLIB) $(XONLYLIB) #endif #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif XSTLANGLIBDIR = $(LIBDIR)/XST XST_DEFINES = XstDefines -DXST_LANG_LIB_PATH=\"$(XSTLANGLIBDIR)\" DEFINES = $(ALLOC_DEFINES) $(XST_DEFINES) -DUSEICU INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I../../include $(STINC) $(ICUINC) \ -I$(STDIR)/stsflib -I$(STDIR)/STClientLibrary/src HEADERS = \ Xst_alpha.h \ Xst_cb.h \ Xst_colors.h \ Xst_conv.h \ Xst_cntl.h \ Xst_env.h \ Index: xc/lib/Xst/Xst_conv.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_conv.c,v retrieving revision 1.1.4.4 diff -u -2 -0 -r1.1.4.4 Xst_conv.c --- xc/lib/Xst/Xst_conv.c 3 May 2004 18:19:10 -0000 1.1.4.4 +++ xc/lib/Xst/Xst_conv.c 20 Jun 2004 22:06:13 -0000 @@ -36,41 +36,40 @@ * nuclear facility. * */ /* @(#)Xst_conv.c 1.44 04/04/27 SMI */ #include "Xlibint.h" #include #include #include #include #include #include #include #include #include #include "Xst_typedef.h" #include "Xst_conv.h" #include /* htons() */ #include -#include "stsfutil.h" #ifndef USEICU #include #else #include "unicode/utypes.h" #include "unicode/ucnv.h" #endif /******************************** General support structures ************************/ /********************************** Static Local Variables **************************/ struct XSTHandle { char *Locale; /* lookup string to check for existence */ char *FromCode; /* iconv conversion string name */ XSTCount bytes; /* bytes per glyph (base units for MB) */ XSTEncoding encoding; /* encoding for strings */ struct XSTHandle *next; /* next handle in the list */ XSTLocale locale; /* locale/language to use with tags */ }; Index: xc/lib/Xst/Xst_ext.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_ext.c,v retrieving revision 1.1.4.3 diff -u -2 -0 -r1.1.4.3 Xst_ext.c --- xc/lib/Xst/Xst_ext.c 10 Jun 2004 22:18:43 -0000 1.1.4.3 +++ xc/lib/Xst/Xst_ext.c 20 Jun 2004 22:06:14 -0000 @@ -24,42 +24,40 @@ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed, licensed or intended * for use in the design, construction, operation or maintenance of any * nuclear facility. * */ /* @(#)Xst_ext.c 1.15 04/04/13 SMI */ #define NEED_REPLIES -#include "stsfutil.h" - #include #include "Xlibint.h" #include #include #include "Xst_ext.h" #include /******************************** General support structures ************************/ /********************************** Static Local Variables **************************/ /* Magic cookie for finding the right XExtData structure on the display's extension list. */ static int XSTNumber = -1; /********************************* XSTExt Static Functions **************************/ /* ********************************************************************************** Index: xc/lib/Xst/Xst_font.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_font.c,v retrieving revision 1.1.4.1 diff -u -2 -0 -r1.1.4.1 Xst_font.c --- xc/lib/Xst/Xst_font.c 6 Apr 2004 02:41:19 -0000 1.1.4.1 +++ xc/lib/Xst/Xst_font.c 20 Jun 2004 22:06:14 -0000 @@ -24,42 +24,40 @@ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed, licensed or intended * for use in the design, construction, operation or maintenance of any * nuclear facility. * */ /* %W% %E% SMI */ #define NEED_REPLIES -#include "stclprivate.h" - #include "Xlibint.h" #include #include #include "Xst_font.h" #include "Xst_conv.h" #include "Xst_ext.h" #include "Xst_util.h" #include "extensions/XSTstr.h" /******************************** XSTFont support functions *************************/ /******************************** XSTFont global functions **************************/ /* ********************************************************************************** * XSTFontGetNameTags(Display *, XSTTypeEnv, XSTFont, int *) * * Returns: XSTNameTag (struct) Index: xc/lib/Xst/Xst_util.c =================================================================== RCS file: /cvs/xorg/xc/lib/Xst/Attic/Xst_util.c,v retrieving revision 1.1.4.5 diff -u -2 -0 -r1.1.4.5 Xst_util.c --- xc/lib/Xst/Xst_util.c 10 Jun 2004 22:18:43 -0000 1.1.4.5 +++ xc/lib/Xst/Xst_util.c 20 Jun 2004 22:06:15 -0000 @@ -22,42 +22,40 @@ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed, licensed or intended * for use in the design, construction, operation or maintenance of any * nuclear facility. * */ /* @(#)Xst_util.c 1.3 04/04/13 SMI */ -#include "stsfutil.h" - #include "Xlibint.h" #include #include #include #include #include #include #include #include "extensions/XSTstr.h" #include "Xst_ext.h" #include "Xst_typedef.h" #include "Xst_conv.h" /******************************** General support structures ************************/ static char *XSTErrors[] = { "XSTQueryVersion", "XSTCapable", "XSTEnable", "XSTDisable", Index: xc/programs/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Imakefile,v retrieving revision 1.1.4.2.6.3.2.1 diff -u -2 -0 -r1.1.4.2.6.3.2.1 Imakefile --- xc/programs/Imakefile 6 Apr 2004 02:41:20 -0000 1.1.4.2.6.3.2.1 +++ xc/programs/Imakefile 20 Jun 2004 22:06:15 -0000 @@ -121,26 +121,26 @@ SUBDIRS = \ appres bdftopcf bitmap \ $(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \ iceauth ico listres luit \ $(MAKEPSRESDIR) $(DPSCLIENTDIRS) \ $(MKCFMSRCDIR) \ mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \ $(RGBSRCDIR) $(RSTARTSRCDIR) showfont \ $(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \ xclipboard xclock \ xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \ $(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 \ xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \ $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \ - $(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) $(XSTLSSRCDIR) \ + $(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) $(XSTLSSRCDIR) \ $(XSTSHOWFONTSRCDIR) #endif MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) Index: xc/programs/Xserver/Xst/xst_glyph.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xst/Attic/xst_glyph.c,v retrieving revision 1.1.4.4 diff -u -2 -0 -r1.1.4.4 xst_glyph.c --- xc/programs/Xserver/Xst/xst_glyph.c 10 Jun 2004 22:40:21 -0000 1.1.4.4 +++ xc/programs/Xserver/Xst/xst_glyph.c 20 Jun 2004 22:06:16 -0000 @@ -670,41 +670,41 @@ free(bBox); WriteToClient(client, totalBytes, (char *)rep); xfree(rep); return(result); } static int ProcSTGlyphVectorRender(client) register ClientPtr client; { Status result = client->noClientException; STStatus st = -1; STGlyphVector stgv; register GC *pGC; register GC *pGCbase; register DrawablePtr pDraw; -#ifdef sun +#if 1 static int last_screen; extern unsigned int *gCBdst; extern int gCBstep; extern int pgx32; extern int gCIall; #endif extern unsigned int panoramiXBaseGC; STOutputMode oOutputMode; STDevice stDev; static int first_time = 1; extern void _RenderBlt(); extern void _InitCopyStructs(); extern GC *_XSTCreateGCforDepth(); extern int _XSTUseCache(); extern void _XSTSetCache(); REQUEST(xSTGlyphVectorRenderReq); REQUEST_SIZE_MATCH(xSTGlyphVectorRenderReq); #ifdef DEBUG Index: xc/programs/Xserver/Xst/xst_line.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xst/Attic/xst_line.c,v retrieving revision 1.1.4.4 diff -u -2 -0 -r1.1.4.4 xst_line.c --- xc/programs/Xserver/Xst/xst_line.c 28 May 2004 19:31:06 -0000 1.1.4.4 +++ xc/programs/Xserver/Xst/xst_line.c 20 Jun 2004 22:06:17 -0000 @@ -857,41 +857,41 @@ short s; long l; swaps(&rep.sequenceNumber, s); swapl(&rep.length, l); swapl(&rep.Offset, l); } WriteToClient(client, sizeof(xSTLineMoveCaretReply), (char *)&rep); return(result); } static int ProcSTLineRender(client) register ClientPtr client; { Status result = client->noClientException; STStatus st = -1; STLine Line; register GC *pGC; register GC *pGCbase; register DrawablePtr pDraw; -#ifdef sun +#if 1 static int last_screen = -1; extern unsigned int *gCBdst; extern int gCBstep; extern int pgx32; #endif STOutputMode oOutputMode; STDevice stDev; extern unsigned int panoramiXBaseGC; extern GC *_XSTCreateGCforDepth(); extern void _RenderBlt(); extern void _InitCopyStructs(); REQUEST(xSTLineRenderReq); REQUEST_SIZE_MATCH(xSTLineRenderReq); #ifdef DEBUG DebugStr(3,"ProcSTLineRender: Lay = 0x%x, DR: 0x%x, GC: 0x%x: 0x%x\n", stuff->Line, stuff->drawable, stuff->gc); #endif VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client); Index: xc/programs/xstls/xstls.c =================================================================== RCS file: /cvs/xorg/xc/programs/xstls/Attic/xstls.c,v retrieving revision 1.1.4.5 diff -u -2 -0 -r1.1.4.5 xstls.c --- xc/programs/xstls/xstls.c 3 May 2004 18:38:15 -0000 1.1.4.5 +++ xc/programs/xstls/xstls.c 20 Jun 2004 22:06:21 -0000 @@ -22,46 +22,51 @@ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE, * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES. * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * * You acknowledge that this software is not designed, licensed or intended * for use in the design, construction, operation or maintenance of any * nuclear facility. * */ /* @(#)xstls.c 1.30 04/04/13 SMI */ +#ifdef linux +#include +#include +#else +#include +#endif /* linux */ #include #include #include #include #include -#include #include #include #include #include #include "xstls.h" #include "stlangname.h" typedef struct { int data; /* Show extra data. Required for remainder */ int copyright; /* Show Copyright information -e */ int description; /* Show Description -e */ int designer; /* Show Designer -e */ int extra_names; /* Show Postscript/Full name -e */ int filename; /* Show File name -u */ int languages; /* Show Languages -la */ int license; /* Show License -l */ int manufacturer; /* Show Manufacturer -e */ int metrics; /* Show Metrics -m */ Index: xc/programs/xstshowfont/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xstshowfont/Attic/Imakefile,v retrieving revision 1.1.4.1 diff -u -2 -0 -r1.1.4.1 Imakefile --- xc/programs/xstshowfont/Imakefile 6 Apr 2004 02:41:20 -0000 1.1.4.1 +++ xc/programs/xstshowfont/Imakefile 20 Jun 2004 22:06:21 -0000 @@ -1,17 +1,17 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ XCOMM $XFree86: xc/programs/xstshowfont/Imakefile,v 1.5tsi Exp $ DEPLIBS = XstClientDepLibs -LOCAL_LIBRARIES = -lXext -lX11 -lXt -lSM -lICE -lXm -lXpm -lXp -L../../lib/Xst -lXst XstClientLibs +LOCAL_LIBRARIES = -lXext -lX11 -lXt -lSM -lICE -lXm -lXpm -lXp -L../../lib/Xst -lXst XstClientLibs -L/usr/X11R6/lib SRCS = xstshowfont.c xstshowfont_cb.c xstshowfont_color.c xstshowfont_funcs.c xstshowfont_main.c xstshowfont_text.c OBJS = xstshowfont.o xstshowfont_cb.o xstshowfont_color.o xstshowfont_funcs.o xstshowfont_main.o xstshowfont_text.o HEADERS = xstshowfont.h xstshowfont_fp.h xstshowfont_funcs.h xstshowfont_tags.h xstshowfont_xpm.h - INCLUDES = + INCLUDES = -I/usr/X11R6/include DEFINES = CDEBUGFLAGS = -g ComplexProgramTarget(xstshowfont) InstallAppDefaults(Xstshowfont)