1 files changed, 13 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 550c5a04e..65572ccd8 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -31,6 +31,7 @@
 #endif
 #include "win.h"
 #include "dixstruct.h"
+#include "inputstr.h"
 
 
 /*
@@ -94,13 +95,18 @@ ProcessInputEvents (void)
 #endif
 
   mieqProcessInputEvents ();
-  miPointerUpdate ();
+  miPointerUpdateSprite(inputInfo.pointer);
 
 #if 0
   ErrorF ("ProcessInputEvents - returning\n");
 #endif
 }
 
+void DDXRingBell(int volume, int pitch, int duration)
+{
+  /* winKeybdBell is used instead */
+  return;
+}
 
 int
 TimeSinceLastInputEvent ()
@@ -138,14 +144,16 @@ InitInput (int argc, char *argv[])
     }
 #endif
 
-  pMouse = AddInputDevice (winMouseProc, TRUE);
-  pKeyboard = AddInputDevice (winKeybdProc, TRUE);
+  pMouse = AddInputDevice (serverClient, winMouseProc, TRUE);
+  pKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);
   
   RegisterPointerDevice (pMouse);
   RegisterKeyboardDevice (pKeyboard);
 
-  miRegisterPointerDevice (screenInfo.screens[0], pMouse);
-  mieqInit ((DevicePtr)pKeyboard, (DevicePtr)pMouse);
+  pMouse->name = strdup("Windows mouse");
+  pKeyboard->name = strdup("Windows keyboard");
+
+  mieqInit ();
 
   /* Initialize the mode key states */
   winInitializeModeKeyStates ();