open-src/lib/libXp/6724993.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 1370 7a7a374453e5
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb

--- src/Makefile.am	2008-08-26 09:58:57.225299000 -0700
+++ src/Makefile.am.new	2008-08-26 10:08:24.257125000 -0700
@@ -17,6 +17,7 @@ libXp_la_SOURCES =			\
 	XpPrinter.c			\
 	XpPutData.c			\
 	XpScreens.c			\
+	XpDpi.c				\
 					\
 	XpExtUtil.h
 
--- src/XpDpi.c	1969-12-31 16:00:00.000000000 -0800
+++ src/XpDpi.c.new	2008-08-26 13:44:31.473701000 -0700
@@ -0,0 +1,101 @@
+/* $XConsortium: XpDpi.c /main/4 1996/12/04 10:24:31 lehors $ */
+/******************************************************************************
+ ******************************************************************************
+ **
+ ** (c) Copyright 1996 Hewlett-Packard Company
+ ** (c) Copyright 1996 International Business Machines Corp.
+ ** (c) Copyright 1996, Oracle and/or its affiliates. All rights reserved.
+ ** (c) Copyright 1996 Novell, Inc.
+ ** (c) Copyright 1996 Digital Equipment Corp.
+ ** (c) Copyright 1996 Fujitsu Limited
+ ** (c) Copyright 1996 Hitachi, Ltd.
+ ** 
+ ** Permission is hereby granted, free of charge, to any person obtaining a copy
+ ** of this software and associated documentation files (the "Software"), to deal
+ ** in the Software without restriction, including without limitation the rights
+ ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ ** copies of the Software, and to permit persons to whom the Software is
+ ** furnished to do so, subject to the following conditions:
+ **
+ ** The above copyright notice and this permission notice shall be included in
+ ** all copies or substantial portions of the Software.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ ** COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ ** IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ ** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ **
+ ** Except as contained in this notice, the names of the copyright holders shall
+ ** not be used in advertising or otherwise to promote the sale, use or other
+ ** dealings in this Software without prior written authorization from said
+ ** copyright holders.
+ **
+ ******************************************************************************
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/extensions/Printstr.h>
+#include "XpExtUtil.h"
+#include <X11/Xlibint.h>
+#include <X11/Xos.h>
+#include <limits.h>
+#ifndef WIN32
+#define X_INCLUDE_PWD_H
+#define XOS_USE_XLIB_LOCKING
+#include <X11/Xos_r.h>
+#endif
+#include <limits.h>
+
+
+Bool
+XpClientDPI (
+    Display    *dpy,
+    int		client_dpi
+)
+{
+    xPrintClientDpiReq   *req;
+    xPrintClientDpiReply rep;
+    XExtDisplayInfo *info = (XExtDisplayInfo *) xp_find_display (dpy);
+    short dpi = (short)client_dpi;
+
+    XPContext    context;
+
+    if (XpCheckExtInit(dpy, XP_SECOND_RELEASE) == -1)
+        return (False); /* NoSuchExtension */
+
+    LockDisplay (dpy);
+
+    GetReq(PrintClientDpi,req);
+    req->reqType = info->codes->major_opcode;
+    req->printReqType = X_PrintClientDpi;
+    req->clientDPI = (CARD16) dpi;
+
+    if (! _XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+        UnlockDisplay (dpy);
+        SyncHandle ();
+        return (False);
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle ();
+
+    return ( rep.status );
+}
+
+/*
+ * Bug 4402782: Add Sun specific propietary call until X.Org takes the
+ * change.
+ */
+#ifdef SUNSOFT
+Bool
+XpClientDPI_SUNW (
+    Display    *dpy,
+    int		client_dpi
+)
+{
+   return XpClientDPI(dpy, client_dpi);
+}
+#endif