aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winprocarg.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-26 09:27:48 +0100
committermarha <marha@users.sourceforge.net>2012-01-26 09:27:48 +0100
commitd99165260070ce9668f3eeac8bb010393f490c0a (patch)
treeafdd34a5707eee117c9827aeb8bb5237cc9d14fa /xorg-server/hw/xwin/winprocarg.c
parent5283d47a3bf49ffbf972465908f1e30aa6698509 (diff)
downloadvcxsrv-d99165260070ce9668f3eeac8bb010393f490c0a.tar.gz
vcxsrv-d99165260070ce9668f3eeac8bb010393f490c0a.tar.bz2
vcxsrv-d99165260070ce9668f3eeac8bb010393f490c0a.zip
turn on -emulate3buttons if less than 3 mouse buttons are reported
Added -noemulate3buttons
Diffstat (limited to 'xorg-server/hw/xwin/winprocarg.c')
-rw-r--r--xorg-server/hw/xwin/winprocarg.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 7cce026c1..3db9a1c3e 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -144,7 +144,7 @@ winInitializeScreenDefaults(void)
defaultScreenInfo.fLessPointer = FALSE;
defaultScreenInfo.iResizeMode = notAllowed;
defaultScreenInfo.fNoTrayIcon = FALSE;
- defaultScreenInfo.iE3BTimeout = WIN_E3B_OFF;
+ defaultScreenInfo.iE3BTimeout = WIN_E3B_DEFAULT;
defaultScreenInfo.fUseWinKillKey = WIN_DEFAULT_WIN_KILL;
defaultScreenInfo.fUseUnixKillKey = WIN_DEFAULT_UNIX_KILL;
defaultScreenInfo.fIgnoreInput = FALSE;
@@ -813,6 +813,17 @@ ddxProcessArgument (int argc, char *argv[], int i)
return iArgsProcessed;
}
+ /*
+ * Look for the '-noemulate3buttons' argument
+ */
+ if (IS_OPTION ("-noemulate3buttons"))
+ {
+ screenInfoPtr->iE3BTimeout = WIN_E3B_OFF;
+
+ /* Indicate that we have processed this argument */
+ return 1;
+ }
+
/*
* Look for the '-depth n' argument
*/