components/x11/x11-protocols/patches/02_printproto.patch

   1 Bugtraq Bug id: 15493867
   2
   3 --- a/include/X11/extensions/Print.h    2004-04-23 11:43:06.000000000 -0700
   4 +++ b/include/X11/extensions/Print.h.new        2008-09-03 13:04:25.259850000 -0700
   5 @@ -88,12 +88,13 @@
   6   */
   7  #define XP_DONT_CHECK          0
   8  #define XP_INITIAL_RELEASE     1
   9 +#define XP_SECOND_RELEASE      2
  10
  11  /*
  12   * For each single entry above, create one major/minor pair.
  13   */
  14  #define XP_PROTO_MAJOR         1
  15 -#define XP_PROTO_MINOR         0
  16 +#define XP_PROTO_MINOR         1
  17
  18  /*
  19   * Identify current version.
  20 @@ -356,6 +357,18 @@
  21      XRectangle         *reproducible_area      /* return value */
  22  );
  23
  24 +#ifdef SUNSOFT
  25 +extern Bool XpClientDPI_SUNW (
  26 +    Display            *display,
  27 +    int                        clientDPI
  28 +);
  29 +#endif
  30 +
  31 +extern Bool XpClientDPI (
  32 +    Display            *display,
  33 +    int                        clientDPI
  34 +);
  35 +
  36  extern void XpStartJob (
  37      Display            *display,
  38      XPSaveData         save_data
  39 --- a/include/X11/extensions/Printstr.h 2005-07-25 09:15:05.000000000 -0700
  40 +++ b/include/X11/extensions/Printstr.h.new     2008-09-03 13:26:27.277787000 -0700
  41 @@ -108,6 +108,7 @@
  42  #define X_PrintQueryScreens            22
  43  #define X_PrintSetImageResolution      23
  44  #define X_PrintGetImageResolution      24
  45 +#define X_PrintClientDpi               25
  46
  47  /********************************************************************
  48   *
  49 @@ -653,6 +654,30 @@
  50  } xPrintGetImageResolutionReply;
  51  #define sz_xPrintGetImageResolutionReply 32
  52
  53 +typedef struct _PrintClientDpi {
  54 +       CARD8   reqType;                /* always PrintReqCode */
  55 +       CARD8   printReqType;           /* always X_PrintClientDpi */
  56 +       CARD16  length B16;
  57 +       PCONTEXT printContext B32;      /* print context */
  58 +       CARD16  clientDPI B16;
  59 +       CARD16  pad1 B16;
  60 +} xPrintClientDpiReq;
  61 +#define sz_xPrintClientDpiReq          12
  62 +
  63 +typedef struct {
  64 +       BYTE    type;                   /* X_Reply */
  65 +       CARD8   status;                 /* accepted or not */
  66 +       CARD16  sequenceNumber B16;
  67 +       CARD32  length B32;
  68 +       CARD32  pad1 B32;
  69 +       CARD32  pad2 B32;
  70 +       CARD32  pad3 B32;
  71 +       CARD32  pad4 B32;
  72 +       CARD32  pad5 B32;
  73 +       CARD32  pad6 B32;
  74 +} xPrintClientDpiReply;
  75 +#define sz_xPrintClientDpiReply                32
  76 +
  77  #ifndef _XP_PRINT_SERVER_
  78  /***********************************************************************
  79   *
  80 @@ -776,6 +801,26 @@
  81  extern void XpUnsetFontResFunc(ClientPtr);
  82  extern void XpRegisterInitFunc(ScreenPtr, char *, int (*)(struct _XpContext *));
  83
  84 +typedef struct _XpClientFonts {
  85 +       struct _XpClientFonts *pNext;
  86 +       int             client_fid;
  87 +       int             server_fid;
  88 +       FontPtr                 client_font;
  89 +       FontPtr                 server_font;
  90 +} XpClientFontsRec, *XpClientFontsPtr;
  91 +
  92 +typedef struct _XpClientDPI {
  93 +        struct _XpClientDPI   *pNext;
  94 +        struct _XpClientDPI   *pPrev;
  95 +       struct _XpClientFonts *head;
  96 +        int                    client_dpi;
  97 +        float                  scale_factor;
  98 +       int                    clientAsMask;
  99 +        XpContextPtr           context;
 100 +       int                    client_x;
 101 +       int                    server_x;
 102 +} XpClientDPIRec, *XpClientDPIPtr;
 103 +
 104  #endif /* _XP_PRINT_SERVER_ */
 105
 106  _XFUNCPROTOEND