Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa pixman xserver git update 25 Mar 2013

4 files changed, 11 insertions, 1 deletions

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index f895365d6..6c249b01c 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -1203,6 +1203,9 @@ PlayReleasedEvents(void)
                 case ET_KeyRelease:
                 case ET_ProximityIn:
                 case ET_ProximityOut:
+                case ET_TouchBegin:
+                case ET_TouchUpdate:
+                case ET_TouchEnd:
                     ev->root_x += screenInfo.screens[0]->x -
                         pDev->spriteInfo->sprite->screen->x;
                     ev->root_y += screenInfo.screens[0]->y -
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index eceab0c01..5eb5b70a2 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -407,6 +407,8 @@ main(int argc, char *argv[], char *envp[])
 
         FreeFonts();
 
+        FreeAllAtoms();
+
         FreeAuditTimer();
 
         if (dispatchException & DE_TERMINATE) {
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c
index 0db842c65..891cc7803 100644
--- a/xorg-server/dix/touch.c
+++ b/xorg-server/dix/touch.c
@@ -902,7 +902,8 @@ TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev)
 }
 
 /**
- * Remove the touch pointer grab from the device. Called from AllowSome()
+ * Remove the touch pointer grab from the device. Called from
+ * DeactivatePointerGrab()
  */
 void
 TouchRemovePointerGrab(DeviceIntPtr dev)
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index 46cdfdee5..c3cf2a6fe 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/dix/window.c
@@ -1435,6 +1435,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
                     }
                 }
 
+                CursorVisible = TRUE;
+
                 if (pWin->realized)
                     WindowHasNewCursor(pWin);
 
@@ -3433,6 +3435,8 @@ ChangeWindowDeviceCursor(WindowPtr pWin, DeviceIntPtr pDev, CursorPtr pCursor)
     }
 
  out:
+    CursorVisible = TRUE;
+
     if (pWin->realized)
         WindowHasNewCursor(pWin);