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

fix: reivse scoped_lock to avoid deadlock for XWindowsClipboard

Browse source 
fix #9890
This commit is contained in:
SASANO Takayoshi 2026-06-27 15:45:28 +09:00 committed by Nick Bolton
parent 3f2571dfa3
commit 2c37169f73
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/lib/platform/XWindowsClipboard.cpp
View file

@ -37,6 +37,7 @@ XWindowsClipboard::XWindowsClipboard(Display *display, Window window, ClipboardI
m_window(window), m_window(window),
m_id(id) m_id(id)
{ {
std::scoped_lock lock{m_mutex};
// get some atoms // get some atoms
m_atomTargets = XInternAtom(m_display, "TARGETS", False); m_atomTargets = XInternAtom(m_display, "TARGETS", False);
m_atomMultiple = XInternAtom(m_display, "MULTIPLE", False); m_atomMultiple = XInternAtom(m_display, "MULTIPLE", False);
@ -76,12 +77,14 @@ XWindowsClipboard::XWindowsClipboard(Display *display, Window window, ClipboardI
XWindowsClipboard::~XWindowsClipboard() XWindowsClipboard::~XWindowsClipboard()
{ {
std::scoped_lock lock{m_mutex};
clearReplies(); clearReplies();
clearConverters(); clearConverters();
} }
void XWindowsClipboard::lost(Time time) void XWindowsClipboard::lost(Time time)
{ {
std::scoped_lock lock{m_mutex};
LOG_DEBUG("lost clipboard %d ownership at %d", m_id, time); LOG_DEBUG("lost clipboard %d ownership at %d", m_id, time);
if (m_owner) { if (m_owner) {
m_owner = false; m_owner = false;
@ -92,6 +95,7 @@ void XWindowsClipboard::lost(Time time)
void XWindowsClipboard::addRequest(Window owner, Window requestor, Atom target, ::Time time, Atom property) void XWindowsClipboard::addRequest(Window owner, Window requestor, Atom target, ::Time time, Atom property)
{ {
std::scoped_lock lock{m_mutex};
// must be for our window and we must have owned the selection // must be for our window and we must have owned the selection
// at the given time. // at the given time.
bool success = false; bool success = false;
@ -176,6 +180,7 @@ bool XWindowsClipboard::addSimpleRequest(Window requestor, Atom target, ::Time t
bool XWindowsClipboard::processRequest(Window requestor, ::Time /*time*/, Atom property) bool XWindowsClipboard::processRequest(Window requestor, ::Time /*time*/, Atom property)
{ {
std::scoped_lock lock{m_mutex};
ReplyMap::iterator index = m_replies.find(requestor); ReplyMap::iterator index = m_replies.find(requestor);
if (index == m_replies.end()) { if (index == m_replies.end()) {
// unknown requestor window // unknown requestor window
@ -264,6 +269,7 @@ bool XWindowsClipboard::empty()
void XWindowsClipboard::add(Format format, const std::string &data) void XWindowsClipboard::add(Format format, const std::string &data)
{ {
std::scoped_lock lock{m_mutex};
assert(m_open); assert(m_open);
assert(m_owner); assert(m_owner);
@ -316,11 +322,11 @@ bool XWindowsClipboard::open(Time time) const
void XWindowsClipboard::close() const void XWindowsClipboard::close() const
{ {
std::scoped_lock lock{m_mutex};
assert(m_open); assert(m_open);
LOG_DEBUG("close clipboard %d", m_id); LOG_DEBUG("close clipboard %d", m_id);
std::scoped_lock lock{m_mutex};
// unlock clipboard // unlock clipboard
if (m_motif) { if (m_motif) {
motifUnlockClipboard(); motifUnlockClipboard();
@ -332,13 +338,14 @@ void XWindowsClipboard::close() const
IClipboard::Time XWindowsClipboard::getTime() const IClipboard::Time XWindowsClipboard::getTime() const
{ {
checkCache();
std::scoped_lock lock{m_mutex}; std::scoped_lock lock{m_mutex};
checkCache();
return m_timeOwned; return m_timeOwned;
} }
bool XWindowsClipboard::has(Format format) const bool XWindowsClipboard::has(Format format) const
{ {
std::scoped_lock lock{m_mutex};
assert(m_open); assert(m_open);
fillCache(); fillCache();
@ -347,6 +354,7 @@ bool XWindowsClipboard::has(Format format) const
std::string XWindowsClipboard::get(Format format) const std::string XWindowsClipboard::get(Format format) const
{ {
std::scoped_lock lock{m_mutex};
assert(m_open); assert(m_open);
fillCache(); fillCache();
@ -386,7 +394,6 @@ IXWindowsClipboardConverter *XWindowsClipboard::getConverter(Atom target, bool o
void XWindowsClipboard::checkCache() const void XWindowsClipboard::checkCache() const
{ {
std::scoped_lock lock{m_mutex};
if (!m_checkCache) { if (!m_checkCache) {
return; return;
} }
@ -418,7 +425,6 @@ void XWindowsClipboard::clearCache() const
void XWindowsClipboard::doClearCache() void XWindowsClipboard::doClearCache()
{ {
std::scoped_lock lock{m_mutex};
m_checkCache = false; m_checkCache = false;
m_cached = false; m_cached = false;
for (int32_t index = 0; index < static_cast<int>(Format::TotalFormats); ++index) { for (int32_t index = 0; index < static_cast<int>(Format::TotalFormats); ++index) {
@ -438,7 +444,6 @@ void XWindowsClipboard::fillCache() const
void XWindowsClipboard::doFillCache() void XWindowsClipboard::doFillCache()
{ {
std::scoped_lock lock{m_mutex};
if (m_motif) { if (m_motif) {
motifFillCache(); motifFillCache();
} else { } else {
@ -524,7 +529,6 @@ bool XWindowsClipboard::icccmGetSelection(Atom target, Atom *actualTarget, std::
assert(actualTarget != nullptr); assert(actualTarget != nullptr);
assert(data != nullptr); assert(data != nullptr);
std::scoped_lock lock{m_mutex};
// request data conversion // request data conversion
if (CICCCMGetClipboard getter(m_window, m_time, m_atomData); if (CICCCMGetClipboard getter(m_window, m_time, m_atomData);
!getter.readClipboard(m_display, m_selection, target, actualTarget, data)) { !getter.readClipboard(m_display, m_selection, target, actualTarget, data)) {
@ -985,7 +989,6 @@ bool XWindowsClipboard::sendReply(Reply *reply)
} }
if (!reply->m_replied) { if (!reply->m_replied) {
std::scoped_lock lock{m_mutex};
sendNotify(reply->m_requestor, m_selection, reply->m_target, None, reply->m_time); sendNotify(reply->m_requestor, m_selection, reply->m_target, None, reply->m_time);
// don't wait for any reply (because we're not expecting one) // don't wait for any reply (because we're not expecting one)
@ -1011,7 +1014,6 @@ bool XWindowsClipboard::sendReply(Reply *reply)
// nothing to log // nothing to log
if (CLOG->getFilter() < LogLevel::Level::Verbose) { if (CLOG->getFilter() < LogLevel::Level::Verbose) {
std::scoped_lock lock{m_mutex};
sendNotify( sendNotify(
reply->m_requestor, m_selection, reply->m_target, reply->m_property, static_cast<unsigned int>(reply->m_time) reply->m_requestor, m_selection, reply->m_target, reply->m_property, static_cast<unsigned int>(reply->m_time)
); );
@ -1060,7 +1062,6 @@ bool XWindowsClipboard::sendReply(Reply *reply)
if (props != nullptr) { if (props != nullptr) {
XFree(props); XFree(props);
} }
std::scoped_lock lck{m_mutex};
sendNotify(reply->m_requestor, m_selection, reply->m_target, reply->m_property, reply->m_time); sendNotify(reply->m_requestor, m_selection, reply->m_target, reply->m_property, reply->m_time);
// wait for delete notify // wait for delete notify
@ -1102,7 +1103,6 @@ bool XWindowsClipboard::wasOwnedAtTime(::Time time) const
{ {
// not owned if we've never owned the selection // not owned if we've never owned the selection
checkCache(); checkCache();
std::scoped_lock lock{m_mutex};
if (m_timeOwned == 0) { if (m_timeOwned == 0) {
return false; return false;
} }
@ -1158,7 +1158,6 @@ Atom XWindowsClipboard::getTimestampData(std::string &data, int *format) const
assert(format != nullptr); assert(format != nullptr);
checkCache(); checkCache();
std::scoped_lock lock{m_mutex};
XWindowsUtil::appendTimeData(data, m_timeOwned); XWindowsUtil::appendTimeData(data, m_timeOwned);
*format = 32; *format = 32;
return m_atomInteger; return m_atomInteger;