yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwl: simplify logic of boolean function

Browse source
This commit is contained in:
Aleix Pol 2020-10-20 02:13:42 +02:00
parent 6ec13c41a5
commit e81e950693
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwl/clipboard.cpp
View file

@ -66,7 +66,7 @@ Clipboard::Clipboard(xcb_atom_t atom, QObject *parent)
void Clipboard::wlSelectionChanged(KWaylandServer::AbstractDataSource *dsi) void Clipboard::wlSelectionChanged(KWaylandServer::AbstractDataSource *dsi)
{ {
if (dsi && !ownsSelection(dsi)) { if (!ownsSelection(dsi)) {
// Wayland native client provides new selection // Wayland native client provides new selection
if (!m_checkConnection) { if (!m_checkConnection) {
m_checkConnection = connect(workspace(), &Workspace::clientActivated, m_checkConnection = connect(workspace(), &Workspace::clientActivated,
@ -80,7 +80,7 @@ void Clipboard::wlSelectionChanged(KWaylandServer::AbstractDataSource *dsi)
bool Clipboard::ownsSelection(KWaylandServer::AbstractDataSource *dsi) const bool Clipboard::ownsSelection(KWaylandServer::AbstractDataSource *dsi) const
{ {
return dsi->client() == DataBridge::self()->dataDeviceIface()->client(); return dsi && dsi->client() == DataBridge::self()->dataDeviceIface()->client();
} }
void Clipboard::checkWlSource() void Clipboard::checkWlSource()
@ -173,7 +173,7 @@ void Clipboard::x11OffersChanged(const QStringList &added, const QStringList &re
} }
} else { } else {
KWaylandServer::AbstractDataSource *currentSelection = waylandServer()->seat()->selection(); KWaylandServer::AbstractDataSource *currentSelection = waylandServer()->seat()->selection();
if (currentSelection && !ownsSelection(currentSelection)) { if (!ownsSelection(currentSelection)) {
waylandServer()->seat()->setSelection(nullptr); waylandServer()->seat()->setSelection(nullptr);
} }
} }