#123 Disabled clipboard grab mechanism when clipboard is disabled

This commit is contained in:
Xinyu Hou 2016-09-16 09:24:46 -04:00 committed by Andrew Nelless
parent ce4effa2c8
commit a17779e7fd
2 changed files with 8 additions and 0 deletions

View File

@ -672,6 +672,10 @@ Client::handleShapeChanged(const Event&, void*)
void void
Client::handleClipboardGrabbed(const Event& event, void*) Client::handleClipboardGrabbed(const Event& event, void*)
{ {
if (!m_enableClipboard) {
return;
}
const IScreen::ClipboardInfo* info = const IScreen::ClipboardInfo* info =
reinterpret_cast<const IScreen::ClipboardInfo*>(event.getData()); reinterpret_cast<const IScreen::ClipboardInfo*>(event.getData());

View File

@ -1219,6 +1219,10 @@ Server::handleShapeChanged(const Event&, void* vclient)
void void
Server::handleClipboardGrabbed(const Event& event, void* vclient) Server::handleClipboardGrabbed(const Event& event, void* vclient)
{ {
if (!m_enableClipboard) {
return;
}
// ignore events from unknown clients // ignore events from unknown clients
BaseClientProxy* grabber = reinterpret_cast<BaseClientProxy*>(vclient); BaseClientProxy* grabber = reinterpret_cast<BaseClientProxy*>(vclient);
if (m_clientSet.count(grabber) == 0) { if (m_clientSet.count(grabber) == 0) {