dos -> unix

1 files changed, 81 insertions, 81 deletions

diff --git a/libX11/src/QuTextE16.c b/libX11/src/QuTextE16.c
index e88d246fa..e458bc52c 100644
--- a/libX11/src/QuTextE16.c
+++ b/libX11/src/QuTextE16.c
@@ -1,81 +1,81 @@
-/*

-

-Copyright 1986, 1987, 1998  The Open Group

-

-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.

-

-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

-OPEN GROUP 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 name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-int

-XQueryTextExtents16 (

-    register Display *dpy,

-    Font fid,

-    _Xconst XChar2b *string,

-    register int nchars,

-    int *dir,

-    int *font_ascent,

-    int *font_descent,

-    register XCharStruct *overall)

-{

-    register long i;

-    register unsigned char *ptr;

-    char *buf;

-    xQueryTextExtentsReply rep;

-    long nbytes;

-    register xQueryTextExtentsReq *req;

-

-    LockDisplay(dpy);

-    nbytes = nchars << 1;

-    GetReq(QueryTextExtents, req);

-    req->fid = fid;

-    if ((buf = _XAllocScratch (dpy, (unsigned long) nbytes))) {

-	req->length += (nbytes + 3)>>2;

-	req->oddLength = nchars & 1;

-	for (ptr = (unsigned char *)buf, i = nchars; --i >= 0; string++) {

-	    *ptr++ = string->byte1;

-	    *ptr++ = string->byte2;

-	}

-	Data (dpy, buf, nbytes);

-    }

-    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue) || !buf) {

-        UnlockDisplay(dpy);

-	SyncHandle();

-	return 0;

-    }

-    *dir = rep.drawDirection;

-    *font_ascent = cvtINT16toInt (rep.fontAscent);

-    *font_descent = cvtINT16toInt (rep.fontDescent);

-    overall->ascent = (short) cvtINT16toShort (rep.overallAscent);

-    overall->descent = (short) cvtINT16toShort (rep.overallDescent);

-    /* XXX bogus - we're throwing away information!!! */

-    overall->width  = (short) cvtINT32toInt (rep.overallWidth);

-    overall->lbearing = (short) cvtINT32toInt (rep.overallLeft);

-    overall->rbearing = (short) cvtINT32toInt (rep.overallRight);

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return 1;

-}

-

+/*
+
+Copyright 1986, 1987, 1998  The Open Group
+
+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.
+
+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
+OPEN GROUP 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 name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+int
+XQueryTextExtents16 (
+    register Display *dpy,
+    Font fid,
+    _Xconst XChar2b *string,
+    register int nchars,
+    int *dir,
+    int *font_ascent,
+    int *font_descent,
+    register XCharStruct *overall)
+{
+    register long i;
+    register unsigned char *ptr;
+    char *buf;
+    xQueryTextExtentsReply rep;
+    long nbytes;
+    register xQueryTextExtentsReq *req;
+
+    LockDisplay(dpy);
+    nbytes = nchars << 1;
+    GetReq(QueryTextExtents, req);
+    req->fid = fid;
+    if ((buf = _XAllocScratch (dpy, (unsigned long) nbytes))) {
+	req->length += (nbytes + 3)>>2;
+	req->oddLength = nchars & 1;
+	for (ptr = (unsigned char *)buf, i = nchars; --i >= 0; string++) {
+	    *ptr++ = string->byte1;
+	    *ptr++ = string->byte2;
+	}
+	Data (dpy, buf, nbytes);
+    }
+    if (!_XReply (dpy, (xReply *)&rep, 0, xTrue) || !buf) {
+        UnlockDisplay(dpy);
+	SyncHandle();
+	return 0;
+    }
+    *dir = rep.drawDirection;
+    *font_ascent = cvtINT16toInt (rep.fontAscent);
+    *font_descent = cvtINT16toInt (rep.fontDescent);
+    overall->ascent = (short) cvtINT16toShort (rep.overallAscent);
+    overall->descent = (short) cvtINT16toShort (rep.overallDescent);
+    /* XXX bogus - we're throwing away information!!! */
+    overall->width  = (short) cvtINT32toInt (rep.overallWidth);
+    overall->lbearing = (short) cvtINT32toInt (rep.overallLeft);
+    overall->rbearing = (short) cvtINT32toInt (rep.overallRight);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 1;
+}
+