xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/src/kinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 14 09:45:19 2008 -0400

    kdrive: Hardcode a different wrong value for number of mouse buttons
    
    This should really come from the input driver directly, but, kdrive.

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 15fd3b7..816e933 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1292,7 +1292,7 @@ KdParsePointer (char *arg)
         return NULL;
     pi->emulateMiddleButton = kdEmulateMiddleButton;
     pi->transformCoordinates = !kdRawPointerCoordinates;
-    pi->nButtons = 3;
+    pi->nButtons = 5; /* XXX should not be hardcoded */
     pi->inputClass = KD_MOUSE;
 
     if (!arg)