xserver/hw/kdrive/linux mouse.c,1.13,1.14

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory pdx:/tmp/cvs-serv18445/hw/kdrive/linux

Modified Files:
	mouse.c 
Log Message:
2004-05-13  Keith Packard  <keithp at keithp.com>

	* composite/compinit.c: (compAddArgbVisual):
	Follow GLX in setting ARGB visual nplanes to 24.
	
	* hw/kdrive/linux/mouse.c: (MouseRead):
	Retry current mouse protocol when sync is lost



Index: mouse.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/mouse.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/mouse.c	7 Nov 2003 23:29:29 -0000	1.13
+++ b/mouse.c	13 May 2004 21:25:51 -0000	1.14
@@ -855,6 +855,8 @@
 	    km->invalid += i + km->tested;
 	    km->valid = 0;
 	    km->tested = 0;
+	    if (km->stage == MouseWorking)
+		km->i_prot--;
 	    km->stage = MouseBroken;
 	    if (km->invalid > MAX_SKIP)
 	    {