fix: avoid toggle overview when setfullscreen and setmaximziescreen

README.md

@@ -71,8 +71,6 @@ https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0
 - hwdata
 - seatd
 - pcre2
-- xorg-xwayland
-- libxcb
 
 ## Arch Linux
 The package is in the Arch User Repository and is availble for manual download [here](https://aur.archlinux.org/packages/mangowc-git) or through a AUR helper like yay:
@@ -82,6 +80,7 @@ yay -S mangowc-git
 ```
 
 ## Gentoo Linux
+
 The package is in the community-maintained repository called GURU.
 First, add GURU repository:
 
@@ -99,16 +98,6 @@ Finally, install the package:
 emerge --ask --verbose gui-wm/mangowc
 ```
 
-## Fedora Linux
-The package is in the third-party Terra repository.
-First, add the [Terra Repository](https://terra.fyralabs.com/).
-
-Then, install the package:
-
-```bash
-dnf install mangowc
-```
-
 ## Other
 
 ```bash
@@ -181,9 +170,7 @@ git clone https://github.com/DreamMaoMao/mango-config.git ~/.config/mango
 
 ## Config Documentation
 
-Refer to the repo wiki [wiki](https://github.com/DreamMaoMao/mango/wiki/)
-
-or the website docs [docs](https://mangowc.vercel.app/docs)
+Refer to the [wiki](https://github.com/DreamMaoMao/mango/wiki/)
 
 # NixOS + Home-manager
 
@@ -261,6 +248,14 @@ Here's an example of using the modules in a flake:
 }
 ```
 
+
+# Sponsor
+
+My current device is a bit outdated and doesn't support certain features like HDR or VRR. If you'd like to support this project, here's how you can help. Thanks!
+
+![Screenshot_2025-10-13-20-06-49-26_ee1cec40dcf6eb3](https://github.com/user-attachments/assets/240a0727-9eb5-4212-a84c-10fa9f093147)
+
+
 # Packaging mango
 
 To package mango for other distributions, you can check the reference setup for:

meson.build

@@ -1,5 +1,5 @@
 project('mango', ['c', 'cpp'],
-  version : '0.10.7',
+  version : '0.10.6',
 )
 
 subdir('protocols')

mmsg/mmsg.c

@@ -86,7 +86,7 @@ static void noop_description(void *data, struct wl_output *wl_output,
 							 const char *description) {}
 
 // 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10）
-void bin_str_9bits(char *buf, uint32_t n) {
+void bin_str_9bits(char *buf, unsigned int n) {
 	for (int i = 8; i >= 0; i--) {
 		*buf++ = ((n >> i) & 1) ? '1' : '0';
 	}
@@ -268,7 +268,7 @@ static void dwl_ipc_output_kb_layout(void *data,
 static void
 dwl_ipc_output_scalefactor(void *data,
 						   struct zdwl_ipc_output_v2 *dwl_ipc_output,
-						   const uint32_t scalefactor) {
+						   const unsigned int scalefactor) {
 	if (!Aflag)
 		return;
 	char *output_name = data;

src/animation/client.h

@@ -1,4 +1,4 @@
-void client_actual_size(Client *c, uint32_t *width, uint32_t *height) {
+void client_actual_size(Client *c, unsigned int *width, unsigned int *height) {
 	*width = c->animation.current.width - c->bw;
 
 	*height = c->animation.current.height - c->bw;
@@ -183,8 +183,8 @@ void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx, int sy,
 
 	if (buffer_data->should_scale) {
 
-		uint32_t surface_width = surface->current.width;
-		uint32_t surface_height = surface->current.height;
+		unsigned int surface_width = surface->current.width;
+		unsigned int surface_height = surface->current.height;
 
 		surface_width = buffer_data->width_scale < 1
 							? surface_width
@@ -270,7 +270,7 @@ void client_draw_shadow(Client *c) {
 			? CORNER_LOCATION_NONE
 			: CORNER_LOCATION_ALL;
 
-	uint32_t bwoffset = c->bw != 0 && hit_no_border ? c->bw : 0;
+	unsigned int bwoffset = c->bw != 0 && hit_no_border ? c->bw : 0;
 
 	uint32_t width, height;
 	client_actual_size(c, &width, &height);
@@ -546,7 +546,7 @@ void client_apply_clip(Client *c, float factor) {
 	}
 
 	// 获取窗口动画实时位置矩形
-	uint32_t width, height;
+	unsigned int width, height;
 	client_actual_size(c, &width, &height);
 
 	// 计算出除了边框的窗口实际剪切大小
@@ -630,15 +630,16 @@ void fadeout_client_animation_next_tick(Client *c) {
 
 	int type = c->animation.action = c->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
-	uint32_t width = c->animation.initial.width +
+	unsigned int width =
+		c->animation.initial.width +
 		(c->current.width - c->animation.initial.width) * factor;
-	uint32_t height =
+	unsigned int height =
 		c->animation.initial.height +
 		(c->current.height - c->animation.initial.height) * factor;
 
-	uint32_t x = c->animation.initial.x +
+	unsigned int x = c->animation.initial.x +
 					 (c->current.x - c->animation.initial.x) * factor;
-	uint32_t y = c->animation.initial.y +
+	unsigned int y = c->animation.initial.y +
 					 (c->current.y - c->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&c->scene->node, x, y);
@@ -695,15 +696,16 @@ void client_animation_next_tick(Client *c) {
 	double sx = 0, sy = 0;
 	struct wlr_surface *surface = NULL;
 
-	uint32_t width = c->animation.initial.width +
+	unsigned int width =
+		c->animation.initial.width +
 		(c->current.width - c->animation.initial.width) * factor;
-	uint32_t height =
+	unsigned int height =
 		c->animation.initial.height +
 		(c->current.height - c->animation.initial.height) * factor;
 
-	uint32_t x = c->animation.initial.x +
+	unsigned int x = c->animation.initial.x +
 					 (c->current.x - c->animation.initial.x) * factor;
-	uint32_t y = c->animation.initial.y +
+	unsigned int y = c->animation.initial.y +
 					 (c->current.y - c->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&c->scene->node, x, y);

src/animation/common.h

@@ -33,33 +33,33 @@ void init_baked_points(void) {
 	baked_points_focus =
 		calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_focus));
 
-	for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_move[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), MOVE);
 	}
-	for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_open[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), OPEN);
 	}
-	for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_tag[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), TAG);
 	}
-	for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_close[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), CLOSE);
 	}
-	for (uint32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_focus[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), FOCUS);
 	}
 }
 
 double find_animation_curve_at(double t, int type) {
-	uint32_t down = 0;
-	uint32_t up = BAKED_POINTS_COUNT - 1;
+	unsigned int down = 0;
+	unsigned int up = BAKED_POINTS_COUNT - 1;
 
-	uint32_t middle = (up + down) / 2;
+	unsigned int middle = (up + down) / 2;
 	struct dvec2 *baked_points;
 	if (type == MOVE) {
 		baked_points = baked_points_move;

src/animation/layer.h

@@ -1,4 +1,5 @@
-void layer_actual_size(LayerSurface *l, uint32_t *width, uint32_t *height) {
+void layer_actual_size(LayerSurface *l, unsigned int *width,
+					   unsigned int *height) {
 	struct wlr_box box;
 
 	if (l->animation.running) {
@@ -212,8 +213,9 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
 
 	struct wlr_surface *surface = scene_surface->surface;
 
-	uint32_t surface_width = surface->current.width * buffer_data->width_scale;
-	uint32_t surface_height =
+	unsigned int surface_width =
+		surface->current.width * buffer_data->width_scale;
+	unsigned int surface_height =
 		surface->current.height * buffer_data->height_scale;
 
 	if (surface_height > 0 && surface_width > 0) {
@@ -243,15 +245,16 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
 
 	int type = l->animation.action = l->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
-	uint32_t width = l->animation.initial.width +
+	unsigned int width =
+		l->animation.initial.width +
 		(l->current.width - l->animation.initial.width) * factor;
-	uint32_t height =
+	unsigned int height =
 		l->animation.initial.height +
 		(l->current.height - l->animation.initial.height) * factor;
 
-	uint32_t x = l->animation.initial.x +
+	unsigned int x = l->animation.initial.x +
 					 (l->current.x - l->animation.initial.x) * factor;
-	uint32_t y = l->animation.initial.y +
+	unsigned int y = l->animation.initial.y +
 					 (l->current.y - l->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&l->scene->node, x, y);
@@ -307,15 +310,16 @@ void layer_animation_next_tick(LayerSurface *l) {
 	int type = l->animation.action == NONE ? MOVE : l->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
 
-	uint32_t width = l->animation.initial.width +
+	unsigned int width =
+		l->animation.initial.width +
 		(l->current.width - l->animation.initial.width) * factor;
-	uint32_t height =
+	unsigned int height =
 		l->animation.initial.height +
 		(l->current.height - l->animation.initial.height) * factor;
 
-	uint32_t x = l->animation.initial.x +
+	unsigned int x = l->animation.initial.x +
 					 (l->current.x - l->animation.initial.x) * factor;
-	uint32_t y = l->animation.initial.y +
+	unsigned int y = l->animation.initial.y +
 					 (l->current.y - l->animation.initial.y) * factor;
 
 	double opacity = MIN(fadein_begin_opacity +

src/client/client.h

@@ -153,6 +153,20 @@ static inline void client_get_geometry(Client *c, struct wlr_box *geom) {
 	*geom = c->surface.xdg->geometry;
 }
 
+static inline Client *get_client_from_surface(struct wlr_surface *surface) {
+	if (!surface)
+		return NULL;
+
+	// 从 surface 的 data 指针获取 scene tree
+	struct wlr_scene_tree *scene_tree = surface->data;
+	if (!scene_tree)
+		return NULL;
+
+	// 从 scene tree 的 node data 获取 Client
+	Client *c = scene_tree->node.data;
+	return c;
+}
+
 static inline Client *client_get_parent(Client *c) {
 	Client *p = NULL;
 #ifdef XWAYLAND
@@ -512,16 +526,16 @@ static inline void client_set_size_bound(Client *c) {
 		if (!size_hints)
 			return;
 
-		if ((uint32_t)c->geom.width - 2 * c->bw < size_hints->min_width &&
+		if ((unsigned int)c->geom.width - 2 * c->bw < size_hints->min_width &&
 			size_hints->min_width > 0)
 			c->geom.width = size_hints->min_width + 2 * c->bw;
-		if ((uint32_t)c->geom.height - 2 * c->bw < size_hints->min_height &&
+		if ((unsigned int)c->geom.height - 2 * c->bw < size_hints->min_height &&
 			size_hints->min_height > 0)
 			c->geom.height = size_hints->min_height + 2 * c->bw;
-		if ((uint32_t)c->geom.width - 2 * c->bw > size_hints->max_width &&
+		if ((unsigned int)c->geom.width - 2 * c->bw > size_hints->max_width &&
 			size_hints->max_width > 0)
 			c->geom.width = size_hints->max_width + 2 * c->bw;
-		if ((uint32_t)c->geom.height - 2 * c->bw > size_hints->max_height &&
+		if ((unsigned int)c->geom.height - 2 * c->bw > size_hints->max_height &&
 			size_hints->max_height > 0)
 			c->geom.height = size_hints->max_height + 2 * c->bw;
 		return;
@@ -530,19 +544,19 @@ static inline void client_set_size_bound(Client *c) {
 
 	toplevel = c->surface.xdg->toplevel;
 	state = toplevel->current;
-	if ((uint32_t)c->geom.width - 2 * c->bw < state.min_width &&
+	if ((unsigned int)c->geom.width - 2 * c->bw < state.min_width &&
 		state.min_width > 0) {
 		c->geom.width = state.min_width + 2 * c->bw;
 	}
-	if ((uint32_t)c->geom.height - 2 * c->bw < state.min_height &&
+	if ((unsigned int)c->geom.height - 2 * c->bw < state.min_height &&
 		state.min_height > 0) {
 		c->geom.height = state.min_height + 2 * c->bw;
 	}
-	if ((uint32_t)c->geom.width - 2 * c->bw > state.max_width &&
+	if ((unsigned int)c->geom.width - 2 * c->bw > state.max_width &&
 		state.max_width > 0) {
 		c->geom.width = state.max_width + 2 * c->bw;
 	}
-	if ((uint32_t)c->geom.height - 2 * c->bw > state.max_height &&
+	if ((unsigned int)c->geom.height - 2 * c->bw > state.max_height &&
 		state.max_height > 0) {
 		c->geom.height = state.max_height + 2 * c->bw;
 	}

src/common/util.c

@@ -82,13 +82,14 @@ void wl_list_append(struct wl_list *list, struct wl_list *object) {
 	wl_list_insert(list->prev, object);
 }
 
-uint32_t get_now_in_ms(void) {
+unsigned int get_now_in_ms(void) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	return timespec_to_ms(&now);
 }
 
-uint32_t timespec_to_ms(struct timespec *ts) {
-	return (uint32_t)ts->tv_sec * 1000 + (uint32_t)ts->tv_nsec / 1000000;
+unsigned int timespec_to_ms(struct timespec *ts) {
+	return (unsigned int)ts->tv_sec * 1000 +
+		   (unsigned int)ts->tv_nsec / 1000000;
 }

src/common/util.h

@@ -6,5 +6,5 @@ void *ecalloc(size_t nmemb, size_t size);
 int fd_set_nonblock(int fd);
 int regex_match(const char *pattern_mb, const char *str_mb);
 void wl_list_append(struct wl_list *list, struct wl_list *object);
-uint32_t get_now_in_ms(void);
-uint32_t timespec_to_ms(struct timespec *ts);
+unsigned int get_now_in_ms(void);
+unsigned int timespec_to_ms(struct timespec *ts);

src/config/parse_config.h

@@ -1,5 +1,4 @@
 #include <ctype.h>
-#include <libgen.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
@@ -43,7 +42,6 @@ typedef struct {
 	bool isdefaultmode;
 	bool islockapply;
 	bool isreleaseapply;
-	bool ispassapply;
 } KeyBinding;
 
 typedef struct {
@@ -54,7 +52,7 @@ typedef struct {
 typedef struct {
 	const char *id;
 	const char *title;
-	uint32_t tags;
+	unsigned int tags;
 	int isfloating;
 	int isfullscreen;
 	float scroller_proportion;
@@ -126,29 +124,29 @@ KeyBinding default_key_bindings[] = {CHVT(1), CHVT(2),	CHVT(3),  CHVT(4),
 									 CHVT(9), CHVT(10), CHVT(11), CHVT(12)};
 
 typedef struct {
-	uint32_t mod;
-	uint32_t button;
+	unsigned int mod;
+	unsigned int button;
 	int (*func)(const Arg *);
 	Arg arg;
 } MouseBinding;
 
 typedef struct {
-	uint32_t mod;
-	uint32_t dir;
+	unsigned int mod;
+	unsigned int dir;
 	int (*func)(const Arg *);
 	Arg arg;
 } AxisBinding;
 
 typedef struct {
-	uint32_t fold;
+	unsigned int fold;
 	int (*func)(const Arg *);
 	Arg arg;
 } SwitchBinding;
 
 typedef struct {
-	uint32_t mod;
-	uint32_t motion;
-	uint32_t fingers_count;
+	unsigned int mod;
+	unsigned int motion;
+	unsigned int fingers_count;
 	int (*func)(const Arg *);
 	Arg arg;
 } GestureBinding;
@@ -212,7 +210,7 @@ typedef struct {
 	int snap_distance;
 	int enable_floating_snap;
 	int drag_tile_to_tile;
-	uint32_t swipe_min_threshold;
+	unsigned int swipe_min_threshold;
 	float focused_opacity;
 	float unfocused_opacity;
 	float *scroller_proportion_preset;
@@ -221,21 +219,21 @@ typedef struct {
 	char **circle_layout;
 	int circle_layout_count;
 
-	uint32_t new_is_master;
+	unsigned int new_is_master;
 	float default_mfact;
-	uint32_t default_nmaster;
+	unsigned int default_nmaster;
 	int center_master_overspread;
 	int center_when_single_stack;
 
-	uint32_t hotarea_size;
-	uint32_t enable_hotarea;
-	uint32_t ov_tab_mode;
+	unsigned int hotarea_size;
+	unsigned int enable_hotarea;
+	unsigned int ov_tab_mode;
 	int overviewgappi;
 	int overviewgappo;
-	uint32_t cursor_hide_timeout;
+	unsigned int cursor_hide_timeout;
 
-	uint32_t axis_bind_apply_timeout;
-	uint32_t focus_on_activate;
+	unsigned int axis_bind_apply_timeout;
+	unsigned int focus_on_activate;
 	int inhibit_regardless_of_visibility;
 	int sloppyfocus;
 	int warpcursor;
@@ -243,7 +241,7 @@ typedef struct {
 	/* keyboard */
 	int repeat_rate;
 	int repeat_delay;
-	uint32_t numlockon;
+	unsigned int numlockon;
 
 	/* Trackpad */
 	int disable_trackpad;
@@ -255,13 +253,13 @@ typedef struct {
 	int disable_while_typing;
 	int left_handed;
 	int middle_button_emulation;
-	uint32_t accel_profile;
+	unsigned int accel_profile;
 	double accel_speed;
-	uint32_t scroll_method;
-	uint32_t scroll_button;
-	uint32_t click_method;
-	uint32_t send_events_mode;
-	uint32_t button_map;
+	unsigned int scroll_method;
+	unsigned int scroll_button;
+	unsigned int click_method;
+	unsigned int send_events_mode;
+	unsigned int button_map;
 
 	int blur;
 	int blur_layer;
@@ -271,18 +269,18 @@ typedef struct {
 	int shadows;
 	int shadow_only_floating;
 	int layer_shadows;
-	uint32_t shadows_size;
+	unsigned int shadows_size;
 	float shadows_blur;
 	int shadows_position_x;
 	int shadows_position_y;
 	float shadowscolor[4];
 
 	int smartgaps;
-	uint32_t gappih;
-	uint32_t gappiv;
-	uint32_t gappoh;
-	uint32_t gappov;
-	uint32_t borderpx;
+	unsigned int gappih;
+	unsigned int gappiv;
+	unsigned int gappoh;
+	unsigned int gappov;
+	unsigned int borderpx;
 	float scratchpad_width_ratio;
 	float scratchpad_height_ratio;
 	float rootcolor[4];
@@ -333,7 +331,7 @@ typedef struct {
 	int exec_once_count;
 
 	char *cursor_theme;
-	uint32_t cursor_size;
+	unsigned int cursor_size;
 
 	int single_scratchpad;
 	int xwayland_persistence;
@@ -444,9 +442,6 @@ void parse_bind_flags(const char *str, KeyBinding *kb) {
 		case 'r':
 			kb->isreleaseapply = true;
 			break;
-		case 'p':
-			kb->ispassapply = true;
-			break;
 		default:
 			// 忽略其他字符或可根据需要处理错误
 			break;
@@ -794,7 +789,7 @@ void convert_hex_to_rgba(float *color, unsigned long int hex) {
 	color[3] = (hex & 0xFF) / 255.0f;
 }
 
-uint32_t parse_num_type(char *str) {
+unsigned int parse_num_type(char *str) {
 	switch (str[0]) {
 	case '-':
 		return NUM_TYPE_MINUS;
@@ -993,31 +988,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
 		(*arg).i = atoi(arg_value2);
 	} else if (strcmp(func_name, "view") == 0) {
 		func = bind_to_view;
-
-		uint32_t mask = 0;
-		char *token;
-		char *arg_copy = strdup(arg_value);
-
-		if (arg_copy != NULL) {
-			char *saveptr = NULL;
-			token = strtok_r(arg_copy, "|", &saveptr);
-
-			while (token != NULL) {
-				int num = atoi(token);
-				if (num > 0 && num <= LENGTH(tags)) {
-					mask |= (1 << (num - 1));
-				}
-				token = strtok_r(NULL, "|", &saveptr);
-			}
-
-			free(arg_copy);
-		}
-
-		if (mask) {
-			(*arg).ui = mask;
-		} else {
-			(*arg).ui = atoi(arg_value);
-		}
+		(*arg).ui = 1 << (atoi(arg_value) - 1);
 		(*arg).i = atoi(arg_value2);
 	} else if (strcmp(func_name, "viewcrossmon") == 0) {
 		func = viewcrossmon;
@@ -1960,7 +1931,7 @@ void parse_option(Config *config, char *key, char *value) {
 
 		config->exec_once_count++;
 
-	} else if (regex_match("^bind[s|l|r|p]*$", key)) {
+	} else if (regex_match("^bind[s|l|r]*$", key)) {
 		config->key_bindings =
 			realloc(config->key_bindings,
 					(config->key_bindings_count + 1) * sizeof(KeyBinding));
@@ -2311,12 +2282,10 @@ void parse_config_file(Config *config, const char *file_path) {
 	if (file_path[0] == '.' && file_path[1] == '/') {
 		// Relative path
 
-		if (cli_config_path) {
-			char *config_path = strdup(cli_config_path);
-			char *config_dir = dirname(config_path);
-			snprintf(full_path, sizeof(full_path), "%s/%s", config_dir,
+		const char *mangoconfig = getenv("MANGOCONFIG");
+		if (mangoconfig && mangoconfig[0] != '\0') {
+			snprintf(full_path, sizeof(full_path), "%s/%s", mangoconfig,
 					 file_path + 1);
-			free(config_path);
 		} else {
 			const char *home = getenv("HOME");
 			if (!home) {
@@ -3043,9 +3012,11 @@ void parse_config(void) {
 
 	create_config_keymap();
 
-	if (cli_config_path) {
-		snprintf(filename, sizeof(filename), "%s", cli_config_path);
-	} else {
+	// 获取 MANGOCONFIG 环境变量
+	const char *mangoconfig = getenv("MANGOCONFIG");
+
+	// 如果 MANGOCONFIG 环境变量不存在或为空，则使用 HOME 环境变量
+	if (!mangoconfig || mangoconfig[0] == '\0') {
 		// 获取当前用户家目录
 		const char *homedir = getenv("HOME");
 		if (!homedir) {
@@ -3062,6 +3033,9 @@ void parse_config(void) {
 			snprintf(filename, sizeof(filename), "%s/mango/config.conf",
 					 SYSCONFDIR);
 		}
+	} else {
+		// 使用 MANGOCONFIG 环境变量作为配置文件夹路径
+		snprintf(filename, sizeof(filename), "%s/config.conf", mangoconfig);
 	}
 
 	set_value_default();

src/config/preset.h

@@ -33,27 +33,27 @@ double animation_curve_close[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
 double animation_curve_focus[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
 
 /* appearance */
-uint32_t axis_bind_apply_timeout = 100; // 滚轮绑定动作的触发的时间间隔
-uint32_t focus_on_activate = 1;			// 收到窗口激活请求是否自动跳转聚焦
-uint32_t new_is_master = 1;				// 新窗口是否插在头部
+unsigned int axis_bind_apply_timeout = 100; // 滚轮绑定动作的触发的时间间隔
+unsigned int focus_on_activate = 1;			// 收到窗口激活请求是否自动跳转聚焦
+unsigned int new_is_master = 1;				// 新窗口是否插在头部
 double default_mfact = 0.55f;				// master 窗口比例
-uint32_t default_nmaster = 1;			// 默认master数量
+unsigned int default_nmaster = 1;			// 默认master数量
 int center_master_overspread = 0;			// 中心master时是否铺满
 int center_when_single_stack = 1;			// 单个stack时是否居中
 /* logging */
 int log_level = WLR_ERROR;
-uint32_t numlockon = 0; // 是否打开右边小键盘
-uint32_t capslock = 0;	// 是否启用快捷键
+unsigned int numlockon = 0; // 是否打开右边小键盘
+unsigned int capslock = 0;	// 是否启用快捷键
 
-uint32_t ov_tab_mode = 0;	 // alt tab切换模式
-uint32_t hotarea_size = 10;	 // 热区大小,10x10
-uint32_t enable_hotarea = 1; // 是否启用鼠标热区
+unsigned int ov_tab_mode = 0;	 // alt tab切换模式
+unsigned int hotarea_size = 10;	 // 热区大小,10x10
+unsigned int enable_hotarea = 1; // 是否启用鼠标热区
 int smartgaps = 0;	 /* 1 means no outer gap when there is only one window */
 int sloppyfocus = 1; /* focus follows mouse */
-uint32_t gappih = 5;  /* horiz inner gap between windows */
-uint32_t gappiv = 5;  /* vert inner gap between windows */
-uint32_t gappoh = 10; /* horiz outer gap between windows and screen edge */
-uint32_t gappov = 10; /* vert outer gap between windows and screen edge */
+unsigned int gappih = 5;  /* horiz inner gap between windows */
+unsigned int gappiv = 5;  /* vert inner gap between windows */
+unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
+unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
 float scratchpad_width_ratio = 0.8;
 float scratchpad_height_ratio = 0.9;
 
@@ -73,15 +73,15 @@ int no_radius_when_single = 0;
 int snap_distance = 30;
 int enable_floating_snap = 0;
 int drag_tile_to_tile = 0;
-uint32_t cursor_size = 24;
-uint32_t cursor_hide_timeout = 0;
+unsigned int cursor_size = 24;
+unsigned int cursor_hide_timeout = 0;
 
-uint32_t swipe_min_threshold = 1;
+unsigned int swipe_min_threshold = 1;
 
 int inhibit_regardless_of_visibility =
 	0; /* 1 means idle inhibitors will disable idle tracking even if it's
 		  surface isn't visible  */
-uint32_t borderpx = 4; /* border pixel of windows */
+unsigned int borderpx = 4; /* border pixel of windows */
 float rootcolor[] = COLOR(0x323232ff);
 float bordercolor[] = COLOR(0x444444ff);
 float focuscolor[] = COLOR(0xc66b25ff);
@@ -166,7 +166,7 @@ LIBINPUT_CONFIG_SCROLL_EDGE
 LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
 */
 enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
-uint32_t scroll_button = 274;
+unsigned int scroll_button = 274;
 
 /* You can choose between:
 LIBINPUT_CONFIG_CLICK_METHOD_NONE
@@ -224,7 +224,7 @@ float blur_params_saturation = 1.2;
 int shadows = 0;
 int shadow_only_floating = 1;
 int layer_shadows = 0;
-uint32_t shadows_size = 10;
+unsigned int shadows_size = 10;
 double shadows_blur = 15;
 int shadows_position_x = 0;
 int shadows_position_y = 0;

src/dispatch/bind_define.h

@@ -1,6 +1,6 @@
 int bind_to_view(const Arg *arg) {
 
-	uint32_t target = arg->ui;
+	unsigned int target = arg->ui;
 
 	if (view_current_to_back && selmon->pertag->curtag &&
 		(target & TAGMASK) == (selmon->tagset[selmon->seltags])) {
@@ -130,7 +130,7 @@ int focuslast(const Arg *arg) {
 	Client *c = NULL;
 	Client *tc = NULL;
 	bool begin = false;
-	uint32_t target = 0;
+	unsigned int target = 0;
 
 	wl_list_for_each(c, &fstack, flink) {
 		if (c->iskilling || c->isminimized || c->isunglobal ||
@@ -171,7 +171,7 @@ int toggle_trackpad_enable(const Arg *arg) {
 }
 
 int focusmon(const Arg *arg) {
-	Client *c = NULL;
+	Client *c = NULL, *old_selmon_sel = NULL;
 	Monitor *m = NULL;
 
 	if (arg->i != UNDIR) {
@@ -192,6 +192,7 @@ int focusmon(const Arg *arg) {
 	if (!m || !m->wlr_output->enabled || m == selmon)
 		return 0;
 
+	old_selmon_sel = selmon->sel;
 	selmon = m;
 	if (warpcursor) {
 		warp_cursor_to_selmon(selmon);
@@ -201,10 +202,12 @@ int focusmon(const Arg *arg) {
 		selmon->sel = NULL;
 		wlr_seat_pointer_notify_clear_focus(seat);
 		wlr_seat_keyboard_notify_clear_focus(seat);
-		focusclient(NULL, 0);
 	} else
 		focusclient(c, 1);
 
+	if (old_selmon_sel) {
+		client_set_unfocused_opacity_animation(old_selmon_sel);
+	}
 	return 0;
 }
 
@@ -528,7 +531,7 @@ int set_proportion(const Arg *arg) {
 		return 0;
 
 	if (selmon->sel) {
-		uint32_t max_client_width =
+		unsigned int max_client_width =
 			selmon->w.width - 2 * scroller_structs - gappih;
 		selmon->sel->scroller_proportion = arg->f;
 		selmon->sel->geom.width = max_client_width * arg->f;
@@ -713,27 +716,15 @@ int centerwin(const Arg *arg) {
 	Client *c = NULL;
 	c = selmon->sel;
 
-	if (!c || c->isfullscreen || c->ismaximizescreen)
+	if (!c || c->isfullscreen)
 		return 0;
+	if (!c->isfloating)
+		setfloating(c, true);
 
-	if (c->isfloating) {
 	c->float_geom = setclient_coordinate_center(c, c->geom, 0, 0);
 	c->iscustomsize = 1;
 	resize(c, c->float_geom, 1);
 	return 0;
-	}
-
-	if (!is_scroller_layout(selmon))
-		return 0;
-
-	if (selmon->pertag->ltidxs[selmon->pertag->curtag]->id == SCROLLER) {
-		c->geom.x = selmon->w.x + (selmon->w.width - c->geom.width) / 2;
-	} else {
-		c->geom.y = selmon->w.y + (selmon->w.height - c->geom.height) / 2;
-	}
-
-	arrange(selmon, false);
-	return 0;
 }
 
 int spawn_shell(const Arg *arg) {
@@ -846,9 +837,9 @@ int switch_keyboard_layout(const Arg *arg) {
 	xkb_layout_index_t next = (current + 1) % num_layouts;
 
 	// 6. 应用新 keymap
-	uint32_t depressed = keyboard->modifiers.depressed;
-	uint32_t latched = keyboard->modifiers.latched;
-	uint32_t locked = keyboard->modifiers.locked;
+	unsigned int depressed = keyboard->modifiers.depressed;
+	unsigned int latched = keyboard->modifiers.latched;
+	unsigned int locked = keyboard->modifiers.locked;
 
 	wlr_keyboard_set_keymap(keyboard, keyboard->keymap);
 	wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next);
@@ -883,7 +874,7 @@ int switch_layout(const Arg *arg) {
 
 	int jk, ji;
 	char *target_layout_name = NULL;
-	uint32_t len;
+	unsigned int len;
 
 	if (config.circle_layout_count != 0) {
 		for (jk = 0; jk < config.circle_layout_count; jk++) {
@@ -968,7 +959,7 @@ int switch_proportion_preset(const Arg *arg) {
 			target_proportion = config.scroller_proportion_preset[0];
 		}
 
-		uint32_t max_client_width =
+		unsigned int max_client_width =
 			selmon->w.width - 2 * scroller_structs - gappih;
 		selmon->sel->scroller_proportion = target_proportion;
 		selmon->sel->geom.width = max_client_width * target_proportion;
@@ -1010,8 +1001,8 @@ int tagmon(const Arg *arg) {
 	if (!m || !m->wlr_output->enabled)
 		return 0;
 
-	uint32_t newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0;
-	uint32_t target;
+	unsigned int newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0;
+	unsigned int target;
 
 	if (c->mon == m) {
 		view(&(Arg){.ui = newtags}, true);
@@ -1251,7 +1242,7 @@ int toggleoverlay(const Arg *arg) {
 }
 
 int toggletag(const Arg *arg) {
-	uint32_t newtags;
+	unsigned int newtags;
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
@@ -1274,8 +1265,8 @@ int toggletag(const Arg *arg) {
 }
 
 int toggleview(const Arg *arg) {
-	uint32_t newtagset;
-	uint32_t target;
+	unsigned int newtagset;
+	unsigned int target;
 
 	target = arg->ui == 0 ? ~0 & TAGMASK : arg->ui;
 
@@ -1292,7 +1283,7 @@ int toggleview(const Arg *arg) {
 }
 
 int viewtoleft(const Arg *arg) {
-	uint32_t target = selmon->tagset[selmon->seltags];
+	unsigned int target = selmon->tagset[selmon->seltags];
 
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
 		return 0;
@@ -1315,7 +1306,7 @@ int viewtoright(const Arg *arg) {
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
 		return 0;
 	}
-	uint32_t target = selmon->tagset[selmon->seltags];
+	unsigned int target = selmon->tagset[selmon->seltags];
 	target <<= 1;
 
 	if (!selmon || (target) == selmon->tagset[selmon->seltags])
@@ -1329,8 +1320,9 @@ int viewtoright(const Arg *arg) {
 }
 
 int viewtoleft_have_client(const Arg *arg) {
-	uint32_t n;
-	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
+	unsigned int n;
+	unsigned int current =
+		get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
 
 	if (selmon->isoverview) {
@@ -1353,8 +1345,9 @@ int viewtoleft_have_client(const Arg *arg) {
 }
 
 int viewtoright_have_client(const Arg *arg) {
-	uint32_t n;
-	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
+	unsigned int n;
+	unsigned int current =
+		get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
 
 	if (selmon->isoverview) {
@@ -1391,7 +1384,7 @@ int tagcrossmon(const Arg *arg) {
 }
 
 int comboview(const Arg *arg) {
-	uint32_t newtags = arg->ui & TAGMASK;
+	unsigned int newtags = arg->ui & TAGMASK;
 
 	if (!newtags || !selmon)
 		return 0;
@@ -1469,8 +1462,8 @@ int toggleoverview(const Arg *arg) {
 	}
 
 	selmon->isoverview ^= 1;
-	uint32_t target;
-	uint32_t visible_client_number = 0;
+	unsigned int target;
+	unsigned int visible_client_number = 0;
 
 	if (selmon->isoverview) {
 		wl_list_for_each(c, &clients, link) if (c && c->mon == selmon &&

src/ext-protocol/dwl-ipc.h

@@ -1,11 +1,12 @@
 #include "dwl-ipc-unstable-v2-protocol.h"
 
 static void dwl_ipc_manager_bind(struct wl_client *client, void *data,
-								 uint32_t version, uint32_t id);
+								 unsigned int version, unsigned int id);
 static void dwl_ipc_manager_destroy(struct wl_resource *resource);
 static void dwl_ipc_manager_get_output(struct wl_client *client,
 									   struct wl_resource *resource,
-									   uint32_t id, struct wl_resource *output);
+									   unsigned int id,
+									   struct wl_resource *output);
 static void dwl_ipc_manager_release(struct wl_client *client,
 									struct wl_resource *resource);
 static void dwl_ipc_output_destroy(struct wl_resource *resource);
@@ -13,14 +14,15 @@ static void dwl_ipc_output_printstatus(Monitor *monitor);
 static void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output);
 static void dwl_ipc_output_set_client_tags(struct wl_client *client,
 										   struct wl_resource *resource,
-										   uint32_t and_tags,
-										   uint32_t xor_tags);
+										   unsigned int and_tags,
+										   unsigned int xor_tags);
 static void dwl_ipc_output_set_layout(struct wl_client *client,
 									  struct wl_resource *resource,
-									  uint32_t index);
+									  unsigned int index);
 static void dwl_ipc_output_set_tags(struct wl_client *client,
 									struct wl_resource *resource,
-									uint32_t tagmask, uint32_t toggle_tagset);
+									unsigned int tagmask,
+									unsigned int toggle_tagset);
 static void dwl_ipc_output_quit(struct wl_client *client,
 								struct wl_resource *resource);
 static void dwl_ipc_output_dispatch(struct wl_client *client,
@@ -44,7 +46,7 @@ static struct zdwl_ipc_output_v2_interface dwl_output_implementation = {
 	.set_client_tags = dwl_ipc_output_set_client_tags};
 
 void dwl_ipc_manager_bind(struct wl_client *client, void *data,
-						  uint32_t version, uint32_t id) {
+						  unsigned int version, unsigned int id) {
 	struct wl_resource *manager_resource =
 		wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
 	if (!manager_resource) {
@@ -57,7 +59,7 @@ void dwl_ipc_manager_bind(struct wl_client *client, void *data,
 
 	zdwl_ipc_manager_v2_send_tags(manager_resource, LENGTH(tags));
 
-	for (uint32_t i = 0; i < LENGTH(layouts); i++)
+	for (unsigned int i = 0; i < LENGTH(layouts); i++)
 		zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
 }
 
@@ -66,7 +68,7 @@ void dwl_ipc_manager_destroy(struct wl_resource *resource) {
 }
 
 void dwl_ipc_manager_get_output(struct wl_client *client,
-								struct wl_resource *resource, uint32_t id,
+								struct wl_resource *resource, unsigned int id,
 								struct wl_resource *output) {
 	DwlIpcOutput *ipc_output;
 	struct wlr_output *op = wlr_output_from_resource(output);
@@ -99,14 +101,12 @@ static void dwl_ipc_output_destroy(struct wl_resource *resource) {
 	free(ipc_output);
 }
 
-// 修改IPC输出函数，接受掩码参数
 void dwl_ipc_output_printstatus(Monitor *monitor) {
 	DwlIpcOutput *ipc_output;
 	wl_list_for_each(ipc_output, &monitor->dwl_ipc_outputs, link)
 		dwl_ipc_output_printstatus_to(ipc_output);
 }
 
-// 修改主IPC输出函数，根据掩码发送相应事件
 void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
 	Monitor *monitor = ipc_output->mon;
 	Client *c = NULL, *focused = NULL;
@@ -216,11 +216,12 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
 
 void dwl_ipc_output_set_client_tags(struct wl_client *client,
 									struct wl_resource *resource,
-									uint32_t and_tags, uint32_t xor_tags) {
+									unsigned int and_tags,
+									unsigned int xor_tags) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
 	Client *selected_client = NULL;
-	uint32_t newtags = 0;
+	unsigned int newtags = 0;
 
 	ipc_output = wl_resource_get_user_data(resource);
 	if (!ipc_output)
@@ -243,7 +244,8 @@ void dwl_ipc_output_set_client_tags(struct wl_client *client,
 }
 
 void dwl_ipc_output_set_layout(struct wl_client *client,
-							   struct wl_resource *resource, uint32_t index) {
+							   struct wl_resource *resource,
+							   unsigned int index) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
 
@@ -262,11 +264,11 @@ void dwl_ipc_output_set_layout(struct wl_client *client,
 }
 
 void dwl_ipc_output_set_tags(struct wl_client *client,
-							 struct wl_resource *resource, uint32_t tagmask,
-							 uint32_t toggle_tagset) {
+							 struct wl_resource *resource, unsigned int tagmask,
+							 unsigned int toggle_tagset) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
-	uint32_t newtags = tagmask & TAGMASK;
+	unsigned int newtags = tagmask & TAGMASK;
 
 	ipc_output = wl_resource_get_user_data(resource);
 	if (!ipc_output)

src/ext-protocol/ext-workspace.h

@@ -8,7 +8,7 @@ typedef struct Monitor Monitor;
 
 struct workspace {
 	struct wl_list link; // Link in global workspaces list
-	uint32_t tag;		 // Numeric identifier (1-9, 0=overview)
+	unsigned int tag;	 // Numeric identifier (1-9, 0=overview)
 	Monitor *m;			 // Associated monitor
 	struct wlr_ext_workspace_handle_v1 *ext_workspace; // Protocol object
 	/* Event listeners */
@@ -22,7 +22,7 @@ struct wlr_ext_workspace_manager_v1 *ext_manager;
 struct wl_list workspaces;
 
 void goto_workspace(struct workspace *target) {
-	uint32_t tag;
+	unsigned int tag;
 	tag = 1 << (target->tag - 1);
 	if (target->tag == 0) {
 		toggleoverview(&(Arg){.i = -1});
@@ -33,7 +33,7 @@ void goto_workspace(struct workspace *target) {
 }
 
 void toggle_workspace(struct workspace *target) {
-	uint32_t tag;
+	unsigned int tag;
 	tag = 1 << (target->tag - 1);
 	if (target->tag == 0) {
 		toggleview(&(Arg){.i = -1});
@@ -69,7 +69,7 @@ static void handle_ext_workspace_deactivate(struct wl_listener *listener,
 	wlr_log(WLR_INFO, "ext deactivating workspace %d", workspace->tag);
 }
 
-static const char *get_name_from_tag(uint32_t tag) {
+static const char *get_name_from_tag(unsigned int tag) {
 	static const char *names[] = {"overview", "1", "2", "3", "4",
 								  "5",		  "6", "7", "8", "9"};
 	return (tag < sizeof(names) / sizeof(names[0])) ? names[tag] : NULL;
@@ -92,7 +92,7 @@ void cleanup_workspaces_by_monitor(Monitor *m) {
 	}
 }
 
-static void remove_workspace_by_tag(uint32_t tag, Monitor *m) {
+static void remove_workspace_by_tag(unsigned int tag, Monitor *m) {
 	struct workspace *workspace, *tmp;
 	wl_list_for_each_safe(workspace, tmp, &workspaces, link) {
 		if (workspace->tag == tag && workspace->m == m) {
@@ -127,7 +127,7 @@ static void add_workspace_by_tag(int tag, Monitor *m) {
 
 void dwl_ext_workspace_printstatus(Monitor *m) {
 	struct workspace *w;
-	uint32_t tag_status = 0;
+	unsigned int tag_status = 0;
 
 	wl_list_for_each(w, &workspaces, link) {
 		if (w && w->m == m) {

src/ext-protocol/foreign-toplevel.h

@@ -4,11 +4,16 @@ static struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
 
 void handle_foreign_activate_request(struct wl_listener *listener, void *data) {
 	Client *c = wl_container_of(listener, c, foreign_activate_request);
-	uint32_t target;
+	unsigned int target;
 
-	if (c->swallowing)
+	if (c && c->swallowing)
 		return;
 
+	if (c && !c->isminimized && c == selmon->sel) {
+		set_minimized(c);
+		return;
+	}
+
 	if (c->isminimized) {
 		c->is_in_scratchpad = 0;
 		c->isnamedscratchpad = 0;
@@ -22,82 +27,29 @@ void handle_foreign_activate_request(struct wl_listener *listener, void *data) {
 	target = get_tags_first_tag(c->tags);
 	view_in_mon(&(Arg){.ui = target}, true, c->mon, true);
 	focusclient(c, 1);
-}
-
-void handle_foreign_maximize_request(struct wl_listener *listener, void *data) {
-	Client *c = wl_container_of(listener, c, foreign_maximize_request);
-	struct wlr_foreign_toplevel_handle_v1_maximized_event *event = data;
-
-	if (c->swallowing)
-		return;
-
-	if (c->ismaximizescreen && !event->maximized) {
-		setmaximizescreen(c, 0);
-		return;
-	}
-
-	if (!c->ismaximizescreen && event->maximized) {
-		setmaximizescreen(c, 1);
-		return;
-	}
-}
-
-void handle_foreign_minimize_request(struct wl_listener *listener, void *data) {
-	Client *c = wl_container_of(listener, c, foreign_minimize_request);
-	struct wlr_foreign_toplevel_handle_v1_minimized_event *event = data;
-
-	if (c->swallowing)
-		return;
-
-	if (!c->isminimized && event->minimized) {
-		set_minimized(c);
-		return;
-	}
-
-	if (c->isminimized && !event->minimized) {
-		c->is_in_scratchpad = 0;
-		c->isnamedscratchpad = 0;
-		c->is_scratchpad_show = 0;
-		setborder_color(c);
-		show_hide_client(c);
-		arrange(c->mon, true);
-		return;
-	}
+	wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, true);
 }
 
 void handle_foreign_fullscreen_request(struct wl_listener *listener,
 									   void *data) {
-
-	Client *c = wl_container_of(listener, c, foreign_fullscreen_request);
-	struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
-
-	if (c->swallowing)
 	return;
-
-	if (c->isfullscreen && !event->fullscreen) {
-		setfullscreen(c, 0);
-		return;
-	}
-
-	if (!c->isfullscreen && event->fullscreen) {
-		setfullscreen(c, 1);
-		return;
-	}
 }
 
 void handle_foreign_close_request(struct wl_listener *listener, void *data) {
 	Client *c = wl_container_of(listener, c, foreign_close_request);
+	if (c) {
 		pending_kill_client(c);
+	}
 }
 
 void handle_foreign_destroy(struct wl_listener *listener, void *data) {
 	Client *c = wl_container_of(listener, c, foreign_destroy);
+	if (c) {
 		wl_list_remove(&c->foreign_activate_request.link);
-	wl_list_remove(&c->foreign_minimize_request.link);
-	wl_list_remove(&c->foreign_maximize_request.link);
 		wl_list_remove(&c->foreign_fullscreen_request.link);
 		wl_list_remove(&c->foreign_close_request.link);
 		wl_list_remove(&c->foreign_destroy.link);
+	}
 }
 
 void remove_foreign_topleve(Client *c) {
@@ -115,10 +67,6 @@ void add_foreign_toplevel(Client *c) {
 	if (c->foreign_toplevel) {
 		LISTEN(&(c->foreign_toplevel->events.request_activate),
 			   &c->foreign_activate_request, handle_foreign_activate_request);
-		LISTEN(&(c->foreign_toplevel->events.request_minimize),
-			   &c->foreign_minimize_request, handle_foreign_minimize_request);
-		LISTEN(&(c->foreign_toplevel->events.request_maximize),
-			   &c->foreign_maximize_request, handle_foreign_maximize_request);
 		LISTEN(&(c->foreign_toplevel->events.request_fullscreen),
 			   &c->foreign_fullscreen_request,
 			   handle_foreign_fullscreen_request);

src/ext-protocol/tearing.h

@@ -13,10 +13,7 @@ static void handle_controller_set_hint(struct wl_listener *listener,
 									   void *data) {
 	struct tearing_controller *controller =
 		wl_container_of(listener, controller, set_hint);
-	Client *c = NULL;
-
-	toplevel_from_wlr_surface(controller->tearing_control->surface, &c, NULL);
-
+	Client *c = get_client_from_surface(controller->tearing_control->surface);
 	if (c) {
 		/*
 		 * tearing_control->current is actually an enum:

src/fetch/client.h

@@ -41,21 +41,10 @@ Client *get_client_by_id_or_title(const char *arg_id, const char *arg_title) {
 			continue;
 		}
 
-		if (c->swallowedby) {
-			appid = client_get_appid(c->swallowedby);
-			title = client_get_title(c->swallowedby);
-		} else {
-			appid = client_get_appid(c);
-			title = client_get_title(c);
-		}
-
-		if (!appid) {
+		if (!(appid = client_get_appid(c)))
 			appid = broken;
-		}
-
-		if (!title) {
+		if (!(title = client_get_title(c)))
 			title = broken;
-		}
 
 		if (arg_id && strncmp(arg_id, "none", 4) == 0)
 			arg_id = NULL;
@@ -81,7 +70,7 @@ setclient_coordinate_center(Client *c, struct wlr_box geom, int offsetx,
 	int len = 0;
 	Monitor *m = c->mon ? c->mon : selmon;
 
-	uint32_t cbw = check_hit_no_border(c) ? c->bw : 0;
+	unsigned int cbw = check_hit_no_border(c) ? c->bw : 0;
 
 	if (!c->no_force_center) {
 		tempbox.x = m->w.x + (m->w.width - geom.width) / 2;
@@ -139,9 +128,8 @@ Client *center_tiled_select(Monitor *m) {
 	int dirx, diry;
 	long int distance;
 	wl_list_for_each(c, &clients, link) {
-		if (c && VISIBLEON(c, m) && ISSCROLLTILED(c) &&
-			client_surface(c)->mapped && !c->isfloating &&
-			!client_is_unmanaged(c)) {
+		if (c && VISIBLEON(c, m) && ISTILED(c) && client_surface(c)->mapped &&
+			!c->isfloating && !client_is_unmanaged(c)) {
 			dirx = c->geom.x + c->geom.width / 2 - (m->w.x + m->w.width / 2);
 			diry = c->geom.y + c->geom.height / 2 - (m->w.y + m->w.height / 2);
 			distance = dirx * dirx + diry * diry;
@@ -193,9 +181,7 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 	int sel_x = tc->geom.x;
 	int sel_y = tc->geom.y;
 	long long int distance = LLONG_MAX;
-	long long int same_monitor_distance = LLONG_MAX;
 	Client *tempFocusClients = NULL;
-	Client *tempSameMonitorFocusClients = NULL;
 
 	switch (arg->i) {
 	case UP:
@@ -226,11 +212,6 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 						distance = tmp_distance;
 						tempFocusClients = tempClients[_i];
 					}
-					if (tempClients[_i]->mon == tc->mon &&
-						tmp_distance < same_monitor_distance) {
-						same_monitor_distance = tmp_distance;
-						tempSameMonitorFocusClients = tempClients[_i];
-					}
 				}
 			}
 		}
@@ -263,11 +244,6 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 						distance = tmp_distance;
 						tempFocusClients = tempClients[_i];
 					}
-					if (tempClients[_i]->mon == tc->mon &&
-						tmp_distance < same_monitor_distance) {
-						same_monitor_distance = tmp_distance;
-						tempSameMonitorFocusClients = tempClients[_i];
-					}
 				}
 			}
 		}
@@ -300,11 +276,6 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 						distance = tmp_distance;
 						tempFocusClients = tempClients[_i];
 					}
-					if (tempClients[_i]->mon == tc->mon &&
-						tmp_distance < same_monitor_distance) {
-						same_monitor_distance = tmp_distance;
-						tempSameMonitorFocusClients = tempClients[_i];
-					}
 				}
 			}
 		}
@@ -337,11 +308,6 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 						distance = tmp_distance;
 						tempFocusClients = tempClients[_i];
 					}
-					if (tempClients[_i]->mon == tc->mon &&
-						tmp_distance < same_monitor_distance) {
-						same_monitor_distance = tmp_distance;
-						tempSameMonitorFocusClients = tempClients[_i];
-					}
 				}
 			}
 		}
@@ -349,11 +315,7 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 	}
 
 	free(tempClients); // 释放内存
-	if (tempSameMonitorFocusClients) {
-		return tempSameMonitorFocusClients;
-	} else {
 	return tempFocusClients;
-	}
 }
 
 Client *direction_select(const Arg *arg) {

src/fetch/common.h

@@ -1,5 +1,5 @@
 pid_t getparentprocess(pid_t p) {
-	uint32_t v = 0;
+	unsigned int v = 0;
 
 	FILE *f;
 	char buf[256];
@@ -26,6 +26,24 @@ int isdescprocess(pid_t p, pid_t c) {
 	return (int)c;
 }
 
+char *get_autostart_path(char *autostart_path, unsigned int buf_size) {
+	const char *mangoconfig = getenv("MANGOCONFIG");
+
+	if (mangoconfig && mangoconfig[0] != '\0') {
+		snprintf(autostart_path, buf_size, "%s/autostart.sh", mangoconfig);
+	} else {
+		const char *homedir = getenv("HOME");
+		if (!homedir) {
+			fprintf(stderr, "Error: HOME environment variable not set.\n");
+			return NULL;
+		}
+		snprintf(autostart_path, buf_size, "%s/.config/mango/autostart.sh",
+				 homedir);
+	}
+
+	return autostart_path;
+}
+
 void get_layout_abbr(char *abbr, const char *full_name) {
 	// 清空输出缓冲区
 	abbr[0] = '\0';
@@ -42,10 +60,10 @@ void get_layout_abbr(char *abbr, const char *full_name) {
 	const char *open = strrchr(full_name, '(');
 	const char *close = strrchr(full_name, ')');
 	if (open && close && close > open) {
-		uint32_t len = close - open - 1;
+		unsigned int len = close - open - 1;
 		if (len > 0 && len <= 4) {
 			// 提取并转换为小写
-			for (uint32_t j = 0; j < len; j++) {
+			for (unsigned int j = 0; j < len; j++) {
 				abbr[j] = tolower(open[j + 1]);
 			}
 			abbr[len] = '\0';
@@ -54,8 +72,8 @@ void get_layout_abbr(char *abbr, const char *full_name) {
 	}
 
 	// 3. 提取前2-3个字母并转换为小写
-	uint32_t j = 0;
-	for (uint32_t i = 0; full_name[i] != '\0' && j < 3; i++) {
+	unsigned int j = 0;
+	for (unsigned int i = 0; full_name[i] != '\0' && j < 3; i++) {
 		if (isalpha(full_name[i])) {
 			abbr[j++] = tolower(full_name[i]);
 		}

src/fetch/monitor.h

@@ -26,9 +26,9 @@ bool is_scroller_layout(Monitor *m) {
 	return false;
 }
 
-uint32_t get_tag_status(uint32_t tag, Monitor *m) {
+unsigned int get_tag_status(unsigned int tag, Monitor *m) {
 	Client *c = NULL;
-	uint32_t status = 0;
+	unsigned int status = 0;
 	wl_list_for_each(c, &clients, link) {
 		if (c->mon == m && c->tags & 1 << (tag - 1) & TAGMASK) {
 			if (c->isurgent) {
@@ -41,8 +41,8 @@ uint32_t get_tag_status(uint32_t tag, Monitor *m) {
 	return status;
 }
 
-uint32_t get_tags_first_tag_num(uint32_t source_tags) {
-	uint32_t i, tag;
+unsigned int get_tags_first_tag_num(unsigned int source_tags) {
+	unsigned int i, tag;
 	tag = 0;
 
 	if (!source_tags) {
@@ -63,8 +63,8 @@ uint32_t get_tags_first_tag_num(uint32_t source_tags) {
 }
 
 // 获取tags中最前面的tag的tagmask
-uint32_t get_tags_first_tag(uint32_t source_tags) {
-	uint32_t i, tag;
+unsigned int get_tags_first_tag(unsigned int source_tags) {
+	unsigned int i, tag;
 	tag = 0;
 
 	if (!source_tags) {

src/layout/arrange.h

@@ -19,7 +19,7 @@ void set_size_per(Monitor *m, Client *c) {
 }
 
 void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
-								   int offsety, uint32_t time, int type) {
+								   int offsety, unsigned int time, int type) {
 	Client *tc = NULL;
 	float delta_x, delta_y;
 	Client *next = NULL;
@@ -213,7 +213,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 }
 
 void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
-								 int offsety, uint32_t time, int type) {
+								 int offsety, unsigned int time, int type) {
 	Client *tc = NULL;
 	float delta_x, delta_y;
 	Client *next = NULL;
@@ -370,7 +370,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 }
 
 void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
-						  uint32_t time, bool isvertical) {
+						  unsigned int time, bool isvertical) {
 	float delta_x, delta_y;
 	float new_scroller_proportion;
 
@@ -474,7 +474,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
 }
 
 void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
-						uint32_t time) {
+						unsigned int time) {
 
 	if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen)
 		return;
@@ -509,22 +509,24 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
 						int stack_num) {
 	Client *c = NULL;
 	int i = 0;
-	uint32_t stack_index = 0;
-	uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
+	unsigned int stack_index = 0;
+	unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
 
 	if (m->pertag->ltidxs[m->pertag->curtag]->id != CENTER_TILE) {
 
 		wl_list_for_each(c, &clients, link) {
 			if (VISIBLEON(c, m) && ISTILED(c)) {
-				if (total_master_inner_percent > 0.0 && i < nmasters) {
+
+				if (total_master_inner_percent <= 0.0)
+					return;
+				if (i < m->pertag->nmasters[m->pertag->curtag]) {
 					c->ismaster = true;
 					c->stack_innder_per = stack_num ? 1.0f / stack_num : 1.0f;
 					c->master_inner_per =
 						c->master_inner_per / total_master_inner_percent;
 				} else {
 					c->ismaster = false;
-					c->master_inner_per =
-						master_num > 0 ? 1.0f / master_num : 1.0f;
+					c->master_inner_per = 1.0f / master_num;
 					c->stack_innder_per =
 						total_stack_hight_percent
 							? c->stack_innder_per / total_stack_hight_percent
@@ -536,7 +538,10 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
 	} else {
 		wl_list_for_each(c, &clients, link) {
 			if (VISIBLEON(c, m) && ISTILED(c)) {
-				if (total_master_inner_percent > 0.0 && i < nmasters) {
+
+				if (total_master_inner_percent <= 0.0)
+					return;
+				if (i < m->pertag->nmasters[m->pertag->curtag]) {
 					c->ismaster = true;
 					if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
 						c->stack_innder_per =
@@ -553,8 +558,7 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
 					stack_index = i - nmasters;
 
 					c->ismaster = false;
-					c->master_inner_per =
-						master_num > 0 ? 1.0f / master_num : 1.0f;
+					c->master_inner_per = 1.0f / master_num;
 					if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
 						c->stack_innder_per =
 							total_right_stack_hight_percent
@@ -633,7 +637,7 @@ arrange(Monitor *m, bool want_animation) {
 			if (VISIBLEON(c, m)) {
 				if (ISTILED(c)) {
 
-					if (i < nmasters) {
+					if (i < m->pertag->nmasters[m->pertag->curtag]) {
 						master_num++;
 						total_master_inner_percent += c->master_inner_per;
 					} else {
@@ -682,6 +686,4 @@ arrange(Monitor *m, bool want_animation) {
 		motionnotify(0, NULL, 0, 0, 0, 0);
 		checkidleinhibitor(NULL);
 	}
-
-	printstatus();
 }

src/layout/horizontal.h

@@ -1,9 +1,9 @@
 // 网格布局窗口大小和位置计算
 void grid(Monitor *m) {
-	uint32_t i, n;
-	uint32_t cx, cy, cw, ch;
-	uint32_t dx;
-	uint32_t cols, rows, overcols;
+	unsigned int i, n;
+	unsigned int cx, cy, cw, ch;
+	unsigned int dx;
+	unsigned int cols, rows, overcols;
 	Client *c = NULL;
 	n = 0;
 	int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappoh : 0;
@@ -23,6 +23,10 @@ void grid(Monitor *m) {
 			if (c->mon != m)
 				continue;
 
+			c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
+							smartgaps
+						? 0
+						: borderpx;
 			if (VISIBLEON(c, m) && !c->isunglobal &&
 				((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 				cw = (m->w.width - 2 * target_gappo) * single_width_ratio;
@@ -45,6 +49,10 @@ void grid(Monitor *m) {
 			if (c->mon != m)
 				continue;
 
+			c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
+							smartgaps
+						? 0
+						: borderpx;
 			if (VISIBLEON(c, m) && !c->isunglobal &&
 				((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 				if (i == 0) {
@@ -91,7 +99,10 @@ void grid(Monitor *m) {
 
 		if (c->mon != m)
 			continue;
-
+		c->bw =
+			m->visible_tiling_clients == 1 && no_border_when_single && smartgaps
+				? 0
+				: borderpx;
 		if (VISIBLEON(c, m) && !c->isunglobal &&
 			((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 			cx = m->w.x + (i % cols) * (cw + target_gappi);
@@ -110,15 +121,15 @@ void grid(Monitor *m) {
 }
 
 void deck(Monitor *m) {
-	uint32_t mw, my;
+	unsigned int mw, my;
 	int i, n = 0;
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
 
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
 	cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
@@ -181,9 +192,9 @@ void deck(Monitor *m) {
 void horizontal_scroll_adjust_fullandmax(Client *c,
 										 struct wlr_box *target_geom) {
 	Monitor *m = c->mon;
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappih =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -212,7 +223,7 @@ void horizontal_scroll_adjust_fullandmax(Client *c,
 
 // 滚动布局
 void scroller(Monitor *m) {
-	uint32_t i, n, j;
+	unsigned int i, n, j;
 	float single_proportion = 1.0;
 
 	Client *c = NULL, *root_client = NULL;
@@ -220,9 +231,9 @@ void scroller(Monitor *m) {
 	struct wlr_box target_geom;
 	int focus_client_index = 0;
 	bool need_scroller = false;
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappih =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -231,7 +242,8 @@ void scroller(Monitor *m) {
 	cur_gappov =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappov;
 
-	uint32_t max_client_width = m->w.width - 2 * scroller_structs - cur_gappih;
+	unsigned int max_client_width =
+		m->w.width - 2 * scroller_structs - cur_gappih;
 
 	n = m->visible_scroll_tiling_clients;
 
@@ -272,7 +284,7 @@ void scroller(Monitor *m) {
 		return;
 	}
 
-	if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) {
+	if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
 		root_client = m->sel;
 	} else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
 			   VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -366,7 +378,7 @@ void scroller(Monitor *m) {
 }
 
 void center_tile(Monitor *m) {
-	uint32_t i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw;
+	unsigned int i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
@@ -375,8 +387,6 @@ void center_tile(Monitor *m) {
 
 	n = m->visible_tiling_clients;
 	master_num = m->pertag->nmasters[m->pertag->curtag];
-	master_num = n > master_num ? master_num : n;
-
 	stack_num = n - master_num;
 
 	if (n == 0)
@@ -389,10 +399,10 @@ void center_tile(Monitor *m) {
 	}
 
 	// 间隙参数处理
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0; // 内部垂直间隙
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0; // 内部水平间隙
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0; // 外部垂直间隙
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0; // 外部水平间隙
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0; // 内部垂直间隙
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0; // 内部水平间隙
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0; // 外部垂直间隙
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0; // 外部水平间隙
 
 	// 智能间隙处理
 	cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -400,7 +410,7 @@ void center_tile(Monitor *m) {
 	cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov;
 	cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
 
-	uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
+	unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
 	mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per
 										: m->pertag->mfacts[m->pertag->curtag];
 
@@ -413,19 +423,6 @@ void center_tile(Monitor *m) {
 	// 判断是否需要主区域铺满
 	int should_overspread = center_master_overspread && (n <= nmasters);
 
-	uint32_t master_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
-	float master_surplus_ratio = 1.0;
-
-	uint32_t slave_left_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num / 2 - 1));
-	float slave_left_surplus_ratio = 1.0;
-
-	uint32_t slave_right_surplus_height =
-		(m->w.height - 2 * cur_gappov -
-		 cur_gappiv * ie * ((stack_num + 1) / 2 - 1));
-	float slave_right_surplus_ratio = 1.0;
-
 	if (n > nmasters || !should_overspread) {
 		// 计算主区域宽度（居中模式）
 		mw = nmasters ? (m->w.width - 2 * cur_gappoh - cur_gappih * ie) * mfact
@@ -470,11 +467,9 @@ void center_tile(Monitor *m) {
 			// 主区域窗口
 			r = MIN(n, nmasters) - i;
 			if (c->master_inner_per > 0.0f) {
-				h = master_surplus_height * c->master_inner_per /
-					master_surplus_ratio;
-				master_surplus_height = master_surplus_height - h;
-				master_surplus_ratio =
-					master_surplus_ratio - c->master_inner_per;
+				h = (m->w.height - 2 * cur_gappov -
+					 cur_gappiv * ie * (master_num - 1)) *
+					c->master_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -494,7 +489,7 @@ void center_tile(Monitor *m) {
 			my += c->geom.height + cur_gappiv * ie;
 		} else {
 			// 堆叠区域窗口
-			uint32_t stack_index = i - nmasters;
+			unsigned int stack_index = i - nmasters;
 
 			if (n - nmasters == 1) {
 				// 单个堆叠窗口
@@ -536,12 +531,9 @@ void center_tile(Monitor *m) {
 				if ((stack_index % 2) ^ (n % 2 == 0)) {
 					// 右侧堆叠窗口
 					if (c->stack_innder_per > 0.0f) {
-						h = slave_right_surplus_height * c->stack_innder_per /
-							slave_right_surplus_ratio;
-						slave_right_surplus_height =
-							slave_right_surplus_height - h;
-						slave_right_surplus_ratio =
-							slave_right_surplus_ratio - c->stack_innder_per;
+						h = (m->w.height - 2 * cur_gappov -
+							 cur_gappiv * ie * ((stack_num + 1) / 2 - 1)) *
+							c->stack_innder_per;
 						c->master_mfact_per = mfact;
 					} else {
 						h = (m->w.height - ety - cur_gappov -
@@ -565,12 +557,9 @@ void center_tile(Monitor *m) {
 				} else {
 					// 左侧堆叠窗口
 					if (c->stack_innder_per > 0.0f) {
-						h = slave_left_surplus_height * c->stack_innder_per /
-							slave_left_surplus_ratio;
-						slave_left_surplus_height =
-							slave_left_surplus_height - h;
-						slave_left_surplus_ratio =
-							slave_left_surplus_ratio - c->stack_innder_per;
+						h = (m->w.height - 2 * cur_gappov -
+							 cur_gappiv * ie * (stack_num / 2 - 1)) *
+							c->stack_innder_per;
 						c->master_mfact_per = mfact;
 					} else {
 						h = (m->w.height - oty - cur_gappov -
@@ -598,7 +587,7 @@ void center_tile(Monitor *m) {
 }
 
 void tile(Monitor *m) {
-	uint32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty;
+	unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
@@ -607,16 +596,15 @@ void tile(Monitor *m) {
 
 	n = m->visible_tiling_clients;
 	master_num = m->pertag->nmasters[m->pertag->curtag];
-	master_num = n > master_num ? master_num : n;
 	stack_num = n - master_num;
 
 	if (n == 0)
 		return;
 
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
 	cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
@@ -640,26 +628,15 @@ void tile(Monitor *m) {
 		mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
 	i = 0;
 	my = ty = cur_gappov;
-
-	uint32_t master_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
-	float master_surplus_ratio = 1.0;
-
-	uint32_t slave_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num - 1));
-	float slave_surplus_ratio = 1.0;
-
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || !ISTILED(c))
 			continue;
 		if (i < m->pertag->nmasters[m->pertag->curtag]) {
 			r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
 			if (c->master_inner_per > 0.0f) {
-				h = master_surplus_height * c->master_inner_per /
-					master_surplus_ratio;
-				master_surplus_height = master_surplus_height - h;
-				master_surplus_ratio =
-					master_surplus_ratio - c->master_inner_per;
+				h = (m->w.height - 2 * cur_gappov -
+					 cur_gappiv * ie * (master_num - 1)) *
+					c->master_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -679,10 +656,9 @@ void tile(Monitor *m) {
 		} else {
 			r = n - i;
 			if (c->stack_innder_per > 0.0f) {
-				h = slave_surplus_height * c->stack_innder_per /
-					slave_surplus_ratio;
-				slave_surplus_height = slave_surplus_height - h;
-				slave_surplus_ratio = slave_surplus_ratio - c->stack_innder_per;
+				h = (m->w.height - 2 * cur_gappov -
+					 cur_gappiv * ie * (stack_num - 1)) *
+					c->stack_innder_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - ty - cur_gappov -
@@ -708,7 +684,7 @@ void tile(Monitor *m) {
 }
 
 void right_tile(Monitor *m) {
-	uint32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty;
+	unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
@@ -717,16 +693,15 @@ void right_tile(Monitor *m) {
 
 	n = m->visible_tiling_clients;
 	master_num = m->pertag->nmasters[m->pertag->curtag];
-	master_num = n > master_num ? master_num : n;
 	stack_num = n - master_num;
 
 	if (n == 0)
 		return;
 
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gappih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
 	cur_gappih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappih;
@@ -750,26 +725,15 @@ void right_tile(Monitor *m) {
 		mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
 	i = 0;
 	my = ty = cur_gappov;
-
-	uint32_t master_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
-	float master_surplus_ratio = 1.0;
-
-	uint32_t slave_surplus_height =
-		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (stack_num - 1));
-	float slave_surplus_ratio = 1.0;
-
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || !ISTILED(c))
 			continue;
 		if (i < m->pertag->nmasters[m->pertag->curtag]) {
 			r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
 			if (c->master_inner_per > 0.0f) {
-				h = master_surplus_height * c->master_inner_per /
-					master_surplus_ratio;
-				master_surplus_height = master_surplus_height - h;
-				master_surplus_ratio =
-					master_surplus_ratio - c->master_inner_per;
+				h = (m->w.height - 2 * cur_gappov -
+					 cur_gappiv * ie * (master_num - 1)) *
+					c->master_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -790,10 +754,9 @@ void right_tile(Monitor *m) {
 		} else {
 			r = n - i;
 			if (c->stack_innder_per > 0.0f) {
-				h = slave_surplus_height * c->stack_innder_per /
-					slave_surplus_ratio;
-				slave_surplus_height = slave_surplus_height - h;
-				slave_surplus_ratio = slave_surplus_ratio - c->stack_innder_per;
+				h = (m->w.height - 2 * cur_gappov -
+					 cur_gappiv * ie * (stack_num - 1)) *
+					c->stack_innder_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - ty - cur_gappov -
@@ -823,8 +786,8 @@ monocle(Monitor *m) {
 	Client *c = NULL;
 	struct wlr_box geom;
 
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
 	cur_gappov = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappov;

src/layout/vertical.h

@@ -1,5 +1,5 @@
 void vertical_tile(Monitor *m) {
-	uint32_t i, n = 0, w, r, ie = enablegaps, mh, mx, tx;
+	unsigned int i, n = 0, w, r, ie = enablegaps, mh, mx, tx;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
@@ -8,16 +8,15 @@ void vertical_tile(Monitor *m) {
 
 	n = m->visible_tiling_clients;
 	master_num = m->pertag->nmasters[m->pertag->curtag];
-	master_num = n > master_num ? master_num : n;
 	stack_num = n - master_num;
 
 	if (n == 0)
 		return;
 
-	uint32_t cur_gapih = enablegaps ? m->gappih : 0;
-	uint32_t cur_gapiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gapoh = enablegaps ? m->gappoh : 0;
-	uint32_t cur_gapov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gapih = enablegaps ? m->gappih : 0;
+	unsigned int cur_gapiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gapoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gapov = enablegaps ? m->gappov : 0;
 
 	cur_gapih = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapih;
 	cur_gapiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gapiv;
@@ -41,26 +40,15 @@ void vertical_tile(Monitor *m) {
 
 	i = 0;
 	mx = tx = cur_gapih;
-
-	uint32_t master_surplus_width =
-		(m->w.width - 2 * cur_gapih - cur_gapih * ie * (master_num - 1));
-	float master_surplus_ratio = 1.0;
-
-	uint32_t slave_surplus_width =
-		(m->w.width - 2 * cur_gapih - cur_gapih * ie * (stack_num - 1));
-	float slave_surplus_ratio = 1.0;
-
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || !ISTILED(c))
 			continue;
 		if (i < m->pertag->nmasters[m->pertag->curtag]) {
 			r = MIN(n, m->pertag->nmasters[m->pertag->curtag]) - i;
 			if (c->master_inner_per > 0.0f) {
-				w = master_surplus_width * c->master_inner_per /
-					master_surplus_ratio;
-				master_surplus_width = master_surplus_width - w;
-				master_surplus_ratio =
-					master_surplus_ratio - c->master_inner_per;
+				w = (m->w.width - 2 * cur_gapih -
+					 cur_gapih * ie * (master_num - 1)) *
+					c->master_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				w = (m->w.width - mx - cur_gapih - cur_gapih * ie * (r - 1)) /
@@ -79,10 +67,9 @@ void vertical_tile(Monitor *m) {
 		} else {
 			r = n - i;
 			if (c->stack_innder_per > 0.0f) {
-				w = slave_surplus_width * c->stack_innder_per /
-					slave_surplus_ratio;
-				slave_surplus_width = slave_surplus_width - w;
-				slave_surplus_ratio = slave_surplus_ratio - c->stack_innder_per;
+				w = (m->w.width - 2 * cur_gapih -
+					 cur_gapih * ie * (stack_num - 1)) *
+					c->stack_innder_per;
 				c->master_mfact_per = mfact;
 			} else {
 				w = (m->w.width - tx - cur_gapih - cur_gapih * ie * (r - 1)) /
@@ -105,15 +92,15 @@ void vertical_tile(Monitor *m) {
 }
 
 void vertical_deck(Monitor *m) {
-	uint32_t mh, mx;
+	unsigned int mh, mx;
 	int i, n = 0;
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
 
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
 	cur_gappoh = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappoh;
@@ -170,9 +157,9 @@ void vertical_deck(Monitor *m) {
 
 void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
 	Monitor *m = c->mon;
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -201,7 +188,7 @@ void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
 
 // 竖屏滚动布局
 void vertical_scroller(Monitor *m) {
-	uint32_t i, n, j;
+	unsigned int i, n, j;
 	float single_proportion = 1.0;
 
 	Client *c = NULL, *root_client = NULL;
@@ -209,9 +196,9 @@ void vertical_scroller(Monitor *m) {
 	struct wlr_box target_geom;
 	int focus_client_index = 0;
 	bool need_scroller = false;
-	uint32_t cur_gappiv = enablegaps ? m->gappiv : 0;
-	uint32_t cur_gappov = enablegaps ? m->gappov : 0;
-	uint32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
+	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -220,7 +207,7 @@ void vertical_scroller(Monitor *m) {
 	cur_gappoh =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappoh;
 
-	uint32_t max_client_height =
+	unsigned int max_client_height =
 		m->w.height - 2 * scroller_structs - cur_gappiv;
 
 	n = m->visible_scroll_tiling_clients;
@@ -259,7 +246,7 @@ void vertical_scroller(Monitor *m) {
 		return;
 	}
 
-	if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) {
+	if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
 		root_client = m->sel;
 	} else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
 			   VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -354,10 +341,10 @@ void vertical_scroller(Monitor *m) {
 }
 
 void vertical_grid(Monitor *m) {
-	uint32_t i, n;
-	uint32_t cx, cy, cw, ch;
-	uint32_t dy;
-	uint32_t rows, cols, overrows;
+	unsigned int i, n;
+	unsigned int cx, cy, cw, ch;
+	unsigned int dy;
+	unsigned int rows, cols, overrows;
 	Client *c = NULL;
 	int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappov : 0;
 	int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
@@ -376,6 +363,10 @@ void vertical_grid(Monitor *m) {
 			if (c->mon != m)
 				continue;
 
+			c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
+							smartgaps
+						? 0
+						: borderpx;
 			if (VISIBLEON(c, m) && !c->isunglobal &&
 				((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 				ch = (m->w.height - 2 * target_gappo) * single_height_ratio;
@@ -399,6 +390,10 @@ void vertical_grid(Monitor *m) {
 			if (c->mon != m)
 				continue;
 
+			c->bw = m->visible_tiling_clients == 1 && no_border_when_single &&
+							smartgaps
+						? 0
+						: borderpx;
 			if (VISIBLEON(c, m) && !c->isunglobal &&
 				((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 				if (i == 0) {
@@ -441,6 +436,10 @@ void vertical_grid(Monitor *m) {
 		if (c->mon != m)
 			continue;
 
+		c->bw =
+			m->visible_tiling_clients == 1 && no_border_when_single && smartgaps
+				? 0
+				: borderpx;
 		if (VISIBLEON(c, m) && !c->isunglobal &&
 			((m->isoverview && !client_is_x11_popup(c)) || ISTILED(c))) {
 			cx = m->w.x + (i / rows) * (cw + target_gappi);

src/mango.c

@@ -181,28 +181,6 @@ enum seat_config_shortcuts_inhibit {
 	SHORTCUTS_INHIBIT_ENABLE,
 };
 
-// 事件掩码枚举
-enum print_event_type {
-	PRINT_ACTIVE = 1 << 0,
-	PRINT_TAG = 1 << 1,
-	PRINT_LAYOUT = 1 << 2,
-	PRINT_TITLE = 1 << 3,
-	PRINT_APPID = 1 << 4,
-	PRINT_LAYOUT_SYMBOL = 1 << 5,
-	PRINT_FULLSCREEN = 1 << 6,
-	PRINT_FLOATING = 1 << 7,
-	PRINT_X = 1 << 8,
-	PRINT_Y = 1 << 9,
-	PRINT_WIDTH = 1 << 10,
-	PRINT_HEIGHT = 1 << 11,
-	PRINT_LAST_LAYER = 1 << 12,
-	PRINT_KB_LAYOUT = 1 << 13,
-	PRINT_KEYMODE = 1 << 14,
-	PRINT_SCALEFACTOR = 1 << 15,
-	PRINT_FRAME = 1 << 16,
-	PRINT_ALL = (1 << 17) - 1 // 所有位都设为1
-};
-
 typedef struct Pertag Pertag;
 typedef struct Monitor Monitor;
 typedef struct Client Client;
@@ -223,13 +201,13 @@ typedef struct {
 	char *v;
 	char *v2;
 	char *v3;
-	uint32_t ui;
-	uint32_t ui2;
+	unsigned int ui;
+	unsigned int ui2;
 } Arg;
 
 typedef struct {
-	uint32_t mod;
-	uint32_t button;
+	unsigned int mod;
+	unsigned int button;
 	int (*func)(const Arg *);
 	const Arg arg;
 } Button; // 鼠标按键
@@ -240,8 +218,8 @@ typedef struct {
 } KeyMode;
 
 typedef struct {
-	uint32_t mod;
-	uint32_t dir;
+	unsigned int mod;
+	unsigned int dir;
 	int (*func)(const Arg *);
 	const Arg arg;
 } Axis;
@@ -269,8 +247,8 @@ struct dwl_animation {
 	bool tagouting;
 	bool begin_fade_in;
 	bool tag_from_rule;
-	uint32_t time_started;
-	uint32_t duration;
+	unsigned int time_started;
+	unsigned int duration;
 	struct wlr_box initial;
 	struct wlr_box current;
 	int action;
@@ -281,8 +259,8 @@ struct dwl_opacity_animation {
 	float current_opacity;
 	float target_opacity;
 	float initial_opacity;
-	uint32_t time_started;
-	uint32_t duration;
+	unsigned int time_started;
+	unsigned int duration;
 	float current_border_color[4];
 	float target_border_color[4];
 	float initial_border_color[4];
@@ -299,7 +277,7 @@ typedef struct {
 
 struct Client {
 	/* Must keep these three elements in this order */
-	uint32_t type; /* XDGShell or X11* */
+	unsigned int type; /* XDGShell or X11* */
 	struct wlr_box geom, pending, float_geom, animainit_geom,
 		overview_backup_geom, current,
 		drag_begin_geom; /* layout-relative, includes border */
@@ -331,10 +309,10 @@ struct Client {
 	struct wl_listener set_hints;
 	struct wl_listener set_geometry;
 #endif
-	uint32_t bw;
-	uint32_t tags, oldtags, mini_restore_tag;
+	unsigned int bw;
+	unsigned int tags, oldtags, mini_restore_tag;
 	bool dirty;
-	uint32_t configure_serial;
+	unsigned int configure_serial;
 	struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel;
 	int isfloating, isurgent, isfullscreen, isfakefullscreen,
 		need_float_size_reduce, isminimized, isoverlay, isnosizehint,
@@ -351,8 +329,6 @@ struct Client {
 	struct wl_listener foreign_fullscreen_request;
 	struct wl_listener foreign_close_request;
 	struct wl_listener foreign_destroy;
-	struct wl_listener foreign_minimize_request;
-	struct wl_listener foreign_maximize_request;
 	struct wl_listener set_decoration_mode;
 	struct wl_listener destroy_decoration;
 
@@ -404,7 +380,6 @@ struct Client {
 	int force_tearing;
 	int allow_shortcuts_inhibit;
 	float scroller_proportion_single;
-	bool isfocusing;
 };
 
 typedef struct {
@@ -414,7 +389,7 @@ typedef struct {
 } DwlIpcOutput;
 
 typedef struct {
-	uint32_t mod;
+	unsigned int mod;
 	xkb_keysym_t keysym;
 	int (*func)(const Arg *);
 	const Arg arg;
@@ -425,8 +400,8 @@ typedef struct {
 
 	int nsyms;
 	const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */
-	uint32_t mods;				 /* invalid if nsyms == 0 */
-	uint32_t keycode;
+	unsigned int mods;			 /* invalid if nsyms == 0 */
+	unsigned int keycode;
 	struct wl_event_source *key_repeat_source;
 
 	struct wl_listener modifiers;
@@ -442,7 +417,7 @@ typedef struct {
 
 typedef struct {
 	/* Must keep these three elements in this order */
-	uint32_t type; /* LayerShell */
+	unsigned int type; /* LayerShell */
 	struct wlr_box geom, current, pending, animainit_geom;
 	Monitor *mon;
 	struct wlr_scene_tree *scene;
@@ -473,7 +448,7 @@ typedef struct {
 	const char *symbol;
 	void (*arrange)(Monitor *);
 	const char *name;
-	uint32_t id;
+	unsigned int id;
 } Layout;
 
 struct Monitor {
@@ -490,8 +465,8 @@ struct Monitor {
 	struct wlr_box w;		  /* window area, layout-relative */
 	struct wl_list layers[4]; /* LayerSurface::link */
 	const Layout *lt;
-	uint32_t seltags;
-	uint32_t tagset[2];
+	unsigned int seltags;
+	unsigned int tagset[2];
 	double mfact;
 	int nmaster;
 
@@ -505,9 +480,9 @@ struct Monitor {
 	int isoverview;
 	int is_in_hotarea;
 	int asleep;
-	uint32_t visible_clients;
-	uint32_t visible_tiling_clients;
-	uint32_t visible_scroll_tiling_clients;
+	unsigned int visible_clients;
+	unsigned int visible_tiling_clients;
+	unsigned int visible_scroll_tiling_clients;
 	bool has_visible_fullscreen_client;
 	struct wlr_scene_optimized_blur *blur;
 	char last_surface_ws_name[256];
@@ -539,7 +514,7 @@ arrange(Monitor *m,
 static void arrangelayer(Monitor *m, struct wl_list *list,
 						 struct wlr_box *usable_area, int exclusive);
 static void arrangelayers(Monitor *m);
-static void handle_print_status(struct wl_listener *listener, void *data);
+static char *get_autostart_path(char *, unsigned int); // 自启动命令执行
 static void axisnotify(struct wl_listener *listener,
 					   void *data); // 滚轮事件处理
 static void buttonpress(struct wl_listener *listener,
@@ -604,20 +579,21 @@ static void gpureset(struct wl_listener *listener, void *data);
 static int keyrepeat(void *data);
 
 static void inputdevice(struct wl_listener *listener, void *data);
-static int keybinding(uint32_t state, bool locked, uint32_t mods,
-					  xkb_keysym_t sym, uint32_t keycode);
+static int keybinding(unsigned int state, bool locked, unsigned int mods,
+					  xkb_keysym_t sym, unsigned int keycode);
 static void keypress(struct wl_listener *listener, void *data);
 static void keypressmod(struct wl_listener *listener, void *data);
 static bool keypressglobal(struct wlr_surface *last_surface,
 						   struct wlr_keyboard *keyboard,
-						   struct wlr_keyboard_key_event *event, uint32_t mods,
-						   xkb_keysym_t keysym, uint32_t keycode);
+						   struct wlr_keyboard_key_event *event,
+						   unsigned int mods, xkb_keysym_t keysym,
+						   unsigned int keycode);
 static void locksession(struct wl_listener *listener, void *data);
 static void mapnotify(struct wl_listener *listener, void *data);
 static void maximizenotify(struct wl_listener *listener, void *data);
 static void minimizenotify(struct wl_listener *listener, void *data);
 static void motionabsolute(struct wl_listener *listener, void *data);
-static void motionnotify(uint32_t time, struct wlr_input_device *device,
+static void motionnotify(unsigned int time, struct wlr_input_device *device,
 						 double sx, double sy, double sx_unaccel,
 						 double sy_unaccel);
 static void motionrelative(struct wl_listener *listener, void *data);
@@ -631,7 +607,7 @@ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config,
 								 int test);
 static void outputmgrtest(struct wl_listener *listener, void *data);
 static void pointerfocus(Client *c, struct wlr_surface *surface, double sx,
-						 double sy, uint32_t time);
+						 double sy, unsigned int time);
 static void printstatus(void);
 static void quitsignal(int signo);
 static void powermgrsetmode(struct wl_listener *listener, void *data);
@@ -649,7 +625,7 @@ static void setmaximizescreen(Client *c, int maximizescreen);
 static void reset_maximizescreen_size(Client *c);
 static void setgaps(int oh, int ov, int ih, int iv);
 
-static void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus);
+static void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus);
 static void setpsel(struct wl_listener *listener, void *data);
 static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
@@ -680,7 +656,7 @@ static Client *termforwin(Client *w);
 static void swallow(Client *c, Client *w);
 
 static void warp_cursor_to_selmon(Monitor *m);
-uint32_t want_restore_fullscreen(Client *target_client);
+unsigned int want_restore_fullscreen(Client *target_client);
 static void overview_restore(Client *c, const Arg *arg);
 static void overview_backup(Client *c);
 static int applyrulesgeom(Client *c);
@@ -693,7 +669,7 @@ static void tag_client(const Arg *arg, Client *target_client);
 static struct wlr_box setclient_coordinate_center(Client *c,
 												  struct wlr_box geom,
 												  int offsetx, int offsety);
-static uint32_t get_tags_first_tag(uint32_t tags);
+static unsigned int get_tags_first_tag(unsigned int tags);
 
 static struct wlr_output_mode *
 get_nearest_output_mode(struct wlr_output *output, int width, int height,
@@ -724,11 +700,11 @@ static bool check_hit_no_border(Client *c);
 static void reset_keyboard_layout(void);
 static void client_update_oldmonname_record(Client *c, Monitor *m);
 static void pending_kill_client(Client *c);
-static uint32_t get_tags_first_tag_num(uint32_t source_tags);
+static unsigned int get_tags_first_tag_num(unsigned int source_tags);
 static void set_layer_open_animaiton(LayerSurface *l, struct wlr_box geo);
 static void init_fadeout_layers(LayerSurface *l);
-static void layer_actual_size(LayerSurface *l, uint32_t *width,
-							  uint32_t *height);
+static void layer_actual_size(LayerSurface *l, unsigned int *width,
+							  unsigned int *height);
 static void get_layer_target_geometry(LayerSurface *l,
 									  struct wlr_box *target_box);
 static void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
@@ -750,13 +726,13 @@ static Client *get_client_by_id_or_title(const char *arg_id,
 										 const char *arg_title);
 static bool switch_scratchpad_client_state(Client *c);
 static bool check_trackpad_disabled(struct wlr_pointer *pointer);
-static uint32_t get_tag_status(uint32_t tag, Monitor *m);
+static unsigned int get_tag_status(unsigned int tag, Monitor *m);
 static void enable_adaptive_sync(Monitor *m, struct wlr_output_state *state);
 static Client *get_next_stack_client(Client *c, bool reverse);
 static void set_float_malposition(Client *tc);
 static void set_size_per(Monitor *m, Client *c);
 static void resize_tile_client(Client *grabc, bool isdrag, int offsetx,
-							   int offsety, uint32_t time);
+							   int offsety, unsigned int time);
 static void refresh_monitors_workspaces_status(Monitor *m);
 static void init_client_properties(Client *c);
 static float *get_border_color(Client *c);
@@ -771,7 +747,7 @@ static void clear_fullscreen_and_maximized_state(Monitor *m);
 static const char broken[] = "broken";
 static pid_t child_pid = -1;
 static int locked;
-static uint32_t locked_mods = 0;
+static unsigned int locked_mods = 0;
 static void *exclusive_focus;
 static struct wl_display *dpy;
 static struct wl_event_loop *event_loop;
@@ -801,7 +777,6 @@ static struct wlr_virtual_pointer_manager_v1 *virtual_pointer_mgr;
 static struct wlr_output_power_manager_v1 *power_mgr;
 static struct wlr_pointer_gestures_v1 *pointer_gestures;
 static struct wlr_drm_lease_v1_manager *drm_lease_manager;
-struct mango_print_status_manager *print_status_manager;
 
 static struct wlr_cursor *cursor;
 static struct wlr_xcursor_manager *cursor_mgr;
@@ -822,7 +797,7 @@ static struct wlr_seat *seat;
 static KeyboardGroup *kb_group;
 static struct wl_list inputdevices;
 static struct wl_list keyboard_shortcut_inhibitors;
-static uint32_t cursor_mode;
+static unsigned int cursor_mode;
 static Client *grabc;
 static int grabcx, grabcy;						   /* client-relative */
 static int drag_begin_cursorx, drag_begin_cursory; /* client-relative */
@@ -839,7 +814,7 @@ static int axis_apply_time = 0;
 static int axis_apply_dir = 0;
 static int scroller_focus_lock = 0;
 
-static uint32_t swipe_fingers = 0;
+static unsigned int swipe_fingers = 0;
 static double swipe_dx = 0;
 static double swipe_dy = 0;
 
@@ -854,7 +829,6 @@ struct dvec2 *baked_points_focus;
 static struct wl_event_source *hide_source;
 static bool cursor_hidden = false;
 static bool tag_combo = false;
-static const char *cli_config_path = NULL;
 static KeyMode keymode = {
 	.mode = {'d', 'e', 'f', 'a', 'u', 'l', 't', '\0'},
 	.isdefault = true,
@@ -870,7 +844,7 @@ static struct {
 #include "config/preset.h"
 
 struct Pertag {
-	uint32_t curtag, prevtag;		/* current and previous tag */
+	unsigned int curtag, prevtag;	/* current and previous tag */
 	int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
 	float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
 	bool no_hide[LENGTH(tags) + 1]; /* no_hide per tag */
@@ -878,10 +852,6 @@ struct Pertag {
 		*ltidxs[LENGTH(tags) + 1]; /* matrix of tags and layouts indexes  */
 };
 
-static struct wl_signal mango_print_status;
-
-static struct wl_listener print_status_listener = {.notify =
-													   handle_print_status};
 static struct wl_listener cursor_axis = {.notify = axisnotify};
 static struct wl_listener cursor_button = {.notify = buttonpress};
 static struct wl_listener cursor_frame = {.notify = cursorframe};
@@ -1319,7 +1289,7 @@ void set_float_malposition(Client *tc) {
 void applyrules(Client *c) {
 	/* rule matching */
 	const char *appid, *title;
-	uint32_t i, newtags = 0;
+	unsigned int i, newtags = 0;
 	const ConfigWinRule *r;
 	Monitor *m = NULL;
 	Client *fc = NULL;
@@ -1494,9 +1464,9 @@ void apply_window_snap(Client *c) {
 	int snap_up_mon = 0, snap_down_mon = 0, snap_left_mon = 0,
 		snap_right_mon = 0;
 
-	uint32_t cbw = !render_border || c->fake_no_border ? borderpx : 0;
-	uint32_t tcbw;
-	uint32_t cx, cy, cw, ch, tcx, tcy, tcw, tch;
+	unsigned int cbw = !render_border || c->fake_no_border ? borderpx : 0;
+	unsigned int tcbw;
+	unsigned int cx, cy, cw, ch, tcx, tcy, tcw, tch;
 	cx = c->geom.x + cbw;
 	cy = c->geom.y + cbw;
 	cw = c->geom.width - 2 * cbw;
@@ -1596,7 +1566,7 @@ void focuslayer(LayerSurface *l) {
 void reset_exclusive_layer(Monitor *m) {
 	LayerSurface *l = NULL;
 	int i;
-	uint32_t layers_above_shell[] = {
+	unsigned int layers_above_shell[] = {
 		ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
 		ZWLR_LAYER_SHELL_V1_LAYER_TOP,
 		ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM,
@@ -1661,10 +1631,10 @@ axisnotify(struct wl_listener *listener, void *data) {
 	 * for example when you move the scroll wheel. */
 	struct wlr_pointer_axis_event *event = data;
 	struct wlr_keyboard *keyboard, *hard_keyboard;
-	uint32_t mods, hard_mods;
+	unsigned int mods, hard_mods;
 	AxisBinding *a;
 	int ji;
-	uint32_t adir;
+	unsigned int adir;
 	// IDLE_NOTIFY_ACTIVITY;
 	handlecursoractivity();
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
@@ -1718,11 +1688,11 @@ axisnotify(struct wl_listener *listener, void *data) {
 
 int ongesture(struct wlr_pointer_swipe_end_event *event) {
 	struct wlr_keyboard *keyboard, *hard_keyboard;
-	uint32_t mods, hard_mods;
+	unsigned int mods, hard_mods;
 	const GestureBinding *g;
-	uint32_t motion;
-	uint32_t adx = (int)round(fabs(swipe_dx));
-	uint32_t ady = (int)round(fabs(swipe_dy));
+	unsigned int motion;
+	unsigned int adx = (int)round(fabs(swipe_dx));
+	unsigned int ady = (int)round(fabs(swipe_dy));
 	int handled = 0;
 	int ji;
 
@@ -1887,7 +1857,7 @@ void // 鼠标按键事件
 buttonpress(struct wl_listener *listener, void *data) {
 	struct wlr_pointer_button_event *event = data;
 	struct wlr_keyboard *hard_keyboard, *keyboard;
-	uint32_t hard_mods, mods;
+	unsigned int hard_mods, mods;
 	Client *c = NULL;
 	LayerSurface *l = NULL;
 	struct wlr_surface *surface;
@@ -2034,7 +2004,6 @@ void setcursorshape(struct wl_listener *listener, void *data) {
 }
 
 void cleanuplisteners(void) {
-	wl_list_remove(&print_status_listener.link);
 	wl_list_remove(&cursor_axis.link);
 	wl_list_remove(&cursor_button.link);
 	wl_list_remove(&cursor_frame.link);
@@ -2105,7 +2074,7 @@ void cleanup(void) {
 void cleanupmon(struct wl_listener *listener, void *data) {
 	Monitor *m = wl_container_of(listener, m, destroy);
 	LayerSurface *l = NULL, *tmp = NULL;
-	uint32_t i;
+	unsigned int i;
 
 	/* m->layers[i] are intentionally not unlinked */
 	for (i = 0; i < LENGTH(m->layers); i++) {
@@ -2519,14 +2488,14 @@ KeyboardGroup *createkeyboardgroup(void) {
 		xkb_mod_index_t mod_index =
 			xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
 		if (mod_index != XKB_MOD_INVALID)
-			locked_mods |= (uint32_t)1 << mod_index;
+			locked_mods |= (unsigned int)1 << mod_index;
 	}
 
 	if (capslock) {
 		xkb_mod_index_t mod_index =
 			xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS);
 		if (mod_index != XKB_MOD_INVALID)
-			locked_mods |= (uint32_t)1 << mod_index;
+			locked_mods |= (unsigned int)1 << mod_index;
 	}
 
 	if (locked_mods)
@@ -2650,7 +2619,7 @@ void createmon(struct wl_listener *listener, void *data) {
 	 * monitor) becomes available. */
 	struct wlr_output *wlr_output = data;
 	const ConfigMonitorRule *r;
-	uint32_t i;
+	unsigned int i;
 	int ji, jk;
 	struct wlr_output_state state;
 	Monitor *m = NULL;
@@ -3169,7 +3138,6 @@ void destroykeyboardgroup(struct wl_listener *listener, void *data) {
 void focusclient(Client *c, int lift) {
 
 	Client *last_focus_client = NULL;
-	Monitor *um = NULL;
 
 	struct wlr_surface *old_keyboard_focus_surface =
 		seat->keyboard_state.focused_surface;
@@ -3209,11 +3177,9 @@ void focusclient(Client *c, int lift) {
 		selmon = c->mon;
 		selmon->prevsel = selmon->sel;
 		selmon->sel = c;
-		c->isfocusing = true;
 
 		if (last_focus_client && !last_focus_client->iskilling &&
 			last_focus_client != c) {
-			last_focus_client->isfocusing = false;
 			client_set_unfocused_opacity_animation(last_focus_client);
 		}
 
@@ -3236,15 +3202,6 @@ void focusclient(Client *c, int lift) {
 		c->isurgent = 0;
 	}
 
-	// update other monitor focus disappear
-	wl_list_for_each(um, &mons, link) {
-		if (um->wlr_output->enabled && um != selmon && um->sel &&
-			!um->sel->iskilling && um->sel->isfocusing) {
-			um->sel->isfocusing = false;
-			client_set_unfocused_opacity_animation(um->sel);
-		}
-	}
-
 	if (c && !c->iskilling && c->foreign_toplevel)
 		wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, true);
 
@@ -3323,7 +3280,7 @@ void inputdevice(struct wl_listener *listener, void *data) {
 	/* This event is raised by the backend when a new input device becomes
 	 * available. */
 	struct wlr_input_device *device = data;
-	uint32_t caps;
+	unsigned int caps;
 
 	switch (device->type) {
 	case WLR_INPUT_DEVICE_KEYBOARD:
@@ -3380,8 +3337,8 @@ bool is_keyboard_shortcut_inhibitor(struct wlr_surface *surface) {
 }
 
 int // 17
-keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
-		   uint32_t keycode) {
+keybinding(unsigned int state, bool locked, unsigned int mods, xkb_keysym_t sym,
+		   unsigned int keycode) {
 	/*
 	 * Here we handle compositor keybindings. This is when the compositor is
 	 * processing keys, rather than passing them on to the client for its
@@ -3434,11 +3391,7 @@ keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
 			k->func) {
 
 			isbreak = k->func(&k->arg);
-
-			if (!k->ispassapply)
 			handled = 1;
-			else
-				handled = 0;
 
 			if (isbreak)
 				break;
@@ -3449,10 +3402,10 @@ keybinding(uint32_t state, bool locked, uint32_t mods, xkb_keysym_t sym,
 
 bool keypressglobal(struct wlr_surface *last_surface,
 					struct wlr_keyboard *keyboard,
-					struct wlr_keyboard_key_event *event, uint32_t mods,
-					xkb_keysym_t keysym, uint32_t keycode) {
+					struct wlr_keyboard_key_event *event, unsigned int mods,
+					xkb_keysym_t keysym, unsigned int keycode) {
 	Client *c = NULL, *lastc = focustop(selmon);
-	uint32_t keycodes[32] = {0};
+	unsigned int keycodes[32] = {0};
 	int reset = false;
 	const char *appid = NULL;
 	const char *title = NULL;
@@ -3528,19 +3481,19 @@ void keypress(struct wl_listener *listener, void *data) {
 #endif
 
 	/* Translate libinput keycode -> xkbcommon */
-	uint32_t keycode = event->keycode + 8;
+	unsigned int keycode = event->keycode + 8;
 	/* Get a list of keysyms based on the keymap for this keyboard */
 	const xkb_keysym_t *syms;
 	int nsyms = xkb_state_key_get_syms(group->wlr_group->keyboard.xkb_state,
 									   keycode, &syms);
 
 	int handled = 0;
-	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
+	unsigned int mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
 
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 
 	// ov tab mode detect moe key release
-	if (ov_tab_mode && !locked && group == kb_group &&
+	if (ov_tab_mode && !locked &&
 		event->state == WL_KEYBOARD_KEY_STATE_RELEASED &&
 		(keycode == 133 || keycode == 37 || keycode == 64 || keycode == 50 ||
 		 keycode == 134 || keycode == 105 || keycode == 108 || keycode == 62) &&
@@ -3674,7 +3627,6 @@ static void iter_xdg_scene_buffers(struct wlr_scene_buffer *buffer, int sx,
 }
 
 void init_client_properties(Client *c) {
-	c->isfocusing = false;
 	c->ismaximizescreen = 0;
 	c->isfullscreen = 0;
 	c->need_float_size_reduce = 0;
@@ -3933,7 +3885,7 @@ void motionabsolute(struct wl_listener *listener, void *data) {
 	motionnotify(event->time_msec, &event->pointer->base, dx, dy, dx, dy);
 }
 
-void motionnotify(uint32_t time, struct wlr_input_device *device, double dx,
+void motionnotify(unsigned int time, struct wlr_input_device *device, double dx,
 				  double dy, double dx_unaccel, double dy_unaccel) {
 	double sx = 0, sy = 0, sx_confined, sy_confined;
 	Client *c = NULL, *w = NULL;
@@ -4028,18 +3980,35 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx,
 	if (!surface && !seat->drag && !cursor_hidden)
 		wlr_cursor_set_xcursor(cursor, cursor_mgr, "default");
 
-	if (c && c->mon && !c->animation.running && (INSIDEMON(c) || !ISTILED(c))) {
+	if (c && c->mon && !c->animation.running &&
+		(!(c->geom.x + c->geom.width > c->mon->m.x + c->mon->m.width ||
+		   c->geom.x < c->mon->m.x ||
+		   c->geom.y + c->geom.height > c->mon->m.y + c->mon->m.height ||
+		   c->geom.y < c->mon->m.y) ||
+		 !ISTILED(c))) {
 		scroller_focus_lock = 0;
 	}
 
 	should_lock = false;
-	if (!scroller_focus_lock || !(c && c->mon && !INSIDEMON(c))) {
-		if (c && c->mon && is_scroller_layout(c->mon) && !INSIDEMON(c)) {
+	if (!scroller_focus_lock ||
+		!(c && c->mon &&
+		  (c->geom.x + c->geom.width > c->mon->m.x + c->mon->m.width ||
+		   c->geom.x < c->mon->m.x ||
+		   c->geom.y + c->geom.height > c->mon->m.y + c->mon->m.height ||
+		   c->geom.y < c->mon->m.y))) {
+		if (c && c->mon && is_scroller_layout(c->mon) &&
+			(c->geom.x + c->geom.width > c->mon->m.x + c->mon->m.width ||
+			 c->geom.x < c->mon->m.x ||
+			 c->geom.y + c->geom.height > c->mon->m.y + c->mon->m.height ||
+			 c->geom.y < c->mon->m.y)) {
 			should_lock = true;
 		}
 
 		if (!(!edge_scroller_pointer_focus && c && c->mon &&
-			  is_scroller_layout(c->mon) && !INSIDEMON(c)))
+			  is_scroller_layout(c->mon) &&
+			  (c->geom.x < c->mon->m.x || c->geom.y < c->mon->m.y ||
+			   c->geom.x + c->geom.width > c->mon->m.x + c->mon->m.width ||
+			   c->geom.y + c->geom.height > c->mon->m.y + c->mon->m.height)))
 			pointerfocus(c, surface, sx, sy, time);
 
 		if (should_lock && c && c->mon && ISTILED(c) && c == c->mon->sel) {
@@ -4141,7 +4110,7 @@ void outputmgrtest(struct wl_listener *listener, void *data) {
 }
 
 void pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
-				  uint32_t time) {
+				  unsigned int time) {
 	struct timespec now;
 
 	if (surface != seat->pointer_state.focused_surface && sloppyfocus && time &&
@@ -4166,8 +4135,20 @@ void pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy,
 	wlr_seat_pointer_notify_motion(seat, time, sx, sy);
 }
 
-// 修改printstatus函数，接受掩码参数
-void printstatus(void) { wl_signal_emit(&mango_print_status, NULL); }
+void // 17
+printstatus(void) {
+	Monitor *m = NULL;
+	wl_list_for_each(m, &mons, link) {
+		if (!m->wlr_output->enabled) {
+			continue;
+		}
+		// Update workspace active states
+		dwl_ext_workspace_printstatus(m);
+
+		// Update IPC output status
+		dwl_ipc_output_printstatus(m);
+	}
+}
 
 void powermgrsetmode(struct wl_listener *listener, void *data) {
 	struct wlr_output_power_v1_set_mode_event *event = data;
@@ -4308,7 +4289,7 @@ void setborder_color(Client *c) {
 void exchange_two_client(Client *c1, Client *c2) {
 
 	Monitor *tmp_mon = NULL;
-	uint32_t tmp_tags;
+	unsigned int tmp_tags;
 	double master_inner_per = 0.0f;
 	double master_mfact_per = 0.0f;
 	double stack_innder_per = 0.0f;
@@ -4386,6 +4367,7 @@ run(char *startup_cmd) {
 
 	set_env();
 
+	char autostart_temp_path[1024];
 	/* Add a Unix socket to the Wayland display. */
 	const char *socket = wl_display_add_socket_auto(dpy);
 	if (!socket)
@@ -4399,7 +4381,9 @@ run(char *startup_cmd) {
 
 	/* Now that the socket exists and the backend is started, run the
 	 * startup command */
-
+	if (!startup_cmd)
+		startup_cmd = get_autostart_path(autostart_temp_path,
+										 sizeof(autostart_temp_path));
 	if (startup_cmd) {
 		int piperw[2];
 		if (pipe(piperw) < 0)
@@ -4742,9 +4726,9 @@ void reset_keyboard_layout(void) {
 	}
 
 	// Apply the new keymap
-	uint32_t depressed = keyboard->modifiers.depressed;
-	uint32_t latched = keyboard->modifiers.latched;
-	uint32_t locked = keyboard->modifiers.locked;
+	unsigned int depressed = keyboard->modifiers.depressed;
+	unsigned int latched = keyboard->modifiers.latched;
+	unsigned int locked = keyboard->modifiers.locked;
 
 	wlr_keyboard_set_keymap(keyboard, new_keymap);
 
@@ -4779,7 +4763,7 @@ cleanup_context:
 	xkb_context_unref(context);
 }
 
-void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus) {
+void setmon(Client *c, Monitor *m, unsigned int newtags, bool focus) {
 	Monitor *oldmon = c->mon;
 
 	if (oldmon == m)
@@ -4849,7 +4833,7 @@ void setsel(struct wl_listener *listener, void *data) {
 }
 
 void show_hide_client(Client *c) {
-	uint32_t target = 1;
+	unsigned int target = 1;
 
 	set_size_per(c->mon, c);
 	target = get_tags_first_tag(c->oldtags);
@@ -4887,20 +4871,6 @@ void create_output(struct wlr_backend *backend, void *data) {
 #endif
 }
 
-// 修改信号处理函数，接收掩码参数
-void handle_print_status(struct wl_listener *listener, void *data) {
-
-	Monitor *m = NULL;
-	wl_list_for_each(m, &mons, link) {
-		if (!m->wlr_output->enabled) {
-			continue;
-		}
-		dwl_ext_workspace_printstatus(m);
-
-		dwl_ipc_output_printstatus(m);
-	}
-}
-
 void setup(void) {
 
 	setenv("XCURSOR_SIZE", "24", 1);
@@ -4996,10 +4966,6 @@ void setup(void) {
 	wlr_alpha_modifier_v1_create(dpy);
 	wlr_ext_data_control_manager_v1_create(dpy, 1);
 
-	// 在 setup 函数中
-	wl_signal_init(&mango_print_status);
-	wl_signal_add(&mango_print_status, &print_status_listener);
-
 	/* Initializes the interface used to implement urgency hints */
 	activation = wlr_xdg_activation_v1_create(dpy);
 	wl_signal_add(&activation->events.request_activate, &request_activate);
@@ -5240,7 +5206,7 @@ void tag_client(const Arg *arg, Client *target_client) {
 void overview(Monitor *m) { grid(m); }
 
 // 目标窗口有其他窗口和它同个tag就返回0
-uint32_t want_restore_fullscreen(Client *target_client) {
+unsigned int want_restore_fullscreen(Client *target_client) {
 	Client *c = NULL;
 	wl_list_for_each(c, &clients, link) {
 		if (c && c != target_client && c->tags == target_client->tags &&
@@ -5616,7 +5582,7 @@ urgent(struct wl_listener *listener, void *data) {
 
 void view_in_mon(const Arg *arg, bool want_animation, Monitor *m,
 				 bool changefocus) {
-	uint32_t i, tmptag;
+	unsigned int i, tmptag;
 
 	if (!m || (arg->ui != (~0 & TAGMASK) && m->isoverview)) {
 		return;
@@ -5627,9 +5593,9 @@ void view_in_mon(const Arg *arg, bool want_animation, Monitor *m,
 	}
 
 	if (arg->ui == UINT32_MAX) {
-		m->pertag->prevtag = get_tags_first_tag_num(m->tagset[m->seltags]);
+		m->pertag->prevtag = m->tagset[m->seltags];
 		m->seltags ^= 1; /* toggle sel tagset */
-		m->pertag->curtag = get_tags_first_tag_num(m->tagset[m->seltags]);
+		m->pertag->curtag = m->tagset[m->seltags];
 		goto toggleseltags;
 	}
 
@@ -5706,15 +5672,8 @@ void handle_keyboard_shortcuts_inhibit_new_inhibitor(
 	}
 
 	// per-view, seat-agnostic config via criteria
-	Client *c = NULL;
-	LayerSurface *l = NULL;
-
-	int type = toplevel_from_wlr_surface(inhibitor->surface, &c, &l);
-
-	if (type < 0)
-		return;
-
-	if (type != LayerShell && c && !c->allow_shortcuts_inhibit) {
+	Client *c = get_client_from_surface(inhibitor->surface);
+	if (c && !c->allow_shortcuts_inhibit) {
 		return;
 	}
 
@@ -5920,15 +5879,13 @@ int main(int argc, char *argv[]) {
 	char *startup_cmd = NULL;
 	int c;
 
-	while ((c = getopt(argc, argv, "s:c:hdv")) != -1) {
+	while ((c = getopt(argc, argv, "s:hdv")) != -1) {
 		if (c == 's')
 			startup_cmd = optarg;
 		else if (c == 'd')
 			log_level = WLR_DEBUG;
 		else if (c == 'v')
 			die("mango " VERSION);
-		else if (c == 'c')
-			cli_config_path = optarg;
 		else
 			goto usage;
 	}
@@ -5946,5 +5903,5 @@ int main(int argc, char *argv[]) {
 	return EXIT_SUCCESS;
 
 usage:
-	die("Usage: %s [-v] [-d] [-c config file] [-s startup command]", argv[0]);
+	die("Usage: %s [-v] [-d] [-s startup command]", argv[0]);
 }