aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/InitOutput.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xwin/InitOutput.c')
-rw-r--r--xorg-server/hw/xwin/InitOutput.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 7a4f8446d..df670ff0e 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -262,12 +262,10 @@ ddxGiveUp(enum ExitCode error)
PostQuitMessage(0);
{
- int iReturn;
+ int iReturn = pthread_mutex_unlock(&g_pmTerminating);
winDebug("ddxGiveUp - Releasing termination mutex\n");
- iReturn = pthread_mutex_unlock(&g_pmTerminating);
-
if (iReturn != 0) {
ErrorF("winMsgWindowProc - pthread_mutex_unlock () failed: %d\n",
iReturn);
@@ -420,8 +418,7 @@ winFixupPaths(void)
{
/* Open fontpath configuration file */
#if defined WIN32 && defined __MINGW32__
-qsdf qsdf qsdf qsdf
- static Bool once = False;
+ static Bool once = False;
char buffer[MAX_PATH];
snprintf(buffer, sizeof(buffer), "%s\\font-dirs", basedir);
buffer[sizeof(buffer)-1] = 0;
@@ -429,7 +426,6 @@ qsdf qsdf qsdf qsdf
if (once) fontdirs = NULL;
else once = True;
#else
-qsdfqsdf qsdf qsdf
FILE *fontdirs = fopen(ETCX11DIR "/font-dirs", "rt");
#endif
if (fontdirs != NULL) {
@@ -809,6 +805,9 @@ winUseMsg(void)
ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n");
+ ErrorF("-hostintitle\n"
+ "\tIn multiwindow mode, add remote host names to window titles.\n");
+
ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n");
#ifdef XWIN_MULTIWINDOWINTWM