osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 14:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

holdbar: changes for new bar

Browse Source
This commit is contained in:
bakkeby 2020-07-18 18:59:03 +02:00
parent 346d7f6b1d
commit 250fbbd2c7
4 changed files with 16 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
patch/bar_holdbar.c
View File

@ -3,25 +3,17 @@ holdbar(const Arg *arg)
{ {
if (selmon->showbar) if (selmon->showbar)
return; return;
Bar *bar;
selmon->showbar = 2; selmon->showbar = 2;
updateholdbarpos(selmon); updatebarpos(selmon);
#if BAR_PADDING_PATCH for (bar = selmon->bar; bar; bar = bar->next)
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh); XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->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
} }
void void
keyrelease(XEvent *e) keyrelease(XEvent *e)
{ {
Bar *bar;
if (XEventsQueued(dpy, QueuedAfterReading)) { if (XEventsQueued(dpy, QueuedAfterReading)) {
XEvent ne; XEvent ne;
XPeekEvent(dpy, &ne); XPeekEvent(dpy, &ne);
@ -34,66 +26,12 @@ keyrelease(XEvent *e)
} }
if (e->xkey.keycode == XKeysymToKeycode(dpy, HOLDKEY) && selmon->showbar == 2) { if (e->xkey.keycode == XKeysymToKeycode(dpy, HOLDKEY) && selmon->showbar == 2) {
selmon->showbar = 0; selmon->showbar = 0;
updateholdbarpos(selmon); updatebarpos(selmon);
#if BAR_PADDING_PATCH for (bar = selmon->bar; bar; bar = bar->next)
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh); XMoveResizeWindow(dpy, bar->win, bar->bx, bar->by, bar->bw, bar->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
arrange(selmon); arrange(selmon);
} }
#if COMBO_PATCH #if COMBO_PATCH
combo = 0; combo = 0;
#endif // COMBO_PATCH #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
}

3
patch/bar_holdbar.h
View File

@ -1,3 +1,2 @@
static void keyrelease(XEvent *e); static void keyrelease(XEvent *e);
static void holdbar(const Arg *arg); static void holdbar(const Arg *arg);
static void updateholdbarpos(Monitor *m);

6
patch/include.c
View File

@ -11,6 +11,9 @@
#if BAR_EWMHTAGS_PATCH #if BAR_EWMHTAGS_PATCH
#include "bar_ewmhtags.c" #include "bar_ewmhtags.c"
#endif #endif
#if COMBO_PATCH
#include "combo.c"
#endif
#if BAR_HOLDBAR_PATCH #if BAR_HOLDBAR_PATCH
#include "bar_holdbar.c" #include "bar_holdbar.c"
#endif #endif
@ -73,9 +76,6 @@
#if CMDCUSTOMIZE_PATCH #if CMDCUSTOMIZE_PATCH
#include "cmdcustomize.c" #include "cmdcustomize.c"
#endif #endif
#if COMBO_PATCH
#include "combo.c"
#endif
#if CYCLELAYOUTS_PATCH #if CYCLELAYOUTS_PATCH
#include "cyclelayouts.c" #include "cyclelayouts.c"
#endif #endif

6
patch/include.h
View File

@ -11,6 +11,9 @@
#if BAR_EWMHTAGS_PATCH #if BAR_EWMHTAGS_PATCH
#include "bar_ewmhtags.h" #include "bar_ewmhtags.h"
#endif #endif
#if COMBO_PATCH
#include "combo.h"
#endif
#if BAR_HOLDBAR_PATCH #if BAR_HOLDBAR_PATCH
#include "bar_holdbar.h" #include "bar_holdbar.h"
#endif #endif
@ -70,9 +73,6 @@
#if CMDCUSTOMIZE_PATCH #if CMDCUSTOMIZE_PATCH
#include "cmdcustomize.h" #include "cmdcustomize.h"
#endif #endif
#if COMBO_PATCH
#include "combo.h"
#endif
#if CYCLELAYOUTS_PATCH #if CYCLELAYOUTS_PATCH
#include "cyclelayouts.h" #include "cyclelayouts.h"
#endif #endif