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

checkpoint. still refactoring. merged common code from primary

Browse Source 
screens into CPrimaryScreen and merged common code from secondary
screens into CSecondaryScreen.  changed is-a relationship to a
has-a between the primary and secondary screen classes and the
generic platform dependent screen class to avoid multiple
inheritance of implementation.  also standardized the interface
for those generic screen classes.  adding a platform now involves
implementing simpler interfaces:  IScreen for the generic screen,
IScreenEventHandler and some methods of CPrimaryScreen for the
primary screen, and IScreenEventHandler and some methods of
CSecondaryScreen for the secondary screen.  did X11 platform
but not win32 platform.
This commit is contained in:
crs
2002-07-13 22:00:38 +00:00
parent 52b60d5175
commit f48a5fe387
34 changed files with 1945 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/CPrimaryClient.cpp
View File

@@ -1,6 +1,6 @@
#include "CPrimaryClient.h"
#include "IServer.h"
#include "IPrimaryScreen.h"
#include "CPrimaryScreen.h"
#include "CClipboard.h"
#include "CLog.h"
@@ -15,7 +15,8 @@
// CPrimaryClient
//
CPrimaryClient::CPrimaryClient(IServer* server, const CString& name) :
CPrimaryClient::CPrimaryClient(IServer* server,
IPrimaryScreenReceiver* receiver, const CString& name) :
m_server(server),
m_name(name),
m_seqNum(0)
@@ -25,9 +26,9 @@ CPrimaryClient::CPrimaryClient(IServer* server, const CString& name) :
// create screen
log((CLOG_DEBUG1 "creating primary screen"));
#if WINDOWS_LIKE
m_screen = new CMSWindowsPrimaryScreen(this, m_server);
m_screen = new CMSWindowsPrimaryScreen(this, receiver);
#elif UNIX_LIKE
m_screen = new CXWindowsPrimaryScreen(this, m_server);
m_screen = new CXWindowsPrimaryScreen(this, receiver);
#endif
}
@@ -211,7 +212,7 @@ CPrimaryClient::mouseWheel(SInt32)
}
void
CPrimaryClient::screenSaver(bool)
CPrimaryClient::screensaver(bool)
{
// ignore
}
@@ -222,6 +223,12 @@ CPrimaryClient::getName() const
return m_name;
}
SInt32
CPrimaryClient::getJumpZoneSize() const
{
return m_info.m_zoneSize;
}
void
CPrimaryClient::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
{
@@ -232,20 +239,14 @@ CPrimaryClient::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
}
void
CPrimaryClient::getCenter(SInt32& x, SInt32& y) const
{
x = m_info.m_mx;
y = m_info.m_my;
}
void
CPrimaryClient::getMousePos(SInt32&, SInt32&) const
CPrimaryClient::getCursorPos(SInt32&, SInt32&) const
{
assert(0 && "shouldn't be called");
}
SInt32
CPrimaryClient::getJumpZoneSize() const
void
CPrimaryClient::getCursorCenter(SInt32& x, SInt32& y) const
{
return m_info.m_zoneSize;
x = m_info.m_mx;
y = m_info.m_my;
}