aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2025-11-06 19:14:57 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3/ipc: fix workspace and monitor focus being unset on launch

Browse source
This commit is contained in:
outfoxxed 2025-03-27 15:56:53 -07:00
parent 2028766e61
commit 14aa1793df
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
5 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/x11/i3/ipc/connection.cpp
View file

@ -99,6 +99,8 @@ void I3Ipc::subscribe() {
this->makeRequest(message);
// Workspaces must be refreshed before monitors or no focus will be
// detected on launch.
this->refreshWorkspaces();
this->refreshMonitors();
}
@ -250,6 +252,10 @@ void I3Ipc::handleGetWorkspacesEvent(I3IpcEvent* event) {
this->mWorkspaces.insertObjectSorted(workspace, &I3Ipc::compareWorkspaces);
}
if (!this->bFocusedWorkspace && object.value("focused").value<bool>()) {
this->bFocusedMonitor = workspace->bindableMonitor().value();
}
names.push_back(name);
}
@ -466,13 +472,23 @@ I3Workspace* I3Ipc::findWorkspaceByName(const QString& name) {
return workspaceIter == list.end() ? nullptr : *workspaceIter;
}
I3Monitor* I3Ipc::findMonitorByName(const QString& name) {
I3Monitor* I3Ipc::findMonitorByName(const QString& name, bool createIfMissing) {
auto list = this->mMonitors.valueList();
auto monitorIter = std::ranges::find_if(list, [name](I3Monitor* m) {
return m->bindableName().value() == name;
});
return monitorIter == list.end() ? nullptr : *monitorIter;
if (monitorIter != list.end()) {
return *monitorIter;
} else if (createIfMissing) {
qCDebug(logI3Ipc) << "Monitor" << name << "requested before creation, performing early init";
auto* monitor = new I3Monitor(this);
monitor->updateInitial(name);
this->mMonitors.insertObject(monitor);
return monitor;
} else {
return nullptr;
}
}
ObjectModel<I3Monitor>* I3Ipc::monitors() { return &this->mMonitors; }