diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-08 16:07:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-08 16:07:08 +0000 |
| commit | 8308417ba79394ca96a326c8cb5c36024b36c1e2 (patch) | |
| tree | c6e087e837c83457b68a7a10363af47778a9b1b7 /xorg-server/hw/xfree86/common/xf86Xinput.c | |
| parent | fea28ce54ffbea6eda28791518ccca0e0df2df0d (diff) | |
| parent | 531a0d974b98074978535f086a73b6b662fa0cea (diff) | |
| download | vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.tar.gz vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.tar.bz2 vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index 3a48fe9c3..dad993ec1 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -280,7 +280,8 @@ void xf86ProcessCommonOptions(InputInfoPtr pInfo,
pointer list)
{
- if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||
+ if (xf86SetBoolOption(list, "Floating", 0) ||
+ !xf86SetBoolOption(list, "AlwaysCore", 1) ||
!xf86SetBoolOption(list, "SendCoreEvents", 1) ||
!xf86SetBoolOption(list, "CorePointer", 1) ||
!xf86SetBoolOption(list, "CoreKeyboard", 1)) {
@@ -652,7 +653,7 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs) return ignore;
}
-static InputInfoPtr
+InputInfoPtr
xf86AllocateInput(void)
{
InputInfoPtr pInfo;
|