frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jon TURNEY 2011-11-07 20:54:10 +00:00
parent b2aaf69e62
commit 3aad9b7556
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/InitOutput.c
View File

@ -739,7 +739,7 @@ winUseMsg(void)
ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n"); 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"); "\tIn multiwindow mode, add remote host names to window titles.\n");
ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n"); ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n");

3
hw/xwin/man/XWin.man
View File

@ -167,9 +167,10 @@ on its own is equivalent to \fB\-resize=randr\fP
.SH OPTIONS FOR MULTIWINDOW MODE .SH OPTIONS FOR MULTIWINDOW MODE
.TP 8 .TP 8
.B \-hostintitle .B \-[no]hostintitle
Add the host name to the window title for X applications which are running 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. on remote hosts, when that information is available and it's useful to do so.
The default is enabled.
.SH OPTIONS CONTROLLING WINDOWS INTEGRATION .SH OPTIONS CONTROLLING WINDOWS INTEGRATION
.TP 8 .TP 8

2
hw/xwin/winglobals.c
View File

@ -78,7 +78,7 @@ Bool g_fNoHelpMessageBox = FALSE;
Bool g_fSoftwareCursor = FALSE; Bool g_fSoftwareCursor = FALSE;
Bool g_fSilentDupError = FALSE; Bool g_fSilentDupError = FALSE;
Bool g_fNativeGl = TRUE; Bool g_fNativeGl = TRUE;
Bool g_fHostInTitle = FALSE; Bool g_fHostInTitle = TRUE;
pthread_mutex_t g_pmTerminating = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t g_pmTerminating = PTHREAD_MUTEX_INITIALIZER;
#ifdef XWIN_CLIPBOARD #ifdef XWIN_CLIPBOARD

5
hw/xwin/winprocarg.c
View File

@ -1098,6 +1098,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
return 1; return 1;
} }
if (IS_OPTION("-nohostintitle")) {
g_fHostInTitle = FALSE;
return 1;
}
return 0; return 0;
} }