diff options
| author | bakkeby <[email protected]> | 2020-07-18 18:59:03 +0200 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2020-07-18 18:59:03 +0200 |
| commit | 250fbbd2c77a36b1b7d22c252fb781cbab09ca79 (patch) | |
| tree | b3217b5092b0337ed66fe1b16297a1145d5adc01 /patch/bar_holdbar.c | |
| parent | 346d7f6b1dee89c7700dc43a9476367e6e5ff0dc (diff) | |
| download | dwm-flexipatch-250fbbd2c77a36b1b7d22c252fb781cbab09ca79.tar.gz dwm-flexipatch-250fbbd2c77a36b1b7d22c252fb781cbab09ca79.zip | |
holdbar: changes for new bar
Diffstat (limited to 'patch/bar_holdbar.c')
| -rw-r--r-- | patch/bar_holdbar.c | 80 |
1 files changed, 9 insertions, 71 deletions
diff --git a/patch/bar_holdbar.c b/patch/bar_holdbar.c index 4be9af1..358cbec 100644 --- a/patch/bar_holdbar.c +++ b/patch/bar_holdbar.c @@ -3,25 +3,17 @@ holdbar(const Arg *arg) { if (selmon->showbar) return; + Bar *bar; selmon->showbar = 2; - updateholdbarpos(selmon); - #if BAR_PADDING_PATCH - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh); - #else - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); - #endif // BAR_PADDING_PATCH - #if BAR_EXTRABAR_PATCH - #if BAR_PADDING_PATCH - XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx + sp, selmon->eby - vp, selmon->ww - 2 * sp, bh); - #else - XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx, selmon->eby, selmon->ww, bh); - #endif // BAR_PADDING_PATCH - #endif // BAR_EXTRABAR_PATCH + updatebarpos(selmon); + for (bar = selmon->bar; bar; bar = bar->next) + XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh); } void keyrelease(XEvent *e) { + Bar *bar; if (XEventsQueued(dpy, QueuedAfterReading)) { XEvent ne; XPeekEvent(dpy, &ne); @@ -34,66 +26,12 @@ keyrelease(XEvent *e) } if (e->xkey.keycode == XKeysymToKeycode(dpy, HOLDKEY) && selmon->showbar == 2) { selmon->showbar = 0; - updateholdbarpos(selmon); - #if BAR_PADDING_PATCH - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh); - #else - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); - #endif // BAR_PADDING_PATCH - #if BAR_EXTRABAR_PATCH - #if BAR_PADDING_PATCH - XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx + sp, selmon->eby - vp, selmon->ww - 2 * sp, bh); - #else - XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx, selmon->eby, selmon->ww, bh); - #endif // BAR_PADDING_PATCH - #endif // BAR_EXTRABAR_PATCH + updatebarpos(selmon); + for (bar = selmon->bar; bar; bar = bar->next) + XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->bh); arrange(selmon); } #if COMBO_PATCH combo = 0; #endif // COMBO_PATCH -} - -void -updateholdbarpos(Monitor *m) -{ - m->wy = m->my; - m->wh = m->mh; - #if BAR_EXTRABAR_PATCH - #if BAR_PADDING_PATCH - m->wh = m->wh - vertpad * m->showbar * 2 - bh * m->showbar * 2; - m->wy = m->showbar ? m->wy + bh + vertpad: m->wy; - if (m->showbar) { - m->by = m->topbar ? m->wy - bh - vertpad: m->wy + m->wh + vertpad; - m->eby = m->topbar ? m->wy + m->wh + vertpad: m->wy - bh - vertpad; - } else { - m->by = -bh - vertpad; - m->eby = -bh - vertpad; - } - #else - m->wh = m->wh - bh * m->showbar * 2; - m->wy = m->showbar ? m->wy + bh : m->wy; - if (m->showbar) { - m->by = m->topbar ? m->wy - bh : m->wy + m->wh; - m->eby = m->topbar ? m->wy + m->wh : m->wy - bh; - } else { - m->by = -bh; - m->eby = -bh; - } - #endif // BAR_PADDING_PATCH - #elif BAR_PADDING_PATCH - if (m->showbar) { - m->wh = m->wh - vertpad - bh; - m->by = m->topbar ? m->wy : m->wy + m->wh + vertpad; - m->wy = m->topbar ? m->wy + bh + vp : m->wy; - } else - m->by = -bh - vp; - #else - if (m->showbar) { - m->wh -= bh; - m->by = m->topbar ? m->wy : m->wy + m->wh; - m->wy = m->topbar ? m->wy + bh : m->wy; - } else - m->by = -bh; - #endif // BAR_EXTRABAR_PATCH -} +}
\ No newline at end of file |