Moved clipboard changed event to CClientProxy because only it
and CServer use it. CServerProxy instead makes a direct call to CClient, like it does for most other messages.
This commit is contained in:
parent
1ccb92b888
commit
c3135b1b1c
|
@ -386,10 +386,6 @@ CClient::setupScreen()
|
||||||
getEventTarget(),
|
getEventTarget(),
|
||||||
new TMethodEventJob<CClient>(this,
|
new TMethodEventJob<CClient>(this,
|
||||||
&CClient::handleClipboardGrabbed));
|
&CClient::handleClipboardGrabbed));
|
||||||
EVENTQUEUE->adoptHandler(IScreen::getClipboardChangedEvent(),
|
|
||||||
getEventTarget(),
|
|
||||||
new TMethodEventJob<CClient>(this,
|
|
||||||
&CClient::handleClipboardChanged));
|
|
||||||
EVENTQUEUE->adoptHandler(CServerProxy::getHandshakeCompleteEvent(),
|
EVENTQUEUE->adoptHandler(CServerProxy::getHandshakeCompleteEvent(),
|
||||||
m_server,
|
m_server,
|
||||||
new TMethodEventJob<CClient>(this,
|
new TMethodEventJob<CClient>(this,
|
||||||
|
@ -453,8 +449,6 @@ CClient::cleanupScreen()
|
||||||
getEventTarget());
|
getEventTarget());
|
||||||
EVENTQUEUE->removeHandler(IScreen::getClipboardGrabbedEvent(),
|
EVENTQUEUE->removeHandler(IScreen::getClipboardGrabbedEvent(),
|
||||||
getEventTarget());
|
getEventTarget());
|
||||||
EVENTQUEUE->removeHandler(IScreen::getClipboardChangedEvent(),
|
|
||||||
getEventTarget());
|
|
||||||
delete m_server;
|
delete m_server;
|
||||||
m_server = NULL;
|
m_server = NULL;
|
||||||
}
|
}
|
||||||
|
@ -566,12 +560,6 @@ CClient::handleClipboardGrabbed(const CEvent& event, void*)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
CClient::handleClipboardChanged(const CEvent&, void*)
|
|
||||||
{
|
|
||||||
// ignore -- we'll check the clipboard when we leave
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
CClient::handleHello(const CEvent&, void*)
|
CClient::handleHello(const CEvent&, void*)
|
||||||
{
|
{
|
||||||
|
|
|
@ -155,7 +155,6 @@ private:
|
||||||
void handleHandshakeComplete(const CEvent&, void*);
|
void handleHandshakeComplete(const CEvent&, void*);
|
||||||
void handleShapeChanged(const CEvent&, void*);
|
void handleShapeChanged(const CEvent&, void*);
|
||||||
void handleClipboardGrabbed(const CEvent&, void*);
|
void handleClipboardGrabbed(const CEvent&, void*);
|
||||||
void handleClipboardChanged(const CEvent&, void*);
|
|
||||||
void handleHello(const CEvent&, void*);
|
void handleHello(const CEvent&, void*);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
CEvent::Type CClientProxy::s_readyEvent = CEvent::kUnknown;
|
CEvent::Type CClientProxy::s_readyEvent = CEvent::kUnknown;
|
||||||
CEvent::Type CClientProxy::s_disconnectedEvent = CEvent::kUnknown;
|
CEvent::Type CClientProxy::s_disconnectedEvent = CEvent::kUnknown;
|
||||||
|
CEvent::Type CClientProxy::s_clipboardChangedEvent= CEvent::kUnknown;
|
||||||
|
|
||||||
CClientProxy::CClientProxy(const CString& name, IStream* stream) :
|
CClientProxy::CClientProxy(const CString& name, IStream* stream) :
|
||||||
m_name(name),
|
m_name(name),
|
||||||
|
@ -72,6 +73,13 @@ CClientProxy::getDisconnectedEvent()
|
||||||
"CClientProxy::disconnected");
|
"CClientProxy::disconnected");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CEvent::Type
|
||||||
|
CClientProxy::getClipboardChangedEvent()
|
||||||
|
{
|
||||||
|
return CEvent::registerTypeOnce(s_clipboardChangedEvent,
|
||||||
|
"CClientProxy::clipboardChanged");
|
||||||
|
}
|
||||||
|
|
||||||
void*
|
void*
|
||||||
CClientProxy::getEventTarget() const
|
CClientProxy::getEventTarget() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -64,6 +64,14 @@ public:
|
||||||
*/
|
*/
|
||||||
static CEvent::Type getDisconnectedEvent();
|
static CEvent::Type getDisconnectedEvent();
|
||||||
|
|
||||||
|
//! Get clipboard changed event type
|
||||||
|
/*!
|
||||||
|
Returns the clipboard changed event type. This is sent whenever the
|
||||||
|
contents of the clipboard has changed. The data is a pointer to a
|
||||||
|
IScreen::CClipboardInfo.
|
||||||
|
*/
|
||||||
|
static CEvent::Type getClipboardChangedEvent();
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
// IScreen
|
// IScreen
|
||||||
|
@ -100,6 +108,7 @@ private:
|
||||||
|
|
||||||
static CEvent::Type s_readyEvent;
|
static CEvent::Type s_readyEvent;
|
||||||
static CEvent::Type s_disconnectedEvent;
|
static CEvent::Type s_disconnectedEvent;
|
||||||
|
static CEvent::Type s_clipboardChangedEvent;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1425,7 +1425,7 @@ CServer::addClient(IClient* client)
|
||||||
client->getEventTarget(),
|
client->getEventTarget(),
|
||||||
new TMethodEventJob<CServer>(this,
|
new TMethodEventJob<CServer>(this,
|
||||||
&CServer::handleClipboardGrabbed, client));
|
&CServer::handleClipboardGrabbed, client));
|
||||||
EVENTQUEUE->adoptHandler(IScreen::getClipboardChangedEvent(),
|
EVENTQUEUE->adoptHandler(CClientProxy::getClipboardChangedEvent(),
|
||||||
client->getEventTarget(),
|
client->getEventTarget(),
|
||||||
new TMethodEventJob<CServer>(this,
|
new TMethodEventJob<CServer>(this,
|
||||||
&CServer::handleClipboardChanged, client));
|
&CServer::handleClipboardChanged, client));
|
||||||
|
@ -1454,7 +1454,7 @@ CServer::removeClient(IClient* client)
|
||||||
client->getEventTarget());
|
client->getEventTarget());
|
||||||
EVENTQUEUE->removeHandler(IScreen::getClipboardGrabbedEvent(),
|
EVENTQUEUE->removeHandler(IScreen::getClipboardGrabbedEvent(),
|
||||||
client->getEventTarget());
|
client->getEventTarget());
|
||||||
EVENTQUEUE->removeHandler(IScreen::getClipboardChangedEvent(),
|
EVENTQUEUE->removeHandler(CClientProxy::getClipboardChangedEvent(),
|
||||||
client->getEventTarget());
|
client->getEventTarget());
|
||||||
|
|
||||||
// remove from list
|
// remove from list
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
CEvent::Type IScreen::s_errorEvent = CEvent::kUnknown;
|
CEvent::Type IScreen::s_errorEvent = CEvent::kUnknown;
|
||||||
CEvent::Type IScreen::s_shapeChangedEvent = CEvent::kUnknown;
|
CEvent::Type IScreen::s_shapeChangedEvent = CEvent::kUnknown;
|
||||||
CEvent::Type IScreen::s_clipboardGrabbedEvent = CEvent::kUnknown;
|
CEvent::Type IScreen::s_clipboardGrabbedEvent = CEvent::kUnknown;
|
||||||
CEvent::Type IScreen::s_clipboardChangedEvent = CEvent::kUnknown;
|
|
||||||
|
|
||||||
CEvent::Type
|
CEvent::Type
|
||||||
IScreen::getErrorEvent()
|
IScreen::getErrorEvent()
|
||||||
|
@ -43,10 +42,3 @@ IScreen::getClipboardGrabbedEvent()
|
||||||
return CEvent::registerTypeOnce(s_clipboardGrabbedEvent,
|
return CEvent::registerTypeOnce(s_clipboardGrabbedEvent,
|
||||||
"IScreen::clipboardGrabbed");
|
"IScreen::clipboardGrabbed");
|
||||||
}
|
}
|
||||||
|
|
||||||
CEvent::Type
|
|
||||||
IScreen::getClipboardChangedEvent()
|
|
||||||
{
|
|
||||||
return CEvent::registerTypeOnce(s_clipboardChangedEvent,
|
|
||||||
"IScreen::clipboardChanged");
|
|
||||||
}
|
|
||||||
|
|
|
@ -85,21 +85,12 @@ public:
|
||||||
*/
|
*/
|
||||||
static CEvent::Type getClipboardGrabbedEvent();
|
static CEvent::Type getClipboardGrabbedEvent();
|
||||||
|
|
||||||
//! Get clipboard changed event type
|
|
||||||
/*!
|
|
||||||
Returns the clipboard changed event type. This is sent whenever the
|
|
||||||
contents of the clipboard has changed. The data is a pointer to a
|
|
||||||
CClipboardInfo.
|
|
||||||
*/
|
|
||||||
static CEvent::Type getClipboardChangedEvent();
|
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static CEvent::Type s_errorEvent;
|
static CEvent::Type s_errorEvent;
|
||||||
static CEvent::Type s_shapeChangedEvent;
|
static CEvent::Type s_shapeChangedEvent;
|
||||||
static CEvent::Type s_clipboardGrabbedEvent;
|
static CEvent::Type s_clipboardGrabbedEvent;
|
||||||
static CEvent::Type s_clipboardChangedEvent;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue