commit 65a3daac71cbe8382d53918bce25dc82b52bf56b
Author: Britton Leo Kerin <[email protected]>
Date: Sun Jul 17 13:50:31 2016 -0800
maximize: rename to follow new scheme
diff --git a/dwm.suckless.org/patches/dwm-6.0-maximize_vert_horz.diff
b/dwm.suckless.org/patches/dwm-6.0-maximize_vert_horz.diff
deleted file mode 100644
index 9c44b56..0000000
--- a/dwm.suckless.org/patches/dwm-6.0-maximize_vert_horz.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: Jan Christoph Ebersbach <[email protected]>
-URL: http://dwm.suckless.org/patches/historical/moveresize
-These patches provide helper functions for moving and resizing floating windows
-using keybindings.
-
-diff -r ec4baab78314 dwm.c
---- a/dwm.c Mon Dec 19 15:38:30 2011 +0100
-+++ b/dwm.c Fri Apr 06 08:23:23 2012 +0200
-@@ -90,7 +90,7 @@
- int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int bw, oldbw;
- unsigned int tags;
-- Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ Bool ismax, wasfloating, isfixed, isfloating, isurgent, neverfocus,
oldstate, isfullscreen;
- Client *next;
- Client *snext;
- Monitor *mon;
-@@ -1151,6 +1151,8 @@
- updatewmhints(c);
- XSelectInput(dpy, w,
EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
- grabbuttons(c, False);
-+ c->wasfloating = False;
-+ c->ismax = False;
- if(!c->isfloating)
- c->isfloating = c->oldstate = trans != None || c->isfixed;
- if(c->isfloating)
-diff -r ec4baab78314 maximize.c
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/maximize.c Fri Apr 06 08:23:23 2012 +0200
-@@ -0,0 +1,45 @@
-+void
-+maximize(int x, int y, int w, int h) {
-+ XEvent ev;
-+
-+ if(!selmon->sel || selmon->sel->isfixed)
-+ return;
-+ XRaiseWindow(dpy, selmon->sel->win);
-+ if(!selmon->sel->ismax) {
-+ if(!selmon->lt[selmon->sellt]->arrange ||
selmon->sel->isfloating)
-+ selmon->sel->wasfloating = True;
-+ else {
-+ togglefloating(NULL);
-+ selmon->sel->wasfloating = False;
-+ }
-+ selmon->sel->oldx = selmon->sel->x;
-+ selmon->sel->oldy = selmon->sel->y;
-+ selmon->sel->oldw = selmon->sel->w;
-+ selmon->sel->oldh = selmon->sel->h;
-+ resize(selmon->sel, x, y, w, h, True);
-+ selmon->sel->ismax = True;
-+ }
-+ else {
-+ resize(selmon->sel, selmon->sel->oldx, selmon->sel->oldy,
selmon->sel->oldw, selmon->sel->oldh, True);
-+ if(!selmon->sel->wasfloating)
-+ togglefloating(NULL);
-+ selmon->sel->ismax = False;
-+ }
-+ drawbar(selmon);
-+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-+}
-+
-+void
-+togglemaximize(const Arg *arg) {
-+ maximize(selmon->wx, selmon->wy, selmon->ww - 2 * borderpx, selmon->wh
- 2 * borderpx);
-+}
-+
-+void
-+toggleverticalmax(const Arg *arg) {
-+ maximize(selmon->sel->x, selmon->wy, selmon->sel->w, selmon->wh - 2 *
borderpx);
-+}
-+
-+void
-+togglehorizontalmax(const Arg *arg) {
-+ maximize(selmon->wx, selmon->sel->y, selmon->ww - 2 * borderpx,
selmon->sel->h);
-+}
diff --git a/dwm.suckless.org/patches/dwm-6.1-maximize_vert_horz.diff
b/dwm.suckless.org/patches/dwm-6.1-maximize_vert_horz.diff
deleted file mode 100644
index 5da0b61..0000000
--- a/dwm.suckless.org/patches/dwm-6.1-maximize_vert_horz.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-Author: Jan Christoph Ebersbach <[email protected]>
-URL: http://dwm.suckless.org/patches/historical/moveresize
-These patches provide helper functions for moving and resizing floating windows
-using keybindings.
-
-Index: dwm/dwm.c
-===================================================================
---- dwm/dwm.c.orig 2014-02-09 15:24:12.552116979 +0100
-+++ dwm/dwm.c 2014-02-09 15:24:12.548116979 +0100
-@@ -91,7 +91,7 @@
- int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int bw, oldbw;
- unsigned int tags;
-- Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ Bool ismax, wasfloating, isfixed, isfloating, isurgent, neverfocus,
oldstate, isfullscreen;
- Client *next;
- Client *snext;
- Monitor *mon;
-@@ -1047,6 +1047,8 @@
- updatewmhints(c);
- XSelectInput(dpy, w,
EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
- grabbuttons(c, False);
-+ c->wasfloating = False;
-+ c->ismax = False;
- if(!c->isfloating)
- c->isfloating = c->oldstate = trans != None || c->isfixed;
- if(c->isfloating)
-Index: dwm/maximize.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dwm/maximize.c 2014-02-09 15:24:12.548116979 +0100
-@@ -0,0 +1,45 @@
-+void
-+maximize(int x, int y, int w, int h) {
-+ XEvent ev;
-+
-+ if(!selmon->sel || selmon->sel->isfixed)
-+ return;
-+ XRaiseWindow(dpy, selmon->sel->win);
-+ if(!selmon->sel->ismax) {
-+ if(!selmon->lt[selmon->sellt]->arrange ||
selmon->sel->isfloating)
-+ selmon->sel->wasfloating = True;
-+ else {
-+ togglefloating(NULL);
-+ selmon->sel->wasfloating = False;
-+ }
-+ selmon->sel->oldx = selmon->sel->x;
-+ selmon->sel->oldy = selmon->sel->y;
-+ selmon->sel->oldw = selmon->sel->w;
-+ selmon->sel->oldh = selmon->sel->h;
-+ resize(selmon->sel, x, y, w, h, True);
-+ selmon->sel->ismax = True;
-+ }
-+ else {
-+ resize(selmon->sel, selmon->sel->oldx, selmon->sel->oldy,
selmon->sel->oldw, selmon->sel->oldh, True);
-+ if(!selmon->sel->wasfloating)
-+ togglefloating(NULL);
-+ selmon->sel->ismax = False;
-+ }
-+ drawbar(selmon);
-+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-+}
-+
-+void
-+togglemaximize(const Arg *arg) {
-+ maximize(selmon->wx, selmon->wy, selmon->ww - 2 * borderpx, selmon->wh
- 2 * borderpx);
-+}
-+
-+void
-+toggleverticalmax(const Arg *arg) {
-+ maximize(selmon->sel->x, selmon->wy, selmon->sel->w, selmon->wh - 2 *
borderpx);
-+}
-+
-+void
-+togglehorizontalmax(const Arg *arg) {
-+ maximize(selmon->wx, selmon->sel->y, selmon->ww - 2 * borderpx,
selmon->sel->h);
-+}
diff --git a/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.0.diff
b/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.0.diff
new file mode 100644
index 0000000..9c44b56
--- /dev/null
+++ b/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.0.diff
@@ -0,0 +1,75 @@
+Author: Jan Christoph Ebersbach <[email protected]>
+URL: http://dwm.suckless.org/patches/historical/moveresize
+These patches provide helper functions for moving and resizing floating windows
+using keybindings.
+
+diff -r ec4baab78314 dwm.c
+--- a/dwm.c Mon Dec 19 15:38:30 2011 +0100
++++ b/dwm.c Fri Apr 06 08:23:23 2012 +0200
+@@ -90,7 +90,7 @@
+ int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+ int bw, oldbw;
+ unsigned int tags;
+- Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
++ Bool ismax, wasfloating, isfixed, isfloating, isurgent, neverfocus,
oldstate, isfullscreen;
+ Client *next;
+ Client *snext;
+ Monitor *mon;
+@@ -1151,6 +1151,8 @@
+ updatewmhints(c);
+ XSelectInput(dpy, w,
EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
+ grabbuttons(c, False);
++ c->wasfloating = False;
++ c->ismax = False;
+ if(!c->isfloating)
+ c->isfloating = c->oldstate = trans != None || c->isfixed;
+ if(c->isfloating)
+diff -r ec4baab78314 maximize.c
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/maximize.c Fri Apr 06 08:23:23 2012 +0200
+@@ -0,0 +1,45 @@
++void
++maximize(int x, int y, int w, int h) {
++ XEvent ev;
++
++ if(!selmon->sel || selmon->sel->isfixed)
++ return;
++ XRaiseWindow(dpy, selmon->sel->win);
++ if(!selmon->sel->ismax) {
++ if(!selmon->lt[selmon->sellt]->arrange ||
selmon->sel->isfloating)
++ selmon->sel->wasfloating = True;
++ else {
++ togglefloating(NULL);
++ selmon->sel->wasfloating = False;
++ }
++ selmon->sel->oldx = selmon->sel->x;
++ selmon->sel->oldy = selmon->sel->y;
++ selmon->sel->oldw = selmon->sel->w;
++ selmon->sel->oldh = selmon->sel->h;
++ resize(selmon->sel, x, y, w, h, True);
++ selmon->sel->ismax = True;
++ }
++ else {
++ resize(selmon->sel, selmon->sel->oldx, selmon->sel->oldy,
selmon->sel->oldw, selmon->sel->oldh, True);
++ if(!selmon->sel->wasfloating)
++ togglefloating(NULL);
++ selmon->sel->ismax = False;
++ }
++ drawbar(selmon);
++ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
++}
++
++void
++togglemaximize(const Arg *arg) {
++ maximize(selmon->wx, selmon->wy, selmon->ww - 2 * borderpx, selmon->wh
- 2 * borderpx);
++}
++
++void
++toggleverticalmax(const Arg *arg) {
++ maximize(selmon->sel->x, selmon->wy, selmon->sel->w, selmon->wh - 2 *
borderpx);
++}
++
++void
++togglehorizontalmax(const Arg *arg) {
++ maximize(selmon->wx, selmon->sel->y, selmon->ww - 2 * borderpx,
selmon->sel->h);
++}
diff --git a/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.1.diff
b/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.1.diff
new file mode 100644
index 0000000..5da0b61
--- /dev/null
+++ b/dwm.suckless.org/patches/dwm-maximize_vert_horz-6.1.diff
@@ -0,0 +1,77 @@
+Author: Jan Christoph Ebersbach <[email protected]>
+URL: http://dwm.suckless.org/patches/historical/moveresize
+These patches provide helper functions for moving and resizing floating windows
+using keybindings.
+
+Index: dwm/dwm.c
+===================================================================
+--- dwm/dwm.c.orig 2014-02-09 15:24:12.552116979 +0100
++++ dwm/dwm.c 2014-02-09 15:24:12.548116979 +0100
+@@ -91,7 +91,7 @@
+ int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+ int bw, oldbw;
+ unsigned int tags;
+- Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
++ Bool ismax, wasfloating, isfixed, isfloating, isurgent, neverfocus,
oldstate, isfullscreen;
+ Client *next;
+ Client *snext;
+ Monitor *mon;
+@@ -1047,6 +1047,8 @@
+ updatewmhints(c);
+ XSelectInput(dpy, w,
EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
+ grabbuttons(c, False);
++ c->wasfloating = False;
++ c->ismax = False;
+ if(!c->isfloating)
+ c->isfloating = c->oldstate = trans != None || c->isfixed;
+ if(c->isfloating)
+Index: dwm/maximize.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ dwm/maximize.c 2014-02-09 15:24:12.548116979 +0100
+@@ -0,0 +1,45 @@
++void
++maximize(int x, int y, int w, int h) {
++ XEvent ev;
++
++ if(!selmon->sel || selmon->sel->isfixed)
++ return;
++ XRaiseWindow(dpy, selmon->sel->win);
++ if(!selmon->sel->ismax) {
++ if(!selmon->lt[selmon->sellt]->arrange ||
selmon->sel->isfloating)
++ selmon->sel->wasfloating = True;
++ else {
++ togglefloating(NULL);
++ selmon->sel->wasfloating = False;
++ }
++ selmon->sel->oldx = selmon->sel->x;
++ selmon->sel->oldy = selmon->sel->y;
++ selmon->sel->oldw = selmon->sel->w;
++ selmon->sel->oldh = selmon->sel->h;
++ resize(selmon->sel, x, y, w, h, True);
++ selmon->sel->ismax = True;
++ }
++ else {
++ resize(selmon->sel, selmon->sel->oldx, selmon->sel->oldy,
selmon->sel->oldw, selmon->sel->oldh, True);
++ if(!selmon->sel->wasfloating)
++ togglefloating(NULL);
++ selmon->sel->ismax = False;
++ }
++ drawbar(selmon);
++ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
++}
++
++void
++togglemaximize(const Arg *arg) {
++ maximize(selmon->wx, selmon->wy, selmon->ww - 2 * borderpx, selmon->wh
- 2 * borderpx);
++}
++
++void
++toggleverticalmax(const Arg *arg) {
++ maximize(selmon->sel->x, selmon->wy, selmon->sel->w, selmon->wh - 2 *
borderpx);
++}
++
++void
++togglehorizontalmax(const Arg *arg) {
++ maximize(selmon->wx, selmon->sel->y, selmon->ww - 2 * borderpx,
selmon->sel->h);
++}
diff --git a/dwm.suckless.org/patches/maximize.md
b/dwm.suckless.org/patches/maximize.md
index ad802ff..488ceab 100644
--- a/dwm.suckless.org/patches/maximize.md
+++ b/dwm.suckless.org/patches/maximize.md
@@ -19,8 +19,8 @@ Insert the bindings into the keys list. Here is an example:
Download
--------
<!-- Author already emailed about uncleanliness of this patch -->
-* [dwm-6.1-maximize_vert_horz.diff](dwm-6.1-maximize_vert_horz.diff) (Unclean
patch)
-* [dwm-6.0-maximize_vert_horz.diff](dwm-6.0-maximize_vert_horz.diff)
+* [dwm-maximize_vert_horz-6.1.diff](dwm-maximize_vert_horz-6.1.diff) (Unclean
patch)
+* [dwm-maximize_vert_horz-6.0.diff](dwm-maximize_vert_horz-6.0.diff)
Author
------
