commit f4707c80507d5aa3dbdbe654b7798cec03bab89f
Author: Jochen Sprickerhof <[email protected]>
Date: Tue Apr 7 08:44:21 2020 +0200
[dwm][patches] port to 6.2
diff --git
a/dwm.suckless.org/patches/fancybar/dwm-fancybar-2019018-b69c870.diff
b/dwm.suckless.org/patches/fancybar/dwm-fancybar-6.2.diff
similarity index 100%
rename from dwm.suckless.org/patches/fancybar/dwm-fancybar-2019018-b69c870.diff
rename to dwm.suckless.org/patches/fancybar/dwm-fancybar-6.2.diff
diff --git a/dwm.suckless.org/patches/fancybar/index.md
b/dwm.suckless.org/patches/fancybar/index.md
index e9cf23c9..7a21b18b 100644
--- a/dwm.suckless.org/patches/fancybar/index.md
+++ b/dwm.suckless.org/patches/fancybar/index.md
@@ -11,7 +11,7 @@ Download
--------
* [dwm-fancybar-5.6.1.diff](dwm-fancybar-5.6.1.diff)
* [dwm-fancybar-6.1.diff](dwm-fancybar-6.1.diff)
-* [dwm-fancybar-2019018-b69c870.diff](dwm-fancybar-2019018-b69c870.diff)
+* [dwm-fancybar-6.2.diff](dwm-fancybar-6.2.diff)
Author
------
diff --git a/dwm.suckless.org/patches/pertag/dwm-pertag-20170513-ceac8c9.diff
b/dwm.suckless.org/patches/pertag/dwm-pertag-6.2.diff
similarity index 91%
rename from dwm.suckless.org/patches/pertag/dwm-pertag-20170513-ceac8c9.diff
rename to dwm.suckless.org/patches/pertag/dwm-pertag-6.2.diff
index 1a2a3cf3..d7537279 100644
--- a/dwm.suckless.org/patches/pertag/dwm-pertag-20170513-ceac8c9.diff
+++ b/dwm.suckless.org/patches/pertag/dwm-pertag-6.2.diff
@@ -1,8 +1,8 @@
diff --git a/dwm.c b/dwm.c
-index a5ce993..45f1e27 100644
+index 4465af1..6474055 100644
--- a/dwm.c
+++ b/dwm.c
-@@ -112,6 +112,7 @@ typedef struct {
+@@ -111,6 +111,7 @@ typedef struct {
void (*arrange)(Monitor *);
} Layout;
@@ -10,7 +10,7 @@ index a5ce993..45f1e27 100644
struct Monitor {
char ltsymbol[16];
float mfact;
-@@ -131,6 +132,7 @@ struct Monitor {
+@@ -130,6 +131,7 @@ struct Monitor {
Monitor *next;
Window barwin;
const Layout *lt[2];
@@ -18,7 +18,7 @@ index a5ce993..45f1e27 100644
};
typedef struct {
-@@ -272,6 +274,15 @@ static Window root, wmcheckwin;
+@@ -271,6 +273,15 @@ static Window root, wmcheckwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
@@ -34,7 +34,7 @@ index a5ce993..45f1e27 100644
/* compile-time check if all tags fit into an unsigned int bit array. */
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-@@ -632,6 +643,7 @@ Monitor *
+@@ -631,6 +642,7 @@ Monitor *
createmon(void)
{
Monitor *m;
@@ -42,7 +42,7 @@ index a5ce993..45f1e27 100644
m = ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1;
-@@ -642,6 +654,20 @@ createmon(void)
+@@ -641,6 +653,20 @@ createmon(void)
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
@@ -63,7 +63,7 @@ index a5ce993..45f1e27 100644
return m;
}
-@@ -968,7 +994,7 @@ grabkeys(void)
+@@ -966,7 +992,7 @@ grabkeys(void)
void
incnmaster(const Arg *arg)
{
@@ -72,7 +72,7 @@ index a5ce993..45f1e27 100644
arrange(selmon);
}
-@@ -1503,9 +1529,9 @@ void
+@@ -1501,9 +1527,9 @@ void
setlayout(const Arg *arg)
{
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
@@ -84,7 +84,7 @@ index a5ce993..45f1e27 100644
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof
selmon->ltsymbol);
if (selmon->sel)
arrange(selmon);
-@@ -1524,7 +1550,7 @@ setmfact(const Arg *arg)
+@@ -1522,7 +1548,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;
@@ -93,7 +93,7 @@ index a5ce993..45f1e27 100644
arrange(selmon);
}
-@@ -1701,7 +1727,7 @@ tile(Monitor *m)
+@@ -1699,7 +1725,7 @@ tile(Monitor *m)
void
togglebar(const Arg *arg)
{
@@ -102,7 +102,7 @@ index a5ce993..45f1e27 100644
updatebarpos(selmon);
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
arrange(selmon);
-@@ -1740,9 +1766,33 @@ void
+@@ -1738,9 +1764,33 @@ void
toggleview(const Arg *arg)
{
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui &
TAGMASK);
@@ -136,7 +136,7 @@ index a5ce993..45f1e27 100644
focus(NULL);
arrange(selmon);
}
-@@ -2036,11 +2086,37 @@ updatewmhints(Client *c)
+@@ -2035,11 +2085,37 @@ updatewmhints(Client *c)
void
view(const Arg *arg)
{
diff --git a/dwm.suckless.org/patches/pertag/index.md
b/dwm.suckless.org/patches/pertag/index.md
index 57468cda..3fa649c5 100644
--- a/dwm.suckless.org/patches/pertag/index.md
+++ b/dwm.suckless.org/patches/pertag/index.md
@@ -8,7 +8,7 @@ This patch keeps layout, mwfact, barpos and nmaster per tag.
Download
--------
-* [dwm-pertag-20170513-ceac8c9.diff](dwm-pertag-20170513-ceac8c9.diff)
+* [dwm-pertag-6.2.diff](dwm-pertag-6.2.diff)
* [dwm-pertag-6.1.diff](dwm-pertag-6.1.diff) (6.4K) (20151109)
* [dwm-git-20120406-pertag.diff](dwm-git-20120406-pertag.diff) (5955b)
* [dwm-pertag-6.0.diff](dwm-pertag-6.0.diff) (5955b) (20120406)
diff --git a/dwm.suckless.org/patches/warp/dwm-warp-git-20160626-7af4d43.diff
b/dwm.suckless.org/patches/warp/dwm-warp-6.2.diff
similarity index 79%
rename from dwm.suckless.org/patches/warp/dwm-warp-git-20160626-7af4d43.diff
rename to dwm.suckless.org/patches/warp/dwm-warp-6.2.diff
index f28ee200..813c41d6 100644
--- a/dwm.suckless.org/patches/warp/dwm-warp-git-20160626-7af4d43.diff
+++ b/dwm.suckless.org/patches/warp/dwm-warp-6.2.diff
@@ -1,24 +1,24 @@
diff --git a/dwm.c b/dwm.c
-index b2bc9bd..0329e1f 100644
+index 4465af1..bf74f60 100644
--- a/dwm.c
+++ b/dwm.c
-@@ -228,6 +228,7 @@ static void updatewindowtype(Client *c);
- static void updatetitle(Client *c);
+@@ -227,6 +227,7 @@ static void updatetitle(Client *c);
+ static void updatewindowtype(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
+static void warp(const Client *c);
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
static int xerror(Display *dpy, XErrorEvent *ee);
-@@ -842,6 +843,7 @@ focusmon(const Arg *arg)
- in gedit and anjuta */
+@@ -827,6 +828,7 @@ focusmon(const Arg *arg)
+ unfocus(selmon->sel, 0);
selmon = m;
focus(NULL);
+ warp(selmon->sel);
}
void
-@@ -1387,6 +1389,8 @@ restack(Monitor *m)
+@@ -1367,6 +1369,8 @@ restack(Monitor *m)
}
XSync(dpy, False);
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -27,7 +27,7 @@ index b2bc9bd..0329e1f 100644
}
void
-@@ -2039,6 +2043,28 @@ view(const Arg *arg)
+@@ -2044,6 +2048,28 @@ view(const Arg *arg)
arrange(selmon);
}
diff --git a/dwm.suckless.org/patches/warp/index.md
b/dwm.suckless.org/patches/warp/index.md
index a969cfd3..7fbe3e02 100644
--- a/dwm.suckless.org/patches/warp/index.md
+++ b/dwm.suckless.org/patches/warp/index.md
@@ -11,7 +11,7 @@ Download
--------
* [dwm-warp-5.9.diff](dwm-warp-5.9.diff) (20111028)
* [dwm-warp-6.1.diff](dwm-warp-6.1.diff) (20151215)
-* [dwm-warp-git-20160626-7af4d43.diff](dwm-warp-git-20160626-7af4d43.diff)
+* [dwm-warp-6.2.diff](dwm-warp-6.2.diff)
Author
------
