chore: even more refactoring

Author: dy-tea

include/effects_backend.h

@@ -13,7 +13,6 @@ struct wlr_output_state;
 #define BLUR_MAX_LEVELS 10
 
 typedef struct {
-	struct wlr_buffer *buf;
 	uint64_t native_handle[2];
 	int width, height;
 } be_buffer_t;
@@ -38,7 +37,6 @@ struct be_blur_params {
 	enum blur_algorithm algorithm;
 	int passes;
 	float radius;
-	int downsample;
 	float vibrancy, vibrancy_darkness;
 	float noise_strength;
 	float brightness;

include/input.h

@@ -94,7 +94,5 @@ void input_apply_config(struct wlr_input_device *device);
 void input_apply_config_all_keyboards(void);
 void input_apply_config_all_pointers(void);
 
-const char *input_config_type_str(enum input_config_type type);
-
 extern input_config_t *input_configs[MAX_INPUT_CONFIGS];
 extern size_t num_input_configs;

include/ipc.h

@@ -51,7 +51,6 @@ void ipc_init(void);
 int ipc_get_socket_fd(void);
 void ipc_handle_incoming(int client_fd);
 void ipc_fini(void);
-const char *ipc_get_socket_path(void);
 
 void ipc_put_status(subscriber_mask_t mask, const char *fmt, ...);
 bool ipc_print_report(int fd);

include/tree.h

@@ -52,7 +52,6 @@ node_t *prev_leaf(node_t *n, node_t *r);
 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);
 node_t *find_fence(node_t *n, direction_t dir);
-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,
@@ -79,10 +78,7 @@ unsigned int node_area(node_t *n);
 
 // Transaction helpers
 void node_set_dirty(node_t *n);
-void node_set_pending_size(node_t *n, int width, int height);
-void node_set_pending_position(node_t *n, int x, int y);
 void node_set_pending_rectangle(node_t *n, struct wlr_box rect);
-void node_set_pending_hidden(node_t *n, bool hidden);
 
 // Color helpers
 void parse_color(const char *hex, float *color);

src/effects.c

@@ -687,9 +687,6 @@ static uint64_t capture_bg_to_tex1_ex(output_t *output, effects_output_t *ctx, b
 	return result;
 }
 
-static struct wlr_box get_client_rect(toplevel_t *tl);
-static struct wlr_box get_animated_client_rect(toplevel_t *tl);
-
 // captures scene with blur layer surfaces hidden but blur toplevels visible (for layer blur)
 static uint64_t capture_bg_combined(output_t *output, effects_output_t *ctx) {
 	return capture_bg_to_tex1_ex(output, ctx, false, NULL, NULL, false, false, NULL);
@@ -1218,6 +1215,7 @@ static bool rebuild_live_acrylic(output_t *output, pixman_region32_t *damage,
 			pixman_region32_clear(overlap_rgn);
 			pixman_region32_union_rect(overlap_rgn, overlap_rgn, r.x - output->lx, r.y - output->ly, r.width,
 				r.height);
+			pixman_region32_intersect(overlap_rgn, overlap_rgn, damage);
 			if (pixman_region32_empty(overlap_rgn))
 				continue;
 		}

src/input.c

@@ -562,29 +562,6 @@ void input_apply_config_all_pointers(void) {
 		input_apply_config(&pointer->wlr_pointer->base);
 }
 
-const char *input_config_type_str(enum input_config_type type) {
-	switch (type) {
-	case INPUT_CONFIG_TYPE_ANY:
-		return "any";
-	case INPUT_CONFIG_TYPE_KEYBOARD:
-		return "keyboard";
-	case INPUT_CONFIG_TYPE_POINTER:
-		return "pointer";
-	case INPUT_CONFIG_TYPE_TOUCHPAD:
-		return "touchpad";
-	case INPUT_CONFIG_TYPE_TOUCH:
-		return "touch";
-	case INPUT_CONFIG_TYPE_TABLET:
-		return "tablet";
-	case INPUT_CONFIG_TYPE_TABLET_PAD:
-		return "tablet_pad";
-	case INPUT_CONFIG_TYPE_SWITCH:
-		return "switch";
-	default:
-		return "unknown";
-	}
-}
-
 void input_init(void) {
 	ONCE();
 	for (size_t i = 0; i < num_input_configs; i++) {

src/ipc.c

@@ -48,10 +48,6 @@ static bool desktop_has_urgent(desktop_t *d) {
 	return false;
 }
 
-const char *ipc_get_socket_path(void) {
-	return socket_path;
-}
-
 int ipc_get_socket_fd(void) {
 	return ipc_socket_fd;
 }

src/ipc_cmd/node.c

@@ -73,8 +73,6 @@ static void hide_leaves(desktop_t *desk) {
 }
 
 static void unlink_and_refocus(node_t *n, desktop_t *src, output_t *mon) {
-	n->destroying = false;
-	n->ntxnrefs = 0;
 	hide_node_client(n);
 	remove_node(src, n);
 	if (src->root) {

src/keyboard.c

@@ -606,9 +606,9 @@ void toggle_floating(void) {
 }
 
 void tile_focused(void) {
-	node_t *n = mon->desk->focus;
-	if (n == NULL)
+	if (mon == NULL || mon->desk == NULL || mon->desk->focus == NULL)
 		return;
+	node_t *n = mon->desk->focus;
 
 	if (n->client == NULL)
 		return;
@@ -957,9 +957,9 @@ void toggle_monocle(void) {
 }
 
 void set_tiled_layout(void) {
-	desktop_t *d = mon->desk;
-	if (mon == NULL || d == NULL)
+	if (mon == NULL || mon->desk == NULL)
 		return;
+	desktop_t *d = mon->desk;
 
 	layout_set(d, LAYOUT_TILED);
 	d->user_layout = LAYOUT_TILED;

src/tree.c

@@ -1227,27 +1227,6 @@ bool activate_node(output_t *m, desktop_t *d, node_t *n) {
 	return focus_node_impl(m, d, n, on_current_desktop);
 }
 
-bool is_adjacent(node_t *a, node_t *b, direction_t dir) {
-	if (a == NULL || b == NULL)
-		return false;
-
-	struct wlr_box ra = a->rectangle;
-	struct wlr_box rb = b->rectangle;
-
-	switch (dir) {
-	case DIR_WEST:
-		return ra.x == rb.x + rb.width;
-	case DIR_EAST:
-		return ra.x + ra.width == rb.x;
-	case DIR_NORTH:
-		return ra.y + ra.height == rb.y;
-	case DIR_SOUTH:
-		return ra.y == rb.y + rb.height;
-	}
-
-	return false;
-}
-
 node_t *find_fence(node_t *n, direction_t dir) {
 	if (n == NULL)
 		return NULL;
@@ -1515,24 +1494,6 @@ void node_set_dirty(node_t *n) {
 	transaction_add_dirty_node(n);
 }
 
-void node_set_pending_size(node_t *n, int width, int height) {
-	if (!n)
-		return;
-
-	n->pending.rectangle.width = width;
-	n->pending.rectangle.height = height;
-	node_set_dirty(n);
-}
-
-void node_set_pending_position(node_t *n, int x, int y) {
-	if (!n)
-		return;
-
-	n->pending.rectangle.x = x;
-	n->pending.rectangle.y = y;
-	node_set_dirty(n);
-}
-
 void node_set_pending_rectangle(node_t *n, struct wlr_box rect) {
 	if (!n)
 		return;
@@ -1541,14 +1502,6 @@ void node_set_pending_rectangle(node_t *n, struct wlr_box rect) {
 	node_set_dirty(n);
 }
 
-void node_set_pending_hidden(node_t *n, bool hidden) {
-	if (!n)
-		return;
-
-	n->pending.hidden = hidden;
-	node_set_dirty(n);
-}
-
 struct wlr_scene_tree *client_get_scene_tree(client_t *client) {
 	if (!client)
 		return NULL;