Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 141 insertions, 0 deletions

diff --git a/libX11/src/Text.c b/libX11/src/Text.c
new file mode 100644
index 000000000..95ad0d9df
--- /dev/null
+++ b/libX11/src/Text.c
@@ -0,0 +1,141 @@
+/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
+/*
+
+Copyright 1986, 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.
+
+*/
+/* $XFree86: xc/lib/X11/Text.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+int
+XDrawString(
+    register Display *dpy,
+    Drawable d,
+    GC gc,
+    int x,
+    int y,
+    _Xconst char *string,
+    int length)
+{   
+    int Datalength = 0;
+    register xPolyText8Req *req;
+
+    if (length <= 0)
+       return 0;
+
+    LockDisplay(dpy);
+    FlushGC(dpy, gc);
+    GetReq (PolyText8, req);
+    req->drawable = d;
+    req->gc = gc->gid;
+    req->x = x;
+    req->y = y;
+
+
+    Datalength += SIZEOF(xTextElt) * ((length + 253) / 254) + length;
+
+
+    req->length += (Datalength + 3)>>2;  /* convert to number of 32-bit words */
+
+
+    /* 
+     * If the entire request does not fit into the remaining space in the
+     * buffer, flush the buffer first.   If the request does fit into the
+     * empty buffer, then we won't have to flush it at the end to keep
+     * the buffer 32-bit aligned. 
+     */
+
+    if (dpy->bufptr + Datalength > dpy->bufmax)
+    	_XFlush (dpy);
+
+    {
+	int nbytes;
+	int PartialNChars = length;
+        /* register xTextElt *elt; */
+ 	char *CharacterOffset = (char *)string;
+        unsigned char *tbuf;
+
+	while(PartialNChars > 254)
+        {
+ 	    nbytes = 254 + SIZEOF(xTextElt);
+	    BufAlloc (unsigned char *, tbuf, nbytes);
+/*    elt->delta = 0;
+ *    elt->len = 254;
+ */
+            *(unsigned char *)tbuf = 254;
+            *(tbuf+1) = 0;
+/*       memcpy ((char *) (elt + 1), CharacterOffset, 254);
+ */
+            memcpy ((char *)tbuf+2, CharacterOffset, 254);
+	    PartialNChars = PartialNChars - 254;
+	    CharacterOffset += 254;
+	}
+	    
+        if (PartialNChars)
+        {
+	    nbytes = PartialNChars + SIZEOF(xTextElt);
+	    BufAlloc (unsigned char *, tbuf, nbytes); 
+/*    elt->delta = 0;
+ *    elt->len = PartialNChars;
+ */
+            *(unsigned char *)tbuf =  PartialNChars;
+            *(tbuf+1) = 0;
+/*     memcpy ((char *) (elt + 1), CharacterOffset, PartialNChars);
+ */
+         memcpy ((char *)tbuf+2, CharacterOffset, PartialNChars);
+	 }
+    }
+
+    /* Pad request out to a 32-bit boundary */
+
+    if (Datalength &= 3) {
+	char *pad;
+	/* 
+	 * BufAlloc is a macro that uses its last argument more than
+	 * once, otherwise I'd write "BufAlloc (char *, pad, 4-length)" 
+	 */
+	length = 4 - Datalength;
+	BufAlloc (char *, pad, length);
+	/* 
+	 * if there are 3 bytes of padding, the first byte MUST be 0
+	 * so the pad bytes aren't mistaken for a final xTextElt 
+	 */
+	*pad = 0;
+        }
+
+    /* 
+     * If the buffer pointer is not now pointing to a 32-bit boundary,
+     * we must flush the buffer so that it does point to a 32-bit boundary
+     * at the end of this routine. 
+     */
+
+    if ((dpy->bufptr - dpy->buffer) & 3)
+       _XFlush (dpy);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return 0;
+}