toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

convert lastfocused() to focustop(m)

Browse source
This commit is contained in:
Devin J. Pohly 2020-08-02 18:39:48 -05:00
parent 8a584d406d
commit da5deab083
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dwl.c
View file

@ -185,7 +185,7 @@ static int keybinding(uint32_t mods, xkb_keysym_t sym);
static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data);
static void killclient(const Arg *arg);
static Client *lastfocused(void);
static Client *focustop(Monitor *m);
static void maprequest(struct wl_listener *listener, void *data);
static void motionabsolute(struct wl_listener *listener, void *data);
static void motionnotify(uint32_t time);
@ -718,7 +718,7 @@ focusmon(const Arg *arg)
if (m == selmon)
return;
selmon = m;
focusclient(sel, lastfocused(), 1);
focusclient(sel, focustop(selmon), 1);
}
void
@ -889,11 +889,11 @@ killclient(const Arg *arg)
}
Client *
lastfocused(void)
focustop(Monitor *m)
{
Client *c;
wl_list_for_each(c, &fstack, flink)
if (VISIBLEON(c, selmon))
if (VISIBLEON(c, m))
return c;
return NULL;
}
@ -1434,7 +1434,7 @@ setmon(Client *c, Monitor *m, unsigned int newtags)
}
/* Focus can change if c is the top of selmon before or after */
if (c == oldsel || c == selclient())
focusclient(oldsel, lastfocused(), 1);
focusclient(oldsel, focustop(selmon), 1);
}
void
@ -1597,7 +1597,7 @@ tag(const Arg *arg)
Client *sel = selclient();
if (sel && arg->ui & TAGMASK) {
sel->tags = arg->ui & TAGMASK;
focusclient(sel, lastfocused(), 1);
focusclient(sel, focustop(selmon), 1);
arrange(selmon);
}
}
@ -1664,7 +1664,7 @@ toggletag(const Arg *arg)
newtags = sel->tags ^ (arg->ui & TAGMASK);
if (newtags) {
sel->tags = newtags;
focusclient(sel, lastfocused(), 1);
focusclient(sel, focustop(selmon), 1);
arrange(selmon);
}
}
@ -1677,7 +1677,7 @@ toggleview(const Arg *arg)
if (newtagset) {
selmon->tagset[selmon->seltags] = newtagset;
focusclient(sel, lastfocused(), 1);
focusclient(sel, focustop(selmon), 1);
arrange(selmon);
}
}
@ -1739,7 +1739,7 @@ view(const Arg *arg)
selmon->seltags ^= 1; /* toggle sel tagset */
if (arg->ui & TAGMASK)
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
focusclient(sel, lastfocused(), 1);
focusclient(sel, focustop(selmon), 1);
arrange(selmon);
}