wzray/dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: save metaws tags

Browse source
This commit is contained in:
Arthur Khachaturov 2024-08-16 06:18:38 +03:00
parent d6a34a353e
commit 4dca15ea1f
No known key found for this signature in database
GPG key ID: CAC2B7EB6DF45D55
2 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config.h
View file

@ -35,18 +35,20 @@ static const unsigned int alphas[][3] = {
/* tagging */ /* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "", "" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "", "" };
static const char *metaworkspaces[] = { "", "", "", "" }; static const char *metaworkspaces[] = { "", "", "", "󰢚" };
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags_mask isfloating isterminal noswallow monitor */ /* class instance title tags_mask isfloating isterminal noswallow monitor mwpin*/
{ "Firefox", NULL, "Picture-in-Picture", 0, 1, 0, 1, -1 }, { "Firefox", NULL, "Picture-in-Picture", 0, 1, 0, 1, -1, 0 },
{ "copyq", NULL, NULL, 0, 1, 0, 0, -1 }, { "copyq", NULL, NULL, 0, 1, 0, 0, -1, 0 },
{ "Alacritty", NULL, NULL, 0, 0, 1, 0, -1 }, { "Alacritty", NULL, NULL, 0, 0, 1, 0, -1, 0 },
{ "floating", NULL, NULL, 0, 1, 0, 0, -1 }, { "floating", NULL, NULL, 0, 1, 0, 0, -1, 0 },
{ "Spotify", "spotify", NULL, 128, 0, 0, 0, 0, 1 },
{ "AyuGramDesktop", "ayugram-desktop", NULL, 256, 0, 0, 0, 0, 1 },
}; };
@ -140,6 +142,10 @@ static const Key keys[] = {
{ MODKEY, XK_x, spawn, SHCMD("vesktop") }, { MODKEY, XK_x, spawn, SHCMD("vesktop") },
{ MODKEY|ControlMask, XK_v, spawn, SHCMD("vpn", "-d", "--visual") }, { MODKEY|ControlMask, XK_v, spawn, SHCMD("vpn", "-d", "--visual") },
{ MODKEY|ShiftMask, XK_v, spawn, SHCMD("vpn", "--visual") }, { MODKEY|ShiftMask, XK_v, spawn, SHCMD("vpn", "--visual") },
{ MODKEY|ShiftMask, XK_Up, spawn, SHCMD("volume", "+1") },
{ MODKEY|ShiftMask, XK_Down, spawn, SHCMD("volume", "-1") },
{ MODKEY, XK_Up, spawn, SHCMD("volume", "+5") },
{ MODKEY, XK_Down, spawn, SHCMD("volume", "-5") },
// tags // tags
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)

70
dwm.c
View file

@ -55,7 +55,7 @@
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \ #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy))) * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags[metaws] & C->mon->tagset[C->mon->seltags])) #define ISVISIBLE(C) ((C->tags[metaws] & C->mon->tagset[metaws][C->mon->seltags[metaws]]))
#define LENGTH(X) (sizeof X / sizeof X[0]) #define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw) #define WIDTH(X) ((X)->w + 2 * (X)->bw)
@ -65,6 +65,7 @@
#define TEXTWN(X) (TEXTW(X)) #define TEXTWN(X) (TEXTW(X))
// #define TEXTWN(X) (TEXTW(X) + 0) // #define TEXTWN(X) (TEXTW(X) + 0)
#define OPAQUE 0xffU #define OPAQUE 0xffU
#define MAX_METAWS 32
/* enums */ /* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@ -102,7 +103,7 @@ struct Client {
int oldx, oldy, oldw, oldh; int oldx, oldy, oldw, oldh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
int bw, oldbw; int bw, oldbw;
unsigned int tags[32]; unsigned int tags[MAX_METAWS];
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow;
pid_t pid; pid_t pid;
Client *next; Client *next;
@ -137,9 +138,9 @@ struct Monitor {
int gappiv; /* vertical gap between windows */ int gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */ int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */ int gappov; /* vertical outer gaps */
unsigned int seltags; unsigned int seltags[MAX_METAWS];
unsigned int sellt; unsigned int sellt;
unsigned int tagset[2]; unsigned int tagset[MAX_METAWS][2];
int showbar; int showbar;
int topbar; int topbar;
int spawnmaster; int spawnmaster;
@ -160,6 +161,7 @@ typedef struct {
int isterminal; int isterminal;
int noswallow; int noswallow;
int monitor; int monitor;
int mwpin;
} Rule; } Rule;
/* function declarations */ /* function declarations */
@ -331,7 +333,7 @@ void
applyrules(Client *c) applyrules(Client *c)
{ {
const char *class, *instance; const char *class, *instance;
unsigned int i; unsigned int i, j;
const Rule *r; const Rule *r;
Monitor *m; Monitor *m;
XClassHint ch = { NULL, NULL }; XClassHint ch = { NULL, NULL };
@ -352,17 +354,21 @@ applyrules(Client *c)
c->isterminal = r->isterminal; c->isterminal = r->isterminal;
c->noswallow = r->noswallow; c->noswallow = r->noswallow;
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
c->tags[metaws] |= r->tags; if (!r->mwpin)
c->tags[metaws] |= r->tags;
else for (j = 0; j < LENGTH(metaworkspaces); ++j)
c->tags[j] |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next); for (m = mons; m && m->num != r->monitor; m = m->next);
if (m) if (m)
c->mon = m; c->mon = m;
c->mwpin = r->mwpin;
} }
} }
if (ch.res_class) if (ch.res_class)
XFree(ch.res_class); XFree(ch.res_class);
if (ch.res_name) if (ch.res_name)
XFree(ch.res_name); XFree(ch.res_name);
c->tags[metaws] = c->tags[metaws] & TAGMASK ? c->tags[metaws] & TAGMASK : c->mon->tagset[c->mon->seltags]; c->tags[metaws] = c->tags[metaws] & TAGMASK ? c->tags[metaws] & TAGMASK : c->mon->tagset[metaws][c->mon->seltags[metaws]];
} }
int int
@ -552,7 +558,7 @@ buttonpress(XEvent *e)
for(c = m->clients; c; c=c->next) for(c = m->clients; c; c=c->next)
occ |= c->tags[metaws] == TAGMASK ? 0 : c->tags[metaws]; occ |= c->tags[metaws] == TAGMASK ? 0 : c->tags[metaws];
do { do {
if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) if (!(occ & 1 << i || m->tagset[metaws][m->seltags[metaws]] & 1 << i))
continue; continue;
x += TEXTW(tags[i]); x += TEXTW(tags[i]);
} while (ev->x >= x && ++i < LENGTH(tags)); } while (ev->x >= x && ++i < LENGTH(tags));
@ -594,7 +600,7 @@ checkotherwm(void)
void void
cleanup(void) cleanup(void)
{ {
Arg a = {.ui = ~0}; Arg a = {.ui = ~0u};
Layout foo = { "", NULL }; Layout foo = { "", NULL };
Monitor *m; Monitor *m;
size_t i; size_t i;
@ -757,10 +763,14 @@ Monitor *
createmon(void) createmon(void)
{ {
Monitor *m; Monitor *m;
unsigned int i;
const char *symbol = spawnmaster ? layouts[0].symbol : layouts[0].symbolrev; const char *symbol = spawnmaster ? layouts[0].symbol : layouts[0].symbolrev;
m = ecalloc(1, sizeof(Monitor)); m = (Monitor *)ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1; for (i = 0; i < LENGTH(metaworkspaces); ++i) {
m->tagset[i][0] = 1;
m->seltags[i] = 0;
}
m->mfact = mfact; m->mfact = mfact;
m->nmaster = nmaster; m->nmaster = nmaster;
m->showbar = showbar; m->showbar = showbar;
@ -846,7 +856,7 @@ drawbar(Monitor *m)
} }
for (c = m->clients; c; c = c->next) { for (c = m->clients; c; c = c->next) {
occ |= c->tags[metaws] == TAGMASK ? 0 : c->tags[metaws]; occ |= c->tags[metaws] == TAGMASK && c != selmon->sel ? 0 : c->tags[metaws];
if (c->isurgent) if (c->isurgent)
urg |= c->tags[metaws]; urg |= c->tags[metaws];
} }
@ -856,34 +866,32 @@ drawbar(Monitor *m)
x = drw_text(drw, x, 0, w, bh, lrpad / 2, mwsymbol, 0); x = drw_text(drw, x, 0, w, bh, lrpad / 2, mwsymbol, 0);
for (i = 0; i < LENGTH(tags); i++) { for (i = 0; i < LENGTH(tags); i++) {
if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) if(!(occ & 1 << i || m->tagset[metaws][m->seltags[metaws]] & 1 << i))
continue; continue;
w = TEXTW(tags[i]); w = TEXTW(tags[i]);
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); drw_setscheme(drw, scheme[m->tagset[metaws][m->seltags[metaws]] & 1 << i ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
if (occ & 1 << i && m == selmon && if (m == selmon &&
selmon->sel && selmon->sel->tags[metaws] & 1 << i) selmon->sel && selmon->sel->tags[metaws] & 1 << i &&
selmon->sel->tags[metaws] & ~(1 << i))
drw_rect(drw, x + boxs, boxs, boxw, boxw, 1, urg & 1 << i); drw_rect(drw, x + boxs, boxs, boxw, boxw, 1, urg & 1 << i);
x += w; x += w;
} }
drw_setscheme(drw, scheme[SchemeNorm]);
if (draw_ltsymbol) { if (draw_ltsymbol) {
w = TEXTW(m->ltsymbol); w = TEXTW(m->ltsymbol);
drw_setscheme(drw, scheme[SchemeNorm]);
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
} }
if ((w = m->ww - tw - x) > bh) { if ((w = m->ww - tw - x) > bh) {
if (m->sel) { if (m->sel) {
drw_setscheme(drw, scheme[SchemeNorm]);
// drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
if (m->sel->isfloating) if (m->sel->isfloating)
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
} else { } else
drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, x, 0, w, bh, 1, 1); drw_rect(drw, x, 0, w, bh, 1, 1);
}
} }
drw_map(drw, m->barwin, 0, 0, m->ww, bh); drw_map(drw, m->barwin, 0, 0, m->ww, bh);
} }
@ -1010,7 +1018,7 @@ focustagmon(const Arg *arg)
{ {
Monitor *m = dirtomon(arg->i); Monitor *m = dirtomon(arg->i);
if (m && m->sel && m->sel->isfullscreen) if (m && m->sel && m->sel->isfullscreen)
return; setfullscreen(m->sel, 0);
tagmon(arg); tagmon(arg);
focusmon(arg); focusmon(arg);
@ -1636,7 +1644,7 @@ sendmon(Client *c, Monitor *m)
Client *pc = selmon->stack; Client *pc = selmon->stack;
c->mon = m; c->mon = m;
c->tags[metaws] = m->tagset[m->seltags]; /* assign tags of target monitor */ c->tags[metaws] = m->tagset[metaws][m->seltags[metaws]]; /* assign tags of target monitor */
if (m->spawnmaster) if (m->spawnmaster)
attach(c); attach(c);
@ -1951,7 +1959,6 @@ void
tagmetaws(const Arg *arg) tagmetaws(const Arg *arg)
{ {
int i; int i;
unsigned int ot;
if (!selmon->sel || arg->i >= (int)LENGTH(metaworkspaces)) if (!selmon->sel || arg->i >= (int)LENGTH(metaworkspaces))
return; return;
@ -1963,10 +1970,9 @@ tagmetaws(const Arg *arg)
} }
else { else {
selmon->sel->mwpin = 0; selmon->sel->mwpin = 0;
ot = selmon->sel->tags[metaws];
for (i = 0; i < LENGTH(metaworkspaces); ++i) for (i = 0; i < LENGTH(metaworkspaces); ++i)
selmon->sel->tags[i] = 0; selmon->sel->tags[i] = 0;
selmon->sel->tags[arg->i] = ot; selmon->sel->tags[arg->i] = selmon->tagset[arg->i][selmon->seltags[arg->i]];
} }
focus(NULL); focus(NULL);
@ -2061,10 +2067,10 @@ toggletag(const Arg *arg)
void void
toggleview(const Arg *arg) toggleview(const Arg *arg)
{ {
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK); unsigned int newtagset = selmon->tagset[metaws][selmon->seltags[metaws]] ^ (arg->ui & TAGMASK);
if (newtagset) { if (newtagset) {
selmon->tagset[selmon->seltags] = newtagset; selmon->tagset[metaws][selmon->seltags[metaws]] = newtagset;
focus(NULL); focus(NULL);
arrange(selmon); arrange(selmon);
} }
@ -2396,11 +2402,11 @@ updatewmhints(Client *c)
void void
view(const Arg *arg) view(const Arg *arg)
{ {
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags]) if ((arg->ui & TAGMASK) == selmon->tagset[metaws][selmon->seltags[metaws]])
return; return;
selmon->seltags ^= 1; /* toggle sel tagset */ selmon->seltags[metaws] ^= 1; /* toggle sel tagset */
if (arg->ui & TAGMASK) if (arg->ui & TAGMASK)
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; selmon->tagset[metaws][selmon->seltags[metaws]] = arg->ui & TAGMASK;
focus(NULL); focus(NULL);
arrange(selmon); arrange(selmon);
} }