mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-05 07:15:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: fix potential issues caused by uninitialization

Browse source
This commit is contained in:
DreamMaoMao 2026-03-06 13:25:24 +08:00
parent 57e02d6217
commit 81fcf208a4
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/layout/arrange.h
View file

@ -5,6 +5,16 @@ void save_old_size_per(Monitor *m) {
if (VISIBLEON(c, m) && ISTILED(c)) { if (VISIBLEON(c, m) && ISTILED(c)) {
c->old_master_inner_per = c->master_inner_per; c->old_master_inner_per = c->master_inner_per;
c->old_stack_inner_per = c->stack_inner_per; c->old_stack_inner_per = c->stack_inner_per;
} else {
if (c->old_master_inner_per <= 0.0f ||
c->old_master_inner_per > 1.0f) {
c->old_master_inner_per = 1.0f;
}
if (c->old_stack_inner_per <= 0.0f ||
c->old_stack_inner_per > 1.0f) {
c->old_stack_inner_per = 1.0f;
}
} }
} }
} }
@ -45,14 +55,16 @@ void restore_size_per(Monitor *m, Client *c) {
} }
if (!c->ismaster && c->old_stack_inner_per < 1.0 && if (!c->ismaster && c->old_stack_inner_per < 1.0 &&
c->stack_inner_per < 1.0) { c->old_stack_inner_per > 0.0f && c->stack_inner_per < 1.0 &&
c->stack_inner_per > 0.0f) {
c->stack_inner_per = (1.0 - c->stack_inner_per) * c->stack_inner_per = (1.0 - c->stack_inner_per) *
c->old_stack_inner_per / c->old_stack_inner_per /
(1.0 - c->old_stack_inner_per); (1.0 - c->old_stack_inner_per);
} }
if (c->ismaster && c->old_master_inner_per < 1.0 && if (c->ismaster && c->old_master_inner_per < 1.0 &&
c->master_inner_per < 1.0) { c->old_master_inner_per > 0.0f && c->master_inner_per < 1.0 &&
c->master_inner_per > 0.0f) {
c->master_inner_per = (1.0 - c->master_inner_per) * c->master_inner_per = (1.0 - c->master_inner_per) *
c->old_master_inner_per / c->old_master_inner_per /
(1.0 - c->old_master_inner_per); (1.0 - c->old_master_inner_per);
@ -61,10 +73,12 @@ void restore_size_per(Monitor *m, Client *c) {
wl_list_for_each(fc, &clients, link) { wl_list_for_each(fc, &clients, link) {
if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c && !fc->ismaster && if (VISIBLEON(fc, m) && ISTILED(fc) && fc != c && !fc->ismaster &&
fc->old_ismaster && fc->old_stack_inner_per < 1.0 && fc->old_ismaster && fc->old_stack_inner_per < 1.0 &&
fc->stack_inner_per < 1.0) { fc->old_stack_inner_per > 0.0f && fc->stack_inner_per < 1.0 &&
fc->stack_inner_per > 0.0f) {
fc->stack_inner_per = (1.0 - fc->stack_inner_per) * fc->stack_inner_per = (1.0 - fc->stack_inner_per) *
fc->old_stack_inner_per / fc->old_stack_inner_per /
(1.0 - fc->old_stack_inner_per); (1.0 - fc->old_stack_inner_per);
fc->old_ismaster = false;
} }
} }
} }

3
src/mango.c
View file

@ -3949,6 +3949,9 @@ void init_client_properties(Client *c) {
c->master_mfact_per = 0.0f; c->master_mfact_per = 0.0f;
c->master_inner_per = 0.0f; c->master_inner_per = 0.0f;
c->stack_inner_per = 0.0f; c->stack_inner_per = 0.0f;
c->old_stack_inner_per = 0.0f;
c->old_master_inner_per = 0.0f;
c->old_master_mfact_per = 0.0f;
c->isterm = 0; c->isterm = 0;
c->allow_csd = 0; c->allow_csd = 0;
c->force_maximize = 0; c->force_maximize = 0;