diff -urN xc/programs/Xserver/dix/events.c xc.new/programs/Xserver/dix/events.c
--- xc/programs/Xserver/dix/events.c	Mon Mar  8 19:52:01 2004
+++ xc.new/programs/Xserver/dix/events.c	Wed Feb  4 23:46:12 2004
@@ -1207,6 +1207,10 @@
     else
 	ConfineCursorToWindow(WindowTable[sprite.hotPhys.pScreen->myNum],
 			      TRUE, FALSE);
+    sprite.hotLimits.x1 -= 3;
+    sprite.hotLimits.y1 -= 3;
+    sprite.hotLimits.x2 += 3;
+    sprite.hotLimits.y2 += 3;
 }
 #endif
 
diff -urN xc/programs/Xserver/randr/randr.c xc.new/programs/Xserver/randr/randr.c
--- xc/programs/Xserver/randr/randr.c	Fri Jul 20 19:30:11 2001
+++ xc.new/programs/Xserver/randr/randr.c	Mon Feb 16 00:03:07 2004
@@ -754,8 +754,11 @@
      */
     if (CompareTimeStamps (configTime, pScrPriv->lastConfigTime) != 0)
     {
-	rep.status = RRSetConfigInvalidConfigTime;
-	goto sendReply;
+      // GNB rep.status = RRSetConfigInvalidConfigTime;
+      // GNB goto sendReply;
+      // That's all very well, but there's only one client app. and
+      // I _know_ it requests the config. so it must be the timestamping
+      // that's borked.
     }
     
     /*