diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-11-07 20:54:10 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-16 16:54:05 +0000 |
| commit | 3aad9b7556391b0f55e46ba13ced5e58d8fd47f7 (patch) | |
| tree | 9cfdff0c4a8a75409e2cab17d6efe1cb6a1d327e | |
| parent | b2aaf69e62f4109ffb8aaf39e9bd2571abb29dfb (diff) | |
hw/xwin: Turn on -hostintitle by default
Turn on -hostintitle by default
Provide -nohostintitle to disable if needed
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/InitOutput.c | 2 | ||||
| -rw-r--r-- | hw/xwin/man/XWin.man | 3 | ||||
| -rw-r--r-- | hw/xwin/winglobals.c | 2 | ||||
| -rw-r--r-- | hw/xwin/winprocarg.c | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 654c58c14..246cd127b 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -739,7 +739,7 @@ winUseMsg(void) ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n"); - ErrorF("-hostintitle\n" + ErrorF("-[no]hostintitle\n" "\tIn multiwindow mode, add remote host names to window titles.\n"); ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n"); diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man index 15a57db02..ed9330321 100644 --- a/hw/xwin/man/XWin.man +++ b/hw/xwin/man/XWin.man @@ -167,9 +167,10 @@ on its own is equivalent to \fB\-resize=randr\fP .SH OPTIONS FOR MULTIWINDOW MODE .TP 8 -.B \-hostintitle +.B \-[no]hostintitle Add the host name to the window title for X applications which are running on remote hosts, when that information is available and it's useful to do so. +The default is enabled. .SH OPTIONS CONTROLLING WINDOWS INTEGRATION .TP 8 diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c index ad82b83f6..1382c8972 100644 --- a/hw/xwin/winglobals.c +++ b/hw/xwin/winglobals.c @@ -78,7 +78,7 @@ Bool g_fNoHelpMessageBox = FALSE; Bool g_fSoftwareCursor = FALSE; Bool g_fSilentDupError = FALSE; Bool g_fNativeGl = TRUE; -Bool g_fHostInTitle = FALSE; +Bool g_fHostInTitle = TRUE; pthread_mutex_t g_pmTerminating = PTHREAD_MUTEX_INITIALIZER; #ifdef XWIN_CLIPBOARD diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 837cdb2f4..65bba8159 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -1098,6 +1098,11 @@ ddxProcessArgument(int argc, char *argv[], int i) return 1; } + if (IS_OPTION("-nohostintitle")) { + g_fHostInTitle = FALSE; + return 1; + } + return 0; } |