checkpoint. still refactoring. merged common code from primary

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

View File

@@ -131,7 +131,7 @@ CServerProxy::run()
}
else if (memcmp(code, kMsgCScreenSaver, 4) == 0) {
screenSaver();
screensaver();
}
else if (memcmp(code, kMsgQInfo, 4) == 0) {
@@ -484,7 +484,7 @@ CServerProxy::mouseWheel()
}
void
CServerProxy::screenSaver()
CServerProxy::screensaver()
{
// parse
SInt8 on;
@@ -492,7 +492,7 @@ CServerProxy::screenSaver()
log((CLOG_DEBUG1 "recv screen saver on=%d", on));
// forward
getClient()->screenSaver(on != 0);
getClient()->screensaver(on != 0);
}
void
@@ -501,7 +501,7 @@ CServerProxy::queryInfo()
// get current info
CClientInfo info;
getClient()->getShape(info.m_x, info.m_y, info.m_w, info.m_h);
getClient()->getMousePos(info.m_mx, info.m_my);
getClient()->getCursorPos(info.m_mx, info.m_my);
info.m_zoneSize = getClient()->getJumpZoneSize();
// send it