chore: remove unused stuff and refactor some things

Author: dy-tea

include/config.h

@@ -161,7 +161,6 @@ bool keybind_matches(const keybind_t *kb, uint32_t modifiers, xkb_keysym_t keysy
 	uint32_t keycode);
 void execute_keybind(const keybind_t *kb);
 void execute_bell_bind(void);
-int get_hotkey_watch_fd(void);
 void setup_hotkey_event_listener(struct wl_event_loop *event_loop);
 void enter_submap(const char *name);
 void exit_submap(void);
@@ -171,12 +170,10 @@ void set_keyboard_grouping(keyboard_grouping_t grouping);
 
 bool gesturebind_matches(const gesturebind_t *gb, enum gesture_type type, uint8_t fingers);
 void execute_gesturebind(const gesturebind_t *gb);
-void reload_gesturebinds(void);
 
 bool hotcornerbind_matches(const hotcornerbind_t *hc, int corner_x, int corner_y);
 hotcornerbind_t *hotcorner_bind_match(int corner_x, int corner_y);
 void execute_hotcornerbind(const hotcornerbind_t *hc);
-void reload_hotcornerbinds(void);
 
 void execute_bind(bind_t b);
 void execute_bind_action(bind_action_t action);

include/effects_backend.h

@@ -53,8 +53,6 @@ struct be_blur_params {
 	float refraction_rgb_fringing;
 	int refraction_texture_repeat_mode;
 	float refraction_offset;
-	float refraction_noise_strength;
-	float refraction_noise_scale;
 };
 
 struct be_shadow_params {

include/master_stack.h

@@ -27,7 +27,6 @@ extern stack_layout_t master_stack_layout;
 void master_stack_arrange(struct output_t *m, desktop_t *d, struct wlr_box available);
 
 int master_stack_collect(desktop_t *d, node_t ***out_nodes);
-int master_stack_find_index(desktop_t *d, const node_t *n);
 
 bool master_stack_focus_south(desktop_t *d);
 bool master_stack_focus_north(desktop_t *d);

include/surface.h

@@ -134,3 +134,5 @@ void surface_client_set_border_radius(struct client_t *client, float radius);
 void surface_client_set_shadow(struct client_t *client, bool enabled);
 
 void surface_set_opacity(struct wlr_scene_node *node, float opacity);
+void rounded_mark_border_size(struct surface_rounded_t *rounded, int content_w, int content_h,
+	int border_w, float scale);

include/toplevel.h

@@ -77,7 +77,6 @@ typedef struct toplevel_t {
 
 // helper functions
 void focus_toplevel(toplevel_t *toplevel);
-void toplevel_apply_geometry(toplevel_t *toplevel);
 bool toplevel_is_ready(toplevel_t *toplevel);
 void update_foreign_toplevel_state(toplevel_t *toplevel);
 void toplevel_center_and_clip_surface(toplevel_t *toplevel);

include/tree.h

@@ -41,6 +41,13 @@ node_t *second_extrema(node_t *n);
 node_t *next_leaf(node_t *n, node_t *r);
 node_t *prev_leaf(node_t *n, node_t *r);
 
+// Iterate over every leaf of the tree rooted at r. `it` is declared by the
+// macro and must be a fresh identifier (some callers break out of the loop).
+#define FOR_EACH_LEAF(it, r)                                                            \
+	for (node_t *it = first_extrema(r); it != NULL; it = next_leaf(it, r))
+#define FOR_EACH_LEAF_EXCLUDE_ROOT(it, r)                                               \
+	for (node_t *it = first_extrema(r); it != NULL && it != (r); it = next_leaf(it, r))
+
 // focus management
 bool focus_node(struct output_t *m, desktop_t *d, node_t *n);
 bool activate_node(struct output_t *m, desktop_t *d, node_t *n);
@@ -50,6 +57,7 @@ bool is_adjacent(node_t *a, node_t *b, direction_t dir);
 // node manipulation
 void swap_nodes(struct output_t *m1, desktop_t *d1, node_t *n1, struct output_t *m2, desktop_t *d2,
 	node_t *n2);
+int collect_tiled_leaves(desktop_t *d, node_t ***out_nodes);
 bool set_state(struct output_t *m, desktop_t *d, node_t *n, client_state_t s);
 void set_floating(struct output_t *m, desktop_t *d, node_t *n, bool value);
 void enter_fullscreen(struct output_t *m, desktop_t *d, node_t *n);
@@ -67,7 +75,6 @@ void equalize_tree(node_t *n);
 void balance_tree(node_t *n);
 
 // geometry
-struct wlr_box get_rectangle(struct output_t *m, node_t *n);
 unsigned int node_area(node_t *n);
 
 // Transaction helpers
@@ -81,7 +88,6 @@ void node_set_pending_hidden(node_t *n, bool hidden);
 void parse_color(const char *hex, float *color);
 
 // Debug helpers
-void print_tree(node_t *n, int depth);
 void validate_tree(const char *context, desktop_t *d);
 
 struct wlr_scene_tree *client_get_scene_tree(client_t *client);

src/config.c

@@ -1295,10 +1295,6 @@ void execute_bell_bind(void) {
 		execute_keybind(&bell_bind);
 }
 
-int get_hotkey_watch_fd(void) {
-	return hotkey_watch_fd;
-}
-
 void setup_hotkey_event_listener(struct wl_event_loop *event_loop) {
 	hotkey_event_loop = event_loop;
 	add_hotkey_listener_to_event_loop();
@@ -1377,10 +1373,6 @@ void execute_gesturebind(const gesturebind_t *gb) {
 	execute_bind(bind);
 }
 
-void reload_gesturebinds(void) {
-	num_gesturebinds = 0;
-}
-
 bool hotcornerbind_matches(const hotcornerbind_t *hc, int corner_x, int corner_y) {
 	if (!hc)
 		return false;
@@ -1409,10 +1401,6 @@ void execute_hotcornerbind(const hotcornerbind_t *hc) {
 	execute_bind(bind);
 }
 
-void reload_hotcornerbinds(void) {
-	num_hotcornerbinds = 0;
-}
-
 const char *bind_action_name(bind_action_t action) {
 	static const char *names[] = {
 		"none",

src/cursor.c

@@ -165,7 +165,7 @@ static void apply_leaf_positions(desktop_t *d) {
 	if (!d || !d->root)
 		return;
 
-	for (node_t *n = first_extrema(d->root); n; n = next_leaf(n, d->root)) {
+	FOR_EACH_LEAF(n, d->root) {
 		if (!n->client)
 			continue;
 
@@ -202,19 +202,10 @@ static void apply_leaf_positions(desktop_t *d) {
 			if (n->client->border_radius > 0.0f) {
 				surface_rounded_t *rounded = client_get_rounded(n->client);
 				if (rounded) {
-					int new_fw = r.width + 2 * (int)bw;
-					int new_fh = r.height + 2 * (int)bw;
-					if (new_fw > 0 && new_fh > 0) {
-						float scale = n->client->toplevel && n->client->toplevel->node &&
-							n->client->toplevel->node->output ? n->client->toplevel->node->output->wlr_output->scale :
-							1.0f;
-						int pfw = (int)((double)new_fw * scale + 0.5);
-						int pfh = (int)((double)new_fh * scale + 0.5);
-						if (rounded->border_shader_buf_w != pfw || rounded->border_shader_buf_h != pfh) {
-							rounded->border_dirty = true;
-							rounded->corner_mask_dirty = true;
-						}
-					}
+					rounded_mark_border_size(rounded, r.width, r.height, (int)bw,
+						n->client->toplevel && n->client->toplevel->node &&
+							n->client->toplevel->node->output ?
+							n->client->toplevel->node->output->wlr_output->scale : 1.0f);
 				}
 			}
 		}
@@ -493,19 +484,8 @@ static void process_cursor_resize(void) {
 		update_borders(toplevel->border_tree, toplevel->border_rects, geo, bw);
 		update_border_colors(client);
 		if (client->border_radius > 0.0f && toplevel->rounded) {
-			int new_fw = new_width + 2 * (int)bw;
-			int new_fh = new_height + 2 * (int)bw;
-			if (new_fw > 0 && new_fh > 0) {
-				float scale = toplevel->node &&
-					toplevel->node->output ? toplevel->node->output->wlr_output->scale : 1.0f;
-				int pfw = (int)((double)new_fw * scale + 0.5);
-				int pfh = (int)((double)new_fh * scale + 0.5);
-				if (toplevel->rounded->border_shader_buf_w != pfw ||
-						toplevel->rounded->border_shader_buf_h != pfh) {
-					toplevel->rounded->border_dirty = true;
-					toplevel->rounded->corner_mask_dirty = true;
-				}
-			}
+			rounded_mark_border_size(toplevel->rounded, new_width, new_height, (int)bw,
+				toplevel->node && toplevel->node->output ? toplevel->node->output->wlr_output->scale : 1.0f);
 		}
 	}
 }

src/effects.c

@@ -92,8 +92,6 @@ float refraction_normal_pow = 6.0f;
 float refraction_rgb_fringing = 22.0f / 30.0f;
 int refraction_texture_repeat_mode = 1;
 float refraction_offset = 1.0f;
-float refraction_noise_strength = 0.03f;
-float refraction_noise_scale = 1.0f;
 
 float shadow_size = 8.0f;
 float shadow_offset_x = 0.0f;
@@ -771,8 +769,6 @@ static bool rebuild_live_blur(output_t *output, uint64_t shared_blurred, pixman_
 		.refraction_rgb_fringing = refraction_rgb_fringing,
 		.refraction_texture_repeat_mode = refraction_texture_repeat_mode,
 		.refraction_offset = refraction_offset,
-		.refraction_noise_strength = refraction_noise_strength,
-		.refraction_noise_scale = refraction_noise_scale,
 	};
 
 	bool keep_blur = ctx->blur_buf && ctx->blur_native[0] && ctx->blur_gen == ctx->backdrop_gen;

src/effects_gles2.c

@@ -117,7 +117,6 @@ struct gles2_data {
 	GLint screen_shader_u_tex;
 	GLint screen_shader_u_resolution;
 	GLint screen_shader_u_time;
-	struct timespec screen_shader_start_time;
 
 	GLuint vbo;
 	GLint attr_pos;
@@ -1185,7 +1184,6 @@ static bool gles2_compile_screen_shader(const char *frag_src) {
 	g->screen_shader_u_tex = glGetUniformLocation(prog, "tex");
 	g->screen_shader_u_resolution = glGetUniformLocation(prog, "resolution");
 	g->screen_shader_u_time = glGetUniformLocation(prog, "time");
-	clock_gettime(CLOCK_MONOTONIC, &g->screen_shader_start_time);
 	return true;
 }