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, 323 insertions, 0 deletions

diff --git a/xorg-server/hw/xgl/xglarea.c b/xorg-server/hw/xgl/xglarea.c
new file mode 100644
index 000000000..cdf652d0f
--- /dev/null
+++ b/xorg-server/hw/xgl/xglarea.c
@@ -0,0 +1,323 @@
+/*
+ * Copyright © 2005 Novell, Inc.
+ *
+ * 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, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xgl.h"
+
+static Bool
+xglAreaMoveIn (xglAreaPtr pArea,
+	       pointer	  closure)
+{
+    pArea->closure = closure;
+    pArea->state   = xglAreaOccupied;
+
+    return (*pArea->pRoot->funcs->MoveIn) (pArea, closure);
+}
+
+static void
+xglAreaMoveOut (xglAreaPtr pArea)
+{
+    (*pArea->pRoot->funcs->MoveOut) (pArea, pArea->closure);
+
+    pArea->closure = (pointer) 0;
+    pArea->state   = xglAreaAvailable;
+}
+
+static xglAreaPtr
+xglAreaCreate (xglRootAreaPtr pRoot,
+	       int	      level,
+	       int	      x,
+	       int	      y,
+	       int	      width,
+	       int	      height)
+{
+    xglAreaPtr pArea;
+    int	       n = 4;
+
+    pArea = xalloc (sizeof (xglAreaRec) + pRoot->devPrivateSize);
+    if (!pArea)
+	return NULL;
+
+    pArea->level   = level;
+    pArea->x	   = x;
+    pArea->y	   = y;
+    pArea->width   = width;
+    pArea->height  = height;
+    pArea->pRoot   = pRoot;
+    pArea->closure = (pointer) 0;
+    pArea->state   = xglAreaAvailable;
+
+    while (n--)
+	pArea->pArea[n] = NULL;
+
+    if (pRoot->devPrivateSize)
+	pArea->devPrivate.ptr = pArea + 1;
+    else
+	pArea->devPrivate.ptr = (pointer) 0;
+
+    if (!(*pArea->pRoot->funcs->Create) (pArea))
+    {
+	free (pArea);
+	return NULL;
+    }
+
+    return pArea;
+}
+
+static void
+xglAreaDestroy (xglAreaPtr pArea)
+{
+    if (!pArea)
+	return;
+
+    if (pArea->state == xglAreaOccupied)
+    {
+	xglAreaMoveOut (pArea);
+    }
+    else
+    {
+	int n = 4;
+
+	while (n--)
+	    xglAreaDestroy (pArea->pArea[n]);
+    }
+
+    xfree (pArea);
+}
+
+static xglAreaPtr
+xglAreaGetTopScoredSubArea (xglAreaPtr pArea)
+{
+    if (!pArea)
+	return NULL;
+
+    switch (pArea->state) {
+    case xglAreaOccupied:
+	return pArea;
+    case xglAreaAvailable:
+	break;
+    case xglAreaDivided: {
+	xglAreaPtr tmp, top = NULL;
+	int	   i;
+
+	for (i = 0; i < 4; i++)
+	{
+	    tmp = xglAreaGetTopScoredSubArea (pArea->pArea[i]);
+	    if (tmp && top)
+	    {
+		if ((*pArea->pRoot->funcs->CompareScore) (tmp,
+							  tmp->closure,
+							  top->closure) > 0)
+		    top = tmp;
+	    }
+	    else if (tmp)
+	    {
+		top = tmp;
+	    }
+	}
+	return top;
+    }
+    }
+
+    return NULL;
+}
+
+static Bool
+xglAreaFind (xglAreaPtr pArea,
+	     int	width,
+	     int	height,
+	     Bool	kickOut,
+	     pointer	closure)
+{
+    if (pArea->width < width || pArea->height < height)
+	return FALSE;
+
+    switch (pArea->state) {
+    case xglAreaOccupied:
+	if (kickOut)
+	{
+	    if ((*pArea->pRoot->funcs->CompareScore) (pArea,
+						      pArea->closure,
+						      closure) >= 0)
+		return FALSE;
+
+	    xglAreaMoveOut (pArea);
+	} else
+	    return FALSE;
+
+    /* fall-through */
+    case xglAreaAvailable:
+    {
+	if (pArea->level == pArea->pRoot->maxLevel ||
+	    (pArea->width == width && pArea->height == height))
+	{
+	    if (xglAreaMoveIn (pArea, closure))
+		return TRUE;
+	}
+	else
+	{
+	    int dx[4], dy[4], w[4], h[4], i;
+
+	    dx[0] = dx[2] = dy[0] = dy[1] = 0;
+
+	    w[0] = w[2] = dx[1] = dx[3] = width;
+	    h[0] = h[1] = dy[2] = dy[3] = height;
+
+	    w[1] = w[3] = pArea->width - width;
+	    h[2] = h[3] = pArea->height - height;
+
+	    for (i = 0; i < 2; i++)
+	    {
+		if (w[i])
+		    pArea->pArea[i] =
+			xglAreaCreate (pArea->pRoot,
+				       pArea->level + 1,
+				       pArea->x + dx[i],
+				       pArea->y + dy[i],
+				       w[i], h[i]);
+	    }
+
+	    for (; i < 4; i++)
+	    {
+		if (w[i] && h[i])
+		    pArea->pArea[i] =
+			xglAreaCreate (pArea->pRoot,
+				       pArea->level + 1,
+				       pArea->x + dx[i],
+				       pArea->y + dy[i],
+				       w[i], h[i]);
+	    }
+
+	    pArea->state = xglAreaDivided;
+
+	    if (xglAreaFind (pArea->pArea[0], width, height, kickOut, closure))
+		return TRUE;
+	}
+    } break;
+    case xglAreaDivided:
+    {
+	xglAreaPtr topArea;
+	int	   i, rejected = FALSE;
+
+	for (i = 0; i < 4; i++)
+	{
+	    if (pArea->pArea[i])
+	    {
+		if (pArea->pArea[i]->width >= width &&
+		    pArea->pArea[i]->height >= height)
+		{
+		    if (xglFindArea (pArea->pArea[i], width, height, kickOut,
+				     closure))
+			return TRUE;
+
+		    rejected = TRUE;
+		}
+	    }
+	}
+
+	if (rejected)
+	    return FALSE;
+
+	topArea = xglAreaGetTopScoredSubArea (pArea);
+	if (topArea)
+	{
+	    if (kickOut)
+	    {
+		if ((*pArea->pRoot->funcs->CompareScore) (topArea,
+							  topArea->closure,
+							  closure) >= 0)
+		    return FALSE;
+	    } else
+		return FALSE;
+	}
+
+	for (i = 0; i < 4; i++)
+	{
+	    xglAreaDestroy (pArea->pArea[i]);
+	    pArea->pArea[i] = NULL;
+	}
+
+	pArea->closure = (pointer) 0;
+	pArea->state   = xglAreaAvailable;
+	if (xglFindArea (pArea, width, height, TRUE, closure))
+	    return TRUE;
+
+    } break;
+    }
+
+    return FALSE;
+}
+
+Bool
+xglRootAreaInit (xglRootAreaPtr	    pRoot,
+		 int		    maxLevel,
+		 int		    width,
+		 int		    height,
+		 int		    devPrivateSize,
+		 xglAreaFuncsPtr    funcs,
+		 pointer	    closure)
+{
+    pRoot->maxLevel	  = maxLevel;
+    pRoot->funcs	  = funcs;
+    pRoot->devPrivateSize = devPrivateSize;
+    pRoot->closure	  = closure;
+
+    pRoot->pArea = xglAreaCreate (pRoot, 0, 0, 0, width, height);
+    if (!pRoot->pArea)
+	return FALSE;
+
+    return TRUE;
+}
+
+void
+xglRootAreaFini (xglRootAreaPtr pRoot)
+{
+    xglAreaDestroy (pRoot->pArea);
+}
+
+void
+xglLeaveArea (xglAreaPtr pArea)
+{
+    xglAreaMoveOut (pArea);
+}
+
+void
+xglWithdrawArea (xglAreaPtr pArea)
+{
+    pArea->closure = NULL;
+    pArea->state   = xglAreaAvailable;
+}
+
+Bool
+xglFindArea (xglAreaPtr pArea,
+	     int	width,
+	     int	height,
+	     Bool	kickOut,
+	     pointer	closure)
+{
+    if (width < 1 || height < 0)
+	return FALSE;
+
+    return xglAreaFind (pArea, width, height, kickOut, closure);
+}