poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

wayland/toplevel: refactor toplevel output tracking to its own file

Browse source
This commit is contained in:
outfoxxed 2025-06-24 18:52:19 -07:00
parent 20c3da01f1
commit 27f97c3283
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
6 changed files with 119 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/wayland/toplevel_management/handle.cpp
View file

@ -23,7 +23,6 @@ namespace qs::wayland::toplevel_management::impl {
QString ToplevelHandle::appId() const { return this->mAppId; }
QString ToplevelHandle::title() const { return this->mTitle; }
QVector<QScreen*> ToplevelHandle::visibleScreens() const { return this->mVisibleScreens; }
ToplevelHandle* ToplevelHandle::parent() const { return this->mParent; }
bool ToplevelHandle::activated() const { return this->mActivated; }
bool ToplevelHandle::maximized() const { return this->mMaximized; }
@ -181,59 +180,13 @@ void ToplevelHandle::zwlr_foreign_toplevel_handle_v1_state(wl_array* stateArray)
}
void ToplevelHandle::zwlr_foreign_toplevel_handle_v1_output_enter(wl_output* output) {
auto* display = QtWaylandClient::QWaylandIntegration::instance()->display();
auto* platformScreen = display->screenForOutput(output);
if (!platformScreen) {
qCDebug(logToplevelManagement) << this << "got pending output enter" << output;
if (this->mPendingVisibleScreens.isEmpty()) {
QObject::connect(
static_cast<QGuiApplication*>(QGuiApplication::instance()), // NOLINT
&QGuiApplication::screenAdded,
this,
&ToplevelHandle::onScreenAdded
);
}
this->mPendingVisibleScreens.append(output);
return;
}
auto* screen = platformScreen->screen();
qCDebug(logToplevelManagement) << this << "got output enter" << screen;
this->mVisibleScreens.append(screen);
emit this->visibleScreenAdded(screen);
qCDebug(logToplevelManagement) << this << "got output enter" << output;
this->visibleScreens.addOutput(output);
}
void ToplevelHandle::zwlr_foreign_toplevel_handle_v1_output_leave(wl_output* output) {
auto* display = QtWaylandClient::QWaylandIntegration::instance()->display();
auto* platformScreen = display->screenForOutput(output);
if (!this->mPendingVisibleScreens.isEmpty()) {
this->mPendingVisibleScreens.removeOne(output);
if (this->mPendingVisibleScreens.isEmpty()) {
qCDebug(logToplevelManagement) << this << "got pending output leave" << output;
QObject::disconnect(
static_cast<QGuiApplication*>(QGuiApplication::instance()), // NOLINT
nullptr,
this,
nullptr
);
}
}
if (!platformScreen) return;
auto* screen = platformScreen->screen();
qCDebug(logToplevelManagement) << this << "got output leave" << screen;
this->mVisibleScreens.removeOne(screen);
emit this->visibleScreenRemoved(screen);
qCDebug(logToplevelManagement) << this << "got output leave" << output;
this->visibleScreens.removeOutput(output);
}
void ToplevelHandle::zwlr_foreign_toplevel_handle_v1_parent(
@ -262,26 +215,4 @@ void ToplevelHandle::onParentClosed() {
emit this->parentChanged();
}
void ToplevelHandle::onScreenAdded(QScreen* screen) {
auto* waylandScreen = dynamic_cast<QtWaylandClient::QWaylandScreen*>(screen->handle());
if (!waylandScreen) return;
auto* output = waylandScreen->output();
if (this->mPendingVisibleScreens.removeOne(output)) {
qCDebug(logToplevelManagement) << this << "got pending entered output init" << screen;
this->mVisibleScreens.append(screen);
emit this->visibleScreenAdded(screen);
}
if (this->mPendingVisibleScreens.isEmpty()) {
QObject::disconnect(
static_cast<QGuiApplication*>(QGuiApplication::instance()), // NOLINT
nullptr,
this,
nullptr
);
}
}
} // namespace qs::wayland::toplevel_management::impl