mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-08 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: optimize focusmon and tagmon arg

Browse source
This commit is contained in:
DreamMaoMao 2025-08-16 11:24:09 +08:00
parent 045e1607cb
commit d4ecf1bac3
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/dispatch/bind_define.h
View file

@ -102,24 +102,26 @@ void focuslast(const Arg *arg) {
void focusmon(const Arg *arg) {
Client *c;
Monitor *m = NULL;
int i = 0, nmons = wl_list_length(&mons);
if (nmons && arg->i != UNDIR) {
do /* don't switch to disabled mons */
selmon = dirtomon(arg->i);
while (!selmon->wlr_output->enabled && i++ < nmons);
if (arg->i != UNDIR) {
m = dirtomon(arg->i);
} else if (arg->v) {
wl_list_for_each(m, &mons, link) {
if (!m->wlr_output->enabled) {
continue;
}
if (regex_match(arg->v, m->wlr_output->name)) {
selmon = m;
break;
}
}
} else {
return;
}
if (!m || !m->wlr_output->enabled)
return;
selmon = m;
warp_cursor_to_selmon(selmon);
c = focustop(selmon);
if (!c) {
@ -836,13 +838,26 @@ void tag(const Arg *arg) {
}
void tagmon(const Arg *arg) {
Monitor *m;
Monitor *m = NULL;
Client *c = focustop(selmon);
if (!c)
return;
m = dirtomon(arg->i);
if (arg->i != UNDIR) {
m = dirtomon(arg->i);
} else if (arg->v) {
wl_list_for_each(m, &mons, link) {
if (!m->wlr_output->enabled) {
continue;
}
if (regex_match(arg->v, m->wlr_output->name)) {
break;
}
}
} else {
return;
}
if (!m || !m->wlr_output->enabled || m == c->mon)
return;