ryan
/
dwl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply pertag patch

master
Ryan 2023-09-25 23:45:42 -04:00
parent c86e057c2c
commit 4dd9d502cf
Signed by: ryan
GPG Key ID: 7D7E2E94267DAD95
1 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dwl.c
View File

@ -95,6 +95,7 @@ typedef struct {
const Arg arg;
} Button;
typedef struct Pertag Pertag;
typedef struct Monitor Monitor;
typedef struct {
/* Must keep these three elements in this order */
@ -193,6 +194,7 @@ struct Monitor {
struct wlr_box w; /* window area, layout-relative */
struct wl_list layers[4]; /* LayerSurface::link */
const Layout *lt[2];
Pertag *pertag;
unsigned int seltags;
unsigned int sellt;
uint32_t tagset[2];
@ -447,6 +449,14 @@ static Atom netatom[NetLast];
static pid_t *autostart_pids;
static size_t autostart_len;
struct Pertag {
unsigned int curtag, prevtag; /* current and previous tag */
int nmasters[TAGCOUNT + 1]; /* number of windows in master area */
float mfacts[TAGCOUNT + 1]; /* mfacts per tag */
unsigned int sellts[TAGCOUNT + 1]; /* selected layouts */
const Layout *ltidxs[TAGCOUNT + 1][2]; /* matrix of tags and layouts indexes */
};
/* function implementations */
void
applybounds(Client *c, struct wlr_box *bbox)
@ -783,6 +793,7 @@ cleanupmon(struct wl_listener *listener, void *data)
wlr_scene_output_destroy(m->scene_output);
wlr_scene_node_destroy(&m->fullscreen_bg->node);
free(m->pertag);
closemon(m);
free(m);
}
@ -1025,6 +1036,18 @@ createmon(struct wl_listener *listener, void *data)
wl_list_insert(&mons, &m->link);
printstatus();
m->pertag = calloc(1, sizeof(Pertag));
m->pertag->curtag = m->pertag->prevtag = 1;
for (i = 0; i <= TAGCOUNT; i++) {
m->pertag->nmasters[i] = m->nmaster;
m->pertag->mfacts[i] = m->mfact;
m->pertag->ltidxs[i][0] = m->lt[0];
m->pertag->ltidxs[i][1] = m->lt[1];
m->pertag->sellts[i] = m->sellt;
}
/* The xdg-protocol specifies:
*
* If the fullscreened surface is not opaque, the compositor must make
@ -1665,7 +1688,7 @@ incnmaster(const Arg *arg)
{
if (!arg || !selmon)
return;
selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
arrange(selmon);
}
@ -2385,9 +2408,9 @@ setlayout(const Arg *arg)
if (!selmon)
return;
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
selmon->sellt ^= 1;
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
if (arg && arg->v)
selmon->lt[selmon->sellt] = (Layout *)arg->v;
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
arrange(selmon);
printstatus();
@ -2404,7 +2427,7 @@ setmfact(const Arg *arg)
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
if (f < 0.1 || f > 0.9)
return;
selmon->mfact = f;
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
arrange(selmon);
}
@ -2774,6 +2797,7 @@ toggleview(const Arg *arg)
{
Monitor *m;
uint32_t newtagset = selmon ? selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK) : 0;
size_t i;
if (!newtagset)
return;
@ -2782,6 +2806,25 @@ toggleview(const Arg *arg)
if (m !=selmon && newtagset & m->tagset[m->seltags])
return;
if (newtagset == ~0) {
selmon->pertag->prevtag = selmon->pertag->curtag;
selmon->pertag->curtag = 0;
}
/* test if the user did not select the same tag */
if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
selmon->pertag->prevtag = selmon->pertag->curtag;
for (i = 0; !(newtagset & 1 << i); i++) ;
selmon->pertag->curtag = i + 1;
}
/* apply settings for this view */
selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
selmon->lt[selmon->sellt^1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
selmon->tagset[selmon->seltags] = newtagset;
attachclients(selmon);
focusclient(focustop(selmon), 1);
@ -2954,6 +2997,7 @@ view(const Arg *arg)
{
Monitor *m, *origm = selmon;
unsigned int newtags = selmon->tagset[selmon->seltags ^ 1];
size_t i, tmptag;
if (!selmon || (arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return;
@ -2977,8 +3021,28 @@ view(const Arg *arg)
}
origm->seltags ^= 1; /* toggle sel tagset */
if (arg->ui & TAGMASK)
if (arg->ui & TAGMASK) {
origm->tagset[origm->seltags] = arg->ui & TAGMASK;
origm->pertag->prevtag = origm->pertag->curtag;
if (arg->ui == ~0)
origm->pertag->curtag = 0;
else {
for (i = 0; !(arg->ui & 1 << i); i++) ;
origm->pertag->curtag = i + 1;
}
} else {
tmptag = origm->pertag->prevtag;
origm->pertag->prevtag = origm->pertag->curtag;
origm->pertag->curtag = tmptag;
}
origm->nmaster = origm->pertag->nmasters[origm->pertag->curtag];
origm->mfact = origm->pertag->mfacts[origm->pertag->curtag];
origm->sellt = origm->pertag->sellts[origm->pertag->curtag];
origm->lt[origm->sellt] = origm->pertag->ltidxs[origm->pertag->curtag][origm->sellt];
origm->lt[origm->sellt^1] = origm->pertag->ltidxs[origm->pertag->curtag][origm->sellt^1];
attachclients(origm);
focusclient(focustop(origm), 1);
arrange(origm);