commit d6f739053d5ecaf6d60836984fec9d517125752a
Author: Miles Alan <[email protected]>
Date: Tue Aug 13 18:27:17 2019 -0500
[dwm][patch] taggrid: Port to 6.2
diff --git a/dwm.suckless.org/patches/taggrid/dwm-6.2-taggrid.diff
b/dwm.suckless.org/patches/taggrid/dwm-6.2-taggrid.diff
new file mode 100644
index 00000000..f5ed115e
--- /dev/null
+++ b/dwm.suckless.org/patches/taggrid/dwm-6.2-taggrid.diff
@@ -0,0 +1,253 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..2f8f34b 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -21,6 +21,22 @@ static const char *colors[][3] = {
+ /* tagging */
+ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
++/* grid of tags */
++#define DRAWCLASSICTAGS 1 << 0
++#define DRAWTAGGRID 1 << 1
++
++#define SWITCHTAG_UP 1 << 0
++#define SWITCHTAG_DOWN 1 << 1
++#define SWITCHTAG_LEFT 1 << 2
++#define SWITCHTAG_RIGHT 1 << 3
++#define SWITCHTAG_TOGGLETAG 1 << 4
++#define SWITCHTAG_TAG 1 << 5
++#define SWITCHTAG_VIEW 1 << 6
++#define SWITCHTAG_TOGGLEVIEW 1 << 7
++
++static const unsigned int drawtagmask = DRAWTAGGRID; /* | DRAWCLASSICTAGS to
show classic row of tags */
++static const int tagrows = 2;
++
+ static const Rule rules[] = {
+ /* xprop(1):
+ * WM_CLASS(STRING) = instance, class
+@@ -94,6 +110,16 @@ static Key keys[] = {
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
++
++ { MODKEY|ControlMask, XK_Up, switchtag, { .ui =
SWITCHTAG_UP | SWITCHTAG_VIEW } },
++ { MODKEY|ControlMask, XK_Down, switchtag, { .ui =
SWITCHTAG_DOWN | SWITCHTAG_VIEW } },
++ { MODKEY|ControlMask, XK_Right, switchtag, { .ui =
SWITCHTAG_RIGHT | SWITCHTAG_VIEW } },
++ { MODKEY|ControlMask, XK_Left, switchtag, { .ui =
SWITCHTAG_LEFT | SWITCHTAG_VIEW } },
++
++ { MODKEY|Mod4Mask, XK_Up, switchtag, { .ui =
SWITCHTAG_UP | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
++ { MODKEY|Mod4Mask, XK_Down, switchtag, { .ui =
SWITCHTAG_DOWN | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
++ { MODKEY|Mod4Mask, XK_Right, switchtag, { .ui =
SWITCHTAG_RIGHT | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
++ { MODKEY|Mod4Mask, XK_Left, switchtag, { .ui =
SWITCHTAG_LEFT | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
+ };
+
+ /* button definitions */
+diff --git a/dwm.c b/dwm.c
+index 4465af1..5c29232 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -163,6 +163,7 @@ static void detachstack(Client *c);
+ static Monitor *dirtomon(int dir);
+ static void drawbar(Monitor *m);
+ static void drawbars(void);
++static void drawtaggrid(Monitor *m, int *x_pos, unsigned int occ);
+ static void enternotify(XEvent *e);
+ static void expose(XEvent *e);
+ static void focus(Client *c);
+@@ -206,6 +207,7 @@ static void seturgent(Client *c, int urg);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
++static void switchtag(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *);
+@@ -417,11 +419,13 @@ void
+ buttonpress(XEvent *e)
+ {
+ unsigned int i, x, click;
++ unsigned int columns;
+ Arg arg = {0};
+ Client *c;
+ Monitor *m;
+ XButtonPressedEvent *ev = &e->xbutton;
+
++ columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 :
0);
+ click = ClkRootWin;
+ /* focus monitor if necessary */
+ if ((m = wintomon(ev->window)) && m != selmon) {
+@@ -431,13 +435,23 @@ buttonpress(XEvent *e)
+ }
+ if (ev->window == selmon->barwin) {
+ i = x = 0;
++ if (drawtagmask & DRAWCLASSICTAGS)
+ do
+ x += TEXTW(tags[i]);
+ while (ev->x >= x && ++i < LENGTH(tags));
+- if (i < LENGTH(tags)) {
++ if(i < LENGTH(tags) && (drawtagmask & DRAWCLASSICTAGS)) {
+ click = ClkTagBar;
+ arg.ui = 1 << i;
+- } else if (ev->x < x + blw)
++ } else if(ev->x < x + columns * bh / tagrows && (drawtagmask &
DRAWTAGGRID)) {
++ click = ClkTagBar;
++ i = (ev->x - x) / (bh / tagrows);
++ i = i + columns * (ev->y / (bh / tagrows));
++ if (i >= LENGTH(tags)) {
++ i = LENGTH(tags) - 1;
++ }
++ arg.ui = 1 << i;
++ }
++ else if(ev->x < x + blw + columns * bh / tagrows)
+ click = ClkLtSymbol;
+ else if (ev->x > selmon->ww - TEXTW(stext))
+ click = ClkStatusText;
+@@ -714,6 +728,7 @@ drawbar(Monitor *m)
+ urg |= c->tags;
+ }
+ x = 0;
++ if (drawtagmask & DRAWCLASSICTAGS)
+ for (i = 0; i < LENGTH(tags); i++) {
+ w = TEXTW(tags[i]);
+ drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ?
SchemeSel : SchemeNorm]);
+@@ -724,6 +739,9 @@ drawbar(Monitor *m)
+ urg & 1 << i);
+ x += w;
+ }
++ if (drawtagmask & DRAWTAGGRID) {
++ drawtaggrid(m,&x,occ);
++ }
+ w = blw = TEXTW(m->ltsymbol);
+ drw_setscheme(drw, scheme[SchemeNorm]);
+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+@@ -750,6 +768,48 @@ drawbars(void)
+ for (m = mons; m; m = m->next)
+ drawbar(m);
+ }
++void drawtaggrid(Monitor *m, int *x_pos, unsigned int occ)
++{
++ unsigned int x, y, h, max_x, columns;
++ int invert, i,j, k;
++
++ h = bh / tagrows;
++ x = max_x = *x_pos;
++ y = 0;
++ columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
++
++ /* Firstly we will fill the borders of squares */
++
++ XSetForeground(drw->dpy, drw->gc, scheme[SchemeNorm][ColBorder].pixel);
++ XFillRectangle(dpy, drw->drawable, drw->gc, x, y, h*columns + 1, bh);
++
++ /* We will draw LENGTH(tags) squares in tagraws raws. */
++ for(j = 0, i= 0; j < tagrows; j++) {
++ x = *x_pos;
++ for (k = 0; k < columns && i < LENGTH(tags); k++, i++) {
++ invert = m->tagset[m->seltags] & 1 << i ? 0 : 1;
++
++ /* Select active color for current square */
++ XSetForeground(drw->dpy, drw->gc, !invert ?
scheme[SchemeSel][ColBg].pixel :
++ scheme[SchemeNorm][ColFg].pixel);
++ XFillRectangle(dpy, drw->drawable, drw->gc, x+1, y+1, h-1, h-1);
++
++ /* Mark square if tag has client */
++ if (occ & 1 << i) {
++ XSetForeground(drw->dpy, drw->gc, !invert ?
scheme[SchemeSel][ColFg].pixel :
++ scheme[SchemeNorm][ColBg].pixel);
++ XFillRectangle(dpy, drw->drawable, drw->gc, x + 1, y + 1,
++ h / 2, h / 2);
++ }
++ x += h;
++ if (x > max_x) {
++ max_x = x;
++ }
++ }
++ y += h;
++ }
++ *x_pos = max_x + 1;
++}
+
+ void
+ enternotify(XEvent *e)
+@@ -1627,6 +1687,81 @@ showhide(Client *c)
+ XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
+ }
+ }
++void switchtag(const Arg *arg)
++{
++ unsigned int columns;
++ unsigned int new_tagset = 0;
++ unsigned int pos, i;
++ int col, row;
++ Arg new_arg;
++
++ columns = LENGTH(tags) / tagrows + ((LENGTH(tags) % tagrows > 0) ? 1 : 0);
++
++ for (i = 0; i < LENGTH(tags); ++i) {
++ if (!(selmon->tagset[selmon->seltags] & 1 << i)) {
++ continue;
++ }
++ pos = i;
++ row = pos / columns;
++ col = pos % columns;
++ if (arg->ui & SWITCHTAG_UP) { /* UP */
++ row --;
++ if (row < 0) {
++ row = tagrows - 1;
++ }
++ do {
++ pos = row * columns + col;
++ row --;
++ } while (pos >= LENGTH(tags));
++ }
++ if (arg->ui & SWITCHTAG_DOWN) { /* DOWN */
++ row ++;
++ if (row >= tagrows) {
++ row = 0;
++ }
++ pos = row * columns + col;
++ if (pos >= LENGTH(tags)) {
++ row = 0;
++ }
++ pos = row * columns + col;
++ }
++ if (arg->ui & SWITCHTAG_LEFT) { /* LEFT */
++ col --;
++ if (col < 0) {
++ col = columns - 1;
++ }
++ do {
++ pos = row * columns + col;
++ col --;
++ } while (pos >= LENGTH(tags));
++ }
++ if (arg->ui & SWITCHTAG_RIGHT) { /* RIGHT */
++ col ++;
++ if (col >= columns) {
++ col = 0;
++ }
++ pos = row * columns + col;
++ if (pos >= LENGTH(tags)) {
++ col = 0;
++ pos = row * columns + col;
++ }
++ }
++ new_tagset |= 1 << pos;
++ }
++ new_arg.ui = new_tagset;
++ if (arg->ui & SWITCHTAG_TOGGLETAG) {
++ toggletag(&new_arg);
++ }
++ if (arg->ui & SWITCHTAG_TAG) {
++ tag(&new_arg);
++ }
++ if (arg->ui & SWITCHTAG_VIEW) {
++ view (&new_arg);
++ }
++ if (arg->ui & SWITCHTAG_TOGGLEVIEW) {
++ toggleview (&new_arg);
++ }
++}
+
+ void
+ sigchld(int unused)
diff --git a/dwm.suckless.org/patches/taggrid/index.md
b/dwm.suckless.org/patches/taggrid/index.md
index 23426e22..9ba4a8b9 100644
--- a/dwm.suckless.org/patches/taggrid/index.md
+++ b/dwm.suckless.org/patches/taggrid/index.md
@@ -59,7 +59,9 @@ this will move active window in specified direction and
perform the action, desc
Download
--------
* [dwm-6.1-taggrid.diff](dwm-6.1-taggrid.diff) (2014-02-16)
+* [dwm-6.2-taggrid.diff](dwm-6.2-taggrid.diff) (2019-08-13)
Author
------
* Yury Shvedov - [shved AT lvk DOT cs DOT msu DOT
su](mailto:[email protected]) (or [mestofel13 AT gmail DOT
com](mailto:[email protected])).
+* Miles Alan - [email protected] (6.2 port)
