README.md

@@ -23,22 +23,25 @@ This project's development is based on [dwl](https://codeberg.org/dwl/dwl/).
      - Ipc support(get/send message from/to compositor by external program)
      - Hycov-like overview
      - Window effects from scenefx (blur, shadow, corner radius, opacity)
-     - Zero flickering - every frame is perfect.
 
-https://github.com/user-attachments/assets/bb83004a-0563-4b48-ad89-6461a9b78b1f
+Master-Stack Layout
 
-# Mango's Vision
+https://github.com/user-attachments/assets/a9d4776e-b50b-48fb-94ce-651d8a749b8a
 
-**Mango's primary goal is stability**: After months of testing and development—and aside from a few lingering GPU compatibility issues—it should now be stable enough. I don't plan on making many breaking changes.
+Scroller Layout
 
-**Mango's preference is practicality**: I tend to add features that genuinely help with daily workflows—things that make our work more convenient.
+https://github.com/user-attachments/assets/c9bf9415-fad1-4400-bcdc-3ad2d76de85a
+
+Layer animation
+
+https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0
 
-**Mango won't cater to every user preference**: For niche feature requests, I'll take a wait-and-see approach. I'll only consider adding them if they get a significant number of upvotes.
 
 # Our discord
 [mangowc](https://discord.gg/CPjbDxesh5)
 
 # Supported layouts
+
 - tile
 - scroller
 - monocle
@@ -48,20 +51,21 @@ https://github.com/user-attachments/assets/bb83004a-0563-4b48-ad89-6461a9b78b1f
 - vertical_tile
 - vertical_grid
 - vertical_scroller
-- tgmix
 
 # Installation
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/mangowc.svg)](https://repology.org/project/mangowc/versions)
-
 ## Dependencies
 
+- glibc
 - wayland
 - wayland-protocols
 - libinput
 - libdrm
 - libxkbcommon
 - pixman
+- git
+- meson
+- ninja
 - libdisplay-info
 - libliftoff
 - hwdata
@@ -71,7 +75,7 @@ https://github.com/user-attachments/assets/bb83004a-0563-4b48-ad89-6461a9b78b1f
 - libxcb
 
 ## Arch Linux
-The package is in the Arch User Repository and is available for manual download [here](https://aur.archlinux.org/packages/mangowc-git) or through a AUR helper like yay:
+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:
 ```bash
 yay -S mangowc-git
 
@@ -105,35 +109,6 @@ Then, install the package:
 dnf install mangowc
 ```
 
-## Guix System
-The package definition is described in the source repository.
-First, add `mangowc` channel to `channels.scm` file:
-
-```scheme
-;; In $HOME/.config/guix/channels.scm
-(cons (channel
-        (name 'mangowc)
-        (url "https://github.com/DreamMaoMao/mangowc.git")
-        (branch "main"))
-      ... ;; Your other channels
-      %default-channels)
-```
-
-Then, run `guix pull` and after update you can either run
-`guix install mangowc` or add it to your configuration via:
-
-```scheme
-(use-modules (mangowc)) ;; Add mangowc module
-
-;; Add mangowc to packages list
-(packages (cons*
-            mangowc-git
-            ... ;; Other packages you specified
-            %base-packages))
-```
-
-And then rebuild your system.
-
 ## Other
 
 ```bash

config.conf

@@ -240,11 +240,12 @@ bind=CTRL+ALT,Left,resizewin,-50,+0
 bind=CTRL+ALT,Right,resizewin,+50,+0
 
 # Mouse Button Bindings
-# btn_left and btn_right can't bind none mod key
+# NONE mode key only work in ov mode
 mousebind=SUPER,btn_left,moveresize,curmove
 mousebind=NONE,btn_middle,togglemaximizescreen,0
 mousebind=SUPER,btn_right,moveresize,curresize
-
+mousebind=NONE,btn_left,toggleoverview,1
+mousebind=NONE,btn_right,killclient,0
 
 # Axis Bindings
 axisbind=SUPER,UP,viewtoleft_have_client

mango.desktop

@@ -1,7 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Mango
-DesktopNames=mango;wlroots
 Comment=mango WM
 Exec=mango
 Icon=mango

meson.build

@@ -1,5 +1,5 @@
 project('mango', ['c', 'cpp'],
-  version : '0.12.3',
+  version : '0.11.0',
 )
 
 subdir('protocols')
@@ -56,7 +56,7 @@ endif
 if is_git_repo
   # 如果是 Git 目录，获取 Commit Hash 和最新的 tag
   commit_hash = run_command(git, 'rev-parse', '--short', 'HEAD', check : false).stdout().strip()
-  latest_tag = meson.project_version()
+  latest_tag = run_command(git, 'describe', '--tags', '--abbrev=0', check : false).stdout().strip()
   version_with_hash = '@0@(@1@)'.format(latest_tag, commit_hash)
 else
   # 如果不是 Git 目录，使用项目版本号和 "release" 字符串

mmsg/mmsg.c

@@ -500,48 +500,12 @@ static const struct wl_registry_listener registry_listener = {
 
 static void usage(void) {
 	fprintf(stderr,
-			"mmsg - MangoWC IPC\n"
+			"usage:"
-			"\n"
+			"\t%s [-OTLq]\n"
-			"SYNOPSIS:\n"
+			"\t%s [-o <output>] -s [-t <tags>] [-l <layout>] [-c <tags>] [-d "
-			"\tmmsg [-OTLq]\n"
-			"\tmmsg [-o <output>] -s [-t <tags>] [-l <layout>] [-c <tags>] [-d "
 			"<cmd>,<arg1>,<arg2>,<arg3>,<arg4>,<arg5>]\n"
-			"\tmmsg [-o <output>] (-g | -w) [-OotlcvmfxekbA]\n"
+			"\t%s [-o <output>] (-g | -w) [-OotlcvmfxekbA]\n",
-			"\n"
+			argv0, argv0, argv0);
-			"OPERATION MODES:\n"
-			"\t-g           Get values (tags, layout, focused client)\n"
-			"\t-s           Set values (switch tags, layouts)\n"
-			"\t-w           Watch mode (stream events)\n"
-			"\n"
-			"GENERAL OPTIONS:\n"
-			"\t-O           Get all output (monitor) information\n"
-			"\t-T           Get number of tags\n"
-			"\t-L           Get all available layouts\n"
-			"\t-q           Quit MangoWC\n"
-			"\t-o <output>  Select output (monitor)\n"
-			"\n"
-			"GET OPTIONS (used with -g or -w):\n"
-			"\t-O           Get output name\n"
-			"\t-o           Get output (monitor) focus information\n"
-			"\t-t           Get selected tags\n"
-			"\t-l           Get current layout\n"
-			"\t-c           Get title and appid of focused clients\n"
-			"\t-v           Get visibility of statusbar\n"
-			"\t-m           Get fullscreen status\n"
-			"\t-f           Get floating status\n"
-			"\t-x           Get focused client geometry\n"
-			"\t-e           Get name of last focused layer\n"
-			"\t-k           Get current keyboard layout\n"
-			"\t-b           Get current keybind mode\n"
-			"\t-A           Get scale factor of monitor\n"
-			"\n"
-			"SET OPTIONS (used with -s):\n"
-			"\t-o <output>         Select output (monitor)\n"
-			"\t-t <tags>           Set selected tags (can be used with [+-^.] "
-			"modifiers)\n"
-			"\t-l <layout>         Set current layout\n"
-			"\t-c <tags>           Get title and appid of focused client\n"
-			"\t-d <cmd>,<args...>  Dispatch internal command (max 5 args)\n");
 	exit(2);
 }
 

protocols/meson.build

@@ -1,6 +1,6 @@
 wayland_scanner = find_program('wayland-scanner')
 wayland_protos_dep = dependency('wayland-protocols')
-wl_protocol_dir = wayland_protos_dep.get_variable(pkgconfig:'pkgdatadir')
+wl_protocol_dir = wayland_protos_dep.get_pkgconfig_variable('pkgdatadir')
 wayland_scanner_code = generator(
 	wayland_scanner,
 	output: '@BASENAME@-protocol.c',

src/animation/client.h

@@ -47,7 +47,7 @@ bool is_horizontal_right_stack_layout(Monitor *m) {
 	return false;
 }
 
-int32_t is_special_animation_rule(Client *c) {
+int32_t is_special_animaiton_rule(Client *c) {
 
 	if (is_scroller_layout(c->mon) && !c->isfloating) {
 		return DOWN;
@@ -70,7 +70,7 @@ int32_t is_special_animation_rule(Client *c) {
 	}
 }
 
-void set_client_open_animation(Client *c, struct wlr_box geo) {
+void set_client_open_animaiton(Client *c, struct wlr_box geo) {
 	int32_t slide_direction;
 	int32_t horizontal, horizontal_value;
 	int32_t vertical, vertical_value;
@@ -96,7 +96,7 @@ void set_client_open_animation(Client *c, struct wlr_box geo) {
 			geo.y + (geo.height - c->animainit_geom.height) / 2;
 		return;
 	} else {
-		special_direction = is_special_animation_rule(c);
+		special_direction = is_special_animaiton_rule(c);
 		center_x = c->geom.x + c->geom.width / 2;
 		center_y = c->geom.y + c->geom.height / 2;
 		if (special_direction == UNDIR) {
@@ -363,6 +363,7 @@ void apply_border(Client *c) {
 		current_corner_location = set_client_corner_location(c);
 	}
 
+	// Handle no-border cases
 	if (hit_no_border && smartgaps) {
 		c->bw = 0;
 		c->fake_no_border = true;
@@ -772,71 +773,71 @@ void init_fadeout_client(Client *c) {
 		return;
 	}
 
-	Client *fadeout_client = ecalloc(1, sizeof(*fadeout_client));
+	Client *fadeout_cient = ecalloc(1, sizeof(*fadeout_cient));
 
 	wlr_scene_node_set_enabled(&c->scene->node, true);
 	client_set_border_color(c, bordercolor);
-	fadeout_client->scene =
+	fadeout_cient->scene =
 		wlr_scene_tree_snapshot(&c->scene->node, layers[LyrFadeOut]);
 	wlr_scene_node_set_enabled(&c->scene->node, false);
 
-	if (!fadeout_client->scene) {
+	if (!fadeout_cient->scene) {
-		free(fadeout_client);
+		free(fadeout_cient);
 		return;
 	}
 
-	fadeout_client->animation.duration = animation_duration_close;
+	fadeout_cient->animation.duration = animation_duration_close;
-	fadeout_client->geom = fadeout_client->current =
+	fadeout_cient->geom = fadeout_cient->current =
-		fadeout_client->animainit_geom = fadeout_client->animation.initial =
+		fadeout_cient->animainit_geom = fadeout_cient->animation.initial =
 			c->animation.current;
-	fadeout_client->mon = c->mon;
+	fadeout_cient->mon = c->mon;
-	fadeout_client->animation_type_close = c->animation_type_close;
+	fadeout_cient->animation_type_close = c->animation_type_close;
-	fadeout_client->animation.action = CLOSE;
+	fadeout_cient->animation.action = CLOSE;
-	fadeout_client->bw = c->bw;
+	fadeout_cient->bw = c->bw;
-	fadeout_client->nofadeout = c->nofadeout;
+	fadeout_cient->nofadeout = c->nofadeout;
 
 	// 这里snap节点的坐标设置是使用的相对坐标，所以不能加上原来坐标
 	// 这跟普通node有区别
 
-	fadeout_client->animation.initial.x = 0;
+	fadeout_cient->animation.initial.x = 0;
-	fadeout_client->animation.initial.y = 0;
+	fadeout_cient->animation.initial.y = 0;
 
 	if ((!c->animation_type_close &&
 		 strcmp(animation_type_close, "fade") == 0) ||
 		(c->animation_type_close &&
 		 strcmp(c->animation_type_close, "fade") == 0)) {
-		fadeout_client->current.x = 0;
+		fadeout_cient->current.x = 0;
-		fadeout_client->current.y = 0;
+		fadeout_cient->current.y = 0;
-		fadeout_client->current.width = 0;
+		fadeout_cient->current.width = 0;
-		fadeout_client->current.height = 0;
+		fadeout_cient->current.height = 0;
 	} else if ((c->animation_type_close &&
 				strcmp(c->animation_type_close, "slide") == 0) ||
 			   (!c->animation_type_close &&
 				strcmp(animation_type_close, "slide") == 0)) {
-		fadeout_client->current.y =
+		fadeout_cient->current.y =
 			c->geom.y + c->geom.height / 2 > c->mon->m.y + c->mon->m.height / 2
 				? c->mon->m.height -
 					  (c->animation.current.y - c->mon->m.y) // down out
 				: c->mon->m.y - c->geom.height;				 // up out
-		fadeout_client->current.x = 0; // x无偏差，垂直划出
+		fadeout_cient->current.x = 0; // x无偏差，垂直划出
 	} else {
-		fadeout_client->current.y =
+		fadeout_cient->current.y =
-			(fadeout_client->geom.height -
+			(fadeout_cient->geom.height -
-			 fadeout_client->geom.height * zoom_end_ratio) /
+			 fadeout_cient->geom.height * zoom_end_ratio) /
 			2;
-		fadeout_client->current.x =
+		fadeout_cient->current.x =
-			(fadeout_client->geom.width -
+			(fadeout_cient->geom.width -
-			 fadeout_client->geom.width * zoom_end_ratio) /
+			 fadeout_cient->geom.width * zoom_end_ratio) /
 			2;
-		fadeout_client->current.width =
+		fadeout_cient->current.width =
-			fadeout_client->geom.width * zoom_end_ratio;
+			fadeout_cient->geom.width * zoom_end_ratio;
-		fadeout_client->current.height =
+		fadeout_cient->current.height =
-			fadeout_client->geom.height * zoom_end_ratio;
+			fadeout_cient->geom.height * zoom_end_ratio;
 	}
 
-	fadeout_client->animation.time_started = get_now_in_ms();
+	fadeout_cient->animation.time_started = get_now_in_ms();
-	wlr_scene_node_set_enabled(&fadeout_client->scene->node, true);
+	wlr_scene_node_set_enabled(&fadeout_cient->scene->node, true);
-	wl_list_insert(&fadeout_clients, &fadeout_client->fadeout_link);
+	wl_list_insert(&fadeout_clients, &fadeout_cient->fadeout_link);
 
 	// 请求刷新屏幕
 	request_fresh_all_monitors();
@@ -971,7 +972,7 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
 		c->animainit_geom.height = c->animation.current.height;
 		c->animainit_geom.width = c->animation.current.width;
 	} else if (c->is_pending_open_animation) {
-		set_client_open_animation(c, c->geom);
+		set_client_open_animaiton(c, c->geom);
 	} else {
 		c->animainit_geom = c->animation.current;
 	}
@@ -980,20 +981,10 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
 		c->bw = 0;
 	}
 
-	bool hit_no_border = check_hit_no_border(c);
-	if (hit_no_border && smartgaps) {
-		c->bw = 0;
-		c->fake_no_border = true;
-	}
-
 	// c->geom 是真实的窗口大小和位置，跟过度的动画无关，用于计算布局
 	c->configure_serial = client_set_size(c, c->geom.width - 2 * c->bw,
 										  c->geom.height - 2 * c->bw);
 
-	if (c->configure_serial != 0) {
-		c->mon->resizing_count_pending++;
-	}
-
 	if (c == grabc) {
 		c->animation.running = false;
 		c->need_output_flush = false;
@@ -1058,11 +1049,20 @@ void client_set_focused_opacity_animation(Client *c) {
 		   sizeof(c->opacity_animation.target_border_color));
 	c->opacity_animation.target_opacity = c->focused_opacity;
 	c->opacity_animation.time_started = get_now_in_ms();
-	memcpy(c->opacity_animation.initial_border_color,
+	if (c->opacity_animation.running) {
-		   c->opacity_animation.current_border_color,
+		memcpy(c->opacity_animation.initial_border_color,
-		   sizeof(c->opacity_animation.initial_border_color));
+			   c->opacity_animation.current_border_color,
-	c->opacity_animation.initial_opacity = c->opacity_animation.current_opacity;
+			   sizeof(c->opacity_animation.initial_border_color));
-
+		c->opacity_animation.initial_opacity =
+			c->opacity_animation.current_opacity;
+	} else {
+		memcpy(c->opacity_animation.initial_border_color, border_color,
+			   sizeof(c->opacity_animation.initial_border_color));
+		memcpy(c->opacity_animation.current_border_color, border_color,
+			   sizeof(c->opacity_animation.current_border_color));
+		c->opacity_animation.initial_opacity = c->unfocused_opacity;
+		c->opacity_animation.current_opacity = c->unfocused_opacity;
+	}
 	c->opacity_animation.running = true;
 }
 
@@ -1082,10 +1082,20 @@ void client_set_unfocused_opacity_animation(Client *c) {
 	c->opacity_animation.target_opacity = c->unfocused_opacity;
 	c->opacity_animation.time_started = get_now_in_ms();
 
-	memcpy(c->opacity_animation.initial_border_color,
+	if (c->opacity_animation.running) {
-		   c->opacity_animation.current_border_color,
+		memcpy(c->opacity_animation.initial_border_color,
-		   sizeof(c->opacity_animation.initial_border_color));
+			   c->opacity_animation.current_border_color,
-	c->opacity_animation.initial_opacity = c->opacity_animation.current_opacity;
+			   sizeof(c->opacity_animation.initial_border_color));
+		c->opacity_animation.initial_opacity =
+			c->opacity_animation.current_opacity;
+	} else {
+		memcpy(c->opacity_animation.initial_border_color, border_color,
+			   sizeof(c->opacity_animation.initial_border_color));
+		memcpy(c->opacity_animation.current_border_color, border_color,
+			   sizeof(c->opacity_animation.current_border_color));
+		c->opacity_animation.initial_opacity = c->focused_opacity;
+		c->opacity_animation.current_opacity = c->focused_opacity;
+	}
 
 	c->opacity_animation.running = true;
 }
@@ -1120,12 +1130,7 @@ bool client_apply_focus_opacity(Client *c) {
 		if (target_opacity > opacity) {
 			target_opacity = opacity;
 		}
-		memcpy(c->opacity_animation.current_border_color,
-			   c->opacity_animation.target_border_color,
-			   sizeof(c->opacity_animation.current_border_color));
-		c->opacity_animation.current_opacity = target_opacity;
 		client_set_opacity(c, target_opacity);
-		client_set_border_color(c, c->opacity_animation.target_border_color);
 	} else if (animations && c->opacity_animation.running) {
 
 		struct timespec now;
@@ -1156,7 +1161,7 @@ bool client_apply_focus_opacity(Client *c) {
 					eased_progress;
 		}
 		client_set_border_color(c, c->opacity_animation.current_border_color);
-		if (linear_progress >= 1.0f) {
+		if (linear_progress == 1.0f) {
 			c->opacity_animation.running = false;
 		} else {
 			return true;

src/client/client.h

@@ -243,6 +243,31 @@ static inline int32_t client_is_rendered_on_mon(Client *c, Monitor *m) {
 	return 0;
 }
 
+static inline int32_t client_is_stopped(Client *c) {
+	int32_t pid;
+	siginfo_t in = {0};
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return 0;
+#endif
+
+	wl_client_get_credentials(c->surface.xdg->client->client, &pid, NULL, NULL);
+	if (waitid(P_PID, pid, &in, WNOHANG | WCONTINUED | WSTOPPED | WNOWAIT) <
+		0) {
+		/* This process is not our child process, while is very unluckely that
+		 * it is stopped, in order to do not skip frames assume that it is. */
+		if (errno == ECHILD)
+			return 1;
+	} else if (in.si_pid) {
+		if (in.si_code == CLD_STOPPED || in.si_code == CLD_TRAPPED)
+			return 1;
+		if (in.si_code == CLD_CONTINUED)
+			return 0;
+	}
+
+	return 0;
+}
+
 static inline int32_t client_is_unmanaged(Client *c) {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
@@ -294,24 +319,9 @@ static inline uint32_t client_set_size(Client *c, uint32_t width,
 									   uint32_t height) {
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
-
-		struct wlr_surface_state *state =
-			&c->surface.xwayland->surface->current;
-
-		if ((int32_t)c->geom.width - 2 * (int32_t)c->bw ==
-				(int32_t)state->width &&
-			(int32_t)c->geom.height - 2 * (int32_t)c->bw ==
-				(int32_t)state->height &&
-			(int32_t)c->surface.xwayland->x ==
-				(int32_t)c->geom.x + (int32_t)c->bw &&
-			(int32_t)c->surface.xwayland->y ==
-				(int32_t)c->geom.y + (int32_t)c->bw) {
-			return 0;
-		}
-
 		wlr_xwayland_surface_configure(c->surface.xwayland, c->geom.x + c->bw,
 									   c->geom.y + c->bw, width, height);
-		return 1;
+		return 0;
 	}
 #endif
 	if ((int32_t)width == c->surface.xdg->toplevel->current.width &&
@@ -537,4 +547,4 @@ static inline void client_set_size_bound(Client *c) {
 		state.max_height > 0) {
 		c->geom.height = state.max_height + 2 * c->bw;
 	}
-}
+}

src/config/preset.h

@@ -47,9 +47,8 @@ int32_t log_level = WLR_ERROR;
 uint32_t numlockon = 0; // 是否打开右边小键盘
 uint32_t capslock = 0;	// 是否启用快捷键
 
-uint32_t ov_tab_mode = 0;	// alt tab切换模式
+uint32_t ov_tab_mode = 0;	 // alt tab切换模式
-uint32_t hotarea_size = 10; // 热区大小,10x10
+uint32_t hotarea_size = 10;	 // 热区大小,10x10
-uint32_t hotarea_corner = BOTTOM_LEFT;
 uint32_t enable_hotarea = 1; // 是否启用鼠标热区
 int32_t smartgaps = 0; /* 1 means no outer gap when there is only one window */
 int32_t sloppyfocus = 1; /* focus follows mouse */
@@ -63,10 +62,9 @@ float scratchpad_height_ratio = 0.9;
 int32_t scroller_structs = 20;
 float scroller_default_proportion = 0.9;
 float scroller_default_proportion_single = 1.0;
-int32_t scroller_ignore_proportion_single = 1;
+int32_t scroller_ignore_proportion_single = 0;
 int32_t scroller_focus_center = 0;
 int32_t scroller_prefer_center = 0;
-int32_t scroller_prefer_overspread = 1;
 int32_t focus_cross_monitor = 0;
 int32_t focus_cross_tag = 0;
 int32_t exchange_cross_monitor = 0;
@@ -103,14 +101,12 @@ int32_t overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */
  * behavior */
 float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0};
 
-int32_t warpcursor = 1;
+int32_t warpcursor = 1;			  /* Warp cursor to focused client */
-int32_t drag_corner = 3;
-int32_t drag_warp_cursor = 1;
 int32_t xwayland_persistence = 1; /* xwayland persistence */
 int32_t syncobj_enable = 0;
+int32_t adaptive_sync = 0;
 int32_t allow_lock_transparent = 0;
-double drag_tile_refresh_interval = 16.0;
+double drag_refresh_interval = 16.0;
-double drag_floating_refresh_interval = 8.0;
 int32_t allow_tearing = TEARING_DISABLED;
 int32_t allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
 
@@ -237,3 +233,4 @@ double shadows_blur = 15;
 int32_t shadows_position_x = 0;
 int32_t shadows_position_y = 0;
 float shadowscolor[] = COLOR(0x000000ff);
+;

src/dispatch/bind_define.h

@@ -1,6 +1,5 @@
 int32_t bind_to_view(const Arg *arg) {
-	if (!selmon)
+
-		return 0;
 	uint32_t target = arg->ui;
 
 	if (view_current_to_back && selmon->pertag->curtag &&
@@ -101,8 +100,6 @@ int32_t defaultgaps(const Arg *arg) {
 }
 
 int32_t exchange_client(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	Client *c = selmon->sel;
 	if (!c || c->isfloating)
 		return 0;
@@ -115,9 +112,6 @@ int32_t exchange_client(const Arg *arg) {
 }
 
 int32_t exchange_stack_client(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	Client *c = selmon->sel;
 	Client *tc = NULL;
 	if (!c || c->isfloating || c->isfullscreen || c->ismaximizescreen)
@@ -271,56 +265,42 @@ int32_t incnmaster(const Arg *arg) {
 }
 
 int32_t incgaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
 			selmon->gappih + arg->i, selmon->gappiv + arg->i);
 	return 0;
 }
 
 int32_t incigaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
 			selmon->gappiv + arg->i);
 	return 0;
 }
 
 int32_t incogaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
 			selmon->gappiv);
 	return 0;
 }
 
 int32_t incihgaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
 			selmon->gappiv);
 	return 0;
 }
 
 int32_t incivgaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
 			selmon->gappiv + arg->i);
 	return 0;
 }
 
 int32_t incohgaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
 			selmon->gappiv);
 	return 0;
 }
 
 int32_t incovgaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
 			selmon->gappiv);
 	return 0;
@@ -350,8 +330,6 @@ int32_t setmfact(const Arg *arg) {
 
 int32_t killclient(const Arg *arg) {
 	Client *c = NULL;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 	if (c) {
 		pending_kill_client(c);
@@ -360,9 +338,6 @@ int32_t killclient(const Arg *arg) {
 }
 
 int32_t moveresize(const Arg *arg) {
-	const char *cursors[] = {"nw-resize", "ne-resize", "sw-resize",
-							 "se-resize"};
-
 	if (cursor_mode != CurNormal && cursor_mode != CurPressed)
 		return 0;
 	xytonode(cursor->x, cursor->y, NULL, &grabc, NULL, NULL, NULL);
@@ -388,29 +363,10 @@ int32_t moveresize(const Arg *arg) {
 		/* Doesn't work for X11 output - the next absolute motion event
 		 * returns the cursor to where it started */
 		if (grabc->isfloating) {
-			rzcorner = drag_corner;
+			wlr_cursor_warp_closest(cursor, NULL,
-			grabcx = (int)round(cursor->x);
+									grabc->geom.x + grabc->geom.width,
-			grabcy = (int)round(cursor->y);
+									grabc->geom.y + grabc->geom.height);
-			if (rzcorner == 4)
+			wlr_cursor_set_xcursor(cursor, cursor_mgr, "bottom_right_corner");
-				/* identify the closest corner index */
-				rzcorner = (grabcx - grabc->geom.x <
-									grabc->geom.x + grabc->geom.width - grabcx
-								? 0
-								: 1) +
-						   (grabcy - grabc->geom.y <
-									grabc->geom.y + grabc->geom.height - grabcy
-								? 0
-								: 2);
-
-			if (drag_warp_cursor) {
-				grabcx = rzcorner & 1 ? grabc->geom.x + grabc->geom.width
-									  : grabc->geom.x;
-				grabcy = rzcorner & 2 ? grabc->geom.y + grabc->geom.height
-									  : grabc->geom.y;
-				wlr_cursor_warp_closest(cursor, NULL, grabcx, grabcy);
-			}
-
-			wlr_cursor_set_xcursor(cursor, cursor_mgr, cursors[rzcorner]);
 		} else {
 			wlr_cursor_set_xcursor(cursor, cursor_mgr, "grab");
 		}
@@ -421,8 +377,6 @@ int32_t moveresize(const Arg *arg) {
 
 int32_t movewin(const Arg *arg) {
 	Client *c = NULL;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
 		return 0;
@@ -466,8 +420,6 @@ int32_t quit(const Arg *arg) {
 
 int32_t resizewin(const Arg *arg) {
 	Client *c = NULL;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 	int32_t offsetx = 0, offsety = 0;
 
@@ -572,8 +524,6 @@ int32_t restore_minimized(const Arg *arg) {
 
 int32_t setlayout(const Arg *arg) {
 	int32_t jk;
-	if (!selmon)
-		return 0;
 
 	for (jk = 0; jk < LENGTH(layouts); jk++) {
 		if (strcmp(layouts[jk].name, arg->v) == 0) {
@@ -599,8 +549,6 @@ int32_t setkeymode(const Arg *arg) {
 }
 
 int32_t set_proportion(const Arg *arg) {
-	if (!selmon)
-		return 0;
 
 	if (selmon->isoverview || !is_scroller_layout(selmon))
 		return 0;
@@ -626,8 +574,6 @@ int32_t smartmovewin(const Arg *arg) {
 	Client *c = NULL, *tc = NULL;
 	int32_t nx, ny;
 	int32_t buttom, top, left, right, tar;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
 		return 0;
@@ -729,8 +675,6 @@ int32_t smartresizewin(const Arg *arg) {
 	Client *c = NULL, *tc = NULL;
 	int32_t nw, nh;
 	int32_t buttom, top, left, right, tar;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
 		return 0;
@@ -799,8 +743,6 @@ int32_t smartresizewin(const Arg *arg) {
 
 int32_t centerwin(const Arg *arg) {
 	Client *c = NULL;
-	if (!selmon)
-		return 0;
 	c = selmon->sel;
 
 	if (!c || c->isfullscreen || c->ismaximizescreen)
@@ -936,20 +878,16 @@ int32_t switch_keyboard_layout(const Arg *arg) {
 		wlr_log(WLR_INFO, "Only one layout available");
 		return 0;
 	}
-
+	xkb_layout_index_t next = (current + 1) % num_layouts;
-	xkb_layout_index_t next = 0;
-	if (arg->i > 0 && arg->i <= num_layouts) {
-		next = arg->i - 1;
-	} else {
-		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;
 
+	wlr_keyboard_set_keymap(keyboard, keyboard->keymap);
 	wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next);
+	keyboard->modifiers.group = 0;
 
 	// 7. 更新 seat
 	wlr_seat_set_keyboard(seat, keyboard);
@@ -963,7 +901,10 @@ int32_t switch_keyboard_layout(const Arg *arg) {
 
 		struct wlr_keyboard *tkb = (struct wlr_keyboard *)id->device_data;
 
+		wlr_keyboard_set_keymap(tkb, keyboard->keymap);
 		wlr_keyboard_notify_modifiers(tkb, depressed, latched, locked, next);
+		tkb->modifiers.group = 0;
+
 		// 7. 更新 seat
 		wlr_seat_set_keyboard(seat, tkb);
 		wlr_seat_keyboard_notify_modifiers(seat, &tkb->modifiers);
@@ -979,9 +920,6 @@ int32_t switch_layout(const Arg *arg) {
 	char *target_layout_name = NULL;
 	uint32_t len;
 
-	if (!selmon)
-		return 0;
-
 	if (config.circle_layout_count != 0) {
 		for (jk = 0; jk < config.circle_layout_count; jk++) {
 
@@ -1033,8 +971,6 @@ int32_t switch_layout(const Arg *arg) {
 
 int32_t switch_proportion_preset(const Arg *arg) {
 	float target_proportion = 0;
-	if (!selmon)
-		return 0;
 
 	if (config.scroller_proportion_preset_count == 0) {
 		return 0;
@@ -1079,8 +1015,6 @@ int32_t switch_proportion_preset(const Arg *arg) {
 }
 
 int32_t tag(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	Client *target_client = selmon->sel;
 	tag_client(arg, target_client);
 	return 0;
@@ -1088,8 +1022,6 @@ int32_t tag(const Arg *arg) {
 
 int32_t tagmon(const Arg *arg) {
 	Monitor *m = NULL, *cm = NULL;
-	if (!selmon)
-		return 0;
 	Client *c = focustop(selmon);
 
 	if (!c)
@@ -1181,9 +1113,6 @@ int32_t tagsilent(const Arg *arg) {
 }
 
 int32_t tagtoleft(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	if (selmon->sel != NULL &&
 		__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
 		selmon->tagset[selmon->seltags] > 1) {
@@ -1193,9 +1122,6 @@ int32_t tagtoleft(const Arg *arg) {
 }
 
 int32_t tagtoright(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	if (selmon->sel != NULL &&
 		__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
 		selmon->tagset[selmon->seltags] & (TAGMASK >> 1)) {
@@ -1224,8 +1150,6 @@ int32_t toggle_named_scratchpad(const Arg *arg) {
 }
 
 int32_t toggle_render_border(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	render_border = !render_border;
 	arrange(selmon, false, false);
 	return 0;
@@ -1261,8 +1185,6 @@ int32_t toggle_scratchpad(const Arg *arg) {
 }
 
 int32_t togglefakefullscreen(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	Client *sel = focustop(selmon);
 	if (sel)
 		setfakefullscreen(sel, !sel->isfakefullscreen);
@@ -1270,9 +1192,6 @@ int32_t togglefakefullscreen(const Arg *arg) {
 }
 
 int32_t togglefloating(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	Client *sel = focustop(selmon);
 
 	if (selmon && selmon->isoverview)
@@ -1281,22 +1200,17 @@ int32_t togglefloating(const Arg *arg) {
 	if (!sel)
 		return 0;
 
-	bool isfloating = sel->isfloating;
-
 	if ((sel->isfullscreen || sel->ismaximizescreen)) {
-		isfloating = 1;
+		sel->isfloating = 1;
 	} else {
-		isfloating = !sel->isfloating;
+		sel->isfloating = !sel->isfloating;
 	}
 
-	setfloating(sel, isfloating);
+	setfloating(sel, sel->isfloating);
 	return 0;
 }
 
 int32_t togglefullscreen(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
@@ -1313,9 +1227,6 @@ int32_t togglefullscreen(const Arg *arg) {
 }
 
 int32_t toggleglobal(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	if (!selmon->sel)
 		return 0;
 	if (selmon->sel->is_in_scratchpad) {
@@ -1334,18 +1245,12 @@ int32_t toggleglobal(const Arg *arg) {
 }
 
 int32_t togglegaps(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	enablegaps ^= 1;
 	arrange(selmon, false, false);
 	return 0;
 }
 
 int32_t togglemaximizescreen(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
@@ -1364,9 +1269,6 @@ int32_t togglemaximizescreen(const Arg *arg) {
 }
 
 int32_t toggleoverlay(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	if (!selmon->sel || !selmon->sel->mon || selmon->sel->isfullscreen) {
 		return 0;
 	}
@@ -1388,9 +1290,6 @@ int32_t toggleoverlay(const Arg *arg) {
 }
 
 int32_t toggletag(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	uint32_t newtags;
 	Client *sel = focustop(selmon);
 	if (!sel)
@@ -1414,15 +1313,13 @@ int32_t toggletag(const Arg *arg) {
 }
 
 int32_t toggleview(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	uint32_t newtagset;
 	uint32_t target;
 
 	target = arg->ui == 0 ? ~0 & TAGMASK : arg->ui;
 
-	newtagset = selmon->tagset[selmon->seltags] ^ (target & TAGMASK);
+	newtagset =
+		selmon ? selmon->tagset[selmon->seltags] ^ (target & TAGMASK) : 0;
 
 	if (newtagset) {
 		selmon->tagset[selmon->seltags] = newtagset;
@@ -1434,9 +1331,6 @@ int32_t toggleview(const Arg *arg) {
 }
 
 int32_t viewtoleft(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	uint32_t target = selmon->tagset[selmon->seltags];
 
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
@@ -1457,9 +1351,6 @@ int32_t viewtoleft(const Arg *arg) {
 }
 
 int32_t viewtoright(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
 		return 0;
 	}
@@ -1477,9 +1368,6 @@ int32_t viewtoright(const Arg *arg) {
 }
 
 int32_t viewtoleft_have_client(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	uint32_t n;
 	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
@@ -1504,9 +1392,6 @@ int32_t viewtoleft_have_client(const Arg *arg) {
 }
 
 int32_t viewtoright_have_client(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	uint32_t n;
 	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
@@ -1531,23 +1416,15 @@ int32_t viewtoright_have_client(const Arg *arg) {
 }
 
 int32_t viewcrossmon(const Arg *arg) {
-	if (!selmon)
-		return 0;
-
 	focusmon(&(Arg){.v = arg->v, .i = UNDIR});
 	view_in_mon(arg, true, selmon, true);
 	return 0;
 }
 
 int32_t tagcrossmon(const Arg *arg) {
-	if (!selmon || !selmon->sel)
+	if (!selmon->sel)
 		return 0;
 
-	if (regex_match(selmon->wlr_output->name, arg->v)) {
-		tag_client(arg, selmon->sel);
-		return 0;
-	}
-
 	tagmon(&(Arg){.ui = arg->ui, .i = UNDIR, .v = arg->v});
 	return 0;
 }
@@ -1612,8 +1489,6 @@ int32_t setoption(const Arg *arg) {
 }
 
 int32_t minimized(const Arg *arg) {
-	if (!selmon)
-		return 0;
 
 	if (selmon && selmon->isoverview)
 		return 0;
@@ -1624,20 +1499,8 @@ int32_t minimized(const Arg *arg) {
 	return 0;
 }
 
-void fix_mon_tagset_from_overview(Monitor *m) {
-	if (m->tagset[m->seltags] == (m->ovbk_prev_tagset & TAGMASK)) {
-		m->tagset[m->seltags ^ 1] = m->ovbk_current_tagset;
-		m->pertag->prevtag = get_tags_first_tag_num(m->ovbk_current_tagset);
-	} else {
-		m->tagset[m->seltags ^ 1] = m->ovbk_prev_tagset;
-		m->pertag->prevtag = get_tags_first_tag_num(m->ovbk_prev_tagset);
-	}
-}
-
 int32_t toggleoverview(const Arg *arg) {
 	Client *c = NULL;
-	if (!selmon)
-		return 0;
 
 	if (selmon->isoverview && ov_tab_mode && arg->i != 1 && selmon->sel) {
 		focusstack(&(Arg){.i = 1});
@@ -1657,8 +1520,6 @@ int32_t toggleoverview(const Arg *arg) {
 			visible_client_number++;
 		}
 		if (visible_client_number > 0) {
-			selmon->ovbk_current_tagset = selmon->tagset[selmon->seltags];
-			selmon->ovbk_prev_tagset = selmon->tagset[selmon->seltags ^ 1];
 			target = ~0 & TAGMASK;
 		} else {
 			selmon->isoverview ^= 1;
@@ -1669,7 +1530,6 @@ int32_t toggleoverview(const Arg *arg) {
 	} else if (!selmon->isoverview && !selmon->sel) {
 		target = (1 << (selmon->pertag->prevtag - 1));
 		view(&(Arg){.ui = target}, false);
-		fix_mon_tagset_from_overview(selmon);
 		refresh_monitors_workspaces_status(selmon);
 		return 0;
 	}
@@ -1692,7 +1552,7 @@ int32_t toggleoverview(const Arg *arg) {
 	}
 
 	view(&(Arg){.ui = target}, false);
-	fix_mon_tagset_from_overview(selmon);
+
 	refresh_monitors_workspaces_status(selmon);
 	return 0;
 }
@@ -1743,8 +1603,6 @@ int32_t toggle_monitor(const Arg *arg) {
 }
 
 int32_t scroller_stack(const Arg *arg) {
-	if (!selmon)
-		return 0;
 	Client *c = selmon->sel;
 	Client *stack_head = NULL;
 	Client *source_stack_head = NULL;

src/fetch/client.h

@@ -12,9 +12,7 @@ bool check_hit_no_border(Client *c) {
 		}
 	}
 
-	if (no_border_when_single && c && c->mon &&
+	if (no_border_when_single && c && c->mon && c->mon->visible_clients == 1) {
-		((ISSCROLLTILED(c) && c->mon->visible_scroll_tiling_clients == 1) ||
-		 c->mon->visible_clients == 1)) {
 		hit_no_border = true;
 	}
 	return hit_no_border;
@@ -83,9 +81,6 @@ setclient_coordinate_center(Client *c, Monitor *tm, struct wlr_box geom,
 	int32_t len = 0;
 	Monitor *m = tm ? tm : selmon;
 
-	if (!m)
-		return geom;
-
 	uint32_t cbw = check_hit_no_border(c) ? c->bw : 0;
 
 	if (!c->no_force_center && m) {
@@ -577,29 +572,23 @@ bool client_is_in_same_stack(Client *sc, Client *tc, Client *fc) {
 
 	if (id == TILE || id == VERTICAL_TILE || id == DECK ||
 		id == VERTICAL_DECK || id == RIGHT_TILE) {
-		if (tc->ismaster ^ sc->ismaster)
+		if (fc && !fc->ismaster)
 			return false;
-		if (fc && !(fc->ismaster ^ sc->ismaster))
+		else if (!sc->ismaster)
-			return false;
-		else
 			return true;
 	}
 
 	if (id == TGMIX) {
-		if (tc->ismaster ^ sc->ismaster)
+		if (fc && !fc->ismaster)
-			return false;
-		if (fc && !(fc->ismaster ^ sc->ismaster))
 			return false;
 		if (!sc->ismaster && sc->mon->visible_tiling_clients <= 3)
 			return true;
 	}
 
 	if (id == CENTER_TILE) {
-		if (tc->ismaster ^ sc->ismaster)
+		if (fc && !fc->ismaster)
 			return false;
-		if (fc && !(fc->ismaster ^ sc->ismaster))
+		if (!sc->ismaster && sc->geom.x == tc->geom.x)
-			return false;
-		if (sc->geom.x == tc->geom.x)
 			return true;
 		else
 			return false;

src/fetch/common.h

@@ -100,6 +100,10 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
 			surface = wlr_scene_surface_try_from_buffer(
 						  wlr_scene_buffer_from_node(node))
 						  ->surface;
+		else if (node->type == WLR_SCENE_NODE_RECT) {
+			surface = NULL;
+			break;
+		}
 
 		/*  start from the topmost layer,
 			find a sureface that can be focused by pointer,
@@ -115,13 +119,6 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
 				l = pnode->data;
 			}
 		}
-
-		if (node->type == WLR_SCENE_NODE_RECT) {
-			if (c) {
-				surface = client_surface(c);
-			}
-			break;
-		}
 	}
 
 	if (psurface)

src/layout/arrange.h

@@ -1,45 +1,3 @@
-void restore_size_per(Monitor *m, Client *c) {
-	Client *fc = NULL;
-	double total_master_inner_per = 0;
-	double total_stack_inner_per = 0;
-
-	if (!m || !c)
-		return;
-
-	const Layout *current_layout = m->pertag->ltidxs[m->pertag->curtag];
-
-	if (current_layout->id == SCROLLER ||
-		current_layout->id == VERTICAL_SCROLLER || current_layout->id == GRID ||
-		current_layout->id == VERTICAL_GRID || current_layout->id == DECK ||
-		current_layout->id == VERTICAL_DECK || current_layout->id == MONOCLE) {
-		return;
-	}
-
-	if (current_layout->id == CENTER_TILE || c->ismaster) {
-		wl_list_for_each(fc, &clients, link) {
-			if (VISIBLEON(fc, m) && ISTILED(fc) && !c->ismaster) {
-				set_size_per(m, fc);
-			}
-		}
-		return;
-	}
-
-	wl_list_for_each(fc, &clients, link) {
-		if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) {
-			if (fc->ismaster) {
-				total_master_inner_per += fc->master_inner_per;
-			} else {
-				total_stack_inner_per += fc->stack_inner_per;
-			}
-		}
-	}
-
-	if (!c->ismaster && total_stack_inner_per) {
-		c->stack_inner_per = total_stack_inner_per * c->stack_inner_per /
-							 (1 - c->stack_inner_per);
-	}
-}
-
 void set_size_per(Monitor *m, Client *c) {
 	Client *fc = NULL;
 	bool found = false;
@@ -47,13 +5,8 @@ void set_size_per(Monitor *m, Client *c) {
 	if (!m || !c)
 		return;
 
-	const Layout *current_layout = m->pertag->ltidxs[m->pertag->curtag];
-
 	wl_list_for_each(fc, &clients, link) {
 		if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) {
-			if (current_layout->id == CENTER_TILE &&
-				!(fc->isleftstack ^ c->isleftstack))
-				continue;
 			c->master_mfact_per = fc->master_mfact_per;
 			c->master_inner_per = fc->master_inner_per;
 			c->stack_inner_per = fc->stack_inner_per;
@@ -257,7 +210,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
 		}
 
 		if (last_apply_drap_time == 0 ||
-			time - last_apply_drap_time > drag_tile_refresh_interval) {
+			time - last_apply_drap_time > drag_refresh_interval) {
 			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}
@@ -414,7 +367,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
 		}
 
 		if (last_apply_drap_time == 0 ||
-			time - last_apply_drap_time > drag_tile_refresh_interval) {
+			time - last_apply_drap_time > drag_refresh_interval) {
 			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}
@@ -595,7 +548,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
 		}
 
 		if (last_apply_drap_time == 0 ||
-			time - last_apply_drap_time > drag_tile_refresh_interval) {
+			time - last_apply_drap_time > drag_refresh_interval) {
 			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}

src/layout/horizontal.h

@@ -117,7 +117,6 @@ void deck(Monitor *m) {
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
-	uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
 
 	int32_t cur_gappih = enablegaps ? m->gappih : 0;
 	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
@@ -143,8 +142,8 @@ void deck(Monitor *m) {
 										: m->pertag->mfacts[m->pertag->curtag];
 
 	// Calculate master width including outer gaps
-	if (n > nmasters)
+	if (n > m->nmaster)
-		mw = nmasters ? round((m->w.width - 2 * cur_gappoh) * mfact) : 0;
+		mw = m->nmaster ? round((m->w.width - 2 * cur_gappoh) * mfact) : 0;
 	else
 		mw = m->w.width - 2 * cur_gappoh;
 
@@ -152,7 +151,7 @@ void deck(Monitor *m) {
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || !ISTILED(c))
 			continue;
-		if (i < nmasters) {
+		if (i < m->nmaster) {
 			c->master_mfact_per = mfact;
 			// Master area clients
 			resize(
@@ -161,7 +160,7 @@ void deck(Monitor *m) {
 								 .y = m->w.y + cur_gappov + my,
 								 .width = mw,
 								 .height = (m->w.height - 2 * cur_gappov - my) /
-										   (MIN(n, nmasters) - i)},
+										   (MIN(n, m->nmaster) - i)},
 				0);
 			my += c->geom.height;
 		} else {
@@ -283,7 +282,6 @@ void scroller(Monitor *m) {
 	struct wlr_box target_geom;
 	int32_t focus_client_index = 0;
 	bool need_scroller = false;
-	bool over_overspread_to_left = false;
 	int32_t cur_gappih = enablegaps ? m->gappih : 0;
 	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
 	int32_t cur_gappov = enablegaps ? m->gappov : 0;
@@ -372,46 +370,6 @@ void scroller(Monitor *m) {
 		}
 	}
 
-	bool need_apply_overspread =
-		scroller_prefer_overspread && m->visible_scroll_tiling_clients > 1 &&
-		(focus_client_index == 0 || focus_client_index == n - 1) &&
-		tempClients[focus_client_index]->scroller_proportion < 1.0f;
-
-	if (need_apply_overspread) {
-
-		if (focus_client_index == 0) {
-			over_overspread_to_left = true;
-		} else {
-			over_overspread_to_left = false;
-		}
-
-		if (over_overspread_to_left &&
-			(!INSIDEMON(tempClients[1]) ||
-			 (tempClients[1]->scroller_proportion +
-				  tempClients[focus_client_index]->scroller_proportion >=
-			  1.0f))) {
-			need_scroller = true;
-		} else if (!over_overspread_to_left &&
-				   (!INSIDEMON(tempClients[focus_client_index - 1]) ||
-					(tempClients[focus_client_index - 1]->scroller_proportion +
-						 tempClients[focus_client_index]->scroller_proportion >=
-					 1.0f))) {
-			need_scroller = true;
-		} else {
-			need_apply_overspread = false;
-		}
-	}
-
-	bool need_apply_center =
-		scroller_focus_center || m->visible_scroll_tiling_clients == 1 ||
-		(scroller_prefer_center && !need_apply_overspread &&
-		 (!m->prevsel ||
-		  (ISSCROLLTILED(m->prevsel) &&
-		   (m->prevsel->scroller_proportion * max_client_width) +
-				   (tempClients[focus_client_index]->scroller_proportion *
-					max_client_width) >
-			   m->w.width - 2 * scroller_structs - cur_gappih)));
-
 	if (n == 1 && scroller_ignore_proportion_single) {
 		need_scroller = true;
 	}
@@ -435,26 +393,18 @@ void scroller(Monitor *m) {
 			tempClients[focus_client_index], &target_geom);
 		arrange_stack(tempClients[focus_client_index], target_geom, cur_gappiv);
 	} else if (need_scroller) {
-		if (need_apply_center) {
+		if (scroller_focus_center ||
+			((!m->prevsel ||
+			  (ISSCROLLTILED(m->prevsel) &&
+			   (m->prevsel->scroller_proportion * max_client_width) +
+					   (root_client->scroller_proportion * max_client_width) >
+				   m->w.width - 2 * scroller_structs - cur_gappih)) &&
+			 scroller_prefer_center)) {
 			target_geom.x = m->w.x + (m->w.width - target_geom.width) / 2;
-		} else if (need_apply_overspread) {
-			if (over_overspread_to_left) {
-				target_geom.x = m->w.x + scroller_structs;
-			} else {
-				target_geom.x =
-					m->w.x +
-					(m->w.width -
-					 tempClients[focus_client_index]->scroller_proportion *
-						 max_client_width -
-					 scroller_structs);
-			}
-
 		} else {
-			target_geom.x = tempClients[focus_client_index]->geom.x >
+			target_geom.x = root_client->geom.x > m->w.x + (m->w.width) / 2
-									m->w.x + (m->w.width) / 2
 								? m->w.x + (m->w.width -
-											tempClients[focus_client_index]
+											root_client->scroller_proportion *
-													->scroller_proportion *
 												max_client_width -
 											scroller_structs)
 								: m->w.x + scroller_structs;

src/layout/layout.h

@@ -17,8 +17,8 @@ static void tgmix(Monitor *m);
 Layout overviewlayout = {"󰃇", overview, "overview"};
 
 enum {
-	TILE,
 	SCROLLER,
+	TILE,
 	GRID,
 	MONOCLE,
 	DECK,
@@ -34,8 +34,8 @@ enum {
 Layout layouts[] = {
 	// 最少两个,不能删除少于两个
 	/* symbol     arrange function   name */
-	{"T", tile, "tile", TILE},						 // 平铺布局
 	{"S", scroller, "scroller", SCROLLER},			 // 滚动布局
+	{"T", tile, "tile", TILE},						 // 平铺布局
 	{"G", grid, "grid", GRID},						 // 格子布局
 	{"M", monocle, "monocle", MONOCLE},				 // 单屏布局
 	{"K", deck, "deck", DECK},						 // 卡片布局

src/layout/vertical.h

@@ -110,7 +110,6 @@ void vertical_deck(Monitor *m) {
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
-	uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
 
 	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
 	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
@@ -135,8 +134,8 @@ void vertical_deck(Monitor *m) {
 	mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per
 										: m->pertag->mfacts[m->pertag->curtag];
 
-	if (n > nmasters)
+	if (n > m->nmaster)
-		mh = nmasters ? round((m->w.height - 2 * cur_gappov) * mfact) : 0;
+		mh = m->nmaster ? round((m->w.height - 2 * cur_gappov) * mfact) : 0;
 	else
 		mh = m->w.height - 2 * cur_gappov;
 
@@ -144,13 +143,13 @@ void vertical_deck(Monitor *m) {
 	wl_list_for_each(c, &clients, link) {
 		if (!VISIBLEON(c, m) || !ISTILED(c))
 			continue;
-		if (i < nmasters) {
+		if (i < m->nmaster) {
 			resize(
 				c,
 				(struct wlr_box){.x = m->w.x + cur_gappoh + mx,
 								 .y = m->w.y + cur_gappov,
 								 .width = (m->w.width - 2 * cur_gappoh - mx) /
-										  (MIN(n, nmasters) - i),
+										  (MIN(n, m->nmaster) - i),
 								 .height = mh},
 				0);
 			mx += c->geom.width;
@@ -270,7 +269,6 @@ void vertical_scroller(Monitor *m) {
 	struct wlr_box target_geom;
 	int32_t focus_client_index = 0;
 	bool need_scroller = false;
-	bool over_overspread_to_up = false;
 	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
 	int32_t cur_gappov = enablegaps ? m->gappov : 0;
 	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
@@ -356,46 +354,6 @@ void vertical_scroller(Monitor *m) {
 		}
 	}
 
-	bool need_apply_overspread =
-		scroller_prefer_overspread && m->visible_scroll_tiling_clients > 1 &&
-		(focus_client_index == 0 || focus_client_index == n - 1) &&
-		tempClients[focus_client_index]->scroller_proportion < 1.0f;
-
-	if (need_apply_overspread) {
-
-		if (focus_client_index == 0) {
-			over_overspread_to_up = true;
-		} else {
-			over_overspread_to_up = false;
-		}
-
-		if (over_overspread_to_up &&
-			(!INSIDEMON(tempClients[1]) ||
-			 (tempClients[1]->scroller_proportion +
-				  tempClients[focus_client_index]->scroller_proportion >=
-			  1.0f))) {
-			need_scroller = true;
-		} else if (!over_overspread_to_up &&
-				   (!INSIDEMON(tempClients[focus_client_index - 1]) ||
-					(tempClients[focus_client_index - 1]->scroller_proportion +
-						 tempClients[focus_client_index]->scroller_proportion >=
-					 1.0f))) {
-			need_scroller = true;
-		} else {
-			need_apply_overspread = false;
-		}
-	}
-
-	bool need_apply_center =
-		scroller_focus_center || m->visible_scroll_tiling_clients == 1 ||
-		(scroller_prefer_center && !need_apply_overspread &&
-		 (!m->prevsel ||
-		  (ISSCROLLTILED(m->prevsel) &&
-		   (m->prevsel->scroller_proportion * max_client_height) +
-				   (tempClients[focus_client_index]->scroller_proportion *
-					max_client_height) >
-			   m->w.height - 2 * scroller_structs - cur_gappiv)));
-
 	if (n == 1 && scroller_ignore_proportion_single) {
 		need_scroller = true;
 	}
@@ -422,24 +380,18 @@ void vertical_scroller(Monitor *m) {
 		arrange_stack_vertical(tempClients[focus_client_index], target_geom,
 							   cur_gappih);
 	} else if (need_scroller) {
-		if (need_apply_center) {
+		if (scroller_focus_center ||
+			((!m->prevsel ||
+			  (ISSCROLLTILED(m->prevsel) &&
+			   (m->prevsel->scroller_proportion * max_client_height) +
+					   (root_client->scroller_proportion * max_client_height) >
+				   m->w.height - 2 * scroller_structs - cur_gappiv)) &&
+			 scroller_prefer_center)) {
 			target_geom.y = m->w.y + (m->w.height - target_geom.height) / 2;
-		} else if (need_apply_overspread) {
-			if (over_overspread_to_up) {
-				target_geom.y = m->w.y + scroller_structs;
-			} else {
-				target_geom.y =
-					m->w.y +
-					(m->w.height -
-					 tempClients[focus_client_index]->scroller_proportion *
-						 max_client_height -
-					 scroller_structs);
-			}
 		} else {
 			target_geom.y = root_client->geom.y > m->w.y + (m->w.height) / 2
 								? m->w.y + (m->w.height -
-											tempClients[focus_client_index]
+											root_client->scroller_proportion *
-													->scroller_proportion *
 												max_client_height -
 											scroller_structs)
 								: m->w.y + scroller_structs;