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.
minor changes to support IPrimaryReciever's functionality. this
does mean that the IPrimaryScreen class will be calling some
methods with dummy arguments. those are documented in
CPrimaryClient.
now speaks to the primary screen and secondary screens almost
everywhere the same way through an IClient interface; only
special primary screen calls are accessed through a different
interface, the CPrimaryClient interface. this simplifies the
server since it no longer needs to test whether the active screen
is the primary or a secondary in most cases.
the server no longer speaks directly to the primary screen; all
that goes through the CPrimaryClient, which often just forwards
the call. the primary screen no longer speaks directly to the
server either, again going through the CPrimaryClient via a
IPrimaryReceiver interface.
CServerProtocol classes have been replaced by CClientProxy
classes which are very similar. the name makes more sense
though.
init() it while it's already running. fixed an uninitialized
pointer bug in CServer and some cleanup-on-error code in
CMSWindowsPrimaryScreen. also added timeout to read() on
IInputStream and a heartbeat sent by clients so the server
can disconnect clients that are dead but never reset the TCP
connection. previously the server would keep these dead
clients around forever and if the user was locked on the
client screen for some reason then the server would have to
be rebooted (or the server would have to be killed via a
remote login).
and back to secondary when it stops. also now redirecting
keyboard input to root window when screen saver starts; this
allows the user to type in the lock dialog and also effectively
discards any input used to deactivate the screen saver.
installing and uninstalling the new error handler, causing
errors before the lock to be caught and errors during the lock
to not be caught. had to add Display* as argument to c'tor.
and untested. also some known problems: not detecting an
xscreensaver started after us and not detecting built-in
screen saver activation (not sure if we can without using
ugly extensions).
to the thread list: the child thread would add itself to the
list which means there could be a time interval in the parent
where the child thread exists but isn't on the list. the
parent now does the adding and removing.
motion events relative to the previous mouse position. for
example, if two mouse events arrive, the first at x+1,y and
the second at x+2,y, we used to compute deltas of 1,0 and 2,0
instead of 1,0 and 1,0. that's fixed. also worked around a
bug (probably) in windows that caused a motion event after a
SetCursorPos() to be lost or reported one pixel off from the
correct position. now using mouse_event() which doesn't
have that problem. also fixed calculation of normalized
coordinates for mouse_event() when there are multiple
displays.
also no longer warping mouse to 0,0 when setting server screen
info. that was causing the mouse to jump if the server screen
had itself as its left or top neighbor (directly or indirectly)
once a screen could be its own neighbor.
include a screen that was already connected under an alias
then that screen wouldn't be disconnected and removed from
the screen list until the screen voluntarily disconnected.
at that time removeConnection() would assert because the
screen name would not be found. now using the canonical
name in the protocol object as well as CServer. this
allows setConfig() to always detect removed screens and
disconnect them.
the address and port to listen on or connect to. changed the
default port and put it in ProtocolTypes.h. the HTTP port is
now no longer opened unless the --http argument is supplied
or the config file includes it.
restarting and daemonizing on unix. daemon sends log messages
to syslog. unix now reads config file from file named on
command line; if no command line arg then uses effective
user's config file and if that's not there it finally tries
/etc/synergy.conf. if there are no screens configured then
one is added for the primary screen. broke some startup
stuff on win32.
also now timing out if X primary screen can't grab the mouse
and keyboard. the server will just give up trying to switch
screens. the grabs will fail is some other app has a grab
and won't release it. note that kdm grabs the keyboard for
the duration that the login window is displayed, effectively
disabling synergy.
the apps still exit but they do it in a mostly controlled
manner. in particular, the server threads except the one
processing primary screen events will terminate gracefully.
this will be important should the server ever allow HTTP
clients to rewrite the configuration file.
note that X makes it effectively impossible to continue once
the X server disconnects. even if it didn't it would be
difficult for synergy to recover. users will have to add
synergy to the X display manager's startup script if they
expect the server to be restarted. alternatively, we could
add code to fork synergy at startup; the child would do
the normal work while the parent would simply wait for the
child to exit and restart it.
crs