backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 04:45:03 +08:00
Code Issues Projects Releases Wiki Activity

added I/O for configuration files and changed the server to use

Browse Source 
an external file for its configuration (was hard coding a config
for testing).
This commit is contained in:
crs
2002-05-31 17:32:26 +00:00
parent 0eccd52226
commit 942e57fc8d
3 changed files with 364 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/server.cpp
View File

@@ -4,6 +4,14 @@
#include "CMutex.h"
#include "CNetwork.h"
#include "CThread.h"
#include <fstream>
//
// config file stuff
//
static const char* s_configFileName = "synergy.conf";
//
// logging thread safety
@@ -41,17 +49,19 @@ void realMain()
// initialize network library
CNetwork::init();
CConfig config;
config.addScreen("primary");
config.addScreen("secondary");
config.addScreen("secondary2");
config.connect("primary", CConfig::kRight, "secondary");
config.connect("secondary", CConfig::kLeft, "primary");
config.connect("secondary", CConfig::kRight, "secondary2");
config.connect("secondary2", CConfig::kLeft, "secondary");
CServer* server = NULL;
try {
CConfig config;
{
log((CLOG_DEBUG "opening configuration"));
ifstream configStream(s_configFileName);
if (!configStream) {
throw XConfigRead("cannot open configuration");
}
configStream >> config;
log((CLOG_DEBUG "configuration read successfully"));
}
server = new CServer();
server->setConfig(config);
server->run();
@@ -93,6 +103,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int)
return 0;
}
catch (XBase& e) {
log((CLOG_CRIT "failed: %s", e.what()));
CString msg = "failed: ";
msg += e.what();
MessageBox(NULL, msg.c_str(), "error", MB_OK | MB_ICONERROR);
@@ -116,6 +127,7 @@ int main(int argc, char** argv)
return 0;
}
catch (XBase& e) {
log((CLOG_CRIT "failed: %s", e.what()));
fprintf(stderr, "failed: %s\n", e.what());
return 1;
}