From bdaf85eda11befa5882f6dcd17786b393022ef76 Mon Sep 17 00:00:00 2001
From: tokyo4j <hrak1529@gmail.com>
Date: Mon, 28 Jul 2025 13:54:10 +0900
Subject: [PATCH] Fix some warnings from clang-tidy

Notably this fixes a possible null pointer dereference in warp_cursor()
when output_nearest_to_cursor() returns null.
---
 src/action.c       | 11 +++++------
 src/input/cursor.c |  1 +
 src/xdg.c          |  3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/action.c b/src/action.c
index 6df68979..8bde5098 100644
--- a/src/action.c
+++ b/src/action.c
@@ -823,8 +823,9 @@ get_target_output(struct output *output, struct server *server,
 }
 
 static void
-warp_cursor(struct view *view, struct output *output, const char *to, const char *x, const char *y)
+warp_cursor(struct server *server, struct view *view, const char *to, const char *x, const char *y)
 {
+	struct output *output = output_nearest_to_cursor(server);
 	struct wlr_box target_area = {0};
 	int goto_x;
 	int goto_y;
@@ -855,8 +856,8 @@ warp_cursor(struct view *view, struct output *output, const char *to, const char
 			target_area.y + target_area.height + offset_y;
 	}
 
-	wlr_cursor_warp(output->server->seat.cursor, NULL, goto_x, goto_y);
-	cursor_update_focus(output->server);
+	wlr_cursor_warp(server->seat.cursor, NULL, goto_x, goto_y);
+	cursor_update_focus(server);
 }
 
 void
@@ -1352,9 +1353,7 @@ actions_run(struct view *activator, struct server *server,
 			const char *to = action_get_str(action, "to", "output");
 			const char *x = action_get_str(action, "x", "center");
 			const char *y = action_get_str(action, "y", "center");
-			struct output *output = output_nearest_to_cursor(server);
-
-			warp_cursor(view, output, to, x, y);
+			warp_cursor(server, view, to, x, y);
 			break;
 		}
 		case ACTION_TYPE_HIDE_CURSOR:
diff --git a/src/input/cursor.c b/src/input/cursor.c
index 6ce81dab..a0d9b3fd 100644
--- a/src/input/cursor.c
+++ b/src/input/cursor.c
@@ -302,6 +302,7 @@ process_cursor_resize(struct server *server, uint32_t time)
 	static uint32_t last_resize_time = 0;
 	static struct view *last_resize_view = NULL;
 
+	assert(server->grabbed_view);
 	if (server->grabbed_view == last_resize_view) {
 		int32_t refresh = 0;
 		if (output_is_usable(last_resize_view->output)) {
diff --git a/src/xdg.c b/src/xdg.c
index 5621e07e..be8cfc20 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -1054,9 +1054,6 @@ static void
 handle_xdg_toplevel_icon_set_icon(struct wl_listener *listener, void *data)
 {
 	struct wlr_xdg_toplevel_icon_manager_v1_set_icon_event *event = data;
-
-	struct server *server =
-		wl_container_of(listener, server, xdg_toplevel_icon_set_icon);
 	struct wlr_xdg_surface *xdg_surface = event->toplevel->base;
 	struct view *view = xdg_surface->data;
 	assert(view);