i3/ipc: general cleanup + add active property

Brings the I3 ipc interface inline with the Hyprland one.
This commit is contained in:
outfoxxed 2025-03-27 00:05:05 -07:00
parent 8f11d60999
commit 67b2682604
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
8 changed files with 153 additions and 135 deletions

View file

@ -1,6 +1,7 @@
#include "qml.hpp"
#include <qobject.h>
#include <qproperty.h>
#include <qstring.h>
#include "../../../core/model.hpp"
@ -13,32 +14,28 @@ namespace qs::i3::ipc {
I3IpcQml::I3IpcQml() {
auto* instance = I3Ipc::instance();
// clang-format off
QObject::connect(instance, &I3Ipc::rawEvent, this, &I3IpcQml::rawEvent);
QObject::connect(instance, &I3Ipc::connected, this, &I3IpcQml::connected);
QObject::connect(
instance,
&I3Ipc::focusedWorkspaceChanged,
this,
&I3IpcQml::focusedWorkspaceChanged
);
QObject::connect(instance, &I3Ipc::focusedWorkspaceChanged, this, &I3IpcQml::focusedWorkspaceChanged);
QObject::connect(instance, &I3Ipc::focusedMonitorChanged, this, &I3IpcQml::focusedMonitorChanged);
// clang-format on
}
void I3IpcQml::dispatch(const QString& request) { I3Ipc::instance()->dispatch(request); }
void I3IpcQml::refreshMonitors() { I3Ipc::instance()->refreshMonitors(); }
void I3IpcQml::refreshWorkspaces() { I3Ipc::instance()->refreshWorkspaces(); }
QString I3IpcQml::socketPath() { return I3Ipc::instance()->socketPath(); }
ObjectModel<I3Monitor>* I3IpcQml::monitors() { return I3Ipc::instance()->monitors(); }
ObjectModel<I3Workspace>* I3IpcQml::workspaces() { return I3Ipc::instance()->workspaces(); }
I3Workspace* I3IpcQml::focusedWorkspace() { return I3Ipc::instance()->focusedWorkspace(); }
QBindable<I3Workspace*> I3IpcQml::bindableFocusedWorkspace() {
return I3Ipc::instance()->bindableFocusedWorkspace();
}
I3Monitor* I3IpcQml::focusedMonitor() { return I3Ipc::instance()->focusedMonitor(); }
QBindable<I3Monitor*> I3IpcQml::bindableFocusedMonitor() {
return I3Ipc::instance()->bindableFocusedMonitor();
}
I3Workspace* I3IpcQml::findWorkspaceByName(const QString& name) {
return I3Ipc::instance()->findWorkspaceByName(name);