diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/vfb/InitInput.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/vfb/InitInput.c')
| -rw-r--r-- | xorg-server/hw/vfb/InitInput.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/vfb/InitInput.c b/xorg-server/hw/vfb/InitInput.c index 99cf56c70..2af3c6421 100644 --- a/xorg-server/hw/vfb/InitInput.c +++ b/xorg-server/hw/vfb/InitInput.c @@ -52,7 +52,6 @@ void ProcessInputEvents() { mieqProcessInputEvents(); - miPointerUpdate(); } void DDXRingBell(int volume, int pitch, int duration) @@ -296,7 +295,7 @@ vfbMouseProc(DeviceIntPtr pDevice, int onoff) map[1] = 1; map[2] = 2; map[3] = 3; - InitPointerDeviceStruct(pDev, map, 3, GetMotionHistory, + InitPointerDeviceStruct(pDev, map, 3, (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2); break; @@ -318,8 +317,8 @@ void InitInput(int argc, char *argv[]) { DeviceIntPtr p, k; - p = AddInputDevice(vfbMouseProc, TRUE); - k = AddInputDevice(vfbKeybdProc, TRUE); + p = AddInputDevice(serverClient, vfbMouseProc, TRUE); + k = AddInputDevice(serverClient, vfbKeybdProc, TRUE); RegisterPointerDevice(p); RegisterKeyboardDevice(k); (void)mieqInit(); |