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

opt: optimize focus stack judge

Browse source
This commit is contained in:
DreamMaoMao 2026-07-09 08:10:14 +08:00
parent 3c1a247892
commit 763ca89257
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/fetch/client.h
View file

@ -391,10 +391,13 @@ bool client_is_in_same_stack(Client *sc, Client *tc, Client *fc) {
uint32_t id = sc->mon->pertag->ltidxs[sc->mon->pertag->curtag]->id; uint32_t id = sc->mon->pertag->ltidxs[sc->mon->pertag->curtag]->id;
if (id != SCROLLER && id != VERTICAL_SCROLLER && id != TILE && if ((id != SCROLLER && id != VERTICAL_SCROLLER) && tc->mon != selmon &&
id != VERTICAL_TILE && id != DECK && id != VERTICAL_DECK && (tc->isfullscreen || tc->ismaximizescreen))
id != CENTER_TILE && id != RIGHT_TILE) return true;
return false;
if (id == MONOCLE) {
return true;
}
if (id == SCROLLER || id == VERTICAL_SCROLLER) { if (id == SCROLLER || id == VERTICAL_SCROLLER) {
Client *source_stack_head = scroll_get_stack_head_client(sc); Client *source_stack_head = scroll_get_stack_head_client(sc);
@ -434,11 +437,11 @@ bool client_is_in_same_stack(Client *sc, Client *tc, Client *fc) {
} }
Client *get_focused_stack_client(Client *sc, Client *custom_focus_client) { Client *get_focused_stack_client(Client *sc, Client *custom_focus_client) {
if (!sc || sc->isfloating) if (!sc || sc->isfloating || !selmon)
return sc; return sc;
Client *tc = NULL; Client *tc = NULL;
Client *fc = custom_focus_client ? custom_focus_client : focustop(sc->mon); Client *fc = custom_focus_client ? custom_focus_client : selmon->sel;
if (fc->isfloating || sc->isfloating) if (fc->isfloating || sc->isfloating)
return sc; return sc;