From fee25b89cd494644d5fa6cc11b72cefa9f706ccd Mon Sep 17 00:00:00 2001
From: Keith Bowes <keithbowes@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:48:37 -0500
Subject: [PATCH] Removed support for wlroots 0.18

---
 meson.build        |  2 +-
 waybox/cursor.c    |  5 -----
 waybox/seat.c      |  5 -----
 waybox/server.c    |  7 ++-----
 waybox/xdg_shell.c | 10 ----------
 5 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/meson.build b/meson.build
index 3626ba9..50e1865 100644
--- a/meson.build
+++ b/meson.build
@@ -29,7 +29,7 @@ inc_dir = include_directories('include')
 if get_option('wlroots-version') != ''
   wlroots_version = get_option('wlroots-version')
 else
-  wlroots_version = ['wlroots-0.20', 'wlroots-0.19', 'wlroots-0.18']
+  wlroots_version = ['wlroots-0.20', 'wlroots-0.19']
 endif
 
 libevdev = dependency('libevdev')
diff --git a/waybox/cursor.c b/waybox/cursor.c
index d4d5e75..5cfa170 100644
--- a/waybox/cursor.c
+++ b/waybox/cursor.c
@@ -50,12 +50,7 @@ static void process_cursor_resize(struct wb_server *server) {
 		}
 	}
 
-#if WLR_CHECK_VERSION(0, 19, 0)
 	struct wlr_box geo_box = toplevel->xdg_toplevel->base->geometry;
-#else
-	struct wlr_box geo_box;
-	wlr_xdg_surface_get_geometry(toplevel->xdg_toplevel->base, &geo_box);
-#endif
 	toplevel->geometry.x = new_left - geo_box.x;
 	toplevel->geometry.y = new_top - geo_box.y;
 		wlr_scene_node_set_position(&toplevel->scene_tree->node,
diff --git a/waybox/seat.c b/waybox/seat.c
index 129d545..c067d92 100644
--- a/waybox/seat.c
+++ b/waybox/seat.c
@@ -123,12 +123,7 @@ static bool handle_keybinding(struct wb_server *server, xkb_keysym_t sym, uint32
 			if (key_binding->action & ACTION_SHADE) {
 				struct wb_toplevel *toplevel = wl_container_of(server->toplevels.next, toplevel, link);
 				if (toplevel->scene_tree->node.enabled) {
-#if WLR_CHECK_VERSION(0, 19, 0)
 					struct wlr_box geo_box = toplevel->xdg_toplevel->base->geometry;
-#else
-					struct wlr_box geo_box;
-					wlr_xdg_surface_get_geometry(toplevel->xdg_toplevel->base, &geo_box);
-#endif
 					int decoration_height = MAX(geo_box.y - toplevel->geometry.y, TITLEBAR_HEIGHT);
 
 					toplevel->previous_geometry = toplevel->geometry;
diff --git a/waybox/server.c b/waybox/server.c
index ece36c4..4d98066 100644
--- a/waybox/server.c
+++ b/waybox/server.c
@@ -1,13 +1,11 @@
 #include <wlr/types/wlr_data_control_v1.h>
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_viewporter.h>
+#include <wlr/types/wlr_xdg_toplevel_icon_v1.h>
 
 #include "idle.h"
 #include "waybox/server.h"
 #include "waybox/xdg_shell.h"
-#if WLR_CHECK_VERSION(0, 19, 0)
-#	include <wlr/types/wlr_xdg_toplevel_icon_v1.h>
-#endif
 
 bool wb_create_backend(struct wb_server* server) {
 	/* The Wayland display is managed by libwayland. It handles accepting
@@ -125,11 +123,10 @@ bool wb_start_server(struct wb_server* server) {
 
 	wlr_fractional_scale_manager_v1_create(server->wl_display, 1);
 	wlr_viewporter_create(server->wl_display);
-#if WLR_CHECK_VERSION(0, 19, 0)
+
 	struct wlr_xdg_toplevel_icon_manager_v1 * icon_manager = wlr_xdg_toplevel_icon_manager_v1_create(server->wl_display, 1);
 	int sizes[] = {16, 24, 32, 48, 64};
 	wlr_xdg_toplevel_icon_manager_v1_set_sizes(icon_manager, (int *) sizes, 5);
-#endif
 
 	return true;
 }
diff --git a/waybox/xdg_shell.c b/waybox/xdg_shell.c
index 97bf259..7389440 100644
--- a/waybox/xdg_shell.c
+++ b/waybox/xdg_shell.c
@@ -103,12 +103,7 @@ static void xdg_toplevel_map(struct wl_listener *listener, void *data) {
 
 	struct wb_config *config = toplevel->server->config;
 	struct wlr_box usable_area = get_usable_area(toplevel);
-#if WLR_CHECK_VERSION(0, 19, 0)
 	struct wlr_box geo_box = toplevel->xdg_toplevel->base->geometry;
-#else
-	struct wlr_box geo_box = {0};
-	wlr_xdg_surface_get_geometry(toplevel->xdg_toplevel->base, &geo_box);
-#endif
 
 	if (config) {
 		toplevel->geometry.height = MIN(geo_box.height,
@@ -313,12 +308,7 @@ static void begin_interactive(struct wb_toplevel *toplevel,
 		server->grab_x = server->cursor->cursor->x - toplevel->geometry.x;
 		server->grab_y = server->cursor->cursor->y - toplevel->geometry.y;
 	} else if (mode == WB_CURSOR_RESIZE) {
-#if WLR_CHECK_VERSION(0, 19, 0)
 		struct wlr_box geo_box = toplevel->xdg_toplevel->base->geometry;
-#else
-		struct wlr_box geo_box;
-		wlr_xdg_surface_get_geometry(toplevel->xdg_toplevel->base, &geo_box);
-#endif
 
 		double border_x = (toplevel->geometry.x + geo_box.x) +
 			((edges & WLR_EDGE_RIGHT) ? geo_box.width : 0);