xserver: Branch 'master' - 4 commits

[Peter Hutterer]

 dix/devices.c |    1 +
 glx/glapi.c   |    3 +++
 mi/mieq.c     |    4 ++--
 xkb/xkbInit.c |    3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Thu Jun 5 09:19:16 2008 +0930

    gl: include assert.h if we're compiling with DEBUG.
    
    Signed-off-by: Peter Hutterer <peter at cs.unisa.edu.au>

diff --git a/glx/glapi.c b/glx/glapi.c
index c4d101a..94a8043 100644
--- a/glx/glapi.c
+++ b/glx/glapi.c
@@ -63,6 +63,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#ifdef DEBUG
+#include <assert.h>
+#endif
 
 #include "glapi.h"
 #include "glapioffsets.h"
commit 8644aa47177bf20f3aa85181032ce75c08270fc5
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Thu Jun 5 08:55:09 2008 +0930

    mi: minor build fix when compiling with debug enabled.
    
    Signed-off-by: Peter Hutterer <peter at cs.unisa.edu.au>

diff --git a/mi/mieq.c b/mi/mieq.c
index a1f9cc6..91b7a51 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -255,8 +255,8 @@ ChangeDeviceID(DeviceIntPtr dev, xEvent* event)
             // do nothing or drink a beer. your choice.
         } else
             DebugF("[mi] Unknown generic event (%d/%d), cannot change id.\n",
-                    ((xGenericEvent*)ev)->extension,
-                    ((xGenericEvent*)ev)->evtype);
+                    ((xGenericEvent*)event)->extension,
+                    ((xGenericEvent*)event)->evtype);
     } else
         DebugF("[mi] Unknown event type (%d), cannot change id.\n", type);
 }
commit fbf4b5f16ac23359872361c8c95a617fe8c92292
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Jun 4 11:10:46 2008 +0930

    dix: set dst->mapWidth when allocating a new map.

diff --git a/dix/devices.c b/dix/devices.c
index efdc0c9..c83f2fc 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1046,6 +1046,7 @@ SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
         if (!map)
             return FALSE;
         dst->map = map;
+        dst->mapWidth = src->mapWidth;
     }
     memmove((char *)&dst->map[rowDif * dst->mapWidth],
 	    (char *)src->map,
commit ff3adf3e564d94fea18e48f966de40a7ded1279e
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Wed Jun 4 11:10:11 2008 +0930

    xkb: reset xkb_cached_map on CloseDownDevices.
    
    Could lead to some invalid pointers in the second server generation.

diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 47ad553..0aaa037 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -292,6 +292,9 @@ XkbDeleteRulesDflts()
     XkbVariantDflt = NULL;
     _XkbFree(XkbOptionsDflt);
     XkbOptionsDflt = NULL;
+
+    XkbFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, True);
+    xkb_cached_map = NULL;
 }
 
 /***====================================================================***/