diff options
Diffstat (limited to 'Xprint/ps/Ps.h')
| -rw-r--r-- | Xprint/ps/Ps.h | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 942e8f9f8..9c65dc26f 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -7,7 +7,6 @@ Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -74,6 +73,7 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.13 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ @@ -87,24 +87,11 @@ in this Software without prior written authorization from The Open Group. #include "scrnintstr.h" #include "dix.h" -/* -#include "X.h" -#include "Xproto.h" -#include "Xatom.h" -#include "misc.h" -#include "screenint.h" -#include "colormapst.h" -#include "windowstr.h" -#include "propertyst.h" -#include "servermd.h"*/ /* needed for IMAGE_BUFSIZE */ - #include "PsDef.h" #include "psout.h" -#define _XP_PRINT_SERVER_ -#include "Print.h" -#include "extensions/Printstr.h" -#undef _XP_PRINT_SERVER_ +#include <X11/extensions/Print.h> +#include <X11/extensions/Printstr.h> #include "miscstruct.h" #include "fontstruct.h" @@ -114,13 +101,17 @@ in this Software without prior written authorization from The Open Group. /* * Some sleazes to force the XrmDB stuff into the server */ +#ifndef HAVE_XPointer typedef char *XPointer; #define Status int #define True 1 #define False 0 +#endif + #include "misc.h" -#include <Xfuncproto.h> -#include "../Xresource.h" +#include <X11/Xfuncproto.h> +#include <X11/Xresource.h> +#include "attributes.h" /* * Public index variables from PsInit.c @@ -130,7 +121,7 @@ extern int PsScreenPrivateIndex; extern int PsWindowPrivateIndex; extern int PsContextPrivateIndex; extern int PsPixmapPrivateIndex; -extern int PsGCPrivateIndex; +extern XpValidatePoolsRec PsValidatePoolsRec; /* * Display list structures @@ -255,7 +246,7 @@ typedef struct { XrmDatabase resDB; ColormapPtr CMap; - Bool (*DestroyWindow)(); + Bool (*DestroyWindow)(WindowPtr); } PsScreenPrivRec, *PsScreenPrivPtr; typedef struct @@ -278,12 +269,6 @@ typedef struct typedef struct { - unsigned freeCompClip; - RegionPtr pCompositeClip; -} PsGCPrivRec, *PsGCPrivPtr; - -typedef struct -{ XpContextPtr context; GC lastGC; int validGC; @@ -296,7 +281,9 @@ typedef struct #define SEND_PS(f,c) fwrite( c, sizeof( char ), strlen( c ), f ) #define MIN(a,b) (((a)<(b))?(a):(b)) +#ifndef MAX #define MAX(a,b) (((a)>(b))?(a):(b)) +#endif /* * Functions in PsInit.c @@ -304,7 +291,6 @@ typedef struct extern Bool InitializePsDriver(int ndx, ScreenPtr pScreen, int argc, char **argv); -static Bool PsDestroyContext(XpContextPtr pCon); extern XpContextPtr PsGetContextFromWindow(WindowPtr win); /* @@ -328,9 +314,6 @@ extern int PsGetDocumentData(XpContextPtr pCon, ClientPtr client, */ extern Bool PsCreateGC(GCPtr pGC); -static int PsGetDrawablePrivateStuff(DrawablePtr pDrawable, GC *gc, - unsigned long *valid, PsOutPtr *psOut, - ColormapPtr *cMap); extern int PsUpdateDrawableGC(GCPtr pGC, DrawablePtr pDrawable, PsOutPtr *psOut, ColormapPtr *cMap); extern void PsValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); @@ -383,6 +366,9 @@ extern void PsPutScaledImage(DrawablePtr pDrawable, GCPtr pGC, int depth, extern void PsPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pImage); +extern void PsPutImageMask(DrawablePtr pDrawable, GCPtr pGC, int depth, + int x, int y, int w, int h, int leftPad, int format, + char *pImage); extern RegionPtr PsCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy, int width, int height, int dstx, int dsty); @@ -517,4 +503,14 @@ extern PsElmPtr PsCreateFillElementList(PixmapPtr pix, int *nElms); extern PsElmPtr PsCloneFillElementList(int nElms, PsElmPtr elms); extern void PsDestroyFillElementList(int nElms, PsElmPtr elms); +/* + * Functions in PsCache.c + */ + +#ifdef BM_CACHE +extern int PsBmIsImageCached(int gWidth, int gHeight, char *pBuffer); +extern int PsBmPutImageInCache(int gWidth, int gHeight, char *pBuffer); +extern void PsBmClearImageCache(void); +#endif + #endif /* _PS_H_ */ |