wayland/shortcuts-inhibit: cleanups, move setup to constructor

Author: bbedward

src/wayland/shortcuts_inhibit/inhibitor.cpp

@@ -15,6 +15,10 @@ ShortcutsInhibitor::ShortcutsInhibitor() {
 	this->bBoundWindow.setBinding([this] {
 		return this->bEnabled ? this->bWindowObject.value() : nullptr;
 	});
+
+	this->bActive.setBinding([this]() {
+		return this->inhibitor ? this->inhibitor->bindableActive().value() : false;
+	});
 }
 
 ShortcutsInhibitor::~ShortcutsInhibitor() {
@@ -87,7 +91,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;
 
@@ -132,12 +139,6 @@ void ShortcutsInhibitor::onWaylandSurfaceCreated() {
 	}
 
 	this->inhibitor = manager->createShortcutsInhibitor(this->mWaylandWindow);
-
-	if (this->inhibitor) {
-		this->bActive.setBinding([this]() {
-			return this->inhibitor ? this->inhibitor->bindableActive().value() : false;
-		});
-	}
 }
 
 void ShortcutsInhibitor::onWaylandSurfaceDestroyed() {

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();

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();
@@ -42,7 +44,7 @@ class ShortcutsInhibitor
 	~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; }