Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated

  • Loading branch information...
commit 2ed8a1fb7d4e181104708317e93ea98470d3dff4 1 parent 8ae845d
ok100 authored
View
11 05-dwm-6.0-monocle_no_borders.diff
@@ -1,11 +0,0 @@
---- dwm.c.orig 2012-07-05 20:08:33.000000000 +0200
-+++ dwm.c 2012-07-05 20:10:09.478236977 +0200
-@@ -1270,7 +1270,7 @@ monocle(Monitor *m) {
- if(n > 0) /* override layout symbol */
- snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
- for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
-- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
-+ resize(c, m->wx - c->bw, m->wy - c->bw, m->ww, m->wh, False);
- }
-
- void
View
91 05-dwm-6.0-single_window_no_border.diff
@@ -0,0 +1,91 @@
+--- dwm.c.orig 2012-10-03 20:31:56.795631064 +0200
++++ dwm.c 2012-10-03 20:32:36.472567251 +0200
+@@ -1261,7 +1261,7 @@ maprequest(XEvent *e) {
+
+ void
+ monocle(Monitor *m) {
+- unsigned int n = 0;
++ unsigned int n = 0, r = 0;
+ Client *c;
+
+ for(c = m->clients; c; c = c->next)
+@@ -1269,8 +1269,17 @@ monocle(Monitor *m) {
+ n++;
+ if(n > 0) /* override layout symbol */
+ snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+- for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
+- resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
++ for(c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
++ /* remove border when in monocle layout */
++ if(c->bw) {
++ c->oldbw = c->bw;
++ c->bw = 0;
++ r = 1;
++ }
++ resize(c, m->wx, m->wy, m->ww - (2 * c->bw), m->wh - (2 * c->bw), False);
++ if(r)
++ resizeclient(c, m->wx, m->wy, m->ww - (2 * c->bw), m->wh - (2 * c->bw));
++ }
+ }
+
+ void
+@@ -1772,7 +1781,7 @@ textnw(const char *text, unsigned int le
+
+ void
+ tile(Monitor *m) {
+- unsigned int i, n, h, mw, my, ty;
++ unsigned int i, n, h, mw, my, ty, r;
+ Client *c;
+
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+@@ -1783,17 +1792,36 @@ tile(Monitor *m) {
+ mw = m->nmasters[m->curtag] ? m->ww * m->mfacts[m->curtag] : 0;
+ else
+ mw = m->ww;
+- for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
++ for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++, r = 0) {
++ if(n == 1) {
++ if (c->bw) {
++ /* remove border when only one window is on the current tag */
++ c->oldbw = c->bw;
++ c->bw = 0;
++ r = 1;
++ }
++ }
++ else if(!c->bw && c->oldbw) {
++ /* restore border when more than one window is displayed */
++ c->bw = c->oldbw;
++ c->oldbw = 0;
++ r = 1;
++ }
+ if(i < m->nmasters[m->curtag]) {
+ h = (m->wh - my) / (MIN(n, m->nmasters[m->curtag]) - i);
+ resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
++ if(r)
++ resizeclient(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw));
+ my += HEIGHT(c);
+ }
+ else {
+ h = (m->wh - ty) / (n - i);
+ resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
++ if(r)
++ resizeclient(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw));
+ ty += HEIGHT(c);
+ }
++ }
+ }
+
+ void
+@@ -1810,6 +1838,12 @@ togglefloating(const Arg *arg) {
+ return;
+ selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+ if(selmon->sel->isfloating)
++ /* restore border when moving window into floating mode */
++ if(!selmon->sel->bw && selmon->sel->oldbw) {
++ selmon->sel->bw = selmon->sel->oldbw;
++ selmon->sel->oldbw = 0;
++ }
++ if(selmon->sel->isfloating)
+ resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+ selmon->sel->w, selmon->sel->h, False);
+ arrange(selmon);
View
2  PKGBUILD
@@ -22,7 +22,7 @@ _patches=(01-dwm-$pkgver-statuscolors.diff
02-dwm-$pkgver-pertag2.diff
03-dwm-$pkgver-scratchpad-stay.diff
04-dwm-$pkgver-cflags.diff
- 05-dwm-$pkgver-monocle_no_borders.diff
+ 05-dwm-$pkgver-single_window_no_border.diff
06-dwm-$pkgver-centred-floating.diff
07-dwm-$pkgver-save_floats.diff
08-dwm-$pkgver-no_title.diff)
View
47 config.h
@@ -8,27 +8,27 @@ static const char font[] = "-*-tamsyn-medium-*-*-*-14-*-*-*-*-*-*-*";
#define NUMCOLORS 21
static const char colors[NUMCOLORS][ColLast][21] = {
/* border fg bg */
- { "#1A1A1A", "#808080", "#020202" }, /* 01 - normal */
- { "#4C4C4C", "#B3B3B3", "#020202" }, /* 02 - selected */
- { "#B3354C", "#B3354C", "#020202" }, /* 03 - urgent */
-
- { "#1A1A1A", "#1A1A1A", "#020202" }, /* 04 - black */
- { "#802635", "#802635", "#020202" }, /* 05 - red */
- { "#608040", "#608040", "#020202" }, /* 06 - green */
- { "#877C43", "#877C43", "#020202" }, /* 07 - yellow */
- { "#1C678C", "#1C678C", "#020202" }, /* 08 - blue */
- { "#684D80", "#684D80", "#020202" }, /* 09 - magenta */
+ { "#1a2633", "#899398", "#0d131a" }, /* 01 - normal */
+ { "#44484c", "#b3b3b3", "#0d131a" }, /* 02 - selected */
+ { "#b34747", "#b34747", "#0d131a" }, /* 03 - urgent */
+
+ { "#1A1A1A", "#1A1A1A", "#0d131a" }, /* 04 - black */
+ { "#802635", "#802635", "#0d131a" }, /* 05 - red */
+ { "#608040", "#608040", "#0d131a" }, /* 06 - green */
+ { "#877C43", "#877C43", "#0d131a" }, /* 07 - yellow */
+ { "#1C678C", "#1C678C", "#0d131a" }, /* 08 - blue */
+ { "#684D80", "#684D80", "#0d131a" }, /* 09 - magenta */
{ "#000000", "#000000", "#000000" }, /* unusable */
- { "#337373", "#337373", "#020202" }, /* 0B - cyan */
- { "#808080", "#808080", "#020202" }, /* 0C - light gray */
- { "#4C4C4C", "#4C4C4C", "#020202" }, /* 0D - gray */
- { "#B3354C", "#B3354C", "#020202" }, /* 0E - light red */
- { "#4BA65A", "#4BA65A", "#020202" }, /* 0F - light green */
- { "#BF9F5F", "#BF9F5F", "#020202" }, /* 10 - light yellow */
- { "#3995BF", "#3995BF", "#020202" }, /* 11 - light blue */
- { "#A64286", "#A64286", "#020202" }, /* 12 - light magenta */
- { "#6C98A6", "#6C98A6", "#020202" }, /* 13 - light cyan */
- { "#B3B3B3", "#B3B3B3", "#020202" }, /* 14 - white */
+ { "#337373", "#337373", "#0d131a" }, /* 0B - cyan */
+ { "#808080", "#808080", "#0d131a" }, /* 0C - light gray */
+ { "#4C4C4C", "#4C4C4C", "#0d131a" }, /* 0D - gray */
+ { "#B3354C", "#B3354C", "#0d131a" }, /* 0E - light red */
+ { "#4BA65A", "#4BA65A", "#0d131a" }, /* 0F - light green */
+ { "#BF9F5F", "#BF9F5F", "#0d131a" }, /* 10 - light yellow */
+ { "#3995BF", "#3995BF", "#0d131a" }, /* 11 - light blue */
+ { "#A64286", "#A64286", "#0d131a" }, /* 12 - light magenta */
+ { "#6C98A6", "#6C98A6", "#0d131a" }, /* 13 - light cyan */
+ { "#B3B3B3", "#B3B3B3", "#0d131a" }, /* 14 - white */
{ "#802635", "#BF9F5F", "#802635" }, /* 15 - warning */
};
@@ -59,6 +59,7 @@ static const Tag tags[] = {
{ "web", &layouts[2], -1, -1 },
{ "term", &layouts[2], -1, -1 },
{ "doc", &layouts[2], -1, -1 },
+ { "media", &layouts[0], -1, -1 },
{ "gfx", &layouts[2], -1, -1 },
};
@@ -68,7 +69,7 @@ static const Rule rules[] = {
{ NULL, NULL, "wifi-menu", 0, True, -1 },
{ "Dwb", NULL, NULL, 1 << 1, False, -1 },
{ "Firefox", NULL, NULL, 1 << 1, False, -1 },
- { "Gimp", NULL, NULL, 1 << 4, False, -1 },
+ { "Gimp", NULL, NULL, 1 << 5, False, -1 },
{ "Gsimplecal", NULL, NULL, 0, True, False, -1 },
{ "Lazarus", NULL, NULL, 1 << 0, True, False, -1 },
{ "Lxappearance", NULL, NULL, 0, True, -1 },
@@ -77,7 +78,7 @@ static const Rule rules[] = {
{ "Qpass", NULL, NULL, 0, True, -1 },
{ "Skype", NULL, NULL, 0, True, -1 },
{ "Stardict", NULL, NULL, 0, True, -1 },
- { "Xsane", NULL, NULL, 1 << 4, True, False, -1 },
+ { "Xsane", NULL, NULL, 1 << 5, True, False, -1 },
{ "Zenity", NULL, NULL, 0, True, -1 },
{ "libreoffice-calc", NULL, NULL, 1 << 3, False, -1 },
{ "libreoffice-impress", NULL, NULL, 1 << 3, False, -1 },
@@ -178,7 +179,7 @@ static Key keys[] = {
TAGKEYS( XK_scaron, 2)
TAGKEYS( XK_ccaron, 3)
TAGKEYS( XK_rcaron, 4)
- /*TAGKEYS( XK_6, 5)*/
+ TAGKEYS( XK_zcaron, 5)
/*TAGKEYS( XK_7, 6)*/
/*TAGKEYS( XK_8, 7)*/
/*TAGKEYS( XK_9, 8)*/
Please sign in to comment.
Something went wrong with that request. Please try again.