|
|
- From 2f6da65e84288941babde413b9c3f4a619f853a1 Mon Sep 17 00:00:00 2001
- From: Pavel Oborin <pavel@oborin.xyz>
- Date: Mon, 20 Jul 2020 21:42:43 +0300
- Subject: [PATCH] Fixed drawbar
-
- ---
- config.def.h | 2 ++
- dwm.c | 26 ++++++++++++++++----------
- 2 files changed, 18 insertions(+), 10 deletions(-)
-
- diff --git a/config.def.h b/config.def.h
- index 1c0b587..867312f 100644
- --- a/config.def.h
- +++ b/config.def.h
- @@ -5,6 +5,8 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
- static const unsigned int snap = 32; /* snap pixel */
- static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
- +static const int vertpad = 10; /* vertical padding of bar */
- +static const int sidepad = 10; /* horizontal padding of bar */
- static const char *fonts[] = { "monospace:size=10" };
- static const char dmenufont[] = "monospace:size=10";
- static const char col_gray1[] = "#222222";
- diff --git a/dwm.c b/dwm.c
- index 9fd0286..ec9c293 100644
- --- a/dwm.c
- +++ b/dwm.c
- @@ -242,6 +242,8 @@ static int screen;
- static int sw, sh; /* X display screen geometry width, height */
- static int bh, blw = 0; /* bar geometry */
- static int lrpad; /* sum of left and right padding for text */
- +static int vp; /* vertical padding for bar */
- +static int sp; /* side padding for bar */
- static int (*xerrorxlib)(Display *, XErrorEvent *);
- static unsigned int numlockmask = 0;
- static void (*handler[LASTEvent]) (XEvent *) = {
- @@ -568,7 +570,7 @@ configurenotify(XEvent *e)
- for (c = m->clients; c; c = c->next)
- if (c->isfullscreen)
- resizeclient(c, m->mx, m->my, m->mw, m->mh);
- - XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
- + XMoveResizeWindow(dpy, m->barwin, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh);
- }
- focus(NULL);
- arrange(NULL);
- @@ -706,7 +708,7 @@ drawbar(Monitor *m)
- if (m == selmon) { /* status is only drawn on selected monitor */
- drw_setscheme(drw, scheme[SchemeNorm]);
- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
- - drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
- + drw_text(drw, m->ww - tw - 2 * sp, 0, tw, bh, 0, stext, 0);
- }
-
- for (c = m->clients; c; c = c->next) {
- @@ -732,12 +734,12 @@ drawbar(Monitor *m)
- if ((w = m->ww - tw - x) > bh) {
- if (m->sel) {
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
- - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
- + drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0);
- if (m->sel->isfloating)
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
- } else {
- drw_setscheme(drw, scheme[SchemeNorm]);
- - drw_rect(drw, x, 0, w, bh, 1, 1);
- + drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
- }
- }
- drw_map(drw, m->barwin, 0, 0, m->ww, bh);
- @@ -1548,6 +1550,9 @@ setup(void)
- lrpad = drw->fonts->h;
- bh = drw->fonts->h + 2;
- updategeom();
- + sp = sidepad;
- + vp = (topbar == 1) ? vertpad : - vertpad;
- +
- /* init atoms */
- utf8string = XInternAtom(dpy, "UTF8_STRING", False);
- wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
- @@ -1574,6 +1579,7 @@ setup(void)
- /* init bars */
- updatebars();
- updatestatus();
- + updatebarpos(selmon);
- /* supporting window for NetWMCheck */
- wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
- XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
- @@ -1704,7 +1710,7 @@ togglebar(const Arg *arg)
- {
- selmon->showbar = !selmon->showbar;
- updatebarpos(selmon);
- - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
- + XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp, selmon->ww - 2 * sp, bh);
- arrange(selmon);
- }
-
- @@ -1814,7 +1820,7 @@ updatebars(void)
- for (m = mons; m; m = m->next) {
- if (m->barwin)
- continue;
- - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
- + m->barwin = XCreateWindow(dpy, root, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- @@ -1829,11 +1835,11 @@ updatebarpos(Monitor *m)
- m->wy = m->my;
- m->wh = m->mh;
- 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;
- + 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;
- + m->by = -bh - vp;
- }
-
- void
- --
- 2.27.0
-
|
