wayland/shortcuts-inhibit: make inhibitor a bindable

Author: bbedward

src/wayland/shortcuts_inhibit/inhibitor.cpp

@@ -2,6 +2,7 @@
 
 #include <private/qwaylandwindow_p.h>
 #include <qlogging.h>
+#include <qloggingcategory.h>
 #include <qobject.h>
 
 #include "../../window/proxywindow.hpp"
@@ -11,19 +12,29 @@
 namespace qs::wayland::shortcuts_inhibit {
 using QtWaylandClient::QWaylandWindow;
 
-ShortcutsInhibitor::ShortcutsInhibitor() {
+ShortcutsInhibitor::ShortcutsInhibitor()
+    : bEnabled(false)
+    , bWindowObject(nullptr)
+    , bBoundWindow(nullptr)
+    , bInhibitor(nullptr)
+    , bActive(false) {
 	this->bBoundWindow.setBinding([this] {
 		return this->bEnabled ? this->bWindowObject.value() : nullptr;
 	});
+
+	this->bActive.setBinding([this]() {
+		auto* inhibitor = this->bInhibitor.value();
+		return inhibitor ? inhibitor->bindableActive().value() : false;
+	});
 }
 
 ShortcutsInhibitor::~ShortcutsInhibitor() {
-	if (!this->inhibitor) return;
+	if (!this->bInhibitor) return;
 
 	auto* manager = impl::ShortcutsInhibitManager::instance();
 	if (!manager) return;
 
-	manager->unrefShortcutsInhibitor(this->inhibitor);
+	manager->unrefShortcutsInhibitor(this->bInhibitor);
 }
 
 QObject* ShortcutsInhibitor::window() const { return this->bWindowObject; }
@@ -87,7 +98,10 @@ void ShortcutsInhibitor::onWindowVisibilityChanged() {
 	if (!window->handle()) window->create();
 
 	auto* waylandWindow = dynamic_cast<QWaylandWindow*>(window->handle());
-	if (!waylandWindow) return;
+	if (!waylandWindow) {
+		qCCritical(impl::logShortcutsInhibit()) << "Window handle is not a QWaylandWindow";
+		return;
+	}
 	if (waylandWindow == this->mWaylandWindow) return;
 	this->mWaylandWindow = waylandWindow;
 
@@ -127,27 +141,23 @@ void ShortcutsInhibitor::onWaylandSurfaceCreated() {
 		return;
 	}
 
-	if (this->inhibitor) {
+	if (this->bInhibitor) {
 		qFatal("ShortcutsInhibitor: inhibitor already exists when creating surface");
 	}
 
-	this->inhibitor = manager->createShortcutsInhibitor(this->mWaylandWindow);
-
-	if (this->inhibitor) {
-		this->bActive.setBinding([this]() {
-			return this->inhibitor ? this->inhibitor->bindableActive().value() : false;
-		});
-	}
+	this->bInhibitor = manager->createShortcutsInhibitor(this->mWaylandWindow);
 }
 
 void ShortcutsInhibitor::onWaylandSurfaceDestroyed() {
-	if (!this->inhibitor) return;
+	if (!this->bInhibitor) return;
 
 	auto* manager = impl::ShortcutsInhibitManager::instance();
 	if (!manager) return;
 
-	manager->unrefShortcutsInhibitor(this->inhibitor);
-	this->inhibitor = nullptr;
+	manager->unrefShortcutsInhibitor(this->bInhibitor);
+	this->bInhibitor = nullptr;
 }
 
+void ShortcutsInhibitor::inhibitorChanged() {}
+
 } // namespace qs::wayland::shortcuts_inhibit

src/wayland/shortcuts_inhibit/inhibitor.hpp

@@ -50,7 +50,7 @@ class ShortcutsInhibitor: public QObject {
 	void setWindow(QObject* window);
 
 	[[nodiscard]] QBindable<bool> bindableEnabled() { return &this->bEnabled; }
-	[[nodiscard]] QBindable<bool> bindableActive() { return &this->bActive; }
+	[[nodiscard]] QBindable<bool> bindableActive() const { return &this->bActive; }
 
 signals:
 	void enabledChanged();
@@ -66,15 +66,15 @@ private slots:
 
 private:
 	void boundWindowChanged();
+	void inhibitorChanged();
 	ProxyWindowBase* proxyWindow = nullptr;
 	QtWaylandClient::QWaylandWindow* mWaylandWindow = nullptr;
 
-	impl::ShortcutsInhibitor* inhibitor = nullptr;
-
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(ShortcutsInhibitor, bool, bEnabled, &ShortcutsInhibitor::enabledChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(ShortcutsInhibitor, QObject*, bWindowObject, &ShortcutsInhibitor::windowChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(ShortcutsInhibitor, QObject*, bBoundWindow, &ShortcutsInhibitor::boundWindowChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(ShortcutsInhibitor, impl::ShortcutsInhibitor*, bInhibitor, &ShortcutsInhibitor::inhibitorChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(ShortcutsInhibitor, bool, bActive, &ShortcutsInhibitor::activeChanged);
 	// clang-format on
 };

src/wayland/shortcuts_inhibit/proto.cpp

@@ -13,9 +13,7 @@
 
 namespace qs::wayland::shortcuts_inhibit::impl {
 
-namespace {
 QS_LOGGING_CATEGORY(logShortcutsInhibit, "quickshell.wayland.shortcuts_inhibit", QtWarningMsg);
-}
 
 ShortcutsInhibitManager::ShortcutsInhibitManager(): QWaylandClientExtensionTemplate(1) {
 	this->initialize();
@@ -54,18 +52,6 @@ ShortcutsInhibitManager::createShortcutsInhibitor(QtWaylandClient::QWaylandWindo
 	return inhibitor;
 }
 
-void ShortcutsInhibitManager::refShortcutsInhibitor(ShortcutsInhibitor* inhibitor) {
-	if (!inhibitor) return;
-
-	auto* surface = inhibitor->surface();
-	if (!this->inhibitors.contains(surface)) return;
-
-	auto& pair = this->inhibitors[surface];
-	pair.second++;
-	qCDebug(logShortcutsInhibit) << "Incremented refcount for inhibitor" << inhibitor
-	                             << "- refcount:" << pair.second;
-}
-
 void ShortcutsInhibitManager::unrefShortcutsInhibitor(ShortcutsInhibitor* inhibitor) {
 	if (!inhibitor) return;
 

src/wayland/shortcuts_inhibit/proto.hpp

@@ -7,10 +7,13 @@
 #include <qwayland-keyboard-shortcuts-inhibit-unstable-v1.h>
 #include <qwaylandclientextension.h>
 
+#include "../../core/logcat.hpp"
 #include "wayland-keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
 
 namespace qs::wayland::shortcuts_inhibit::impl {
 
+QS_DECLARE_LOGGING_CATEGORY(logShortcutsInhibit);
+
 class ShortcutsInhibitor;
 
 class ShortcutsInhibitManager
@@ -20,7 +23,6 @@ class ShortcutsInhibitManager
 	explicit ShortcutsInhibitManager();
 
 	ShortcutsInhibitor* createShortcutsInhibitor(QtWaylandClient::QWaylandWindow* surface);
-	void refShortcutsInhibitor(ShortcutsInhibitor* inhibitor);
 	void unrefShortcutsInhibitor(ShortcutsInhibitor* inhibitor);
 
 	static ShortcutsInhibitManager* instance();
@@ -37,21 +39,24 @@ class ShortcutsInhibitor
 public:
 	explicit ShortcutsInhibitor(::zwp_keyboard_shortcuts_inhibitor_v1* inhibitor, wl_surface* surface)
 	    : QtWayland::zwp_keyboard_shortcuts_inhibitor_v1(inhibitor)
-	    , mSurface(surface) {}
+	    , mSurface(surface)
+	    , bActive(false) {}
 
 	~ShortcutsInhibitor() override;
 	Q_DISABLE_COPY_MOVE(ShortcutsInhibitor);
 
-	[[nodiscard]] QBindable<bool> bindableActive() { return &this->bActive; }
+	[[nodiscard]] QBindable<bool> bindableActive() const { return &this->bActive; }
 	[[nodiscard]] bool isActive() const { return this->bActive; }
 	[[nodiscard]] wl_surface* surface() const { return this->mSurface; }
 
 signals:
 	void activeChanged();
 
 protected:
+	// NOLINTBEGIN(readability-identifier-naming)
 	void zwp_keyboard_shortcuts_inhibitor_v1_active() override;
 	void zwp_keyboard_shortcuts_inhibitor_v1_inactive() override;
+	// NOLINTEND(readability-identifier-naming)
 
 private:
 	wl_surface* mSurface;