From 498f7aff528f11f2ad33a659c1634ae74d291aba Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Mon, 17 Nov 2003 19:03:40 +0000 Subject: merge XFree86 4.3.0.1 to -CURRENT --- Print.h | 58 +++++--------------------------------- Printstr.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 80 insertions(+), 73 deletions(-) diff --git a/Print.h b/Print.h index 3a8e4f2..dc9c66d 100644 --- a/Print.h +++ b/Print.h @@ -57,6 +57,7 @@ ** ****************************************************************************** *****************************************************************************/ +/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp $ */ #ifndef _XpPrint_H_ #define _XpPrint_H_ @@ -261,18 +262,22 @@ typedef void (*XPFinishProc)( Display *display, /* * Typedefs for XpSetLocaleHinter and XpGetLocaleHinter */ -typedef char * (*XPHinterProc)(); +typedef char * (*XPHinterProc)(void); +#if 0 /******************************************************************* * * Extension version structures. * + **** this structure is now defined localy in the one file that uses it + **** in order to avoid clashes with its definition in XI.h */ typedef struct { int present; short major_version; short minor_version; } XExtensionVersion; +#endif /******************************************************************** * @@ -319,8 +324,6 @@ typedef struct { * Function prototypes for library side. */ -#if NeedFunctionPrototypes - extern XPContext XpCreateContext ( Display *display, char *printer_name @@ -531,10 +534,7 @@ extern char *XpGetLocaleHinter ( XPHinterProc *hinter_proc ); - - - -extern char *XpGetLocaleNetString(); +extern char *XpGetLocaleNetString(void); extern char *XpNotifyPdm ( Display *print_display, @@ -545,50 +545,6 @@ extern char *XpNotifyPdm ( Bool auth_flag ); -#else - -extern XPContext XpCreateContext (); -extern void XpSetContext (); -extern XPContext XpGetContext (); -extern void XpDestroyContext (); -extern Screen *XpGetScreenOfContext (); -extern Status XpGetPageDimensions (); -extern void XpStartJob (); -extern void XpEndJob (); -extern void XpCancelJob (); -extern void XpStartDoc (); -extern void XpEndDoc (); -extern void XpCancelDoc (); -extern void XpPutDocumentData (); -extern Status XpGetDocumentData (); -extern void XpStartPage (); -extern void XpEndPage (); -extern void XpCancelPage (); -extern void XpSelectInput (); -extern unsigned long XpInputSelected (); -extern Bool XpSetImageResolution (); -extern int XpGetImageResolution (); -extern char *XpGetAttributes (); -extern void XpSetAttributes (); -extern char *XpGetOneAttribute (); -extern XPPrinterList XpGetPrinterList (); -extern void XpFreePrinterList (); -extern void XpRehashPrinterList (); -extern Status XpQueryVersion (); -extern Bool XpQueryExtension (); -extern Screen **XpQueryScreens (); -extern Status XpGetPdmStartParams (); -extern Status XpGetAuthParams (); -extern Status XpSendAuth (); -extern Status XpSendOneTicket (); -extern void XpSetLocaleHinter (); -extern char *XpGetLocaleHinter (); - -extern char *XpGetLocaleNetString (); -extern char *XpNotifyPdm (); - -#endif /* NeedFunctionPrototypes */ - #endif /* _XP_PRINT_SERVER_ */ _XFUNCPROTOEND diff --git a/Printstr.h b/Printstr.h index 2adda4f..a518da8 100644 --- a/Printstr.h +++ b/Printstr.h @@ -43,6 +43,7 @@ ** ****************************************************************************** *****************************************************************************/ +/* $XFree86: xc/include/extensions/Printstr.h,v 1.6 2001/08/23 12:46:11 alanh Exp $ */ #ifndef _XpPrintstr_H_ @@ -661,9 +662,8 @@ extern XPHinterProc _xp_hinter_proc; extern char *_xp_hinter_desc; extern int _xp_hinter_init; -#endif /* _XP_PRINT_SERVER_ */ +#else /* _XP_PRINT_SERVER_ */ -#ifdef _XP_PRINT_SERVER_ /*********************************************************************** * * Server-only definitions shared between the extension and DDX layers. @@ -676,27 +676,70 @@ extern int _xp_hinter_init; */ #define Suspended 84 +struct _XpContext; + extern void XpRegisterPrinterScreen( ScreenPtr pScreen, - int (*CreateContext)()); + int (*CreateContext)(struct _XpContext *)); typedef struct _xpprintFuncs { - int (*StartJob)(); /* pContext, client */ - int (*EndJob)(); /* pContext, client */ - int (*StartDoc)(); /* pContext, client */ - int (*EndDoc)(); /* pContext, client */ - int (*StartPage)(); /* pContext, pWin, client, exposures */ - int (*EndPage)(); /* pContext, client */ - int (*PutDocumentData)(); /* pContext,pDraw,pData,len_data,pFmt,len_fmt,pOpt,len_opt, client */ - int (*GetDocumentData)(); /* pContext,pData,len_data,pFmt,len_fmt,pOpt,len_opt, client */ - int (*DestroyContext)(); /* pContext, client */ - char *(*GetAttributes)(); /* pContext, pool */ - char *(*GetOneAttribute)(); /* pContext, pool, attr */ - int (*SetAttributes)(); /* pContext, pool, attrs */ - int (*AugmentAttributes)(); /* pContext, pool, attrs */ - int (*GetMediumDimensions)(); /* pPrintContext, pWidth, pHeight */ - int (*GetReproducibleArea)(); /* pPrintContext, pRect */ - int (*SetImageResolution)(); /* pPrintContext, imageRes, pStatus */ + int (*StartJob)( + struct _XpContext * /* pContext */, + Bool /* sendClientData */, + ClientPtr /* client */); + int (*EndJob)(struct _XpContext *, int); + int (*StartDoc)( + struct _XpContext * /* pContext */, + XPDocumentType /* type */); + int (*EndDoc)(struct _XpContext *, int); + int (*StartPage)( + struct _XpContext * /* pContext */, + WindowPtr /* pWin */); + int (*EndPage)( + struct _XpContext * /* pContext */, + WindowPtr /* pWin */); + int (*PutDocumentData)( + struct _XpContext * /* pContext */, + DrawablePtr /* pDraw */, + char * /* pData */, + int /* len_data */, + char * /* pDoc_fmt */, + int /* len_fmt */, + char * /* pOptions */, + int /* len_options */, + ClientPtr /* client */); + int (*GetDocumentData)( + struct _XpContext * /* pContext */, + ClientPtr /* client */, + int /* maxBufferSize */); + int (*DestroyContext)( + struct _XpContext *); /* pContext */ + char *(*GetAttributes)( + struct _XpContext *, + XPAttributes /* pool */); + char *(*GetOneAttribute)( + struct _XpContext * /* pContext */, + XPAttributes /* pool */, + char * /* attrs */); + int (*SetAttributes)( + struct _XpContext * /* pContext */, + XPAttributes /* pool */, + char * /* attrs */); + int (*AugmentAttributes)( + struct _XpContext * /* pContext */, + XPAttributes /* pool */, + char * /* attrs */); + int (*GetMediumDimensions)( + struct _XpContext * /* pPrintContext */, + CARD16 * /* pWidth */, + CARD16 * /* pHeight */); + int (*GetReproducibleArea)( + struct _XpContext * /* pPrintContext */, + xRectangle * /* pRect */); + int (*SetImageResolution)( + struct _XpContext * /* pPrintContext */, + int /* imageRes */, + Bool * /* pStatus */); } XpDriverFuncs, *XpDriverFuncsPtr; /* @@ -721,12 +764,20 @@ typedef struct _XpContext { int imageRes; } XpContextRec, *XpContextPtr; -extern XpContextPtr XpGetPrintContext( - ClientPtr client); +#include "fontstruct.h" /* FontResolutionPtr */ + +extern Bool XpAllocateContextPrivate(int, unsigned); +extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *); +extern XpContextPtr XpContextOfClient(ClientPtr); +extern XpContextPtr XpGetPrintContext(ClientPtr); +extern int XpAllocateContextPrivateIndex(void); +extern int XpRehashPrinterList(void); +extern void XpSetFontResFunc(ClientPtr); +extern void XpUnsetFontResFunc(ClientPtr); +extern void XpRegisterInitFunc(ScreenPtr, char *, int (*)(struct _XpContext *)); #endif /* _XP_PRINT_SERVER_ */ _XFUNCPROTOEND #endif /* _XpPrintstr_H_ */ - -- cgit v1.2.3 From e0972b5ba2e9a39f5afa6ad17668dfa517e04cea Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:38:51 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- Print.h | 2 +- Printstr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Print.h b/Print.h index dc9c66d..2d45082 100644 --- a/Print.h +++ b/Print.h @@ -57,7 +57,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp $ */ #ifndef _XpPrint_H_ #define _XpPrint_H_ diff --git a/Printstr.h b/Printstr.h index a518da8..164e2f3 100644 --- a/Printstr.h +++ b/Printstr.h @@ -43,7 +43,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Printstr.h,v 1.6 2001/08/23 12:46:11 alanh Exp $ */ +/* $XFree86: xc/include/extensions/Printstr.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */ #ifndef _XpPrintstr_H_ -- cgit v1.2.3