aboutsummaryrefslogtreecommitdiff
path: root/dwm/patches
diff options
context:
space:
mode:
Diffstat (limited to 'dwm/patches')
-rw-r--r--dwm/patches/dwm-alpha-6.1.diff253
-rw-r--r--dwm/patches/dwm-fakefullscreen-20170508-ceac8c9.diff92
-rw-r--r--dwm/patches/dwm-fibonacci-5.8.2.diff85
-rw-r--r--dwm/patches/dwm-gaplessgrid-6.1.diff43
-rw-r--r--dwm/patches/dwm-resizecorners-6.1.diff68
-rw-r--r--dwm/patches/dwm-rotatestack-20161021-ab9571b.diff102
6 files changed, 0 insertions, 643 deletions
diff --git a/dwm/patches/dwm-alpha-6.1.diff b/dwm/patches/dwm-alpha-6.1.diff
deleted file mode 100644
index 7ca0885..0000000
--- a/dwm/patches/dwm-alpha-6.1.diff
+++ /dev/null
@@ -1,253 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..4448d46 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -11,6 +11,8 @@ static const char normfgcolor[] = "#bbbbbb";
- static const char selbordercolor[] = "#005577";
- static const char selbgcolor[] = "#005577";
- static const char selfgcolor[] = "#eeeeee";
-+static unsigned int baralpha = 0xd0;
-+static unsigned int borderalpha = OPAQUE;
- static const unsigned int borderpx = 1; /* border pixel of windows */
- static const unsigned int snap = 32; /* snap pixel */
- static const int showbar = 1; /* 0 means no bar */
-diff --git a/config.mk b/config.mk
-index 4eefb71..de25d2a 100644
---- a/config.mk
-+++ b/config.mk
-@@ -22,7 +22,7 @@ FREETYPEINC = /usr/include/freetype2
-
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
-
- # flags
- CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff --git a/drw.c b/drw.c
-index f49200b..12e3ebc 100644
---- a/drw.c
-+++ b/drw.c
-@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
- }
-
- Drw *
--drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
- {
- Drw *drw;
-
-@@ -71,8 +71,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
- drw->root = root;
- drw->w = w;
- drw->h = h;
-- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-- drw->gc = XCreateGC(dpy, root, 0, NULL);
-+ drw->visual = visual;
-+ drw->depth = depth;
-+ drw->cmap = cmap;
-+ drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
-+ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
- drw->fontcount = 0;
- XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-@@ -86,7 +89,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
- drw->h = h;
- if (drw->drawable)
- XFreePixmap(drw->dpy, drw->drawable);
-- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-+ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
- }
-
- void
-@@ -180,16 +183,15 @@ drw_font_free(Fnt *font)
- }
-
- Clr *
--drw_clr_create(Drw *drw, const char *clrname)
-+drw_clr_create(Drw *drw, const char *clrname, unsigned int alpha)
- {
- Clr *clr;
-
- clr = ecalloc(1, sizeof(Clr));
-- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-- DefaultColormap(drw->dpy, drw->screen),
-+ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
- clrname, &clr->rgb))
- die("error, cannot allocate color '%s'\n", clrname);
-- clr->pix = clr->rgb.pixel;
-+ clr->pix = (clr->rgb.pixel & 0x00ffffffU) | (alpha << 24);
-
- return clr;
- }
-@@ -245,9 +247,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
- XSetForeground(drw->dpy, drw->gc, invert ?
- drw->scheme->fg->pix : drw->scheme->bg->pix);
- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-- d = XftDrawCreate(drw->dpy, drw->drawable,
-- DefaultVisual(drw->dpy, drw->screen),
-- DefaultColormap(drw->dpy, drw->screen));
-+ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
- }
-
- curfont = drw->fonts[0];
-diff --git a/drw.h b/drw.h
-index e3b8515..1fed824 100644
---- a/drw.h
-+++ b/drw.h
-@@ -30,6 +30,9 @@ typedef struct {
- Display *dpy;
- int screen;
- Window root;
-+ Visual *visual;
-+ unsigned int depth;
-+ Colormap cmap;
- Drawable drawable;
- GC gc;
- ClrScheme *scheme;
-@@ -43,7 +46,7 @@ typedef struct {
- } Extnts;
-
- /* Drawable abstraction */
--Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
-+Drw *drw_create(Display *, int, Window, unsigned int, unsigned int, Visual*, unsigned int, Colormap);
- void drw_resize(Drw *, unsigned int, unsigned int);
- void drw_free(Drw *);
-
-@@ -55,7 +58,7 @@ void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
- unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
-
- /* Colour abstraction */
--Clr *drw_clr_create(Drw *, const char *);
-+Clr *drw_clr_create(Drw *, const char *, unsigned int);
- void drw_clr_free(Clr *);
-
- /* Cursor abstraction */
-diff --git a/dwm.c b/dwm.c
-index 0362114..17fe373 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,6 +57,8 @@
- #define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
-
-+#define OPAQUE 0xffU
-+
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
- enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
-@@ -232,6 +234,7 @@ static Monitor *wintomon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
-+static void xinitvisual();
- static void zoom(const Arg *arg);
-
- /* variables */
-@@ -267,6 +270,11 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root;
-
-+static int useargb = 0;
-+static Visual *visual;
-+static int depth;
-+static Colormap cmap;
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
-
-@@ -1556,7 +1564,8 @@ setup(void)
- sw = DisplayWidth(dpy, screen);
- sh = DisplayHeight(dpy, screen);
- root = RootWindow(dpy, screen);
-- drw = drw_create(dpy, screen, root, sw, sh);
-+ xinitvisual();
-+ drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
- drw_load_fonts(drw, fonts, LENGTH(fonts));
- if (!drw->fontcount)
- die("no fonts could be loaded.\n");
-@@ -1580,12 +1589,12 @@ setup(void)
- cursor[CurResize] = drw_cur_create(drw, XC_sizing);
- cursor[CurMove] = drw_cur_create(drw, XC_fleur);
- /* init appearance */
-- scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor);
-- scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-- scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-- scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
-- scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-- scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-+ scheme[SchemeNorm].border = drw_clr_create(drw, normbordercolor, borderalpha);
-+ scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor, baralpha);
-+ scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor, OPAQUE);
-+ scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor, borderalpha);
-+ scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor, baralpha);
-+ scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor, OPAQUE);
- /* init bars */
- updatebars();
- updatestatus();
-@@ -1798,15 +1807,17 @@ updatebars(void)
- Monitor *m;
- XSetWindowAttributes wa = {
- .override_redirect = True,
-- .background_pixmap = ParentRelative,
-+ .background_pixel = 0,
-+ .border_pixel = 0,
-+ .colormap = cmap,
- .event_mask = ButtonPressMask|ExposureMask
- };
- for (m = mons; m; m = m->next) {
- if (m->barwin)
- continue;
-- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-- CopyFromParent, DefaultVisual(dpy, screen),
-- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
-+ InputOutput, visual,
-+ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- XMapRaised(dpy, m->barwin);
- }
-@@ -2107,6 +2118,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
- }
-
- void
-+xinitvisual()
-+{
-+ XVisualInfo *infos;
-+ XRenderPictFormat *fmt;
-+ int nitems;
-+ int i;
-+
-+ XVisualInfo tpl = {
-+ .screen = screen,
-+ .depth = 32,
-+ .class = TrueColor
-+ };
-+ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-+
-+ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-+ visual = NULL;
-+ for(i = 0; i < nitems; i ++) {
-+ fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-+ visual = infos[i].visual;
-+ depth = infos[i].depth;
-+ cmap = XCreateColormap(dpy, root, visual, AllocNone);
-+ useargb = 1;
-+ break;
-+ }
-+ }
-+
-+ XFree(infos);
-+
-+ if (! visual) {
-+ visual = DefaultVisual(dpy, screen);
-+ depth = DefaultDepth(dpy, screen);
-+ cmap = DefaultColormap(dpy, screen);
-+ }
-+}
-+
-+void
- zoom(const Arg *arg)
- {
- Client *c = selmon->sel;
diff --git a/dwm/patches/dwm-fakefullscreen-20170508-ceac8c9.diff b/dwm/patches/dwm-fakefullscreen-20170508-ceac8c9.diff
deleted file mode 100644
index 0c15db4..0000000
--- a/dwm/patches/dwm-fakefullscreen-20170508-ceac8c9.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index a5ce993..42d2049 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -522,7 +522,7 @@ clientmessage(XEvent *e)
- if (cme->data.l[1] == netatom[NetWMFullscreen]
- || cme->data.l[2] == netatom[NetWMFullscreen])
- setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
-- || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-+ || cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */));
- } else if (cme->message_type == netatom[NetActiveWindow]) {
- if (c != selmon->sel && !c->isurgent)
- seturgent(c, 1);
-@@ -552,7 +552,6 @@ void
- configurenotify(XEvent *e)
- {
- Monitor *m;
-- Client *c;
- XConfigureEvent *ev = &e->xconfigure;
- int dirty;
-
-@@ -565,9 +564,6 @@ configurenotify(XEvent *e)
- drw_resize(drw, sw, bh);
- updatebars();
- for (m = mons; m; m = m->next) {
-- for (c = m->clients; c; c = c->next)
-- if (c->isfullscreen)
-- resizeclient(c, m->mx, m->my, m->mw, m->mh);
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
- }
- focus(NULL);
-@@ -1145,8 +1141,6 @@ movemouse(const Arg *arg)
-
- if (!(c = selmon->sel))
- return;
-- if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-- return;
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
-@@ -1300,8 +1294,6 @@ resizemouse(const Arg *arg)
-
- if (!(c = selmon->sel))
- return;
-- if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-- return;
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
-@@ -1478,24 +1470,10 @@ setfullscreen(Client *c, int fullscreen)
- XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
- PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
- c->isfullscreen = 1;
-- c->oldstate = c->isfloating;
-- c->oldbw = c->bw;
-- c->bw = 0;
-- c->isfloating = 1;
-- resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-- XRaiseWindow(dpy, c->win);
- } else if (!fullscreen && c->isfullscreen){
- XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
- PropModeReplace, (unsigned char*)0, 0);
- c->isfullscreen = 0;
-- c->isfloating = c->oldstate;
-- c->bw = c->oldbw;
-- c->x = c->oldx;
-- c->y = c->oldy;
-- c->w = c->oldw;
-- c->h = c->oldh;
-- resizeclient(c, c->x, c->y, c->w, c->h);
-- arrange(c->mon);
- }
- }
-
-@@ -1620,7 +1598,7 @@ showhide(Client *c)
- if (ISVISIBLE(c)) {
- /* show clients top down */
- XMoveWindow(dpy, c->win, c->x, c->y);
-- if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-+ if (!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
- resize(c, c->x, c->y, c->w, c->h, 0);
- showhide(c->snext);
- } else {
-@@ -1712,8 +1690,6 @@ togglefloating(const Arg *arg)
- {
- if (!selmon->sel)
- return;
-- if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-- return;
- selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
- if (selmon->sel->isfloating)
- resize(selmon->sel, selmon->sel->x, selmon->sel->y,
diff --git a/dwm/patches/dwm-fibonacci-5.8.2.diff b/dwm/patches/dwm-fibonacci-5.8.2.diff
deleted file mode 100644
index 78664c8..0000000
--- a/dwm/patches/dwm-fibonacci-5.8.2.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index cca37df..91b91aa 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -29,1 +29,2 @@
-+#include "fibonacci.c"
- static const Layout layouts[] = {
-@@ -34,3 +35,5 @@
-+ { "[@]", spiral },
-+ { "[\\]", dwindle },
- };
-
- /* key definitions */
-diff --git a/fibonacci.c b/fibonacci.c
-new file mode 100644
-index 0000000..fce0a57
---- /dev/null
-+++ b/fibonacci.c
-@@ -0,0 +1,66 @@
-+void
-+fibonacci(Monitor *mon, int s) {
-+ unsigned int i, n, nx, ny, nw, nh;
-+ Client *c;
-+
-+ for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
-+ if(n == 0)
-+ return;
-+
-+ nx = mon->wx;
-+ ny = 0;
-+ nw = mon->ww;
-+ nh = mon->wh;
-+
-+ for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
-+ if((i % 2 && nh / 2 > 2 * c->bw)
-+ || (!(i % 2) && nw / 2 > 2 * c->bw)) {
-+ if(i < n - 1) {
-+ if(i % 2)
-+ nh /= 2;
-+ else
-+ nw /= 2;
-+ if((i % 4) == 2 && !s)
-+ nx += nw;
-+ else if((i % 4) == 3 && !s)
-+ ny += nh;
-+ }
-+ if((i % 4) == 0) {
-+ if(s)
-+ ny += nh;
-+ else
-+ ny -= nh;
-+ }
-+ else if((i % 4) == 1)
-+ nx += nw;
-+ else if((i % 4) == 2)
-+ ny += nh;
-+ else if((i % 4) == 3) {
-+ if(s)
-+ nx += nw;
-+ else
-+ nx -= nw;
-+ }
-+ if(i == 0)
-+ {
-+ if(n != 1)
-+ nw = mon->ww * mon->mfact;
-+ ny = mon->wy;
-+ }
-+ else if(i == 1)
-+ nw = mon->ww - nw;
-+ i++;
-+ }
-+ resize(c, nx, ny, nw - 2 * c->bw, nh - 2 * c->bw, False);
-+ }
-+}
-+
-+void
-+dwindle(Monitor *mon) {
-+ fibonacci(mon, 1);
-+}
-+
-+void
-+spiral(Monitor *mon) {
-+ fibonacci(mon, 0);
-+}
diff --git a/dwm/patches/dwm-gaplessgrid-6.1.diff b/dwm/patches/dwm-gaplessgrid-6.1.diff
deleted file mode 100644
index aed6430..0000000
--- a/dwm/patches/dwm-gaplessgrid-6.1.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-URL: http://dwm.suckless.org/patches/gapless_grid
-Add gapless grid layout.
-
-Index: dwm/gaplessgrid.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dwm/gaplessgrid.c 2014-02-09 15:24:17.132117105 +0100
-@@ -0,0 +1,35 @@
-+void
-+gaplessgrid(Monitor *m) {
-+ unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
-+ Client *c;
-+
-+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ;
-+ if(n == 0)
-+ return;
-+
-+ /* grid dimensions */
-+ for(cols = 0; cols <= n/2; cols++)
-+ if(cols*cols >= n)
-+ break;
-+ if(n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
-+ cols = 2;
-+ rows = n/cols;
-+
-+ /* window geometries */
-+ cw = cols ? m->ww / cols : m->ww;
-+ cn = 0; /* current column number */
-+ rn = 0; /* current row number */
-+ for(i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
-+ if(i/rows + 1 > cols - n%cols)
-+ rows = n/cols + 1;
-+ ch = rows ? m->wh / rows : m->wh;
-+ cx = m->wx + cn*cw;
-+ cy = m->wy + rn*ch;
-+ resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
-+ rn++;
-+ if(rn >= rows) {
-+ rn = 0;
-+ cn++;
-+ }
-+ }
-+}
diff --git a/dwm/patches/dwm-resizecorners-6.1.diff b/dwm/patches/dwm-resizecorners-6.1.diff
deleted file mode 100644
index b4c8400..0000000
--- a/dwm/patches/dwm-resizecorners-6.1.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index ff7e096..b6ce27c 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -1313,9 +1313,14 @@ void
- resizemouse(const Arg *arg)
- {
- int ocx, ocy, nw, nh;
-+ int ocx2, ocy2, nx, ny;
- Client *c;
- Monitor *m;
- XEvent ev;
-+ int horizcorner, vertcorner;
-+ int di;
-+ unsigned int dui;
-+ Window dummy;
- Time lasttime = 0;
-
- if (!(c = selmon->sel))
-@@ -1325,10 +1330,19 @@ resizemouse(const Arg *arg)
- restack(selmon);
- ocx = c->x;
- ocy = c->y;
-+ ocx2 = c->x + c->w;
-+ ocy2 = c->y + c->h;
- if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
- return;
-- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-+ if (!XQueryPointer (dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
-+ return;
-+ horizcorner = nx < c->w / 2;
-+ vertcorner = ny < c->h / 2;
-+ XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
-+ horizcorner ? (-c->bw) : (c->w + c->bw - 1),
-+ vertcorner ? (-c->bw) : (c->h + c->bw - 1));
-+
- do {
- XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
- switch(ev.type) {
-@@ -1344,6 +1358,11 @@ resizemouse(const Arg *arg)
-
- nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
- nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-+ nx = horizcorner ? ev.xmotion.x : c->x;
-+ ny = vertcorner ? ev.xmotion.y : c->y;
-+ nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
-+ nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
-+
- if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
- && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
- {
-@@ -1352,11 +1371,13 @@ resizemouse(const Arg *arg)
- togglefloating(NULL);
- }
- if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-- resize(c, c->x, c->y, nw, nh, 1);
-+ resize(c, nx, ny, nw, nh, 1);
- break;
- }
- } while (ev.type != ButtonRelease);
-- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
-+ horizcorner ? (-c->bw) : (c->w + c->bw - 1),
-+ vertcorner ? (-c->bw) : (c->h + c->bw - 1));
- XUngrabPointer(dpy, CurrentTime);
- while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
- if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
diff --git a/dwm/patches/dwm-rotatestack-20161021-ab9571b.diff b/dwm/patches/dwm-rotatestack-20161021-ab9571b.diff
deleted file mode 100644
index ed74c6d..0000000
--- a/dwm/patches/dwm-rotatestack-20161021-ab9571b.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index fd77a07..09737d7 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -64,6 +64,8 @@ static Key keys[] = {
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_b, togglebar, {0} },
-+ { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } },
-+ { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
-diff --git a/dwm.c b/dwm.c
-index 421bf27..1ec8b10 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -165,6 +165,8 @@ static void detachstack(Client *c);
- static Monitor *dirtomon(int dir);
- static void drawbar(Monitor *m);
- static void drawbars(void);
-+static void enqueue(Client *c);
-+static void enqueuestack(Client *c);
- static void enternotify(XEvent *e);
- static void expose(XEvent *e);
- static void focus(Client *c);
-@@ -194,6 +196,7 @@ static void resize(Client *c, int x, int y, int w, int h, int interact);
- static void resizeclient(Client *c, int x, int y, int w, int h);
- static void resizemouse(const Arg *arg);
- static void restack(Monitor *m);
-+static void rotatestack(const Arg *arg);
- static void run(void);
- static void scan(void);
- static int sendevent(Client *c, Atom proto);
-@@ -765,6 +768,28 @@ drawbars(void)
- }
-
- void
-+enqueue(Client *c)
-+{
-+ Client *l;
-+ for (l = c->mon->clients; l && l->next; l = l->next);
-+ if (l) {
-+ l->next = c;
-+ c->next = NULL;
-+ }
-+}
-+
-+void
-+enqueuestack(Client *c)
-+{
-+ Client *l;
-+ for (l = c->mon->stack; l && l->snext; l = l->snext);
-+ if (l) {
-+ l->snext = c;
-+ c->snext = NULL;
-+ }
-+}
-+
-+void
- enternotify(XEvent *e)
- {
- Client *c;
-@@ -1390,6 +1415,38 @@ restack(Monitor *m)
- }
-
- void
-+rotatestack(const Arg *arg)
-+{
-+ Client *c = NULL, *f;
-+
-+ if (!selmon->sel)
-+ return;
-+ f = selmon->sel;
-+ if (arg->i > 0) {
-+ for (c = nexttiled(selmon->clients); c && nexttiled(c->next); c = nexttiled(c->next));
-+ if (c){
-+ detach(c);
-+ attach(c);
-+ detachstack(c);
-+ attachstack(c);
-+ }
-+ } else {
-+ if ((c = nexttiled(selmon->clients))){
-+ detach(c);
-+ enqueue(c);
-+ detachstack(c);
-+ enqueuestack(c);
-+ }
-+ }
-+ if (c){
-+ arrange(selmon);
-+ //unfocus(f, 1);
-+ focus(f);
-+ restack(selmon);
-+ }
-+}
-+
-+void
- run(void)
- {
- XEvent ev;