diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 17:46:26 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 17:46:26 -0800 |
| commit | 028bbdc0417173803695808ba9f48498519273a3 (patch) | |
| tree | 1df4feed40b78d346f57a3b20163469137740f30 /hw/vfb | |
| parent | 50504c68e1d407232cf83465981b235e542ef31f (diff) | |
| parent | 8deaaa312ad7f9b492a2ae8ad17d74650112c25c (diff) | |
Merge master back to randr-1.2
Diffstat (limited to 'hw/vfb')
| -rw-r--r-- | hw/vfb/InitInput.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 773c45420..99cf56c70 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -43,7 +43,7 @@ from The Open Group. #include <X11/keysym.h> Bool -LegalModifier(unsigned int key, DevicePtr pDev) +LegalModifier(unsigned int key, DeviceIntPtr pDev) { return TRUE; } @@ -55,6 +55,10 @@ ProcessInputEvents() miPointerUpdate(); } +void DDXRingBell(int volume, int pitch, int duration) +{ +} + #define VFB_MIN_KEY 8 #define VFB_MAX_KEY 255 KeySym map[MAP_LENGTH * LK201_GLYPHS_PER_KEY]; @@ -292,8 +296,8 @@ vfbMouseProc(DeviceIntPtr pDevice, int onoff) map[1] = 1; map[2] = 2; map[3] = 3; - InitPointerDeviceStruct(pDev, map, 3, miPointerGetMotionEvents, - (PtrCtrlProcPtr)NoopDDA, miPointerGetMotionBufferSize()); + InitPointerDeviceStruct(pDev, map, 3, GetMotionHistory, + (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2); break; case DEVICE_ON: @@ -318,6 +322,5 @@ InitInput(int argc, char *argv[]) k = AddInputDevice(vfbKeybdProc, TRUE); RegisterPointerDevice(p); RegisterKeyboardDevice(k); - miRegisterPointerDevice(screenInfo.screens[0], p); - (void)mieqInit ((DevicePtr) k, (DevicePtr) p); + (void)mieqInit(); } |