xserver: Branch 'glucose-2' - 3 commits

[Jose Fonseca]

 hw/xgl/glx/xglx.c |    2 +-
 hw/xgl/xglinput.c |    5 +++++
 hw/xgl/xglpict.c  |   44 --------------------------------------------
 3 files changed, 6 insertions(+), 45 deletions(-)

New commits:
diff-tree 1d7403a1c269a92bb1eb347c497f0682bf8a7287 (from 0362a4bbd222abd9d093e827d8cc9453117215f3)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Wed Sep 12 22:27:43 2007 +0100

    Revert xkbsrv.h include rename, per Daniel Stone.

diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 1cf2098..27aff1f 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -50,7 +50,7 @@
 
 #ifdef XKB
 #include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <X11/extensions/XKBconfig.h>
 
 extern Bool
diff-tree 0362a4bbd222abd9d093e827d8cc9453117215f3 (from fcc1e37f36a8db6ff04bfb08c39932e1614a5afd)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Wed Sep 12 22:24:27 2007 +0100

    Add dummy DDXRingBell.

diff --git a/hw/xgl/xglinput.c b/hw/xgl/xglinput.c
index f745f8b..a08fd10 100644
--- a/hw/xgl/xglinput.c
+++ b/hw/xgl/xglinput.c
@@ -76,6 +76,11 @@ xglBell (int	      volume,
 }
 
 void
+DDXRingBell(int volume, int pitch, int duration)
+{
+}
+
+void
 xglKbdCtrl (DeviceIntPtr pDevice,
 	    KeybdCtrl	 *ctrl)
 {
diff-tree fcc1e37f36a8db6ff04bfb08c39932e1614a5afd (from d40ddb942147106975eeaaf05051fa7e30a121b3)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Wed Sep 12 22:22:59 2007 +0100

    Remove duplicate function.

diff --git a/hw/xgl/xglpict.c b/hw/xgl/xglpict.c
index 9ff0c7b..36e6603 100644
--- a/hw/xgl/xglpict.c
+++ b/hw/xgl/xglpict.c
@@ -784,48 +784,4 @@ xglPictureClipExtents (PicturePtr pPictu
     }
 }
 
-void
-xglCreateSolidAlphaPicture (ScreenPtr pScreen)
-{
-    static xRenderColor	solidWhite = { 0xffff, 0xffff, 0xffff, 0xffff };
-    static xRectangle	one = { 0, 0, 1, 1 };
-    PixmapPtr		pPixmap;
-    PictFormatPtr	pFormat;
-    int			error;
-    Pixel		pixel;
-    GCPtr		pGC;
-    XID			tmpval[2];
-
-    XGL_SCREEN_PRIV (pScreen);
-
-    pFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8);
-    if (!pFormat)
-	return;
-
-    pGC = GetScratchGC (pFormat->depth, pScreen);
-    if (!pGC)
-	return;
-
-    pPixmap = (*pScreen->CreatePixmap) (pScreen, 1, 1, pFormat->depth);
-    if (!pPixmap)
-	return;
-
-    miRenderColorToPixel (pFormat, &solidWhite, &pixel);
-
-    tmpval[0] = GXcopy;
-    tmpval[1] = pixel;
-
-    ChangeGC (pGC, GCFunction | GCForeground, tmpval);
-    ValidateGC (&pPixmap->drawable, pGC);
-    (*pGC->ops->PolyFillRect) (&pPixmap->drawable, pGC, 1, &one);
-    FreeScratchGC (pGC);
-
-    tmpval[0] = xTrue;
-    pScreenPriv->pSolidAlpha = CreatePicture (0, &pPixmap->drawable, pFormat,
-					      CPRepeat, tmpval, 0, &error);
-    (*pScreen->DestroyPixmap) (pPixmap);
-
-    if (pScreenPriv->pSolidAlpha)
-	ValidatePicture (pScreenPriv->pSolidAlpha);
-}
 #endif