rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6151 Remove tray from core, add core deprecated warning

This commit is contained in:
Nick Bolton 2017-09-14 13:28:01 +01:00
parent c66729e187
commit ce02171eab
101 changed files with 154 additions and 1573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/synergyc/CMakeLists.txt
View File

@ -19,8 +19,6 @@ set(sources
) )
if (WIN32) if (WIN32)
file(GLOB arch_headers "MSWindows*.h")
file(GLOB arch_sources "MSWindows*.cpp")
list(APPEND sources list(APPEND sources
resource.h resource.h
synergyc.ico synergyc.ico
@ -30,12 +28,6 @@ if (WIN32)
tb_run.ico tb_run.ico
tb_wait.ico tb_wait.ico
) )
elseif (APPLE)
file(GLOB arch_headers "OSX*.h")
file(GLOB arch_sources "OSX*.cpp")
elseif (UNIX)
file(GLOB arch_headers "XWindows*.h")
file(GLOB arch_sources "XWindows*.cpp")
endif() endif()
list(APPEND sources ${arch_sources}) list(APPEND sources ${arch_sources})
@ -47,4 +39,4 @@ endif()
add_executable(synergyc ${sources}) add_executable(synergyc ${sources})
target_link_libraries(synergyc target_link_libraries(synergyc
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS})

376
src/cmd/synergyc/MSWindowsClientTaskBarReceiver.cpp
View File

@ -1,376 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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 "MSWindowsClientTaskBarReceiver.h"
#include "resource.h"
#include "client/Client.h"
#include "platform/MSWindowsClipboard.h"
#include "platform/MSWindowsScreen.h"
#include "arch/win32/ArchTaskBarWindows.h"
#include "arch/win32/ArchMiscWindows.h"
#include "arch/Arch.h"
#include "base/EventQueue.h"
#include "base/log_outputters.h"
#include "base/EventTypes.h"
//
// MSWindowsClientTaskBarReceiver
//
const UINT MSWindowsClientTaskBarReceiver::s_stateToIconID[kMaxState] =
{
IDI_TASKBAR_NOT_RUNNING,
IDI_TASKBAR_NOT_WORKING,
IDI_TASKBAR_NOT_CONNECTED,
IDI_TASKBAR_NOT_CONNECTED,
IDI_TASKBAR_CONNECTED
};
MSWindowsClientTaskBarReceiver::MSWindowsClientTaskBarReceiver(
HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
ClientTaskBarReceiver(events),
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);
}
MSWindowsClientTaskBarReceiver::~MSWindowsClientTaskBarReceiver()
{
cleanup();
}
void
MSWindowsClientTaskBarReceiver::cleanup()
{
ARCH->removeReceiver(this);
for (UInt32 i = 0; i < kMaxState; ++i) {
deleteIcon(m_icon[i]);
}
DestroyMenu(m_menu);
destroyWindow();
}
void
MSWindowsClientTaskBarReceiver::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
MSWindowsClientTaskBarReceiver::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
MSWindowsClientTaskBarReceiver::primaryAction()
{
showStatus();
}
const IArchTaskBarReceiver::Icon
MSWindowsClientTaskBarReceiver::getIcon() const
{
return static_cast<Icon>(m_icon[getStatus()]);
}
void
MSWindowsClientTaskBarReceiver::copyLog() const
{
if (m_logBuffer != NULL) {
// collect log buffer
String data;
for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
index != m_logBuffer->end(); ++index) {
data += *index;
data += "\n";
}
// copy log to clipboard
if (!data.empty()) {
MSWindowsClipboard clipboard(m_window);
clipboard.open(0);
clipboard.emptyUnowned();
clipboard.add(IClipboard::kText, data);
clipboard.close();
}
}
}
void
MSWindowsClientTaskBarReceiver::onStatusChanged()
{
if (IsWindowVisible(m_window)) {
showStatus();
}
}
HICON
MSWindowsClientTaskBarReceiver::loadIcon(UINT id)
{
HANDLE icon = LoadImage(m_appInstance,
MAKEINTRESOURCE(id),
IMAGE_ICON,
0, 0,
LR_DEFAULTCOLOR);
return static_cast<HICON>(icon);
}
void
MSWindowsClientTaskBarReceiver::deleteIcon(HICON icon)
{
if (icon != NULL) {
DestroyIcon(icon);
}
}
void
MSWindowsClientTaskBarReceiver::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)&MSWindowsClientTaskBarReceiver::staticDlgProc,
reinterpret_cast<LPARAM>(
static_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
ArchTaskBarWindows::addDialog(m_window);
}
void
MSWindowsClientTaskBarReceiver::destroyWindow()
{
if (m_window != NULL) {
ArchTaskBarWindows::removeDialog(m_window);
DestroyWindow(m_window);
m_window = NULL;
}
}
BOOL
MSWindowsClientTaskBarReceiver::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
MSWindowsClientTaskBarReceiver::staticDlgProc(HWND hwnd,
UINT msg, WPARAM wParam, LPARAM lParam)
{
// if msg is WM_INITDIALOG, extract the MSWindowsClientTaskBarReceiver*
// and put it in the extra window data then forward the call.
MSWindowsClientTaskBarReceiver* self = NULL;
if (msg == WM_INITDIALOG) {
self = static_cast<MSWindowsClientTaskBarReceiver*>(
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 = (MSWindowsClientTaskBarReceiver*) data;
}
}
// forward the message
if (self != NULL) {
return self->dlgProc(hwnd, msg, wParam, lParam);
}
else {
return (msg == WM_INITDIALOG) ? TRUE : FALSE;
}
}
IArchTaskBarReceiver*
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
ArchMiscWindows::setIcons(
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
32, 32, LR_SHARED),
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
16, 16, LR_SHARED));
return new MSWindowsClientTaskBarReceiver(
MSWindowsScreen::getWindowInstance(), logBuffer, events);
}

68
src/cmd/synergyc/MSWindowsClientTaskBarReceiver.h
View File

@ -1,68 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ClientTaskBarReceiver.h"
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of ClientTaskBarReceiver for Microsoft Windows
class MSWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
MSWindowsClientTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
virtual ~MSWindowsClientTaskBarReceiver();
// 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;
// ClientTaskBarReceiver 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 BufferedLogOutputter* m_logBuffer;
static const UINT s_stateToIconID[];
};

69
src/cmd/synergyc/OSXClientTaskBarReceiver.cpp
View File

@ -1,69 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2004 Chris Schoeneman
*
* 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 LICENSE 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 "OSXClientTaskBarReceiver.h"
#include "arch/Arch.h"
//
// OSXClientTaskBarReceiver
//
OSXClientTaskBarReceiver::OSXClientTaskBarReceiver(
const BufferedLogOutputter*,
IEventQueue* events) :
ClientTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
}
OSXClientTaskBarReceiver::~OSXClientTaskBarReceiver()
{
ARCH->removeReceiver(this);
}
void
OSXClientTaskBarReceiver::showStatus()
{
// do nothing
}
void
OSXClientTaskBarReceiver::runMenu(int, int)
{
// do nothing
}
void
OSXClientTaskBarReceiver::primaryAction()
{
// do nothing
}
const IArchTaskBarReceiver::Icon
OSXClientTaskBarReceiver::getIcon() const
{
return NULL;
}
IArchTaskBarReceiver*
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new OSXClientTaskBarReceiver(logBuffer, events);
}

37
src/cmd/synergyc/OSXClientTaskBarReceiver.h
View File

@ -1,37 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2004 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ClientTaskBarReceiver.h"
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of ClientTaskBarReceiver for OS X
class OSXClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
OSXClientTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
virtual ~OSXClientTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();
virtual void runMenu(int x, int y);
virtual void primaryAction();
virtual const Icon getIcon() const;
};

68
src/cmd/synergyc/XWindowsClientTaskBarReceiver.cpp
View File

@ -1,68 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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 "XWindowsClientTaskBarReceiver.h"
#include "arch/Arch.h"
//
// CXWindowsClientTaskBarReceiver
//
CXWindowsClientTaskBarReceiver::CXWindowsClientTaskBarReceiver(
const BufferedLogOutputter*,
IEventQueue* events) :
ClientTaskBarReceiver(events)
{
// 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 BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new CXWindowsClientTaskBarReceiver(logBuffer, events);
}

38
src/cmd/synergyc/XWindowsClientTaskBarReceiver.h
View File

@ -1,38 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ClientTaskBarReceiver.h"
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of ClientTaskBarReceiver for X Windows
class CXWindowsClientTaskBarReceiver : public ClientTaskBarReceiver {
public:
CXWindowsClientTaskBarReceiver(
const BufferedLogOutputter*, IEventQueue* events);
virtual ~CXWindowsClientTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();
virtual void runMenu(int x, int y);
virtual void primaryAction();
virtual const Icon getIcon() const;
};

16
src/cmd/synergyc/synergyc.cpp
View File

@ -16,24 +16,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClientApp.h" #include "core/ClientApp.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#if WINAPI_MSWINDOWS #include <iostream>
#include "MSWindowsClientTaskBarReceiver.h"
#elif WINAPI_XWINDOWS
#include "XWindowsClientTaskBarReceiver.h"
#elif WINAPI_CARBON
#include "OSXClientTaskBarReceiver.h"
#else
#error Platform not supported.
#endif
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {
std::cerr << "warning: synergyc is deprecated. instead, use: synergy-core --client" << std::endl;
#if SYSAPI_WIN32 #if SYSAPI_WIN32
// record window instance for tray icon, etc // record window instance for tray icon, etc
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL)); ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
@ -45,6 +39,6 @@ main(int argc, char** argv)
Log log; Log log;
EventQueue events; EventQueue events;
ClientApp app(&events, createTaskBarReceiver); ClientApp app(&events);
return app.run(argc, argv); return app.run(argc, argv);
} }

13
src/cmd/synergys/CMakeLists.txt
View File

@ -19,8 +19,6 @@ set(sources
) )
if (WIN32) if (WIN32)
file(GLOB arch_headers "MSWindows*.h")
file(GLOB arch_sources "MSWindows*.cpp")
list(APPEND sources list(APPEND sources
resource.h resource.h
synergys.ico synergys.ico
@ -30,21 +28,12 @@ if (WIN32)
tb_run.ico tb_run.ico
tb_wait.ico tb_wait.ico
) )
elseif (APPLE)
file(GLOB arch_headers "OSX*.h")
file(GLOB arch_sources "OSX*.cpp")
elseif (UNIX)
file(GLOB arch_headers "XWindows*.h")
file(GLOB arch_sources "XWindows*.cpp")
endif() endif()
list(APPEND sources ${arch_sources})
list(APPEND headers ${arch_headers})
if (SYNERGY_ADD_HEADERS) if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers}) list(APPEND sources ${headers})
endif() endif()
add_executable(synergys ${sources}) add_executable(synergys ${sources})
target_link_libraries(synergys target_link_libraries(synergys
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server core ${libs} ${OPENSSL_LIBS})

408
src/cmd/synergys/MSWindowsServerTaskBarReceiver.cpp
View File

@ -1,408 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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 "MSWindowsServerTaskBarReceiver.h"
#include "resource.h"
#include "server/Server.h"
#include "platform/MSWindowsClipboard.h"
#include "platform/MSWindowsScreen.h"
#include "arch/win32/ArchTaskBarWindows.h"
#include "arch/win32/ArchMiscWindows.h"
#include "arch/Arch.h"
#include "base/EventQueue.h"
#include "base/IEventQueue.h"
#include "base/log_outputters.h"
#include "base/EventTypes.h"
//
// MSWindowsServerTaskBarReceiver
//
const UINT MSWindowsServerTaskBarReceiver::s_stateToIconID[kMaxState] =
{
IDI_TASKBAR_NOT_RUNNING,
IDI_TASKBAR_NOT_WORKING,
IDI_TASKBAR_NOT_CONNECTED,
IDI_TASKBAR_CONNECTED
};
MSWindowsServerTaskBarReceiver::MSWindowsServerTaskBarReceiver(
HINSTANCE appInstance, const BufferedLogOutputter* logBuffer, IEventQueue* events) :
ServerTaskBarReceiver(events),
m_events(events),
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
MSWindowsServerTaskBarReceiver::cleanup()
{
ARCH->removeReceiver(this);
for (UInt32 i = 0; i < kMaxState; ++i) {
deleteIcon(m_icon[i]);
}
DestroyMenu(m_menu);
destroyWindow();
}
MSWindowsServerTaskBarReceiver::~MSWindowsServerTaskBarReceiver()
{
cleanup();
}
void
MSWindowsServerTaskBarReceiver::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 Clients& 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 (Clients::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
MSWindowsServerTaskBarReceiver::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:
m_events->addEvent(Event(m_events->forServerApp().reloadConfig(),
m_events->getSystemTarget()));
break;
case IDC_FORCE_RECONNECT:
m_events->addEvent(Event(m_events->forServerApp().forceReconnect(),
m_events->getSystemTarget()));
break;
case ID_SYNERGY_RESETSERVER:
m_events->addEvent(Event(m_events->forServerApp().resetServer(),
m_events->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
MSWindowsServerTaskBarReceiver::primaryAction()
{
showStatus();
}
const IArchTaskBarReceiver::Icon
MSWindowsServerTaskBarReceiver::getIcon() const
{
return static_cast<Icon>(m_icon[getStatus()]);
}
void
MSWindowsServerTaskBarReceiver::copyLog() const
{
if (m_logBuffer != NULL) {
// collect log buffer
String data;
for (BufferedLogOutputter::const_iterator index = m_logBuffer->begin();
index != m_logBuffer->end(); ++index) {
data += *index;
data += "\n";
}
// copy log to clipboard
if (!data.empty()) {
MSWindowsClipboard clipboard(m_window);
clipboard.open(0);
clipboard.emptyUnowned();
clipboard.add(IClipboard::kText, data);
clipboard.close();
}
}
}
void
MSWindowsServerTaskBarReceiver::onStatusChanged()
{
if (IsWindowVisible(m_window)) {
showStatus();
}
}
HICON
MSWindowsServerTaskBarReceiver::loadIcon(UINT id)
{
HANDLE icon = LoadImage(m_appInstance,
MAKEINTRESOURCE(id),
IMAGE_ICON,
0, 0,
LR_DEFAULTCOLOR);
return static_cast<HICON>(icon);
}
void
MSWindowsServerTaskBarReceiver::deleteIcon(HICON icon)
{
if (icon != NULL) {
DestroyIcon(icon);
}
}
void
MSWindowsServerTaskBarReceiver::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)&MSWindowsServerTaskBarReceiver::staticDlgProc,
reinterpret_cast<LPARAM>(
static_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
ArchTaskBarWindows::addDialog(m_window);
}
void
MSWindowsServerTaskBarReceiver::destroyWindow()
{
if (m_window != NULL) {
ArchTaskBarWindows::removeDialog(m_window);
DestroyWindow(m_window);
m_window = NULL;
}
}
BOOL
MSWindowsServerTaskBarReceiver::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
MSWindowsServerTaskBarReceiver::staticDlgProc(HWND hwnd,
UINT msg, WPARAM wParam, LPARAM lParam)
{
// if msg is WM_INITDIALOG, extract the MSWindowsServerTaskBarReceiver*
// and put it in the extra window data then forward the call.
MSWindowsServerTaskBarReceiver* self = NULL;
if (msg == WM_INITDIALOG) {
self = static_cast<MSWindowsServerTaskBarReceiver*>(
reinterpret_cast<void*>(lParam));
SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
}
else {
// get the extra window data and forward the call
LONG_PTR data = GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (data != 0) {
self = static_cast<MSWindowsServerTaskBarReceiver*>(
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 BufferedLogOutputter* logBuffer, IEventQueue* events)
{
ArchMiscWindows::setIcons(
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
32, 32, LR_SHARED),
(HICON)LoadImage(ArchMiscWindows::instanceWin32(),
MAKEINTRESOURCE(IDI_SYNERGY),
IMAGE_ICON,
16, 16, LR_SHARED));
return new MSWindowsServerTaskBarReceiver(
MSWindowsScreen::getWindowInstance(), logBuffer, events);
}

69
src/cmd/synergys/MSWindowsServerTaskBarReceiver.h
View File

@ -1,69 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ServerTaskBarReceiver.h"
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of ServerTaskBarReceiver for Microsoft Windows
class MSWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
MSWindowsServerTaskBarReceiver(HINSTANCE, const BufferedLogOutputter*, IEventQueue* events);
virtual ~MSWindowsServerTaskBarReceiver();
// 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;
// ServerTaskBarReceiver 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 BufferedLogOutputter* m_logBuffer;
IEventQueue* m_events;
static const UINT s_stateToIconID[];
};

67
src/cmd/synergys/OSXServerTaskBarReceiver.cpp
View File

@ -1,67 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2004 Chris Schoeneman
*
* 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 LICENSE 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 "OSXServerTaskBarReceiver.h"
#include "arch/Arch.h"
//
// OSXServerTaskBarReceiver
//
OSXServerTaskBarReceiver::OSXServerTaskBarReceiver(
const BufferedLogOutputter*, IEventQueue* events) :
ServerTaskBarReceiver(events)
{
// add ourself to the task bar
ARCH->addReceiver(this);
}
OSXServerTaskBarReceiver::~OSXServerTaskBarReceiver()
{
ARCH->removeReceiver(this);
}
void
OSXServerTaskBarReceiver::showStatus()
{
// do nothing
}
void
OSXServerTaskBarReceiver::runMenu(int, int)
{
// do nothing
}
void
OSXServerTaskBarReceiver::primaryAction()
{
// do nothing
}
const IArchTaskBarReceiver::Icon
OSXServerTaskBarReceiver::getIcon() const
{
return NULL;
}
IArchTaskBarReceiver*
createTaskBarReceiver(const BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new OSXServerTaskBarReceiver(logBuffer, events);
}

36
src/cmd/synergys/OSXServerTaskBarReceiver.h
View File

@ -1,36 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2004 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ServerTaskBarReceiver.h"
class BufferedLogOutputter;
//! Implementation of ServerTaskBarReceiver for OS X
class OSXServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
OSXServerTaskBarReceiver(const BufferedLogOutputter*, IEventQueue* events);
virtual ~OSXServerTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();
virtual void runMenu(int x, int y);
virtual void primaryAction();
virtual const Icon getIcon() const;
};

67
src/cmd/synergys/XWindowsServerTaskBarReceiver.cpp
View File

@ -1,67 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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 "XWindowsServerTaskBarReceiver.h"
#include "arch/Arch.h"
//
// CXWindowsServerTaskBarReceiver
//
CXWindowsServerTaskBarReceiver::CXWindowsServerTaskBarReceiver(
const BufferedLogOutputter*, IEventQueue* events) :
ServerTaskBarReceiver(events)
{
// 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 BufferedLogOutputter* logBuffer, IEventQueue* events)
{
return new CXWindowsServerTaskBarReceiver(logBuffer, events);
}

38
src/cmd/synergys/XWindowsServerTaskBarReceiver.h
View File

@ -1,38 +0,0 @@
/*
* synergy -- mouse and keyboard sharing utility
* Copyright (C) 2012-2016 Symless Ltd.
* Copyright (C) 2003 Chris Schoeneman
*
* 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 LICENSE 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/>.
*/
#pragma once
#include "synergy/ServerTaskBarReceiver.h"
class BufferedLogOutputter;
class IEventQueue;
//! Implementation of ServerTaskBarReceiver for X Windows
class CXWindowsServerTaskBarReceiver : public ServerTaskBarReceiver {
public:
CXWindowsServerTaskBarReceiver(
const BufferedLogOutputter*, IEventQueue* events);
virtual ~CXWindowsServerTaskBarReceiver();
// IArchTaskBarReceiver overrides
virtual void showStatus();
virtual void runMenu(int x, int y);
virtual void primaryAction();
virtual const Icon getIcon() const;
};

16
src/cmd/synergys/synergys.cpp
View File

@ -16,24 +16,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ServerApp.h" #include "core/ServerApp.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#if WINAPI_MSWINDOWS #include <iostream>
#include "MSWindowsServerTaskBarReceiver.h"
#elif WINAPI_XWINDOWS
#include "XWindowsServerTaskBarReceiver.h"
#elif WINAPI_CARBON
#include "OSXServerTaskBarReceiver.h"
#else
#error Platform not supported.
#endif
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {
std::cerr << "warning: synergys is deprecated. instead, use: synergy-core --server" << std::endl;
#if SYSAPI_WIN32 #if SYSAPI_WIN32
// record window instance for tray icon, etc // record window instance for tray icon, etc
ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL)); ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
@ -45,6 +39,6 @@ main(int argc, char** argv)
Log log; Log log;
EventQueue events; EventQueue events;
ServerApp app(&events, createTaskBarReceiver); ServerApp app(&events);
return app.run(argc, argv); return app.run(argc, argv);
} }

26
src/lib/synergy/App.cpp → src/lib/core/App.cpp
View File

@ -16,17 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/App.h" #include "core/App.h"
#include "base/Log.h" #include "base/Log.h"
#include "common/Version.h" #include "common/Version.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/XBase.h" #include "base/XBase.h"
#include "arch/XArch.h" #include "arch/XArch.h"
#include "base/log_outputters.h" #include "base/log_outputters.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "ipc/IpcServerProxy.h" #include "ipc/IpcServerProxy.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"
#include "ipc/IpcMessage.h" #include "ipc/IpcMessage.h"
@ -56,14 +56,12 @@ App* App::s_instance = nullptr;
// App // App
// //
App::App(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver, ArgsBase* args) : App::App(IEventQueue* events, ArgsBase* args) :
m_bye(&exit), m_bye(&exit),
m_taskBarReceiver(NULL),
m_suspended(false), m_suspended(false),
m_events(events), m_events(events),
m_args(args), m_args(args),
m_fileLog(nullptr), m_fileLog(nullptr),
m_createTaskBarReceiver(createTaskBarReceiver),
m_appUtil(events), m_appUtil(events),
m_ipcClient(nullptr), m_ipcClient(nullptr),
m_socketMultiplexer(nullptr) m_socketMultiplexer(nullptr)
@ -195,18 +193,6 @@ App::initApp(int argc, const char** argv)
// load configuration // load configuration
loadConfig(); loadConfig();
if (!argsBase().m_disableTray) {
// create a log buffer so we can show the latest message
// as a tray icon tooltip
BufferedLogOutputter* logBuffer = new BufferedLogOutputter(1000);
CLOG->insert(logBuffer, true);
// make the task bar receiver. the user can control this app
// through the task bar.
m_taskBarReceiver = m_createTaskBarReceiver(logBuffer, m_events);
}
} }
void void
@ -255,7 +241,7 @@ App::runEventsLoop(void*)
// //
MinimalApp::MinimalApp() : MinimalApp::MinimalApp() :
App(NULL, NULL, new ArgsBase()) App(NULL, new ArgsBase())
{ {
m_arch.init(); m_arch.init();
setEvents(m_events); setEvents(m_events);

15
src/lib/synergy/App.h → src/lib/core/App.h
View File

@ -19,19 +19,18 @@
#pragma once #pragma once
#include "ipc/IpcClient.h" #include "ipc/IpcClient.h"
#include "synergy/IApp.h" #include "core/IApp.h"
#include "base/String.h" #include "base/String.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#include "common/common.h" #include "common/common.h"
#if SYSAPI_WIN32 #if SYSAPI_WIN32
#include "synergy/win32/AppUtilWindows.h" #include "core/win32/AppUtilWindows.h"
#elif SYSAPI_UNIX #elif SYSAPI_UNIX
#include "synergy/unix/AppUtilUnix.h" #include "core/unix/AppUtilUnix.h"
#endif #endif
class IArchTaskBarReceiver;
class BufferedLogOutputter; class BufferedLogOutputter;
class ILogOutputter; class ILogOutputter;
class FileLogOutputter; class FileLogOutputter;
@ -39,11 +38,9 @@ namespace synergy { class Screen; }
class IEventQueue; class IEventQueue;
class SocketMultiplexer; class SocketMultiplexer;
typedef IArchTaskBarReceiver* (*CreateTaskBarReceiverFunc)(const BufferedLogOutputter*, IEventQueue* events);
class App : public IApp { class App : public IApp {
public: public:
App(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver, ArgsBase* args); App(IEventQueue* events, ArgsBase* args);
virtual ~App(); virtual ~App();
// Returns args that are common between server and client. // Returns args that are common between server and client.
@ -88,8 +85,6 @@ public:
ARCH_APP_UTIL& appUtil() { return m_appUtil; } ARCH_APP_UTIL& appUtil() { return m_appUtil; }
virtual IArchTaskBarReceiver* taskBarReceiver() const { return m_taskBarReceiver; }
virtual void setByeFunc(void(*bye)(int)) { m_bye = bye; } virtual void setByeFunc(void(*bye)(int)) { m_bye = bye; }
virtual void bye(int error) { m_bye(error); } virtual void bye(int error) { m_bye(error); }
@ -108,7 +103,6 @@ protected:
void cleanupIpcClient(); void cleanupIpcClient();
void runEventsLoop(void*); void runEventsLoop(void*);
IArchTaskBarReceiver* m_taskBarReceiver;
bool m_suspended; bool m_suspended;
IEventQueue* m_events; IEventQueue* m_events;
@ -116,7 +110,6 @@ private:
ArgsBase* m_args; ArgsBase* m_args;
static App* s_instance; static App* s_instance;
FileLogOutputter* m_fileLog; FileLogOutputter* m_fileLog;
CreateTaskBarReceiverFunc m_createTaskBarReceiver;
ARCH_APP_UTIL m_appUtil; ARCH_APP_UTIL m_appUtil;
IpcClient* m_ipcClient; IpcClient* m_ipcClient;
SocketMultiplexer* m_socketMultiplexer; SocketMultiplexer* m_socketMultiplexer;

2
src/lib/synergy/AppUtil.cpp → src/lib/core/AppUtil.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/AppUtil.h" #include "core/AppUtil.h"
AppUtil* AppUtil::s_instance = nullptr; AppUtil* AppUtil::s_instance = nullptr;

4
src/lib/synergy/AppUtil.h → src/lib/core/AppUtil.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/IAppUtil.h" #include "core/IAppUtil.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
class AppUtil : public IAppUtil { class AppUtil : public IAppUtil {
public: public:

17
src/lib/synergy/ArgParser.cpp → src/lib/core/ArgParser.cpp
View File

@ -15,14 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
#include "synergy/ToolArgs.h" #include "core/ToolArgs.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/String.h" #include "base/String.h"
@ -259,9 +259,6 @@ ArgParser::parseGenericArgs(int argc, const char* const* argv, int& i)
} }
argsBase().m_shouldExit = true; argsBase().m_shouldExit = true;
} }
else if (isArg(i, argc, argv, NULL, "--no-tray")) {
argsBase().m_disableTray = true;
}
else if (isArg(i, argc, argv, NULL, "--ipc")) { else if (isArg(i, argc, argv, NULL, "--ipc")) {
argsBase().m_enableIpc = true; argsBase().m_enableIpc = true;
} }

0
src/lib/synergy/ArgParser.h → src/lib/core/ArgParser.h
View File

3
src/lib/synergy/ArgsBase.cpp → src/lib/core/ArgsBase.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
ArgsBase::ArgsBase() : ArgsBase::ArgsBase() :
#if SYSAPI_WIN32 #if SYSAPI_WIN32
@ -37,7 +37,6 @@ m_pname(NULL),
m_logFilter(NULL), m_logFilter(NULL),
m_logFile(NULL), m_logFile(NULL),
m_display(NULL), m_display(NULL),
m_disableTray(false),
m_enableIpc(false), m_enableIpc(false),
m_enableDragDrop(false), m_enableDragDrop(false),
m_shouldExit(false), m_shouldExit(false),

1
src/lib/synergy/ArgsBase.h → src/lib/core/ArgsBase.h
View File

@ -35,7 +35,6 @@ public:
const char* m_logFile; const char* m_logFile;
const char* m_display; const char* m_display;
String m_name; String m_name;
bool m_disableTray;
bool m_enableIpc; bool m_enableIpc;
bool m_enableDragDrop; bool m_enableDragDrop;
#if SYSAPI_WIN32 #if SYSAPI_WIN32

4
src/lib/synergy/CMakeLists.txt → src/lib/core/CMakeLists.txt
View File

@ -33,8 +33,8 @@ if (SYNERGY_ADD_HEADERS)
list(APPEND sources ${headers}) list(APPEND sources ${headers})
endif() endif()
add_library(synlib STATIC ${sources}) add_library(core STATIC ${sources})
if (UNIX) if (UNIX)
target_link_libraries(synlib arch client ipc net base platform mt server) target_link_libraries(core arch client ipc net base platform mt server)
endif() endif()

2
src/lib/synergy/Chunk.cpp → src/lib/core/Chunk.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/Chunk.h" #include "core/Chunk.h"
#include "base/String.h" #include "base/String.h"
Chunk::Chunk(size_t size): m_dataSize(0) Chunk::Chunk(size_t size): m_dataSize(0)

0
src/lib/synergy/Chunk.h → src/lib/core/Chunk.h
View File

26
src/lib/synergy/ClientApp.cpp → src/lib/core/ClientApp.cpp
View File

@ -16,14 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClientApp.h" #include "core/ClientApp.h"
#include "client/Client.h" #include "client/Client.h"
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
#include "net/NetworkAddress.h" #include "net/NetworkAddress.h"
#include "net/TCPSocketFactory.h" #include "net/TCPSocketFactory.h"
#include "net/SocketMultiplexer.h" #include "net/SocketMultiplexer.h"
@ -62,8 +62,8 @@
#define RETRY_TIME 1.0 #define RETRY_TIME 1.0
ClientApp::ClientApp(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver) : ClientApp::ClientApp(IEventQueue* events) :
App(events, createTaskBarReceiver, new ClientArgs()), App(events, new ClientArgs()),
m_client(NULL), m_client(NULL),
m_clientScreen(NULL), m_clientScreen(NULL),
m_serverAddress(NULL) m_serverAddress(NULL)
@ -194,10 +194,6 @@ ClientApp::updateStatus()
void void
ClientApp::updateStatus(const String& msg) ClientApp::updateStatus(const String& msg)
{ {
if (m_taskBarReceiver)
{
m_taskBarReceiver->updateStatus(m_client, msg);
}
} }
@ -542,12 +538,6 @@ ClientApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc
} }
catch (...) catch (...)
{ {
if (m_taskBarReceiver)
{
// done with task bar receiver
delete m_taskBarReceiver;
}
delete m_serverAddress; delete m_serverAddress;
throw; throw;

4
src/lib/synergy/ClientApp.h → src/lib/core/ClientApp.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/App.h" #include "core/App.h"
namespace synergy { class Screen; } namespace synergy { class Screen; }
class Event; class Event;
@ -29,7 +29,7 @@ class ClientArgs;
class ClientApp : public App { class ClientApp : public App {
public: public:
ClientApp(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver); ClientApp(IEventQueue* events);
virtual ~ClientApp(); virtual ~ClientApp();
// Parse client specific command line arguments. // Parse client specific command line arguments.

2
src/lib/synergy/ClientArgs.cpp → src/lib/core/ClientArgs.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
ClientArgs::ClientArgs() : ClientArgs::ClientArgs() :
m_yscroll(0) m_yscroll(0)

2
src/lib/synergy/ClientArgs.h → src/lib/core/ClientArgs.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
class NetworkAddress; class NetworkAddress;

2
src/lib/synergy/ClientTaskBarReceiver.cpp → src/lib/core/ClientTaskBarReceiver.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClientTaskBarReceiver.h" #include "core/ClientTaskBarReceiver.h"
#include "client/Client.h" #include "client/Client.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "base/String.h" #include "base/String.h"

0
src/lib/synergy/ClientTaskBarReceiver.h → src/lib/core/ClientTaskBarReceiver.h
View File

2
src/lib/synergy/Clipboard.cpp → src/lib/core/Clipboard.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/Clipboard.h" #include "core/Clipboard.h"
// //
// Clipboard // Clipboard

2
src/lib/synergy/Clipboard.h → src/lib/core/Clipboard.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
//! Memory buffer clipboard //! Memory buffer clipboard
/*! /*!

6
src/lib/synergy/ClipboardChunk.cpp → src/lib/core/ClipboardChunk.cpp
View File

@ -15,10 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ClipboardChunk.h" #include "core/ClipboardChunk.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include <cstring> #include <cstring>

4
src/lib/synergy/ClipboardChunk.h → src/lib/core/ClipboardChunk.h
View File

@ -17,8 +17,8 @@
#pragma once #pragma once
#include "synergy/Chunk.h" #include "core/Chunk.h"
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "base/String.h" #include "base/String.h"
#include "common/basic_types.h" #include "common/basic_types.h"

12
src/lib/synergy/DaemonApp.cpp → src/lib/core/DaemonApp.cpp
View File

@ -19,12 +19,12 @@
// TODO: split this class into windows and unix to get rid // TODO: split this class into windows and unix to get rid
// of all the #ifdefs! // of all the #ifdefs!
#include "synergy/DaemonApp.h" #include "core/DaemonApp.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
#include "synergy/ClientArgs.h" #include "core/ClientArgs.h"
#include "ipc/IpcClientProxy.h" #include "ipc/IpcClientProxy.h"
#include "ipc/IpcMessage.h" #include "ipc/IpcMessage.h"
#include "ipc/IpcLogOutputter.h" #include "ipc/IpcLogOutputter.h"
@ -41,7 +41,7 @@
#include "arch/win32/ArchMiscWindows.h" #include "arch/win32/ArchMiscWindows.h"
#include "arch/win32/XArchWindows.h" #include "arch/win32/XArchWindows.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "platform/MSWindowsScreen.h" #include "platform/MSWindowsScreen.h"
#include "platform/MSWindowsDebugOutputter.h" #include "platform/MSWindowsDebugOutputter.h"
#include "platform/MSWindowsWatchdog.h" #include "platform/MSWindowsWatchdog.h"

0
src/lib/synergy/DaemonApp.h → src/lib/core/DaemonApp.h
View File

2
src/lib/synergy/DragInformation.cpp → src/lib/core/DragInformation.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "base/Log.h" #include "base/Log.h"
#include <fstream> #include <fstream>

0
src/lib/synergy/DragInformation.h → src/lib/core/DragInformation.h
View File

2
src/lib/synergy/DropHelper.cpp → src/lib/core/DropHelper.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/DropHelper.h" #include "core/DropHelper.h"
#include "base/Log.h" #include "base/Log.h"

2
src/lib/synergy/DropHelper.h → src/lib/core/DropHelper.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "base/String.h" #include "base/String.h"
class DropHelper { class DropHelper {

6
src/lib/synergy/FileChunk.cpp → src/lib/core/FileChunk.cpp
View File

@ -15,10 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Stopwatch.h" #include "base/Stopwatch.h"
#include "base/Log.h" #include "base/Log.h"

2
src/lib/synergy/FileChunk.h → src/lib/core/FileChunk.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/Chunk.h" #include "core/Chunk.h"
#include "base/String.h" #include "base/String.h"
#include "common/basic_types.h" #include "common/basic_types.h"

1
src/lib/synergy/IApp.h → src/lib/core/IApp.h
View File

@ -36,7 +36,6 @@ public:
virtual int standardStartup(int argc, char** argv) = 0; virtual int standardStartup(int argc, char** argv) = 0;
virtual int runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup) = 0; virtual int runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc startup) = 0;
virtual void startNode() = 0; virtual void startNode() = 0;
virtual IArchTaskBarReceiver* taskBarReceiver() const = 0;
virtual void bye(int error) = 0; virtual void bye(int error) = 0;
virtual int mainLoop() = 0; virtual int mainLoop() = 0;
virtual void initApp(int argc, const char** argv) = 0; virtual void initApp(int argc, const char** argv) = 0;

2
src/lib/synergy/IAppUtil.h → src/lib/core/IAppUtil.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "common/IInterface.h" #include "common/IInterface.h"
#include "synergy/IApp.h" #include "core/IApp.h"
class IAppUtil : public IInterface { class IAppUtil : public IInterface {
public: public:

10
src/lib/synergy/IClient.h → src/lib/core/IClient.h
View File

@ -18,11 +18,11 @@
#pragma once #pragma once
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/IScreen.h" #include "core/IScreen.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "base/String.h" #include "base/String.h"
//! Client interface //! Client interface

2
src/lib/synergy/IClipboard.cpp → src/lib/core/IClipboard.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/IClipboard.h" #include "core/IClipboard.h"
#include "common/stdvector.h" #include "common/stdvector.h"
// //

0
src/lib/synergy/IClipboard.h → src/lib/core/IClipboard.h
View File

2
src/lib/synergy/IKeyState.cpp → src/lib/core/IKeyState.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/IKeyState.h" #include "core/IKeyState.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#include <cstring> #include <cstring>

2
src/lib/synergy/IKeyState.h → src/lib/core/IKeyState.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/key_types.h" #include "core/key_types.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/String.h" #include "base/String.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

0
src/lib/synergy/INode.h → src/lib/core/INode.h
View File

2
src/lib/synergy/IPlatformScreen.cpp → src/lib/core/IPlatformScreen.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
bool bool
IPlatformScreen::fakeMediaKey(KeyID id) IPlatformScreen::fakeMediaKey(KeyID id)

14
src/lib/synergy/IPlatformScreen.h → src/lib/core/IPlatformScreen.h
View File

@ -18,13 +18,13 @@
#pragma once #pragma once
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/IScreen.h" #include "core/IScreen.h"
#include "synergy/IPrimaryScreen.h" #include "core/IPrimaryScreen.h"
#include "synergy/ISecondaryScreen.h" #include "core/ISecondaryScreen.h"
#include "synergy/IKeyState.h" #include "core/IKeyState.h"
#include "synergy/option_types.h" #include "core/option_types.h"
class IClipboard; class IClipboard;

2
src/lib/synergy/IPrimaryScreen.cpp → src/lib/core/IPrimaryScreen.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/IPrimaryScreen.h" #include "core/IPrimaryScreen.h"
#include "base/EventQueue.h" #include "base/EventQueue.h"
#include <cstdlib> #include <cstdlib>

4
src/lib/synergy/IPrimaryScreen.h → src/lib/core/IPrimaryScreen.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "common/IInterface.h" #include "common/IInterface.h"

2
src/lib/synergy/IScreen.h → src/lib/core/IScreen.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "common/IInterface.h" #include "common/IInterface.h"

0
src/lib/synergy/IScreenSaver.h → src/lib/core/IScreenSaver.h
View File

2
src/lib/synergy/ISecondaryScreen.h → src/lib/core/ISecondaryScreen.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "common/IInterface.h" #include "common/IInterface.h"

4
src/lib/synergy/KeyMap.cpp → src/lib/core/KeyMap.cpp
View File

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "base/Log.h" #include "base/Log.h"
#include <assert.h> #include <assert.h>

2
src/lib/synergy/KeyMap.h → src/lib/core/KeyMap.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/key_types.h" #include "core/key_types.h"
#include "base/String.h" #include "base/String.h"
#include "common/stdmap.h" #include "common/stdmap.h"
#include "common/stdset.h" #include "common/stdset.h"

2
src/lib/synergy/KeyState.cpp → src/lib/core/KeyState.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/KeyState.h" #include "core/KeyState.h"
#include "base/Log.h" #include "base/Log.h"
#include <cstring> #include <cstring>

4
src/lib/synergy/KeyState.h → src/lib/core/KeyState.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/IKeyState.h" #include "core/IKeyState.h"
#include "synergy/KeyMap.h" #include "core/KeyMap.h"
//! Core key state //! Core key state
/*! /*!

2
src/lib/synergy/PacketStreamFilter.cpp → src/lib/core/PacketStreamFilter.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/PacketStreamFilter.h" #include "core/PacketStreamFilter.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "base/TMethodEventJob.h" #include "base/TMethodEventJob.h"

0
src/lib/synergy/PacketStreamFilter.h → src/lib/core/PacketStreamFilter.h
View File

6
src/lib/synergy/PlatformScreen.cpp → src/lib/core/PlatformScreen.cpp
View File

@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/PlatformScreen.h" #include "core/PlatformScreen.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
PlatformScreen::PlatformScreen(IEventQueue* events) : PlatformScreen::PlatformScreen(IEventQueue* events) :
IPlatformScreen(events), IPlatformScreen(events),

4
src/lib/synergy/PlatformScreen.h → src/lib/core/PlatformScreen.h
View File

@ -18,8 +18,8 @@
#pragma once #pragma once
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "common/stdexcept.h" #include "common/stdexcept.h"
//! Base screen implementation //! Base screen implementation

2
src/lib/synergy/PortableTaskBarReceiver.cpp → src/lib/core/PortableTaskBarReceiver.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/PortableTaskBarReceiver.h" #include "core/PortableTaskBarReceiver.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "base/String.h" #include "base/String.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

2
src/lib/synergy/PortableTaskBarReceiver.h → src/lib/core/PortableTaskBarReceiver.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/INode.h" #include "core/INode.h"
#include "arch/IArchTaskBarReceiver.h" #include "arch/IArchTaskBarReceiver.h"
#include "base/log_outputters.h" #include "base/log_outputters.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"

2
src/lib/synergy/ProtocolUtil.cpp → src/lib/core/ProtocolUtil.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ProtocolUtil.h" #include "core/ProtocolUtil.h"
#include "io/IStream.h" #include "io/IStream.h"
#include "base/Log.h" #include "base/Log.h"
#include "common/stdvector.h" #include "common/stdvector.h"

0
src/lib/synergy/ProtocolUtil.h → src/lib/core/ProtocolUtil.h
View File

6
src/lib/synergy/Screen.cpp → src/lib/core/Screen.cpp
View File

@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/IPlatformScreen.h" #include "core/IPlatformScreen.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
#include "server/ClientProxy.h" #include "server/ClientProxy.h"

12
src/lib/synergy/Screen.h → src/lib/core/Screen.h
View File

@ -18,12 +18,12 @@
#pragma once #pragma once
#include "synergy/DragInformation.h" #include "core/DragInformation.h"
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "synergy/IScreen.h" #include "core/IScreen.h"
#include "synergy/key_types.h" #include "core/key_types.h"
#include "synergy/mouse_types.h" #include "core/mouse_types.h"
#include "synergy/option_types.h" #include "core/option_types.h"
#include "base/String.h" #include "base/String.h"
class IClipboard; class IClipboard;

26
src/lib/synergy/ServerApp.cpp → src/lib/core/ServerApp.cpp
View File

@ -16,17 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ServerApp.h" #include "core/ServerApp.h"
#include "server/Server.h" #include "server/Server.h"
#include "server/ClientListener.h" #include "server/ClientListener.h"
#include "server/ClientProxy.h" #include "server/ClientProxy.h"
#include "server/PrimaryClient.h" #include "server/PrimaryClient.h"
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/XScreen.h" #include "core/XScreen.h"
#include "synergy/ServerTaskBarReceiver.h" #include "core/ServerTaskBarReceiver.h"
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
#include "net/SocketMultiplexer.h" #include "net/SocketMultiplexer.h"
#include "net/TCPSocketFactory.h" #include "net/TCPSocketFactory.h"
#include "net/XSocket.h" #include "net/XSocket.h"
@ -64,8 +64,8 @@
// ServerApp // ServerApp
// //
ServerApp::ServerApp(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver) : ServerApp::ServerApp(IEventQueue* events) :
App(events, createTaskBarReceiver, new ServerArgs()), App(events, new ServerArgs()),
m_server(NULL), m_server(NULL),
m_serverState(kUninitialized), m_serverState(kUninitialized),
m_serverScreen(NULL), m_serverScreen(NULL),
@ -319,10 +319,6 @@ ServerApp::updateStatus()
void ServerApp::updateStatus(const String& msg) void ServerApp::updateStatus(const String& msg)
{ {
if (m_taskBarReceiver)
{
m_taskBarReceiver->updateStatus(m_server, msg);
}
} }
void void
@ -799,12 +795,6 @@ ServerApp::runInner(int argc, char** argv, ILogOutputter* outputter, StartupFunc
// run // run
int result = startup(argc, argv); int result = startup(argc, argv);
if (m_taskBarReceiver)
{
// done with task bar receiver
delete m_taskBarReceiver;
}
delete args().m_config; delete args().m_config;
delete m_synergyAddress; delete m_synergyAddress;
return result; return result;

8
src/lib/synergy/ServerApp.h → src/lib/core/ServerApp.h
View File

@ -18,14 +18,14 @@
#pragma once #pragma once
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "synergy/App.h" #include "core/App.h"
#include "base/String.h" #include "base/String.h"
#include "server/Config.h" #include "server/Config.h"
#include "net/NetworkAddress.h" #include "net/NetworkAddress.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "arch/IArchMultithread.h" #include "arch/IArchMultithread.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include <map> #include <map>
@ -49,7 +49,7 @@ class ServerArgs;
class ServerApp : public App { class ServerApp : public App {
public: public:
ServerApp(IEventQueue* events, CreateTaskBarReceiverFunc createTaskBarReceiver); ServerApp(IEventQueue* events);
virtual ~ServerApp(); virtual ~ServerApp();
// Parse server specific command line arguments. // Parse server specific command line arguments.

2
src/lib/synergy/ServerArgs.cpp → src/lib/core/ServerArgs.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ServerArgs.h" #include "core/ServerArgs.h"
ServerArgs::ServerArgs() : ServerArgs::ServerArgs() :
m_configFile(), m_configFile(),

2
src/lib/synergy/ServerArgs.h → src/lib/core/ServerArgs.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "shared/SerialKey.h" #include "shared/SerialKey.h"
class NetworkAddress; class NetworkAddress;

2
src/lib/synergy/ServerTaskBarReceiver.cpp → src/lib/core/ServerTaskBarReceiver.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ServerTaskBarReceiver.h" #include "core/ServerTaskBarReceiver.h"
#include "server/Server.h" #include "server/Server.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "base/String.h" #include "base/String.h"

2
src/lib/synergy/ServerTaskBarReceiver.h → src/lib/core/ServerTaskBarReceiver.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "server/Server.h" #include "server/Server.h"
#include "synergy/ServerApp.h" #include "core/ServerApp.h"
#include "arch/IArchTaskBarReceiver.h" #include "arch/IArchTaskBarReceiver.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "base/String.h" #include "base/String.h"

8
src/lib/synergy/StreamChunker.cpp → src/lib/core/StreamChunker.cpp
View File

@ -15,13 +15,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/StreamChunker.h" #include "core/StreamChunker.h"
#include "mt/Lock.h" #include "mt/Lock.h"
#include "mt/Mutex.h" #include "mt/Mutex.h"
#include "synergy/FileChunk.h" #include "core/FileChunk.h"
#include "synergy/ClipboardChunk.h" #include "core/ClipboardChunk.h"
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
#include "base/EventTypes.h" #include "base/EventTypes.h"
#include "base/Event.h" #include "base/Event.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"

2
src/lib/synergy/StreamChunker.h → src/lib/core/StreamChunker.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#include "synergy/clipboard_types.h" #include "core/clipboard_types.h"
#include "base/String.h" #include "base/String.h"
class IEventQueue; class IEventQueue;

4
src/lib/synergy/ToolApp.cpp → src/lib/core/ToolApp.cpp
View File

@ -15,9 +15,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ToolApp.h" #include "core/ToolApp.h"
#include "synergy/ArgParser.h" #include "core/ArgParser.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/String.h" #include "base/String.h"

4
src/lib/synergy/ToolApp.h → src/lib/core/ToolApp.h
View File

@ -17,8 +17,8 @@
#pragma once #pragma once
#include "synergy/App.h" #include "core/App.h"
#include "synergy/ToolArgs.h" #include "core/ToolArgs.h"
#include "common/basic_types.h" #include "common/basic_types.h"
class ToolApp : public MinimalApp class ToolApp : public MinimalApp

2
src/lib/synergy/ToolArgs.cpp → src/lib/core/ToolArgs.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/ToolArgs.h" #include "core/ToolArgs.h"
ToolArgs::ToolArgs() : ToolArgs::ToolArgs() :
m_printActiveDesktopName(false), m_printActiveDesktopName(false),

0
src/lib/synergy/ToolArgs.h → src/lib/core/ToolArgs.h
View File

2
src/lib/synergy/XScreen.cpp → src/lib/core/XScreen.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/XScreen.h" #include "core/XScreen.h"
// //
// XScreenOpenFailure // XScreenOpenFailure

0
src/lib/synergy/XScreen.h → src/lib/core/XScreen.h
View File

2
src/lib/synergy/XSynergy.cpp → src/lib/core/XSynergy.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "base/String.h" #include "base/String.h"
// //

0
src/lib/synergy/XSynergy.h → src/lib/core/XSynergy.h
View File

0
src/lib/synergy/clipboard_types.h → src/lib/core/clipboard_types.h
View File

2
src/lib/synergy/key_types.cpp → src/lib/core/key_types.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/key_types.h" #include "core/key_types.h"
const KeyNameMapEntry kKeyNameMap[] = { const KeyNameMapEntry kKeyNameMap[] = {
{ "AltGr", kKeyAltGr }, { "AltGr", kKeyAltGr },

0
src/lib/synergy/key_types.h → src/lib/core/key_types.h
View File

0
src/lib/synergy/mouse_types.h → src/lib/core/mouse_types.h
View File

0
src/lib/synergy/option_types.h → src/lib/core/option_types.h
View File

2
src/lib/synergy/protocol_types.cpp → src/lib/core/protocol_types.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/protocol_types.h" #include "core/protocol_types.h"
const char* kMsgHello = "Synergy%2i%2i"; const char* kMsgHello = "Synergy%2i%2i";
const char* kMsgHelloBack = "Synergy%2i%2i%s"; const char* kMsgHelloBack = "Synergy%2i%2i%s";

0
src/lib/synergy/protocol_types.h → src/lib/core/protocol_types.h
View File

4
src/lib/synergy/unix/AppUtilUnix.cpp → src/lib/core/unix/AppUtilUnix.cpp
View File

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/unix/AppUtilUnix.h" #include "core/unix/AppUtilUnix.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
AppUtilUnix::AppUtilUnix(IEventQueue* events) AppUtilUnix::AppUtilUnix(IEventQueue* events)
{ {

2
src/lib/synergy/unix/AppUtilUnix.h → src/lib/core/unix/AppUtilUnix.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "synergy/AppUtil.h" #include "core/AppUtil.h"
#define ARCH_APP_UTIL AppUtilUnix #define ARCH_APP_UTIL AppUtilUnix

10
src/lib/synergy/win32/AppUtilWindows.cpp → src/lib/core/win32/AppUtilWindows.cpp
View File

@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "synergy/win32/AppUtilWindows.h" #include "core/win32/AppUtilWindows.h"
#include "synergy/Screen.h" #include "core/Screen.h"
#include "synergy/ArgsBase.h" #include "core/ArgsBase.h"
#include "synergy/App.h" #include "core/App.h"
#include "synergy/XSynergy.h" #include "core/XSynergy.h"
#include "platform/MSWindowsScreen.h" #include "platform/MSWindowsScreen.h"
#include "arch/win32/XArchWindows.h" #include "arch/win32/XArchWindows.h"
#include "arch/win32/ArchMiscWindows.h" #include "arch/win32/ArchMiscWindows.h"

Some files were not shown because too many files have changed in this diff Show More