rebranding symless/synergy to debauchee/barrier

src/lib/server/BaseClientProxy.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2006 Chris Schoeneman
  * 

src/lib/server/BaseClientProxy.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include "synergy/IClient.h"
+#include "barrier/IClient.h"
 #include "base/String.h"
 
-namespace synergy { class IStream; }
+namespace barrier { class IStream; }
 
 //! Generic proxy for client or primary
 class BaseClientProxy : public IClient {
@@ -90,7 +90,7 @@ public:
                             size_t size) = 0;
     virtual void        fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0;
     virtual String        getName() const;
-    virtual synergy::IStream*
+    virtual barrier::IStream*
                         getStream() const = 0;
 
 private:

src/lib/server/CMakeLists.txt

@@ -1,4 +1,4 @@
-# synergy -- mouse and keyboard sharing utility
+# barrier -- mouse and keyboard sharing utility
 # Copyright (C) 2012-2016 Symless Ltd.
 # Copyright (C) 2009 Nick Bolton
 # 
@@ -17,7 +17,7 @@
 file(GLOB headers "*.h")
 file(GLOB sources "*.cpp")
 
-if (SYNERGY_ADD_HEADERS)
+if (BARRIER_ADD_HEADERS)
     list(APPEND sources ${headers})
 endif()
 

src/lib/server/ClientListener.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
  * 
@@ -20,7 +20,7 @@
 
 #include "server/ClientProxy.h"
 #include "server/ClientProxyUnknown.h"
-#include "synergy/PacketStreamFilter.h"
+#include "barrier/PacketStreamFilter.h"
 #include "net/IDataSocket.h"
 #include "net/IListenSocket.h"
 #include "net/ISocketFactory.h"
@@ -149,7 +149,7 @@ ClientListener::handleClientAccepted(const Event&, void* vsocket)
     IDataSocket* socket = static_cast<IDataSocket*>(vsocket);
     
     // filter socket messages, including a packetizing filter
-    synergy::IStream* stream = new PacketStreamFilter(m_events, socket, true);
+    barrier::IStream* stream = new PacketStreamFilter(m_events, socket, true);
     assert(m_server != NULL);
 
     // create proxy for unknown client

src/lib/server/ClientListener.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
  * 

src/lib/server/ClientProxy.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,7 +18,7 @@
 
 #include "server/ClientProxy.h"
 
-#include "synergy/ProtocolUtil.h"
+#include "barrier/ProtocolUtil.h"
 #include "io/IStream.h"
 #include "base/Log.h"
 #include "base/EventQueue.h"
@@ -27,7 +27,7 @@
 // ClientProxy
 //
 
-ClientProxy::ClientProxy(const String& name, synergy::IStream* stream) :
+ClientProxy::ClientProxy(const String& name, barrier::IStream* stream) :
     BaseClientProxy(name),
     m_stream(stream)
 {
@@ -48,7 +48,7 @@ ClientProxy::close(const char* msg)
     getStream()->flush();
 }
 
-synergy::IStream*
+barrier::IStream*
 ClientProxy::getStream() const
 {
     return m_stream;

src/lib/server/ClientProxy.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -23,7 +23,7 @@
 #include "base/String.h"
 #include "base/EventTypes.h"
 
-namespace synergy { class IStream; }
+namespace barrier { class IStream; }
 
 //! Generic proxy for client
 class ClientProxy : public BaseClientProxy {
@@ -31,7 +31,7 @@ public:
     /*!
     \c name is the name of the client.
     */
-    ClientProxy(const String& name, synergy::IStream* adoptedStream);
+    ClientProxy(const String& name, barrier::IStream* adoptedStream);
     ~ClientProxy();
 
     //! @name manipulators
@@ -51,7 +51,7 @@ public:
     /*!
     Returns the original stream passed to the c'tor.
     */
-    synergy::IStream*    getStream() const;
+    barrier::IStream*    getStream() const;
 
     //@}
 
@@ -87,5 +87,5 @@ public:
     virtual void        fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0;
 
 private:
-    synergy::IStream*    m_stream;
+    barrier::IStream*    m_stream;
 };

src/lib/server/ClientProxy1_0.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,8 +18,8 @@
 
 #include "server/ClientProxy1_0.h"
 
-#include "synergy/ProtocolUtil.h"
-#include "synergy/XSynergy.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/XBarrier.h"
 #include "io/IStream.h"
 #include "base/Log.h"
 #include "base/IEventQueue.h"
@@ -31,7 +31,7 @@
 // ClientProxy1_0
 //
 
-ClientProxy1_0::ClientProxy1_0(const String& name, synergy::IStream* stream, IEventQueue* events) :
+ClientProxy1_0::ClientProxy1_0(const String& name, barrier::IStream* stream, IEventQueue* events) :
     ClientProxy(name, stream),
     m_heartbeatTimer(NULL),
     m_parser(&ClientProxy1_0::parseHandshakeMessage),

src/lib/server/ClientProxy1_0.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -19,8 +19,8 @@
 #pragma once
 
 #include "server/ClientProxy.h"
-#include "synergy/Clipboard.h"
-#include "synergy/protocol_types.h"
+#include "barrier/Clipboard.h"
+#include "barrier/protocol_types.h"
 
 class Event;
 class EventQueueTimer;
@@ -29,7 +29,7 @@ class IEventQueue;
 //! Proxy for client implementing protocol version 1.0
 class ClientProxy1_0 : public ClientProxy {
 public:
-    ClientProxy1_0(const String& name, synergy::IStream* adoptedStream, IEventQueue* events);
+    ClientProxy1_0(const String& name, barrier::IStream* adoptedStream, IEventQueue* events);
     ~ClientProxy1_0();
 
     // IScreen

src/lib/server/ClientProxy1_1.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,7 +18,7 @@
 
 #include "server/ClientProxy1_1.h"
 
-#include "synergy/ProtocolUtil.h"
+#include "barrier/ProtocolUtil.h"
 #include "base/Log.h"
 
 #include <cstring>
@@ -27,7 +27,7 @@
 // ClientProxy1_1
 //
 
-ClientProxy1_1::ClientProxy1_1(const String& name, synergy::IStream* stream, IEventQueue* events) :
+ClientProxy1_1::ClientProxy1_1(const String& name, barrier::IStream* stream, IEventQueue* events) :
     ClientProxy1_0(name, stream, events)
 {
     // do nothing

src/lib/server/ClientProxy1_1.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -23,7 +23,7 @@
 //! Proxy for client implementing protocol version 1.1
 class ClientProxy1_1 : public ClientProxy1_0 {
 public:
-    ClientProxy1_1(const String& name, synergy::IStream* adoptedStream, IEventQueue* events);
+    ClientProxy1_1(const String& name, barrier::IStream* adoptedStream, IEventQueue* events);
     ~ClientProxy1_1();
 
     // IClient overrides

src/lib/server/ClientProxy1_2.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,14 +18,14 @@
 
 #include "server/ClientProxy1_2.h"
 
-#include "synergy/ProtocolUtil.h"
+#include "barrier/ProtocolUtil.h"
 #include "base/Log.h"
 
 //
 // ClientProxy1_1
 //
 
-ClientProxy1_2::ClientProxy1_2(const String& name, synergy::IStream* stream, IEventQueue* events) :
+ClientProxy1_2::ClientProxy1_2(const String& name, barrier::IStream* stream, IEventQueue* events) :
     ClientProxy1_1(name, stream, events)
 {
     // do nothing

src/lib/server/ClientProxy1_2.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
  * 
@@ -25,7 +25,7 @@ class IEventQueue;
 //! Proxy for client implementing protocol version 1.2
 class ClientProxy1_2 : public ClientProxy1_1 {
 public:
-    ClientProxy1_2(const String& name, synergy::IStream* adoptedStream, IEventQueue* events);
+    ClientProxy1_2(const String& name, barrier::IStream* adoptedStream, IEventQueue* events);
     ~ClientProxy1_2();
 
     // IClient overrides

src/lib/server/ClientProxy1_3.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2006 Chris Schoeneman
  * 
@@ -18,7 +18,7 @@
 
 #include "server/ClientProxy1_3.h"
 
-#include "synergy/ProtocolUtil.h"
+#include "barrier/ProtocolUtil.h"
 #include "base/Log.h"
 #include "base/IEventQueue.h"
 #include "base/TMethodEventJob.h"
@@ -30,7 +30,7 @@
 // ClientProxy1_3
 //
 
-ClientProxy1_3::ClientProxy1_3(const String& name, synergy::IStream* stream, IEventQueue* events) :
+ClientProxy1_3::ClientProxy1_3(const String& name, barrier::IStream* stream, IEventQueue* events) :
     ClientProxy1_2(name, stream, events),
     m_keepAliveRate(kKeepAliveRate),
     m_keepAliveTimer(NULL),

src/lib/server/ClientProxy1_3.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2006 Chris Schoeneman
  * 
@@ -23,7 +23,7 @@
 //! Proxy for client implementing protocol version 1.3
 class ClientProxy1_3 : public ClientProxy1_2 {
 public:
-    ClientProxy1_3(const String& name, synergy::IStream* adoptedStream, IEventQueue* events);
+    ClientProxy1_3(const String& name, barrier::IStream* adoptedStream, IEventQueue* events);
     ~ClientProxy1_3();
 
     // IClient overrides

src/lib/server/ClientProxy1_4.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2011 Chris Schoeneman
  * 
@@ -19,7 +19,7 @@
 #include "server/ClientProxy1_4.h"
 
 #include "server/Server.h"
-#include "synergy/ProtocolUtil.h"
+#include "barrier/ProtocolUtil.h"
 #include "base/Log.h"
 #include "base/IEventQueue.h"
 #include "base/TMethodEventJob.h"
@@ -31,7 +31,7 @@
 // ClientProxy1_4
 //
 
-ClientProxy1_4::ClientProxy1_4(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
+ClientProxy1_4::ClientProxy1_4(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) :
     ClientProxy1_3(name, stream, events), m_server(server)
 {
     assert(m_server != NULL);

src/lib/server/ClientProxy1_4.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2011 Chris Schoeneman
  * 
@@ -25,7 +25,7 @@ class Server;
 //! Proxy for client implementing protocol version 1.4
 class ClientProxy1_4 : public ClientProxy1_3 {
 public:
-    ClientProxy1_4(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events);
+    ClientProxy1_4(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events);
     ~ClientProxy1_4();
 
     //! @name accessors

src/lib/server/ClientProxy1_5.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2013-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -18,9 +18,9 @@
 #include "server/ClientProxy1_5.h"
 
 #include "server/Server.h"
-#include "synergy/FileChunk.h"
-#include "synergy/StreamChunker.h"
-#include "synergy/ProtocolUtil.h"
+#include "barrier/FileChunk.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/ProtocolUtil.h"
 #include "io/IStream.h"
 #include "base/TMethodEventJob.h"
 #include "base/Log.h"
@@ -31,7 +31,7 @@
 // ClientProxy1_5
 //
 
-ClientProxy1_5::ClientProxy1_5(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
+ClientProxy1_5::ClientProxy1_5(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) :
     ClientProxy1_4(name, stream, server, events),
     m_events(events)
 {

src/lib/server/ClientProxy1_5.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2013-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@ class IEventQueue;
 //! Proxy for client implementing protocol version 1.5
 class ClientProxy1_5 : public ClientProxy1_4 {
 public:
-    ClientProxy1_5(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events);
+    ClientProxy1_5(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events);
     ~ClientProxy1_5();
 
     virtual void        sendDragInfo(UInt32 fileCount, const char* info, size_t size);

src/lib/server/ClientProxy1_6.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -18,9 +18,9 @@
 #include "server/ClientProxy1_6.h"
 
 #include "server/Server.h"
-#include "synergy/ProtocolUtil.h"
-#include "synergy/StreamChunker.h"
-#include "synergy/ClipboardChunk.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/ClipboardChunk.h"
 #include "io/IStream.h"
 #include "base/TMethodEventJob.h"
 #include "base/Log.h"
@@ -29,7 +29,7 @@
 // ClientProxy1_6
 //
 
-ClientProxy1_6::ClientProxy1_6(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
+ClientProxy1_6::ClientProxy1_6(const String& name, barrier::IStream* stream, Server* server, IEventQueue* events) :
     ClientProxy1_5(name, stream, server, events),
     m_events(events)
 {

src/lib/server/ClientProxy1_6.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2015-2016 Symless Ltd.
  * 
  * This package is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ class IEventQueue;
 //! Proxy for client implementing protocol version 1.6
 class ClientProxy1_6 : public ClientProxy1_5 {
 public:
-    ClientProxy1_6(const String& name, synergy::IStream* adoptedStream, Server* server, IEventQueue* events);
+    ClientProxy1_6(const String& name, barrier::IStream* adoptedStream, Server* server, IEventQueue* events);
     ~ClientProxy1_6();
 
     virtual void        setClipboard(ClipboardID id, const IClipboard* clipboard);

src/lib/server/ClientProxyUnknown.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
  * 
@@ -26,9 +26,9 @@
 #include "server/ClientProxy1_4.h"
 #include "server/ClientProxy1_5.h"
 #include "server/ClientProxy1_6.h"
-#include "synergy/protocol_types.h"
-#include "synergy/ProtocolUtil.h"
-#include "synergy/XSynergy.h"
+#include "barrier/protocol_types.h"
+#include "barrier/ProtocolUtil.h"
+#include "barrier/XBarrier.h"
 #include "io/IStream.h"
 #include "io/XIO.h"
 #include "base/Log.h"
@@ -40,7 +40,7 @@
 // ClientProxyUnknown
 //
 
-ClientProxyUnknown::ClientProxyUnknown(synergy::IStream* stream, double timeout, Server* server, IEventQueue* events) :
+ClientProxyUnknown::ClientProxyUnknown(barrier::IStream* stream, double timeout, Server* server, IEventQueue* events) :
     m_stream(stream),
     m_proxy(NULL),
     m_ready(false),

src/lib/server/ClientProxyUnknown.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2004 Chris Schoeneman
  * 
@@ -23,13 +23,13 @@
 
 class ClientProxy;
 class EventQueueTimer;
-namespace synergy { class IStream; }
+namespace barrier { class IStream; }
 class Server;
 class IEventQueue;
 
 class ClientProxyUnknown {
 public:
-    ClientProxyUnknown(synergy::IStream* stream, double timeout, Server* server, IEventQueue* events);
+    ClientProxyUnknown(barrier::IStream* stream, double timeout, Server* server, IEventQueue* events);
     ~ClientProxyUnknown();
 
     //! @name manipulators
@@ -44,7 +44,7 @@ public:
     ClientProxy*        orphanClientProxy();
 
     //! Get the stream
-    synergy::IStream*    getStream() { return m_stream; }
+    barrier::IStream*    getStream() { return m_stream; }
 
     //@}
 
@@ -62,7 +62,7 @@ private:
     void                handleReady(const Event&, void*);
 
 private:
-    synergy::IStream*    m_stream;
+    barrier::IStream*    m_stream;
     EventQueueTimer*    m_timer;
     ClientProxy*        m_proxy;
     bool                m_ready;

src/lib/server/Config.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -19,8 +19,8 @@
 #include "server/Config.h"
 
 #include "server/Server.h"
-#include "synergy/KeyMap.h"
-#include "synergy/key_types.h"
+#include "barrier/KeyMap.h"
+#include "barrier/key_types.h"
 #include "net/XSocket.h"
 #include "base/IEventQueue.h"
 #include "common/stdistream.h"
@@ -28,7 +28,7 @@
 
 #include <cstdlib>
 
-using namespace synergy::string;
+using namespace barrier::string;
 
 //
 // Config
@@ -280,9 +280,9 @@ Config::disconnect(const String& srcName, EDirection srcSide, float position)
 }
 
 void
-Config::setSynergyAddress(const NetworkAddress& addr)
+Config::setBarrierAddress(const NetworkAddress& addr)
 {
-	m_synergyAddress = addr;
+	m_barrierAddress = addr;
 }
 
 bool
@@ -529,9 +529,9 @@ Config::endNeighbor(const String& srcName) const
 }
 
 const NetworkAddress&
-Config::getSynergyAddress() const
+Config::getBarrierAddress() const
 {
-	return m_synergyAddress;
+	return m_barrierAddress;
 }
 
 const Config::ScreenOptions*
@@ -562,7 +562,7 @@ Config::hasLockToScreenAction() const
 bool
 Config::operator==(const Config& x) const
 {
-	if (m_synergyAddress != x.m_synergyAddress) {
+	if (m_barrierAddress != x.m_barrierAddress) {
 		return false;
 	}
 	if (m_map.size() != x.m_map.size()) {
@@ -647,7 +647,7 @@ Config::formatInterval(const Interval& x)
 	if (x.first == 0.0f && x.second == 1.0f) {
 		return "";
 	}
-	return synergy::string::sprintf("(%d,%d)", (int)(x.first * 100.0f + 0.5f),
+	return barrier::string::sprintf("(%d,%d)", (int)(x.first * 100.0f + 0.5f),
 										(int)(x.second * 100.0f + 0.5f));
 }
 
@@ -724,8 +724,8 @@ Config::readSectionOptions(ConfigReadContext& s)
 		bool handled = true;
 		if (name == "address") {
 			try {
-				m_synergyAddress = NetworkAddress(value, kDefaultPort);
-				m_synergyAddress.resolve();
+				m_barrierAddress = NetworkAddress(value, kDefaultPort);
+				m_barrierAddress.resolve();
 			}
 			catch (XSocketAddress& e) {
 				throw XConfigRead(s,
@@ -1436,7 +1436,7 @@ Config::getOptionValue(OptionID id, OptionValue value)
 		id == kOptionScreenSwitchCornerSize ||
 		id == kOptionScreenSwitchDelay ||
 		id == kOptionScreenSwitchTwoTap) {
-		return synergy::string::sprintf("%d", value);
+		return barrier::string::sprintf("%d", value);
 	}
 	if (id == kOptionScreenSwitchCorners) {
 		std::string result("none");
@@ -1862,9 +1862,9 @@ operator<<(std::ostream& s, const Config& config)
 			}
 		}
 	}
-	if (config.m_synergyAddress.isValid()) {
+	if (config.m_barrierAddress.isValid()) {
 		s << "\taddress = " <<
-			config.m_synergyAddress.getHostname().c_str() << std::endl;
+			config.m_barrierAddress.getHostname().c_str() << std::endl;
 	}
 	s << config.m_inputFilter.format("\t");
 	s << "end" << std::endl;
@@ -1917,7 +1917,7 @@ ConfigReadContext::readLine(String& line)
 				if (!isgraph(line[i]) && line[i] != ' ' && line[i] != '\t') {
 					throw XConfigRead(*this,
 								"invalid character %{1}",
-								synergy::string::sprintf("%#2x", line[i]));
+								barrier::string::sprintf("%#2x", line[i]));
 				}
 			}
 
@@ -2233,12 +2233,12 @@ ConfigReadContext::parseKeystroke(const String& keystroke,
 	String s = keystroke;
 
 	KeyModifierMask mask;
-	if (!synergy::KeyMap::parseModifiers(s, mask)) {
+	if (!barrier::KeyMap::parseModifiers(s, mask)) {
 		throw XConfigRead(*this, "unable to parse key modifiers");
 	}
 
 	KeyID key;
-	if (!synergy::KeyMap::parseKey(s, key)) {
+	if (!barrier::KeyMap::parseKey(s, key)) {
 		throw XConfigRead(*this, "unable to parse key");
 	}
 
@@ -2255,7 +2255,7 @@ ConfigReadContext::parseMouse(const String& mouse) const
 	String s = mouse;
 
 	KeyModifierMask mask;
-	if (!synergy::KeyMap::parseModifiers(s, mask)) {
+	if (!barrier::KeyMap::parseModifiers(s, mask)) {
 		throw XConfigRead(*this, "unable to parse button modifiers");
 	}
 
@@ -2277,7 +2277,7 @@ ConfigReadContext::parseModifier(const String& modifiers) const
 	String s = modifiers;
 
 	KeyModifierMask mask;
-	if (!synergy::KeyMap::parseModifiers(s, mask)) {
+	if (!barrier::KeyMap::parseModifiers(s, mask)) {
 		throw XConfigRead(*this, "unable to parse modifiers");
 	}
 
@@ -2309,7 +2309,7 @@ ConfigReadContext::concatArgs(const ArgList& args)
 
 XConfigRead::XConfigRead(const ConfigReadContext& context,
 				const String& error) :
-	m_error(synergy::string::sprintf("line %d: %s",
+	m_error(barrier::string::sprintf("line %d: %s",
 							context.getLineNumber(), error.c_str()))
 {
 	// do nothing
@@ -2317,8 +2317,8 @@ XConfigRead::XConfigRead(const ConfigReadContext& context,
 
 XConfigRead::XConfigRead(const ConfigReadContext& context,
 				const char* errorFmt, const String& arg) :
-	m_error(synergy::string::sprintf("line %d: ", context.getLineNumber()) +
-							synergy::string::format(errorFmt, arg.c_str()))
+	m_error(barrier::string::sprintf("line %d: ", context.getLineNumber()) +
+							barrier::string::format(errorFmt, arg.c_str()))
 {
 	// do nothing
 }

src/lib/server/Config.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -19,9 +19,9 @@
 #pragma once
 
 #include "server/InputFilter.h"
-#include "synergy/option_types.h"
-#include "synergy/protocol_types.h"
-#include "synergy/IPlatformScreen.h"
+#include "barrier/option_types.h"
+#include "barrier/protocol_types.h"
+#include "barrier/IPlatformScreen.h"
 #include "net/NetworkAddress.h"
 #include "base/String.h"
 #include "base/XBase.h"
@@ -140,8 +140,8 @@ private:
     public:
         ScreenOptions    m_options;
     };
-    typedef std::map<String, Cell, synergy::string::CaselessCmp> CellMap;
-    typedef std::map<String, String, synergy::string::CaselessCmp> NameMap;
+    typedef std::map<String, Cell, barrier::string::CaselessCmp> CellMap;
+    typedef std::map<String, String, barrier::string::CaselessCmp> NameMap;
 
 public:
     typedef Cell::const_iterator link_const_iterator;
@@ -283,10 +283,10 @@ public:
 
     //! Set server address
     /*!
-    Set the synergy listen addresses.  There is no default address so
+    Set the barrier listen addresses.  There is no default address so
     this must be called to run a server using this configuration.
     */
-    void                setSynergyAddress(const NetworkAddress&);
+    void                setBarrierAddress(const NetworkAddress&);
 
     //! Add a screen option
     /*!
@@ -392,7 +392,7 @@ public:
 
     //! Get the server address
     const NetworkAddress&
-                        getSynergyAddress() const;
+                        getBarrierAddress() const;
 
     //! Get the screen options
     /*!
@@ -474,7 +474,7 @@ private:
 private:
     CellMap                m_map;
     NameMap                m_nameToCanonicalName;
-    NetworkAddress        m_synergyAddress;
+    NetworkAddress        m_barrierAddress;
     ScreenOptions        m_globalOptions;
     InputFilter            m_inputFilter;
     bool                m_hasLockToScreenAction;

src/lib/server/InputFilter.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2005 Chris Schoeneman
  * 
@@ -19,7 +19,7 @@
 #include "server/InputFilter.h"
 #include "server/Server.h"
 #include "server/PrimaryClient.h"
-#include "synergy/KeyMap.h"
+#include "barrier/KeyMap.h"
 #include "base/EventQueue.h"
 #include "base/Log.h"
 #include "base/TMethodEventJob.h"
@@ -98,8 +98,8 @@ InputFilter::KeystrokeCondition::clone() const
 String
 InputFilter::KeystrokeCondition::format() const
 {
-    return synergy::string::sprintf("keystroke(%s)",
-                            synergy::KeyMap::formatKey(m_key, m_mask).c_str());
+    return barrier::string::sprintf("keystroke(%s)",
+                            barrier::KeyMap::formatKey(m_key, m_mask).c_str());
 }
 
 InputFilter::EFilterStatus
@@ -186,11 +186,11 @@ InputFilter::MouseButtonCondition::clone() const
 String
 InputFilter::MouseButtonCondition::format() const
 {
-    String key = synergy::KeyMap::formatKey(kKeyNone, m_mask);
+    String key = barrier::KeyMap::formatKey(kKeyNone, m_mask);
     if (!key.empty()) {
         key += "+";
     }
-    return synergy::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button);
+    return barrier::string::sprintf("mousebutton(%s%d)", key.c_str(), m_button);
 }
 
 InputFilter::EFilterStatus        
@@ -248,7 +248,7 @@ InputFilter::ScreenConnectedCondition::clone() const
 String
 InputFilter::ScreenConnectedCondition::format() const
 {
-    return synergy::string::sprintf("connect(%s)", m_screen.c_str());
+    return barrier::string::sprintf("connect(%s)", m_screen.c_str());
 }
 
 InputFilter::EFilterStatus
@@ -303,7 +303,7 @@ InputFilter::LockCursorToScreenAction::format() const
 {
     static const char* s_mode[] = { "off", "on", "toggle" };
 
-    return synergy::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]);
+    return barrier::string::sprintf("lockCursorToScreen(%s)", s_mode[m_mode]);
 }
 
 void
@@ -346,7 +346,7 @@ InputFilter::SwitchToScreenAction::clone() const
 String
 InputFilter::SwitchToScreenAction::format() const
 {
-    return synergy::string::sprintf("switchToScreen(%s)", m_screen.c_str());
+    return barrier::string::sprintf("switchToScreen(%s)", m_screen.c_str());
 }
 
 void
@@ -400,7 +400,7 @@ InputFilter::SwitchInDirectionAction::format() const
         "down"
     };
 
-    return synergy::string::sprintf("switchInDirection(%s)", s_names[m_direction]);
+    return barrier::string::sprintf("switchInDirection(%s)", s_names[m_direction]);
 }
 
 void
@@ -459,10 +459,10 @@ InputFilter::KeyboardBroadcastAction::format() const
     static const char* s_name = "keyboardBroadcast";
 
     if (m_screens.empty() || m_screens[0] == '*') {
-        return synergy::string::sprintf("%s(%s)", s_name, s_mode[m_mode]);
+        return barrier::string::sprintf("%s(%s)", s_name, s_mode[m_mode]);
     }
     else {
-        return synergy::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode],
+        return barrier::string::sprintf("%s(%s,%.*s)", s_name, s_mode[m_mode],
                             m_screens.size() - 2,
                             m_screens.c_str() + 1);
     }
@@ -531,18 +531,18 @@ InputFilter::KeystrokeAction::format() const
     const char* type = formatName();
 
     if (m_keyInfo->m_screens[0] == '\0') {
-        return synergy::string::sprintf("%s(%s)", type,
-                            synergy::KeyMap::formatKey(m_keyInfo->m_key,
+        return barrier::string::sprintf("%s(%s)", type,
+                            barrier::KeyMap::formatKey(m_keyInfo->m_key,
                                 m_keyInfo->m_mask).c_str());
     }
     else if (m_keyInfo->m_screens[0] == '*') {
-        return synergy::string::sprintf("%s(%s,*)", type,
-                            synergy::KeyMap::formatKey(m_keyInfo->m_key,
+        return barrier::string::sprintf("%s(%s,*)", type,
+                            barrier::KeyMap::formatKey(m_keyInfo->m_key,
                                 m_keyInfo->m_mask).c_str());
     }
     else {
-        return synergy::string::sprintf("%s(%s,%.*s)", type,
-                            synergy::KeyMap::formatKey(m_keyInfo->m_key,
+        return barrier::string::sprintf("%s(%s,%.*s)", type,
+                            barrier::KeyMap::formatKey(m_keyInfo->m_key,
                                 m_keyInfo->m_mask).c_str(),
                             strlen(m_keyInfo->m_screens + 1) - 1,
                             m_keyInfo->m_screens + 1);
@@ -612,8 +612,8 @@ InputFilter::MouseButtonAction::format() const
 {
     const char* type = formatName();
 
-    String key = synergy::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask);
-    return synergy::string::sprintf("%s(%s%s%d)", type,
+    String key = barrier::KeyMap::formatKey(kKeyNone, m_buttonInfo->m_mask);
+    return barrier::string::sprintf("%s(%s%s%d)", type,
                             key.c_str(), key.empty() ? "" : "+",
                             m_buttonInfo->m_button);
 }

src/lib/server/InputFilter.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2005 Chris Schoeneman
  * 
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include "synergy/key_types.h"
-#include "synergy/mouse_types.h"
-#include "synergy/protocol_types.h"
-#include "synergy/IPlatformScreen.h"
+#include "barrier/key_types.h"
+#include "barrier/mouse_types.h"
+#include "barrier/protocol_types.h"
+#include "barrier/IPlatformScreen.h"
 #include "base/String.h"
 #include "common/stdmap.h"
 #include "common/stdset.h"

src/lib/server/PrimaryClient.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -18,15 +18,15 @@
 
 #include "server/PrimaryClient.h"
 
-#include "synergy/Screen.h"
-#include "synergy/Clipboard.h"
+#include "barrier/Screen.h"
+#include "barrier/Clipboard.h"
 #include "base/Log.h"
 
 //
 // PrimaryClient
 //
 
-PrimaryClient::PrimaryClient(const String& name, synergy::Screen* screen) :
+PrimaryClient::PrimaryClient(const String& name, barrier::Screen* screen) :
     BaseClientProxy(name),
     m_screen(screen),
     m_fakeInputCount(0)

src/lib/server/PrimaryClient.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -19,9 +19,9 @@
 #pragma once
 
 #include "server/BaseClientProxy.h"
-#include "synergy/protocol_types.h"
+#include "barrier/protocol_types.h"
 
-namespace synergy { class Screen; }
+namespace barrier { class Screen; }
 
 //! Primary screen as pseudo-client
 /*!
@@ -34,7 +34,7 @@ public:
     /*!
     \c name is the name of the server and \p screen is primary screen.
     */
-    PrimaryClient(const String& name, synergy::Screen* screen);
+    PrimaryClient(const String& name, barrier::Screen* screen);
     ~PrimaryClient();
 
 #ifdef TEST_ENV
@@ -146,11 +146,11 @@ public:
     virtual void        sendDragInfo(UInt32 fileCount, const char* info, size_t size);
     virtual void        fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 
-    virtual synergy::IStream*
+    virtual barrier::IStream*
                         getStream() const { return NULL; }
     bool                isPrimary() const { return true; }
 private:
-    synergy::Screen*    m_screen;
+    barrier::Screen*    m_screen;
     bool                m_clipboardDirty[kClipboardEnd];
     SInt32                m_fakeInputCount;
 };

src/lib/server/Server.cpp

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  *
@@ -22,17 +22,17 @@
 #include "server/ClientProxyUnknown.h"
 #include "server/PrimaryClient.h"
 #include "server/ClientListener.h"
-#include "synergy/FileChunk.h"
-#include "synergy/IPlatformScreen.h"
-#include "synergy/DropHelper.h"
-#include "synergy/option_types.h"
-#include "synergy/protocol_types.h"
-#include "synergy/XScreen.h"
-#include "synergy/XSynergy.h"
-#include "synergy/StreamChunker.h"
-#include "synergy/KeyState.h"
-#include "synergy/Screen.h"
-#include "synergy/PacketStreamFilter.h"
+#include "barrier/FileChunk.h"
+#include "barrier/IPlatformScreen.h"
+#include "barrier/DropHelper.h"
+#include "barrier/option_types.h"
+#include "barrier/protocol_types.h"
+#include "barrier/XScreen.h"
+#include "barrier/XBarrier.h"
+#include "barrier/StreamChunker.h"
+#include "barrier/KeyState.h"
+#include "barrier/Screen.h"
+#include "barrier/PacketStreamFilter.h"
 #include "net/TCPSocket.h"
 #include "net/IDataSocket.h"
 #include "net/IListenSocket.h"
@@ -59,7 +59,7 @@
 Server::Server(
 		Config& config,
 		PrimaryClient* primaryClient,
-		synergy::Screen* screen,
+		barrier::Screen* screen,
 		IEventQueue* events,
 		ServerArgs const& args) :
 	m_mock(false),
@@ -1846,8 +1846,8 @@ Server::sendDragInfoThread(void* arg)
 
 #if defined(__APPLE__)
 	// on mac it seems that after faking a LMB up, system would signal back
-	// to synergy a mouse up event, which doesn't happen on windows. as a
-	// result, synergy would send dragging file to client twice. This variable
+	// to barrier a mouse up event, which doesn't happen on windows. as a
+	// result, barrier would send dragging file to client twice. This variable
 	// is used to ignore the first file sending.
 	m_ignoreFileTransfer = true;
 #endif

src/lib/server/Server.h

@@ -1,5 +1,5 @@
 /*
- * synergy -- mouse and keyboard sharing utility
+ * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
  * 
@@ -19,13 +19,13 @@
 #pragma once
 
 #include "server/Config.h"
-#include "synergy/clipboard_types.h"
-#include "synergy/Clipboard.h"
-#include "synergy/key_types.h"
-#include "synergy/mouse_types.h"
-#include "synergy/INode.h"
-#include "synergy/DragInformation.h"
-#include "synergy/ServerArgs.h"
+#include "barrier/clipboard_types.h"
+#include "barrier/Clipboard.h"
+#include "barrier/key_types.h"
+#include "barrier/mouse_types.h"
+#include "barrier/INode.h"
+#include "barrier/DragInformation.h"
+#include "barrier/ServerArgs.h"
 #include "base/Event.h"
 #include "base/Stopwatch.h"
 #include "base/EventTypes.h"
@@ -37,14 +37,14 @@ class BaseClientProxy;
 class EventQueueTimer;
 class PrimaryClient;
 class InputFilter;
-namespace synergy { class Screen; }
+namespace barrier { class Screen; }
 class IEventQueue;
 class Thread;
 class ClientListener;
 
-//! Synergy server
+//! Barrier server
 /*!
-This class implements the top-level server algorithms for synergy.
+This class implements the top-level server algorithms for barrier.
 */
 class Server : public INode {
 public:
@@ -107,7 +107,7 @@ public:
     ownership of \p primaryClient.
     */
     Server(Config& config, PrimaryClient* primaryClient,
-        synergy::Screen* screen, IEventQueue* events, ServerArgs const& args);
+        barrier::Screen* screen, IEventQueue* events, ServerArgs const& args);
     ~Server();
 
 #ifdef TEST_ENV
@@ -460,7 +460,7 @@ private:
     bool                m_lockedToScreen;
 
     // server screen
-    synergy::Screen*    m_screen;
+    barrier::Screen*    m_screen;
 
     IEventQueue*        m_events;