3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-08-04 00:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Changes from mercurial repository.

Browse source
This commit is contained in:
Sorin Sbarnea 2009-10-21 16:25:08 +00:00
parent 44bb32f476
commit 98c68897d8
135 changed files with 2686 additions and 26965 deletions
Download patch file Download diff file Expand all files Collapse all files

62
cmd/synergyc/synergyc.cpp
View file

@ -74,9 +74,11 @@ public:
m_backend(false),
m_restartable(true),
m_daemon(true),
m_yscroll(0),
m_logFilter(NULL),
m_display(NULL),
m_serverAddress(NULL)
m_serverAddress(NULL),
m_logFile(NULL)
{ s_instance = this; }
~CArgs() { s_instance = NULL; }
@ -86,10 +88,13 @@ public:
bool m_backend;
bool m_restartable;
bool m_daemon;
int m_yscroll;
const char* m_logFilter;
const char* m_display;
CString m_name;
CNetworkAddress* m_serverAddress;
const char* m_logFile;
};
CArgs* CArgs::s_instance = NULL;
@ -106,7 +111,7 @@ createScreen()
#if WINAPI_MSWINDOWS
return new CScreen(new CMSWindowsScreen(false));
#elif WINAPI_XWINDOWS
return new CScreen(new CXWindowsScreen(ARG->m_display, false));
return new CScreen(new CXWindowsScreen(ARG->m_display, false, ARG->m_yscroll));
#elif WINAPI_CARBON
return new CScreen(new COSXScreen(false));
#endif
@ -134,9 +139,11 @@ createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
static CClient* s_client = NULL;
static CScreen* s_clientScreen = NULL;
static CClientTaskBarReceiver* s_taskBarReceiver = NULL;
static double s_retryTime = 0.0;
//static double s_retryTime = 0.0;
static bool s_suspened = false;
#define RETRY_TIME 1.0
static
void
updateStatus()
@ -155,13 +162,18 @@ static
void
resetRestartTimeout()
{
s_retryTime = 0.0;
// retry time can nolonger be changed
//s_retryTime = 0.0;
}
static
double
nextRestartTimeout()
{
// retry at a constant rate (Issue 52)
return RETRY_TIME;
/*
// choose next restart timeout. we start with rapid retries
// then slow down.
if (s_retryTime < 1.0) {
@ -170,19 +182,11 @@ nextRestartTimeout()
else if (s_retryTime < 3.0) {
s_retryTime = 3.0;
}
else if (s_retryTime < 5.0) {
else {
s_retryTime = 5.0;
}
else if (s_retryTime < 15.0) {
s_retryTime = 15.0;
}
else if (s_retryTime < 30.0) {
s_retryTime = 30.0;
}
else {
s_retryTime = 60.0;
}
return s_retryTime;
*/
}
static
@ -374,6 +378,17 @@ static
int
mainLoop()
{
// logging to files
CFileLogOutputter* fileLog = NULL;
if (ARG->m_logFile != NULL) {
fileLog = new CFileLogOutputter(ARG->m_logFile);
CLOG->insert(fileLog);
LOG((CLOG_DEBUG1 "Logging to file (%s) enabled", ARG->m_logFile));
}
// create socket multiplexer. this must happen after daemonization
// on unix because threads evaporate across a fork().
CSocketMultiplexer multiplexer;
@ -407,6 +422,11 @@ mainLoop()
updateStatus();
LOG((CLOG_NOTE "stopped client"));
if (fileLog) {
CLOG->remove(fileLog);
delete fileLog;
}
return kExitSuccess;
}
@ -517,6 +537,7 @@ help()
" [--debug <level>]"
USAGE_DISPLAY_ARG
" [--name <screen-name>]"
" [--yscroll <delta>]"
" [--restart|--no-restart]"
" <server-address>"
"\n\n"
@ -530,9 +551,12 @@ USAGE_DISPLAY_INFO
"* --daemon run the client as a daemon.\n"
" -n, --name <screen-name> use screen-name instead the hostname to identify\n"
" ourself to the server.\n"
" --yscroll <delta> defines the vertical scrolling delta, which is\n"
" 120 by default.\n"
" -1, --no-restart do not try to restart the client if it fails for\n"
" some reason.\n"
"* --restart restart the client automatically if it fails.\n"
" -l --log <file> write log messages to file.\n"
" -h, --help display this help and exit.\n"
" --version display version information and exit.\n"
"\n"
@ -618,6 +642,15 @@ parse(int argc, const char* const* argv)
}
#endif
else if (isArg(i, argc, argv, NULL, "--yscroll", 1)) {
// define scroll
ARG->m_yscroll = atoi(argv[++i]);
}
else if (isArg(i, argc, argv, "-l", "--log", 1)) {
ARG->m_logFile = argv[++i];
}
else if (isArg(i, argc, argv, "-1", "--no-restart")) {
// don't try to restart
ARG->m_restartable = false;
@ -728,7 +761,6 @@ parse(int argc, const char* const* argv)
//
#if SYSAPI_WIN32
static bool s_hasImportantLogMessages = false;
//