xserver: Branch 'master' - 3 commits

[Keith Packard]

 configure.ac                   |   10 ++++++----
 hw/xfree86/common/xf86Xinput.c |   10 ----------
 render/mipict.c                |    8 ++++----
 3 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f
Author: Kim Woelders <kim at woelders.dk>
Date:   Fri Oct 2 19:31:15 2009 +0200

    render: Fix clip region translation in miClipPictureSrc().
    
    Signed-off-by: Kim Woelders <kim at woelders.dk>
    Reviewed-by:  Soren Sandmann Pedersen <sandmann at redhat.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/render/mipict.c b/render/mipict.c
index 71f3de7..b5dfcb2 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -318,14 +318,14 @@ miClipPictureSrc (RegionPtr	pRegion,
 	Bool result;
 	
 	pixman_region_translate ( pPicture->clientClip,
-				  pPicture->clipOrigin.x - dx,
-				  pPicture->clipOrigin.y - dy);
+				  pPicture->clipOrigin.x + dx,
+				  pPicture->clipOrigin.y + dy);
 
 	result = REGION_INTERSECT (pScreen, pRegion, pRegion, pPicture->clientClip);
 	
 	pixman_region_translate ( pPicture->clientClip,
-				  - (pPicture->clipOrigin.x - dx),
-				  - (pPicture->clipOrigin.y - dy));
+				  - (pPicture->clipOrigin.x + dx),
+				  - (pPicture->clipOrigin.y + dy));
 
 	if (!result)
 	    return FALSE;
commit bd7430a32e63df8cd60352764744076448ee623f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 5 15:31:54 2009 +1000

    xfree86: remove log-spamming DebugF
    
    All input drivers use xf86PostKeyEventP indirectly now and have been since
    it exists. I guess that qualifies it as tested - no need to spam the logs.
    
    Reported-by: Felix Wenk
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index b369537..fd07c2a 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -896,11 +896,6 @@ xf86PostKeyEvent(DeviceIntPtr	device,
     int i = 0;
     static int valuators[MAX_VALUATORS];
 
-    /* instil confidence in the user */
-    DebugF("this function has never been tested properly.  if things go quite "
-           "badly south after this message, then xf86PostKeyEvent is "
-           "broken.\n");
-
     XI_VERIFY_VALUATORS(num_valuators);
 
     va_start(var, num_valuators);
@@ -924,11 +919,6 @@ xf86PostKeyEventP(DeviceIntPtr	device,
 {
     int i = 0, nevents = 0;
 
-    /* instil confidence in the user */
-    DebugF("this function has never been tested properly.  if things go quite "
-           "badly south after this message, then xf86PostKeyEvent is "
-           "broken.\n");
-
     XI_VERIFY_VALUATORS(num_valuators);
 
     if (is_absolute) {
commit c629e0fc50dfaffaa40a56709da7f035c289fed2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 5 10:44:43 2009 +1000

    Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
    
    libXtst requirement is already implicit since we require xextproto 7.1 and
    that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
    list it explicitly.
    
    Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
    Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
    
    Reported-by: Mark Rosenstand
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/configure.ac b/configure.ac
index 46421fd..7adce55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,11 +734,13 @@ REQUIRED_LIBS="xfont xau [pixman-1 >= 0.15.20]"
 
 dnl List of libraries that require a specific version
 LIBAPPLEWM="applewm >= 1.4"
+LIBDMX="dmx >= 1.0.99.1"
 LIBDRI="dri >= 7.1.0"
 LIBDRM="libdrm >= 2.3.0"
 LIBGL="gl >= 7.1.0"
 LIBXEXT="xext >= 1.0.99.4"
 LIBXI="xi >= 1.2.99.1"
+LIBXTST="xtst >= 1.0.99.2"
 LIBPCIACCESS="pciaccess >= 0.8.0"
 LIBGLIB="glib-2.0 >= 2.16"
 
@@ -1819,13 +1821,13 @@ dnl Linux sources in DMX require <linux/keyboard.h>
 	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
 	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
 	AC_SUBST(XDMXCONFIG_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx $LIBXEXT x11])
+	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
 	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu $LIBXEXT x11])
+	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11])
 	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx $LIBXI $LIBXEXT x11])
+	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11])
 	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst $LIBXEXT x11])
+	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11])
 	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
 	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11])
 	AC_SUBST(XRESEXAMPLES_DEP_LIBS)