mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-14 08:22:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

opt: reduce Repetitive calculation

Browse source
This commit is contained in:
DreamMaoMao 2026-02-17 17:26:55 +08:00
parent c3dcee2c8e
commit b1c957dcc5
3 changed files with 351 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

233
src/animation/client.h
View file

@ -250,8 +250,9 @@ void buffer_set_effect(Client *c, BufferData data) {
scene_buffer_apply_effect, &data); scene_buffer_apply_effect, &data);
} }
void client_draw_shadow(Client *c) { void client_draw_shadow(Client *c, int32_t left_offset, int32_t top_offset,
int32_t right_offset, int32_t bottom_offset,
enum corner_location current_corner_location) {
if (c->iskilling || !client_surface(c)->mapped || c->isnoshadow) if (c->iskilling || !client_surface(c)->mapped || c->isnoshadow)
return; return;
@ -265,11 +266,10 @@ void client_draw_shadow(Client *c) {
} }
bool hit_no_border = check_hit_no_border(c); bool hit_no_border = check_hit_no_border(c);
enum corner_location current_corner_location = if (c->isfullscreen || (no_radius_when_single && c->mon &&
c->isfullscreen || (no_radius_when_single && c->mon && c->mon->visible_tiling_clients == 1)) {
c->mon->visible_tiling_clients == 1) current_corner_location = CORNER_LOCATION_NONE;
? CORNER_LOCATION_NONE }
: CORNER_LOCATION_ALL;
int32_t bwoffset = c->bw != 0 && hit_no_border ? (int32_t)c->bw : 0; int32_t bwoffset = c->bw != 0 && hit_no_border ? (int32_t)c->bw : 0;
@ -278,7 +278,6 @@ void client_draw_shadow(Client *c) {
int32_t delta = shadows_size + (int32_t)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 = { struct wlr_box client_box = {
.x = bwoffset, .x = bwoffset,
.y = bwoffset, .y = bwoffset,
@ -295,8 +294,6 @@ void client_draw_shadow(Client *c) {
struct wlr_box intersection_box; struct wlr_box intersection_box;
wlr_box_intersection(&intersection_box, &client_box, &shadow_box); 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 + bwoffset; intersection_box.x -= shadows_position_x + bwoffset;
intersection_box.y -= shadows_position_y + bwoffset; intersection_box.y -= shadows_position_y + bwoffset;
@ -313,54 +310,45 @@ void client_draw_shadow(Client *c) {
.height = shadow_box.height, .height = shadow_box.height,
}; };
int32_t right_offset, bottom_offset, left_offset, top_offset; int32_t right_out, bottom_out, left_out, top_out;
if (c == grabc) { if (c == grabc) {
right_offset = 0; right_out = 0; bottom_out = 0; left_out = 0; top_out = 0;
bottom_offset = 0;
left_offset = 0;
top_offset = 0;
} else { } else {
right_offset = right_out = GEZERO(absolute_shadow_box.x + absolute_shadow_box.width -
GEZERO(absolute_shadow_box.x + absolute_shadow_box.width -
c->mon->m.x - c->mon->m.width); c->mon->m.x - c->mon->m.width);
bottom_offset = bottom_out = GEZERO(absolute_shadow_box.y + absolute_shadow_box.height -
GEZERO(absolute_shadow_box.y + absolute_shadow_box.height -
c->mon->m.y - c->mon->m.height); c->mon->m.y - c->mon->m.height);
left_out = GEZERO(c->mon->m.x - absolute_shadow_box.x);
left_offset = GEZERO(c->mon->m.x - absolute_shadow_box.x); top_out = GEZERO(c->mon->m.y - absolute_shadow_box.y);
top_offset = GEZERO(c->mon->m.y - absolute_shadow_box.y);
} }
left_offset = MIN(left_offset, shadow_box.width); left_out = MIN(left_out, shadow_box.width);
right_offset = MIN(right_offset, shadow_box.width); right_out = MIN(right_out, shadow_box.width);
top_offset = MIN(top_offset, shadow_box.height); top_out = MIN(top_out, shadow_box.height);
bottom_offset = MIN(bottom_offset, shadow_box.height); bottom_out = MIN(bottom_out, shadow_box.height);
wlr_scene_node_set_position(&c->shadow->node, shadow_box.x + left_offset, wlr_scene_node_set_position(&c->shadow->node, shadow_box.x + left_out,
shadow_box.y + top_offset); shadow_box.y + top_out);
wlr_scene_shadow_set_size( wlr_scene_shadow_set_size(c->shadow,
c->shadow, GEZERO(shadow_box.width - left_offset - right_offset), GEZERO(shadow_box.width - left_out - right_out),
GEZERO(shadow_box.height - top_offset - bottom_offset)); GEZERO(shadow_box.height - top_out - bottom_out));
clipped_region.area.x = clipped_region.area.x - left_offset;
clipped_region.area.y = clipped_region.area.y - top_offset;
clipped_region.area.x -= left_out;
clipped_region.area.y -= top_out;
wlr_scene_shadow_set_clipped_region(c->shadow, clipped_region); wlr_scene_shadow_set_clipped_region(c->shadow, clipped_region);
} }
void apply_border(Client *c) { void apply_border(Client *c, int32_t left_offset, int32_t top_offset,
int32_t right_offset, int32_t bottom_offset,
enum corner_location current_corner_location) {
if (!c || c->iskilling || !client_surface(c)->mapped) if (!c || c->iskilling || !client_surface(c)->mapped)
return; return;
bool hit_no_border = check_hit_no_border(c); bool hit_no_border = check_hit_no_border(c);
enum corner_location current_corner_location;
if (c->isfullscreen || (no_radius_when_single && c->mon && if (c->isfullscreen || (no_radius_when_single && c->mon &&
c->mon->visible_tiling_clients == 1)) { c->mon->visible_tiling_clients == 1)) {
current_corner_location = CORNER_LOCATION_NONE; current_corner_location = CORNER_LOCATION_NONE;
} else {
current_corner_location = set_client_corner_location(c);
} }
if (hit_no_border && smartgaps) { if (hit_no_border && smartgaps) {
@ -377,28 +365,8 @@ void apply_border(Client *c) {
} }
struct wlr_box clip_box = c->animation.current; struct wlr_box clip_box = c->animation.current;
// 一但在GEZERO如果使用无符号，那么其他数据也会转换为无符号导致没有负数出错
int32_t bw = (int32_t)c->bw; int32_t bw = (int32_t)c->bw;
int32_t right_offset, bottom_offset, left_offset, top_offset;
if (c == grabc) {
right_offset = 0;
bottom_offset = 0;
left_offset = 0;
top_offset = 0;
} else {
right_offset =
GEZERO(c->animation.current.x + c->animation.current.width -
c->mon->m.x - c->mon->m.width);
bottom_offset =
GEZERO(c->animation.current.y + c->animation.current.height -
c->mon->m.y - c->mon->m.height);
left_offset = GEZERO(c->mon->m.x - c->animation.current.x);
top_offset = GEZERO(c->mon->m.y - c->animation.current.y);
}
int32_t inner_surface_width = GEZERO(clip_box.width - 2 * bw); int32_t inner_surface_width = GEZERO(clip_box.width - 2 * bw);
int32_t inner_surface_height = GEZERO(clip_box.height - 2 * bw); int32_t inner_surface_height = GEZERO(clip_box.height - 2 * bw);
@ -408,28 +376,17 @@ void apply_border(Client *c) {
int32_t rect_x = left_offset; int32_t rect_x = left_offset;
int32_t rect_y = top_offset; int32_t rect_y = top_offset;
int32_t rect_width = int32_t rect_width = GEZERO(c->animation.current.width - left_offset - right_offset);
GEZERO(c->animation.current.width - left_offset - right_offset); int32_t rect_height = GEZERO(c->animation.current.height - top_offset - bottom_offset);
int32_t rect_height =
GEZERO(c->animation.current.height - top_offset - bottom_offset);
if (left_offset > c->bw) if (left_offset > c->bw)
inner_surface_width = inner_surface_width = inner_surface_width - left_offset + (int32_t)c->bw;
inner_surface_width - left_offset + (int32_t)c->bw;
if (top_offset > c->bw) if (top_offset > c->bw)
inner_surface_height = inner_surface_height = inner_surface_height - top_offset + (int32_t)c->bw;
inner_surface_height - top_offset + (int32_t)c->bw; if (right_offset > 0)
inner_surface_width = MIN(clip_box.width, inner_surface_width + right_offset);
if (right_offset > 0) { if (bottom_offset > 0)
inner_surface_width = inner_surface_height = MIN(clip_box.height, inner_surface_height + bottom_offset);
MIN(clip_box.width, inner_surface_width + right_offset);
}
if (bottom_offset > 0) {
inner_surface_height =
MIN(clip_box.height, inner_surface_height + bottom_offset);
}
struct clipped_region clipped_region = { struct clipped_region clipped_region = {
.area = {inner_surface_x, inner_surface_y, inner_surface_width, .area = {inner_surface_x, inner_surface_y, inner_surface_width,
@ -439,14 +396,16 @@ void apply_border(Client *c) {
}; };
wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw);
wlr_scene_rect_set_size(c->border, rect_width, rect_height);
wlr_scene_node_set_position(&c->border->node, rect_x, rect_y); wlr_scene_node_set_position(&c->border->node, rect_x, rect_y);
wlr_scene_rect_set_size(c->border, rect_width, rect_height);
wlr_scene_rect_set_corner_radius(c->border, border_radius, wlr_scene_rect_set_corner_radius(c->border, border_radius,
current_corner_location); current_corner_location);
wlr_scene_rect_set_clipped_region(c->border, clipped_region); wlr_scene_rect_set_clipped_region(c->border, clipped_region);
} }
struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) { struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box,
int32_t left_offset, int32_t top_offset,
int32_t right_offset, int32_t bottom_offset) {
int32_t 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}; struct ivec2 offset = {0, 0, 0, 0};
@ -454,45 +413,29 @@ struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) {
!c->animation.tagouting) !c->animation.tagouting)
return offset; return offset;
int32_t bottom_out_offset =
GEZERO(c->animation.current.y + c->animation.current.height -
c->mon->m.y - c->mon->m.height);
int32_t right_out_offset =
GEZERO(c->animation.current.x + c->animation.current.width -
c->mon->m.x - c->mon->m.width);
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，否计算会没有负数导致判断错误
int32_t bw = (int32_t)c->bw; int32_t bw = (int32_t)c->bw;
/*
计算窗口表面超出屏幕四个方向的偏差，避免窗口超出屏幕
需要主要border超出屏幕的时候不计算如偏差之内而是
要等窗口表面超出才开始计算偏差
*/
if (ISSCROLLTILED(c) || c->animation.tagining || c->animation.tagouted || if (ISSCROLLTILED(c) || c->animation.tagining || c->animation.tagouted ||
c->animation.tagouting) { c->animation.tagouting) {
if (left_out_offset > 0) { if (left_offset > 0) {
offsetx = GEZERO(left_out_offset - bw); offsetx = GEZERO(left_offset - bw);
clip_box->x = clip_box->x + offsetx; clip_box->x = clip_box->x + offsetx;
clip_box->width = clip_box->width - offsetx; clip_box->width = clip_box->width - offsetx;
} else if (right_out_offset > 0) { } else if (right_offset > 0) {
offsetw = GEZERO(right_out_offset - bw); offsetw = GEZERO(right_offset - bw);
clip_box->width = clip_box->width - offsetw; clip_box->width = clip_box->width - offsetw;
} }
if (top_out_offset > 0) { if (top_offset > 0) {
offsety = GEZERO(top_out_offset - bw); offsety = GEZERO(top_offset - bw);
clip_box->y = clip_box->y + offsety; clip_box->y = clip_box->y + offsety;
clip_box->height = clip_box->height - offsety; clip_box->height = clip_box->height - offsety;
} else if (bottom_out_offset > 0) { } else if (bottom_offset > 0) {
offseth = GEZERO(bottom_out_offset - bw); offseth = GEZERO(bottom_offset - bw);
clip_box->height = clip_box->height - offseth; clip_box->height = clip_box->height - offseth;
} }
} }
// 窗口表面超出屏幕四个方向的偏差
offset.x = offsetx; offset.x = offsetx;
offset.y = offsety; offset.y = offsety;
offset.width = offsetw; offset.width = offsetw;
@ -511,7 +454,6 @@ struct ivec2 clip_to_hide(Client *c, struct wlr_box *clip_box) {
} }
void client_apply_clip(Client *c, float factor) { void client_apply_clip(Client *c, float factor) {
if (c->iskilling || !client_surface(c)->mapped) if (c->iskilling || !client_surface(c)->mapped)
return; return;
@ -520,25 +462,29 @@ void client_apply_clip(Client *c, float factor) {
struct ivec2 offset; struct ivec2 offset;
BufferData buffer_data; BufferData buffer_data;
enum corner_location current_corner_location = // 一次性计算四个方向的溢出偏移量
set_client_corner_location(c); int32_t left_offset = GEZERO(c->mon->m.x - c->animation.current.x);
int32_t top_offset = GEZERO(c->mon->m.y - c->animation.current.y);
int32_t right_offset = GEZERO(c->animation.current.x + c->animation.current.width -
c->mon->m.x - c->mon->m.width);
int32_t bottom_offset = GEZERO(c->animation.current.y + c->animation.current.height -
c->mon->m.y - c->mon->m.height);
// 计算圆角位置（只一次）
enum corner_location current_corner_location = set_client_corner_location(c);
if (!animations) { if (!animations) {
c->animation.running = false; c->animation.running = false;
c->need_output_flush = false; c->need_output_flush = false;
c->animainit_geom = c->current = c->pending = c->animation.current = c->animainit_geom = c->current = c->pending = c->animation.current = c->geom;
c->geom;
client_get_clip(c, &clip_box); client_get_clip(c, &clip_box);
offset = clip_to_hide(c, &clip_box, left_offset, top_offset, right_offset, bottom_offset);
offset = clip_to_hide(c, &clip_box); apply_border(c, left_offset, top_offset, right_offset, bottom_offset, current_corner_location);
client_draw_shadow(c, left_offset, top_offset, right_offset, bottom_offset, current_corner_location);
apply_border(c); if (clip_box.width <= 0 || clip_box.height <= 0) return;
client_draw_shadow(c);
if (clip_box.width <= 0 || clip_box.height <= 0) {
return;
}
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
buffer_set_effect(c, (BufferData){1.0f, 1.0f, clip_box.width, buffer_set_effect(c, (BufferData){1.0f, 1.0f, clip_box.width,
@ -547,11 +493,8 @@ void client_apply_clip(Client *c, float factor) {
return; return;
} }
// 获取窗口动画实时位置矩形
int32_t width, height; int32_t width, height;
client_actual_size(c, &width, &height); client_actual_size(c, &width, &height);
// 计算出除了边框的窗口实际剪切大小
struct wlr_box geometry; struct wlr_box geometry;
client_get_geometry(c, &geometry); client_get_geometry(c, &geometry);
clip_box = (struct wlr_box){ clip_box = (struct wlr_box){
@ -560,20 +503,16 @@ void client_apply_clip(Client *c, float factor) {
.width = width, .width = width,
.height = height, .height = height,
}; };
if (client_is_x11(c)) { if (client_is_x11(c)) {
clip_box.x = 0; clip_box.x = 0;
clip_box.y = 0; clip_box.y = 0;
} }
// 检测窗口是否需要剪切超出屏幕部分，如果需要就调整实际要剪切的矩形 offset = clip_to_hide(c, &clip_box, left_offset, top_offset, right_offset, bottom_offset);
offset = clip_to_hide(c, &clip_box);
// 应用窗口装饰 apply_border(c, left_offset, top_offset, right_offset, bottom_offset, current_corner_location);
apply_border(c); client_draw_shadow(c, left_offset, top_offset, right_offset, bottom_offset, current_corner_location);
client_draw_shadow(c);
// 如果窗口剪切区域已经剪切到0，则不渲染窗口表面
if (clip_box.width <= 0 || clip_box.height <= 0) { if (clip_box.width <= 0 || clip_box.height <= 0) {
should_render_client_surface = false; should_render_client_surface = false;
wlr_scene_node_set_enabled(&c->scene_surface->node, false); wlr_scene_node_set_enabled(&c->scene_surface->node, false);
@ -582,20 +521,13 @@ void client_apply_clip(Client *c, float factor) {
wlr_scene_node_set_enabled(&c->scene_surface->node, true); wlr_scene_node_set_enabled(&c->scene_surface->node, true);
} }
// 不用在执行下面的窗口表面剪切和缩放等效果操作 if (!should_render_client_surface) return;
if (!should_render_client_surface) {
return;
}
// 应用窗口表面剪切
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip_box);
// 获取剪切后的表面的实际大小用于计算缩放
int32_t acutal_surface_width = geometry.width - offset.x - offset.width; int32_t acutal_surface_width = geometry.width - offset.x - offset.width;
int32_t acutal_surface_height = geometry.height - offset.y - offset.height; int32_t acutal_surface_height = geometry.height - offset.y - offset.height;
if (acutal_surface_width <= 0 || acutal_surface_height <= 0) return;
if (acutal_surface_width <= 0 || acutal_surface_height <= 0)
return;
buffer_data.should_scale = true; buffer_data.should_scale = true;
buffer_data.width = clip_box.width; buffer_data.width = clip_box.width;
@ -606,10 +538,8 @@ void client_apply_clip(Client *c, float factor) {
buffer_data.width_scale = 1.0; buffer_data.width_scale = 1.0;
buffer_data.height_scale = 1.0; buffer_data.height_scale = 1.0;
} else { } else {
buffer_data.width_scale = buffer_data.width_scale = (float)buffer_data.width / acutal_surface_width;
(float)buffer_data.width / acutal_surface_width; buffer_data.height_scale = (float)buffer_data.height / acutal_surface_height;
buffer_data.height_scale =
(float)buffer_data.height / acutal_surface_height;
} }
buffer_set_effect(c, buffer_data); buffer_set_effect(c, buffer_data);
@ -908,7 +838,6 @@ void client_set_pending_state(Client *c) {
} }
void resize(Client *c, struct wlr_box geo, int32_t interact) { void resize(Client *c, struct wlr_box geo, int32_t interact) {
// 动画设置的起始函数，这里用来计算一些动画的起始值 // 动画设置的起始函数，这里用来计算一些动画的起始值
// 动画起始位置大小是由于c->animainit_geom确定的 // 动画起始位置大小是由于c->animainit_geom确定的
@ -933,9 +862,7 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height); c->geom.height = MAX(1 + 2 * (int32_t)c->bw, c->geom.height);
} else { // 这里会限制不允许窗口划出屏幕 } else { // 这里会限制不允许窗口划出屏幕
c->geom = geo; c->geom = geo;
applybounds( applybounds(c, bbox);
c,
bbox); // 去掉这个推荐的窗口大小,因为有时推荐的窗口特别大导致平铺异常
} }
if (!c->isnosizehint && !c->ismaximizescreen && !c->isfullscreen && if (!c->isnosizehint && !c->ismaximizescreen && !c->isfullscreen &&
@ -994,16 +921,28 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) {
c->animation.running = false; c->animation.running = false;
c->need_output_flush = false; c->need_output_flush = false;
c->animainit_geom = c->current = c->pending = c->animation.current = c->animainit_geom = c->current = c->pending = c->animation.current = c->geom;
c->geom;
wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
client_draw_shadow(c); // 计算当前窗口相对于显示器的偏移量（用于边框和阴影）
apply_border(c); int32_t left_offset = GEZERO(c->mon->m.x - c->geom.x);
int32_t top_offset = GEZERO(c->mon->m.y - c->geom.y);
int32_t right_offset = GEZERO(c->geom.x + c->geom.width -
c->mon->m.x - c->mon->m.width);
int32_t bottom_offset = GEZERO(c->geom.y + c->geom.height -
c->mon->m.y - c->mon->m.height);
enum corner_location current_corner_location = set_client_corner_location(c);
// 传入偏移量和圆角位置
client_draw_shadow(c, left_offset, top_offset, right_offset, bottom_offset,
current_corner_location);
apply_border(c, left_offset, top_offset, right_offset, bottom_offset,
current_corner_location);
client_get_clip(c, &clip); client_get_clip(c, &clip);
wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip); wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip);
return; return;
} }
// 如果不是工作区切换时划出去的窗口，就让动画的结束位置，就是上面的真实位置和大小 // 如果不是工作区切换时划出去的窗口，就让动画的结束位置，就是上面的真实位置和大小
// c->pending 决定动画的终点，一般在其他调用resize的函数的附近设置了 // c->pending 决定动画的终点，一般在其他调用resize的函数的附近设置了
if (!c->animation.tagouting && !c->iskilling) { if (!c->animation.tagouting && !c->iskilling) {

6
src/animation/common.h
View file

@ -72,10 +72,10 @@ void init_baked_points(void) {
} }
double find_animation_curve_at(double t, int32_t type) { double find_animation_curve_at(double t, int32_t type) {
int32_t down = 0; uint32_t down = 0;
int32_t up = BAKED_POINTS_COUNT - 1; uint32_t up = BAKED_POINTS_COUNT - 1;
int32_t middle = (up + down) / 2; uint32_t middle = (up + down) / 2;
struct dvec2 *baked_points; struct dvec2 *baked_points;
if (type == MOVE) { if (type == MOVE) {
baked_points = baked_points_move; baked_points = baked_points_move;

4
src/mango.c
View file

@ -717,7 +717,9 @@ get_nearest_output_mode(struct wlr_output *output, int32_t width,
static void client_commit(Client *c); static void client_commit(Client *c);
static void layer_commit(LayerSurface *l); static void layer_commit(LayerSurface *l);
static void apply_border(Client *c); static void apply_border(Client *c, int32_t left_offset, int32_t top_offset,
int32_t right_offset, int32_t bottom_offset,
enum corner_location current_corner_location);
static void client_set_opacity(Client *c, double opacity); static void client_set_opacity(Client *c, double opacity);
static void init_baked_points(void); static void init_baked_points(void);
static void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer, static void scene_buffer_apply_opacity(struct wlr_scene_buffer *buffer,