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

hyprland/focus_grab: wait for surface creation if null

Browse source 
Fixes an occasional crash with QWaylandWindow::surface() returning null.
This commit is contained in:
outfoxxed 2024-08-20 16:41:04 -07:00
parent fe1d15e8f6
commit f95e7dbaf6
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
3 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/wayland/hyprland/focus_grab/grab.cpp
View file

@ -19,18 +19,34 @@ FocusGrab::~FocusGrab() {
bool FocusGrab::isActive() const { return this->active; }
void FocusGrab::addWindow(QWindow* window) {
auto tryAddWayland = [this](QWaylandWindow* waylandWindow) {
if (waylandWindow->surface()) {
this->addWaylandWindow(waylandWindow);
this->sync();
} else {
QObject::connect(
waylandWindow,
&QWaylandWindow::surfaceCreated,
this,
[this, waylandWindow]() {
this->addWaylandWindow(waylandWindow);
this->sync();
}
);
}
};
if (auto* waylandWindow = dynamic_cast<QWaylandWindow*>(window->handle())) {
this->addWaylandWindow(waylandWindow);
tryAddWayland(waylandWindow);
} else {
QObject::connect(window, &QWindow::visibleChanged, this, [this, window]() {
QObject::connect(window, &QWindow::visibleChanged, this, [this, window, tryAddWayland]() {
if (window->isVisible()) {
if (window->handle() == nullptr) {
window->create();
}
auto* waylandWindow = dynamic_cast<QWaylandWindow*>(window->handle());
this->addWaylandWindow(waylandWindow);
this->sync();
tryAddWayland(waylandWindow);
}
});
}
@ -53,6 +69,8 @@ void FocusGrab::addWaylandWindow(QWaylandWindow* window) {
}
void FocusGrab::sync() {
if (this->transactionActive) return;
if (this->commitRequired) {
this->commit();
this->commitRequired = false;
@ -70,6 +88,13 @@ void FocusGrab::sync() {
}
}
void FocusGrab::startTransaction() { this->transactionActive = true; }
void FocusGrab::completeTransaction() {
this->transactionActive = false;
this->sync();
}
void FocusGrab::hyprland_focus_grab_v1_cleared() {
this->active = false;
emit this->cleared();