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

Added more checks to avoid sending unchanged clipboard data. 

Still takes too long to query the clipboard owner for info
(maybe 1/10th second) but not sure why or if that can be
improved.
This commit is contained in:
crs 2002-05-01 16:17:57 +00:00
parent f2e83e607d
commit f052d126c0
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/CServer.cpp
View File

@ -956,9 +956,21 @@ void CServer::updatePrimaryClipboard(ClipboardID id)
// if clipboard changed then other screens have an
// out-of-date clipboard.
if (time != clipboard.m_clipboard.getTime()) {
log((CLOG_DEBUG "clipboard %d changed", id));
clipboard.m_clipboardData = clipboard.m_clipboard.marshall();
clearGotClipboard(id);
log((CLOG_DEBUG "clipboard %d time changed (%08x to %08x)", id, time, clipboard.m_clipboard.getTime()));
// marshall data
CString newData = clipboard.m_clipboard.marshall();
// compare old and new data. if identical then the clipboard
// hasn't really changed.
if (newData != clipboard.m_clipboardData) {
log((CLOG_DEBUG "clipboard %d changed", id));
clipboard.m_clipboardData = newData;
clearGotClipboard(id);
}
else {
log((CLOG_DEBUG "clipboard %d unchanged", id));
}
m_primaryInfo->m_gotClipboard[id] = true;
}
}

37
synergy/CXWindowsScreen.cpp
View File

@ -249,12 +249,6 @@ void CXWindowsScreen::getDisplayClipboard(
assert(clipboard != NULL);
assert(requestor != None);
// FIXME -- don't update clipboard object if clipboard hasn't changed
// clear the clipboard object
if (!clipboard->open(timestamp))
return;
// block others from using the display while we get the clipboard.
// in particular, this prevents the event thread from stealing the
// selection notify event we're expecting.
@ -271,16 +265,43 @@ void CXWindowsScreen::getDisplayClipboard(
Window owner = XGetSelectionOwner(m_display, selection);
if (m_clipboards[id].m_unresponsive) {
if (owner != None && owner == m_clipboards[id].m_owner) {
clipboard->close();
log((CLOG_DEBUG1 "skip unresponsive clipboard owner"));
// clear the clipboard and return
if (!clipboard->open(timestamp)) {
clipboard->close();
}
return;
}
}
CClipboardInfo& clipboardInfo =
const_cast<CClipboardInfo&>(m_clipboards[id]);
// don't update clipboard object if clipboard hasn't changed. ask
// the selection for the tiemstamp when it acquired the selection.
Atom format;
CString data;
if (getDisplayClipboard(selection, m_atomTimestamp,
requestor, timestamp, &format, &data) &&
format == m_atomInteger) {
// get the owner's time
Time time = *reinterpret_cast<const Time*>(data.data());
log((CLOG_DEBUG "got clipboard timestamp %08x", time));
// if unchanged then clipboard hasn't changed
if (time == clipboard->getTime())
return;
// use clipboard owner's time as timestamp
timestamp = time;
}
// clear the clipboard object
if (!clipboard->open(timestamp)) {
return;
}
// ask the selection for all the formats it has. some owners return
// the TARGETS atom and some the ATOM atom when TARGETS is requested.
Atom format;
CString targets;
if (getDisplayClipboard(selection, m_atomTargets,
requestor, timestamp, &format, &targets) &&