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

Merge 1.4.1 into trunk

Browse source
This commit is contained in:
Nick Bolton 2010-06-12 17:20:54 +00:00
parent 1698161945
commit a8eb2a3bfd
27 changed files with 841 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/synergy/CClientApp.cpp
View file

@ -49,8 +49,8 @@
#define RETRY_TIME 1.0
CClientApp::CClientApp() :
CApp(new CArgs()),
CClientApp::CClientApp(CreateTaskBarReceiverFunc createTaskBarReceiver) :
CApp(createTaskBarReceiver, new CArgs()),
s_client(NULL),
s_clientScreen(NULL)
{
@ -168,6 +168,7 @@ CClientApp::help()
"Usage: %s"
" [--yscroll <delta>]"
WINAPI_ARG
HELP_SYS_ARGS
HELP_COMMON_ARGS
" <server-address>"
"\n\n"
@ -175,6 +176,7 @@ CClientApp::help()
"\n"
HELP_COMMON_INFO_1
WINAPI_INFO
HELP_SYS_INFO
" --yscroll <delta> defines the vertical scrolling delta, which is\n"
HELP_COMMON_INFO_2
"\n"
@ -224,14 +226,17 @@ CClientApp::createScreen()
void
CClientApp::updateStatus()
{
s_taskBarReceiver->updateStatus(s_client, "");
updateStatus("");
}
void
CClientApp::updateStatus(const CString& msg)
{
s_taskBarReceiver->updateStatus(s_client, msg);
if (m_taskBarReceiver)
{
m_taskBarReceiver->updateStatus(s_client, msg);
}
}
@ -343,7 +348,7 @@ CClientApp::handleClientFailed(const CEvent& e, void*)
}
else {
LOG((CLOG_WARN "failed to connect to server: %s", info->m_what.c_str()));
if (!s_suspended) {
if (!m_suspended) {
scheduleClientRestart(nextRestartTimeout());
}
}
@ -358,7 +363,7 @@ CClientApp::handleClientDisconnected(const CEvent&, void*)
if (!args().m_restartable) {
EVENTQUEUE->addEvent(CEvent(CEvent::kQuit));
}
else if (!s_suspended) {
else if (!m_suspended) {
s_client->connect();
}
updateStatus();
@ -530,7 +535,7 @@ CClientApp::standardStartup(int argc, char** argv)
}
int
CClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup, CreateTaskBarReceiverFunc createTaskBarReceiver)
CClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup)
{
// general initialization
args().m_serverAddress = new CNetworkAddress;
@ -541,15 +546,6 @@ CClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFun
CLOG->insert(outputter);
}
// save log messages
// use heap memory because CLog deletes outputters on destruction
CBufferedLogOutputter* logBuffer = new CBufferedLogOutputter(1000);
CLOG->insert(logBuffer, true);
// make the task bar receiver. the user can control this app
// through the task bar.
s_taskBarReceiver = createTaskBarReceiver(logBuffer);
int result;
try
{
@ -558,8 +554,11 @@ CClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFun
}
catch (...)
{
// done with task bar receiver
delete s_taskBarReceiver;
if (m_taskBarReceiver)
{
// done with task bar receiver
delete m_taskBarReceiver;
}
delete args().m_serverAddress;