moving 1.4 to trunk

src/cmd/CMakeLists.txt

@@ -0,0 +1,18 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+add_subdirectory(synergyc)
+add_subdirectory(synergys)
+add_subdirectory(synergyd)

src/cmd/synergyc/.gitignore

@@ -0,0 +1 @@
+/*.aps

src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp

@@ -0,0 +1,373 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CMSWindowsClientTaskBarReceiver.h"
+#include "CClient.h"
+#include "CMSWindowsClipboard.h"
+#include "LogOutputters.h"
+#include "BasicTypes.h"
+#include "CArch.h"
+#include "CArchTaskBarWindows.h"
+#include "CArchMiscWindows.h"
+#include "resource.h"
+#include "CMSWindowsScreen.h"
+
+//
+// CMSWindowsClientTaskBarReceiver
+//
+
+const UINT CMSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] =
+{
+	IDI_TASKBAR_NOT_RUNNING,
+	IDI_TASKBAR_NOT_WORKING,
+	IDI_TASKBAR_NOT_CONNECTED,
+	IDI_TASKBAR_NOT_CONNECTED,
+	IDI_TASKBAR_CONNECTED
+};
+
+CMSWindowsClientTaskBarReceiver::CMSWindowsClientTaskBarReceiver(
+				HINSTANCE appInstance, const CBufferedLogOutputter* logBuffer) :
+	CClientTaskBarReceiver(),
+	m_appInstance(appInstance),
+	m_window(NULL),
+	m_logBuffer(logBuffer)
+{
+	for (UInt32 i = 0; i < kMaxState; ++i) {
+		m_icon[i] = loadIcon(s_stateToIconID[i]);
+	}
+	m_menu = LoadMenu(m_appInstance, MAKEINTRESOURCE(IDR_TASKBAR));
+
+	// don't create the window yet.  we'll create it on demand.  this
+	// has the side benefit of being created in the thread used for
+	// the task bar.  that's good because it means the existence of
+	// the window won't prevent changing the main thread's desktop.
+
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+CMSWindowsClientTaskBarReceiver::~CMSWindowsClientTaskBarReceiver()
+{
+	cleanup();
+}
+
+void
+CMSWindowsClientTaskBarReceiver::cleanup()
+{
+	ARCH->removeReceiver(this);
+	for (UInt32 i = 0; i < kMaxState; ++i) {
+		deleteIcon(m_icon[i]);
+	}
+	DestroyMenu(m_menu);
+	destroyWindow();
+}
+
+void
+CMSWindowsClientTaskBarReceiver::showStatus()
+{
+	// create the window
+	createWindow();
+
+	// lock self while getting status
+	lock();
+
+	// get the current status
+	std::string status = getToolTip();
+
+	// done getting status
+	unlock();
+
+	// update dialog
+	HWND child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_STATUS);
+	SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
+
+	if (!IsWindowVisible(m_window)) {
+		// position it by the mouse
+		POINT cursorPos;
+		GetCursorPos(&cursorPos);
+		RECT windowRect;
+		GetWindowRect(m_window, &windowRect);
+		int  x = cursorPos.x;
+		int  y = cursorPos.y;
+		int fw = GetSystemMetrics(SM_CXDLGFRAME);
+		int fh = GetSystemMetrics(SM_CYDLGFRAME);
+		int ww = windowRect.right  - windowRect.left;
+		int wh = windowRect.bottom - windowRect.top;
+		int sw = GetSystemMetrics(SM_CXFULLSCREEN);
+		int sh = GetSystemMetrics(SM_CYFULLSCREEN);
+		if (fw < 1) {
+			fw = 1;
+		}
+		if (fh < 1) {
+			fh = 1;
+		}
+		if (x + ww - fw > sw) {
+			x -= ww - fw;
+		}
+		else {
+			x -= fw;
+		}
+		if (x < 0) {
+			x = 0;
+		}
+		if (y + wh - fh > sh) {
+			y -= wh - fh;
+		}
+		else {
+			y -= fh;
+		}
+		if (y < 0) {
+			y = 0;
+		}
+		SetWindowPos(m_window, HWND_TOPMOST, x, y, ww, wh,
+							SWP_SHOWWINDOW);
+	}
+}
+
+void
+CMSWindowsClientTaskBarReceiver::runMenu(int x, int y)
+{
+	// do popup menu.  we need a window to pass to TrackPopupMenu().
+	// the SetForegroundWindow() and SendMessage() calls around
+	// TrackPopupMenu() are to get the menu to be dismissed when
+	// another window gets activated and are just one of those
+	// win32 weirdnesses.
+	createWindow();
+	SetForegroundWindow(m_window);
+	HMENU menu = GetSubMenu(m_menu, 0);
+	SetMenuDefaultItem(menu, IDC_TASKBAR_STATUS, FALSE);
+	HMENU logLevelMenu = GetSubMenu(menu, 3);
+	CheckMenuRadioItem(logLevelMenu, 0, 6,
+							CLOG->getFilter() - kERROR, MF_BYPOSITION);
+	int n = TrackPopupMenu(menu,
+							TPM_NONOTIFY |
+							TPM_RETURNCMD |
+							TPM_LEFTBUTTON |
+							TPM_RIGHTBUTTON,
+							x, y, 0, m_window, NULL);
+	SendMessage(m_window, WM_NULL, 0, 0);
+
+	// perform the requested operation
+	switch (n) {
+	case IDC_TASKBAR_STATUS:
+		showStatus();
+		break;
+
+	case IDC_TASKBAR_LOG:
+		copyLog();
+		break;
+
+	case IDC_TASKBAR_SHOW_LOG:
+		ARCH->showConsole(true);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_ERROR:
+		CLOG->setFilter(kERROR);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_WARNING:
+		CLOG->setFilter(kWARNING);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_NOTE:
+		CLOG->setFilter(kNOTE);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_INFO:
+		CLOG->setFilter(kINFO);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG:
+		CLOG->setFilter(kDEBUG);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG1:
+		CLOG->setFilter(kDEBUG1);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG2:
+		CLOG->setFilter(kDEBUG2);
+		break;
+
+	case IDC_TASKBAR_QUIT:
+		quit();
+		break;
+	}
+}
+
+void
+CMSWindowsClientTaskBarReceiver::primaryAction()
+{
+	showStatus();
+}
+
+const IArchTaskBarReceiver::Icon
+CMSWindowsClientTaskBarReceiver::getIcon() const
+{
+	return reinterpret_cast<Icon>(m_icon[getStatus()]);
+}
+
+void
+CMSWindowsClientTaskBarReceiver::copyLog() const
+{
+	if (m_logBuffer != NULL) {
+		// collect log buffer
+		CString data;
+		for (CBufferedLogOutputter::const_iterator index = m_logBuffer->begin();
+								index != m_logBuffer->end(); ++index) {
+			data += *index;
+			data += "\n";
+		}
+
+		// copy log to clipboard
+		if (!data.empty()) {
+			CMSWindowsClipboard clipboard(m_window);
+			clipboard.open(0);
+			clipboard.emptyUnowned();
+			clipboard.add(IClipboard::kText, data);
+			clipboard.close();
+		}
+	}
+}
+
+void
+CMSWindowsClientTaskBarReceiver::onStatusChanged()
+{
+	if (IsWindowVisible(m_window)) {
+		showStatus();
+	}
+}
+
+HICON
+CMSWindowsClientTaskBarReceiver::loadIcon(UINT id)
+{
+	HANDLE icon = LoadImage(m_appInstance,
+							MAKEINTRESOURCE(id),
+							IMAGE_ICON,
+							0, 0,
+							LR_DEFAULTCOLOR);
+	return reinterpret_cast<HICON>(icon);
+}
+
+void
+CMSWindowsClientTaskBarReceiver::deleteIcon(HICON icon)
+{
+	if (icon != NULL) {
+		DestroyIcon(icon);
+	}
+}
+
+void
+CMSWindowsClientTaskBarReceiver::createWindow()
+{
+	// ignore if already created
+	if (m_window != NULL) {
+		return;
+	}
+
+	// get the status dialog
+	m_window = CreateDialogParam(m_appInstance,
+							MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
+							NULL,
+							(DLGPROC)&CMSWindowsClientTaskBarReceiver::staticDlgProc,
+							reinterpret_cast<LPARAM>(
+								reinterpret_cast<void*>(this)));
+
+	// window should appear on top of everything, including (especially)
+	// the task bar.
+	LONG_PTR style = GetWindowLongPtr(m_window, GWL_EXSTYLE);
+	style |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
+	SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
+
+	// tell the task bar about this dialog
+	CArchTaskBarWindows::addDialog(m_window);
+}
+
+void
+CMSWindowsClientTaskBarReceiver::destroyWindow()
+{
+	if (m_window != NULL) {
+		CArchTaskBarWindows::removeDialog(m_window);
+		DestroyWindow(m_window);
+		m_window = NULL;
+	}
+}
+
+BOOL
+CMSWindowsClientTaskBarReceiver::dlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM)
+{
+	switch (msg) {
+	case WM_INITDIALOG:
+		// use default focus
+		return TRUE;
+
+	case WM_ACTIVATE:
+		// hide when another window is activated
+		if (LOWORD(wParam) == WA_INACTIVE) {
+			ShowWindow(hwnd, SW_HIDE);
+		}
+		break;
+	}
+	return FALSE;
+}
+
+BOOL CALLBACK
+CMSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	// if msg is WM_INITDIALOG, extract the CMSWindowsClientTaskBarReceiver*
+	// and put it in the extra window data then forward the call.
+	CMSWindowsClientTaskBarReceiver* self = NULL;
+	if (msg == WM_INITDIALOG) {
+		self = reinterpret_cast<CMSWindowsClientTaskBarReceiver*>(
+							reinterpret_cast<void*>(lParam));
+		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR) lParam);
+	}
+	else {
+		// get the extra window data and forward the call
+		LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+		if (data != 0) {
+			self = (CMSWindowsClientTaskBarReceiver*) data;
+		}
+	}
+
+	// forward the message
+	if (self != NULL) {
+		return self->dlgProc(hwnd, msg, wParam, lParam);
+	}
+	else {
+		return (msg == WM_INITDIALOG) ? TRUE : FALSE;
+	}
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	CArchMiscWindows::setIcons(
+		(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
+		MAKEINTRESOURCE(IDI_SYNERGY),
+		IMAGE_ICON,
+		32, 32, LR_SHARED),
+		(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
+		MAKEINTRESOURCE(IDI_SYNERGY),
+		IMAGE_ICON,
+		16, 16, LR_SHARED));
+
+	return new CMSWindowsClientTaskBarReceiver(
+		CMSWindowsScreen::getWindowInstance(), logBuffer);
+}

src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h

@@ -0,0 +1,68 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CMSWINDOWSCLIENTTASKBARRECEIVER_H
+#define CMSWINDOWSCLIENTTASKBARRECEIVER_H
+
+#define WIN32_LEAN_AND_MEAN
+
+#include "CClientTaskBarReceiver.h"
+#include <windows.h>
+
+class CBufferedLogOutputter;
+
+//! Implementation of CClientTaskBarReceiver for Microsoft Windows
+class CMSWindowsClientTaskBarReceiver : public CClientTaskBarReceiver {
+public:
+	CMSWindowsClientTaskBarReceiver(HINSTANCE, const CBufferedLogOutputter*);
+	virtual ~CMSWindowsClientTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+	void cleanup();
+
+protected:
+	void				copyLog() const;
+
+	// CClientTaskBarReceiver overrides
+	virtual void		onStatusChanged();
+
+private:
+	HICON				loadIcon(UINT);
+	void				deleteIcon(HICON);
+	void				createWindow();
+	void				destroyWindow();
+
+	BOOL				dlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam);
+	static BOOL CALLBACK
+						staticDlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam);
+
+private:
+	HINSTANCE			m_appInstance;
+	HWND				m_window;
+	HMENU				m_menu;
+	HICON				m_icon[kMaxState];
+	const CBufferedLogOutputter*	m_logBuffer;
+	static const UINT	s_stateToIconID[];
+};
+
+#endif

src/cmd/synergyc/CMakeLists.txt

@@ -0,0 +1,70 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(src
+	synergyc.cpp
+)
+
+if (WIN32)
+	list(APPEND src
+		CMSWindowsClientTaskBarReceiver.cpp
+		CMSWindowsClientTaskBarReceiver.h
+		resource.h
+		synergyc.ico
+		synergyc.rc
+		tb_error.ico
+		tb_idle.ico
+		tb_run.ico
+		tb_wait.ico
+	)
+elseif (APPLE)
+	list(APPEND src COSXClientTaskBarReceiver.cpp)
+elseif (UNIX)
+	list(APPEND src CXWindowsClientTaskBarReceiver.cpp)	
+endif()
+
+set(inc
+	../../lib/arch
+	../../lib/base
+	../../lib/client
+	../../lib/common
+	../../lib/io
+	../../lib/mt
+	../../lib/net
+	../../lib/platform
+	../../lib/synergy
+)
+
+if (UNIX)
+	list(APPEND inc
+		../../..
+	)
+endif()
+
+if (VNC_SUPPORT)
+	list(APPEND libs vnc_server vnc_client)
+endif()
+
+include_directories(${inc})
+add_executable(synergyc ${src})
+target_link_libraries(synergyc
+	arch base client common io mt net platform server synergy ${libs})
+
+if (CONF_CPACK)
+	install(TARGETS
+		synergyc
+		COMPONENT core
+		DESTINATION bin)
+endif()

src/cmd/synergyc/COSXClientTaskBarReceiver.cpp

@@ -0,0 +1,66 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "COSXClientTaskBarReceiver.h"
+#include "CArch.h"
+
+//
+// COSXClientTaskBarReceiver
+//
+
+COSXClientTaskBarReceiver::COSXClientTaskBarReceiver(
+				const CBufferedLogOutputter*)
+{
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+COSXClientTaskBarReceiver::~COSXClientTaskBarReceiver()
+{
+	ARCH->removeReceiver(this);
+}
+
+void
+COSXClientTaskBarReceiver::showStatus()
+{
+	// do nothing
+}
+
+void
+COSXClientTaskBarReceiver::runMenu(int, int)
+{
+	// do nothing
+}
+
+void
+COSXClientTaskBarReceiver::primaryAction()
+{
+	// do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+COSXClientTaskBarReceiver::getIcon() const
+{
+	return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	return new COSXClientTaskBarReceiver(logBuffer);
+}
+

src/cmd/synergyc/COSXClientTaskBarReceiver.h

@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COSXCLIENTTASKBARRECEIVER_H
+#define COSXCLIENTTASKBARRECEIVER_H
+
+#include "CClientTaskBarReceiver.h"
+
+class CBufferedLogOutputter;
+
+//! Implementation of CClientTaskBarReceiver for OS X
+class COSXClientTaskBarReceiver : public CClientTaskBarReceiver {
+public:
+	COSXClientTaskBarReceiver(const CBufferedLogOutputter*);
+	virtual ~COSXClientTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+};
+
+#endif

src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp

@@ -0,0 +1,65 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CXWindowsClientTaskBarReceiver.h"
+#include "CArch.h"
+
+//
+// CXWindowsClientTaskBarReceiver
+//
+
+CXWindowsClientTaskBarReceiver::CXWindowsClientTaskBarReceiver(
+				const CBufferedLogOutputter*)
+{
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+CXWindowsClientTaskBarReceiver::~CXWindowsClientTaskBarReceiver()
+{
+	ARCH->removeReceiver(this);
+}
+
+void
+CXWindowsClientTaskBarReceiver::showStatus()
+{
+	// do nothing
+}
+
+void
+CXWindowsClientTaskBarReceiver::runMenu(int, int)
+{
+	// do nothing
+}
+
+void
+CXWindowsClientTaskBarReceiver::primaryAction()
+{
+	// do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+CXWindowsClientTaskBarReceiver::getIcon() const
+{
+	return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	return new CXWindowsClientTaskBarReceiver(logBuffer);
+}

src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h

@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CXWINDOWSCLIENTTASKBARRECEIVER_H
+#define CXWINDOWSCLIENTTASKBARRECEIVER_H
+
+#include "CClientTaskBarReceiver.h"
+
+class CBufferedLogOutputter;
+
+//! Implementation of CClientTaskBarReceiver for X Windows
+class CXWindowsClientTaskBarReceiver : public CClientTaskBarReceiver {
+public:
+	CXWindowsClientTaskBarReceiver(const CBufferedLogOutputter*);
+	virtual ~CXWindowsClientTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+};
+
+#endif

src/cmd/synergyc/resource.h

@@ -0,0 +1,37 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by synergyc.rc
+//
+#define IDS_FAILED                      1
+#define IDS_INIT_FAILED                 2
+#define IDS_UNCAUGHT_EXCEPTION          3
+#define IDI_SYNERGY                     101
+#define IDI_TASKBAR_NOT_RUNNING         102
+#define IDI_TASKBAR_NOT_WORKING         103
+#define IDI_TASKBAR_NOT_CONNECTED       104
+#define IDI_TASKBAR_CONNECTED           105
+#define IDR_TASKBAR                     107
+#define IDD_TASKBAR_STATUS              108
+#define IDC_TASKBAR_STATUS_STATUS       1000
+#define IDC_TASKBAR_QUIT                40001
+#define IDC_TASKBAR_STATUS              40002
+#define IDC_TASKBAR_LOG                 40003
+#define IDC_TASKBAR_SHOW_LOG            40004
+#define IDC_TASKBAR_LOG_LEVEL_ERROR     40009
+#define IDC_TASKBAR_LOG_LEVEL_WARNING   40010
+#define IDC_TASKBAR_LOG_LEVEL_NOTE      40011
+#define IDC_TASKBAR_LOG_LEVEL_INFO      40012
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG     40013
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG1    40014
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG2    40015
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40016
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

src/cmd/synergyc/synergyc.cpp

@@ -0,0 +1,35 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CClientApp.h"
+
+#if WINAPI_MSWINDOWS
+#include "CMSWindowsClientTaskBarReceiver.h"
+#elif WINAPI_XWINDOWS
+#include "CXWindowsClientTaskBarReceiver.h"
+#elif WINAPI_CARBON
+#include "COSXClientTaskBarReceiver.h"
+#else
+#error Platform not supported.
+#endif
+
+int
+main(int argc, char** argv) 
+{
+	CClientApp app(createTaskBarReceiver);
+	return app.run(argc, argv);
+}

src/cmd/synergyc/synergyc.rc

@@ -0,0 +1,141 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#if !defined(IDC_STATIC)
+#define IDC_STATIC (-1)
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include <winresrc.h>\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SYNERGY             ICON    DISCARDABLE     "synergyc.ico"
+IDI_TASKBAR_NOT_RUNNING ICON    DISCARDABLE     "tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON    DISCARDABLE     "tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON    DISCARDABLE     "tb_wait.ico"
+IDI_TASKBAR_CONNECTED   ICON    DISCARDABLE     "tb_run.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_TASKBAR_STATUS DIALOG DISCARDABLE  0, 0, 145, 18
+STYLE DS_MODALFRAME | WS_POPUP
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_TASKBAR MENU DISCARDABLE 
+BEGIN
+    POPUP "Synergy"
+    BEGIN
+        MENUITEM "Show Status",                 IDC_TASKBAR_STATUS
+        MENUITEM "Show Log",                    IDC_TASKBAR_SHOW_LOG
+        MENUITEM "Copy Log To Clipboard",       IDC_TASKBAR_LOG
+        POPUP "Set Log Level"
+        BEGIN
+            MENUITEM "Error",                       IDC_TASKBAR_LOG_LEVEL_ERROR
+
+            MENUITEM "Warning",                     IDC_TASKBAR_LOG_LEVEL_WARNING
+
+            MENUITEM "Note",                        IDC_TASKBAR_LOG_LEVEL_NOTE
+
+            MENUITEM "Info",                        IDC_TASKBAR_LOG_LEVEL_INFO
+
+            MENUITEM "Debug",                       IDC_TASKBAR_LOG_LEVEL_DEBUG
+
+            MENUITEM "Debug1",                      IDC_TASKBAR_LOG_LEVEL_DEBUG1
+
+            MENUITEM "Debug2",                      IDC_TASKBAR_LOG_LEVEL_DEBUG2
+
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Quit",                        IDC_TASKBAR_QUIT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_FAILED              "Synergy is about to quit with errors or warnings.  Please check the log then click OK."
+    IDS_INIT_FAILED         "Synergy failed to initialize: %{1}"
+    IDS_UNCAUGHT_EXCEPTION  "Uncaught exception: %{1}"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

src/cmd/synergyd/CMakeLists.txt

@@ -0,0 +1,57 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Nick Bolton
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(src
+	synergyd.cpp
+)
+
+set(inc
+	../../lib/arch
+	../../lib/base
+	../../lib/common
+	../../lib/io
+	../../lib/mt
+	../../lib/net
+	../../lib/platform
+	../../lib/synergy
+)
+
+if (UNIX)
+	list(APPEND inc
+		../../..
+	)
+endif()
+
+include_directories(${inc})
+
+if (WIN32)
+  add_executable(synergyd WIN32 ${src})
+else()
+  add_executable(synergyd ${src})
+endif()
+
+if (VNC_SUPPORT)
+	list(APPEND libs vnc_server vnc_client)
+endif()
+
+target_link_libraries(synergyd
+	arch base common io mt net platform synergy ${libs})
+
+if (CONF_CPACK)
+	install(TARGETS
+		synergyd
+		COMPONENT core
+		DESTINATION bin)
+endif()

src/cmd/synergyd/synergyd.cpp

@@ -0,0 +1,42 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Nick Bolton
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CDaemonApp.h"
+#include <iostream>
+
+#ifdef SYSAPI_UNIX
+
+int
+main(int argc, char** argv)
+{
+	CDaemonApp app;
+	return app.run(argc, argv);
+}
+
+#elif SYSAPI_WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+int WINAPI
+WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+	CDaemonApp app;
+	return app.run(__argc, __argv);
+}
+
+#endif

src/cmd/synergys/.gitignore

@@ -0,0 +1 @@
+/*.aps

src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp

@@ -0,0 +1,404 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CMSWindowsServerTaskBarReceiver.h"
+#include "CServer.h"
+#include "CMSWindowsClipboard.h"
+#include "IEventQueue.h"
+#include "LogOutputters.h"
+#include "BasicTypes.h"
+#include "CArch.h"
+#include "CArchTaskBarWindows.h"
+#include "resource.h"
+#include "CArchMiscWindows.h"
+#include "CMSWindowsScreen.h"
+
+//
+// CMSWindowsServerTaskBarReceiver
+//
+
+const UINT CMSWindowsServerTaskBarReceiver::s_stateToIconID[kMaxState] =
+{
+	IDI_TASKBAR_NOT_RUNNING,
+	IDI_TASKBAR_NOT_WORKING,
+	IDI_TASKBAR_NOT_CONNECTED,
+	IDI_TASKBAR_CONNECTED
+};
+
+CMSWindowsServerTaskBarReceiver::CMSWindowsServerTaskBarReceiver(
+				HINSTANCE appInstance, const CBufferedLogOutputter* logBuffer) :
+	CServerTaskBarReceiver(),
+	m_appInstance(appInstance),
+	m_window(NULL),
+	m_logBuffer(logBuffer)
+{
+	for (UInt32 i = 0; i < kMaxState; ++i) {
+		m_icon[i] = loadIcon(s_stateToIconID[i]);
+	}
+	m_menu = LoadMenu(m_appInstance, MAKEINTRESOURCE(IDR_TASKBAR));
+
+	// don't create the window yet.  we'll create it on demand.  this
+	// has the side benefit of being created in the thread used for
+	// the task bar.  that's good because it means the existence of
+	// the window won't prevent changing the main thread's desktop.
+
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+void
+CMSWindowsServerTaskBarReceiver::cleanup()
+{
+	ARCH->removeReceiver(this);
+	for (UInt32 i = 0; i < kMaxState; ++i) {
+		deleteIcon(m_icon[i]);
+	}
+	DestroyMenu(m_menu);
+	destroyWindow();
+}
+
+CMSWindowsServerTaskBarReceiver::~CMSWindowsServerTaskBarReceiver()
+{
+	cleanup();
+}
+
+void
+CMSWindowsServerTaskBarReceiver::showStatus()
+{
+	// create the window
+	createWindow();
+
+	// lock self while getting status
+	lock();
+
+	// get the current status
+	std::string status = getToolTip();
+
+	// get the connect clients, if any
+	const CClients& clients = getClients();
+
+	// done getting status
+	unlock();
+
+	// update dialog
+	HWND child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_STATUS);
+	SendMessage(child, WM_SETTEXT, 0, (LPARAM)status.c_str());
+	child = GetDlgItem(m_window, IDC_TASKBAR_STATUS_CLIENTS);
+	SendMessage(child, LB_RESETCONTENT, 0, 0);
+	for (CClients::const_iterator index = clients.begin();
+							index != clients.end(); ) {
+		const char* client = index->c_str();
+		if (++index == clients.end()) {
+			SendMessage(child, LB_ADDSTRING, 0, (LPARAM)client);
+		}
+		else {
+			SendMessage(child, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)client);
+		}
+	}
+
+	if (!IsWindowVisible(m_window)) {
+		// position it by the mouse
+		POINT cursorPos;
+		GetCursorPos(&cursorPos);
+		RECT windowRect;
+		GetWindowRect(m_window, &windowRect);
+		int  x = cursorPos.x;
+		int  y = cursorPos.y;
+		int fw = GetSystemMetrics(SM_CXDLGFRAME);
+		int fh = GetSystemMetrics(SM_CYDLGFRAME);
+		int ww = windowRect.right  - windowRect.left;
+		int wh = windowRect.bottom - windowRect.top;
+		int sw = GetSystemMetrics(SM_CXFULLSCREEN);
+		int sh = GetSystemMetrics(SM_CYFULLSCREEN);
+		if (fw < 1) {
+			fw = 1;
+		}
+		if (fh < 1) {
+			fh = 1;
+		}
+		if (x + ww - fw > sw) {
+			x -= ww - fw;
+		}
+		else {
+			x -= fw;
+		}
+		if (x < 0) {
+			x = 0;
+		}
+		if (y + wh - fh > sh) {
+			y -= wh - fh;
+		}
+		else {
+			y -= fh;
+		}
+		if (y < 0) {
+			y = 0;
+		}
+		SetWindowPos(m_window, HWND_TOPMOST, x, y, ww, wh,
+							SWP_SHOWWINDOW);
+	}
+}
+
+void
+CMSWindowsServerTaskBarReceiver::runMenu(int x, int y)
+{
+	// do popup menu.  we need a window to pass to TrackPopupMenu().
+	// the SetForegroundWindow() and SendMessage() calls around
+	// TrackPopupMenu() are to get the menu to be dismissed when
+	// another window gets activated and are just one of those
+	// win32 weirdnesses.
+	createWindow();
+	SetForegroundWindow(m_window);
+	HMENU menu = GetSubMenu(m_menu, 0);
+	SetMenuDefaultItem(menu, IDC_TASKBAR_STATUS, FALSE);
+	HMENU logLevelMenu = GetSubMenu(menu, 3);
+	CheckMenuRadioItem(logLevelMenu, 0, 6,
+							CLOG->getFilter() - kERROR, MF_BYPOSITION);
+	int n = TrackPopupMenu(menu,
+							TPM_NONOTIFY |
+							TPM_RETURNCMD |
+							TPM_LEFTBUTTON |
+							TPM_RIGHTBUTTON,
+							x, y, 0, m_window, NULL);
+	SendMessage(m_window, WM_NULL, 0, 0);
+
+	// perform the requested operation
+	switch (n) {
+	case IDC_TASKBAR_STATUS:
+		showStatus();
+		break;
+
+	case IDC_TASKBAR_LOG:
+		copyLog();
+		break;
+
+	case IDC_TASKBAR_SHOW_LOG:
+		ARCH->showConsole(true);
+		break;
+
+	case IDC_RELOAD_CONFIG:
+		EVENTQUEUE->addEvent(CEvent(getReloadConfigEvent(),
+							IEventQueue::getSystemTarget()));
+		break;
+
+	case IDC_FORCE_RECONNECT:
+		EVENTQUEUE->addEvent(CEvent(getForceReconnectEvent(),
+							IEventQueue::getSystemTarget()));
+		break;
+
+	case ID_SYNERGY_RESETSERVER:
+		EVENTQUEUE->addEvent(CEvent(getResetServerEvent(),
+							IEventQueue::getSystemTarget()));
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_ERROR:
+		CLOG->setFilter(kERROR);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_WARNING:
+		CLOG->setFilter(kWARNING);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_NOTE:
+		CLOG->setFilter(kNOTE);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_INFO:
+		CLOG->setFilter(kINFO);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG:
+		CLOG->setFilter(kDEBUG);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG1:
+		CLOG->setFilter(kDEBUG1);
+		break;
+
+	case IDC_TASKBAR_LOG_LEVEL_DEBUG2:
+		CLOG->setFilter(kDEBUG2);
+		break;
+
+	case IDC_TASKBAR_QUIT:
+		quit();
+		break;
+	}
+}
+
+void
+CMSWindowsServerTaskBarReceiver::primaryAction()
+{
+	showStatus();
+}
+
+const IArchTaskBarReceiver::Icon
+CMSWindowsServerTaskBarReceiver::getIcon() const
+{
+	return reinterpret_cast<Icon>(m_icon[getStatus()]);
+}
+
+void
+CMSWindowsServerTaskBarReceiver::copyLog() const
+{
+	if (m_logBuffer != NULL) {
+		// collect log buffer
+		CString data;
+		for (CBufferedLogOutputter::const_iterator index = m_logBuffer->begin();
+								index != m_logBuffer->end(); ++index) {
+			data += *index;
+			data += "\n";
+		}
+
+		// copy log to clipboard
+		if (!data.empty()) {
+			CMSWindowsClipboard clipboard(m_window);
+			clipboard.open(0);
+			clipboard.emptyUnowned();
+			clipboard.add(IClipboard::kText, data);
+			clipboard.close();
+		}
+	}
+}
+
+void
+CMSWindowsServerTaskBarReceiver::onStatusChanged()
+{
+	if (IsWindowVisible(m_window)) {
+		showStatus();
+	}
+}
+
+HICON
+CMSWindowsServerTaskBarReceiver::loadIcon(UINT id)
+{
+	HANDLE icon = LoadImage(m_appInstance,
+							MAKEINTRESOURCE(id),
+							IMAGE_ICON,
+							0, 0,
+							LR_DEFAULTCOLOR);
+	return reinterpret_cast<HICON>(icon);
+}
+
+void
+CMSWindowsServerTaskBarReceiver::deleteIcon(HICON icon)
+{
+	if (icon != NULL) {
+		DestroyIcon(icon);
+	}
+}
+
+void
+CMSWindowsServerTaskBarReceiver::createWindow()
+{
+	// ignore if already created
+	if (m_window != NULL) {
+		return;
+	}
+
+	// get the status dialog
+	m_window = CreateDialogParam(m_appInstance,
+							MAKEINTRESOURCE(IDD_TASKBAR_STATUS),
+							NULL,
+							(DLGPROC)&CMSWindowsServerTaskBarReceiver::staticDlgProc,
+							reinterpret_cast<LPARAM>(
+								reinterpret_cast<void*>(this)));
+
+	// window should appear on top of everything, including (especially)
+	// the task bar.
+	LONG_PTR style = GetWindowLongPtr(m_window, GWL_EXSTYLE);
+	style |= WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
+	SetWindowLongPtr(m_window, GWL_EXSTYLE, style);
+
+	// tell the task bar about this dialog
+	CArchTaskBarWindows::addDialog(m_window);
+}
+
+void
+CMSWindowsServerTaskBarReceiver::destroyWindow()
+{
+	if (m_window != NULL) {
+		CArchTaskBarWindows::removeDialog(m_window);
+		DestroyWindow(m_window);
+		m_window = NULL;
+	}
+}
+
+BOOL
+CMSWindowsServerTaskBarReceiver::dlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM)
+{
+	switch (msg) {
+	case WM_INITDIALOG:
+		// use default focus
+		return TRUE;
+
+	case WM_ACTIVATE:
+		// hide when another window is activated
+		if (LOWORD(wParam) == WA_INACTIVE) {
+			ShowWindow(hwnd, SW_HIDE);
+		}
+		break;
+	}
+	return FALSE;
+}
+
+BOOL CALLBACK
+CMSWindowsServerTaskBarReceiver::staticDlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	// if msg is WM_INITDIALOG, extract the CMSWindowsServerTaskBarReceiver*
+	// and put it in the extra window data then forward the call.
+	CMSWindowsServerTaskBarReceiver* self = NULL;
+	if (msg == WM_INITDIALOG) {
+		self = reinterpret_cast<CMSWindowsServerTaskBarReceiver*>(
+							reinterpret_cast<void*>(lParam));
+		SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
+	}
+	else {
+		// get the extra window data and forward the call
+		LONG data = (LONG)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+		if (data != 0) {
+			self = reinterpret_cast<CMSWindowsServerTaskBarReceiver*>(
+							reinterpret_cast<void*>(data));
+		}
+	}
+
+	// forward the message
+	if (self != NULL) {
+		return self->dlgProc(hwnd, msg, wParam, lParam);
+	}
+	else {
+		return (msg == WM_INITDIALOG) ? TRUE : FALSE;
+	}
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	CArchMiscWindows::setIcons(
+		(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
+		MAKEINTRESOURCE(IDI_SYNERGY),
+		IMAGE_ICON,
+		32, 32, LR_SHARED),
+		(HICON)LoadImage(CArchMiscWindows::instanceWin32(),
+		MAKEINTRESOURCE(IDI_SYNERGY),
+		IMAGE_ICON,
+		16, 16, LR_SHARED));
+
+	return new CMSWindowsServerTaskBarReceiver(
+		CMSWindowsScreen::getWindowInstance(), logBuffer);
+}

src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h

@@ -0,0 +1,68 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CMSWINDOWSSERVERTASKBARRECEIVER_H
+#define CMSWINDOWSSERVERTASKBARRECEIVER_H
+
+#define WIN32_LEAN_AND_MEAN
+
+#include "CServerTaskBarReceiver.h"
+#include <windows.h>
+
+class CBufferedLogOutputter;
+
+//! Implementation of CServerTaskBarReceiver for Microsoft Windows
+class CMSWindowsServerTaskBarReceiver : public CServerTaskBarReceiver {
+public:
+	CMSWindowsServerTaskBarReceiver(HINSTANCE, const CBufferedLogOutputter*);
+	virtual ~CMSWindowsServerTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+	void cleanup();
+
+protected:
+	void				copyLog() const;
+
+	// CServerTaskBarReceiver overrides
+	virtual void		onStatusChanged();
+
+private:
+	HICON				loadIcon(UINT);
+	void				deleteIcon(HICON);
+	void				createWindow();
+	void				destroyWindow();
+
+	BOOL				dlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam);
+	static BOOL CALLBACK
+						staticDlgProc(HWND hwnd,
+							UINT msg, WPARAM wParam, LPARAM lParam);
+
+private:
+	HINSTANCE			m_appInstance;
+	HWND				m_window;
+	HMENU				m_menu;
+	HICON				m_icon[kMaxState];
+	const CBufferedLogOutputter*	m_logBuffer;
+	static const UINT	s_stateToIconID[];
+};
+
+#endif

src/cmd/synergys/CMakeLists.txt

@@ -0,0 +1,70 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(src
+	synergys.cpp
+)
+
+if (WIN32)
+	list(APPEND src
+		CMSWindowsServerTaskBarReceiver.cpp
+		CMSWindowsServerTaskBarReceiver.h
+		resource.h
+		synergys.ico
+		synergys.rc
+		tb_error.ico
+		tb_idle.ico
+		tb_run.ico
+		tb_wait.ico
+	)
+elseif (APPLE)
+	list(APPEND src COSXServerTaskBarReceiver.cpp)	
+elseif (UNIX)
+	list(APPEND src CXWindowsServerTaskBarReceiver.cpp)
+endif()
+
+set(inc
+	../../lib/arch
+	../../lib/base
+	../../lib/common
+	../../lib/io
+	../../lib/mt
+	../../lib/net
+	../../lib/platform
+	../../lib/synergy
+	../../lib/server
+)
+
+if (UNIX)
+	list(APPEND inc
+		../../..
+	)
+endif()
+
+if (VNC_SUPPORT)
+	list(APPEND libs vnc_server vnc_client)
+endif()
+
+include_directories(${inc})
+add_executable(synergys ${src})
+target_link_libraries(synergys
+	arch base client common io mt net platform server synergy ${libs})
+
+if (CONF_CPACK)
+	install(TARGETS
+		synergys
+		COMPONENT core
+		DESTINATION bin)
+endif()

src/cmd/synergys/COSXServerTaskBarReceiver.cpp

@@ -0,0 +1,65 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "COSXServerTaskBarReceiver.h"
+#include "CArch.h"
+
+//
+// COSXServerTaskBarReceiver
+//
+
+COSXServerTaskBarReceiver::COSXServerTaskBarReceiver(
+				const CBufferedLogOutputter*)
+{
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+COSXServerTaskBarReceiver::~COSXServerTaskBarReceiver()
+{
+	ARCH->removeReceiver(this);
+}
+
+void
+COSXServerTaskBarReceiver::showStatus()
+{
+	// do nothing
+}
+
+void
+COSXServerTaskBarReceiver::runMenu(int, int)
+{
+	// do nothing
+}
+
+void
+COSXServerTaskBarReceiver::primaryAction()
+{
+	// do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+COSXServerTaskBarReceiver::getIcon() const
+{
+	return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	return new COSXServerTaskBarReceiver(logBuffer);
+}

src/cmd/synergys/COSXServerTaskBarReceiver.h

@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COSXSERVERTASKBARRECEIVER_H
+#define COSXSERVERTASKBARRECEIVER_H
+
+#include "CServerTaskBarReceiver.h"
+
+class CBufferedLogOutputter;
+
+//! Implementation of CServerTaskBarReceiver for OS X
+class COSXServerTaskBarReceiver : public CServerTaskBarReceiver {
+public:
+	COSXServerTaskBarReceiver(const CBufferedLogOutputter*);
+	virtual ~COSXServerTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+};
+
+#endif

src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp

@@ -0,0 +1,65 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CXWindowsServerTaskBarReceiver.h"
+#include "CArch.h"
+
+//
+// CXWindowsServerTaskBarReceiver
+//
+
+CXWindowsServerTaskBarReceiver::CXWindowsServerTaskBarReceiver(
+				const CBufferedLogOutputter*)
+{
+	// add ourself to the task bar
+	ARCH->addReceiver(this);
+}
+
+CXWindowsServerTaskBarReceiver::~CXWindowsServerTaskBarReceiver()
+{
+	ARCH->removeReceiver(this);
+}
+
+void
+CXWindowsServerTaskBarReceiver::showStatus()
+{
+	// do nothing
+}
+
+void
+CXWindowsServerTaskBarReceiver::runMenu(int, int)
+{
+	// do nothing
+}
+
+void
+CXWindowsServerTaskBarReceiver::primaryAction()
+{
+	// do nothing
+}
+
+const IArchTaskBarReceiver::Icon
+CXWindowsServerTaskBarReceiver::getIcon() const
+{
+	return NULL;
+}
+
+IArchTaskBarReceiver*
+createTaskBarReceiver(const CBufferedLogOutputter* logBuffer)
+{
+	return new CXWindowsServerTaskBarReceiver(logBuffer);
+}

src/cmd/synergys/CXWindowsServerTaskBarReceiver.h

@@ -0,0 +1,38 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CXWINDOWSSERVERTASKBARRECEIVER_H
+#define CXWINDOWSSERVERTASKBARRECEIVER_H
+
+#include "CServerTaskBarReceiver.h"
+
+class CBufferedLogOutputter;
+
+//! Implementation of CServerTaskBarReceiver for X Windows
+class CXWindowsServerTaskBarReceiver : public CServerTaskBarReceiver {
+public:
+	CXWindowsServerTaskBarReceiver(const CBufferedLogOutputter*);
+	virtual ~CXWindowsServerTaskBarReceiver();
+
+	// IArchTaskBarReceiver overrides
+	virtual void		showStatus();
+	virtual void		runMenu(int x, int y);
+	virtual void		primaryAction();
+	virtual const Icon	getIcon() const;
+};
+
+#endif

src/cmd/synergys/resource.h

@@ -0,0 +1,42 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by synergys.rc
+//
+#define IDS_FAILED                      1
+#define IDS_INIT_FAILED                 2
+#define IDS_UNCAUGHT_EXCEPTION          3
+#define IDI_SYNERGY                     101
+#define IDI_TASKBAR_NOT_RUNNING         102
+#define IDI_TASKBAR_NOT_WORKING         103
+#define IDI_TASKBAR_NOT_CONNECTED       104
+#define IDI_TASKBAR_CONNECTED           105
+#define IDR_TASKBAR                     107
+#define IDD_TASKBAR_STATUS              108
+#define IDC_TASKBAR_STATUS_STATUS       1000
+#define IDC_TASKBAR_STATUS_CLIENTS      1001
+#define IDC_TASKBAR_QUIT                40003
+#define IDC_TASKBAR_STATUS              40004
+#define IDC_TASKBAR_LOG                 40005
+#define IDC_RELOAD_CONFIG               40006
+#define IDC_FORCE_RECONNECT             40007
+#define IDC_TASKBAR_SHOW_LOG            40008
+#define IDC_TASKBAR_LOG_LEVEL_ERROR     40009
+#define IDC_TASKBAR_LOG_LEVEL_WARNING   40010
+#define IDC_TASKBAR_LOG_LEVEL_NOTE      40011
+#define IDC_TASKBAR_LOG_LEVEL_INFO      40012
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG     40013
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG1    40014
+#define IDC_TASKBAR_LOG_LEVEL_DEBUG2    40015
+#define ID_SYNERGY_RELOADSYSTEM         40016
+#define ID_SYNERGY_RESETSERVER          40017
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40018
+#define _APS_NEXT_CONTROL_VALUE         1003
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

src/cmd/synergys/synergys.cpp

@@ -0,0 +1,35 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CServerApp.h"
+
+#if WINAPI_MSWINDOWS
+#include "CMSWindowsServerTaskBarReceiver.h"
+#elif WINAPI_XWINDOWS
+#include "CXWindowsServerTaskBarReceiver.h"
+#elif WINAPI_CARBON
+#include "COSXServerTaskBarReceiver.h"
+#else
+#error Platform not supported.
+#endif
+
+int
+main(int argc, char** argv) 
+{
+	CServerApp app(createTaskBarReceiver);
+	return app.run(argc, argv);
+}

src/cmd/synergys/synergys.rc

@@ -0,0 +1,134 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include <winresrc.h>\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SYNERGY             ICON                    "synergys.ico"
+IDI_TASKBAR_NOT_RUNNING ICON                    "tb_idle.ico"
+IDI_TASKBAR_NOT_WORKING ICON                    "tb_error.ico"
+IDI_TASKBAR_NOT_CONNECTED ICON                    "tb_wait.ico"
+IDI_TASKBAR_CONNECTED   ICON                    "tb_run.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_TASKBAR MENU 
+BEGIN
+    POPUP "Synergy"
+    BEGIN
+        MENUITEM "Show Status",                 IDC_TASKBAR_STATUS
+        MENUITEM "Show Log",                    IDC_TASKBAR_SHOW_LOG
+        MENUITEM "Copy Log To Clipboard",       IDC_TASKBAR_LOG
+        POPUP "Set Log Level"
+        BEGIN
+            MENUITEM "Error",                       IDC_TASKBAR_LOG_LEVEL_ERROR
+            MENUITEM "Warning",                     IDC_TASKBAR_LOG_LEVEL_WARNING
+            MENUITEM "Note",                        IDC_TASKBAR_LOG_LEVEL_NOTE
+            MENUITEM "Info",                        IDC_TASKBAR_LOG_LEVEL_INFO
+            MENUITEM "Debug",                       IDC_TASKBAR_LOG_LEVEL_DEBUG
+            MENUITEM "Debug1",                      IDC_TASKBAR_LOG_LEVEL_DEBUG1
+            MENUITEM "Debug2",                      IDC_TASKBAR_LOG_LEVEL_DEBUG2
+        END
+        MENUITEM "Reload Configuration",        IDC_RELOAD_CONFIG
+        MENUITEM "Force Reconnect",             IDC_FORCE_RECONNECT
+        MENUITEM "Reset Server",                ID_SYNERGY_RESETSERVER
+        MENUITEM SEPARATOR
+        MENUITEM "Quit",                        IDC_TASKBAR_QUIT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_TASKBAR_STATUS DIALOG  0, 0, 145, 60
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
+FONT 8, "MS Sans Serif"
+BEGIN
+    EDITTEXT        IDC_TASKBAR_STATUS_STATUS,3,3,139,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LISTBOX         IDC_TASKBAR_STATUS_CLIENTS,3,17,139,40,NOT LBS_NOTIFY | LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | WS_TABSTOP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_FAILED              "Synergy is about to quit with errors or warnings.  Please check the log then click OK."
+    IDS_INIT_FAILED         "Synergy failed to initialize: %{1}"
+    IDS_UNCAUGHT_EXCEPTION  "Uncaught exception: %{1}"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+