diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-24 21:12:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-24 21:12:32 +0100 |
| commit | e0927d908a12c9c140458c355b29b884a7705f2d (patch) | |
| tree | 360dbbd5a318ff84a951e4ca96df38393bc9783f /xorg-server/hw/xwin/InitInput.c | |
| parent | 41fea4472dec859ddec76bdfa7108ebec71de1e3 (diff) | |
| download | vcxsrv-e0927d908a12c9c140458c355b29b884a7705f2d.tar.gz vcxsrv-e0927d908a12c9c140458c355b29b884a7705f2d.tar.bz2 vcxsrv-e0927d908a12c9c140458c355b29b884a7705f2d.zip | |
fontconfig libxcb mesa xserver git update 24 Mar 2014
xserver commit bf087659f0fb747c471e26c5b287c35877818040
libxcb commit e2813e1cde893f384fa620ff3c13493beebabe0c
fontconfig commit 9260b7ec39c34ce68d74e16d47917290a8c3f35a
mesa commit 0d99aef6c8a940e52afcbffa7091ff9c854ba120
Diffstat (limited to 'xorg-server/hw/xwin/InitInput.c')
| -rw-r--r-- | xorg-server/hw/xwin/InitInput.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c index 36346b7e1..38203c906 100644 --- a/xorg-server/hw/xwin/InitInput.c +++ b/xorg-server/hw/xwin/InitInput.c @@ -108,10 +108,11 @@ 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"); + if (AllocDevicePair(serverClient, "Windows", + &g_pwinPointer, &g_pwinKeyboard, + winMouseProc, winKeybdProc, + FALSE) != Success) + FatalError("InitInput - Failed to allocate slave devices.\n"); mieqInit(); |