mirror of
https://github.com/tiyn/dwm.git
synced 2025-10-15 20:31:18 +02:00
Compare commits
4 Commits
bottomstac
...
statusallm
Author | SHA1 | Date | |
---|---|---|---|
f3742f9d17 | |||
63403dd909 | |||
5ed6234a15 | |||
6df99308c1 |
@@ -41,8 +41,6 @@ static const Layout layouts[] = {
|
|||||||
{ "[]=", tile }, /* first entry is default */
|
{ "[]=", tile }, /* first entry is default */
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
{ "[M]", monocle },
|
{ "[M]", monocle },
|
||||||
{ "TTT", bstack },
|
|
||||||
{ "===", bstackhoriz },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* key definitions */
|
/* key definitions */
|
||||||
@@ -78,8 +76,6 @@ static Key keys[] = {
|
|||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
{ MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
@@ -1,101 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index fd77a07..c3a044b 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -41,6 +41,8 @@ static const Layout layouts[] = {
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
+ { "TTT", bstack },
|
|
||||||
+ { "===", bstackhoriz },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
@@ -76,6 +78,8 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
|
||||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
|
||||||
+ { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
|
||||||
+ { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
|
||||||
{ MODKEY, XK_space, setlayout, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index b2bc9bd..8b74165 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -234,6 +234,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
+static void bstack(Monitor *m);
|
|
||||||
+static void bstackhoriz(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
@@ -2138,3 +2140,65 @@ main(int argc, char *argv[])
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+bstack(Monitor *m) {
|
|
||||||
+ int w, h, mh, mx, tx, ty, tw;
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ mh = m->nmaster ? m->mfact * m->wh : 0;
|
|
||||||
+ tw = m->ww / (n - m->nmaster);
|
|
||||||
+ ty = m->wy + mh;
|
|
||||||
+ } else {
|
|
||||||
+ mh = m->wh;
|
|
||||||
+ tw = m->ww;
|
|
||||||
+ ty = m->wy;
|
|
||||||
+ }
|
|
||||||
+ for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
|
|
||||||
+ mx += WIDTH(c);
|
|
||||||
+ } else {
|
|
||||||
+ h = m->wh - mh;
|
|
||||||
+ resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0);
|
|
||||||
+ if (tw != m->ww)
|
|
||||||
+ tx += WIDTH(c);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+bstackhoriz(Monitor *m) {
|
|
||||||
+ int w, mh, mx, tx, ty, th;
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+ if (n > m->nmaster) {
|
|
||||||
+ mh = m->nmaster ? m->mfact * m->wh : 0;
|
|
||||||
+ th = (m->wh - mh) / (n - m->nmaster);
|
|
||||||
+ ty = m->wy + mh;
|
|
||||||
+ } else {
|
|
||||||
+ th = mh = m->wh;
|
|
||||||
+ ty = m->wy;
|
|
||||||
+ }
|
|
||||||
+ for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
+ resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
|
|
||||||
+ mx += WIDTH(c);
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0);
|
|
||||||
+ if (th != m->wh)
|
|
||||||
+ ty += HEIGHT(c);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
25
dwm-statusallmons-6.2.diff
Normal file
25
dwm-statusallmons-6.2.diff
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
diff -up a/dwm.c b/dwm.c
|
||||||
|
--- a/dwm.c 2020-07-09 16:49:10.023585649 +0200
|
||||||
|
+++ b/dwm.c 2020-07-09 16:49:43.497542191 +0200
|
||||||
|
@@ -702,7 +702,7 @@ drawbar(Monitor *m)
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
- if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
+ if (m == selmon || 1) { /* status is only drawn on selected monitor */
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
||||||
|
@@ -1987,9 +1987,11 @@ updatesizehints(Client *c)
|
||||||
|
void
|
||||||
|
updatestatus(void)
|
||||||
|
{
|
||||||
|
+ Monitor* m;
|
||||||
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
|
strcpy(stext, "dwm-"VERSION);
|
||||||
|
- drawbar(selmon);
|
||||||
|
+ for(m = mons; m; m = m->next)
|
||||||
|
+ drawbar(m);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
70
dwm.c
70
dwm.c
@@ -233,8 +233,6 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
|||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
static void zoom(const Arg *arg);
|
static void zoom(const Arg *arg);
|
||||||
static void bstack(Monitor *m);
|
|
||||||
static void bstackhoriz(Monitor *m);
|
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
@@ -704,7 +702,7 @@ drawbar(Monitor *m)
|
|||||||
Client *c;
|
Client *c;
|
||||||
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
if (m == selmon || 1) { /* status is only drawn on selected monitor */
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
||||||
@@ -1989,9 +1987,11 @@ updatesizehints(Client *c)
|
|||||||
void
|
void
|
||||||
updatestatus(void)
|
updatestatus(void)
|
||||||
{
|
{
|
||||||
|
Monitor* m;
|
||||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
strcpy(stext, "dwm-"VERSION);
|
strcpy(stext, "dwm-"VERSION);
|
||||||
drawbar(selmon);
|
for(m = mons; m; m = m->next)
|
||||||
|
drawbar(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -2149,65 +2149,3 @@ main(int argc, char *argv[])
|
|||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
bstack(Monitor *m) {
|
|
||||||
int w, h, mh, mx, tx, ty, tw;
|
|
||||||
unsigned int i, n;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
if (n > m->nmaster) {
|
|
||||||
mh = m->nmaster ? m->mfact * m->wh : 0;
|
|
||||||
tw = m->ww / (n - m->nmaster);
|
|
||||||
ty = m->wy + mh;
|
|
||||||
} else {
|
|
||||||
mh = m->wh;
|
|
||||||
tw = m->ww;
|
|
||||||
ty = m->wy;
|
|
||||||
}
|
|
||||||
for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
|
|
||||||
mx += WIDTH(c);
|
|
||||||
} else {
|
|
||||||
h = m->wh - mh;
|
|
||||||
resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0);
|
|
||||||
if (tw != m->ww)
|
|
||||||
tx += WIDTH(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
bstackhoriz(Monitor *m) {
|
|
||||||
int w, mh, mx, tx, ty, th;
|
|
||||||
unsigned int i, n;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
if (n > m->nmaster) {
|
|
||||||
mh = m->nmaster ? m->mfact * m->wh : 0;
|
|
||||||
th = (m->wh - mh) / (n - m->nmaster);
|
|
||||||
ty = m->wy + mh;
|
|
||||||
} else {
|
|
||||||
th = mh = m->wh;
|
|
||||||
ty = m->wy;
|
|
||||||
}
|
|
||||||
for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
|
|
||||||
resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
|
|
||||||
mx += WIDTH(c);
|
|
||||||
} else {
|
|
||||||
resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0);
|
|
||||||
if (th != m->wh)
|
|
||||||
ty += HEIGHT(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Reference in New Issue
Block a user