backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-08 12:53:53 +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

32
client/CClient.cpp
View File

@@ -4,7 +4,7 @@
#include "CInputPacketStream.h"
#include "COutputPacketStream.h"
#include "CProtocolUtil.h"
#include "ISecondaryScreen.h"
#include "CSecondaryScreen.h"
#include "IServer.h"
#include "ProtocolTypes.h"
#include "XScreen.h"
@@ -148,9 +148,7 @@ CClient::run()
this, &CClient::runSession));
// handle events
log((CLOG_DEBUG "starting event handling"));
m_screen->run();
log((CLOG_DEBUG "stopped event handling"));
// clean up
deleteSession(thread);
@@ -160,7 +158,6 @@ CClient::run()
log((CLOG_ERR "client error: %s", e.what()));
// clean up
log((CLOG_DEBUG "stopped event handling"));
deleteSession(thread);
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
CLock lock(&m_mutex);
@@ -168,7 +165,6 @@ CClient::run()
}
catch (XThread&) {
// clean up
log((CLOG_DEBUG "stopped event handling"));
deleteSession(thread);
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
throw;
@@ -177,7 +173,6 @@ CClient::run()
log((CLOG_DEBUG "unknown client error"));
// clean up
log((CLOG_DEBUG "stopped event handling"));
deleteSession(thread);
log((CLOG_NOTE "stopping client \"%s\"", m_name.c_str()));
throw;
@@ -188,6 +183,7 @@ void
CClient::close()
{
closeSecondaryScreen();
log((CLOG_INFO "closed screen"));
}
void
@@ -291,9 +287,9 @@ CClient::mouseWheel(SInt32 delta)
}
void
CClient::screenSaver(bool activate)
CClient::screensaver(bool activate)
{
m_screen->screenSaver(activate);
m_screen->screensaver(activate);
}
CString
@@ -302,6 +298,12 @@ CClient::getName() const
return m_name;
}
SInt32
CClient::getJumpZoneSize() const
{
return m_screen->getJumpZoneSize();
}
void
CClient::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
{
@@ -309,21 +311,15 @@ CClient::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
}
void
CClient::getCenter(SInt32&, SInt32&) const
CClient::getCursorPos(SInt32& x, SInt32& y) const
{
assert(0 && "shouldn't be called");
m_screen->getCursorPos(x, y);
}
void
CClient::getMousePos(SInt32& x, SInt32& y) const
CClient::getCursorCenter(SInt32&, SInt32&) const
{
m_screen->getMousePos(x, y);
}
SInt32
CClient::getJumpZoneSize() const
{
return m_screen->getJumpZoneSize();
assert(0 && "shouldn't be called");
}
// FIXME -- use factory to create screen