mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-31 22:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt:Optimize code structure

Browse source
This commit is contained in:
DreamMaoMao 2025-02-24 21:52:33 +08:00
parent 06d47e87e8
commit fb990c196d
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
maomao.c
View file

@ -178,7 +178,6 @@ typedef struct {
struct wlr_scene_tree *scene; struct wlr_scene_tree *scene;
struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ struct wlr_scene_rect *border[4]; /* top, bottom, left, right */
struct wlr_scene_tree *scene_surface; struct wlr_scene_tree *scene_surface;
struct wlr_scene_tree *snapshot_scene;
struct wl_list link; struct wl_list link;
struct wl_list flink; struct wl_list flink;
struct wl_list fadeout_link; struct wl_list fadeout_link;
@ -726,7 +725,11 @@ void apply_opacity_to_rect_nodes(struct wlr_scene_node *node, double opacity) {
if (node->type == WLR_SCENE_NODE_RECT) { if (node->type == WLR_SCENE_NODE_RECT) {
struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node); struct wlr_scene_rect *rect = wlr_scene_rect_from_node(node);
// Assuming the rect has a color field and we can modify it // Assuming the rect has a color field and we can modify it
rect->color[3] = opacity; // Set the alpha channel of the color // rect->color[0] = opacity * rect->color[3] * rect->color[0] ; // Set the red channel of the color
// rect->color[1] = opacity * rect->color[3] * rect->color[1] ; // Set the green channel of the color
// rect->color[2] = opacity * rect->color[3] * rect->color[2] ; // Set the blue channel of the color
rect->color[3] = opacity ; // Set the alpha channel of the color
wlr_scene_rect_set_color(rect, rect->color);
} }
// If the node is a tree, recursively traverse its children // If the node is a tree, recursively traverse its children
@ -757,7 +760,7 @@ void fadeout_client_animation_next_tick(Client *c) {
uint32_t y = uint32_t y =
c->animation.initial.y + (c->current.y - c->animation.initial.y) * factor; c->animation.initial.y + (c->current.y - c->animation.initial.y) * factor;
wlr_scene_node_set_position(&c->snapshot_scene->node, 0, y); wlr_scene_node_set_position(&c->scene->node, 0, y);
c->animation.current = (struct wlr_box){ c->animation.current = (struct wlr_box){
.x = x, .x = x,
.y = y, .y = y,
@ -767,14 +770,14 @@ void fadeout_client_animation_next_tick(Client *c) {
double opacity = MAX(fadeout_begin_opacity - animation_passed, 0); double opacity = MAX(fadeout_begin_opacity - animation_passed, 0);
wlr_scene_node_for_each_buffer(&c->snapshot_scene->node, wlr_scene_node_for_each_buffer(&c->scene->node,
scene_buffer_apply_opacity, &opacity); scene_buffer_apply_opacity, &opacity);
// apply_opacity_to_rect_nodes(&c->snapshot_scene->node, opacity); // apply_opacity_to_rect_nodes(&c->scene->node, opacity);
if (animation_passed == 1.0) { if (animation_passed == 1.0) {
wl_list_remove(&c->fadeout_link); wl_list_remove(&c->fadeout_link);
wlr_scene_node_destroy(&c->snapshot_scene->node); wlr_scene_node_destroy(&c->scene->node);
free(c); free(c);
c = NULL; c = NULL;
} else { } else {
@ -3269,15 +3272,6 @@ struct wlr_scene_tree *wlr_scene_tree_snapshot(struct wlr_scene_node *node,
} }
void pending_kill_client(Client *c) { void pending_kill_client(Client *c) {
if (!c->snapshot_scene) {
wlr_scene_node_destroy(&c->snapshot_scene->node);
}
if (c->mon) {
c->snapshot_scene =
wlr_scene_tree_snapshot(&c->scene->node, layers[LyrFadeOut]);
wlr_scene_node_set_enabled(&c->snapshot_scene->node, false);
}
// c->iskilling = 1; //不可以提前标记已经杀掉，因为有些客户端可能拒绝 // c->iskilling = 1; //不可以提前标记已经杀掉，因为有些客户端可能拒绝
client_send_close(c); client_send_close(c);
} }
@ -5619,18 +5613,18 @@ void init_fadeout_client(Client *c) {
if (!c->mon || client_is_unmanaged(c)) if (!c->mon || client_is_unmanaged(c))
return; return;
if (!c->snapshot_scene) { if (!c->scene) {
wlr_scene_node_destroy(&c->snapshot_scene->node); return;
} }
Client *fadeout_cient = ecalloc(1, sizeof(*fadeout_cient)); Client *fadeout_cient = ecalloc(1, sizeof(*fadeout_cient));
wlr_scene_node_set_enabled(&c->scene->node, true); wlr_scene_node_set_enabled(&c->scene->node, true);
fadeout_cient->snapshot_scene = fadeout_cient->scene =
wlr_scene_tree_snapshot(&c->scene->node, layers[LyrFadeOut]); wlr_scene_tree_snapshot(&c->scene->node, layers[LyrFadeOut]);
wlr_scene_node_set_enabled(&c->scene->node, false); wlr_scene_node_set_enabled(&c->scene->node, false);
if (!fadeout_cient->snapshot_scene) { if (!fadeout_cient->scene) {
free(fadeout_cient); free(fadeout_cient);
return; return;
} }
@ -5648,7 +5642,7 @@ void init_fadeout_client(Client *c) {
fadeout_cient->animation.total_frames = fadeout_cient->animation.total_frames =
fadeout_cient->animation.duration / output_frame_duration_ms(c); fadeout_cient->animation.duration / output_frame_duration_ms(c);
fadeout_cient->is_fadeout_client = true; fadeout_cient->is_fadeout_client = true;
wlr_scene_node_set_enabled(&fadeout_cient->snapshot_scene->node, true); wlr_scene_node_set_enabled(&fadeout_cient->scene->node, true);
wl_list_insert(&fadeout_clients, &fadeout_cient->fadeout_link); wl_list_insert(&fadeout_clients, &fadeout_cient->fadeout_link);
} }