From 186259cf44ea0261c6e3bf30b82eb211e576cc09 Mon Sep 17 00:00:00 2001 From: DreamMaoMao <2523610504@qq.com> Date: Wed, 1 Jul 2026 11:58:03 +0800 Subject: [PATCH] opt: Optimize some function names --- src/animation/client.h | 28 ++++++++++++++-------------- src/dispatch/bind_define.h | 2 +- src/mango.c | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/animation/client.h b/src/animation/client.h index 769846af..1e4dfe3d 100644 --- a/src/animation/client.h +++ b/src/animation/client.h @@ -412,7 +412,7 @@ void client_draw_shadow(Client *c) { wlr_scene_shadow_set_clipped_region(c->shadow, clipped_region); } -void client_draw_title(Client *c) { +void client_draw_groupbar(Client *c) { if (!c || !c->group_bar) return; @@ -500,7 +500,7 @@ void client_draw_title(Client *c) { } } -void apply_shield(Client *c, struct wlr_box clip_box) { +void client_draw_shield(Client *c, struct wlr_box clip_box) { if (clip_box.width <= 0 || clip_box.height <= 0) { wlr_scene_node_set_enabled(&c->shield->node, false); @@ -571,7 +571,7 @@ void global_draw_group_bar(Client *c, int32_t x, int32_t y, int32_t width, mango_group_bar_set_size(c->group_bar, width, height); } -void apply_split_border(Client *c, bool hit_no_border) { +void client_draw_split_border(Client *c, bool hit_no_border) { if (c->iskilling || !c->mon || !client_surface(c)->mapped) return; @@ -662,7 +662,7 @@ void apply_split_border(Client *c, bool hit_no_border) { border_right_y); } -void apply_border(Client *c) { +void client_draw_border(Client *c) { if (!c || c->iskilling || !client_surface(c)->mapped) return; @@ -681,7 +681,7 @@ void apply_border(Client *c) { } bool hit_no_border = check_hit_no_border(c); - apply_split_border(c, hit_no_border); + client_draw_split_border(c, hit_no_border); struct fx_corner_radii current_corner_location = c->isfullscreen || (config.no_radius_when_single && c->mon && @@ -1051,11 +1051,11 @@ void client_apply_clip(Client *c, float factor) { offset = clip_to_hide(c, &clip_box); - apply_border(c); + client_draw_border(c); client_draw_shadow(c); - client_draw_title(c); + client_draw_groupbar(c); client_draw_blur(c, clip_box, offset); - apply_shield(c, clip_box); + client_draw_shield(c, clip_box); if (clip_box.width <= 0 || clip_box.height <= 0) { should_render_client_surface = false; @@ -1103,10 +1103,10 @@ void client_apply_clip(Client *c, float factor) { offset = clip_to_hide(c, &clip_box); // 应用窗口装饰 - apply_border(c); + client_draw_border(c); client_draw_shadow(c); - client_draw_title(c); - apply_shield(c, clip_box); + client_draw_groupbar(c); + client_draw_shield(c, clip_box); client_draw_blur(c, clip_box, offset); // 如果窗口剪切区域已经剪切到0,则不渲染窗口表面 @@ -1553,11 +1553,11 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) { c->geom; wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); - apply_border(c); + client_draw_border(c); client_get_clip(c, &clip); - apply_shield(c, clip); + client_draw_shield(c, clip); client_draw_shadow(c); - client_draw_title(c); + client_draw_groupbar(c); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip); if (config.blur && !c->noblur) wlr_scene_blur_set_size(c->blur, diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h index 63f6206e..c449f53d 100644 --- a/src/dispatch/bind_define.h +++ b/src/dispatch/bind_define.h @@ -2148,7 +2148,7 @@ int32_t dwindle_set_split_direction(Client *c, bool istoggle, bool horizontal) { leaf->custom_leaf_split_h = false; } bool hit_no_border = check_hit_no_border(c); - apply_split_border(c, hit_no_border); + client_draw_split_border(c, hit_no_border); return 0; } diff --git a/src/mango.c b/src/mango.c index 0f1c8987..056d7b6d 100644 --- a/src/mango.c +++ b/src/mango.c @@ -848,7 +848,7 @@ get_nearest_output_mode(struct wlr_output *output, int32_t width, static void client_commit(Client *c); static void layer_commit(LayerSurface *l); -static void apply_border(Client *c); +static void client_draw_border(Client *c); static void client_set_opacity(Client *c, double opacity); static void init_baked_points(void); static void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer,