xserver: Branch 'mpx' - 5 commits

[Peter Hutterer]

 dix/devices.c  |    1 +
 dix/main.c     |    2 +-
 fb/fbarc.c     |    2 ++
 fb/fbpict.c    |    2 +-
 mi/mi.h        |    2 +-
 mi/mieq.c      |    2 +-
 mi/mipointer.c |    2 +-
 xkb/xkbUtils.c |    6 +++---
 8 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 2ae3bed33731d800bb28a968e3a1c8066d179740
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed May 21 15:51:35 2008 +0930

    mi: shut up compiler warning (return w/o a value)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 484947d..0d5c984 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -199,7 +199,7 @@ miPointerDisplayCursor (pDev, pScreen, pCursor)
     /* return for keyboards */
     if ((pDev->isMaster && !DevHasCursor(pDev)) ||
         (!pDev->isMaster && pDev->u.master && !DevHasCursor(pDev->u.master)))
-            return;
+            return FALSE;
 
     pPointer = MIPOINTER(pDev);
 
commit 4056595fc77c20052e226b402e38a2a914dca123
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue May 20 18:57:31 2008 +0930

    xkb: remove superfluous checks in if statement.

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 19a171a..0727ad8 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -2052,7 +2052,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
              * just MapNotify.  we also need to send NKN if the geometry
              * changed (obviously ...). */
             if ((src->min_key_code != dst->min_key_code ||
-                 src->max_key_code != dst->max_key_code) && sendNotifies) {
+                 src->max_key_code != dst->max_key_code)) {
                 nkn.oldMinKeyCode = dst->min_key_code;
                 nkn.oldMaxKeyCode = dst->max_key_code;
                 nkn.deviceID = nkn.oldDeviceID = pDev->id;
@@ -2062,8 +2062,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                 nkn.requestMinor = X_kbSetMap; /* XXX bare-faced lie */
                 nkn.changed = XkbAllNewKeyboardEventsMask;
                 XkbSendNewKeyboardNotify(pDev, &nkn);
-            }
-            else if (sendNotifies) {
+            } else
+            {
                 mn.deviceID = pDev->id;
                 mn.minKeyCode = src->min_key_code;
                 mn.maxKeyCode = src->max_key_code;
commit 7a550cefd9417c22a4397ea4d103ddc347ab1a0f
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue May 20 11:07:39 2008 +0930

    dix: shut up two compiler warnings.

diff --git a/dix/devices.c b/dix/devices.c
index 4dd1dc5..5606543 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -71,6 +71,7 @@ SOFTWARE.
 #endif
 #include "privates.h"
 #include "xace.h"
+#include "mi.h"
 
 #include "dispatch.h"
 #include "swaprep.h"
diff --git a/dix/main.c b/dix/main.c
index 11ea29b..328c0b4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -240,7 +240,7 @@ int dix_main(int argc, char *argv[], char *envp[])
 int main(int argc, char *argv[], char *envp[])
 #endif
 {
-    int		i, j, k, error;
+    int		i, j, k;
     char	*xauthfile;
     HWEventQueueType	alwaysCheckForInput[2];
 
commit f9edecd1b53a2e234def9cbd954a47c4bda2bebc
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue May 20 11:07:17 2008 +0930

    mi: sync declaration and definition of mieqResizeEvents.

diff --git a/mi/mi.h b/mi/mi.h
index 0af1a1b..2fdaf20 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -153,7 +153,7 @@ extern Bool mieqInit(
     void
 );
 
-extern void mieqResize(
+extern void mieqResizeEvents(
     int /* min_size */
 );
 
diff --git a/mi/mieq.c b/mi/mieq.c
index 3ab8936..830bab8 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -103,7 +103,7 @@ mieqInit(void)
 }
 
 /* Ensure all events in the EQ are at least size bytes. */
-Bool
+void
 mieqResizeEvents(int min_size)
 {
     int i;
commit e73a03d589b47ac9131f3932da7f78d2fef7bfb5
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue May 20 10:54:32 2008 +0930

    fb: shut up two compiler warnings.

diff --git a/fb/fbarc.c b/fb/fbarc.c
index f89b81c..3a8a2c5 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -77,6 +77,8 @@ fbPolyArc (DrawablePtr	pDrawable,
 	    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 #ifdef FB_ACCESS_WRAPPER
 	    wrapped = 1;
+#else
+	    wrapped = 0;
 #endif
 	    while (narcs--)
 	    {
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 85b5171..1355e90 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -292,7 +292,7 @@ create_bits_picture (PicturePtr pict,
     
     fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
 
-    bits = (CARD8*)bits + yoff * stride * sizeof(FbBits) + xoff * (bpp / 8);
+    bits = (FbBits*)((CARD8*)bits + yoff * stride * sizeof(FbBits) + xoff * (bpp / 8));
 
     image = pixman_image_create_bits (
 	pict->format,