fixup! WIP my local config changes

config.def.h

@@ -74,16 +74,10 @@ static const char *lockcmd[]  = { "slock", NULL };
 static const char *suspendcmd[] = { "systemctl", "suspend", NULL };
 static const char *themecmd[]   = { "lupan-set-theme", "toggle", NULL };
 
-#include "shift-tools.c"
 #include "exitdwm.c"
-
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_p,      spawndmenu,     {0} },
-	{ MODKEY,                       XK_u,      shiftview,      { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_u,	   shifttag,       { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_y,	   shifttag,       { .i = -1 } },
-	{ MODKEY,                       XK_y,      shiftview,      { .i = -1 } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstackvis,  {.i = +1 } },
@@ -93,14 +87,9 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
 	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY|ShiftMask,		XK_h,      shiftboth,      { .i = -1 }	},
-	{ MODKEY|ControlMask,		XK_h,      shiftswaptags,  { .i = -1 }	},
-	{ MODKEY|ControlMask,		XK_l,      shiftswaptags,  { .i = +1 }	},
-	{ MODKEY|ShiftMask,             XK_l,      shiftboth,      { .i = +1 }	},
 	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
 	{ MODKEY,                       XK_Return, zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY,                       XK_g,      goback,         {0} },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },

dwm.c

@@ -180,7 +180,6 @@ static Atom getatomprop(Client *c, Atom prop);
 static int getrootptr(int *x, int *y);
 static long getstate(Window w);
 static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void goback(const Arg *arg);
 static void grabbuttons(Client *c, int focused);
 static void grabkeys(void);
 static void hide(const Arg *arg);
@@ -288,7 +287,7 @@ static Cur *cursor[CurLast];
 static Clr **scheme, **schemedark, **schemelight;
 static Display *dpy;
 static Drw *drw;
-static Monitor *mons, *selmon, *prevmon;
+static Monitor *mons, *selmon;
 static Window root, wmcheckwin;
 static const char **dmenucmd;
 static int colormodechanged;
@@ -453,7 +452,6 @@ buttonpress(XEvent *e)
 	/* focus monitor if necessary */
 	if ((m = wintomon(ev->window)) && m != selmon) {
 		unfocus(selmon->sel, 1);
-		prevmon = selmon;
 		selmon = m;
 		focus(NULL);
 	}
@@ -842,7 +840,6 @@ enternotify(XEvent *e)
 	m = c ? c->mon : wintomon(ev->window);
 	if (m != selmon) {
 		unfocus(selmon->sel, 1);
-		prevmon = selmon;
 		selmon = m;
 	} else if (!c || c == selmon->sel)
 		return;
@@ -875,10 +872,8 @@ focus(Client *c)
 		}
 	}
 	if (c) {
-		if (c->mon != selmon) {
+		if (c->mon != selmon)
-			prevmon = selmon;
 			selmon = c->mon;
-		}
 		if (c->isurgent)
 			seturgent(c, 0);
 		detachstack(c);
@@ -914,7 +909,6 @@ focusmon(const Arg *arg)
 	if ((m = dirtomon(arg->i)) == selmon)
 		return;
 	unfocus(selmon->sel, 0);
-	prevmon = selmon;
 	selmon = m;
 	focus(NULL);
 	warp(selmon->sel);
@@ -1037,22 +1031,6 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size)
 	return 1;
 }
 
-void
-goback(const Arg *arg)
-{
-	if (prevmon == NULL) {
-		Arg a = {0};
-		view(&a);
-	} else if (prevmon != selmon) {
-		unfocus(selmon->sel, 0);
-		Monitor *p = selmon;
-		selmon = prevmon;
-		focus(NULL);
-		prevmon = p;
-		warp(selmon->sel);
-	}
-}
-
 void
 grabbuttons(Client *c, int focused)
 {
@@ -1313,8 +1291,6 @@ motionnotify(XEvent *e)
 		return;
 	if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
 		unfocus(selmon->sel, 1);
-		if (m != selmon)
-			prevmon = selmon;
 		selmon = m;
 		focus(NULL);
 	}
@@ -1376,7 +1352,6 @@ movemouse(const Arg *arg)
 	XUngrabPointer(dpy, CurrentTime);
 	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
 		sendmon(c, m);
-		prevmon = selmon;
 		selmon = m;
 		focus(NULL);
 	}
@@ -1568,7 +1543,6 @@ resizemouse(const Arg *arg)
 	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
 		sendmon(c, m);
-		prevmon = selmon;
 		selmon = m;
 		focus(NULL);
 	}
@@ -2107,7 +2081,6 @@ toggleview(const Arg *arg)
 	unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
 
 	if (newtagset) {
-		prevmon = NULL;
 		selmon->tagset[selmon->seltags] = newtagset;
 		focus(NULL);
 		arrange(selmon);
@@ -2436,7 +2409,6 @@ view(const Arg *arg)
 {
 	if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
 		return;
-	prevmon = NULL;
 	selmon->seltags ^= 1; /* toggle sel tagset */
 	if (arg->ui & TAGMASK)
 		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;

shift-tools.c

@@ -1,135 +0,0 @@
-/* Sends a window to the next/prev tag */
-void
-shifttag(const Arg *arg)
-{
-	Arg shifted;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-
-	if (arg->i > 0)	/* left circular shift */
-		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
-	else		/* right circular shift */
-		shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i));
-	tag(&shifted);
-}
-/* Sends a window to the next/prev tag that has a client, else it moves it to the next/prev one. */
-void
-shifttagclients(const Arg *arg)
-{
-
-	Arg shifted;
-	Client *c;
-	unsigned int tagmask = 0;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-	for (c = selmon->clients; c; c = c->next)
-		if (!(c->tags))
-			tagmask = tagmask | c->tags;
-
-
-	if (arg->i > 0)	/* left circular shift */
-		do {
-			shifted.ui = (shifted.ui << arg->i)
-			   | (shifted.ui >> (LENGTH(tags) - arg->i));
-		} while (tagmask && !(shifted.ui & tagmask));
-	else		/* right circular shift */
-		do {
-			shifted.ui = (shifted.ui >> (- arg->i)
-			   | shifted.ui << (LENGTH(tags) + arg->i));
-		} while (tagmask && !(shifted.ui & tagmask));
-	tag(&shifted);
-}
-/* Navigate to the next/prev tag */
-void
-shiftview(const Arg *arg)
-{
-	Arg shifted;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-	if (arg->i > 0)	/* left circular shift */
-		shifted.ui = (shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i));
-	else		/* right circular shift */
-		shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i));
-	view(&shifted);
-}
-/* Navigate to the next/prev tag that has a client, else moves it to the next/prev tag */
-void
-shiftviewclients(const Arg *arg)
-{
-	Arg shifted;
-	Client *c;
-	unsigned int tagmask = 0;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-	for (c = selmon->clients; c; c = c->next)
-		if (!(c->tags))
-			tagmask = tagmask | c->tags;
-
-
-	if (arg->i > 0)	/* left circular shift */
-		do {
-			shifted.ui = (shifted.ui << arg->i)
-			   | (shifted.ui >> (LENGTH(tags) - arg->i));
-		} while (tagmask && !(shifted.ui & tagmask));
-	else		/* right circular shift */
-		do {
-			shifted.ui = (shifted.ui >> (- arg->i)
-			   | shifted.ui << (LENGTH(tags) + arg->i));
-		} while (tagmask && !(shifted.ui & tagmask));
-	view(&shifted);
-}
-/* move the current active window to the next/prev tag and view it. More like following the window */
-void
-shiftboth(const Arg *arg)
-{
-	Arg shifted;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-	if (arg->i > 0)	/* left circular shift */
-		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
-	else		/* right circular shift */
-		shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i)));
-	tag(&shifted);
-	view(&shifted);
-}
-//helper function for shiftswaptags.
-//see: https://github.com/moizifty/DWM-Build/blob/65379c62640788881486401a0d8c79333751b02f/config.h#L48
-void
-swaptags(const Arg *arg)
-{
-	Client *c;
-	unsigned int newtag = arg->ui & TAGMASK;
-	unsigned int curtag = selmon->tagset[selmon->seltags];
-
-	if (newtag == curtag || !curtag || (curtag & (curtag-1)))
-		return;
-
-	for (c = selmon->clients; c != NULL; c = c->next) {
-		if ((c->tags & newtag) || (c->tags & curtag))
-			c->tags ^= curtag ^ newtag;
-
-		if (!c->tags)
-			c->tags = newtag;
-	}
-
-	//move to the swaped tag
-	//selmon->tagset[selmon->seltags] = newtag;
-
-	focus(NULL);
-	arrange(selmon);
-}
-/* swaps "tags" (all the clients) with the next/prev tag. */
-void
-shiftswaptags(const Arg *arg)
-{
-	Arg shifted;
-	shifted.ui = selmon->tagset[selmon->seltags];
-
-	if (arg->i > 0)	/* left circular shift */
-		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i)));
-	else		/* right circular shift */
-		shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i)));
-	swaptags(&shifted);
-	// uncomment if you also want to "go" (view) the tag where the the clients are going
-	//view(&shifted);
-}