aboutsummaryrefslogtreecommitdiff
path: root/.repos
diff options
context:
space:
mode:
Diffstat (limited to '.repos')
-rw-r--r--.repos/.gitignore3
-rw-r--r--.repos/dwm/config.h30
-rw-r--r--.repos/dwm/dwm.c93
-rw-r--r--.repos/dwm/patches/dwm-adjacenttag-skipvacant-6.2.diff161
4 files changed, 275 insertions, 12 deletions
diff --git a/.repos/.gitignore b/.repos/.gitignore
new file mode 100644
index 0000000..b262bdb
--- /dev/null
+++ b/.repos/.gitignore
@@ -0,0 +1,3 @@
+*.rej
+*.orig
+*.o
diff --git a/.repos/dwm/config.h b/.repos/dwm/config.h
index 9c04d02..9e5bfa9 100644
--- a/.repos/dwm/config.h
+++ b/.repos/dwm/config.h
@@ -22,14 +22,14 @@ typedef struct {
const char *name;
const void *cmd;
} Sp;
-const char *spcmd1[] = {"mlterm", "-T", "spterm", "-g", "120x34", NULL };
-const char *spcmd2[] = {"mlterm", "-T", "spcalc", "-e", "python3", "-q", NULL };
+const char *spcmd1[] = {"term", "-t", "spterm", NULL };
+const char *spcmd2[] = {"term", "-t", "spcalc", "-e", "python3", "-q", NULL };
const char *spcmd3[] = {"keepassxc", NULL };
-const char *spcmd4[] = {"mlterm", "-T", "mail", "-g", "150x40", "-e", "neomutt", NULL };
-const char *spcmd5[] = {"/home/melvin/.scripts/weather", "show", NULL };
-const char *spcmd6[] = {"mlterm", "-T", "spalsa", "-e", "alsamixer", NULL };
-const char *spcmd7[] = {"mlterm", "-T", "spcale", "-e", "calcurse", NULL };
-const char *spcmd8[] = {"mlterm", "-T", "sptop", "-e", "htop", NULL };
+const char *spcmd4[] = {"term", "-t", "mail", "-e", "neomutt", NULL };
+const char *spcmd5[] = {"weather", "show", NULL };
+const char *spcmd6[] = {"term", "-t", "spalsa", "-e", "alsamixer", NULL };
+const char *spcmd7[] = {"term", "-t", "spcale", "-e", "calcurse", NULL };
+const char *spcmd8[] = {"term", "-t", "sptop", "-e", "htop", NULL };
static Sp scratchpads[] = {
/* name cmd */
{"spterm", spcmd1},
@@ -69,8 +69,8 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen
static const Layout layouts[] = {
/* symbol arrange function */
{ "[T]", tile }, /* first entry is default */
- { "[F]", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
+ { "[F]", NULL }, /* no layout function means floating behavior */
};
/* key definitions */
@@ -87,7 +87,7 @@ static const Layout layouts[] = {
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *termcmd[] = { "mlterm", NULL };
+static const char *termcmd[] = { "term", NULL };
#include <X11/XF86keysym.h>
static Key keys[] = {
@@ -101,12 +101,16 @@ static Key keys[] = {
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, XK_semicolon,viewnext, {0} },
+ { MODKEY, XK_g, viewprev, {0} },
+ /* { MODKEY|ShiftMask, XK_Right, tagtonext, {0} }, */
+ /* { MODKEY|ShiftMask, XK_Left, tagtoprev, {0} }, */
{ MODKEY|ShiftMask, XK_j, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_q, killclient, {0} },
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
@@ -134,6 +138,8 @@ static Key keys[] = {
TAGKEYS( XK_9, 8)
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {0} },
+ { MODKEY, XK_e, spawn, SHCMD("emoji") },
+
{ 0, XF86XK_AudioMute, spawn, SHCMD("amixer set Master toggle") },
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer set Master 5%+") },
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("amixer set Master 5%-") },
@@ -151,7 +157,7 @@ static Key keys[] = {
static Button buttons[] = {
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[1]} },
{ ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
diff --git a/.repos/dwm/dwm.c b/.repos/dwm/dwm.c
index 5ba4ad9..c257ee5 100644
--- a/.repos/dwm/dwm.c
+++ b/.repos/dwm/dwm.c
@@ -189,8 +189,10 @@ static void maprequest(XEvent *e);
static void monocle(Monitor *m);
static void motionnotify(XEvent *e);
static void movemouse(const Arg *arg);
+static unsigned int nexttag(void);
static Client *nexttiled(Client *c);
static void pop(Client *);
+static unsigned int prevtag(void);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
static Monitor *recttomon(int x, int y, int w, int h);
@@ -214,6 +216,8 @@ static void sigchld(int unused);
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
static void tagmon(const Arg *arg);
+static void tagtonext(const Arg *arg);
+static void tagtoprev(const Arg *arg);
static void tile(Monitor *);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
@@ -234,6 +238,8 @@ static void updatetitle(Client *c);
static void updatewindowtype(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
+static void viewnext(const Arg *arg);
+static void viewprev(const Arg *arg);
static void warp(const Client *c);
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
@@ -1230,6 +1236,29 @@ movemouse(const Arg *arg)
}
}
+unsigned int
+nexttag(void)
+{
+ unsigned int seltag = selmon->tagset[selmon->seltags];
+ unsigned int usedtags = 0;
+ Client *c = selmon->clients;
+
+ if (!c)
+ return seltag;
+
+ /* skip vacant tags */
+ do {
+ usedtags |= c->tags;
+ c = c->next;
+ } while (c);
+
+ do {
+ seltag = seltag == (1 << (LENGTH(tags) - 1)) ? 1 : seltag << 1;
+ } while (!(seltag & usedtags));
+
+ return seltag;
+}
+
Client *
nexttiled(Client *c)
{
@@ -1246,6 +1275,28 @@ pop(Client *c)
arrange(c->mon);
}
+unsigned int
+prevtag(void)
+{
+ unsigned int seltag = selmon->tagset[selmon->seltags];
+ unsigned int usedtags = 0;
+ Client *c = selmon->clients;
+ if (!c)
+ return seltag;
+
+ /* skip vacant tags */
+ do {
+ usedtags |= c->tags;
+ c = c->next;
+ } while (c);
+
+ do {
+ seltag = seltag == 1 ? (1 << (LENGTH(tags) - 1)) : seltag >> 1;
+ } while (!(seltag & usedtags));
+
+ return seltag;
+}
+
void
propertynotify(XEvent *e)
{
@@ -1711,6 +1762,36 @@ tagmon(const Arg *arg)
}
void
+tagtonext(const Arg *arg)
+{
+ unsigned int tmp;
+
+ if (selmon->sel == NULL)
+ return;
+
+ if ((tmp = nexttag()) == selmon->tagset[selmon->seltags])
+ return;
+
+ tag(&(const Arg){.ui = tmp });
+ view(&(const Arg){.ui = tmp });
+}
+
+void
+tagtoprev(const Arg *arg)
+{
+ unsigned int tmp;
+
+ if (selmon->sel == NULL)
+ return;
+
+ if ((tmp = prevtag()) == selmon->tagset[selmon->seltags])
+ return;
+
+ tag(&(const Arg){.ui = tmp });
+ view(&(const Arg){.ui = tmp });
+}
+
+void
tile(Monitor *m)
{
unsigned int i, n, h, mw, my, ty;
@@ -2184,6 +2265,18 @@ warp(const Client *c)
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
}
+void
+viewnext(const Arg *arg)
+{
+ view(&(const Arg){.ui = nexttag()});
+}
+
+void
+viewprev(const Arg *arg)
+{
+ view(&(const Arg){.ui = prevtag()});
+}
+
Client *
wintoclient(Window w)
{
diff --git a/.repos/dwm/patches/dwm-adjacenttag-skipvacant-6.2.diff b/.repos/dwm/patches/dwm-adjacenttag-skipvacant-6.2.diff
new file mode 100644
index 0000000..6e39d71
--- /dev/null
+++ b/.repos/dwm/patches/dwm-adjacenttag-skipvacant-6.2.diff
@@ -0,0 +1,161 @@
+diff -up a/config.def.h b/config.def.h
+--- a/config.def.h 2021-10-02 14:22:28.034782413 +0100
++++ b/config.def.h 2021-10-02 14:22:28.044723532 +0100
+@@ -84,6 +84,10 @@ static Key keys[] = {
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
++ { MODKEY, XK_Right, viewnext, {0} },
++ { MODKEY, XK_Left, viewprev, {0} },
++ { MODKEY|ShiftMask, XK_Right, tagtonext, {0} },
++ { MODKEY|ShiftMask, XK_Left, tagtoprev, {0} },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+diff -up a/dwm.c b/dwm.c
+--- a/dwm.c 2021-10-02 14:22:28.034782413 +0100
++++ b/dwm.c 2021-10-02 14:27:54.599845767 +0100
+@@ -183,8 +183,10 @@ static void maprequest(XEvent *e);
+ static void monocle(Monitor *m);
+ static void motionnotify(XEvent *e);
+ static void movemouse(const Arg *arg);
++static unsigned int nexttag(void);
+ static Client *nexttiled(Client *c);
+ static void pop(Client *);
++static unsigned int prevtag(void);
+ static void propertynotify(XEvent *e);
+ static void quit(const Arg *arg);
+ static Monitor *recttomon(int x, int y, int w, int h);
+@@ -208,6 +210,8 @@ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
++static void tagtonext(const Arg *arg);
++static void tagtoprev(const Arg *arg);
+ static void tile(Monitor *);
+ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+@@ -227,6 +231,8 @@ static void updatetitle(Client *c);
+ static void updatewindowtype(Client *c);
+ static void updatewmhints(Client *c);
+ static void view(const Arg *arg);
++static void viewnext(const Arg *arg);
++static void viewprev(const Arg *arg);
+ static Client *wintoclient(Window w);
+ static Monitor *wintomon(Window w);
+ static int xerror(Display *dpy, XErrorEvent *ee);
+@@ -1192,6 +1198,29 @@ movemouse(const Arg *arg)
+ }
+ }
+
++unsigned int
++nexttag(void)
++{
++ unsigned int seltag = selmon->tagset[selmon->seltags];
++ unsigned int usedtags = 0;
++ Client *c = selmon->clients;
++
++ if (!c)
++ return seltag;
++
++ /* skip vacant tags */
++ do {
++ usedtags |= c->tags;
++ c = c->next;
++ } while (c);
++
++ do {
++ seltag = seltag == (1 << (LENGTH(tags) - 1)) ? 1 : seltag << 1;
++ } while (!(seltag & usedtags));
++
++ return seltag;
++}
++
+ Client *
+ nexttiled(Client *c)
+ {
+@@ -1208,6 +1237,28 @@ pop(Client *c)
+ arrange(c->mon);
+ }
+
++unsigned int
++prevtag(void)
++{
++ unsigned int seltag = selmon->tagset[selmon->seltags];
++ unsigned int usedtags = 0;
++ Client *c = selmon->clients;
++ if (!c)
++ return seltag;
++
++ /* skip vacant tags */
++ do {
++ usedtags |= c->tags;
++ c = c->next;
++ } while (c);
++
++ do {
++ seltag = seltag == 1 ? (1 << (LENGTH(tags) - 1)) : seltag >> 1;
++ } while (!(seltag & usedtags));
++
++ return seltag;
++}
++
+ void
+ propertynotify(XEvent *e)
+ {
+@@ -1671,6 +1722,36 @@ tagmon(const Arg *arg)
+ }
+
+ void
++tagtonext(const Arg *arg)
++{
++ unsigned int tmp;
++
++ if (selmon->sel == NULL)
++ return;
++
++ if ((tmp = nexttag()) == selmon->tagset[selmon->seltags])
++ return;
++
++ tag(&(const Arg){.ui = tmp });
++ view(&(const Arg){.ui = tmp });
++}
++
++void
++tagtoprev(const Arg *arg)
++{
++ unsigned int tmp;
++
++ if (selmon->sel == NULL)
++ return;
++
++ if ((tmp = prevtag()) == selmon->tagset[selmon->seltags])
++ return;
++
++ tag(&(const Arg){.ui = tmp });
++ view(&(const Arg){.ui = tmp });
++}
++
++void
+ tile(Monitor *m)
+ {
+ unsigned int i, n, h, mw, my, ty;
+@@ -2044,6 +2125,18 @@ view(const Arg *arg)
+ arrange(selmon);
+ }
+
++void
++viewnext(const Arg *arg)
++{
++ view(&(const Arg){.ui = nexttag()});
++}
++
++void
++viewprev(const Arg *arg)
++{
++ view(&(const Arg){.ui = prevtag()});
++}
++
+ Client *
+ wintoclient(Window w)
+ {