My patched version of suckless' dwm.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

101 lines
3.1 KiB

  1. diff --git a/config.def.h b/config.def.h
  2. index fd77a07..c3a044b 100644
  3. --- a/config.def.h
  4. +++ b/config.def.h
  5. @@ -41,6 +41,8 @@ static const Layout layouts[] = {
  6. { "[]=", tile }, /* first entry is default */
  7. { "><>", NULL }, /* no layout function means floating behavior */
  8. { "[M]", monocle },
  9. + { "TTT", bstack },
  10. + { "===", bstackhoriz },
  11. };
  12. /* key definitions */
  13. @@ -76,6 +78,8 @@ static Key keys[] = {
  14. { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
  15. { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
  16. { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
  17. + { MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
  18. + { MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
  19. { MODKEY, XK_space, setlayout, {0} },
  20. { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
  21. { MODKEY, XK_0, view, {.ui = ~0 } },
  22. diff --git a/dwm.c b/dwm.c
  23. index b2bc9bd..8b74165 100644
  24. --- a/dwm.c
  25. +++ b/dwm.c
  26. @@ -234,6 +234,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
  27. static int xerrordummy(Display *dpy, XErrorEvent *ee);
  28. static int xerrorstart(Display *dpy, XErrorEvent *ee);
  29. static void zoom(const Arg *arg);
  30. +static void bstack(Monitor *m);
  31. +static void bstackhoriz(Monitor *m);
  32. /* variables */
  33. static const char broken[] = "broken";
  34. @@ -2138,3 +2140,65 @@ main(int argc, char *argv[])
  35. XCloseDisplay(dpy);
  36. return EXIT_SUCCESS;
  37. }
  38. +
  39. +static void
  40. +bstack(Monitor *m) {
  41. + int w, h, mh, mx, tx, ty, tw;
  42. + unsigned int i, n;
  43. + Client *c;
  44. +
  45. + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
  46. + if (n == 0)
  47. + return;
  48. + if (n > m->nmaster) {
  49. + mh = m->nmaster ? m->mfact * m->wh : 0;
  50. + tw = m->ww / (n - m->nmaster);
  51. + ty = m->wy + mh;
  52. + } else {
  53. + mh = m->wh;
  54. + tw = m->ww;
  55. + ty = m->wy;
  56. + }
  57. + for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
  58. + if (i < m->nmaster) {
  59. + w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
  60. + resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
  61. + mx += WIDTH(c);
  62. + } else {
  63. + h = m->wh - mh;
  64. + resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0);
  65. + if (tw != m->ww)
  66. + tx += WIDTH(c);
  67. + }
  68. + }
  69. +}
  70. +
  71. +static void
  72. +bstackhoriz(Monitor *m) {
  73. + int w, mh, mx, tx, ty, th;
  74. + unsigned int i, n;
  75. + Client *c;
  76. +
  77. + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
  78. + if (n == 0)
  79. + return;
  80. + if (n > m->nmaster) {
  81. + mh = m->nmaster ? m->mfact * m->wh : 0;
  82. + th = (m->wh - mh) / (n - m->nmaster);
  83. + ty = m->wy + mh;
  84. + } else {
  85. + th = mh = m->wh;
  86. + ty = m->wy;
  87. + }
  88. + for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
  89. + if (i < m->nmaster) {
  90. + w = (m->ww - mx) / (MIN(n, m->nmaster) - i);
  91. + resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0);
  92. + mx += WIDTH(c);
  93. + } else {
  94. + resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0);
  95. + if (th != m->wh)
  96. + ty += HEIGHT(c);
  97. + }
  98. + }
  99. +}