rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Nick Bolton 2011-01-17 20:56:04 +00:00
parent 728e8bb035
commit 8285d95ba4
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/arch/CArchAppUtilUnix.cpp
View File

@ -34,7 +34,7 @@ CArchAppUtilUnix::parseArg(const int& argc, const char* const* argv, int& i)
app().argsBase().m_display = argv[++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; app().argsBase().m_disableXInitThreads = true;
} }

2
lib/platform/CXWindowsScreen.cpp
View File

@ -113,6 +113,8 @@ CXWindowsScreen::CXWindowsScreen(const char* displayName, bool isPrimary, bool d
// initializes Xlib support for concurrent threads. // initializes Xlib support for concurrent threads.
if (XInitThreads() == 0) if (XInitThreads() == 0)
throw XArch("XInitThreads() returned zero"); throw XArch("XInitThreads() returned zero");
} else {
LOG((CLOG_DEBUG "skipping XInitThreads()"));
} }
// set the X I/O error handler so we catch the display disconnecting // set the X I/O error handler so we catch the display disconnecting

4
lib/synergy/CApp.h
View File

@ -163,8 +163,8 @@ private:
# define HELP_SYS_ARGS \ # define HELP_SYS_ARGS \
" [--daemon|--no-daemon]" " [--daemon|--no-daemon]"
# define HELP_SYS_INFO \ # define HELP_SYS_INFO \
" -f, --no-daemon run in the foreground.\n" \ " -f, --no-daemon run in the foreground.\n" \
"* --daemon run as a daemon.\n" "* --daemon run as a daemon.\n"
#elif SYSAPI_WIN32 #elif SYSAPI_WIN32

6
lib/synergy/CClientApp.cpp
View File

@ -157,9 +157,10 @@ CClientApp::help()
{ {
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
# define WINAPI_ARG \ # define WINAPI_ARG \
" [--display <display>]" " [--display <display>] [--no-xinitthreads]"
# define WINAPI_INFO \ # 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 #else
# define WINAPI_ARG # define WINAPI_ARG
# define WINAPI_INFO # define WINAPI_INFO
@ -181,6 +182,7 @@ CClientApp::help()
WINAPI_INFO WINAPI_INFO
HELP_SYS_INFO HELP_SYS_INFO
" --yscroll <delta> defines the vertical scrolling delta, which is\n" " --yscroll <delta> defines the vertical scrolling delta, which is\n"
" 120 by default.\n"
HELP_COMMON_INFO_2 HELP_COMMON_INFO_2
"\n" "\n"
"* marks defaults.\n" "* marks defaults.\n"

5
lib/synergy/CServerApp.cpp
View File

@ -150,9 +150,10 @@ CServerApp::help()
// window api args (windows/x-windows/carbon) // window api args (windows/x-windows/carbon)
#if WINAPI_XWINDOWS #if WINAPI_XWINDOWS
# define WINAPI_ARGS \ # define WINAPI_ARGS \
" [--display <display>]" " [--display <display>] [--no-xinitthreads]"
# define WINAPI_INFO \ # 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 #else
# define WINAPI_ARGS # define WINAPI_ARGS
# define WINAPI_INFO # define WINAPI_INFO