3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-21 02:17:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactored clipboard event into ClipboardEvent #4601

Browse source
This commit is contained in:
Xinyu Hou 2015-05-20 19:09:54 +01:00
parent a6dfbbe021
commit 49ac320f97
13 changed files with 76 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/server/Server.cpp
View file

@ -92,8 +92,7 @@ Server::Server(
m_ignoreFileTransfer(false),
m_enableDragDrop(enableDragDrop),
m_getDragInfoThread(NULL),
m_waitDragInfoThread(true),
m_dataTransmissionThread(NULL)
m_waitDragInfoThread(true)
{
// must have a primary client and it must have a canonical name
assert(m_primaryClient != NULL);
@ -506,12 +505,6 @@ Server::switchScreen(BaseClientProxy* dst,
m_primaryClient->getToggleMask(),
forScreensaver);
// send the clipboard data to new active screen
m_dataTransmissionThread = new Thread(
new TMethodJob<Server>(
this, &Server::sendClipboardThread,
NULL));
Server::SwitchToScreenInfo* info =
Server::SwitchToScreenInfo::alloc(m_active->getName());
m_events->addEvent(Event(m_events->forServer().screenSwitched(), this, info));
@ -2079,11 +2072,11 @@ Server::addClient(BaseClientProxy* client)
client->getEventTarget(),
new TMethodEventJob<Server>(this,
&Server::handleShapeChanged, client));
m_events->adoptHandler(m_events->forIScreen().clipboardGrabbed(),
m_events->adoptHandler(m_events->forClipboard().clipboardGrabbed(),
client->getEventTarget(),
new TMethodEventJob<Server>(this,
&Server::handleClipboardGrabbed, client));
m_events->adoptHandler(m_events->forClientProxy().clipboardChanged(),
m_events->adoptHandler(m_events->forClipboard().clipboardChanged(),
client->getEventTarget(),
new TMethodEventJob<Server>(this,
&Server::handleClipboardChanged, client));
@ -2115,9 +2108,9 @@ Server::removeClient(BaseClientProxy* client)
// remove event handlers
m_events->removeHandler(m_events->forIScreen().shapeChanged(),
client->getEventTarget());
m_events->removeHandler(m_events->forIScreen().clipboardGrabbed(),
m_events->removeHandler(m_events->forClipboard().clipboardGrabbed(),
client->getEventTarget());
m_events->removeHandler(m_events->forClientProxy().clipboardChanged(),
m_events->removeHandler(m_events->forClipboard().clipboardChanged(),
client->getEventTarget());
// remove from list