smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Improve logging in Server::handleClipboardGrabbed

Browse source
This commit is contained in:
Nick Bolton 2025-08-05 13:45:25 +01:00 committed by Chris Rizzitello
parent 739cdc1752
commit 98d03fb098
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1172,14 +1172,14 @@ void Server::handleClipboardGrabbed(const Event &event, BaseClientProxy *grabber
// screen to grab. // screen to grab.
ClipboardInfo &clipboard = m_clipboards[info->m_id]; ClipboardInfo &clipboard = m_clipboards[info->m_id];
if (grabber != m_primaryClient && info->m_sequenceNumber < clipboard.m_clipboardSeqNum) { if (grabber != m_primaryClient && info->m_sequenceNumber < clipboard.m_clipboardSeqNum) {
LOG((CLOG_INFO "ignored screen \"%s\" grab of clipboard %d", getName(grabber).c_str(), info->m_id)); LOG_INFO("ignored screen \"%s\" grab of clipboard %d", getName(grabber).c_str(), info->m_id);
return; return;
} }
// mark screen as owning clipboard // mark screen as owning clipboard
LOG( LOG_INFO(
(CLOG_INFO "screen \"%s\" grabbed clipboard %d from \"%s\"", getName(grabber).c_str(), info->m_id, "screen \"%s\" grabbed clipboard %d from \"%s\"", getName(grabber).c_str(), info->m_id,
clipboard.m_clipboardOwner.c_str()) clipboard.m_clipboardOwner.c_str()
); );
clipboard.m_clipboardOwner = getName(grabber); clipboard.m_clipboardOwner = getName(grabber);
clipboard.m_clipboardSeqNum = info->m_sequenceNumber; clipboard.m_clipboardSeqNum = info->m_sequenceNumber;
@ -1203,8 +1203,7 @@ void Server::handleClipboardGrabbed(const Event &event, BaseClientProxy *grabber
} }
if (grabber == m_primaryClient && m_active != m_primaryClient) { if (grabber == m_primaryClient && m_active != m_primaryClient) {
LOG((CLOG_INFO "clipboard grabbed, but we are already changed active " LOG_INFO("clipboard grabbed while active screen was changed, resending clipboard data");
"screen. Resend clipboard data"));
for (ClipboardID id = 0; id < kClipboardEnd; ++id) { for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
onClipboardChanged(m_primaryClient, id, m_clipboards[id].m_clipboardSeqNum); onClipboardChanged(m_primaryClient, id, m_clipboards[id].m_clipboardSeqNum);
} }