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

fix: avoid curtag out of bound

Browse source
This commit is contained in:
DreamMaoMao 2025-05-06 23:30:26 +08:00
parent 483ee706a0
commit 8dc52b4895
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/maomao.c
View file

@ -6992,9 +6992,9 @@ void view_in_mon(const Arg *arg, bool want_animation, Monitor *m) {
if (arg->ui == ~0) if (arg->ui == ~0)
m->pertag->curtag = 0; m->pertag->curtag = 0;
else { else {
for (i = 0; !(arg->ui & 1 << i) && arg->ui != 0; i++) for (i = 0; !(arg->ui & 1 << i) && i <LENGTH(tags) && arg->ui != 0; i++)
; ;
m->pertag->curtag = i + 1; m->pertag->curtag = i >= LENGTH(tags) ? LENGTH(tags) : i + 1;
} }
m->pertag->prevtag = m->pertag->prevtag =
@ -7076,10 +7076,15 @@ void viewtoright_have_client(const Arg *arg) {
if (!selmon || (target) == selmon->tagset[selmon->seltags]) if (!selmon || (target) == selmon->tagset[selmon->seltags])
return; return;
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags ^= 1; /* toggle sel tagset */
int new_tag = selmon->pertag->curtag + n;
if (new_tag > LENGTH(tags))
new_tag = LENGTH(tags);
if (target) { if (target) {
selmon->tagset[selmon->seltags] = target; selmon->tagset[selmon->seltags] = target;
selmon->pertag->prevtag = selmon->pertag->curtag; selmon->pertag->prevtag = selmon->pertag->curtag;
selmon->pertag->curtag = selmon->pertag->curtag + n; selmon->pertag->curtag = new_tag;
} else { } else {
tmptag = selmon->pertag->prevtag; tmptag = selmon->pertag->prevtag;
selmon->pertag->prevtag = selmon->pertag->curtag; selmon->pertag->prevtag = selmon->pertag->curtag;
@ -7150,10 +7155,15 @@ void viewtoleft_have_client(const Arg *arg) {
if (!selmon || (target) == selmon->tagset[selmon->seltags]) if (!selmon || (target) == selmon->tagset[selmon->seltags])
return; return;
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags ^= 1; /* toggle sel tagset */
int new_tag = selmon->pertag->curtag - n;
if (new_tag < 1)
new_tag = 1;
if (target) { if (target) {
selmon->tagset[selmon->seltags] = target; selmon->tagset[selmon->seltags] = target;
selmon->pertag->prevtag = selmon->pertag->curtag; selmon->pertag->prevtag = selmon->pertag->curtag;
selmon->pertag->curtag = selmon->pertag->curtag - n; selmon->pertag->curtag = new_tag;
} else { } else {
tmptag = selmon->pertag->prevtag; tmptag = selmon->pertag->prevtag;
selmon->pertag->prevtag = selmon->pertag->curtag; selmon->pertag->prevtag = selmon->pertag->curtag;