6725007.patch revision 535
230N/A--- Print.h 2004-04-23 11:43:06.000000000 -0700
230N/A+++ Print.h.new 2008-09-03 13:04:25.259850000 -0700
230N/A@@ -88,12 +88,13 @@
230N/A */
230N/A #define XP_DONT_CHECK 0
230N/A #define XP_INITIAL_RELEASE 1
230N/A+#define XP_SECOND_RELEASE 2
230N/A
230N/A /*
230N/A * For each single entry above, create one major/minor pair.
230N/A */
230N/A #define XP_PROTO_MAJOR 1
230N/A-#define XP_PROTO_MINOR 0
230N/A+#define XP_PROTO_MINOR 1
230N/A
230N/A /*
230N/A * Identify current version.
230N/A@@ -356,6 +357,18 @@
230N/A XRectangle *reproducible_area /* return value */
230N/A );
230N/A
230N/A+#ifdef SUNSOFT
230N/A+extern Bool XpClientDPI_SUNW (
230N/A+ Display *display,
230N/A+ int clientDPI
230N/A+);
230N/A+#endif
230N/A+
230N/A+extern Bool XpClientDPI (
230N/A+ Display *display,
230N/A+ int clientDPI
230N/A+);
230N/A+
230N/A extern void XpStartJob (
439N/A Display *display,
439N/A XPSaveData save_data
230N/A--- Printstr.h 2005-07-25 09:15:05.000000000 -0700
230N/A+++ Printstr.h.new 2008-09-03 13:26:27.277787000 -0700
368N/A@@ -108,6 +108,7 @@
368N/A #define X_PrintQueryScreens 22
340N/A #define X_PrintSetImageResolution 23
230N/A #define X_PrintGetImageResolution 24
857N/A+#define X_PrintClientDpi 25
230N/A
857N/A /********************************************************************
230N/A *
230N/A@@ -653,6 +654,30 @@
230N/A } xPrintGetImageResolutionReply;
340N/A #define sz_xPrintGetImageResolutionReply 32
340N/A
230N/A+typedef struct _PrintClientDpi {
230N/A+ CARD8 reqType; /* always PrintReqCode */
857N/A+ CARD8 printReqType; /* always X_PrintClientDpi */
857N/A+ CARD16 length B16;
857N/A+ PCONTEXT printContext B32; /* print context */
857N/A+ CARD16 clientDPI B16;
857N/A+ CARD16 pad1 B16;
857N/A+} xPrintClientDpiReq;
857N/A+#define sz_xPrintClientDpiReq 12
857N/A+
857N/A+typedef struct {
230N/A+ BYTE type; /* X_Reply */
230N/A+ CARD8 status; /* accepted or not */
230N/A+ CARD16 sequenceNumber B16;
340N/A+ CARD32 length B32;
340N/A+ CARD32 pad1 B32;
340N/A+ CARD32 pad2 B32;
340N/A+ CARD32 pad3 B32;
340N/A+ CARD32 pad4 B32;
230N/A+ CARD32 pad5 B32;
230N/A+ CARD32 pad6 B32;
230N/A+} xPrintClientDpiReply;
340N/A+#define sz_xPrintClientDpiReply 32
230N/A+
230N/A #ifndef _XP_PRINT_SERVER_
230N/A /***********************************************************************
230N/A *
230N/A@@ -776,6 +801,26 @@
extern void XpUnsetFontResFunc(ClientPtr);
extern void XpRegisterInitFunc(ScreenPtr, char *, int (*)(struct _XpContext *));
+typedef struct _XpClientFonts {
+ struct _XpClientFonts *pNext;
+ int client_fid;
+ int server_fid;
+ FontPtr client_font;
+ FontPtr server_font;
+} XpClientFontsRec, *XpClientFontsPtr;
+
+typedef struct _XpClientDPI {
+ struct _XpClientDPI *pNext;
+ struct _XpClientDPI *pPrev;
+ struct _XpClientFonts *head;
+ int client_dpi;
+ float scale_factor;
+ int clientAsMask;
+ XpContextPtr context;
+ int client_x;
+ int server_x;
+} XpClientDPIRec, *XpClientDPIPtr;
+
#endif /* _XP_PRINT_SERVER_ */
_XFUNCPROTOEND