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

Merged primary and secondary screens into one class.

Browse Source
This commit is contained in:
crs
2003-09-02 22:05:47 +00:00
parent 4fea7719f3
commit 47ca409ff9
57 changed files with 8263 additions and 9809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/synergyc/synergyc.cpp
View File

@@ -13,7 +13,7 @@
*/
#include "CClient.h"
#include "ISecondaryScreenFactory.h"
#include "IScreenFactory.h"
#include "ProtocolTypes.h"
#include "Version.h"
#include "XScreen.h"
@@ -35,14 +35,13 @@
#define DAEMON_RUNNING(running_)
#if WINDOWS_LIKE
#include "CMSWindowsScreen.h"
#include "CMSWindowsSecondaryScreen.h"
#include "CArchMiscWindows.h"
#include "CMSWindowsClientTaskBarReceiver.h"
#include "resource.h"
#undef DAEMON_RUNNING
#define DAEMON_RUNNING(running_) CArchMiscWindows::daemonRunning(running_)
#elif UNIX_LIKE
#include "CXWindowsSecondaryScreen.h"
#include "CXWindowsScreen.h"
#include "CXWindowsClientTaskBarReceiver.h"
#endif
@@ -88,28 +87,28 @@ CArgs* CArgs::s_instance = NULL;
// platform dependent factories
//
//! Factory for creating secondary screens
//! Factory for creating screens
/*!
Objects of this type create secondary screens appropriate for the
platform.
Objects of this type create screens appropriate for the platform.
*/
class CSecondaryScreenFactory : public ISecondaryScreenFactory {
class CScreenFactory : public IScreenFactory {
public:
CSecondaryScreenFactory() { }
virtual ~CSecondaryScreenFactory() { }
CScreenFactory() { }
virtual ~CScreenFactory() { }
// ISecondaryScreenFactory overrides
virtual CSecondaryScreen*
create(IScreenReceiver*);
// IScreenFactory overrides
virtual IPlatformScreen*
create(IScreenReceiver*, IPrimaryScreenReceiver*);
};
CSecondaryScreen*
CSecondaryScreenFactory::create(IScreenReceiver* receiver)
IPlatformScreen*
CScreenFactory::create(IScreenReceiver* receiver,
IPrimaryScreenReceiver* primaryReceiver)
{
#if WINDOWS_LIKE
return new CMSWindowsSecondaryScreen(receiver);
return new CMSWindowsScreen(receiver, primaryReceiver);
#elif UNIX_LIKE
return new CXWindowsSecondaryScreen(receiver);
return new CXWindowsScreen(receiver, primaryReceiver);
#endif
}
@@ -167,7 +166,7 @@ realMain(void)
// create client
s_client = new CClient(ARG->m_name);
s_client->setAddress(ARG->m_serverAddress);
s_client->setScreenFactory(new CSecondaryScreenFactory);
s_client->setScreenFactory(new CScreenFactory);
s_client->setSocketFactory(new CTCPSocketFactory);
s_client->setStreamFilterFactory(NULL);

30
cmd/synergys/synergys.cpp
View File

@@ -14,7 +14,7 @@
#include "CServer.h"
#include "CConfig.h"
#include "IPrimaryScreenFactory.h"
#include "IScreenFactory.h"
#include "ProtocolTypes.h"
#include "Version.h"
#include "XScreen.h"
@@ -34,14 +34,13 @@
#define DAEMON_RUNNING(running_)
#if WINDOWS_LIKE
#include "CMSWindowsScreen.h"
#include "CMSWindowsPrimaryScreen.h"
#include "CArchMiscWindows.h"
#include "CMSWindowsServerTaskBarReceiver.h"
#include "resource.h"
#undef DAEMON_RUNNING
#define DAEMON_RUNNING(running_) CArchMiscWindows::daemonRunning(running_)
#elif UNIX_LIKE
#include "CXWindowsPrimaryScreen.h"
#include "CXWindowsScreen.h"
#include "CXWindowsServerTaskBarReceiver.h"
#endif
@@ -100,29 +99,28 @@ CArgs* CArgs::s_instance = NULL;
// platform dependent factories
//
//! Factory for creating primary screens
//! Factory for creating screens
/*!
Objects of this type create primary screens appropriate for the
platform.
Objects of this type create screens appropriate for the platform.
*/
class CPrimaryScreenFactory : public IPrimaryScreenFactory {
class CScreenFactory : public IScreenFactory {
public:
CPrimaryScreenFactory() { }
virtual ~CPrimaryScreenFactory() { }
CScreenFactory() { }
virtual ~CScreenFactory() { }
// IPrimaryScreenFactory overrides
virtual CPrimaryScreen*
// IScreenFactory overrides
virtual IPlatformScreen*
create(IScreenReceiver*, IPrimaryScreenReceiver*);
};
CPrimaryScreen*
CPrimaryScreenFactory::create(IScreenReceiver* receiver,
IPlatformScreen*
CScreenFactory::create(IScreenReceiver* receiver,
IPrimaryScreenReceiver* primaryReceiver)
{
#if WINDOWS_LIKE
return new CMSWindowsPrimaryScreen(receiver, primaryReceiver);
return new CMSWindowsScreen(receiver, primaryReceiver);
#elif UNIX_LIKE
return new CXWindowsPrimaryScreen(receiver, primaryReceiver);
return new CXWindowsScreen(receiver, primaryReceiver);
#endif
}
@@ -201,7 +199,7 @@ realMain(void)
// create server
s_server = new CServer(ARG->m_name);
s_server->setConfig(ARG->m_config);
s_server->setScreenFactory(new CPrimaryScreenFactory);
s_server->setScreenFactory(new CScreenFactory);
s_server->setSocketFactory(new CTCPSocketFactory);
s_server->setStreamFilterFactory(NULL);