Fix view focusing

BuddiesOfBudgie · Oct 13, 2023 · 28e352a · 28e352a
1 parent 68180a5
commit 28e352a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 2 deletions.
diff --git a/src/input/cursor.cpp b/src/input/cursor.cpp
@@ -145,7 +145,7 @@ static void cursor_button_notify(wl_listener* listener, void* data) {
 		if (cursor.mode != MAGPIE_CURSOR_PASSTHROUGH) {
 			cursor.reset_mode();
 		}
-	} else if (typeid(magpie_surface) == typeid(View*)) {
+	} else if (magpie_surface != nullptr && magpie_surface->is_view()) {
 		/* Focus that client if the button was _pressed_ */
 		server.focus_view(*static_cast<View*>(magpie_surface), surface);
 	}

diff --git a/src/layer.cpp b/src/layer.cpp
@@ -137,3 +137,7 @@ Layer::~Layer() noexcept {
 inline Server& Layer::get_server() const {
 	return server;
 }
+
+bool Layer::is_view() const {
+	return false;
+}
diff --git a/src/layer.hpp b/src/layer.hpp
@@ -44,7 +44,8 @@ class Layer : public Surface {
 	Layer(Output& output, wlr_layer_surface_v1& surface) noexcept;
 	~Layer() noexcept;
 
-	inline Server& get_server() const;
+	inline Server& get_server() const override;
+	bool is_view() const override;
 };
 
 class LayerSubsurface {

diff --git a/src/popup.cpp b/src/popup.cpp
@@ -68,3 +68,7 @@ Popup::~Popup() noexcept {
 inline Server& Popup::get_server() const {
 	return server;
 }
+
+bool Popup::is_view() const {
+	return false;
+}
diff --git a/src/popup.hpp b/src/popup.hpp
@@ -35,6 +35,7 @@ class Popup : public Surface {
 	~Popup() noexcept;
 
 	Server& get_server() const override;
+	bool is_view() const override;
 };
 
 #endif
diff --git a/src/surface.hpp b/src/surface.hpp
@@ -17,6 +17,7 @@ struct Surface {
 	virtual ~Surface() noexcept {};
 
 	virtual Server& get_server() const = 0;
+	virtual bool is_view() const = 0;
 };
 
 #endif
diff --git a/src/view.cpp b/src/view.cpp
@@ -60,6 +60,10 @@ const std::optional<const Output*> View::find_output_for_maximize() {
 	return best_output;
 }
 
+bool View::is_view() const {
+	return true;
+}
+
 void View::begin_interactive(const CursorMode mode, const uint32_t edges) {
 	Server& server = get_server();
 

diff --git a/src/view.hpp b/src/view.hpp
@@ -29,6 +29,7 @@ struct View : public Surface {
 	virtual void map() = 0;
 	virtual void unmap() = 0;
 
+	bool is_view() const;
 	void begin_interactive(const CursorMode mode, const uint32_t edges);
 	void set_size(const int new_width, const int new_height);
 	void set_activated(const bool activated);