Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: pass the current owner to kWaitForOwner() function

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-15 03:02:41 +02:00
parent 6b0375f64f
commit 40ad0ba5ac
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kdeui/util/kselectionowner.cpp
View file

@ -27,10 +27,9 @@
#define KSELECTIONOWNER_SLEEPTIME 500 #define KSELECTIONOWNER_SLEEPTIME 500
#define KSELECTIONOWNER_CHECKTIME 250 #define KSELECTIONOWNER_CHECKTIME 250
static Window kWaitForOwner(Display* x11display, const Atom x11atom) static Window kWaitForOwner(Display* x11display, const Atom x11atom, Window currentowner)
{ {
ushort counter = 0; ushort counter = 0;
Window currentowner = XGetSelectionOwner(x11display, x11atom);
while (currentowner != None && counter < 10) { while (currentowner != None && counter < 10) {
QCoreApplication::processEvents(QEventLoop::AllEvents, KSELECTIONOWNER_TIMEOUT); QCoreApplication::processEvents(QEventLoop::AllEvents, KSELECTIONOWNER_TIMEOUT);
QThread::msleep(KSELECTIONOWNER_SLEEPTIME); QThread::msleep(KSELECTIONOWNER_SLEEPTIME);
@ -115,7 +114,7 @@ bool KSelectionOwner::claim(const bool force)
return false; return false;
} }
kDebug(240) << "Waiting for" << d->atomname << "owner"; kDebug(240) << "Waiting for" << d->atomname << "owner";
currentowner = kWaitForOwner(d->x11display, d->x11atom); currentowner = kWaitForOwner(d->x11display, d->x11atom, currentowner);
} }
if (currentowner != None) { if (currentowner != None) {
kDebug(240) << d->atomname << "is owned, killing owner"; kDebug(240) << d->atomname << "is owned, killing owner";
@ -127,7 +126,7 @@ bool KSelectionOwner::claim(const bool force)
return false; return false;
} }
kDebug(240) << "Waiting for" << d->atomname << "owner"; kDebug(240) << "Waiting for" << d->atomname << "owner";
currentowner = kWaitForOwner(d->x11display, d->x11atom); currentowner = kWaitForOwner(d->x11display, d->x11atom, currentowner);
} }
if (currentowner != None) { if (currentowner != None) {
kWarning(240) << d->atomname << "is still owned"; kWarning(240) << d->atomname << "is still owned";