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

diff --git a/xorg-server/hw/kdrive/fake/fake.c b/xorg-server/hw/kdrive/fake/fake.c
new file mode 100644
index 000000000..6211ab871
--- /dev/null
+++ b/xorg-server/hw/kdrive/fake/fake.c
@@ -0,0 +1,484 @@
+/*
+ * Copyright © 2004 Keith Packard
+ *
+ * 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 Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "fake.h"
+
+extern int KdTsPhyScreen;
+
+Bool
+fakeInitialize (KdCardInfo *card, FakePriv *priv)
+{
+    priv->base = 0;
+    priv->bytes_per_line = 0;
+    return TRUE;
+}
+
+Bool
+fakeCardInit (KdCardInfo *card)
+{
+    FakePriv	*priv;
+
+    priv = (FakePriv *) xalloc (sizeof (FakePriv));
+    if (!priv)
+	return FALSE;
+    
+    if (!fakeInitialize (card, priv))
+    {
+	xfree (priv);
+	return FALSE;
+    }
+    card->driver = priv;
+    
+    return TRUE;
+}
+
+Bool
+fakeScreenInitialize (KdScreenInfo *screen, FakeScrPriv *scrpriv)
+{
+    if (!screen->width || !screen->height)
+    {
+	screen->width = 1024;
+	screen->height = 768;
+	screen->rate = 72;
+    }
+
+    if (screen->width <= 0)
+	screen->width = 1;
+    if (screen->height <= 0)
+	screen->height = 1;
+    
+    if (!screen->fb[0].depth)
+	screen->fb[0].depth = 16;
+
+    if (screen->fb[0].depth <= 8)
+    {
+	screen->fb[0].visuals = ((1 << StaticGray) |
+				 (1 << GrayScale) |
+				 (1 << StaticColor) |
+				 (1 << PseudoColor) |
+				 (1 << TrueColor) |
+				 (1 << DirectColor));
+    }
+    else 
+    {
+	screen->fb[0].visuals = (1 << TrueColor);
+#define Mask(o,l)   (((1 << l) - 1) << o)
+	if (screen->fb[0].depth <= 15)
+	{
+	    screen->fb[0].depth = 15;
+	    screen->fb[0].bitsPerPixel = 16;
+	    screen->fb[0].redMask = Mask (10, 5);
+	    screen->fb[0].greenMask = Mask (5, 5);
+	    screen->fb[0].blueMask = Mask (0, 5);
+	}
+	else if (screen->fb[0].depth <= 16)
+	{
+	    screen->fb[0].depth = 16;
+	    screen->fb[0].bitsPerPixel = 16;
+	    screen->fb[0].redMask = Mask (11, 5);
+	    screen->fb[0].greenMask = Mask (5, 6);
+	    screen->fb[0].blueMask = Mask (0, 5);
+	}
+	else
+	{
+	    screen->fb[0].depth = 24;
+	    screen->fb[0].bitsPerPixel = 32;
+	    screen->fb[0].redMask = Mask (16, 8);
+	    screen->fb[0].greenMask = Mask (8, 8);
+	    screen->fb[0].blueMask = Mask (0, 8);
+	}
+    }
+
+    scrpriv->randr = screen->randr;
+
+    return fakeMapFramebuffer (screen);
+}
+
+Bool
+fakeScreenInit (KdScreenInfo *screen)
+{
+    FakeScrPriv *scrpriv;
+
+    scrpriv = xalloc (sizeof (FakeScrPriv));
+    if (!scrpriv)
+	return FALSE;
+    memset (scrpriv, '\0', sizeof (FakeScrPriv));
+    screen->driver = scrpriv;
+    if (!fakeScreenInitialize (screen, scrpriv))
+    {
+	screen->driver = 0;
+	xfree (scrpriv);
+	return FALSE;
+    }
+    return TRUE;
+}
+    
+void *
+fakeWindowLinear (ScreenPtr	pScreen,
+		   CARD32	row,
+		   CARD32	offset,
+		   int		mode,
+		   CARD32	*size,
+		   void		*closure)
+{
+    KdScreenPriv(pScreen);
+    FakePriv	    *priv = pScreenPriv->card->driver;
+
+    if (!pScreenPriv->enabled)
+	return 0;
+    *size = priv->bytes_per_line;
+    return priv->base + row * priv->bytes_per_line;
+}
+
+Bool
+fakeMapFramebuffer (KdScreenInfo *screen)
+{
+    FakeScrPriv	*scrpriv = screen->driver;
+    KdPointerMatrix	m;
+    FakePriv		*priv = screen->card->driver;
+
+    if (scrpriv->randr != RR_Rotate_0)
+	scrpriv->shadow = TRUE;
+    else
+	scrpriv->shadow = FALSE;
+    
+    KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);
+    
+    KdSetPointerMatrix (&m);
+    
+    priv->bytes_per_line = ((screen->width * screen->fb[0].bitsPerPixel + 31) >> 5) << 2;
+    if (priv->base)
+	free (priv->base);
+    priv->base = malloc (priv->bytes_per_line * screen->height);
+    screen->memory_base = (CARD8 *) (priv->base);
+    screen->memory_size = 0;
+    screen->off_screen_base = 0;
+    
+    if (scrpriv->shadow)
+    {
+	if (!KdShadowFbAlloc (screen, 0, 
+			      scrpriv->randr & (RR_Rotate_90|RR_Rotate_270)))
+	    return FALSE;
+    }
+    else
+    {
+        screen->fb[0].byteStride = priv->bytes_per_line;
+        screen->fb[0].pixelStride = (priv->bytes_per_line * 8/
+				     screen->fb[0].bitsPerPixel);
+        screen->fb[0].frameBuffer = (CARD8 *) (priv->base);
+    }
+    
+    return TRUE;
+}
+
+void
+fakeSetScreenSizes (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo	*screen = pScreenPriv->screen;
+    FakeScrPriv	*scrpriv = screen->driver;
+
+    if (scrpriv->randr & (RR_Rotate_0|RR_Rotate_180))
+    {
+	pScreen->width = screen->width;
+	pScreen->height = screen->height;
+	pScreen->mmWidth = screen->width_mm;
+	pScreen->mmHeight = screen->height_mm;
+    }
+    else
+    {
+	pScreen->width = screen->width;
+	pScreen->height = screen->height;
+	pScreen->mmWidth = screen->height_mm;
+	pScreen->mmHeight = screen->width_mm;
+    }
+}
+
+Bool
+fakeUnmapFramebuffer (KdScreenInfo *screen)
+{
+    FakePriv		*priv = screen->card->driver;
+    KdShadowFbFree (screen, 0);
+    if (priv->base)
+    {
+	free (priv->base);
+	priv->base = 0;
+    }
+    return TRUE;
+}
+
+Bool
+fakeSetShadow (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo	*screen = pScreenPriv->screen;
+    FakeScrPriv	*scrpriv = screen->driver;
+    ShadowUpdateProc	update;
+    ShadowWindowProc	window;
+
+    window = fakeWindowLinear;
+    update = 0;
+    if (scrpriv->randr)
+	update = shadowUpdateRotatePacked;
+    else
+	update = shadowUpdatePacked;
+    return KdShadowSet (pScreen, scrpriv->randr, update, window);
+}
+
+
+#ifdef RANDR
+Bool
+fakeRandRGetInfo (ScreenPtr pScreen, Rotation *rotations)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo	    *screen = pScreenPriv->screen;
+    FakeScrPriv	    *scrpriv = screen->driver;
+    RRScreenSizePtr	    pSize;
+    Rotation		    randr;
+    int			    n;
+    
+    *rotations = RR_Rotate_All|RR_Reflect_All;
+    
+    for (n = 0; n < pScreen->numDepths; n++)
+	if (pScreen->allowedDepths[n].numVids)
+	    break;
+    if (n == pScreen->numDepths)
+	return FALSE;
+    
+    pSize = RRRegisterSize (pScreen,
+			    screen->width,
+			    screen->height,
+			    screen->width_mm,
+			    screen->height_mm);
+    
+    randr = KdSubRotation (scrpriv->randr, screen->randr);
+    
+    RRSetCurrentConfig (pScreen, randr, 0, pSize);
+    
+    return TRUE;
+}
+
+Bool
+fakeRandRSetConfig (ScreenPtr		pScreen,
+		     Rotation		randr,
+		     int		rate,
+		     RRScreenSizePtr	pSize)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo	*screen = pScreenPriv->screen;
+    FakeScrPriv	*scrpriv = screen->driver;
+    Bool		wasEnabled = pScreenPriv->enabled;
+    FakeScrPriv	oldscr;
+    int			oldwidth;
+    int			oldheight;
+    int			oldmmwidth;
+    int			oldmmheight;
+    int			newwidth, newheight;
+
+    if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
+    {
+	newwidth = pSize->width;
+	newheight = pSize->height;
+    }
+    else
+    {
+	newwidth = pSize->height;
+	newheight = pSize->width;
+    }
+
+    if (wasEnabled)
+	KdDisableScreen (pScreen);
+
+    oldscr = *scrpriv;
+    
+    oldwidth = screen->width;
+    oldheight = screen->height;
+    oldmmwidth = pScreen->mmWidth;
+    oldmmheight = pScreen->mmHeight;
+    
+    /*
+     * Set new configuration
+     */
+    
+    scrpriv->randr = KdAddRotation (screen->randr, randr);
+
+    KdOffscreenSwapOut (screen->pScreen);
+
+    fakeUnmapFramebuffer (screen);
+    
+    if (!fakeMapFramebuffer (screen))
+	goto bail4;
+
+    KdShadowUnset (screen->pScreen);
+
+    if (!fakeSetShadow (screen->pScreen))
+	goto bail4;
+
+    fakeSetScreenSizes (screen->pScreen);
+
+    /*
+     * Set frame buffer mapping
+     */
+    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap (pScreen),
+				    pScreen->width,
+				    pScreen->height,
+				    screen->fb[0].depth,
+				    screen->fb[0].bitsPerPixel,
+				    screen->fb[0].byteStride,
+				    screen->fb[0].frameBuffer);
+    
+    /* set the subpixel order */
+    
+    KdSetSubpixelOrder (pScreen, scrpriv->randr);
+    if (wasEnabled)
+	KdEnableScreen (pScreen);
+
+    return TRUE;
+
+bail4:
+    fakeUnmapFramebuffer (screen);
+    *scrpriv = oldscr;
+    (void) fakeMapFramebuffer (screen);
+    pScreen->width = oldwidth;
+    pScreen->height = oldheight;
+    pScreen->mmWidth = oldmmwidth;
+    pScreen->mmHeight = oldmmheight;
+    
+    if (wasEnabled)
+	KdEnableScreen (pScreen);
+    return FALSE;
+}
+
+Bool
+fakeRandRInit (ScreenPtr pScreen)
+{
+    rrScrPrivPtr    pScrPriv;
+    
+    if (!RRScreenInit (pScreen))
+	return FALSE;
+
+    pScrPriv = rrGetScrPriv(pScreen);
+    pScrPriv->rrGetInfo = fakeRandRGetInfo;
+    pScrPriv->rrSetConfig = fakeRandRSetConfig;
+    return TRUE;
+}
+#endif
+
+Bool
+fakeCreateColormap (ColormapPtr pmap)
+{
+    return fbInitializeColormap (pmap);
+}
+
+Bool
+fakeInitScreen (ScreenPtr pScreen)
+{
+#ifdef TOUCHSCREEN
+    KdTsPhyScreen = pScreen->myNum;
+#endif
+
+    pScreen->CreateColormap = fakeCreateColormap;
+    return TRUE;
+}
+
+Bool
+fakeFinishInitScreen (ScreenPtr pScreen)
+{
+    if (!shadowSetup (pScreen))
+	return FALSE;
+
+#ifdef RANDR
+    if (!fakeRandRInit (pScreen))
+	return FALSE;
+#endif
+    
+    return TRUE;
+}
+
+
+Bool
+fakeCreateResources (ScreenPtr pScreen)
+{
+    return fakeSetShadow (pScreen);
+}
+
+void
+fakePreserve (KdCardInfo *card)
+{
+}
+
+Bool
+fakeEnable (ScreenPtr pScreen)
+{
+    return TRUE;
+}
+
+Bool
+fakeDPMS (ScreenPtr pScreen, int mode)
+{
+    return TRUE;
+}
+
+void
+fakeDisable (ScreenPtr pScreen)
+{
+}
+
+void
+fakeRestore (KdCardInfo *card)
+{
+}
+
+void
+fakeScreenFini (KdScreenInfo *screen)
+{
+}
+
+void
+fakeCardFini (KdCardInfo *card)
+{
+    FakePriv	*priv = card->driver;
+    
+    if (priv->base)
+	free (priv->base);
+    xfree (priv);
+}
+
+void
+fakeGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
+{
+    while (n--)
+    {
+	pdefs->red = 0;
+	pdefs->green = 0;
+	pdefs->blue = 0;
+	pdefs++;
+    }
+}
+
+void
+fakePutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
+{
+}