summaryrefslogtreecommitdiff
path: root/dwm.c
diff options
context:
space:
mode:
Diffstat (limited to 'dwm.c')
-rw-r--r--dwm.c156
1 files changed, 156 insertions, 0 deletions
diff --git a/dwm.c b/dwm.c
index 4465af1..b353b8e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,6 +41,8 @@
#endif /* XINERAMA */
#include <X11/Xft/Xft.h>
+#include "kconfig.h"
+#include "debug/debug.h"
#include "drw.h"
#include "util.h"
@@ -67,6 +69,12 @@ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms *
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+/******************************************************************************/
+#ifdef CONFIG_DWM_PERTAG
+typedef struct Pertag Pertag;
+#endif
+/******************************************************************************/
+
typedef union {
int i;
unsigned int ui;
@@ -97,6 +105,7 @@ struct Client {
Client *snext;
Monitor *mon;
Window win;
+
};
typedef struct {
@@ -130,6 +139,11 @@ struct Monitor {
Monitor *next;
Window barwin;
const Layout *lt[2];
+/******************************************************************************/
+#ifdef CONFIG_DWM_PERTAG
+ Pertag *pertag;
+#endif
+/******************************************************************************/
};
typedef struct {
@@ -141,6 +155,8 @@ typedef struct {
int monitor;
} Rule;
+
+
/* function declarations */
static void applyrules(Client *c);
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
@@ -271,6 +287,20 @@ static Window root, wmcheckwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
+/******************************************************************************/
+#ifdef CONFIG_DWM_PERTAG
+struct Pertag {
+ unsigned int curtag, prevtag; /* current and previous tag */
+ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
+ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
+ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
+ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes */
+ Bool showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
+ Client *prevzooms[LENGTH(tags) + 1]; /* store zoom information */
+};
+#endif
+/******************************************************************************/
+
/* compile-time check if all tags fit into an unsigned int bit array. */
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
@@ -514,6 +544,9 @@ clientmessage(XEvent *e)
{
XClientMessageEvent *cme = &e->xclient;
Client *c = wintoclient(cme->window);
+#ifdef CONFIG_DWM_PERTAG
+ int i;
+#endif
if (!c)
return;
@@ -523,6 +556,11 @@ clientmessage(XEvent *e)
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
} else if (cme->message_type == netatom[NetActiveWindow]) {
+#ifdef CONFIG_DWM_PERTAG
+ for (i=0; !(c->tags & 1 << i);i++);
+ view(&(Arg){.ui = 1 << i});
+#endif
+
if (c != selmon->sel && !c->isurgent)
seturgent(c, 1);
}
@@ -631,6 +669,9 @@ Monitor *
createmon(void)
{
Monitor *m;
+#ifdef CONFIG_DWM_PERTAG
+ int i;
+#endif
m = ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1;
@@ -641,6 +682,29 @@ createmon(void)
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+#ifdef CONFIG_DWM_PERTAG
+ if (!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
+ die("fatal: could not malloc() %u bytes\n", sizeof(Pertag));
+ m->pertag->curtag = m->pertag->prevtag = 1;
+ for(i=0; i <= LENGTH(tags); i++) {
+ /* init nmaster */
+ m->pertag->nmasters[i] = m->nmaster;
+
+ /* init mfacts */
+ m->pertag->mfacts[i] = m->mfact;
+
+ /* init layouts */
+ m->pertag->ltidxs[i][0] = m->lt[0];
+ m->pertag->ltidxs[i][1] = m->lt[1];
+ m->pertag->sellts[i] = m->sellt;
+
+ /* init showbar */
+ m->pertag->showbars[i] = m->showbar;
+
+ /* swap focus and zoomswap*/
+ m->pertag->prevzooms[i] = NULL;
+ }
+#endif
return m;
}
@@ -966,7 +1030,11 @@ grabkeys(void)
void
incnmaster(const Arg *arg)
{
+#ifdef CONFIG_DWM_PERTAG
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
+#else
selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+#endif
arrange(selmon);
}
@@ -1500,10 +1568,31 @@ setfullscreen(Client *c, int fullscreen)
void
setlayout(const Arg *arg)
{
+/******************************************************************************/
+#ifdef CONFIG_DWM_PERTAG
+ if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+ {
+ selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+ }
+#else
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
selmon->sellt ^= 1;
+#endif
+/******************************************************************************/
+
+
+/******************************************************************************/
+#ifdef CONFIG_DWM_PERTAG
+ if (arg && arg->v)
+ selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
+ selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+#else
if (arg && arg->v)
selmon->lt[selmon->sellt] = (Layout *)arg->v;
+#endif
+/******************************************************************************/
+
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
if (selmon->sel)
arrange(selmon);
@@ -1522,7 +1611,13 @@ 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;
+
+#ifdef CONFIG_DWM_PERTAG
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
+#else
selmon->mfact = f;
+#endif
+
arrange(selmon);
}
@@ -1699,7 +1794,11 @@ tile(Monitor *m)
void
togglebar(const Arg *arg)
{
+#ifdef CONFIG_DWM_PERTAG
+ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
+#else
selmon->showbar = !selmon->showbar;
+#endif
updatebarpos(selmon);
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
arrange(selmon);
@@ -1740,9 +1839,35 @@ toggleview(const Arg *arg)
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
if (newtagset) {
+#ifdef CONFIG_DWM_PERTAG
+ int i;
+ 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;
+ }
+ selmon->tagset[selmon->seltags] = newtagset;
+
+ /* 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];
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
+ togglebar(NULL);
+ focus(NULL);
+ arrange(selmon);
+#else
selmon->tagset[selmon->seltags] = newtagset;
focus(NULL);
arrange(selmon);
+#endif
}
}
@@ -2035,11 +2160,42 @@ updatewmhints(Client *c)
void
view(const Arg *arg)
{
+#ifdef CONFIG_DWM_PERTAG
+ int i;
+ unsigned int tmptag;
+#endif
+
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return;
selmon->seltags ^= 1; /* toggle sel tagset */
+
+#ifdef CONFIG_DWM_PERTAG
+ if (arg->ui & TAGMASK) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+ if (arg->ui == ~0)
+ selmon->pertag->curtag = 0;
+ else {
+ for (i=0; !(arg->ui & 1 << i); i++) ;
+ selmon->pertag->curtag = i + 1;
+ }
+ } else {
+ tmptag = selmon->pertag->prevtag;
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ selmon->pertag->curtag = tmptag;
+ }
+ 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];
+ if (selmon->showbar != selmon->pertag->showbars[selmon->pertag->curtag])
+ togglebar(NULL);
+#else
if (arg->ui & TAGMASK)
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+#endif
+
focus(NULL);
arrange(selmon);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 08:48:41 +0000