diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-12 18:20:04 +0000 |
| commit | da8fe31a7ba4acf109097d5696ad0145b991cdfd (patch) | |
| tree | 1c74d6f075702a73e557872f2a6f020ea4eb5432 /xorg-server/hw/xwin/InitInput.c | |
| parent | 6590f805a12779909cb8504c230fa367148fe38c (diff) | |
| parent | 529dcfd0858d75cb3c87c73cb0f81dd20bbb9230 (diff) | |
| download | vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.gz vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.tar.bz2 vcxsrv-da8fe31a7ba4acf109097d5696ad0145b991cdfd.zip | |
Changes for VC compilation
Diffstat (limited to 'xorg-server/hw/xwin/InitInput.c')
| -rw-r--r-- | xorg-server/hw/xwin/InitInput.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c index 6a850cd44..bce7ac54e 100644 --- a/xorg-server/hw/xwin/InitInput.c +++ b/xorg-server/hw/xwin/InitInput.c @@ -30,10 +30,8 @@ #include <xwin-config.h> #endif #include "win.h" -#ifdef XWIN_CLIPBOARD -# include "../../Xext/xf86miscproc.h" -#endif #include "dixstruct.h" +#include "inputstr.h" /* @@ -104,6 +102,11 @@ ProcessInputEvents (void) #endif } +void DDXRingBell(int volume, int pitch, int duration) +{ + /* winKeybdBell is used instead */ + return; +} int TimeSinceLastInputEvent () @@ -147,8 +150,10 @@ InitInput (int argc, char *argv[]) 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 (); |