resolve upstream merge conflicts

avoid the coordinates being forcibly limited to positive numbers

README.md

@@ -1,7 +1,7 @@
-# MangoWC
-
-<img width="255" height="256" alt="mango-transparency-256" src="https://github.com/DreamMaoMao/mangowc/blob/main/assets/mango-transparency-256.png" />
-
+# Mango Wayland Compositor
+<div>
+  <img src="https://github.com/DreamMaoMao/mangowc/blob/main/assets/mango-transparency-256.png" alt="MangoWC Logo" width="120"/>
+</div>
 
 This project's development is based on [dwl](https://codeberg.org/dwl/dwl/).
 
@@ -32,7 +32,7 @@ Scroller Layout
 
 https://github.com/user-attachments/assets/c9bf9415-fad1-4400-bcdc-3ad2d76de85a
 
-Layer animaiton
+Layer animation
 
 https://github.com/user-attachments/assets/014c893f-115c-4ae9-8342-f9ae3e9a0df0
 
@@ -71,6 +71,8 @@ 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:
@@ -80,7 +82,6 @@ yay -S mangowc-git
 ```
 
 ## Gentoo Linux
-
 The package is in the community-maintained repository called GURU.
 First, add GURU repository:
 
@@ -98,6 +99,16 @@ 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
@@ -170,7 +181,9 @@ git clone https://github.com/DreamMaoMao/mango-config.git ~/.config/mango
 
 ## Config Documentation
 
-Refer to the [wiki](https://github.com/DreamMaoMao/mango/wiki/)
+Refer to the repo wiki [wiki](https://github.com/DreamMaoMao/mango/wiki/)
+
+or the website docs [docs](https://mangowc.vercel.app/docs)
 
 # NixOS + Home-manager
 
@@ -248,14 +261,6 @@ 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:

config.conf

@@ -48,6 +48,8 @@ animation_curve_move=0.46,1.0,0.29,1
 animation_curve_tag=0.46,1.0,0.29,1
 animation_curve_close=0.08,0.92,0,1
 animation_curve_focus=0.46,1.0,0.29,1
+animation_curve_opafadeout=0.5,0.5,0.5,0.5
+animation_curve_opafadein=0.46,1.0,0.29,1
 
 # Scroller Layout Setting
 scroller_structs=20
@@ -76,7 +78,7 @@ overviewgappo=30
 no_border_when_single=0
 axis_bind_apply_timeout=100
 focus_on_activate=1
-inhibit_regardless_of_visibility=0
+idleinhibit_ignore_visible=0
 sloppyfocus=1
 warpcursor=1
 focus_cross_monitor=0

mangowc.scm

@@ -0,0 +1,64 @@
+(define-module (mangowc)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix gexp)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages pciutils)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages build-tools)
+  #:use-module (gnu packages ninja)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (guix build-system meson)
+  #:use-module (guix licenses))
+
+
+(define-public mangowc-git
+  (package
+    (name "mangowc")
+    (version "git")
+    (source (local-file "." "mangowc-checkout"
+                        #:recursive? #t
+                        #:select? (or (git-predicate (current-source-directory))
+                                      (const #t))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "-Dsysconfdir=" #$output "/etc"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'patch-meson
+            (lambda _
+              (substitute* "meson.build"
+                (("'-DSYSCONFDIR=\\\"@0@\\\"'.format\\('/etc'\\)")
+                 "'-DSYSCONFDIR=\"@0@\"'.format(sysconfdir)")
+                (("sysconfdir = sysconfdir.substring\\(prefix.length\\(\\)\\)")
+                 "")))))))
+    (inputs (list wayland
+                  libinput
+                  libdrm
+                  libxkbcommon
+                  pixman
+                  libdisplay-info
+                  libliftoff
+                  hwdata
+                  seatd
+                  pcre2
+                  libxcb
+                  xcb-util-wm
+                  wlroots
+                  scenefx))
+    (native-inputs (list pkg-config wayland-protocols))
+    (home-page "https://github.com/DreamMaoMao/mangowc")
+    (synopsis "Wayland compositor based on wlroots and scenefx")
+    (description "A Wayland compositor based on wlroots and scenefx,
+inspired by dwl but aiming to be more feature-rich.")
+    (license gpl3)))
+
+mangowc-git

meson.build

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

mmsg/arg.h

@@ -8,13 +8,13 @@
 
 extern char *argv0;
 
-/* use main(int argc, char *argv[]) */
+/* use main(int32_t argc, char *argv[]) */
 #define ARGBEGIN                                                               \
 	for (argv0 = *argv, argv++, argc--;                                        \
 		 argv[0] && argv[0][0] == '-' && argv[0][1]; argc--, argv++) {         \
 		char argc_;                                                            \
 		char **argv_;                                                          \
-		int brk_;                                                              \
+		int32_t brk_;                                                          \
 		if (argv[0][1] == '-' && argv[0][2] == '\0') {                         \
 			argv++;                                                            \
 			argc--;                                                            \

mmsg/mmsg.c

@@ -25,31 +25,31 @@ static enum {
 	WATCH = 1 << 2 | GET,
 } mode = NONE;
 
-static int Oflag;
-static int Tflag;
-static int Lflag;
-static int oflag;
-static int tflag;
-static int lflag;
-static int cflag;
-static int vflag;
-static int mflag;
-static int fflag;
-static int qflag;
-static int dflag;
-static int xflag;
-static int eflag;
-static int kflag;
-static int bflag;
-static int Aflag;
+static int32_t Oflag;
+static int32_t Tflag;
+static int32_t Lflag;
+static int32_t oflag;
+static int32_t tflag;
+static int32_t lflag;
+static int32_t cflag;
+static int32_t vflag;
+static int32_t mflag;
+static int32_t fflag;
+static int32_t qflag;
+static int32_t dflag;
+static int32_t xflag;
+static int32_t eflag;
+static int32_t kflag;
+static int32_t bflag;
+static int32_t Aflag;
 
 static uint32_t occ, seltags, total_clients, urg;
 
 static char *output_name;
-static int tagcount;
+static int32_t tagcount;
 static char *tagset;
 static char *layout_name;
-static int layoutcount, layout_idx;
+static int32_t layoutcount, layout_idx;
 static char *client_tags;
 static char *dispatch_cmd;
 static char *dispatch_arg1;
@@ -86,8 +86,8 @@ static void noop_description(void *data, struct wl_output *wl_output,
 							 const char *description) {}
 
 // 将 n 转换为 9 位二进制字符串，结果存入 buf（至少长度 10）
-void bin_str_9bits(char *buf, unsigned int n) {
-	for (int i = 8; i >= 0; i--) {
+void bin_str_9bits(char *buf, uint32_t n) {
+	for (int32_t i = 8; i >= 0; i--) {
 		*buf++ = ((n >> i) & 1) ? '1' : '0';
 	}
 	*buf = '\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 unsigned int scalefactor) {
+						   const uint32_t scalefactor) {
 	if (!Aflag)
 		return;
 	char *output_name = data;
@@ -324,7 +324,7 @@ static void dwl_ipc_output_frame(void *data,
 		if (tflag) {
 			uint32_t mask = seltags;
 			char *t = tagset;
-			int i = 0;
+			int32_t i = 0;
 
 			for (; *t && *t >= '0' && *t <= '9'; t++)
 				i = *t - '0' + i * 10;
@@ -354,7 +354,7 @@ static void dwl_ipc_output_frame(void *data,
 		if (cflag) {
 			uint32_t and = ~0, xor = 0;
 			char *t = client_tags;
-			int i = 0;
+			int32_t i = 0;
 
 			for (; *t && *t >= '0' && *t <= '9'; t++)
 				i = *t - '0' + i * 10;
@@ -509,7 +509,7 @@ static void usage(void) {
 	exit(2);
 }
 
-int main(int argc, char *argv[]) {
+int32_t main(int32_t argc, char *argv[]) {
 	ARGBEGIN {
 	case 'q':
 		qflag = 1;

nix/default.nix

@@ -13,60 +13,64 @@
   wayland-scanner,
   xcbutilwm,
   xwayland,
-  enableXWayland ? true,
   meson,
   ninja,
   scenefx,
   wlroots_0_19,
   libGL,
-}: let
+  enableXWayland ? true,
+  debug ? false,
+}:
+stdenv.mkDerivation {
   pname = "mango";
-in
-  stdenv.mkDerivation {
-    inherit pname;
-    version = "nightly";
+  version = "nightly";
 
-    src = builtins.path {
-      path = ../.;
-      name = "source";
-    };
+  src = builtins.path {
+    path = ../.;
+    name = "source";
+  };
 
-    nativeBuildInputs = [
-      meson
-      ninja
-      pkg-config
-      wayland-scanner
+  mesonFlags = [
+    (lib.mesonEnable "xwayland" enableXWayland)
+    (lib.mesonBool "asan" debug)
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs =
+    [
+      libinput
+      libxcb
+      libxkbcommon
+      pcre2
+      pixman
+      wayland
+      wayland-protocols
+      wlroots_0_19
+      scenefx
+      libGL
+    ]
+    ++ lib.optionals enableXWayland [
+      libX11
+      xcbutilwm
+      xwayland
     ];
 
-    buildInputs =
-      [
-        libinput
-        libxcb
-        libxkbcommon
-        pcre2
-        pixman
-        wayland
-        wayland-protocols
-        wlroots_0_19
-        scenefx
-        libGL
-      ]
-      ++ lib.optionals enableXWayland [
-        libX11
-        xcbutilwm
-        xwayland
-      ];
+  passthru = {
+    providedSessions = ["mango"];
+  };
 
-    passthru = {
-      providedSessions = ["mango"];
-    };
-
-    meta = {
-      mainProgram = "mango";
-      description = "A streamlined but feature-rich Wayland compositor";
-      homepage = "https://github.com/DreamMaoMao/mango";
-      license = lib.licenses.gpl3Plus;
-      maintainers = [];
-      platforms = lib.platforms.unix;
-    };
-  }
+  meta = {
+    mainProgram = "mango";
+    description = "A streamlined but feature-rich Wayland compositor";
+    homepage = "https://github.com/DreamMaoMao/mango";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [];
+    platforms = lib.platforms.unix;
+  };
+}

src/animation/client.h

@@ -1,10 +1,10 @@
-void client_actual_size(Client *c, unsigned int *width, unsigned int *height) {
-	*width = c->animation.current.width - c->bw;
+void client_actual_size(Client *c, int32_t *width, int32_t *height) {
+	*width = c->animation.current.width - 2 * (int32_t)c->bw;
 
-	*height = c->animation.current.height - c->bw;
+	*height = c->animation.current.height - 2 * (int32_t)c->bw;
 }
 
-void set_rect_size(struct wlr_scene_rect *rect, int width, int height) {
+void set_rect_size(struct wlr_scene_rect *rect, int32_t width, int32_t height) {
 	wlr_scene_rect_set_size(rect, GEZERO(width), GEZERO(height));
 }
 
@@ -47,7 +47,7 @@ bool is_horizontal_right_stack_layout(Monitor *m) {
 	return false;
 }
 
-int is_special_animaiton_rule(Client *c) {
+int32_t is_special_animaiton_rule(Client *c) {
 
 	if (is_scroller_layout(c->mon) && !c->isfloating) {
 		return DOWN;
@@ -71,11 +71,11 @@ int is_special_animaiton_rule(Client *c) {
 }
 
 void set_client_open_animaiton(Client *c, struct wlr_box geo) {
-	int slide_direction;
-	int horizontal, horizontal_value;
-	int vertical, vertical_value;
-	int special_direction;
-	int center_x, center_y;
+	int32_t slide_direction;
+	int32_t horizontal, horizontal_value;
+	int32_t vertical, vertical_value;
+	int32_t special_direction;
+	int32_t center_x, center_y;
 
 	if ((!c->animation_type_open && strcmp(animation_type_open, "fade") == 0) ||
 		(c->animation_type_open &&
@@ -147,15 +147,15 @@ void set_client_open_animaiton(Client *c, struct wlr_box geo) {
 	}
 }
 
-void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
-									int sy, void *data) {
+void snap_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
+									int32_t sy, void *data) {
 	BufferData *buffer_data = (BufferData *)data;
 	wlr_scene_buffer_set_dest_size(buffer, buffer_data->width,
 								   buffer_data->height);
 }
 
-void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx, int sy,
-							   void *data) {
+void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int32_t sx,
+							   int32_t sy, void *data) {
 	BufferData *buffer_data = (BufferData *)data;
 
 	if (buffer_data->should_scale && buffer_data->height_scale < 1 &&
@@ -183,8 +183,8 @@ void scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx, int sy,
 
 	if (buffer_data->should_scale) {
 
-		unsigned int surface_width = surface->current.width;
-		unsigned int surface_height = surface->current.height;
+		int32_t surface_width = surface->current.width;
+		int32_t surface_height = surface->current.height;
 
 		surface_width = buffer_data->width_scale < 1
 							? surface_width
@@ -240,8 +240,9 @@ void buffer_set_effect(Client *c, BufferData data) {
 	if (c == grabc)
 		data.should_scale = false;
 
-	if (c->isfullscreen || (no_radius_when_single && c->mon &&
-							c->mon->visible_tiling_clients == 1)) {
+	if (c->isnoradius || c->isfullscreen ||
+		(no_radius_when_single && c->mon &&
+		 c->mon->visible_tiling_clients == 1)) {
 		data.corner_location = CORNER_LOCATION_NONE;
 	}
 
@@ -270,24 +271,24 @@ void client_draw_shadow(Client *c) {
 			? CORNER_LOCATION_NONE
 			: CORNER_LOCATION_ALL;
 
-	unsigned int bwoffset = c->bw != 0 && hit_no_border ? c->bw : 0;
+	int32_t bwoffset = c->bw != 0 && hit_no_border ? (int32_t)c->bw : 0;
 
-	uint32_t width, height;
+	int32_t width, height;
 	client_actual_size(c, &width, &height);
 
-	uint32_t delta = shadows_size + c->bw - bwoffset;
+	int32_t delta = shadows_size + (int32_t)c->bw - bwoffset;
 
 	/* we calculate where to clip the shadow */
 	struct wlr_box client_box = {
 		.x = bwoffset,
 		.y = bwoffset,
-		.width = width - 2 * bwoffset,
-		.height = height - 2 * bwoffset,
+		.width = width + (int32_t)c->bw - bwoffset,
+		.height = height + (int32_t)c->bw - bwoffset,
 	};
 
 	struct wlr_box shadow_box = {
-		.x = shadows_position_x,
-		.y = shadows_position_y,
+		.x = shadows_position_x + bwoffset,
+		.y = shadows_position_y + bwoffset,
 		.width = width + 2 * delta,
 		.height = height + 2 * delta,
 	};
@@ -296,8 +297,8 @@ void client_draw_shadow(Client *c) {
 	wlr_box_intersection(&intersection_box, &client_box, &shadow_box);
 	/* clipped region takes shadow relative coords, so we translate everything
 	 * by its position */
-	intersection_box.x -= shadows_position_x;
-	intersection_box.y -= shadows_position_y;
+	intersection_box.x -= shadows_position_x + bwoffset;
+	intersection_box.y -= shadows_position_y + bwoffset;
 
 	struct clipped_region clipped_region = {
 		.area = intersection_box,
@@ -312,7 +313,7 @@ void client_draw_shadow(Client *c) {
 		.height = shadow_box.height,
 	};
 
-	int right_offset, bottom_offset, left_offset, top_offset;
+	int32_t right_offset, bottom_offset, left_offset, top_offset;
 
 	if (c == grabc) {
 		right_offset = 0;
@@ -354,11 +355,13 @@ void apply_border(Client *c) {
 		return;
 
 	bool hit_no_border = check_hit_no_border(c);
-	enum corner_location current_corner_location =
-		c->isfullscreen || (no_radius_when_single && c->mon &&
-							c->mon->visible_tiling_clients == 1)
-			? CORNER_LOCATION_NONE
-			: CORNER_LOCATION_ALL;
+	enum corner_location current_corner_location;
+	if (c->isfullscreen || (no_radius_when_single && c->mon &&
+							c->mon->visible_tiling_clients == 1)) {
+		current_corner_location = CORNER_LOCATION_NONE;
+	} else {
+		current_corner_location = set_client_corner_location(c);
+	}
 
 	// Handle no-border cases
 	if (hit_no_border && smartgaps) {
@@ -376,9 +379,9 @@ void apply_border(Client *c) {
 
 	struct wlr_box clip_box = c->animation.current;
 	// 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错
-	int bw = (int)c->bw;
+	int32_t bw = (int32_t)c->bw;
 
-	int right_offset, bottom_offset, left_offset, top_offset;
+	int32_t right_offset, bottom_offset, left_offset, top_offset;
 
 	if (c == grabc) {
 		right_offset = 0;
@@ -397,25 +400,27 @@ void apply_border(Client *c) {
 		top_offset = GEZERO(c->mon->m.y - c->animation.current.y);
 	}
 
-	int inner_surface_width = GEZERO(clip_box.width - 2 * bw);
-	int inner_surface_height = GEZERO(clip_box.height - 2 * bw);
+	int32_t inner_surface_width = GEZERO(clip_box.width - 2 * bw);
+	int32_t inner_surface_height = GEZERO(clip_box.height - 2 * bw);
 
-	int inner_surface_x = GEZERO(bw - left_offset);
-	int inner_surface_y = GEZERO(bw - top_offset);
+	int32_t inner_surface_x = GEZERO(bw - left_offset);
+	int32_t inner_surface_y = GEZERO(bw - top_offset);
 
-	int rect_x = left_offset;
-	int rect_y = top_offset;
+	int32_t rect_x = left_offset;
+	int32_t rect_y = top_offset;
 
-	int rect_width =
+	int32_t rect_width =
 		GEZERO(c->animation.current.width - left_offset - right_offset);
-	int rect_height =
+	int32_t rect_height =
 		GEZERO(c->animation.current.height - top_offset - bottom_offset);
 
 	if (left_offset > c->bw)
-		inner_surface_width = inner_surface_width - left_offset + c->bw;
+		inner_surface_width =
+			inner_surface_width - left_offset + (int32_t)c->bw;
 
 	if (top_offset > c->bw)
-		inner_surface_height = inner_surface_height - top_offset + c->bw;
+		inner_surface_height =
+			inner_surface_height - top_offset + (int32_t)c->bw;
 
 	if (right_offset > 0) {
 		inner_surface_width =
@@ -443,24 +448,24 @@ void apply_border(Client *c) {
 }
 
 struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) {
-	int offsetx = 0, offsety = 0, offsetw = 0, offseth = 0;
+	int32_t offsetx = 0, offsety = 0, offsetw = 0, offseth = 0;
 	struct ivec2 offset = {0, 0, 0, 0};
 
 	if (!ISSCROLLTILED(c) && !c->animation.tagining && !c->animation.tagouted &&
 		!c->animation.tagouting)
 		return offset;
 
-	int bottom_out_offset =
+	int32_t bottom_out_offset =
 		GEZERO(c->animation.current.y + c->animation.current.height -
 			   c->mon->m.y - c->mon->m.height);
-	int right_out_offset =
+	int32_t right_out_offset =
 		GEZERO(c->animation.current.x + c->animation.current.width -
 			   c->mon->m.x - c->mon->m.width);
-	int left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x);
-	int top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y);
+	int32_t left_out_offset = GEZERO(c->mon->m.x - c->animation.current.x);
+	int32_t top_out_offset = GEZERO(c->mon->m.y - c->animation.current.y);
 
 	// 必须转换为int，否计算会没有负数导致判断错误
-	int bw = (int)c->bw;
+	int32_t bw = (int32_t)c->bw;
 
 	/*
 	  计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕
@@ -519,8 +524,6 @@ void client_apply_clip(Client *c, float factor) {
 	enum corner_location current_corner_location =
 		set_client_corner_location(c);
 
-	int bw = (int)c->bw;
-
 	if (!animations) {
 		c->animation.running = false;
 		c->need_output_flush = false;
@@ -546,7 +549,7 @@ void client_apply_clip(Client *c, float factor) {
 	}
 
 	// 获取窗口动画实时位置矩形
-	unsigned int width, height;
+	int32_t width, height;
 	client_actual_size(c, &width, &height);
 
 	// 计算出除了边框的窗口实际剪切大小
@@ -555,8 +558,8 @@ void client_apply_clip(Client *c, float factor) {
 	clip_box = (struct wlr_box){
 		.x = geometry.x,
 		.y = geometry.y,
-		.width = width - bw,
-		.height = height - bw,
+		.width = width,
+		.height = height,
 	};
 
 	if (client_is_x11(c)) {
@@ -589,8 +592,8 @@ void client_apply_clip(Client *c, float factor) {
 	wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
 
 	// 获取剪切后的表面的实际大小用于计算缩放
-	int acutal_surface_width = geometry.width - offset.x - offset.width;
-	int acutal_surface_height = geometry.height - offset.y - offset.height;
+	int32_t acutal_surface_width = geometry.width - offset.x - offset.width;
+	int32_t acutal_surface_height = geometry.height - offset.y - offset.height;
 
 	if (acutal_surface_width <= 0 || acutal_surface_height <= 0)
 		return;
@@ -622,25 +625,24 @@ void fadeout_client_animation_next_tick(Client *c) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
+	int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
 	double animation_passed =
 		c->animation.duration
 			? (double)passed_time / (double)c->animation.duration
 			: 1.0;
 
-	int type = c->animation.action = c->animation.action;
+	int32_t type = c->animation.action = c->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
-	unsigned int width =
-		c->animation.initial.width +
-		(c->current.width - c->animation.initial.width) * factor;
-	unsigned int height =
-		c->animation.initial.height +
-		(c->current.height - c->animation.initial.height) * factor;
 
-	unsigned int x = c->animation.initial.x +
-					 (c->current.x - c->animation.initial.x) * factor;
-	unsigned int y = c->animation.initial.y +
-					 (c->current.y - c->animation.initial.y) * factor;
+	int32_t width = c->animation.initial.width +
+					(c->current.width - c->animation.initial.width) * factor;
+	int32_t height = c->animation.initial.height +
+					 (c->current.height - c->animation.initial.height) * factor;
+
+	int32_t x = c->animation.initial.x +
+				(c->current.x - c->animation.initial.x) * factor;
+	int32_t y = c->animation.initial.y +
+				(c->current.y - c->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&c->scene->node, x, y);
 
@@ -651,7 +653,13 @@ void fadeout_client_animation_next_tick(Client *c) {
 		.height = height,
 	};
 
-	double opacity = MAX(fadeout_begin_opacity - animation_passed, 0);
+	double opacity_eased_progress =
+		find_animation_curve_at(animation_passed, OPAFADEOUT);
+
+	double percent = fadeout_begin_opacity -
+					 (opacity_eased_progress * fadeout_begin_opacity);
+
+	double opacity = MAX(percent, 0);
 
 	if (animation_fade_out && !c->nofadeout)
 		wlr_scene_node_for_each_buffer(&c->scene->node,
@@ -683,30 +691,28 @@ void client_animation_next_tick(Client *c) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
+	int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
 	double animation_passed =
 		c->animation.duration
 			? (double)passed_time / (double)c->animation.duration
 			: 1.0;
 
-	int type = c->animation.action == NONE ? MOVE : c->animation.action;
+	int32_t type = c->animation.action == NONE ? MOVE : c->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
 
 	Client *pointer_c = NULL;
 	double sx = 0, sy = 0;
 	struct wlr_surface *surface = NULL;
 
-	unsigned int width =
-		c->animation.initial.width +
-		(c->current.width - c->animation.initial.width) * factor;
-	unsigned int height =
-		c->animation.initial.height +
-		(c->current.height - c->animation.initial.height) * factor;
+	int32_t width = c->animation.initial.width +
+					(c->current.width - c->animation.initial.width) * factor;
+	int32_t height = c->animation.initial.height +
+					 (c->current.height - c->animation.initial.height) * factor;
 
-	unsigned int x = c->animation.initial.x +
-					 (c->current.x - c->animation.initial.x) * factor;
-	unsigned int y = c->animation.initial.y +
-					 (c->current.y - c->animation.initial.y) * factor;
+	int32_t x = c->animation.initial.x +
+				(c->current.x - c->animation.initial.x) * factor;
+	int32_t y = c->animation.initial.y +
+				(c->current.y - c->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&c->scene->node, x, y);
 	c->animation.current = (struct wlr_box){
@@ -902,7 +908,7 @@ void client_set_pending_state(Client *c) {
 	c->dirty = true;
 }
 
-void resize(Client *c, struct wlr_box geo, int interact) {
+void resize(Client *c, struct wlr_box geo, int32_t interact) {
 
 	// 动画设置的起始函数，这里用来计算一些动画的起始值
 	// 动画起始位置大小是由于c->animainit_geom确定的
@@ -924,8 +930,8 @@ void resize(Client *c, struct wlr_box geo, int interact) {
 
 	if (is_scroller_layout(c->mon) && (!c->isfloating || c == grabc)) {
 		c->geom = geo;
-		c->geom.width = MAX(1 + 2 * (int)c->bw, c->geom.width);
-		c->geom.height = MAX(1 + 2 * (int)c->bw, c->geom.height);
+		c->geom.width = MAX(1 + 2 * (int32_t)c->bw, c->geom.width);
+		c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height);
 	} else { // 这里会限制不允许窗口划出屏幕
 		c->geom = geo;
 		applybounds(
@@ -1105,14 +1111,17 @@ bool client_apply_focus_opacity(Client *c) {
 		struct timespec now;
 		clock_gettime(CLOCK_MONOTONIC, &now);
 
-		uint32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
+		int32_t passed_time = timespec_to_ms(&now) - c->animation.time_started;
 		double linear_progress =
 			c->animation.duration
 				? (double)passed_time / (double)c->animation.duration
 				: 1.0;
 
+		double opacity_eased_progress =
+			find_animation_curve_at(linear_progress, OPAFADEIN);
+
 		float percent =
-			animation_fade_in && !c->nofadein ? linear_progress : 1.0;
+			animation_fade_in && !c->nofadein ? opacity_eased_progress : 1.0;
 		float opacity =
 			c == selmon->sel ? c->focused_opacity : c->unfocused_opacity;
 
@@ -1127,7 +1136,7 @@ bool client_apply_focus_opacity(Client *c) {
 		struct timespec now;
 		clock_gettime(CLOCK_MONOTONIC, &now);
 
-		uint32_t passed_time =
+		int32_t passed_time =
 			timespec_to_ms(&now) - c->opacity_animation.time_started;
 		double linear_progress =
 			c->opacity_animation.duration
@@ -1144,7 +1153,7 @@ bool client_apply_focus_opacity(Client *c) {
 		client_set_opacity(c, c->opacity_animation.current_opacity);
 
 		// Animate border color
-		for (int i = 0; i < 4; i++) {
+		for (int32_t i = 0; i < 4; i++) {
 			c->opacity_animation.current_border_color[i] =
 				c->opacity_animation.initial_border_color[i] +
 				(c->opacity_animation.target_border_color[i] -

src/animation/common.h

@@ -1,4 +1,4 @@
-struct dvec2 calculate_animation_curve_at(double t, int type) {
+struct dvec2 calculate_animation_curve_at(double t, int32_t type) {
 	struct dvec2 point;
 	double *animation_curve;
 	if (type == MOVE) {
@@ -11,6 +11,10 @@ struct dvec2 calculate_animation_curve_at(double t, int type) {
 		animation_curve = animation_curve_close;
 	} else if (type == FOCUS) {
 		animation_curve = animation_curve_focus;
+	} else if (type == OPAFADEIN) {
+		animation_curve = animation_curve_opafadein;
+	} else if (type == OPAFADEOUT) {
+		animation_curve = animation_curve_opafadeout;
 	} else {
 		animation_curve = animation_curve_move;
 	}
@@ -32,34 +36,46 @@ void init_baked_points(void) {
 		calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_close));
 	baked_points_focus =
 		calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_focus));
+	baked_points_opafadein =
+		calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadein));
+	baked_points_opafadeout =
+		calloc(BAKED_POINTS_COUNT, sizeof(*baked_points_opafadeout));
 
-	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_move[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), MOVE);
 	}
-	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_open[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), OPEN);
 	}
-	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_tag[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), TAG);
 	}
-	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_close[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), CLOSE);
 	}
-	for (unsigned int i = 0; i < BAKED_POINTS_COUNT; i++) {
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
 		baked_points_focus[i] = calculate_animation_curve_at(
 			(double)i / (BAKED_POINTS_COUNT - 1), FOCUS);
 	}
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+		baked_points_opafadein[i] = calculate_animation_curve_at(
+			(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEIN);
+	}
+	for (int32_t i = 0; i < BAKED_POINTS_COUNT; i++) {
+		baked_points_opafadeout[i] = calculate_animation_curve_at(
+			(double)i / (BAKED_POINTS_COUNT - 1), OPAFADEOUT);
+	}
 }
 
-double find_animation_curve_at(double t, int type) {
-	unsigned int down = 0;
-	unsigned int up = BAKED_POINTS_COUNT - 1;
+double find_animation_curve_at(double t, int32_t type) {
+	int32_t down = 0;
+	int32_t up = BAKED_POINTS_COUNT - 1;
 
-	unsigned int middle = (up + down) / 2;
+	int32_t middle = (up + down) / 2;
 	struct dvec2 *baked_points;
 	if (type == MOVE) {
 		baked_points = baked_points_move;
@@ -71,6 +87,10 @@ double find_animation_curve_at(double t, int type) {
 		baked_points = baked_points_close;
 	} else if (type == FOCUS) {
 		baked_points = baked_points_focus;
+	} else if (type == OPAFADEIN) {
+		baked_points = baked_points_opafadein;
+	} else if (type == OPAFADEOUT) {
+		baked_points = baked_points_opafadeout;
 	} else {
 		baked_points = baked_points_move;
 	}
@@ -86,7 +106,8 @@ double find_animation_curve_at(double t, int type) {
 	return baked_points[up].y;
 }
 
-static bool scene_node_snapshot(struct wlr_scene_node *node, int lx, int ly,
+static bool scene_node_snapshot(struct wlr_scene_node *node, int32_t lx,
+								int32_t ly,
 								struct wlr_scene_tree *snapshot_tree) {
 	if (!node->enabled && node->type != WLR_SCENE_NODE_TREE) {
 		return true;

src/animation/layer.h

@@ -1,5 +1,4 @@
-void layer_actual_size(LayerSurface *l, unsigned int *width,
-					   unsigned int *height) {
+void layer_actual_size(LayerSurface *l, int32_t *width, int32_t *height) {
 	struct wlr_box box;
 
 	if (l->animation.running) {
@@ -43,7 +42,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
 						  .height = state->desired_height};
 
 	// 水平方向定位
-	const uint32_t both_horiz =
+	const int32_t both_horiz =
 		ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
 	if (box.width == 0) {
 		box.x = bounds.x;
@@ -58,7 +57,7 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
 	}
 
 	// 垂直方向定位
-	const uint32_t both_vert =
+	const int32_t both_vert =
 		ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
 	if (box.height == 0) {
 		box.y = bounds.y;
@@ -102,10 +101,10 @@ void get_layer_target_geometry(LayerSurface *l, struct wlr_box *target_box) {
 }
 
 void set_layer_dir_animaiton(LayerSurface *l, struct wlr_box *geo) {
-	int slide_direction;
-	int horizontal, horizontal_value;
-	int vertical, vertical_value;
-	int center_x, center_y;
+	int32_t slide_direction;
+	int32_t horizontal, horizontal_value;
+	int32_t vertical, vertical_value;
+	int32_t center_x, center_y;
 
 	if (!l)
 		return;
@@ -162,10 +161,10 @@ void layer_draw_shadow(LayerSurface *l) {
 		return;
 	}
 
-	uint32_t width, height;
+	int32_t width, height;
 	layer_actual_size(l, &width, &height);
 
-	uint32_t delta = shadows_size;
+	int32_t delta = shadows_size;
 
 	/* we calculate where to clip the shadow */
 	struct wlr_box layer_box = {
@@ -201,8 +200,8 @@ void layer_draw_shadow(LayerSurface *l) {
 	wlr_scene_shadow_set_clipped_region(l->shadow, clipped_region);
 }
 
-void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
-									 int sy, void *data) {
+void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
+									 int32_t sx, int32_t sy, void *data) {
 	BufferData *buffer_data = (BufferData *)data;
 
 	struct wlr_scene_surface *scene_surface =
@@ -213,9 +212,8 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
 
 	struct wlr_surface *surface = scene_surface->surface;
 
-	unsigned int surface_width =
-		surface->current.width * buffer_data->width_scale;
-	unsigned int surface_height =
+	int32_t surface_width = surface->current.width * buffer_data->width_scale;
+	int32_t surface_height =
 		surface->current.height * buffer_data->height_scale;
 
 	if (surface_height > 0 && surface_width > 0) {
@@ -224,7 +222,8 @@ void layer_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer, int sx,
 }
 
 void layer_fadeout_scene_buffer_apply_effect(struct wlr_scene_buffer *buffer,
-											 int sx, int sy, void *data) {
+											 int32_t sx, int32_t sy,
+											 void *data) {
 	BufferData *buffer_data = (BufferData *)data;
 	wlr_scene_buffer_set_dest_size(buffer, buffer_data->width,
 								   buffer_data->height);
@@ -237,25 +236,23 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
+	int32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
 	double animation_passed =
 		l->animation.duration
 			? (double)passed_time / (double)l->animation.duration
 			: 1.0;
 
-	int type = l->animation.action = l->animation.action;
+	int32_t type = l->animation.action = l->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
-	unsigned int width =
-		l->animation.initial.width +
-		(l->current.width - l->animation.initial.width) * factor;
-	unsigned int height =
-		l->animation.initial.height +
-		(l->current.height - l->animation.initial.height) * factor;
+	int32_t width = l->animation.initial.width +
+					(l->current.width - l->animation.initial.width) * factor;
+	int32_t height = l->animation.initial.height +
+					 (l->current.height - l->animation.initial.height) * factor;
 
-	unsigned int x = l->animation.initial.x +
-					 (l->current.x - l->animation.initial.x) * factor;
-	unsigned int y = l->animation.initial.y +
-					 (l->current.y - l->animation.initial.y) * factor;
+	int32_t x = l->animation.initial.x +
+				(l->current.x - l->animation.initial.x) * factor;
+	int32_t y = l->animation.initial.y +
+				(l->current.y - l->animation.initial.y) * factor;
 
 	wlr_scene_node_set_position(&l->scene->node, x, y);
 
@@ -279,7 +276,13 @@ void fadeout_layer_animation_next_tick(LayerSurface *l) {
 		.height = height,
 	};
 
-	double opacity = MAX(fadeout_begin_opacity - animation_passed, 0.0f);
+	double opacity_eased_progress =
+		find_animation_curve_at(animation_passed, OPAFADEOUT);
+
+	double percent = fadeout_begin_opacity -
+					 (opacity_eased_progress * fadeout_begin_opacity);
+
+	double opacity = MAX(percent, 0.0f);
 
 	if (animation_fade_out)
 		wlr_scene_node_for_each_buffer(&l->scene->node,
@@ -301,30 +304,32 @@ void layer_animation_next_tick(LayerSurface *l) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
-	uint32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
+	int32_t passed_time = timespec_to_ms(&now) - l->animation.time_started;
 	double animation_passed =
 		l->animation.duration
 			? (double)passed_time / (double)l->animation.duration
 			: 1.0;
 
-	int type = l->animation.action == NONE ? MOVE : l->animation.action;
+	int32_t type = l->animation.action == NONE ? MOVE : l->animation.action;
 	double factor = find_animation_curve_at(animation_passed, type);
 
-	unsigned int width =
-		l->animation.initial.width +
-		(l->current.width - l->animation.initial.width) * factor;
-	unsigned int height =
-		l->animation.initial.height +
-		(l->current.height - l->animation.initial.height) * factor;
+	int32_t width = l->animation.initial.width +
+					(l->current.width - l->animation.initial.width) * factor;
+	int32_t height = l->animation.initial.height +
+					 (l->current.height - l->animation.initial.height) * factor;
 
-	unsigned int x = l->animation.initial.x +
-					 (l->current.x - l->animation.initial.x) * factor;
-	unsigned int y = l->animation.initial.y +
-					 (l->current.y - l->animation.initial.y) * factor;
+	int32_t x = l->animation.initial.x +
+				(l->current.x - l->animation.initial.x) * factor;
+	int32_t y = l->animation.initial.y +
+				(l->current.y - l->animation.initial.y) * factor;
 
-	double opacity = MIN(fadein_begin_opacity +
-							 animation_passed * (1.0 - fadein_begin_opacity),
-						 1.0f);
+	double opacity_eased_progress =
+		find_animation_curve_at(animation_passed, OPAFADEIN);
+
+	double opacity =
+		MIN(fadein_begin_opacity +
+				opacity_eased_progress * (1.0 - fadein_begin_opacity),
+			1.0f);
 
 	if (animation_fade_in)
 		wlr_scene_node_for_each_buffer(&l->scene->node,
@@ -461,7 +466,8 @@ void init_fadeout_layers(LayerSurface *l) {
 	wl_list_insert(&fadeout_layers, &fadeout_layer->fadeout_link);
 
 	// 请求刷新屏幕
-	wlr_output_schedule_frame(l->mon->wlr_output);
+	if (l->mon)
+		wlr_output_schedule_frame(l->mon->wlr_output);
 }
 
 void layer_set_pending_state(LayerSurface *l) {
@@ -544,7 +550,8 @@ void layer_commit(LayerSurface *l) {
 		l->animation.should_animate = false;
 	}
 	// 请求刷新屏幕
-	wlr_output_schedule_frame(l->mon->wlr_output);
+	if (l->mon)
+		wlr_output_schedule_frame(l->mon->wlr_output);
 }
 
 bool layer_draw_frame(LayerSurface *l) {

src/client/client.h

@@ -6,7 +6,7 @@
  */
 
 /* Leave these functions first; they're used in the others */
-static inline int client_is_x11(Client *c) {
+static inline int32_t client_is_x11(Client *c) {
 #ifdef XWAYLAND
 	return c->type == X11;
 #endif
@@ -21,14 +21,15 @@ static inline struct wlr_surface *client_surface(Client *c) {
 	return c->surface.xdg->surface;
 }
 
-static inline int toplevel_from_wlr_surface(struct wlr_surface *s, Client **pc,
-											LayerSurface **pl) {
+static inline int32_t toplevel_from_wlr_surface(struct wlr_surface *s,
+												Client **pc,
+												LayerSurface **pl) {
 	struct wlr_xdg_surface *xdg_surface, *tmp_xdg_surface;
 	struct wlr_surface *root_surface;
 	struct wlr_layer_surface_v1 *layer_surface;
 	Client *c = NULL;
 	LayerSurface *l = NULL;
-	int type = -1;
+	int32_t type = -1;
 #ifdef XWAYLAND
 	struct wlr_xwayland_surface *xsurface;
 #endif
@@ -88,7 +89,7 @@ end:
 
 /* The others */
 static inline void client_activate_surface(struct wlr_surface *s,
-										   int activated) {
+										   int32_t activated) {
 	struct wlr_xdg_toplevel *toplevel;
 #ifdef XWAYLAND
 	struct wlr_xwayland_surface *xsurface;
@@ -113,7 +114,7 @@ static inline const char *client_get_appid(Client *c) {
 											: "broken";
 }
 
-static inline int client_get_pid(Client *c) {
+static inline int32_t client_get_pid(Client *c) {
 	pid_t pid;
 #ifdef XWAYLAND
 	if (client_is_x11(c))
@@ -127,8 +128,8 @@ static inline void client_get_clip(Client *c, struct wlr_box *clip) {
 	*clip = (struct wlr_box){
 		.x = 0,
 		.y = 0,
-		.width = c->geom.width - c->bw,
-		.height = c->geom.height - c->bw,
+		.width = c->geom.width - 2 * c->bw,
+		.height = c->geom.height - 2 * c->bw,
 	};
 
 #ifdef XWAYLAND
@@ -153,20 +154,6 @@ 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
@@ -183,7 +170,7 @@ static inline Client *client_get_parent(Client *c) {
 	return p;
 }
 
-static inline int client_has_children(Client *c) {
+static inline int32_t client_has_children(Client *c) {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
 		return !wl_list_empty(&c->surface.xwayland->children);
@@ -203,7 +190,7 @@ static inline const char *client_get_title(Client *c) {
 										   : "broken";
 }
 
-static inline int client_is_float_type(Client *c) {
+static inline int32_t client_is_float_type(Client *c) {
 	struct wlr_xdg_toplevel *toplevel;
 	struct wlr_xdg_toplevel_state state;
 
@@ -243,12 +230,12 @@ static inline int client_is_float_type(Client *c) {
 								 state.min_height == state.max_height));
 }
 
-static inline int client_is_rendered_on_mon(Client *c, Monitor *m) {
+static inline int32_t client_is_rendered_on_mon(Client *c, Monitor *m) {
 	/* This is needed for when you don't want to check formal assignment,
 	 * but rather actual displaying of the pixels.
 	 * Usually VISIBLEON suffices and is also faster. */
 	struct wlr_surface_output *s;
-	int unused_lx, unused_ly;
+	int32_t unused_lx, unused_ly;
 	if (!wlr_scene_node_coords(&c->scene->node, &unused_lx, &unused_ly))
 		return 0;
 	wl_list_for_each(s, &client_surface(c)->current_outputs,
@@ -256,8 +243,8 @@ static inline int client_is_rendered_on_mon(Client *c, Monitor *m) {
 	return 0;
 }
 
-static inline int client_is_stopped(Client *c) {
-	int pid;
+static inline int32_t client_is_stopped(Client *c) {
+	int32_t pid;
 	siginfo_t in = {0};
 #ifdef XWAYLAND
 	if (client_is_x11(c))
@@ -281,7 +268,7 @@ static inline int client_is_stopped(Client *c) {
 	return 0;
 }
 
-static inline int client_is_unmanaged(Client *c) {
+static inline int32_t client_is_unmanaged(Client *c) {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
 		return c->surface.xwayland->override_redirect;
@@ -313,7 +300,7 @@ static inline void client_set_border_color(Client *c,
 	wlr_scene_rect_set_color(c->border, color);
 }
 
-static inline void client_set_fullscreen(Client *c, int fullscreen) {
+static inline void client_set_fullscreen(Client *c, int32_t fullscreen) {
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
 		wlr_xwayland_surface_set_fullscreen(c->surface.xwayland, fullscreen);
@@ -393,7 +380,7 @@ static inline void client_set_tiled(Client *c, uint32_t edges) {
 	}
 }
 
-static inline void client_set_suspended(Client *c, int suspended) {
+static inline void client_set_suspended(Client *c, int32_t suspended) {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
 		return;
@@ -402,7 +389,7 @@ static inline void client_set_suspended(Client *c, int suspended) {
 	wlr_xdg_toplevel_set_suspended(c->surface.xdg->toplevel, suspended);
 }
 
-static inline int client_should_ignore_focus(Client *c) {
+static inline int32_t client_should_ignore_focus(Client *c) {
 
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
@@ -417,7 +404,7 @@ static inline int client_should_ignore_focus(Client *c) {
 	return 0;
 }
 
-static inline int client_is_x11_popup(Client *c) {
+static inline int32_t client_is_x11_popup(Client *c) {
 
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
@@ -446,7 +433,7 @@ static inline int client_is_x11_popup(Client *c) {
 	return 0;
 }
 
-static inline int client_should_global(Client *c) {
+static inline int32_t client_should_global(Client *c) {
 
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
@@ -459,7 +446,7 @@ static inline int client_should_global(Client *c) {
 	return 0;
 }
 
-static inline int client_should_overtop(Client *c) {
+static inline int32_t client_should_overtop(Client *c) {
 
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
@@ -471,7 +458,7 @@ static inline int client_should_overtop(Client *c) {
 	return 0;
 }
 
-static inline int client_wants_focus(Client *c) {
+static inline int32_t client_wants_focus(Client *c) {
 #ifdef XWAYLAND
 	return client_is_unmanaged(c) &&
 		   wlr_xwayland_surface_override_redirect_wants_focus(
@@ -482,7 +469,7 @@ static inline int client_wants_focus(Client *c) {
 	return 0;
 }
 
-static inline int client_wants_fullscreen(Client *c) {
+static inline int32_t client_wants_fullscreen(Client *c) {
 #ifdef XWAYLAND
 	if (client_is_x11(c))
 		return c->surface.xwayland->fullscreen;
@@ -526,16 +513,16 @@ static inline void client_set_size_bound(Client *c) {
 		if (!size_hints)
 			return;
 
-		if ((unsigned int)c->geom.width - 2 * c->bw < size_hints->min_width &&
+		if ((uint32_t)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 ((unsigned int)c->geom.height - 2 * c->bw < size_hints->min_height &&
+		if ((uint32_t)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 ((unsigned int)c->geom.width - 2 * c->bw > size_hints->max_width &&
+		if ((uint32_t)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 ((unsigned int)c->geom.height - 2 * c->bw > size_hints->max_height &&
+		if ((uint32_t)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;
@@ -544,19 +531,19 @@ static inline void client_set_size_bound(Client *c) {
 
 	toplevel = c->surface.xdg->toplevel;
 	state = toplevel->current;
-	if ((unsigned int)c->geom.width - 2 * c->bw < state.min_width &&
+	if ((uint32_t)c->geom.width - 2 * c->bw < state.min_width &&
 		state.min_width > 0) {
 		c->geom.width = state.min_width + 2 * c->bw;
 	}
-	if ((unsigned int)c->geom.height - 2 * c->bw < state.min_height &&
+	if ((uint32_t)c->geom.height - 2 * c->bw < state.min_height &&
 		state.min_height > 0) {
 		c->geom.height = state.min_height + 2 * c->bw;
 	}
-	if ((unsigned int)c->geom.width - 2 * c->bw > state.max_width &&
+	if ((uint32_t)c->geom.width - 2 * c->bw > state.max_width &&
 		state.max_width > 0) {
 		c->geom.width = state.max_width + 2 * c->bw;
 	}
-	if ((unsigned int)c->geom.height - 2 * c->bw > state.max_height &&
+	if ((uint32_t)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

@@ -36,8 +36,8 @@ void *ecalloc(size_t nmemb, size_t size) {
 	return p;
 }
 
-int fd_set_nonblock(int fd) {
-	int flags = fcntl(fd, F_GETFL);
+int32_t fd_set_nonblock(int32_t fd) {
+	int32_t flags = fcntl(fd, F_GETFL);
 	if (flags < 0) {
 		perror("fcntl(F_GETFL):");
 		return -1;
@@ -50,8 +50,8 @@ int fd_set_nonblock(int fd) {
 	return 0;
 }
 
-int regex_match(const char *pattern, const char *str) {
-	int errnum;
+int32_t regex_match(const char *pattern, const char *str) {
+	int32_t errnum;
 	PCRE2_SIZE erroffset;
 
 	if (!pattern || !str) {
@@ -70,7 +70,7 @@ int regex_match(const char *pattern, const char *str) {
 
 	pcre2_match_data *match_data =
 		pcre2_match_data_create_from_pattern(re, NULL);
-	int ret =
+	int32_t ret =
 		pcre2_match(re, (PCRE2_SPTR)str, strlen(str), 0, 0, match_data, NULL);
 
 	pcre2_match_data_free(match_data);
@@ -82,14 +82,13 @@ void wl_list_append(struct wl_list *list, struct wl_list *object) {
 	wl_list_insert(list->prev, object);
 }
 
-unsigned int get_now_in_ms(void) {
+uint32_t get_now_in_ms(void) {
 	struct timespec now;
 	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	return timespec_to_ms(&now);
 }
 
-unsigned int timespec_to_ms(struct timespec *ts) {
-	return (unsigned int)ts->tv_sec * 1000 +
-		   (unsigned int)ts->tv_nsec / 1000000;
+uint32_t timespec_to_ms(struct timespec *ts) {
+	return (uint32_t)ts->tv_sec * 1000 + (uint32_t)ts->tv_nsec / 1000000;
 }

src/common/util.h

@@ -3,8 +3,8 @@
 
 void die(const char *fmt, ...);
 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);
+int32_t fd_set_nonblock(int32_t fd);
+int32_t regex_match(const char *pattern_mb, const char *str_mb);
 void wl_list_append(struct wl_list *list, struct wl_list *object);
-unsigned int get_now_in_ms(void);
-unsigned int timespec_to_ms(struct timespec *ts);
+uint32_t get_now_in_ms(void);
+uint32_t timespec_to_ms(struct timespec *ts);

src/config/preset.h

@@ -8,17 +8,17 @@
 	 ((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f}
 
 /* animaion */
-char *animation_type_open = "slide";		// 是否启用动画 //slide,zoom
-char *animation_type_close = "slide";		// 是否启用动画 //slide,zoom
-char *layer_animation_type_open = "slide";	// 是否启用layer动画 //slide,zoom
-char *layer_animation_type_close = "slide"; // 是否启用layer动画 //slide,zoom
-int animations = 1;							// 是否启用动画
-int layer_animations = 0;					// 是否启用layer动画
-int tag_animation_direction = HORIZONTAL;	// 标签动画方向
-int animation_fade_in = 1;					// Enable animation fade in
-int animation_fade_out = 1;					// Enable animation fade out
-float zoom_initial_ratio = 0.3;				// 动画起始窗口比例
-float zoom_end_ratio = 0.8;					// 动画结束窗口比例
+char *animation_type_open = "slide";		  // 是否启用动画 //slide,zoom
+char *animation_type_close = "slide";		  // 是否启用动画 //slide,zoom
+char *layer_animation_type_open = "slide";	  // 是否启用layer动画 //slide,zoom
+char *layer_animation_type_close = "slide";	  // 是否启用layer动画 //slide,zoom
+int32_t animations = 1;						  // 是否启用动画
+int32_t layer_animations = 0;				  // 是否启用layer动画
+int32_t tag_animation_direction = HORIZONTAL; // 标签动画方向
+int32_t animation_fade_in = 1;				  // Enable animation fade in
+int32_t animation_fade_out = 1;				  // Enable animation fade out
+float zoom_initial_ratio = 0.3;				  // 动画起始窗口比例
+float zoom_end_ratio = 0.8;					  // 动画结束窗口比例
 float fadein_begin_opacity = 0.5;  // Begin opac window ratio for animations
 float fadeout_begin_opacity = 0.5; // Begin opac window ratio for animations
 uint32_t animation_duration_move = 500;	 // Animation move speed
@@ -26,63 +26,65 @@ uint32_t animation_duration_open = 400;	 // Animation open speed
 uint32_t animation_duration_tag = 300;	 // Animation tag speed
 uint32_t animation_duration_close = 300; // Animation close speed
 uint32_t animation_duration_focus = 0;	 // Animation focus opacity speed
-double animation_curve_move[4] = {0.46, 1.0, 0.29, 0.99};  // 动画曲线
-double animation_curve_open[4] = {0.46, 1.0, 0.29, 0.99};  // 动画曲线
-double animation_curve_tag[4] = {0.46, 1.0, 0.29, 0.99};   // 动画曲线
-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}; // 动画曲线
+double animation_curve_move[4] = {0.46, 1.0, 0.29, 0.99};	   // 动画曲线
+double animation_curve_open[4] = {0.46, 1.0, 0.29, 0.99};	   // 动画曲线
+double animation_curve_tag[4] = {0.46, 1.0, 0.29, 0.99};	   // 动画曲线
+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};	   // 动画曲线
+double animation_curve_opafadein[4] = {0.46, 1.0, 0.29, 0.99}; // 动画曲线
+double animation_curve_opafadeout[4] = {0.5, 0.5, 0.5, 0.5};   // 动画曲线
 
 /* appearance */
-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 窗口比例
-unsigned int default_nmaster = 1;			// 默认master数量
-int center_master_overspread = 0;			// 中心master时是否铺满
-int center_when_single_stack = 1;			// 单个stack时是否居中
+uint32_t axis_bind_apply_timeout = 100; // 滚轮绑定动作的触发的时间间隔
+uint32_t focus_on_activate = 1;			// 收到窗口激活请求是否自动跳转聚焦
+uint32_t new_is_master = 1;				// 新窗口是否插在头部
+double default_mfact = 0.55f;			// master 窗口比例
+uint32_t default_nmaster = 1;			// 默认master数量
+int32_t center_master_overspread = 0;	// 中心master时是否铺满
+int32_t center_when_single_stack = 1;	// 单个stack时是否居中
 /* logging */
-int log_level = WLR_ERROR;
-unsigned int numlockon = 0; // 是否打开右边小键盘
-unsigned int capslock = 0;	// 是否启用快捷键
+int32_t log_level = WLR_ERROR;
+uint32_t numlockon = 0; // 是否打开右边小键盘
+uint32_t capslock = 0;	// 是否启用快捷键
 
-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 */
-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 */
+uint32_t ov_tab_mode = 0;	 // alt tab切换模式
+uint32_t hotarea_size = 10;	 // 热区大小,10x10
+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 */
+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 */
 float scratchpad_width_ratio = 0.8;
 float scratchpad_height_ratio = 0.9;
 
-int scroller_structs = 20;
+int32_t scroller_structs = 20;
 float scroller_default_proportion = 0.9;
 float scroller_default_proportion_single = 1.0;
-int scroller_ignore_proportion_single = 0;
-int scroller_focus_center = 0;
-int scroller_prefer_center = 0;
+int32_t scroller_ignore_proportion_single = 0;
+int32_t scroller_focus_center = 0;
+int32_t scroller_prefer_center = 0;
 float dual_scroller_default_split_ratio = 0.3;
-int focus_cross_monitor = 0;
-int focus_cross_tag = 0;
-int exchange_cross_monitor = 0;
-int scratchpad_cross_monitor = 0;
-int view_current_to_back = 1;
-int no_border_when_single = 0;
-int no_radius_when_single = 0;
-int snap_distance = 30;
-int enable_floating_snap = 0;
-int drag_tile_to_tile = 0;
-unsigned int cursor_size = 24;
-unsigned int cursor_hide_timeout = 0;
+int32_t focus_cross_monitor = 0;
+int32_t focus_cross_tag = 0;
+int32_t exchange_cross_monitor = 0;
+int32_t scratchpad_cross_monitor = 0;
+int32_t view_current_to_back = 0;
+int32_t no_border_when_single = 0;
+int32_t no_radius_when_single = 0;
+int32_t snap_distance = 30;
+int32_t enable_floating_snap = 0;
+int32_t drag_tile_to_tile = 0;
+uint32_t cursor_size = 24;
+uint32_t cursor_hide_timeout = 0;
 
-unsigned int swipe_min_threshold = 1;
+uint32_t swipe_min_threshold = 1;
 
-int inhibit_regardless_of_visibility =
+int32_t idleinhibit_ignore_visible =
 	0; /* 1 means idle inhibitors will disable idle tracking even if it's
 		  surface isn't visible  */
-unsigned int borderpx = 4; /* border pixel of windows */
+uint32_t borderpx = 4; /* border pixel of windows */
 float rootcolor[] = COLOR(0x323232ff);
 float bordercolor[] = COLOR(0x444444ff);
 float focuscolor[] = COLOR(0xc66b25ff);
@@ -93,21 +95,21 @@ float globalcolor[] = COLOR(0xb153a7ff);
 float overlaycolor[] = COLOR(0x14a57cff);
 // char *cursor_theme = "Bibata-Modern-Ice";
 
-int overviewgappi = 5;	/* overview时 窗口与边缘 缝隙大小 */
-int overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */
+int32_t overviewgappi = 5;	/* overview时 窗口与边缘 缝隙大小 */
+int32_t overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */
 
 /* To conform the xdg-protocol, set the alpha to zero to restore the old
  * behavior */
 float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0};
 
-int warpcursor = 1;			  /* Warp cursor to focused client */
-int xwayland_persistence = 1; /* xwayland persistence */
-int syncobj_enable = 0;
-int adaptive_sync = 0;
-int allow_lock_transparent = 0;
-double drag_refresh_interval = 30.0;
-int allow_tearing = TEARING_DISABLED;
-int allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
+int32_t warpcursor = 1;			  /* Warp cursor to focused client */
+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_refresh_interval = 16.0;
+int32_t allow_tearing = TEARING_DISABLED;
+int32_t allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE;
 
 /* keyboard */
 
@@ -144,21 +146,21 @@ struct xkb_rule_names xkb_rules = {
 	.options = xkb_rules_options,
 };
 
-int repeat_rate = 25;
-int repeat_delay = 600;
+int32_t repeat_rate = 25;
+int32_t repeat_delay = 600;
 
 /* Trackpad */
-int disable_trackpad = 0;
-int tap_to_click = 1;
-int tap_and_drag = 1;
-int drag_lock = 1;
-int mouse_natural_scrolling = 0;
-int trackpad_natural_scrolling = 0;
-int disable_while_typing = 1;
-int left_handed = 0;
-int middle_button_emulation = 0;
-int single_scratchpad = 1;
-int edge_scroller_pointer_focus = 1;
+int32_t disable_trackpad = 0;
+int32_t tap_to_click = 1;
+int32_t tap_and_drag = 1;
+int32_t drag_lock = 1;
+int32_t mouse_natural_scrolling = 0;
+int32_t trackpad_natural_scrolling = 0;
+int32_t disable_while_typing = 1;
+int32_t left_handed = 0;
+int32_t middle_button_emulation = 0;
+int32_t single_scratchpad = 1;
+int32_t edge_scroller_pointer_focus = 1;
 
 /* You can choose between:
 LIBINPUT_CONFIG_SCROLL_NO_SCROLL
@@ -167,7 +169,7 @@ LIBINPUT_CONFIG_SCROLL_EDGE
 LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
 */
 enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
-unsigned int scroll_button = 274;
+uint32_t scroll_button = 274;
 
 /* You can choose between:
 LIBINPUT_CONFIG_CLICK_METHOD_NONE
@@ -177,6 +179,8 @@ LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
 enum libinput_config_click_method click_method =
 	LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
 
+double axis_scroll_factor = 1.0;
+
 /* You can choose between:
 LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
 LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
@@ -207,27 +211,27 @@ static const char *tags[] = {
 float focused_opacity = 1.0;
 float unfocused_opacity = 1.0;
 
-int border_radius = 0;
-int border_radius_location_default = CORNER_LOCATION_ALL;
-int blur = 0;
-int blur_layer = 0;
-int blur_optimized = 1;
+int32_t border_radius = 0;
+int32_t border_radius_location_default = CORNER_LOCATION_ALL;
+int32_t blur = 0;
+int32_t blur_layer = 0;
+int32_t blur_optimized = 1;
 
 struct blur_data blur_params;
 
-int blur_params_num_passes = 1;
-int blur_params_radius = 5;
+int32_t blur_params_num_passes = 1;
+int32_t blur_params_radius = 5;
 float blur_params_noise = 0.02;
 float blur_params_brightness = 0.9;
 float blur_params_contrast = 0.9;
 float blur_params_saturation = 1.2;
 
-int shadows = 0;
-int shadow_only_floating = 1;
-int layer_shadows = 0;
-unsigned int shadows_size = 10;
+int32_t shadows = 0;
+int32_t shadow_only_floating = 1;
+int32_t layer_shadows = 0;
+uint32_t shadows_size = 10;
 double shadows_blur = 15;
-int shadows_position_x = 0;
-int shadows_position_y = 0;
+int32_t shadows_position_x = 0;
+int32_t shadows_position_y = 0;
 float shadowscolor[] = COLOR(0x000000ff);
 ;

src/dispatch/bind_declare.h

@@ -1,73 +1,73 @@
-int minimized(const Arg *arg);
-int restore_minimized(const Arg *arg);
-int toggle_scratchpad(const Arg *arg);
-int focusdir(const Arg *arg);
-int togglerow(const Arg *arg);
-int toggleoverview(const Arg *arg);
-int set_proportion(const Arg *arg);
-int switch_proportion_preset(const Arg *arg);
-int zoom(const Arg *arg);
-int tagsilent(const Arg *arg);
-int tagtoleft(const Arg *arg);
-int tagtoright(const Arg *arg);
-int tagcrossmon(const Arg *arg);
-int viewtoleft(const Arg *arg);
-int viewtoright(const Arg *arg);
-int viewtoleft_have_client(const Arg *arg);
-int viewtoright_have_client(const Arg *arg);
-int viewcrossmon(const Arg *arg);
-int togglefloating(const Arg *arg);
-int togglefullscreen(const Arg *arg);
-int togglemaximizescreen(const Arg *arg);
-int togglegaps(const Arg *arg);
-int tagmon(const Arg *arg);
-int spawn(const Arg *arg);
-int spawn_shell(const Arg *arg);
-int spawn_on_empty(const Arg *arg);
-int setkeymode(const Arg *arg);
-int switch_keyboard_layout(const Arg *arg);
-int setlayout(const Arg *arg);
-int switch_layout(const Arg *arg);
-int setmfact(const Arg *arg);
-int adjust_dual_scroller_split(const Arg *arg);
-int quit(const Arg *arg);
-int moveresize(const Arg *arg);
-int exchange_client(const Arg *arg);
-int exchange_stack_client(const Arg *arg);
-int killclient(const Arg *arg);
-int toggleglobal(const Arg *arg);
-int incnmaster(const Arg *arg);
-int focusmon(const Arg *arg);
-int focusstack(const Arg *arg);
-int chvt(const Arg *arg);
-int reload_config(const Arg *arg);
-int smartmovewin(const Arg *arg);
-int smartresizewin(const Arg *arg);
-int centerwin(const Arg *arg);
-int bind_to_view(const Arg *arg);
-int toggletag(const Arg *arg);
-int toggleview(const Arg *arg);
-int tag(const Arg *arg);
-int comboview(const Arg *arg);
-int incgaps(const Arg *arg);
-int incigaps(const Arg *arg);
-int incihgaps(const Arg *arg);
-int incivgaps(const Arg *arg);
-int incogaps(const Arg *arg);
-int incohgaps(const Arg *arg);
-int incovgaps(const Arg *arg);
-int defaultgaps(const Arg *arg);
-int togglefakefullscreen(const Arg *arg);
-int toggleoverlay(const Arg *arg);
-int movewin(const Arg *arg);
-int resizewin(const Arg *arg);
-int toggle_named_scratchpad(const Arg *arg);
-int toggle_render_border(const Arg *arg);
-int create_virtual_output(const Arg *arg);
-int destroy_all_virtual_output(const Arg *arg);
-int focuslast(const Arg *arg);
-int toggle_trackpad_enable(const Arg *arg);
-int setoption(const Arg *arg);
-int disable_monitor(const Arg *arg);
-int enable_monitor(const Arg *arg);
-int toggle_monitor(const Arg *arg);
+int32_t minimized(const Arg *arg);
+int32_t restore_minimized(const Arg *arg);
+int32_t toggle_scratchpad(const Arg *arg);
+int32_t focusdir(const Arg *arg);
+int32_t toggleoverview(const Arg *arg);
+int32_t set_proportion(const Arg *arg);
+int32_t switch_proportion_preset(const Arg *arg);
+int32_t zoom(const Arg *arg);
+int32_t tagsilent(const Arg *arg);
+int32_t tagtoleft(const Arg *arg);
+int32_t tagtoright(const Arg *arg);
+int32_t tagcrossmon(const Arg *arg);
+int32_t viewtoleft(const Arg *arg);
+int32_t viewtoright(const Arg *arg);
+int32_t viewtoleft_have_client(const Arg *arg);
+int32_t viewtoright_have_client(const Arg *arg);
+int32_t viewcrossmon(const Arg *arg);
+int32_t togglefloating(const Arg *arg);
+int32_t togglefullscreen(const Arg *arg);
+int32_t togglemaximizescreen(const Arg *arg);
+int32_t togglegaps(const Arg *arg);
+int32_t togglerow(const Arg *arg);
+int32_t tagmon(const Arg *arg);
+int32_t spawn(const Arg *arg);
+int32_t spawn_shell(const Arg *arg);
+int32_t spawn_on_empty(const Arg *arg);
+int32_t setkeymode(const Arg *arg);
+int32_t switch_keyboard_layout(const Arg *arg);
+int32_t setlayout(const Arg *arg);
+int32_t switch_layout(const Arg *arg);
+int32_t setmfact(const Arg *arg);
+int32_t adjust_dual_scroller_split(const Arg *arg);
+int32_t quit(const Arg *arg);
+int32_t moveresize(const Arg *arg);
+int32_t exchange_client(const Arg *arg);
+int32_t exchange_stack_client(const Arg *arg);
+int32_t killclient(const Arg *arg);
+int32_t toggleglobal(const Arg *arg);
+int32_t incnmaster(const Arg *arg);
+int32_t focusmon(const Arg *arg);
+int32_t focusstack(const Arg *arg);
+int32_t chvt(const Arg *arg);
+int32_t reload_config(const Arg *arg);
+int32_t smartmovewin(const Arg *arg);
+int32_t smartresizewin(const Arg *arg);
+int32_t centerwin(const Arg *arg);
+int32_t bind_to_view(const Arg *arg);
+int32_t toggletag(const Arg *arg);
+int32_t toggleview(const Arg *arg);
+int32_t tag(const Arg *arg);
+int32_t comboview(const Arg *arg);
+int32_t incgaps(const Arg *arg);
+int32_t incigaps(const Arg *arg);
+int32_t incihgaps(const Arg *arg);
+int32_t incivgaps(const Arg *arg);
+int32_t incogaps(const Arg *arg);
+int32_t incohgaps(const Arg *arg);
+int32_t incovgaps(const Arg *arg);
+int32_t defaultgaps(const Arg *arg);
+int32_t togglefakefullscreen(const Arg *arg);
+int32_t toggleoverlay(const Arg *arg);
+int32_t movewin(const Arg *arg);
+int32_t resizewin(const Arg *arg);
+int32_t toggle_named_scratchpad(const Arg *arg);
+int32_t toggle_render_border(const Arg *arg);
+int32_t create_virtual_output(const Arg *arg);
+int32_t destroy_all_virtual_output(const Arg *arg);
+int32_t focuslast(const Arg *arg);
+int32_t toggle_trackpad_enable(const Arg *arg);
+int32_t setoption(const Arg *arg);
+int32_t disable_monitor(const Arg *arg);
+int32_t enable_monitor(const Arg *arg);
+int32_t toggle_monitor(const Arg *arg);

src/dispatch/bind_define.h

@@ -1,6 +1,6 @@
-int bind_to_view(const Arg *arg) {
+int32_t bind_to_view(const Arg *arg) {
 
-	unsigned int target = arg->ui;
+	uint32_t target = arg->ui;
 
 	if (view_current_to_back && selmon->pertag->curtag &&
 		(target & TAGMASK) == (selmon->tagset[selmon->seltags])) {
@@ -15,14 +15,14 @@ int bind_to_view(const Arg *arg) {
 		return 0;
 	}
 
-	if ((int)target == INT_MIN && selmon->pertag->curtag == 0) {
+	if ((int32_t)target == INT_MIN && selmon->pertag->curtag == 0) {
 		if (view_current_to_back && selmon->pertag->prevtag)
 			target = 1 << (selmon->pertag->prevtag - 1);
 		else
 			target = 0;
 	}
 
-	if (target == 0 || (int)target == INT_MIN) {
+	if (target == 0 || (int32_t)target == INT_MIN) {
 		view(&(Arg){.ui = ~0 & TAGMASK, .i = arg->i}, false);
 	} else {
 		view(&(Arg){.ui = target, .i = arg->i}, true);
@@ -30,12 +30,33 @@ int bind_to_view(const Arg *arg) {
 	return 0;
 }
 
-int chvt(const Arg *arg) {
+int32_t chvt(const Arg *arg) {
+	struct timespec ts;
+
+	// prevent the animation to rquest the new frame
+	allow_frame_scheduling = false;
+
+	// backup current tag and monitor name
+	if (selmon) {
+		chvt_backup_tag = selmon->pertag->curtag;
+		strncpy(chvt_backup_selmon, selmon->wlr_output->name,
+				sizeof(chvt_backup_selmon) - 1);
+	}
+
 	wlr_session_change_vt(session, arg->ui);
-	return 0;
+
+	// wait for DRM device to stabilize and ensure the session state is inactive
+	ts.tv_sec = 0;
+	ts.tv_nsec = 100000000; // 200ms
+	nanosleep(&ts, NULL);
+
+	// allow frame scheduling,
+	// because session state is now inactive, rendermon will not enter
+	allow_frame_scheduling = true;
+	return 1;
 }
 
-int create_virtual_output(const Arg *arg) {
+int32_t create_virtual_output(const Arg *arg) {
 
 	if (!wlr_backend_is_multi(backend)) {
 		wlr_log(WLR_ERROR, "Expected a multi backend");
@@ -54,7 +75,7 @@ int create_virtual_output(const Arg *arg) {
 	return 0;
 }
 
-int destroy_all_virtual_output(const Arg *arg) {
+int32_t destroy_all_virtual_output(const Arg *arg) {
 
 	if (!wlr_backend_is_multi(backend)) {
 		wlr_log(WLR_ERROR, "Expected a multi backend");
@@ -73,12 +94,12 @@ int destroy_all_virtual_output(const Arg *arg) {
 	return 0;
 }
 
-int defaultgaps(const Arg *arg) {
+int32_t defaultgaps(const Arg *arg) {
 	setgaps(gappoh, gappov, gappih, gappiv);
 	return 0;
 }
 
-int exchange_client(const Arg *arg) {
+int32_t exchange_client(const Arg *arg) {
 	Client *c = selmon->sel;
 	if (!c || c->isfloating)
 		return 0;
@@ -90,7 +111,7 @@ int exchange_client(const Arg *arg) {
 	return 0;
 }
 
-int exchange_stack_client(const Arg *arg) {
+int32_t exchange_stack_client(const Arg *arg) {
 	Client *c = selmon->sel;
 	Client *tc = NULL;
 	if (!c || c->isfloating || c->isfullscreen || c->ismaximizescreen)
@@ -105,7 +126,7 @@ int exchange_stack_client(const Arg *arg) {
 	return 0;
 }
 
-int focusdir(const Arg *arg) {
+int32_t focusdir(const Arg *arg) {
 	Client *c = NULL;
 	c = direction_select(arg);
 	if (c) {
@@ -125,7 +146,7 @@ int focusdir(const Arg *arg) {
 	return 0;
 }
 
-int togglerow(const Arg *arg) {
+int32_t togglerow(const Arg *arg) {
 	// Toggle between top and bottom row in dual-scroller layout
 	if (!selmon || !selmon->sel || !is_row_layout(selmon))
 		return 0;
@@ -144,16 +165,16 @@ int togglerow(const Arg *arg) {
 	}
 
 	// Trigger a relayout
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int focuslast(const Arg *arg) {
+int32_t focuslast(const Arg *arg) {
 
 	Client *c = NULL;
 	Client *tc = NULL;
 	bool begin = false;
-	unsigned int target = 0;
+	uint32_t target = 0;
 
 	wl_list_for_each(c, &fstack, flink) {
 		if (c->iskilling || c->isminimized || c->isunglobal ||
@@ -180,7 +201,7 @@ int focuslast(const Arg *arg) {
 	if (!tc || !client_surface(tc)->mapped)
 		return 0;
 
-	if ((int)tc->tags > 0) {
+	if ((int32_t)tc->tags > 0) {
 		focusclient(tc, 1);
 		target = get_tags_first_tag(tc->tags);
 		view(&(Arg){.ui = target}, true);
@@ -188,23 +209,25 @@ int focuslast(const Arg *arg) {
 	return 0;
 }
 
-int toggle_trackpad_enable(const Arg *arg) {
+int32_t toggle_trackpad_enable(const Arg *arg) {
 	disable_trackpad = !disable_trackpad;
 	return 0;
 }
 
-int focusmon(const Arg *arg) {
-	Client *c = NULL, *old_selmon_sel = NULL;
+int32_t focusmon(const Arg *arg) {
+	Client *c = NULL;
 	Monitor *m = NULL;
+	Monitor *tm = NULL;
 
 	if (arg->i != UNDIR) {
-		m = dirtomon(arg->i);
+		tm = dirtomon(arg->i);
 	} else if (arg->v) {
 		wl_list_for_each(m, &mons, link) {
 			if (!m->wlr_output->enabled) {
 				continue;
 			}
 			if (regex_match(arg->v, m->wlr_output->name)) {
+				tm = m;
 				break;
 			}
 		}
@@ -212,11 +235,10 @@ int focusmon(const Arg *arg) {
 		return 0;
 	}
 
-	if (!m || !m->wlr_output->enabled || m == selmon)
+	if (!tm || !tm->wlr_output->enabled || tm == selmon)
 		return 0;
 
-	old_selmon_sel = selmon->sel;
-	selmon = m;
+	selmon = tm;
 	if (warpcursor) {
 		warp_cursor_to_selmon(selmon);
 	}
@@ -225,16 +247,14 @@ 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;
 }
 
-int focusstack(const Arg *arg) {
+int32_t focusstack(const Arg *arg) {
 	/* Focus the next or previous client (in tiling order) on selmon */
 	Client *sel = focustop(selmon);
 	Client *tc = NULL;
@@ -257,58 +277,58 @@ int focusstack(const Arg *arg) {
 	return 0;
 }
 
-int incnmaster(const Arg *arg) {
+int32_t incnmaster(const Arg *arg) {
 	if (!arg || !selmon)
 		return 0;
 	selmon->pertag->nmasters[selmon->pertag->curtag] =
 		MAX(selmon->pertag->nmasters[selmon->pertag->curtag] + arg->i, 0);
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int incgaps(const Arg *arg) {
+int32_t incgaps(const Arg *arg) {
 	setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
 			selmon->gappih + arg->i, selmon->gappiv + arg->i);
 	return 0;
 }
 
-int incigaps(const Arg *arg) {
+int32_t incigaps(const Arg *arg) {
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
 			selmon->gappiv + arg->i);
 	return 0;
 }
 
-int incogaps(const Arg *arg) {
+int32_t incogaps(const Arg *arg) {
 	setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
 			selmon->gappiv);
 	return 0;
 }
 
-int incihgaps(const Arg *arg) {
+int32_t incihgaps(const Arg *arg) {
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
 			selmon->gappiv);
 	return 0;
 }
 
-int incivgaps(const Arg *arg) {
+int32_t incivgaps(const Arg *arg) {
 	setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
 			selmon->gappiv + arg->i);
 	return 0;
 }
 
-int incohgaps(const Arg *arg) {
+int32_t incohgaps(const Arg *arg) {
 	setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
 			selmon->gappiv);
 	return 0;
 }
 
-int incovgaps(const Arg *arg) {
+int32_t incovgaps(const Arg *arg) {
 	setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
 			selmon->gappiv);
 	return 0;
 }
 
-int setmfact(const Arg *arg) {
+int32_t setmfact(const Arg *arg) {
 	float f;
 	Client *c = NULL;
 
@@ -326,11 +346,11 @@ int setmfact(const Arg *arg) {
 			c->master_mfact_per = f;
 		}
 	}
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int adjust_dual_scroller_split(const Arg *arg) {
+int32_t adjust_dual_scroller_split(const Arg *arg) {
 	float new_ratio;
 
 	if (!arg || !selmon)
@@ -348,11 +368,11 @@ int adjust_dual_scroller_split(const Arg *arg) {
 		return 0;
 
 	dual_scroller_default_split_ratio = new_ratio;
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int killclient(const Arg *arg) {
+int32_t killclient(const Arg *arg) {
 	Client *c = NULL;
 	c = selmon->sel;
 	if (c) {
@@ -361,7 +381,7 @@ int killclient(const Arg *arg) {
 	return 0;
 }
 
-int moveresize(const Arg *arg) {
+int32_t moveresize(const Arg *arg) {
 	if (cursor_mode != CurNormal && cursor_mode != CurPressed)
 		return 0;
 	xytonode(cursor->x, cursor->y, NULL, &grabc, NULL, NULL, NULL);
@@ -399,7 +419,7 @@ int moveresize(const Arg *arg) {
 	return 0;
 }
 
-int movewin(const Arg *arg) {
+int32_t movewin(const Arg *arg) {
 	Client *c = NULL;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
@@ -437,15 +457,15 @@ int movewin(const Arg *arg) {
 	return 0;
 }
 
-int quit(const Arg *arg) {
+int32_t quit(const Arg *arg) {
 	wl_display_terminate(dpy);
 	return 0;
 }
 
-int resizewin(const Arg *arg) {
+int32_t resizewin(const Arg *arg) {
 	Client *c = NULL;
 	c = selmon->sel;
-	int offsetx = 0, offsety = 0;
+	int32_t offsetx = 0, offsety = 0;
 
 	if (!c || c->isfullscreen || c->ismaximizescreen)
 		return 0;
@@ -508,7 +528,7 @@ int resizewin(const Arg *arg) {
 	return 0;
 }
 
-int restore_minimized(const Arg *arg) {
+int32_t restore_minimized(const Arg *arg) {
 	Client *c = NULL;
 
 	if (selmon && selmon->isoverview)
@@ -531,7 +551,7 @@ int restore_minimized(const Arg *arg) {
 			c->isnamedscratchpad = 0;
 			show_hide_client(c);
 			setborder_color(c);
-			arrange(c->mon, false);
+			arrange(c->mon, false, false);
 			focusclient(c, 0);
 			warp_cursor(c);
 			return 0;
@@ -540,14 +560,14 @@ int restore_minimized(const Arg *arg) {
 	return 0;
 }
 
-int setlayout(const Arg *arg) {
-	int jk;
+int32_t setlayout(const Arg *arg) {
+	int32_t jk;
 
 	for (jk = 0; jk < LENGTH(layouts); jk++) {
 		if (strcmp(layouts[jk].name, arg->v) == 0) {
 			selmon->pertag->ltidxs[selmon->pertag->curtag] = &layouts[jk];
 			clear_fullscreen_and_maximized_state(selmon);
-			arrange(selmon, false);
+			arrange(selmon, false, false);
 			printstatus();
 			return 0;
 		}
@@ -555,7 +575,7 @@ int setlayout(const Arg *arg) {
 	return 0;
 }
 
-int setkeymode(const Arg *arg) {
+int32_t setkeymode(const Arg *arg) {
 	snprintf(keymode.mode, sizeof(keymode.mode), "%.27s", arg->v);
 	if (strcmp(keymode.mode, "default") == 0) {
 		keymode.isdefault = true;
@@ -566,7 +586,7 @@ int setkeymode(const Arg *arg) {
 	return 1;
 }
 
-int set_proportion(const Arg *arg) {
+int32_t set_proportion(const Arg *arg) {
 
 	if (selmon->isoverview || !is_scroller_layout(selmon))
 		return 0;
@@ -576,20 +596,20 @@ int set_proportion(const Arg *arg) {
 		return 0;
 
 	if (selmon->sel) {
-		unsigned int max_client_width =
+		uint32_t 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;
 		// resize(selmon->sel, selmon->sel->geom, 0);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	}
 	return 0;
 }
 
-int smartmovewin(const Arg *arg) {
+int32_t smartmovewin(const Arg *arg) {
 	Client *c = NULL, *tc = NULL;
-	int nx, ny;
-	int buttom, top, left, right, tar;
+	int32_t nx, ny;
+	int32_t buttom, top, left, right, tar;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
 		return 0;
@@ -687,10 +707,10 @@ int smartmovewin(const Arg *arg) {
 	return 0;
 }
 
-int smartresizewin(const Arg *arg) {
+int32_t smartresizewin(const Arg *arg) {
 	Client *c = NULL, *tc = NULL;
-	int nw, nh;
-	int buttom, top, left, right, tar;
+	int32_t nw, nh;
+	int32_t buttom, top, left, right, tar;
 	c = selmon->sel;
 	if (!c || c->isfullscreen)
 		return 0;
@@ -757,22 +777,34 @@ int smartresizewin(const Arg *arg) {
 	return 0;
 }
 
-int centerwin(const Arg *arg) {
+int32_t centerwin(const Arg *arg) {
 	Client *c = NULL;
 	c = selmon->sel;
 
-	if (!c || c->isfullscreen)
+	if (!c || c->isfullscreen || c->ismaximizescreen)
 		return 0;
-	if (!c->isfloating)
-		setfloating(c, true);
 
-	c->float_geom = setclient_coordinate_center(c, c->geom, 0, 0);
-	c->iscustomsize = 1;
-	resize(c, c->float_geom, 1);
+	if (c->isfloating) {
+		c->float_geom = setclient_coordinate_center(c, c->mon, 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, false);
 	return 0;
 }
 
-int spawn_shell(const Arg *arg) {
+int32_t spawn_shell(const Arg *arg) {
 	if (!arg->v)
 		return 0;
 
@@ -799,7 +831,7 @@ int spawn_shell(const Arg *arg) {
 	return 0;
 }
 
-int spawn(const Arg *arg) {
+int32_t spawn(const Arg *arg) {
 
 	if (!arg->v)
 		return 0;
@@ -815,7 +847,7 @@ int spawn(const Arg *arg) {
 
 		// 2. 解析参数
 		char *argv[64];
-		int argc = 0;
+		int32_t argc = 0;
 		char *token = strtok((char *)arg->v, " ");
 		while (token != NULL && argc < 63) {
 			wordexp_t p;
@@ -839,7 +871,7 @@ int spawn(const Arg *arg) {
 	return 0;
 }
 
-int spawn_on_empty(const Arg *arg) {
+int32_t spawn_on_empty(const Arg *arg) {
 	bool is_empty = true;
 	Client *c = NULL;
 
@@ -859,7 +891,7 @@ int spawn_on_empty(const Arg *arg) {
 	return 0;
 }
 
-int switch_keyboard_layout(const Arg *arg) {
+int32_t switch_keyboard_layout(const Arg *arg) {
 	if (!kb_group || !kb_group->wlr_group || !seat) {
 		wlr_log(WLR_ERROR, "Invalid keyboard group or seat");
 		return 0;
@@ -874,7 +906,7 @@ int switch_keyboard_layout(const Arg *arg) {
 	// 1. 获取当前布局和计算下一个布局
 	xkb_layout_index_t current = xkb_state_serialize_layout(
 		keyboard->xkb_state, XKB_STATE_LAYOUT_EFFECTIVE);
-	const int num_layouts = xkb_keymap_num_layouts(keyboard->keymap);
+	const int32_t num_layouts = xkb_keymap_num_layouts(keyboard->keymap);
 	if (num_layouts < 2) {
 		wlr_log(WLR_INFO, "Only one layout available");
 		return 0;
@@ -882,9 +914,9 @@ int switch_keyboard_layout(const Arg *arg) {
 	xkb_layout_index_t next = (current + 1) % num_layouts;
 
 	// 6. 应用新 keymap
-	unsigned int depressed = keyboard->modifiers.depressed;
-	unsigned int latched = keyboard->modifiers.latched;
-	unsigned int locked = keyboard->modifiers.locked;
+	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);
@@ -915,11 +947,11 @@ int switch_keyboard_layout(const Arg *arg) {
 	return 0;
 }
 
-int switch_layout(const Arg *arg) {
+int32_t switch_layout(const Arg *arg) {
 
-	int jk, ji;
+	int32_t jk, ji;
 	char *target_layout_name = NULL;
-	unsigned int len;
+	uint32_t len;
 
 	if (config.circle_layout_count != 0) {
 		for (jk = 0; jk < config.circle_layout_count; jk++) {
@@ -951,7 +983,7 @@ int switch_layout(const Arg *arg) {
 			}
 		}
 		clear_fullscreen_and_maximized_state(selmon);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 		printstatus();
 		return 0;
 	}
@@ -962,7 +994,7 @@ int switch_layout(const Arg *arg) {
 			selmon->pertag->ltidxs[selmon->pertag->curtag] =
 				jk == LENGTH(layouts) - 1 ? &layouts[0] : &layouts[jk + 1];
 			clear_fullscreen_and_maximized_state(selmon);
-			arrange(selmon, false);
+			arrange(selmon, false, false);
 			printstatus();
 			return 0;
 		}
@@ -970,7 +1002,7 @@ int switch_layout(const Arg *arg) {
 	return 0;
 }
 
-int switch_proportion_preset(const Arg *arg) {
+int32_t switch_proportion_preset(const Arg *arg) {
 	float target_proportion = 0;
 
 	if (config.scroller_proportion_preset_count == 0) {
@@ -986,7 +1018,7 @@ int switch_proportion_preset(const Arg *arg) {
 
 	if (selmon->sel) {
 
-		for (int i = 0; i < config.scroller_proportion_preset_count; i++) {
+		for (int32_t i = 0; i < config.scroller_proportion_preset_count; i++) {
 			if (config.scroller_proportion_preset[i] ==
 				selmon->sel->scroller_proportion) {
 				if (i == config.scroller_proportion_preset_count - 1) {
@@ -1004,23 +1036,23 @@ int switch_proportion_preset(const Arg *arg) {
 			target_proportion = config.scroller_proportion_preset[0];
 		}
 
-		unsigned int max_client_width =
+		uint32_t 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;
 		// resize(selmon->sel, selmon->sel->geom, 0);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	}
 	return 0;
 }
 
-int tag(const Arg *arg) {
+int32_t tag(const Arg *arg) {
 	Client *target_client = selmon->sel;
 	tag_client(arg, target_client);
 	return 0;
 }
 
-int tagmon(const Arg *arg) {
+int32_t tagmon(const Arg *arg) {
 	Monitor *m = NULL, *cm = NULL;
 	Client *c = focustop(selmon);
 
@@ -1046,8 +1078,8 @@ int tagmon(const Arg *arg) {
 	if (!m || !m->wlr_output->enabled)
 		return 0;
 
-	unsigned int newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0;
-	unsigned int target;
+	uint32_t newtags = arg->ui ? arg->ui : arg->i2 ? c->tags : 0;
+	uint32_t target;
 
 	if (c->mon == m) {
 		view(&(Arg){.ui = newtags}, true);
@@ -1064,11 +1096,11 @@ int tagmon(const Arg *arg) {
 	reset_foreign_tolevel(c);
 
 	c->float_geom.width =
-		(int)(c->float_geom.width * c->mon->w.width / selmon->w.width);
+		(int32_t)(c->float_geom.width * c->mon->w.width / selmon->w.width);
 	c->float_geom.height =
-		(int)(c->float_geom.height * c->mon->w.height / selmon->w.height);
+		(int32_t)(c->float_geom.height * c->mon->w.height / selmon->w.height);
 	selmon = c->mon;
-	c->float_geom = setclient_coordinate_center(c, c->float_geom, 0, 0);
+	c->float_geom = setclient_coordinate_center(c, c->mon, c->float_geom, 0, 0);
 
 	// 重新计算居中的坐标
 	// 重新计算居中的坐标
@@ -1083,7 +1115,7 @@ int tagmon(const Arg *arg) {
 		target = get_tags_first_tag(c->tags);
 		view(&(Arg){.ui = target}, true);
 		focusclient(c, 1);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	}
 	if (warpcursor) {
 		warp_cursor_to_selmon(c->mon);
@@ -1091,7 +1123,7 @@ int tagmon(const Arg *arg) {
 	return 0;
 }
 
-int tagsilent(const Arg *arg) {
+int32_t tagsilent(const Arg *arg) {
 	Client *fc = NULL;
 	Client *target_client = NULL;
 
@@ -1107,11 +1139,11 @@ int tagsilent(const Arg *arg) {
 		}
 	}
 	focusclient(focustop(selmon), 1);
-	arrange(target_client->mon, false);
+	arrange(target_client->mon, false, false);
 	return 0;
 }
 
-int tagtoleft(const Arg *arg) {
+int32_t tagtoleft(const Arg *arg) {
 	if (selmon->sel != NULL &&
 		__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
 		selmon->tagset[selmon->seltags] > 1) {
@@ -1120,7 +1152,7 @@ int tagtoleft(const Arg *arg) {
 	return 0;
 }
 
-int tagtoright(const Arg *arg) {
+int32_t tagtoright(const Arg *arg) {
 	if (selmon->sel != NULL &&
 		__builtin_popcount(selmon->tagset[selmon->seltags] & TAGMASK) == 1 &&
 		selmon->tagset[selmon->seltags] & (TAGMASK >> 1)) {
@@ -1129,7 +1161,7 @@ int tagtoright(const Arg *arg) {
 	return 0;
 }
 
-int toggle_named_scratchpad(const Arg *arg) {
+int32_t toggle_named_scratchpad(const Arg *arg) {
 	Client *target_client = NULL;
 	char *arg_id = arg->v;
 	char *arg_title = arg->v2;
@@ -1148,13 +1180,13 @@ int toggle_named_scratchpad(const Arg *arg) {
 	return 0;
 }
 
-int toggle_render_border(const Arg *arg) {
+int32_t toggle_render_border(const Arg *arg) {
 	render_border = !render_border;
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int toggle_scratchpad(const Arg *arg) {
+int32_t toggle_scratchpad(const Arg *arg) {
 	Client *c = NULL;
 	bool hit = false;
 	Client *tmp = NULL;
@@ -1183,14 +1215,14 @@ int toggle_scratchpad(const Arg *arg) {
 	return 0;
 }
 
-int togglefakefullscreen(const Arg *arg) {
+int32_t togglefakefullscreen(const Arg *arg) {
 	Client *sel = focustop(selmon);
 	if (sel)
 		setfakefullscreen(sel, !sel->isfakefullscreen);
 	return 0;
 }
 
-int togglefloating(const Arg *arg) {
+int32_t togglefloating(const Arg *arg) {
 	Client *sel = focustop(selmon);
 
 	if (selmon && selmon->isoverview)
@@ -1209,7 +1241,7 @@ int togglefloating(const Arg *arg) {
 	return 0;
 }
 
-int togglefullscreen(const Arg *arg) {
+int32_t togglefullscreen(const Arg *arg) {
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
@@ -1225,7 +1257,7 @@ int togglefullscreen(const Arg *arg) {
 	return 0;
 }
 
-int toggleglobal(const Arg *arg) {
+int32_t toggleglobal(const Arg *arg) {
 	if (!selmon->sel)
 		return 0;
 	if (selmon->sel->is_in_scratchpad) {
@@ -1241,13 +1273,13 @@ int toggleglobal(const Arg *arg) {
 	return 0;
 }
 
-int togglegaps(const Arg *arg) {
+int32_t togglegaps(const Arg *arg) {
 	enablegaps ^= 1;
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int togglemaximizescreen(const Arg *arg) {
+int32_t togglemaximizescreen(const Arg *arg) {
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
@@ -1265,7 +1297,7 @@ int togglemaximizescreen(const Arg *arg) {
 	return 0;
 }
 
-int toggleoverlay(const Arg *arg) {
+int32_t toggleoverlay(const Arg *arg) {
 	if (!selmon->sel || !selmon->sel->mon || selmon->sel->isfullscreen) {
 		return 0;
 	}
@@ -1286,15 +1318,15 @@ int toggleoverlay(const Arg *arg) {
 	return 0;
 }
 
-int toggletag(const Arg *arg) {
-	unsigned int newtags;
+int32_t toggletag(const Arg *arg) {
+	uint32_t newtags;
 	Client *sel = focustop(selmon);
 	if (!sel)
 		return 0;
 
-	if ((int)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) {
+	if ((int32_t)arg->ui == INT_MIN && sel->tags != (~0 & TAGMASK)) {
 		newtags = ~0 & TAGMASK;
-	} else if ((int)arg->ui == INT_MIN && sel->tags == (~0 & TAGMASK)) {
+	} else if ((int32_t)arg->ui == INT_MIN && sel->tags == (~0 & TAGMASK)) {
 		newtags = 1 << (sel->mon->pertag->curtag - 1);
 	} else {
 		newtags = sel->tags ^ (arg->ui & TAGMASK);
@@ -1303,15 +1335,15 @@ int toggletag(const Arg *arg) {
 	if (newtags) {
 		sel->tags = newtags;
 		focusclient(focustop(selmon), 1);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	}
 	printstatus();
 	return 0;
 }
 
-int toggleview(const Arg *arg) {
-	unsigned int newtagset;
-	unsigned int target;
+int32_t toggleview(const Arg *arg) {
+	uint32_t newtagset;
+	uint32_t target;
 
 	target = arg->ui == 0 ? ~0 & TAGMASK : arg->ui;
 
@@ -1321,14 +1353,14 @@ int toggleview(const Arg *arg) {
 	if (newtagset) {
 		selmon->tagset[selmon->seltags] = newtagset;
 		focusclient(focustop(selmon), 1);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	}
 	printstatus();
 	return 0;
 }
 
-int viewtoleft(const Arg *arg) {
-	unsigned int target = selmon->tagset[selmon->seltags];
+int32_t viewtoleft(const Arg *arg) {
+	uint32_t target = selmon->tagset[selmon->seltags];
 
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
 		return 0;
@@ -1347,11 +1379,11 @@ int viewtoleft(const Arg *arg) {
 	return 0;
 }
 
-int viewtoright(const Arg *arg) {
+int32_t viewtoright(const Arg *arg) {
 	if (selmon->isoverview || selmon->pertag->curtag == 0) {
 		return 0;
 	}
-	unsigned int target = selmon->tagset[selmon->seltags];
+	uint32_t target = selmon->tagset[selmon->seltags];
 	target <<= 1;
 
 	if (!selmon || (target) == selmon->tagset[selmon->seltags])
@@ -1364,10 +1396,9 @@ int viewtoright(const Arg *arg) {
 	return 0;
 }
 
-int viewtoleft_have_client(const Arg *arg) {
-	unsigned int n;
-	unsigned int current =
-		get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
+int32_t viewtoleft_have_client(const Arg *arg) {
+	uint32_t n;
+	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
 
 	if (selmon->isoverview) {
@@ -1389,10 +1420,9 @@ int viewtoleft_have_client(const Arg *arg) {
 	return 0;
 }
 
-int viewtoright_have_client(const Arg *arg) {
-	unsigned int n;
-	unsigned int current =
-		get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
+int32_t viewtoright_have_client(const Arg *arg) {
+	uint32_t n;
+	uint32_t current = get_tags_first_tag_num(selmon->tagset[selmon->seltags]);
 	bool found = false;
 
 	if (selmon->isoverview) {
@@ -1414,13 +1444,13 @@ int viewtoright_have_client(const Arg *arg) {
 	return 0;
 }
 
-int viewcrossmon(const Arg *arg) {
+int32_t viewcrossmon(const Arg *arg) {
 	focusmon(&(Arg){.v = arg->v, .i = UNDIR});
 	view_in_mon(arg, true, selmon, true);
 	return 0;
 }
 
-int tagcrossmon(const Arg *arg) {
+int32_t tagcrossmon(const Arg *arg) {
 	if (!selmon->sel)
 		return 0;
 
@@ -1428,8 +1458,8 @@ int tagcrossmon(const Arg *arg) {
 	return 0;
 }
 
-int comboview(const Arg *arg) {
-	unsigned int newtags = arg->ui & TAGMASK;
+int32_t comboview(const Arg *arg) {
+	uint32_t newtags = arg->ui & TAGMASK;
 
 	if (!newtags || !selmon)
 		return 0;
@@ -1437,7 +1467,7 @@ int comboview(const Arg *arg) {
 	if (tag_combo) {
 		selmon->tagset[selmon->seltags] |= newtags;
 		focusclient(focustop(selmon), 1);
-		arrange(selmon, false);
+		arrange(selmon, false, false);
 	} else {
 		tag_combo = true;
 		view(&(Arg){.ui = newtags}, false);
@@ -1447,7 +1477,7 @@ int comboview(const Arg *arg) {
 	return 0;
 }
 
-int zoom(const Arg *arg) {
+int32_t zoom(const Arg *arg) {
 	Client *c = NULL, *sel = focustop(selmon);
 
 	if (!sel || !selmon ||
@@ -1476,18 +1506,18 @@ int zoom(const Arg *arg) {
 	wl_list_insert(&clients, &sel->link);
 
 	focusclient(sel, 1);
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	return 0;
 }
 
-int setoption(const Arg *arg) {
+int32_t setoption(const Arg *arg) {
 	parse_option(&config, arg->v, arg->v2);
 	override_config();
 	reset_option();
 	return 0;
 }
 
-int minimized(const Arg *arg) {
+int32_t minimized(const Arg *arg) {
 
 	if (selmon && selmon->isoverview)
 		return 0;
@@ -1498,7 +1528,7 @@ int minimized(const Arg *arg) {
 	return 0;
 }
 
-int toggleoverview(const Arg *arg) {
+int32_t toggleoverview(const Arg *arg) {
 	Client *c = NULL;
 
 	if (selmon->isoverview && ov_tab_mode && arg->i != 1 && selmon->sel) {
@@ -1507,8 +1537,8 @@ int toggleoverview(const Arg *arg) {
 	}
 
 	selmon->isoverview ^= 1;
-	unsigned int target;
-	unsigned int visible_client_number = 0;
+	uint32_t target;
+	uint32_t visible_client_number = 0;
 
 	if (selmon->isoverview) {
 		wl_list_for_each(c, &clients, link) if (c && c->mon == selmon &&
@@ -1556,7 +1586,7 @@ int toggleoverview(const Arg *arg) {
 	return 0;
 }
 
-int disable_monitor(const Arg *arg) {
+int32_t disable_monitor(const Arg *arg) {
 	Monitor *m = NULL;
 	struct wlr_output_state state = {0};
 	wl_list_for_each(m, &mons, link) {
@@ -1571,7 +1601,7 @@ int disable_monitor(const Arg *arg) {
 	return 0;
 }
 
-int enable_monitor(const Arg *arg) {
+int32_t enable_monitor(const Arg *arg) {
 	Monitor *m = NULL;
 	struct wlr_output_state state = {0};
 	wl_list_for_each(m, &mons, link) {
@@ -1586,7 +1616,7 @@ int enable_monitor(const Arg *arg) {
 	return 0;
 }
 
-int toggle_monitor(const Arg *arg) {
+int32_t toggle_monitor(const Arg *arg) {
 	Monitor *m = NULL;
 	struct wlr_output_state state = {0};
 	wl_list_for_each(m, &mons, link) {
@@ -1599,4 +1629,4 @@ int toggle_monitor(const Arg *arg) {
 		}
 	}
 	return 0;
-}
+}

src/ext-protocol/dwl-ipc.h

@@ -1,12 +1,11 @@
 #include "dwl-ipc-unstable-v2-protocol.h"
 
 static void dwl_ipc_manager_bind(struct wl_client *client, void *data,
-								 unsigned int version, unsigned int id);
+								 uint32_t version, uint32_t 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,
-									   unsigned int id,
-									   struct wl_resource *output);
+									   uint32_t 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);
@@ -14,15 +13,14 @@ 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,
-										   unsigned int and_tags,
-										   unsigned int xor_tags);
+										   uint32_t and_tags,
+										   uint32_t xor_tags);
 static void dwl_ipc_output_set_layout(struct wl_client *client,
 									  struct wl_resource *resource,
-									  unsigned int index);
+									  uint32_t index);
 static void dwl_ipc_output_set_tags(struct wl_client *client,
 									struct wl_resource *resource,
-									unsigned int tagmask,
-									unsigned int toggle_tagset);
+									uint32_t tagmask, uint32_t 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,
@@ -46,7 +44,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,
-						  unsigned int version, unsigned int id) {
+						  uint32_t version, uint32_t id) {
 	struct wl_resource *manager_resource =
 		wl_resource_create(client, &zdwl_ipc_manager_v2_interface, version, id);
 	if (!manager_resource) {
@@ -59,7 +57,7 @@ void dwl_ipc_manager_bind(struct wl_client *client, void *data,
 
 	zdwl_ipc_manager_v2_send_tags(manager_resource, LENGTH(tags));
 
-	for (unsigned int i = 0; i < LENGTH(layouts); i++)
+	for (uint32_t i = 0; i < LENGTH(layouts); i++)
 		zdwl_ipc_manager_v2_send_layout(manager_resource, layouts[i].symbol);
 }
 
@@ -68,7 +66,7 @@ void dwl_ipc_manager_destroy(struct wl_resource *resource) {
 }
 
 void dwl_ipc_manager_get_output(struct wl_client *client,
-								struct wl_resource *resource, unsigned int id,
+								struct wl_resource *resource, uint32_t id,
 								struct wl_resource *output) {
 	DwlIpcOutput *ipc_output;
 	struct wlr_output *op = wlr_output_from_resource(output);
@@ -101,18 +99,20 @@ 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;
 	struct wlr_keyboard *keyboard;
 	xkb_layout_index_t current;
-	int tagmask, state, numclients, focused_client, tag;
+	int32_t tagmask, state, numclients, focused_client, tag;
 	const char *title, *appid, *symbol;
 	char kb_layout[32];
 	focused = focustop(monitor);
@@ -216,12 +216,11 @@ void dwl_ipc_output_printstatus_to(DwlIpcOutput *ipc_output) {
 
 void dwl_ipc_output_set_client_tags(struct wl_client *client,
 									struct wl_resource *resource,
-									unsigned int and_tags,
-									unsigned int xor_tags) {
+									uint32_t and_tags, uint32_t xor_tags) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
 	Client *selected_client = NULL;
-	unsigned int newtags = 0;
+	uint32_t newtags = 0;
 
 	ipc_output = wl_resource_get_user_data(resource);
 	if (!ipc_output)
@@ -239,13 +238,12 @@ void dwl_ipc_output_set_client_tags(struct wl_client *client,
 	selected_client->tags = newtags;
 	if (selmon == monitor)
 		focusclient(focustop(monitor), 1);
-	arrange(selmon, false);
+	arrange(selmon, false, false);
 	printstatus();
 }
 
 void dwl_ipc_output_set_layout(struct wl_client *client,
-							   struct wl_resource *resource,
-							   unsigned int index) {
+							   struct wl_resource *resource, uint32_t index) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
 
@@ -259,16 +257,16 @@ void dwl_ipc_output_set_layout(struct wl_client *client,
 
 	monitor->pertag->ltidxs[monitor->pertag->curtag] = &layouts[index];
 	clear_fullscreen_and_maximized_state(monitor);
-	arrange(monitor, false);
+	arrange(monitor, false, false);
 	printstatus();
 }
 
 void dwl_ipc_output_set_tags(struct wl_client *client,
-							 struct wl_resource *resource, unsigned int tagmask,
-							 unsigned int toggle_tagset) {
+							 struct wl_resource *resource, uint32_t tagmask,
+							 uint32_t toggle_tagset) {
 	DwlIpcOutput *ipc_output;
 	Monitor *monitor = NULL;
-	unsigned int newtags = tagmask & TAGMASK;
+	uint32_t newtags = tagmask & TAGMASK;
 
 	ipc_output = wl_resource_get_user_data(resource);
 	if (!ipc_output)
@@ -289,7 +287,7 @@ void dwl_ipc_output_dispatch(struct wl_client *client,
 							 const char *arg3, const char *arg4,
 							 const char *arg5) {
 
-	int (*func)(const Arg *);
+	int32_t (*func)(const Arg *);
 	Arg arg;
 	func = parse_func_name((char *)dispatch, &arg, (char *)arg1, (char *)arg2,
 						   (char *)arg3, (char *)arg4, (char *)arg5);

src/ext-protocol/ext-workspace.h

@@ -1,14 +1,14 @@
 #include "wlr_ext_workspace_v1.h"
 
 #define EXT_WORKSPACE_ENABLE_CAPS                                              \
-	WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ACTIVATE |                                 \
-		WLR_EXT_WORKSPACE_HANDLE_V1_CAP_DEACTIVATE
+	EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_ACTIVATE |                  \
+		EXT_WORKSPACE_HANDLE_V1_WORKSPACE_CAPABILITIES_DEACTIVATE
 
 typedef struct Monitor Monitor;
 
 struct workspace {
 	struct wl_list link; // Link in global workspaces list
-	unsigned int tag;	 // Numeric identifier (1-9, 0=overview)
+	uint32_t 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) {
-	unsigned int tag;
+	uint32_t 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) {
-	unsigned int tag;
+	uint32_t 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(unsigned int tag) {
+static const char *get_name_from_tag(uint32_t 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(unsigned int tag, Monitor *m) {
+static void remove_workspace_by_tag(uint32_t tag, Monitor *m) {
 	struct workspace *workspace, *tmp;
 	wl_list_for_each_safe(workspace, tmp, &workspaces, link) {
 		if (workspace->tag == tag && workspace->m == m) {
@@ -102,7 +102,7 @@ static void remove_workspace_by_tag(unsigned int tag, Monitor *m) {
 	}
 }
 
-static void add_workspace_by_tag(int tag, Monitor *m) {
+static void add_workspace_by_tag(int32_t tag, Monitor *m) {
 	const char *name = get_name_from_tag(tag);
 
 	struct workspace *workspace = ecalloc(1, sizeof(*workspace));
@@ -127,7 +127,7 @@ static void add_workspace_by_tag(int tag, Monitor *m) {
 
 void dwl_ext_workspace_printstatus(Monitor *m) {
 	struct workspace *w;
-	unsigned int tag_status = 0;
+	uint32_t tag_status = 0;
 
 	wl_list_for_each(w, &workspaces, link) {
 		if (w && w->m == m) {
@@ -162,7 +162,7 @@ void dwl_ext_workspace_printstatus(Monitor *m) {
 }
 
 void refresh_monitors_workspaces_status(Monitor *m) {
-	int i;
+	int32_t i;
 
 	if (m->isoverview) {
 		for (i = 1; i <= LENGTH(tags); i++) {

src/ext-protocol/foreign-toplevel.h

@@ -4,52 +4,100 @@ 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);
-	unsigned int target;
+	uint32_t target;
 
-	if (c && c->swallowing)
+	if (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;
 		c->is_scratchpad_show = 0;
 		setborder_color(c);
 		show_hide_client(c);
-		arrange(c->mon, true);
+		arrange(c->mon, true, false);
 		return;
 	}
 
 	target = get_tags_first_tag(c->tags);
 	view_in_mon(&(Arg){.ui = target}, true, c->mon, true);
 	focusclient(c, 1);
-	wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, true);
+}
+
+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, false);
+		return;
+	}
 }
 
 void handle_foreign_fullscreen_request(struct wl_listener *listener,
 									   void *data) {
-	return;
+
+	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);
-	}
+	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_fullscreen_request.link);
-		wl_list_remove(&c->foreign_close_request.link);
-		wl_list_remove(&c->foreign_destroy.link);
-	}
+	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) {
@@ -67,6 +115,10 @@ 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,7 +13,10 @@ 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 = get_client_from_surface(controller->tearing_control->surface);
+	Client *c = NULL;
+
+	toplevel_from_wlr_surface(controller->tearing_control->surface, &c, NULL);
+
 	if (c) {
 		/*
 		 * tearing_control->current is actually an enum:

src/ext-protocol/text-input.h

@@ -77,7 +77,7 @@ Monitor *output_from_wlr_output(struct wlr_output *wlr_output) {
 	return NULL;
 }
 
-Monitor *output_nearest_to(int lx, int ly) {
+Monitor *output_nearest_to(int32_t lx, int32_t ly) {
 	double closest_x, closest_y;
 	wlr_output_layout_closest_point(output_layout, NULL, lx, ly, &closest_x,
 									&closest_y);
@@ -225,7 +225,7 @@ static void update_popup_position(struct dwl_input_method_popup *popup) {
 	Monitor *output = NULL;
 	struct wlr_xdg_positioner_rules pointer_rules;
 	struct wlr_box output_box;
-	int lx, ly;
+	int32_t lx, ly;
 	struct wlr_box popup_box;
 
 	if (!text_input || !relay->focused_surface ||

src/ext-protocol/wlr_ext_workspace_v1.c

@@ -29,7 +29,7 @@ struct wlr_ext_workspace_v1_request {
 	// ACTIVATE / DEACTIVATE / ASSIGN / REMOVE
 	struct wlr_ext_workspace_handle_v1 *workspace;
 
-	struct wl_list link; // wlr_ext_workspace_manager_client_v1.requests
+	struct wl_list link; // wlr_ext_workspace_manager_v1_resource.requests
 };
 
 struct wlr_ext_workspace_v1_group_output {
@@ -41,33 +41,40 @@ struct wlr_ext_workspace_v1_group_output {
 };
 
 // These structs wrap wl_resource of each interface to access the request queue
-// (wlr_ext_workspace_manager_client_v1.requests) assigned per manager resource
+// (wlr_ext_workspace_manager_v1_resource.requests) assigned per manager
+// resource
 
-struct wlr_ext_workspace_manager_client_v1 {
+struct wlr_ext_workspace_manager_v1_resource {
 	struct wl_resource *resource;
 	struct wlr_ext_workspace_manager_v1 *manager;
-	struct wl_list requests; // wlr_ext_workspace_v1_request.link
-	struct wl_list link;	 // wlr_ext_workspace_manager_v1.clients
+	struct wl_list requests;			// wlr_ext_workspace_v1_request.link
+	struct wl_list workspace_resources; // wlr_ext_workspace_v1_resource.link
+	struct wl_list group_resources; // wlr_ext_workspace_group_v1_resource.link
+	struct wl_list link;			// wlr_ext_workspace_manager_v1.resources
 };
 
-struct wlr_ext_workspace_group_client_v1 {
+struct wlr_ext_workspace_group_v1_resource {
 	struct wl_resource *resource;
 	struct wlr_ext_workspace_group_handle_v1 *group;
-	struct wlr_ext_workspace_manager_client_v1 *manager;
-	struct wl_list link; // wlr_ext_workspace_group_v1.clients
+	struct wlr_ext_workspace_manager_v1_resource *manager;
+	struct wl_list link; // wlr_ext_workspace_group_v1.resources
+	struct wl_list
+		manager_resource_link; // wlr_ext_workspace_manager_v1_resource.group_resources
 };
 
-struct wlr_ext_workspace_client_v1 {
+struct wlr_ext_workspace_v1_resource {
 	struct wl_resource *resource;
 	struct wlr_ext_workspace_handle_v1 *workspace;
-	struct wlr_ext_workspace_manager_client_v1 *manager;
-	struct wl_list link; // wlr_ext_workspace_v1.clients
+	struct wlr_ext_workspace_manager_v1_resource *manager;
+	struct wl_list link; // wlr_ext_workspace_v1.resources
+	struct wl_list
+		manager_resource_link; // wlr_ext_workspace_manager_v1_resource.workspace_resources
 };
 
 static const struct ext_workspace_group_handle_v1_interface group_impl;
 
-static struct wlr_ext_workspace_group_client_v1 *
-group_client_from_resource(struct wl_resource *resource) {
+static struct wlr_ext_workspace_group_v1_resource *
+group_resource_from_resource(struct wl_resource *resource) {
 	assert(wl_resource_instance_of(
 		resource, &ext_workspace_group_handle_v1_interface, &group_impl));
 	return wl_resource_get_user_data(resource);
@@ -75,8 +82,8 @@ group_client_from_resource(struct wl_resource *resource) {
 
 static const struct ext_workspace_handle_v1_interface workspace_impl;
 
-static struct wlr_ext_workspace_client_v1 *
-workspace_client_from_resource(struct wl_resource *resource) {
+static struct wlr_ext_workspace_v1_resource *
+workspace_resource_from_resource(struct wl_resource *resource) {
 	assert(wl_resource_instance_of(resource, &ext_workspace_handle_v1_interface,
 								   &workspace_impl));
 	return wl_resource_get_user_data(resource);
@@ -84,8 +91,8 @@ workspace_client_from_resource(struct wl_resource *resource) {
 
 static const struct ext_workspace_manager_v1_interface manager_impl;
 
-static struct wlr_ext_workspace_manager_client_v1 *
-manager_client_from_resource(struct wl_resource *resource) {
+static struct wlr_ext_workspace_manager_v1_resource *
+manager_resource_from_resource(struct wl_resource *resource) {
 	assert(wl_resource_instance_of(
 		resource, &ext_workspace_manager_v1_interface, &manager_impl));
 	return wl_resource_get_user_data(resource);
@@ -98,9 +105,9 @@ static void workspace_handle_destroy(struct wl_client *client,
 
 static void workspace_handle_activate(struct wl_client *client,
 									  struct wl_resource *workspace_resource) {
-	struct wlr_ext_workspace_client_v1 *workspace =
-		workspace_client_from_resource(workspace_resource);
-	if (!workspace) {
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		workspace_resource_from_resource(workspace_resource);
+	if (!workspace_res) {
 		return;
 	}
 
@@ -110,16 +117,16 @@ static void workspace_handle_activate(struct wl_client *client,
 		return;
 	}
 	req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE;
-	req->workspace = workspace->workspace;
-	wl_list_insert(workspace->manager->requests.prev, &req->link);
+	req->workspace = workspace_res->workspace;
+	wl_list_insert(workspace_res->manager->requests.prev, &req->link);
 }
 
 static void
 workspace_handle_deactivate(struct wl_client *client,
 							struct wl_resource *workspace_resource) {
-	struct wlr_ext_workspace_client_v1 *workspace =
-		workspace_client_from_resource(workspace_resource);
-	if (!workspace) {
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		workspace_resource_from_resource(workspace_resource);
+	if (!workspace_res) {
 		return;
 	}
 
@@ -129,18 +136,18 @@ workspace_handle_deactivate(struct wl_client *client,
 		return;
 	}
 	req->type = WLR_EXT_WORKSPACE_V1_REQUEST_DEACTIVATE;
-	req->workspace = workspace->workspace;
-	wl_list_insert(workspace->manager->requests.prev, &req->link);
+	req->workspace = workspace_res->workspace;
+	wl_list_insert(workspace_res->manager->requests.prev, &req->link);
 }
 
 static void workspace_handle_assign(struct wl_client *client,
 									struct wl_resource *workspace_resource,
 									struct wl_resource *group_resource) {
-	struct wlr_ext_workspace_client_v1 *workspace =
-		workspace_client_from_resource(workspace_resource);
-	struct wlr_ext_workspace_group_client_v1 *group =
-		group_client_from_resource(group_resource);
-	if (!workspace || !group) {
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		workspace_resource_from_resource(workspace_resource);
+	struct wlr_ext_workspace_group_v1_resource *group_res =
+		group_resource_from_resource(group_resource);
+	if (!workspace_res || !group_res) {
 		return;
 	}
 
@@ -150,16 +157,16 @@ static void workspace_handle_assign(struct wl_client *client,
 		return;
 	}
 	req->type = WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN;
-	req->group = group->group;
-	req->workspace = workspace->workspace;
-	wl_list_insert(workspace->manager->requests.prev, &req->link);
+	req->group = group_res->group;
+	req->workspace = workspace_res->workspace;
+	wl_list_insert(workspace_res->manager->requests.prev, &req->link);
 }
 
 static void workspace_handle_remove(struct wl_client *client,
 									struct wl_resource *workspace_resource) {
-	struct wlr_ext_workspace_client_v1 *workspace =
-		workspace_client_from_resource(workspace_resource);
-	if (!workspace) {
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		workspace_resource_from_resource(workspace_resource);
+	if (!workspace_res) {
 		return;
 	}
 
@@ -169,8 +176,8 @@ static void workspace_handle_remove(struct wl_client *client,
 		return;
 	}
 	req->type = WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE;
-	req->workspace = workspace->workspace;
-	wl_list_insert(workspace->manager->requests.prev, &req->link);
+	req->workspace = workspace_res->workspace;
+	wl_list_insert(workspace_res->manager->requests.prev, &req->link);
 }
 
 static const struct ext_workspace_handle_v1_interface workspace_impl = {
@@ -184,9 +191,9 @@ static const struct ext_workspace_handle_v1_interface workspace_impl = {
 static void group_handle_create_workspace(struct wl_client *client,
 										  struct wl_resource *group_resource,
 										  const char *name) {
-	struct wlr_ext_workspace_group_client_v1 *group =
-		group_client_from_resource(group_resource);
-	if (!group) {
+	struct wlr_ext_workspace_group_v1_resource *group_res =
+		group_resource_from_resource(group_resource);
+	if (!group_res) {
 		return;
 	}
 
@@ -195,9 +202,15 @@ static void group_handle_create_workspace(struct wl_client *client,
 		wl_resource_post_no_memory(group_resource);
 		return;
 	}
+	req->name = strdup(name);
+	if (!req->name) {
+		free(req);
+		wl_resource_post_no_memory(group_resource);
+		return;
+	}
 	req->type = WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE;
-	req->group = group->group;
-	wl_list_insert(group->manager->requests.prev, &req->link);
+	req->group = group_res->group;
+	wl_list_insert(group_res->manager->requests.prev, &req->link);
 }
 
 static void group_handle_destroy(struct wl_client *client,
@@ -210,89 +223,94 @@ static const struct ext_workspace_group_handle_v1_interface group_impl = {
 	.destroy = group_handle_destroy,
 };
 
-static void
-destroy_workspace_client(struct wlr_ext_workspace_client_v1 *workspace_client) {
-	wl_list_remove(&workspace_client->link);
-	wl_resource_set_user_data(workspace_client->resource, NULL);
-	free(workspace_client);
+static void destroy_workspace_resource(
+	struct wlr_ext_workspace_v1_resource *workspace_res) {
+	wl_list_remove(&workspace_res->link);
+	wl_list_remove(&workspace_res->manager_resource_link);
+	wl_resource_set_user_data(workspace_res->resource, NULL);
+	free(workspace_res);
 }
 
 static void workspace_resource_destroy(struct wl_resource *resource) {
-	struct wlr_ext_workspace_client_v1 *workspace_client =
-		workspace_client_from_resource(resource);
-	if (workspace_client) {
-		destroy_workspace_client(workspace_client);
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		workspace_resource_from_resource(resource);
+	if (workspace_res) {
+		destroy_workspace_resource(workspace_res);
 	}
 }
 
-static struct wlr_ext_workspace_client_v1 *create_workspace_client(
+static struct wlr_ext_workspace_v1_resource *create_workspace_resource(
 	struct wlr_ext_workspace_handle_v1 *workspace,
-	struct wlr_ext_workspace_manager_client_v1 *manager_client) {
-	struct wlr_ext_workspace_client_v1 *workspace_client =
-		calloc(1, sizeof(*workspace_client));
-	if (!workspace_client) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res) {
+	struct wlr_ext_workspace_v1_resource *workspace_res =
+		calloc(1, sizeof(*workspace_res));
+	if (!workspace_res) {
 		return NULL;
 	}
 
-	struct wl_client *client = wl_resource_get_client(manager_client->resource);
-	workspace_client->resource = wl_resource_create(
-		client, &ext_workspace_handle_v1_interface,
-		wl_resource_get_version(manager_client->resource), 0);
-	if (!workspace_client->resource) {
-		free(workspace_client);
+	struct wl_client *client = wl_resource_get_client(manager_res->resource);
+	workspace_res->resource =
+		wl_resource_create(client, &ext_workspace_handle_v1_interface,
+						   wl_resource_get_version(manager_res->resource), 0);
+	if (!workspace_res->resource) {
+		free(workspace_res);
 		return NULL;
 	}
-	wl_resource_set_implementation(workspace_client->resource, &workspace_impl,
-								   workspace_client,
-								   workspace_resource_destroy);
+	wl_resource_set_implementation(workspace_res->resource, &workspace_impl,
+								   workspace_res, workspace_resource_destroy);
 
-	workspace_client->workspace = workspace;
-	workspace_client->manager = manager_client;
-	wl_list_insert(&workspace->clients, &workspace_client->link);
+	workspace_res->workspace = workspace;
+	workspace_res->manager = manager_res;
+	wl_list_insert(&workspace->resources, &workspace_res->link);
+	wl_list_insert(&manager_res->workspace_resources,
+				   &workspace_res->manager_resource_link);
 
-	return workspace_client;
+	return workspace_res;
 }
 
 static void
-destroy_group_client(struct wlr_ext_workspace_group_client_v1 *group_client) {
-	wl_list_remove(&group_client->link);
-	wl_resource_set_user_data(group_client->resource, NULL);
-	free(group_client);
+destroy_group_resource(struct wlr_ext_workspace_group_v1_resource *group_res) {
+	wl_list_remove(&group_res->link);
+	wl_list_remove(&group_res->manager_resource_link);
+	wl_resource_set_user_data(group_res->resource, NULL);
+	free(group_res);
 }
 
 static void group_handle_resource_destroy(struct wl_resource *resource) {
-	struct wlr_ext_workspace_group_client_v1 *group_client =
-		group_client_from_resource(resource);
-	if (group_client) {
-		destroy_group_client(group_client);
+	struct wlr_ext_workspace_group_v1_resource *group_res =
+		group_resource_from_resource(resource);
+	if (group_res) {
+		destroy_group_resource(group_res);
 	}
 }
 
-static struct wlr_ext_workspace_group_client_v1 *create_group_client(
+static struct wlr_ext_workspace_group_v1_resource *create_group_resource(
 	struct wlr_ext_workspace_group_handle_v1 *group,
-	struct wlr_ext_workspace_manager_client_v1 *manager_client) {
-	struct wlr_ext_workspace_group_client_v1 *group_client =
-		calloc(1, sizeof(*group_client));
-	if (!group_client) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res) {
+	struct wlr_ext_workspace_group_v1_resource *group_res =
+		calloc(1, sizeof(*group_res));
+	if (!group_res) {
 		return NULL;
 	}
 
-	struct wl_client *client = wl_resource_get_client(manager_client->resource);
-	uint32_t version = wl_resource_get_version(manager_client->resource);
-	group_client->resource = wl_resource_create(
+	struct wl_client *client = wl_resource_get_client(manager_res->resource);
+	uint32_t version = wl_resource_get_version(manager_res->resource);
+	group_res->resource = wl_resource_create(
 		client, &ext_workspace_group_handle_v1_interface, version, 0);
-	if (group_client->resource == NULL) {
-		free(group_client);
+	if (group_res->resource == NULL) {
+		free(group_res);
 		return NULL;
 	}
-	wl_resource_set_implementation(group_client->resource, &group_impl,
-								   group_client, group_handle_resource_destroy);
+	wl_resource_set_implementation(group_res->resource, &group_impl, group_res,
+								   group_handle_resource_destroy);
 
-	group_client->group = group;
-	group_client->manager = manager_client;
-	wl_list_insert(&group->clients, &group_client->link);
+	group_res->group = group;
+	group_res->manager = manager_res;
+	wl_list_insert(&group->resources, &group_res->link);
+	wl_list_insert(&manager_res->group_resources,
+				   &group_res->manager_resource_link);
 
-	return group_client;
+	return group_res;
 }
 
 static void destroy_request(struct wlr_ext_workspace_v1_request *req) {
@@ -303,18 +321,22 @@ static void destroy_request(struct wlr_ext_workspace_v1_request *req) {
 
 static void manager_handle_commit(struct wl_client *client,
 								  struct wl_resource *resource) {
-	struct wlr_ext_workspace_manager_client_v1 *manager =
-		manager_client_from_resource(resource);
-	if (!manager) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res =
+		manager_resource_from_resource(resource);
+	if (!manager_res) {
 		return;
 	}
 
 	struct wlr_ext_workspace_v1_request *req, *tmp;
-	wl_list_for_each_safe(req, tmp, &manager->requests, link) {
+	wl_list_for_each_safe(req, tmp, &manager_res->requests, link) {
 		switch (req->type) {
-		case WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE:
+		case WLR_EXT_WORKSPACE_V1_REQUEST_CREATE_WORKSPACE:;
+			struct wlr_ext_workspace_group_handle_v1_create_workspace_event
+				event = {
+					.name = req->name,
+				};
 			wl_signal_emit_mutable(&req->group->events.create_workspace,
-								   req->name);
+								   &event);
 			break;
 		case WLR_EXT_WORKSPACE_V1_REQUEST_ACTIVATE:
 			wl_signal_emit_mutable(&req->workspace->events.activate, NULL);
@@ -323,13 +345,11 @@ static void manager_handle_commit(struct wl_client *client,
 			wl_signal_emit_mutable(&req->workspace->events.deactivate, NULL);
 			break;
 		case WLR_EXT_WORKSPACE_V1_REQUEST_ASSIGN:
-			wl_signal_emit_mutable(&req->workspace->events.assign, &req->group);
+			wl_signal_emit_mutable(&req->workspace->events.assign, req->group);
 			break;
 		case WLR_EXT_WORKSPACE_V1_REQUEST_REMOVE:
 			wl_signal_emit_mutable(&req->workspace->events.remove, NULL);
 			break;
-		default:
-			abort();
 		}
 		destroy_request(req);
 	}
@@ -338,9 +358,9 @@ static void manager_handle_commit(struct wl_client *client,
 static void handle_idle(void *data) {
 	struct wlr_ext_workspace_manager_v1 *manager = data;
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client;
-	wl_list_for_each(manager_client, &manager->clients, link) {
-		ext_workspace_manager_v1_send_done(manager_client->resource);
+	struct wlr_ext_workspace_manager_v1_resource *manager_res;
+	wl_list_for_each(manager_res, &manager->resources, link) {
+		ext_workspace_manager_v1_send_done(manager_res->resource);
 	}
 	manager->idle_source = NULL;
 }
@@ -354,9 +374,9 @@ manager_schedule_done(struct wlr_ext_workspace_manager_v1 *manager) {
 }
 
 static void
-workspace_send_details(struct wlr_ext_workspace_client_v1 *workspace_client) {
-	struct wlr_ext_workspace_handle_v1 *workspace = workspace_client->workspace;
-	struct wl_resource *resource = workspace_client->resource;
+workspace_send_details(struct wlr_ext_workspace_v1_resource *workspace_res) {
+	struct wlr_ext_workspace_handle_v1 *workspace = workspace_res->workspace;
+	struct wl_resource *resource = workspace_res->resource;
 
 	ext_workspace_handle_v1_send_capabilities(resource, workspace->caps);
 	if (workspace->coordinates.size > 0) {
@@ -384,29 +404,41 @@ static const struct ext_workspace_manager_v1_interface manager_impl = {
 	.stop = manager_handle_stop,
 };
 
-static void destroy_manager_client(
-	struct wlr_ext_workspace_manager_client_v1 *manager_client) {
+static void destroy_manager_resource(
+	struct wlr_ext_workspace_manager_v1_resource *manager_res) {
 	struct wlr_ext_workspace_v1_request *req, *tmp;
-	wl_list_for_each_safe(req, tmp, &manager_client->requests, link) {
+	wl_list_for_each_safe(req, tmp, &manager_res->requests, link) {
 		destroy_request(req);
 	}
-	wl_list_remove(&manager_client->link);
-	wl_resource_set_user_data(manager_client->resource, NULL);
-	free(manager_client);
+	struct wlr_ext_workspace_v1_resource *workspace_res, *tmp2;
+	wl_list_for_each_safe(workspace_res, tmp2,
+						  &manager_res->workspace_resources,
+						  manager_resource_link) {
+		destroy_workspace_resource(workspace_res);
+	}
+	struct wlr_ext_workspace_group_v1_resource *group_res, *tmp3;
+	wl_list_for_each_safe(group_res, tmp3, &manager_res->group_resources,
+						  manager_resource_link) {
+		destroy_group_resource(group_res);
+	}
+
+	wl_list_remove(&manager_res->link);
+	wl_resource_set_user_data(manager_res->resource, NULL);
+	free(manager_res);
 }
 
 static void manager_resource_destroy(struct wl_resource *resource) {
-	struct wlr_ext_workspace_manager_client_v1 *manager_client =
-		manager_client_from_resource(resource);
-	if (manager_client) {
-		destroy_manager_client(manager_client);
+	struct wlr_ext_workspace_manager_v1_resource *manager_res =
+		manager_resource_from_resource(resource);
+	if (manager_res) {
+		destroy_manager_resource(manager_res);
 	}
 }
 
 static void
-group_send_details(struct wlr_ext_workspace_group_client_v1 *group_client) {
-	struct wlr_ext_workspace_group_handle_v1 *group = group_client->group;
-	struct wl_resource *resource = group_client->resource;
+group_send_details(struct wlr_ext_workspace_group_v1_resource *group_res) {
+	struct wlr_ext_workspace_group_handle_v1 *group = group_res->group;
+	struct wl_resource *resource = group_res->resource;
 	struct wl_client *client = wl_resource_get_client(resource);
 
 	ext_workspace_group_handle_v1_send_capabilities(resource, group->caps);
@@ -430,65 +462,67 @@ static void manager_bind(struct wl_client *client, void *data, uint32_t version,
 						 uint32_t id) {
 	struct wlr_ext_workspace_manager_v1 *manager = data;
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client =
-		calloc(1, sizeof(*manager_client));
-	if (!manager_client) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res =
+		calloc(1, sizeof(*manager_res));
+	if (!manager_res) {
 		wl_client_post_no_memory(client);
 		return;
 	}
 
-	manager_client->manager = manager;
-	wl_list_init(&manager_client->requests);
-	wl_list_insert(&manager->clients, &manager_client->link);
+	manager_res->manager = manager;
+	wl_list_init(&manager_res->requests);
+	wl_list_init(&manager_res->workspace_resources);
+	wl_list_init(&manager_res->group_resources);
 
-	manager_client->resource = wl_resource_create(
+	manager_res->resource = wl_resource_create(
 		client, &ext_workspace_manager_v1_interface, version, id);
-	if (!manager_client->resource) {
-		free(manager_client);
+	if (!manager_res->resource) {
+		free(manager_res);
 		wl_client_post_no_memory(client);
 		return;
 	}
-	wl_resource_set_implementation(manager_client->resource, &manager_impl,
-								   manager_client, manager_resource_destroy);
+	wl_resource_set_implementation(manager_res->resource, &manager_impl,
+								   manager_res, manager_resource_destroy);
+	wl_list_insert(&manager->resources, &manager_res->link);
 
 	struct wlr_ext_workspace_group_handle_v1 *group;
 	wl_list_for_each(group, &manager->groups, link) {
-		struct wlr_ext_workspace_group_client_v1 *group_client =
-			create_group_client(group, manager_client);
-		if (!group_client) {
-			wl_resource_post_no_memory(manager_client->resource);
+		struct wlr_ext_workspace_group_v1_resource *group_res =
+			create_group_resource(group, manager_res);
+		if (!group_res) {
+			wl_resource_post_no_memory(manager_res->resource);
 			continue;
 		}
-		ext_workspace_manager_v1_send_workspace_group(manager_client->resource,
-													  group_client->resource);
-		group_send_details(group_client);
+		ext_workspace_manager_v1_send_workspace_group(manager_res->resource,
+													  group_res->resource);
+		group_send_details(group_res);
 	}
 
 	struct wlr_ext_workspace_handle_v1 *workspace;
 	wl_list_for_each(workspace, &manager->workspaces, link) {
-		struct wlr_ext_workspace_client_v1 *workspace_client =
-			create_workspace_client(workspace, manager_client);
-		if (!workspace) {
-			wl_client_post_no_memory(client);
+		struct wlr_ext_workspace_v1_resource *workspace_res =
+			create_workspace_resource(workspace, manager_res);
+		if (!workspace_res) {
+			wl_resource_post_no_memory(manager_res->resource);
 			continue;
 		}
-		ext_workspace_manager_v1_send_workspace(manager_client->resource,
-												workspace_client->resource);
-		workspace_send_details(workspace_client);
+		ext_workspace_manager_v1_send_workspace(manager_res->resource,
+												workspace_res->resource);
+		workspace_send_details(workspace_res);
 
 		if (!workspace->group) {
 			continue;
 		}
-		struct wlr_ext_workspace_group_client_v1 *group_client;
-		wl_list_for_each(group_client, &workspace->group->clients, link) {
-			if (group_client->manager == manager_client) {
+		struct wlr_ext_workspace_group_v1_resource *group_res;
+		wl_list_for_each(group_res, &workspace->group->resources, link) {
+			if (group_res->manager == manager_res) {
 				ext_workspace_group_handle_v1_send_workspace_enter(
-					group_client->resource, workspace_client->resource);
+					group_res->resource, workspace_res->resource);
 			}
 		}
 	}
 
-	manager_schedule_done(manager);
+	ext_workspace_manager_v1_send_done(manager_res->resource);
 }
 
 static void manager_handle_display_destroy(struct wl_listener *listener,
@@ -509,9 +543,9 @@ static void manager_handle_display_destroy(struct wl_listener *listener,
 		wlr_ext_workspace_handle_v1_destroy(workspace);
 	}
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client, *tmp3;
-	wl_list_for_each_safe(manager_client, tmp3, &manager->clients, link) {
-		destroy_manager_client(manager_client);
+	struct wlr_ext_workspace_manager_v1_resource *manager_res, *tmp3;
+	wl_list_for_each_safe(manager_res, tmp3, &manager->resources, link) {
+		destroy_manager_resource(manager_res);
 	}
 
 	if (manager->idle_source) {
@@ -548,7 +582,7 @@ wlr_ext_workspace_manager_v1_create(struct wl_display *display,
 
 	wl_list_init(&manager->groups);
 	wl_list_init(&manager->workspaces);
-	wl_list_init(&manager->clients);
+	wl_list_init(&manager->resources);
 	wl_signal_init(&manager->events.destroy);
 
 	return manager;
@@ -566,22 +600,22 @@ wlr_ext_workspace_group_handle_v1_create(
 	group->caps = caps;
 
 	wl_list_init(&group->outputs);
-	wl_list_init(&group->clients);
+	wl_list_init(&group->resources);
 	wl_signal_init(&group->events.create_workspace);
 	wl_signal_init(&group->events.destroy);
 
 	wl_list_insert(manager->groups.prev, &group->link);
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client;
-	wl_list_for_each(manager_client, &manager->clients, link) {
-		struct wlr_ext_workspace_group_client_v1 *group_client =
-			create_group_client(group, manager_client);
-		if (!group_client) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res;
+	wl_list_for_each(manager_res, &manager->resources, link) {
+		struct wlr_ext_workspace_group_v1_resource *group_res =
+			create_group_resource(group, manager_res);
+		if (!group_res) {
 			continue;
 		}
-		ext_workspace_manager_v1_send_workspace_group(manager_client->resource,
-													  group_client->resource);
-		group_send_details(group_client);
+		ext_workspace_manager_v1_send_workspace_group(manager_res->resource,
+													  group_res->resource);
+		group_send_details(group_res);
 	}
 
 	manager_schedule_done(manager);
@@ -594,19 +628,19 @@ workspace_send_group(struct wlr_ext_workspace_handle_v1 *workspace,
 					 struct wlr_ext_workspace_group_handle_v1 *group,
 					 bool enter) {
 
-	struct wlr_ext_workspace_client_v1 *workspace_client;
-	wl_list_for_each(workspace_client, &workspace->clients, link) {
-		struct wlr_ext_workspace_group_client_v1 *group_client;
-		wl_list_for_each(group_client, &group->clients, link) {
-			if (group_client->manager != workspace_client->manager) {
+	struct wlr_ext_workspace_v1_resource *workspace_res;
+	wl_list_for_each(workspace_res, &workspace->resources, link) {
+		struct wlr_ext_workspace_group_v1_resource *group_res;
+		wl_list_for_each(group_res, &group->resources, link) {
+			if (group_res->manager != workspace_res->manager) {
 				continue;
 			}
 			if (enter) {
 				ext_workspace_group_handle_v1_send_workspace_enter(
-					group_client->resource, workspace_client->resource);
+					group_res->resource, workspace_res->resource);
 			} else {
 				ext_workspace_group_handle_v1_send_workspace_leave(
-					group_client->resource, workspace_client->resource);
+					group_res->resource, workspace_res->resource);
 			}
 		}
 	}
@@ -625,10 +659,9 @@ destroy_group_output(struct wlr_ext_workspace_v1_group_output *group_output) {
 static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
 							  struct wlr_output *output, bool enter) {
 
-	struct wlr_ext_workspace_group_client_v1 *group_client;
-	wl_list_for_each(group_client, &group->clients, link) {
-		struct wl_client *client =
-			wl_resource_get_client(group_client->resource);
+	struct wlr_ext_workspace_group_v1_resource *group_res;
+	wl_list_for_each(group_res, &group->resources, link) {
+		struct wl_client *client = wl_resource_get_client(group_res->resource);
 
 		struct wl_resource *output_resource;
 		wl_resource_for_each(output_resource, &output->resources) {
@@ -637,10 +670,10 @@ static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
 			}
 			if (enter) {
 				ext_workspace_group_handle_v1_send_output_enter(
-					group_client->resource, output_resource);
+					group_res->resource, output_resource);
 			} else {
 				ext_workspace_group_handle_v1_send_output_leave(
-					group_client->resource, output_resource);
+					group_res->resource, output_resource);
 			}
 		}
 	}
@@ -650,6 +683,10 @@ static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
 
 void wlr_ext_workspace_group_handle_v1_destroy(
 	struct wlr_ext_workspace_group_handle_v1 *group) {
+	if (!group) {
+		return;
+	}
+
 	wl_signal_emit_mutable(&group->events.destroy, NULL);
 
 	assert(wl_list_empty(&group->events.create_workspace.listener_list));
@@ -663,16 +700,16 @@ void wlr_ext_workspace_group_handle_v1_destroy(
 		}
 	}
 
-	struct wlr_ext_workspace_group_client_v1 *group_client, *tmp;
-	wl_list_for_each_safe(group_client, tmp, &group->clients, link) {
-		ext_workspace_group_handle_v1_send_removed(group_client->resource);
-		destroy_group_client(group_client);
+	struct wlr_ext_workspace_group_v1_resource *group_res, *tmp;
+	wl_list_for_each_safe(group_res, tmp, &group->resources, link) {
+		ext_workspace_group_handle_v1_send_removed(group_res->resource);
+		destroy_group_resource(group_res);
 	}
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client;
-	wl_list_for_each(manager_client, &group->manager->clients, link) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res;
+	wl_list_for_each(manager_res, &group->manager->resources, link) {
 		struct wlr_ext_workspace_v1_request *req, *tmp2;
-		wl_list_for_each_safe(req, tmp2, &manager_client->requests, link) {
+		wl_list_for_each_safe(req, tmp2, &manager_res->requests, link) {
 			if (req->group == group) {
 				destroy_request(req);
 			}
@@ -697,11 +734,11 @@ static void handle_output_bind(struct wl_listener *listener, void *data) {
 	struct wlr_output_event_bind *event = data;
 	struct wl_client *client = wl_resource_get_client(event->resource);
 
-	struct wlr_ext_workspace_group_client_v1 *group_client;
-	wl_list_for_each(group_client, &group_output->group->clients, link) {
-		if (wl_resource_get_client(group_client->resource) == client) {
-			ext_workspace_group_handle_v1_send_output_enter(
-				group_client->resource, event->resource);
+	struct wlr_ext_workspace_group_v1_resource *group_res;
+	wl_list_for_each(group_res, &group_output->group->resources, link) {
+		if (wl_resource_get_client(group_res->resource) == client) {
+			ext_workspace_group_handle_v1_send_output_enter(group_res->resource,
+															event->resource);
 		}
 	}
 
@@ -778,11 +815,12 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
 	if (id) {
 		workspace->id = strdup(id);
 		if (!workspace->id) {
+			free(workspace);
 			return NULL;
 		}
 	}
 
-	wl_list_init(&workspace->clients);
+	wl_list_init(&workspace->resources);
 	wl_array_init(&workspace->coordinates);
 	wl_signal_init(&workspace->events.activate);
 	wl_signal_init(&workspace->events.deactivate);
@@ -792,16 +830,16 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
 
 	wl_list_insert(&manager->workspaces, &workspace->link);
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client;
-	wl_list_for_each(manager_client, &manager->clients, link) {
-		struct wlr_ext_workspace_client_v1 *workspace_client =
-			create_workspace_client(workspace, manager_client);
-		if (!workspace_client) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res;
+	wl_list_for_each(manager_res, &manager->resources, link) {
+		struct wlr_ext_workspace_v1_resource *workspace_res =
+			create_workspace_resource(workspace, manager_res);
+		if (!workspace_res) {
 			continue;
 		}
-		ext_workspace_manager_v1_send_workspace(manager_client->resource,
-												workspace_client->resource);
-		workspace_send_details(workspace_client);
+		ext_workspace_manager_v1_send_workspace(manager_res->resource,
+												workspace_res->resource);
+		workspace_send_details(workspace_res);
 	}
 
 	manager_schedule_done(manager);
@@ -811,6 +849,10 @@ wlr_ext_workspace_handle_v1_create(struct wlr_ext_workspace_manager_v1 *manager,
 
 void wlr_ext_workspace_handle_v1_destroy(
 	struct wlr_ext_workspace_handle_v1 *workspace) {
+	if (!workspace) {
+		return;
+	}
+
 	wl_signal_emit_mutable(&workspace->events.destroy, NULL);
 
 	assert(wl_list_empty(&workspace->events.activate.listener_list));
@@ -823,16 +865,16 @@ void wlr_ext_workspace_handle_v1_destroy(
 		workspace_send_group(workspace, workspace->group, false);
 	}
 
-	struct wlr_ext_workspace_client_v1 *workspace_client, *tmp;
-	wl_list_for_each_safe(workspace_client, tmp, &workspace->clients, link) {
-		ext_workspace_handle_v1_send_removed(workspace_client->resource);
-		destroy_workspace_client(workspace_client);
+	struct wlr_ext_workspace_v1_resource *workspace_res, *tmp;
+	wl_list_for_each_safe(workspace_res, tmp, &workspace->resources, link) {
+		ext_workspace_handle_v1_send_removed(workspace_res->resource);
+		destroy_workspace_resource(workspace_res);
 	}
 
-	struct wlr_ext_workspace_manager_client_v1 *manager_client;
-	wl_list_for_each(manager_client, &workspace->manager->clients, link) {
+	struct wlr_ext_workspace_manager_v1_resource *manager_res;
+	wl_list_for_each(manager_res, &workspace->manager->resources, link) {
 		struct wlr_ext_workspace_v1_request *req, *tmp2;
-		wl_list_for_each_safe(req, tmp2, &manager_client->requests, link) {
+		wl_list_for_each_safe(req, tmp2, &manager_res->requests, link) {
 			if (req->workspace == workspace) {
 				destroy_request(req);
 			}
@@ -856,7 +898,7 @@ void wlr_ext_workspace_handle_v1_set_group(
 	}
 
 	if (workspace->group) {
-		workspace_send_group(workspace, group, false);
+		workspace_send_group(workspace, workspace->group, false);
 	}
 	workspace->group = group;
 	if (group) {
@@ -878,9 +920,9 @@ void wlr_ext_workspace_handle_v1_set_name(
 		return;
 	}
 
-	struct wlr_ext_workspace_client_v1 *workspace_client;
-	wl_list_for_each(workspace_client, &workspace->clients, link) {
-		ext_workspace_handle_v1_send_name(workspace_client->resource,
+	struct wlr_ext_workspace_v1_resource *workspace_res;
+	wl_list_for_each(workspace_res, &workspace->resources, link) {
+		ext_workspace_handle_v1_send_name(workspace_res->resource,
 										  workspace->name);
 	}
 
@@ -905,9 +947,9 @@ void wlr_ext_workspace_handle_v1_set_coordinates(
 	wl_array_init(&workspace->coordinates);
 	wl_array_copy(&workspace->coordinates, coordinates);
 
-	struct wlr_ext_workspace_client_v1 *workspace_client;
-	wl_list_for_each(workspace_client, &workspace->clients, link) {
-		ext_workspace_handle_v1_send_coordinates(workspace_client->resource,
+	struct wlr_ext_workspace_v1_resource *workspace_res;
+	wl_list_for_each(workspace_res, &workspace->resources, link) {
+		ext_workspace_handle_v1_send_coordinates(workspace_res->resource,
 												 &workspace->coordinates);
 	}
 
@@ -927,9 +969,9 @@ static void workspace_set_state(struct wlr_ext_workspace_handle_v1 *workspace,
 		return;
 	}
 
-	struct wlr_ext_workspace_client_v1 *workspace_client;
-	wl_list_for_each(workspace_client, &workspace->clients, link) {
-		ext_workspace_handle_v1_send_state(workspace_client->resource,
+	struct wlr_ext_workspace_v1_resource *workspace_res;
+	wl_list_for_each(workspace_res, &workspace->resources, link) {
+		ext_workspace_handle_v1_send_state(workspace_res->resource,
 										   workspace->state);
 	}
 

src/ext-protocol/wlr_ext_workspace_v1.h

@@ -2,32 +2,11 @@
 // TODO: remove this file
 // refer: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5115
 
-/*
- * This an unstable interface of wlroots. No guarantees are made regarding the
- * future consistency of this API.
- */
-#ifndef WLR_USE_UNSTABLE
-#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
-#endif
-
-#ifndef WLR_TYPES_WLR_EXT_WORKSPACE_V1_H
-#define WLR_TYPES_WLR_EXT_WORKSPACE_V1_H
-
+#include <wayland-protocols/ext-workspace-v1-enum.h>
 #include <wayland-server-core.h>
 
 struct wlr_output;
 
-enum wlr_ext_workspace_group_handle_v1_cap {
-	WLR_EXT_WORKSPACE_GROUP_HANDLE_V1_CAP_CREATE_WORKSPACE = 1 << 0,
-};
-
-enum wlr_ext_workspace_handle_v1_cap {
-	WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ACTIVATE = 1 << 0,
-	WLR_EXT_WORKSPACE_HANDLE_V1_CAP_DEACTIVATE = 1 << 1,
-	WLR_EXT_WORKSPACE_HANDLE_V1_CAP_REMOVE = 1 << 2,
-	WLR_EXT_WORKSPACE_HANDLE_V1_CAP_ASSIGN = 1 << 3,
-};
-
 struct wlr_ext_workspace_manager_v1 {
 	struct wl_global *global;
 	struct wl_list groups;	   // wlr_ext_workspace_group_handle_v1.link
@@ -37,24 +16,33 @@ struct wlr_ext_workspace_manager_v1 {
 		struct wl_signal destroy;
 	} events;
 
-	struct wl_list clients; // wlr_ext_workspace_manager_client_v1.link
-	struct wl_event_source *idle_source;
-	struct wl_event_loop *event_loop;
-	struct wl_listener display_destroy;
+	struct {
+		struct wl_list resources; // wlr_ext_workspace_manager_v1_resource.link
+		struct wl_event_source *idle_source;
+		struct wl_event_loop *event_loop;
+		struct wl_listener display_destroy;
+	};
+};
+
+struct wlr_ext_workspace_group_handle_v1_create_workspace_event {
+	const char *name;
 };
 
 struct wlr_ext_workspace_group_handle_v1 {
 	struct wlr_ext_workspace_manager_v1 *manager;
-	uint32_t caps; // wlr_ext_workspace_group_handle_v1_cap
+	uint32_t caps; // ext_workspace_group_handle_v1_group_capabilities
 	struct {
-		struct wl_signal create_workspace; // const char *
+		struct wl_signal
+			create_workspace; // wlr_ext_workspace_group_handle_v1_create_workspace_event
 		struct wl_signal destroy;
 	} events;
 
 	struct wl_list link; // wlr_ext_workspace_manager_v1.groups
 
-	struct wl_list outputs; // wlr_ext_workspace_v1_group_output.link
-	struct wl_list clients; // wlr_ext_workspace_manager_client_v1.link
+	struct {
+		struct wl_list outputs;	  // wlr_ext_workspace_v1_group_output.link
+		struct wl_list resources; // wlr_ext_workspace_manager_v1_resource.link
+	};
 };
 
 struct wlr_ext_workspace_handle_v1 {
@@ -63,7 +51,7 @@ struct wlr_ext_workspace_handle_v1 {
 	char *id;
 	char *name;
 	struct wl_array coordinates;
-	uint32_t caps;	// wlr_ext_workspace_handle_v1_cap
+	uint32_t caps;	// ext_workspace_handle_v1_workspace_capabilities
 	uint32_t state; // ext_workspace_handle_v1_state
 
 	struct {
@@ -74,9 +62,11 @@ struct wlr_ext_workspace_handle_v1 {
 		struct wl_signal destroy;
 	} events;
 
-	struct wl_list link; // wlr_ext_workspace_manager_v1.workspaces;
+	struct wl_list link; // wlr_ext_workspace_manager_v1.workspaces
 
-	struct wl_list clients;
+	struct {
+		struct wl_list resources; // wlr_ext_workspace_v1_resource.link
+	};
 };
 
 struct wlr_ext_workspace_manager_v1 *
@@ -114,5 +104,3 @@ void wlr_ext_workspace_handle_v1_set_urgent(
 	struct wlr_ext_workspace_handle_v1 *workspace, bool enabled);
 void wlr_ext_workspace_handle_v1_set_hidden(
 	struct wlr_ext_workspace_handle_v1 *workspace, bool enabled);
-
-#endif

src/fetch/client.h

@@ -1,5 +1,5 @@
 bool check_hit_no_border(Client *c) {
-	int i;
+	int32_t i;
 	bool hit_no_border = false;
 	if (!render_border) {
 		hit_no_border = true;
@@ -41,10 +41,21 @@ Client *get_client_by_id_or_title(const char *arg_id, const char *arg_title) {
 			continue;
 		}
 
-		if (!(appid = client_get_appid(c)))
+		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) {
 			appid = broken;
-		if (!(title = client_get_title(c)))
+		}
+
+		if (!title) {
 			title = broken;
+		}
 
 		if (arg_id && strncmp(arg_id, "none", 4) == 0)
 			arg_id = NULL;
@@ -63,16 +74,16 @@ Client *get_client_by_id_or_title(const char *arg_id, const char *arg_title) {
 	return target_client;
 }
 struct wlr_box // 计算客户端居中坐标
-setclient_coordinate_center(Client *c, struct wlr_box geom, int offsetx,
-							int offsety) {
+setclient_coordinate_center(Client *c, Monitor *tm, struct wlr_box geom,
+							int32_t offsetx, int32_t offsety) {
 	struct wlr_box tempbox;
-	int offset = 0;
-	int len = 0;
-	Monitor *m = c->mon ? c->mon : selmon;
+	int32_t offset = 0;
+	int32_t len = 0;
+	Monitor *m = tm ? tm : selmon;
 
-	unsigned int cbw = check_hit_no_border(c) ? c->bw : 0;
+	uint32_t cbw = check_hit_no_border(c) ? c->bw : 0;
 
-	if (!c->no_force_center) {
+	if (!c->no_force_center && m) {
 		tempbox.x = m->w.x + (m->w.width - geom.width) / 2;
 		tempbox.y = m->w.y + (m->w.height - geom.height) / 2;
 	} else {
@@ -124,12 +135,13 @@ static bool is_window_rule_matches(const ConfigWinRule *r, const char *appid,
 Client *center_tiled_select(Monitor *m) {
 	Client *c = NULL;
 	Client *target_c = NULL;
-	long int mini_distance = -1;
-	int dirx, diry;
-	long int distance;
+	int64_t mini_distance = -1;
+	int32_t dirx, diry;
+	int64_t distance;
 	wl_list_for_each(c, &clients, link) {
-		if (c && VISIBLEON(c, m) && ISTILED(c) && client_surface(c)->mapped &&
-			!c->isfloating && !client_is_unmanaged(c)) {
+		if (c && VISIBLEON(c, m) && ISSCROLLTILED(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;
@@ -145,7 +157,7 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 								 bool ignore_align) {
 	Client *c = NULL;
 	Client **tempClients = NULL; // 初始化为 NULL
-	int last = -1;
+	int32_t last = -1;
 	bool constrain_to_row = tc->mon && is_row_layout(tc->mon);
 
 	// 第一次遍历，计算客户端数量
@@ -179,21 +191,23 @@ 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;
+	int32_t sel_x = tc->geom.x;
+	int32_t sel_y = tc->geom.y;
+	int64_t distance = LLONG_MAX;
+	int64_t same_monitor_distance = LLONG_MAX;
 	Client *tempFocusClients = NULL;
+	Client *tempSameMonitorFocusClients = NULL;
 
 	switch (arg->i) {
 	case UP:
 		if (!ignore_align) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.y < sel_y &&
 					tempClients[_i]->geom.x == sel_x &&
 					tempClients[_i]->mon == tc->mon) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						distance = tmp_distance;
@@ -203,29 +217,34 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 			}
 		}
 		if (!tempFocusClients) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.y < sel_y) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						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];
+					}
 				}
 			}
 		}
 		break;
 	case DOWN:
 		if (!ignore_align) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.y > sel_y &&
 					tempClients[_i]->geom.x == sel_x &&
 					tempClients[_i]->mon == tc->mon) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						distance = tmp_distance;
@@ -235,29 +254,34 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 			}
 		}
 		if (!tempFocusClients) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.y > sel_y) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						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];
+					}
 				}
 			}
 		}
 		break;
 	case LEFT:
 		if (!ignore_align || constrain_to_row) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.x < sel_x &&
 					tempClients[_i]->geom.y == sel_y &&
 					tempClients[_i]->mon == tc->mon) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						distance = tmp_distance;
@@ -267,29 +291,34 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 			}
 		}
 		if (!tempFocusClients && !constrain_to_row) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.x < sel_x) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						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];
+					}
 				}
 			}
 		}
 		break;
 	case RIGHT:
 		if (!ignore_align || constrain_to_row) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.x > sel_x &&
 					tempClients[_i]->geom.y == sel_y &&
 					tempClients[_i]->mon == tc->mon) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						distance = tmp_distance;
@@ -299,16 +328,21 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 			}
 		}
 		if (!tempFocusClients && !constrain_to_row) {
-			for (int _i = 0; _i <= last; _i++) {
+			for (int32_t _i = 0; _i <= last; _i++) {
 				if (tempClients[_i]->geom.x > sel_x) {
-					int dis_x = tempClients[_i]->geom.x - sel_x;
-					int dis_y = tempClients[_i]->geom.y - sel_y;
-					long long int tmp_distance =
+					int32_t dis_x = tempClients[_i]->geom.x - sel_x;
+					int32_t dis_y = tempClients[_i]->geom.y - sel_y;
+					int64_t tmp_distance =
 						dis_x * dis_x + dis_y * dis_y; // 计算距离
 					if (tmp_distance < distance) {
 						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];
+					}
 				}
 			}
 		}
@@ -316,7 +350,11 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
 	}
 
 	free(tempClients); // 释放内存
-	return tempFocusClients;
+	if (tempSameMonitorFocusClients) {
+		return tempSameMonitorFocusClients;
+	} else {
+		return tempFocusClients;
+	}
 }
 
 Client *direction_select(const Arg *arg) {
@@ -351,29 +389,26 @@ Client *focustop(Monitor *m) {
 
 Client *get_next_stack_client(Client *c, bool reverse) {
 	if (!c || !c->mon)
-		return NULL; // 添加输入检查
+		return NULL;
 
 	Client *next = NULL;
 	if (reverse) {
 		wl_list_for_each_reverse(next, &c->link, link) {
-			if (!next)
-				continue; // 安全检查
+			if (&next->link == &clients)
+				continue; /* wrap past the sentinel node */
 
-			if (c->mon->has_visible_fullscreen_client && !next->isfloating &&
-				!next->isfullscreen)
+			if (next->isunglobal)
 				continue;
 
-			// 添加更安全的 VISIBLEON 检查
 			if (next != c && next->mon && VISIBLEON(next, c->mon))
 				return next;
 		}
 	} else {
 		wl_list_for_each(next, &c->link, link) {
-			if (!next)
-				continue; // 安全检查
+			if (&next->link == &clients)
+				continue; /* wrap past the sentinel node */
 
-			if (c->mon->has_visible_fullscreen_client && !next->isfloating &&
-				!next->isfullscreen)
+			if (next->isunglobal)
 				continue;
 
 			if (next != c && next->mon && VISIBLEON(next, c->mon))
@@ -402,4 +437,15 @@ float *get_border_color(Client *c) {
 	} else {
 		return bordercolor;
 	}
-}
+}
+
+int32_t is_single_bit_set(uint32_t x) { return x && !(x & (x - 1)); }
+
+bool client_only_in_one_tag(Client *c) {
+	uint32_t masked = c->tags & TAGMASK;
+	if (is_single_bit_set(masked)) {
+		return true;
+	} else {
+		return false;
+	}
+}

src/fetch/common.h

@@ -1,5 +1,5 @@
 pid_t getparentprocess(pid_t p) {
-	unsigned int v = 0;
+	uint32_t v = 0;
 
 	FILE *f;
 	char buf[256];
@@ -19,29 +19,11 @@ pid_t getparentprocess(pid_t p) {
 	return (pid_t)v;
 }
 
-int isdescprocess(pid_t p, pid_t c) {
+int32_t isdescprocess(pid_t p, pid_t c) {
 	while (p != c && c != 0)
 		c = getparentprocess(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;
+	return (int32_t)c;
 }
 
 void get_layout_abbr(char *abbr, const char *full_name) {
@@ -49,7 +31,7 @@ void get_layout_abbr(char *abbr, const char *full_name) {
 	abbr[0] = '\0';
 
 	// 1. 尝试在映射表中查找
-	for (int i = 0; layout_mappings[i].full_name != NULL; i++) {
+	for (int32_t i = 0; layout_mappings[i].full_name != NULL; i++) {
 		if (strcmp(full_name, layout_mappings[i].full_name) == 0) {
 			strcpy(abbr, layout_mappings[i].abbr);
 			return;
@@ -60,10 +42,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) {
-		unsigned int len = close - open - 1;
+		uint32_t len = close - open - 1;
 		if (len > 0 && len <= 4) {
 			// 提取并转换为小写
-			for (unsigned int j = 0; j < len; j++) {
+			for (uint32_t j = 0; j < len; j++) {
 				abbr[j] = tolower(open[j + 1]);
 			}
 			abbr[len] = '\0';
@@ -72,8 +54,8 @@ void get_layout_abbr(char *abbr, const char *full_name) {
 	}
 
 	// 3. 提取前2-3个字母并转换为小写
-	unsigned int j = 0;
-	for (unsigned int i = 0; full_name[i] != '\0' && j < 3; i++) {
+	uint32_t j = 0;
+	for (uint32_t i = 0; full_name[i] != '\0' && j < 3; i++) {
 		if (isalpha(full_name[i])) {
 			abbr[j++] = tolower(full_name[i]);
 		}
@@ -101,7 +83,7 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
 	struct wlr_surface *surface = NULL;
 	Client *c = NULL;
 	LayerSurface *l = NULL;
-	int layer;
+	int32_t layer;
 
 	for (layer = NUM_LAYERS - 1; !surface && layer >= 0; layer--) {
 
@@ -111,6 +93,9 @@ void xytonode(double x, double y, struct wlr_surface **psurface, Client **pc,
 		if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny)))
 			continue;
 
+		if (!node->enabled)
+			continue;
+
 		if (node->type == WLR_SCENE_NODE_BUFFER)
 			surface = wlr_scene_surface_try_from_buffer(
 						  wlr_scene_buffer_from_node(node))

src/fetch/monitor.h

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

src/layout/arrange.h

@@ -1,11 +1,15 @@
 void set_size_per(Monitor *m, Client *c) {
 	Client *fc = NULL;
 	bool found = false;
+
+	if (!m || !c)
+		return;
+
 	wl_list_for_each(fc, &clients, link) {
 		if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c) {
 			c->master_mfact_per = fc->master_mfact_per;
 			c->master_inner_per = fc->master_inner_per;
-			c->stack_innder_per = fc->stack_innder_per;
+			c->stack_inner_per = fc->stack_inner_per;
 			found = true;
 			break;
 		}
@@ -14,12 +18,13 @@ void set_size_per(Monitor *m, Client *c) {
 	if (!found) {
 		c->master_mfact_per = m->pertag->mfacts[m->pertag->curtag];
 		c->master_inner_per = 1.0f;
-		c->stack_innder_per = 1.0f;
+		c->stack_inner_per = 1.0f;
 	}
 }
 
-void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
-								   int offsety, unsigned int time, int type) {
+void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx,
+								   int32_t offsety, uint32_t time,
+								   int32_t type) {
 	Client *tc = NULL;
 	float delta_x, delta_y;
 	Client *next = NULL;
@@ -70,7 +75,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 		// 记录初始状态
 		grabc->old_master_mfact_per = grabc->master_mfact_per;
 		grabc->old_master_inner_per = grabc->master_inner_per;
-		grabc->old_stack_innder_per = grabc->stack_innder_per;
+		grabc->old_stack_inner_per = grabc->stack_inner_per;
 		grabc->cursor_in_upper_half =
 			cursor->y < grabc->geom.y + grabc->geom.height / 2;
 		grabc->cursor_in_left_half =
@@ -86,7 +91,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 		} else {
 			grabc->old_master_mfact_per = grabc->master_mfact_per;
 			grabc->old_master_inner_per = grabc->master_inner_per;
-			grabc->old_stack_innder_per = grabc->stack_innder_per;
+			grabc->old_stack_inner_per = grabc->stack_inner_per;
 			grabc->drag_begin_geom = grabc->geom;
 			grabc->cursor_in_upper_half = true;
 			grabc->cursor_in_left_half = false;
@@ -100,7 +105,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 		} else {
 			delta_x = (float)(offsetx) * (1 - grabc->old_master_mfact_per) /
 					  grabc->drag_begin_geom.width;
-			delta_y = (float)(offsety) * (grabc->old_stack_innder_per) /
+			delta_y = (float)(offsety) * (grabc->old_stack_inner_per) /
 					  grabc->drag_begin_geom.height;
 		}
 		bool moving_up;
@@ -182,12 +187,12 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 		// 直接设置新的比例，基于初始值 + 变化量
 		float new_master_mfact_per = grabc->old_master_mfact_per + delta_x;
 		float new_master_inner_per = grabc->old_master_inner_per + delta_y;
-		float new_stack_innder_per = grabc->old_stack_innder_per + delta_y;
+		float new_stack_inner_per = grabc->old_stack_inner_per + delta_y;
 
 		// 应用限制，确保比例在合理范围内
 		new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per));
 		new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per));
-		new_stack_innder_per = fmaxf(0.1f, fminf(0.9f, new_stack_innder_per));
+		new_stack_inner_per = fmaxf(0.1f, fminf(0.9f, new_stack_inner_per));
 
 		// 应用到所有平铺窗口
 		wl_list_for_each(tc, &clients, link) {
@@ -197,23 +202,23 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int offsetx,
 		}
 
 		grabc->master_inner_per = new_master_inner_per;
-		grabc->stack_innder_per = new_stack_innder_per;
+		grabc->stack_inner_per = new_stack_inner_per;
 
 		if (!isdrag) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			return;
 		}
 
 		if (last_apply_drap_time == 0 ||
 			time - last_apply_drap_time > drag_refresh_interval) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}
 	}
 }
 
-void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
-								 int offsety, unsigned int time, int type) {
+void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx,
+								 int32_t offsety, uint32_t time, int32_t type) {
 	Client *tc = NULL;
 	float delta_x, delta_y;
 	Client *next = NULL;
@@ -250,7 +255,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 		// 记录初始状态
 		grabc->old_master_mfact_per = grabc->master_mfact_per;
 		grabc->old_master_inner_per = grabc->master_inner_per;
-		grabc->old_stack_innder_per = grabc->stack_innder_per;
+		grabc->old_stack_inner_per = grabc->stack_inner_per;
 		grabc->cursor_in_upper_half =
 			cursor->y < grabc->geom.y + grabc->geom.height / 2;
 		grabc->cursor_in_left_half =
@@ -267,7 +272,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 		} else {
 			grabc->old_master_mfact_per = grabc->master_mfact_per;
 			grabc->old_master_inner_per = grabc->master_inner_per;
-			grabc->old_stack_innder_per = grabc->stack_innder_per;
+			grabc->old_stack_inner_per = grabc->stack_inner_per;
 			grabc->drag_begin_geom = grabc->geom;
 			grabc->cursor_in_upper_half = true;
 			grabc->cursor_in_left_half = false;
@@ -280,7 +285,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 			delta_y = (float)(offsety) * (grabc->old_master_mfact_per) /
 					  grabc->drag_begin_geom.height;
 		} else {
-			delta_x = (float)(offsetx) * (grabc->old_stack_innder_per) /
+			delta_x = (float)(offsetx) * (grabc->old_stack_inner_per) /
 					  grabc->drag_begin_geom.width;
 			delta_y = (float)(offsety) * (1 - grabc->old_master_mfact_per) /
 					  grabc->drag_begin_geom.height;
@@ -338,13 +343,13 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 									 delta_y; // 垂直：delta_y调整主区域高度
 		float new_master_inner_per = grabc->old_master_inner_per +
 									 delta_x; // 垂直：delta_x调整主区域内部宽度
-		float new_stack_innder_per = grabc->old_stack_innder_per +
-									 delta_x; // 垂直：delta_x调整栈区域内部宽度
+		float new_stack_inner_per = grabc->old_stack_inner_per +
+									delta_x; // 垂直：delta_x调整栈区域内部宽度
 
 		// 应用限制，确保比例在合理范围内
 		new_master_mfact_per = fmaxf(0.1f, fminf(0.9f, new_master_mfact_per));
 		new_master_inner_per = fmaxf(0.1f, fminf(0.9f, new_master_inner_per));
-		new_stack_innder_per = fmaxf(0.1f, fminf(0.9f, new_stack_innder_per));
+		new_stack_inner_per = fmaxf(0.1f, fminf(0.9f, new_stack_inner_per));
 
 		// 应用到所有平铺窗口
 		wl_list_for_each(tc, &clients, link) {
@@ -354,23 +359,23 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int offsetx,
 		}
 
 		grabc->master_inner_per = new_master_inner_per;
-		grabc->stack_innder_per = new_stack_innder_per;
+		grabc->stack_inner_per = new_stack_inner_per;
 
 		if (!isdrag) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			return;
 		}
 
 		if (last_apply_drap_time == 0 ||
 			time - last_apply_drap_time > drag_refresh_interval) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}
 	}
 }
 
-void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
-						  unsigned int time, bool isvertical) {
+void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
+						  int32_t offsety, uint32_t time, bool isvertical) {
 	float delta_x, delta_y;
 	float new_scroller_proportion;
 
@@ -402,7 +407,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
 		} else {
 			grabc->old_master_mfact_per = grabc->master_mfact_per;
 			grabc->old_master_inner_per = grabc->master_inner_per;
-			grabc->old_stack_innder_per = grabc->stack_innder_per;
+			grabc->old_stack_inner_per = grabc->stack_inner_per;
 			grabc->drag_begin_geom = grabc->geom;
 			grabc->old_scroller_pproportion = grabc->scroller_proportion;
 			grabc->cursor_in_upper_half = false;
@@ -461,20 +466,20 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int offsetx, int offsety,
 		grabc->scroller_proportion = new_scroller_proportion;
 
 		if (!isdrag) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			return;
 		}
 
 		if (last_apply_drap_time == 0 ||
 			time - last_apply_drap_time > drag_refresh_interval) {
-			arrange(grabc->mon, false);
+			arrange(grabc->mon, false, false);
 			last_apply_drap_time = time;
 		}
 	}
 }
 
-void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
-						unsigned int time) {
+void resize_tile_client(Client *grabc, bool isdrag, int32_t offsetx,
+						int32_t offsety, uint32_t time) {
 
 	if (!grabc || grabc->isfullscreen || grabc->ismaximizescreen)
 		return;
@@ -485,7 +490,8 @@ void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
 	const Layout *current_layout =
 		grabc->mon->pertag->ltidxs[grabc->mon->pertag->curtag];
 	if (current_layout->id == TILE || current_layout->id == DECK ||
-		current_layout->id == CENTER_TILE || current_layout->id == RIGHT_TILE
+		current_layout->id == CENTER_TILE || current_layout->id == RIGHT_TILE ||
+		(current_layout->id == TGMIX && grabc->mon->visible_tiling_clients <= 3)
 
 	) {
 		resize_tile_master_horizontal(grabc, isdrag, offsetx, offsety, time,
@@ -503,35 +509,33 @@ void resize_tile_client(Client *grabc, bool isdrag, int offsetx, int offsety,
 	}
 }
 
-void reset_size_per_mon(Monitor *m, int tile_cilent_num,
+void reset_size_per_mon(Monitor *m, int32_t tile_cilent_num,
 						double total_left_stack_hight_percent,
 						double total_right_stack_hight_percent,
 						double total_stack_hight_percent,
-						double total_master_inner_percent, int master_num,
-						int stack_num) {
+						double total_master_inner_percent, int32_t master_num,
+						int32_t stack_num) {
 	Client *c = NULL;
-	int i = 0;
-	unsigned int stack_index = 0;
-	unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
+	int32_t i = 0;
+	uint32_t stack_index = 0;
+	uint32_t 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)
-					return;
-				if (i < m->pertag->nmasters[m->pertag->curtag]) {
+				if (total_master_inner_percent > 0.0 && i < nmasters) {
 					c->ismaster = true;
-					c->stack_innder_per = stack_num ? 1.0f / stack_num : 1.0f;
+					c->stack_inner_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 = 1.0f / master_num;
-					c->stack_innder_per =
+					c->master_inner_per =
+						master_num > 0 ? 1.0f / master_num : 1.0f;
+					c->stack_inner_per =
 						total_stack_hight_percent
-							? c->stack_innder_per / total_stack_hight_percent
+							? c->stack_inner_per / total_stack_hight_percent
 							: 1.0f;
 				}
 				i++;
@@ -540,17 +544,14 @@ 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)
-					return;
-				if (i < m->pertag->nmasters[m->pertag->curtag]) {
+				if (total_master_inner_percent > 0.0 && i < nmasters) {
 					c->ismaster = true;
 					if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
-						c->stack_innder_per =
+						c->stack_inner_per =
 							stack_num > 1 ? 1.0f / ((stack_num - 1) / 2) : 1.0f;
 
 					} else {
-						c->stack_innder_per =
+						c->stack_inner_per =
 							stack_num > 1 ? 2.0f / stack_num : 1.0f;
 					}
 
@@ -560,17 +561,18 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
 					stack_index = i - nmasters;
 
 					c->ismaster = false;
-					c->master_inner_per = 1.0f / master_num;
+					c->master_inner_per =
+						master_num > 0 ? 1.0f / master_num : 1.0f;
 					if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
-						c->stack_innder_per =
+						c->stack_inner_per =
 							total_right_stack_hight_percent
-								? c->stack_innder_per /
+								? c->stack_inner_per /
 									  total_right_stack_hight_percent
 								: 1.0f;
 					} else {
-						c->stack_innder_per =
+						c->stack_inner_per =
 							total_left_stack_hight_percent
-								? c->stack_innder_per /
+								? c->stack_inner_per /
 									  total_left_stack_hight_percent
 								: 1.0f;
 					}
@@ -582,17 +584,17 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
 }
 
 void // 17
-arrange(Monitor *m, bool want_animation) {
+arrange(Monitor *m, bool want_animation, bool from_view) {
 	Client *c = NULL;
-	double total_stack_innder_percent = 0;
+	double total_stack_inner_percent = 0;
 	double total_master_inner_percent = 0;
 	double total_right_stack_hight_percent = 0;
 	double total_left_stack_hight_percent = 0;
-	int i = 0;
-	int nmasters = 0;
-	int stack_index = 0;
-	int master_num = 0;
-	int stack_num = 0;
+	int32_t i = 0;
+	int32_t nmasters = 0;
+	int32_t stack_index = 0;
+	int32_t master_num = 0;
+	int32_t stack_num = 0;
 
 	if (!m)
 		return;
@@ -602,10 +604,13 @@ arrange(Monitor *m, bool want_animation) {
 	m->visible_clients = 0;
 	m->visible_tiling_clients = 0;
 	m->visible_scroll_tiling_clients = 0;
-	m->has_visible_fullscreen_client = false;
 
 	wl_list_for_each(c, &clients, link) {
 
+		if (from_view && (c->isglobal || c->isunglobal)) {
+			set_size_per(m, c);
+		}
+
 		if (c->mon == m && (c->isglobal || c->isunglobal)) {
 			c->tags = m->tagset[m->seltags];
 			if (c->mon->sel == NULL)
@@ -613,12 +618,13 @@ arrange(Monitor *m, bool want_animation) {
 		}
 
 		if (VISIBLEON(c, m)) {
+			if (from_view && !client_only_in_one_tag(c)) {
+				set_size_per(m, c);
+			}
+
 			if (!c->isunglobal)
 				m->visible_clients++;
 
-			if (c->isfullscreen)
-				m->has_visible_fullscreen_client = true;
-
 			if (ISTILED(c)) {
 				m->visible_tiling_clients++;
 			}
@@ -639,22 +645,22 @@ arrange(Monitor *m, bool want_animation) {
 			if (VISIBLEON(c, m)) {
 				if (ISTILED(c)) {
 
-					if (i < m->pertag->nmasters[m->pertag->curtag]) {
+					if (i < nmasters) {
 						master_num++;
 						total_master_inner_percent += c->master_inner_per;
 					} else {
 						stack_num++;
-						total_stack_innder_percent += c->stack_innder_per;
+						total_stack_inner_percent += c->stack_inner_per;
 						stack_index = i - nmasters;
 						if ((stack_index % 2) ^
 							(m->visible_tiling_clients % 2 == 0)) {
 							c->isleftstack = false;
 							total_right_stack_hight_percent +=
-								c->stack_innder_per;
+								c->stack_inner_per;
 						} else {
 							c->isleftstack = true;
 							total_left_stack_hight_percent +=
-								c->stack_innder_per;
+								c->stack_inner_per;
 						}
 					}
 
@@ -675,7 +681,7 @@ arrange(Monitor *m, bool want_animation) {
 
 	reset_size_per_mon(
 		m, m->visible_tiling_clients, total_left_stack_hight_percent,
-		total_right_stack_hight_percent, total_stack_innder_percent,
+		total_right_stack_hight_percent, total_stack_inner_percent,
 		total_master_inner_percent, master_num, stack_num);
 
 	if (m->isoverview) {
@@ -688,4 +694,6 @@ arrange(Monitor *m, bool want_animation) {
 		motionnotify(0, NULL, 0, 0, 0, 0);
 		checkidleinhibitor(NULL);
 	}
+
+	printstatus();
 }

src/layout/horizontal.h

@@ -1,13 +1,15 @@
 // 网格布局窗口大小和位置计算
 void grid(Monitor *m) {
-	unsigned int i, n;
-	unsigned int cx, cy, cw, ch;
-	unsigned int dx;
-	unsigned int cols, rows, overcols;
+	int32_t i, n;
+	int32_t cx, cy, cw, ch;
+	int32_t dx;
+	int32_t cols, rows, overcols;
 	Client *c = NULL;
 	n = 0;
-	int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappoh : 0;
-	int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappih : 0;
+	int32_t target_gappo =
+		enablegaps ? m->isoverview ? overviewgappo : gappoh : 0;
+	int32_t target_gappi =
+		enablegaps ? m->isoverview ? overviewgappi : gappih : 0;
 	float single_width_ratio = m->isoverview ? 0.7 : 0.9;
 	float single_height_ratio = m->isoverview ? 0.8 : 0.9;
 
@@ -23,10 +25,6 @@ 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;
@@ -49,10 +47,6 @@ 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) {
@@ -99,10 +93,7 @@ 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);
@@ -121,15 +112,15 @@ void grid(Monitor *m) {
 }
 
 void deck(Monitor *m) {
-	unsigned int mw, my;
-	int i, n = 0;
+	int32_t mw, my;
+	int32_t i, n = 0;
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
 
-	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappih = enablegaps ? m->gappih : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t 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;
@@ -192,9 +183,9 @@ void deck(Monitor *m) {
 void horizontal_scroll_adjust_fullandmax(Client *c,
 										 struct wlr_box *target_geom) {
 	Monitor *m = c->mon;
-	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappih = enablegaps ? m->gappih : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappih =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -223,17 +214,17 @@ void horizontal_scroll_adjust_fullandmax(Client *c,
 
 // 滚动布局
 void scroller(Monitor *m) {
-	unsigned int i, n, j;
+	int32_t i, n, j;
 	float single_proportion = 1.0;
 
 	Client *c = NULL, *root_client = NULL;
 	Client **tempClients = NULL; // 初始化为 NULL
 	struct wlr_box target_geom;
-	int focus_client_index = 0;
+	int32_t focus_client_index = 0;
 	bool need_scroller = false;
-	unsigned int cur_gappih = enablegaps ? m->gappih : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappih = enablegaps ? m->gappih : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
 
 	cur_gappih =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappih;
@@ -242,8 +233,7 @@ void scroller(Monitor *m) {
 	cur_gappov =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappov;
 
-	unsigned int max_client_width =
-		m->w.width - 2 * scroller_structs - cur_gappih;
+	int32_t max_client_width = m->w.width - 2 * scroller_structs - cur_gappih;
 
 	n = m->visible_scroll_tiling_clients;
 
@@ -284,7 +274,7 @@ void scroller(Monitor *m) {
 		return;
 	}
 
-	if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
+	if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) {
 		root_client = m->sel;
 	} else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
 			   VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -584,15 +574,17 @@ void dual_scroller(Monitor *m) {
 }
 
 void center_tile(Monitor *m) {
-	unsigned int i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw;
+	int32_t i, n = 0, h, r, ie = enablegaps, mw, mx, my, oty, ety, tw;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
-	int master_num = 0;
-	int stack_num = 0;
+	int32_t master_num = 0;
+	int32_t stack_num = 0;
 
 	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)
@@ -605,10 +597,10 @@ void center_tile(Monitor *m) {
 	}
 
 	// 间隙参数处理
-	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; // 外部水平间隙
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0; // 内部垂直间隙
+	int32_t cur_gappih = enablegaps ? m->gappih : 0; // 内部水平间隙
+	int32_t cur_gappov = enablegaps ? m->gappov : 0; // 外部垂直间隙
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0; // 外部水平间隙
 
 	// 智能间隙处理
 	cur_gappiv = smartgaps && m->visible_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -616,7 +608,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;
 
-	unsigned int nmasters = m->pertag->nmasters[m->pertag->curtag];
+	int32_t nmasters = m->pertag->nmasters[m->pertag->curtag];
 	mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per
 										: m->pertag->mfacts[m->pertag->curtag];
 
@@ -627,7 +619,20 @@ void center_tile(Monitor *m) {
 	tw = mw;
 
 	// 判断是否需要主区域铺满
-	int should_overspread = center_master_overspread && (n <= nmasters);
+	int32_t should_overspread = center_master_overspread && (n <= nmasters);
+
+	int32_t master_surplus_height =
+		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
+	float master_surplus_ratio = 1.0;
+
+	int32_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;
+
+	int32_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) {
 		// 计算主区域宽度（居中模式）
@@ -673,9 +678,11 @@ void center_tile(Monitor *m) {
 			// 主区域窗口
 			r = MIN(n, nmasters) - i;
 			if (c->master_inner_per > 0.0f) {
-				h = (m->w.height - 2 * cur_gappov -
-					 cur_gappiv * ie * (master_num - 1)) *
-					c->master_inner_per;
+				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;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -695,26 +702,26 @@ void center_tile(Monitor *m) {
 			my += c->geom.height + cur_gappiv * ie;
 		} else {
 			// 堆叠区域窗口
-			unsigned int stack_index = i - nmasters;
+			int32_t stack_index = i - nmasters;
 
 			if (n - nmasters == 1) {
 				// 单个堆叠窗口
 				r = n - i;
-				if (c->stack_innder_per > 0.0f) {
+				if (c->stack_inner_per > 0.0f) {
 					h = (m->w.height - 2 * cur_gappov -
 						 cur_gappiv * ie * (stack_num - 1)) *
-						c->stack_innder_per;
+						c->stack_inner_per;
 					c->master_mfact_per = mfact;
 				} else {
 					h = (m->w.height - ety - cur_gappov -
 						 cur_gappiv * ie * (r - 1)) /
 						r;
-					c->stack_innder_per = h / (m->w.height - ety - cur_gappov -
-											   cur_gappiv * ie * (r - 1));
+					c->stack_inner_per = h / (m->w.height - ety - cur_gappov -
+											  cur_gappiv * ie * (r - 1));
 					c->master_mfact_per = mfact;
 				}
 
-				int stack_x;
+				int32_t stack_x;
 				if (center_when_single_stack) {
 					// 放在右侧（master居中时，stack在右边）
 					stack_x = m->w.x + mx + mw + cur_gappih * ie;
@@ -736,22 +743,25 @@ void center_tile(Monitor *m) {
 
 				if ((stack_index % 2) ^ (n % 2 == 0)) {
 					// 右侧堆叠窗口
-					if (c->stack_innder_per > 0.0f) {
-						h = (m->w.height - 2 * cur_gappov -
-							 cur_gappiv * ie * ((stack_num + 1) / 2 - 1)) *
-							c->stack_innder_per;
+					if (c->stack_inner_per > 0.0f) {
+						h = slave_right_surplus_height * c->stack_inner_per /
+							slave_right_surplus_ratio;
+						slave_right_surplus_height =
+							slave_right_surplus_height - h;
+						slave_right_surplus_ratio =
+							slave_right_surplus_ratio - c->stack_inner_per;
 						c->master_mfact_per = mfact;
 					} else {
 						h = (m->w.height - ety - cur_gappov -
 							 cur_gappiv * ie * (r - 1)) /
 							r;
-						c->stack_innder_per =
+						c->stack_inner_per =
 							h / (m->w.height - ety - cur_gappov -
 								 cur_gappiv * ie * (r - 1));
 						c->master_mfact_per = mfact;
 					}
 
-					int stack_x = m->w.x + mx + mw + cur_gappih * ie;
+					int32_t stack_x = m->w.x + mx + mw + cur_gappih * ie;
 
 					resize(c,
 						   (struct wlr_box){.x = stack_x,
@@ -762,22 +772,25 @@ void center_tile(Monitor *m) {
 					ety += c->geom.height + cur_gappiv * ie;
 				} else {
 					// 左侧堆叠窗口
-					if (c->stack_innder_per > 0.0f) {
-						h = (m->w.height - 2 * cur_gappov -
-							 cur_gappiv * ie * (stack_num / 2 - 1)) *
-							c->stack_innder_per;
+					if (c->stack_inner_per > 0.0f) {
+						h = slave_left_surplus_height * c->stack_inner_per /
+							slave_left_surplus_ratio;
+						slave_left_surplus_height =
+							slave_left_surplus_height - h;
+						slave_left_surplus_ratio =
+							slave_left_surplus_ratio - c->stack_inner_per;
 						c->master_mfact_per = mfact;
 					} else {
 						h = (m->w.height - oty - cur_gappov -
 							 cur_gappiv * ie * (r - 1)) /
 							r;
-						c->stack_innder_per =
+						c->stack_inner_per =
 							h / (m->w.height - oty - cur_gappov -
 								 cur_gappiv * ie * (r - 1));
 						c->master_mfact_per = mfact;
 					}
 
-					int stack_x = m->w.x + cur_gappoh;
+					int32_t stack_x = m->w.x + cur_gappoh;
 					resize(c,
 						   (struct wlr_box){.x = stack_x,
 											.y = m->w.y + oty,
@@ -793,24 +806,25 @@ void center_tile(Monitor *m) {
 }
 
 void tile(Monitor *m) {
-	unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
+	int32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
-	int master_num = 0;
-	int stack_num = 0;
+	int32_t master_num = 0;
+	int32_t stack_num = 0;
 
 	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;
 
-	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;
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gappih = enablegaps ? m->gappih : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t 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;
@@ -834,15 +848,26 @@ void tile(Monitor *m) {
 		mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
 	i = 0;
 	my = ty = cur_gappov;
+
+	int32_t master_surplus_height =
+		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
+	float master_surplus_ratio = 1.0;
+
+	int32_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 = (m->w.height - 2 * cur_gappov -
-					 cur_gappiv * ie * (master_num - 1)) *
-					c->master_inner_per;
+				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;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -861,21 +886,22 @@ void tile(Monitor *m) {
 			my += c->geom.height + cur_gappiv * ie;
 		} else {
 			r = n - i;
-			if (c->stack_innder_per > 0.0f) {
-				h = (m->w.height - 2 * cur_gappov -
-					 cur_gappiv * ie * (stack_num - 1)) *
-					c->stack_innder_per;
+			if (c->stack_inner_per > 0.0f) {
+				h = slave_surplus_height * c->stack_inner_per /
+					slave_surplus_ratio;
+				slave_surplus_height = slave_surplus_height - h;
+				slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - ty - cur_gappov -
 					 cur_gappiv * ie * (r - 1)) /
 					r;
-				c->stack_innder_per = h / (m->w.height - ty - cur_gappov -
-										   cur_gappiv * ie * (r - 1));
+				c->stack_inner_per = h / (m->w.height - ty - cur_gappov -
+										  cur_gappiv * ie * (r - 1));
 				c->master_mfact_per = mfact;
 			}
 
-			// wlr_log(WLR_ERROR, "stack_innder_per: %f", c->stack_innder_per);
+			// wlr_log(WLR_ERROR, "stack_inner_per: %f", c->stack_inner_per);
 
 			resize(c,
 				   (struct wlr_box){.x = m->w.x + mw + cur_gappoh,
@@ -890,24 +916,25 @@ void tile(Monitor *m) {
 }
 
 void right_tile(Monitor *m) {
-	unsigned int i, n = 0, h, r, ie = enablegaps, mw, my, ty;
+	int32_t i, n = 0, h, r, ie = enablegaps, mw, my, ty;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
-	int master_num = 0;
-	int stack_num = 0;
+	int32_t master_num = 0;
+	int32_t stack_num = 0;
 
 	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;
 
-	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;
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gappih = enablegaps ? m->gappih : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t 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;
@@ -931,15 +958,26 @@ void right_tile(Monitor *m) {
 		mw = m->w.width - 2 * cur_gappoh + cur_gappih * ie;
 	i = 0;
 	my = ty = cur_gappov;
+
+	int32_t master_surplus_height =
+		(m->w.height - 2 * cur_gappov - cur_gappiv * ie * (master_num - 1));
+	float master_surplus_ratio = 1.0;
+
+	int32_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 = (m->w.height - 2 * cur_gappov -
-					 cur_gappiv * ie * (master_num - 1)) *
-					c->master_inner_per;
+				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;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - my - cur_gappov -
@@ -959,21 +997,22 @@ void right_tile(Monitor *m) {
 			my += c->geom.height + cur_gappiv * ie;
 		} else {
 			r = n - i;
-			if (c->stack_innder_per > 0.0f) {
-				h = (m->w.height - 2 * cur_gappov -
-					 cur_gappiv * ie * (stack_num - 1)) *
-					c->stack_innder_per;
+			if (c->stack_inner_per > 0.0f) {
+				h = slave_surplus_height * c->stack_inner_per /
+					slave_surplus_ratio;
+				slave_surplus_height = slave_surplus_height - h;
+				slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				h = (m->w.height - ty - cur_gappov -
 					 cur_gappiv * ie * (r - 1)) /
 					r;
-				c->stack_innder_per = h / (m->w.height - ty - cur_gappov -
-										   cur_gappiv * ie * (r - 1));
+				c->stack_inner_per = h / (m->w.height - ty - cur_gappov -
+										  cur_gappiv * ie * (r - 1));
 				c->master_mfact_per = mfact;
 			}
 
-			// wlr_log(WLR_ERROR, "stack_innder_per: %f", c->stack_innder_per);
+			// wlr_log(WLR_ERROR, "stack_inner_per: %f", c->stack_inner_per);
 
 			resize(c,
 				   (struct wlr_box){.x = m->w.x + cur_gappoh,
@@ -992,8 +1031,8 @@ monocle(Monitor *m) {
 	Client *c = NULL;
 	struct wlr_box geom;
 
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t 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;
@@ -1010,3 +1049,14 @@ monocle(Monitor *m) {
 	if ((c = focustop(m)))
 		wlr_scene_node_raise_to_top(&c->scene->node);
 }
+
+void tgmix(Monitor *m) {
+	int32_t n = m->visible_tiling_clients;
+	if (n <= 3) {
+		tile(m);
+		return;
+	} else {
+		grid(m);
+		return;
+	}
+}

src/layout/layout.h

@@ -12,6 +12,7 @@ static void vertical_grid(Monitor *m);
 static void vertical_scroller(Monitor *m);
 static void vertical_deck(Monitor *mon);
 static void dual_scroller(Monitor *mon);
+static void tgmix(Monitor *m);
 
 /* layout(s) */
 Layout overviewlayout = {"󰃇", overview, "overview"};
@@ -29,6 +30,7 @@ enum {
 	VERTICAL_DECK,
 	RIGHT_TILE,
 	DUAL_SCROLLER,
+	TGMIX,
 };
 
 Layout layouts[] = {
@@ -47,4 +49,5 @@ Layout layouts[] = {
 	{"VG", vertical_grid, "vertical_grid", VERTICAL_GRID}, // 垂直格子布局
 	{"VK", vertical_deck, "vertical_deck", VERTICAL_DECK}, // 垂直卡片布局
 	{"DS", dual_scroller, "dual_scroller", DUAL_SCROLLER}, // 双行滚动布局
-};
+	{"TG", tgmix, "tgmix", TGMIX},						   // 混合布局
+};

src/layout/vertical.h

@@ -1,22 +1,23 @@
 void vertical_tile(Monitor *m) {
-	unsigned int i, n = 0, w, r, ie = enablegaps, mh, mx, tx;
+	int32_t i, n = 0, w, r, ie = enablegaps, mh, mx, tx;
 	Client *c = NULL;
 	Client *fc = NULL;
 	double mfact = 0;
-	int master_num = 0;
-	int stack_num = 0;
+	int32_t master_num = 0;
+	int32_t stack_num = 0;
 
 	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;
 
-	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;
+	int32_t cur_gapih = enablegaps ? m->gappih : 0;
+	int32_t cur_gapiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gapoh = enablegaps ? m->gappoh : 0;
+	int32_t 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;
@@ -39,16 +40,27 @@ void vertical_tile(Monitor *m) {
 		mh = m->w.height - 2 * cur_gapov + cur_gapiv * ie;
 
 	i = 0;
-	mx = tx = cur_gapih;
+	mx = tx = cur_gapoh;
+
+	int32_t master_surplus_width =
+		(m->w.width - 2 * cur_gapoh - cur_gapih * ie * (master_num - 1));
+	float master_surplus_ratio = 1.0;
+
+	int32_t slave_surplus_width =
+		(m->w.width - 2 * cur_gapoh - 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 = (m->w.width - 2 * cur_gapih -
-					 cur_gapih * ie * (master_num - 1)) *
-					c->master_inner_per;
+				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;
 				c->master_mfact_per = mfact;
 			} else {
 				w = (m->w.width - mx - cur_gapih - cur_gapih * ie * (r - 1)) /
@@ -66,16 +78,17 @@ void vertical_tile(Monitor *m) {
 			mx += c->geom.width + cur_gapih * ie;
 		} else {
 			r = n - i;
-			if (c->stack_innder_per > 0.0f) {
-				w = (m->w.width - 2 * cur_gapih -
-					 cur_gapih * ie * (stack_num - 1)) *
-					c->stack_innder_per;
+			if (c->stack_inner_per > 0.0f) {
+				w = slave_surplus_width * c->stack_inner_per /
+					slave_surplus_ratio;
+				slave_surplus_width = slave_surplus_width - w;
+				slave_surplus_ratio = slave_surplus_ratio - c->stack_inner_per;
 				c->master_mfact_per = mfact;
 			} else {
 				w = (m->w.width - tx - cur_gapih - cur_gapih * ie * (r - 1)) /
 					r;
-				c->stack_innder_per = w / (m->w.width - tx - cur_gapih -
-										   cur_gapih * ie * (r - 1));
+				c->stack_inner_per = w / (m->w.width - tx - cur_gapih -
+										  cur_gapih * ie * (r - 1));
 				c->master_mfact_per = mfact;
 			}
 
@@ -92,15 +105,15 @@ void vertical_tile(Monitor *m) {
 }
 
 void vertical_deck(Monitor *m) {
-	unsigned int mh, mx;
-	int i, n = 0;
+	int32_t mh, mx;
+	int32_t i, n = 0;
 	Client *c = NULL;
 	Client *fc = NULL;
 	float mfact;
 
-	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t 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;
@@ -157,9 +170,9 @@ void vertical_deck(Monitor *m) {
 
 void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
 	Monitor *m = c->mon;
-	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -188,17 +201,17 @@ void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
 
 // 竖屏滚动布局
 void vertical_scroller(Monitor *m) {
-	unsigned int i, n, j;
+	int32_t i, n, j;
 	float single_proportion = 1.0;
 
 	Client *c = NULL, *root_client = NULL;
 	Client **tempClients = NULL;
 	struct wlr_box target_geom;
-	int focus_client_index = 0;
+	int32_t focus_client_index = 0;
 	bool need_scroller = false;
-	unsigned int cur_gappiv = enablegaps ? m->gappiv : 0;
-	unsigned int cur_gappov = enablegaps ? m->gappov : 0;
-	unsigned int cur_gappoh = enablegaps ? m->gappoh : 0;
+	int32_t cur_gappiv = enablegaps ? m->gappiv : 0;
+	int32_t cur_gappov = enablegaps ? m->gappov : 0;
+	int32_t cur_gappoh = enablegaps ? m->gappoh : 0;
 
 	cur_gappiv =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappiv;
@@ -207,8 +220,7 @@ void vertical_scroller(Monitor *m) {
 	cur_gappoh =
 		smartgaps && m->visible_scroll_tiling_clients == 1 ? 0 : cur_gappoh;
 
-	unsigned int max_client_height =
-		m->w.height - 2 * scroller_structs - cur_gappiv;
+	int32_t max_client_height = m->w.height - 2 * scroller_structs - cur_gappiv;
 
 	n = m->visible_scroll_tiling_clients;
 
@@ -246,7 +258,7 @@ void vertical_scroller(Monitor *m) {
 		return;
 	}
 
-	if (m->sel && !client_is_unmanaged(m->sel) && !m->sel->isfloating) {
+	if (m->sel && !client_is_unmanaged(m->sel) && ISSCROLLTILED(m->sel)) {
 		root_client = m->sel;
 	} else if (m->prevsel && ISSCROLLTILED(m->prevsel) &&
 			   VISIBLEON(m->prevsel, m) && !client_is_unmanaged(m->prevsel)) {
@@ -341,13 +353,15 @@ void vertical_scroller(Monitor *m) {
 }
 
 void vertical_grid(Monitor *m) {
-	unsigned int i, n;
-	unsigned int cx, cy, cw, ch;
-	unsigned int dy;
-	unsigned int rows, cols, overrows;
+	int32_t i, n;
+	int32_t cx, cy, cw, ch;
+	int32_t dy;
+	int32_t rows, cols, overrows;
 	Client *c = NULL;
-	int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappov : 0;
-	int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
+	int32_t target_gappo =
+		enablegaps ? m->isoverview ? overviewgappo : gappov : 0;
+	int32_t target_gappi =
+		enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
 	float single_width_ratio = m->isoverview ? 0.7 : 0.9;
 	float single_height_ratio = m->isoverview ? 0.8 : 0.9;
 
@@ -363,10 +377,6 @@ 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;
@@ -390,10 +400,6 @@ 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) {
@@ -436,10 +442,6 @@ 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);