diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
| commit | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (patch) | |
| tree | 3fd4cc1783510fb6ce17c4c42b4d012014008e5b /xorg-server/hw/xwin/winprocarg.c | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.gz vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.bz2 vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.zip | |
mesa xserver git update 28 jan 2012
Diffstat (limited to 'xorg-server/hw/xwin/winprocarg.c')
| -rw-r--r-- | xorg-server/hw/xwin/winprocarg.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c index 2b6949ed1..9bec84141 100644 --- a/xorg-server/hw/xwin/winprocarg.c +++ b/xorg-server/hw/xwin/winprocarg.c @@ -141,7 +141,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; @@ -789,6 +789,17 @@ ddxProcessArgument (int argc, char *argv[], int i) } /* + * 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 */ if (IS_OPTION ("-depth")) @@ -1209,7 +1220,7 @@ winLogCommandLine (int argc, char *argv[]) /* - * winLogVersionInfo - Log Cygwin/X version information + * winLogVersionInfo - Log version information */ void |