changed --disable-xinitthreads to --no-xinitthreads and added the arg to --help. also fixed the --help (added missing info about --yscroll, and other stuff)
This commit is contained in:
parent
728e8bb035
commit
8285d95ba4
|
@ -34,7 +34,7 @@ CArchAppUtilUnix::parseArg(const int& argc, const char* const* argv, int& i)
|
|||
app().argsBase().m_display = argv[++i];
|
||||
}
|
||||
|
||||
else if (app().isArg(i, argc, argv, NULL, "--disable-xinitthreads")) {
|
||||
else if (app().isArg(i, argc, argv, NULL, "--no-xinitthreads")) {
|
||||
app().argsBase().m_disableXInitThreads = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -113,6 +113,8 @@ CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, bool d
|
|||
// initializes Xlib support for concurrent threads.
|
||||
if (XInitThreads() == 0)
|
||||
throw XArch("XInitThreads() returned zero");
|
||||
} else {
|
||||
LOG((CLOG_DEBUG "skipping XInitThreads()"));
|
||||
}
|
||||
|
||||
// set the X I/O error handler so we catch the display disconnecting
|
||||
|
|
|
@ -157,9 +157,10 @@ CClientApp::help()
|
|||
{
|
||||
#if WINAPI_XWINDOWS
|
||||
# define WINAPI_ARG \
|
||||
" [--display <display>]"
|
||||
" [--display <display>] [--no-xinitthreads]"
|
||||
# define WINAPI_INFO \
|
||||
" --display <display> connect to the X server at <display>\n"
|
||||
" --display <display> connect to the X server at <display>\n" \
|
||||
" --no-xinitthreads do not call XInitThreads()\n"
|
||||
#else
|
||||
# define WINAPI_ARG
|
||||
# define WINAPI_INFO
|
||||
|
@ -181,6 +182,7 @@ CClientApp::help()
|
|||
WINAPI_INFO
|
||||
HELP_SYS_INFO
|
||||
" --yscroll <delta> defines the vertical scrolling delta, which is\n"
|
||||
" 120 by default.\n"
|
||||
HELP_COMMON_INFO_2
|
||||
"\n"
|
||||
"* marks defaults.\n"
|
||||
|
|
|
@ -150,9 +150,10 @@ CServerApp::help()
|
|||
// window api args (windows/x-windows/carbon)
|
||||
#if WINAPI_XWINDOWS
|
||||
# define WINAPI_ARGS \
|
||||
" [--display <display>]"
|
||||
" [--display <display>] [--no-xinitthreads]"
|
||||
# define WINAPI_INFO \
|
||||
" --display <display> connect to the X server at <display>\n"
|
||||
" --display <display> connect to the X server at <display>\n" \
|
||||
" --no-xinitthreads do not call XInitThreads()\n"
|
||||
#else
|
||||
# define WINAPI_ARGS
|
||||
# define WINAPI_INFO
|
||||
|
|
Loading…
Reference in New Issue