aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-26 08:41:31 +0200
committermarha <marha@users.sourceforge.net>2011-07-26 08:41:31 +0200
commit8680f93ff96770b0a022596d8d4092a29c586435 (patch)
treed46548bc7edefc4b8b71ca5c171ea29dd93d62be /xorg-server
parenta9621bcc79c7e3bf09a68dd72460708c3a884793 (diff)
downloadvcxsrv-8680f93ff96770b0a022596d8d4092a29c586435.tar.gz
vcxsrv-8680f93ff96770b0a022596d8d4092a29c586435.tar.bz2
vcxsrv-8680f93ff96770b0a022596d8d4092a29c586435.zip
Use AllocDevicePair for create the mouse and keyboard devices
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xwin/InitInput.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 6e7db760d..3e02633a5 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -90,6 +90,7 @@ void DDXRingBell(int volume, int pitch, int duration)
void
InitInput (int argc, char *argv[])
{
+ int rc;
winDebug ("InitInput\n");
#ifdef XWIN_CLIPBOARD
@@ -103,10 +104,15 @@ InitInput (int argc, char *argv[])
}
#endif
- g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE);
- g_pwinKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);
- g_pwinPointer->name = strdup("Windows mouse");
- g_pwinKeyboard->name = strdup("Windows keyboard");
+ rc = AllocDevicePair(serverClient, "Windows",
+ &g_pwinPointer,
+ &g_pwinKeyboard,
+ winMouseProc,
+ winKeybdProc,
+ FALSE);
+
+ if (rc != Success)
+ FatalError("Failed to init vcxsrv default devices.\n");
mieqInit ();