[dwm][patches][barpadding] - sites - public wiki contents of suckless.org
 (HTM) git clone git://git.suckless.org/sites
 (DIR) Log
 (DIR) Files
 (DIR) Refs
       ---
 (DIR) commit 475493d4c12b2271e94aa7faa6a0483b2e5248ce
 (DIR) parent f7e0b3b046b9a09928eceb0aeec83de4c4aa90e8
 (HTM) Author: Markus Hanetzok <markus@hanetzok.net>
       Date:   Tue, 18 Nov 2025 16:24:46 +0100
       
       [dwm][patches][barpadding]
       
       added port that works with 6.6 without conflicts.
       
       Diffstat:
         A dwm.suckless.org/patches/barpaddin… |     115 +++++++++++++++++++++++++++++++
         M dwm.suckless.org/patches/barpaddin… |       2 ++
       
       2 files changed, 117 insertions(+), 0 deletions(-)
       ---
 (DIR) diff --git a/dwm.suckless.org/patches/barpadding/dwm-barpadding-6.6.diff b/dwm.suckless.org/patches/barpadding/dwm-barpadding-6.6.diff
       @@ -0,0 +1,115 @@
       +diff '--color=auto' -up ../dwm-6.6/config.def.h ./config.def.h
       +--- ../dwm-6.6/config.def.h        2025-08-09 15:00:55.740267680 +0200
       ++++ ./config.def.h        2025-11-18 16:16:23.935996023 +0100
       +@@ -5,6 +5,8 @@ static const unsigned int borderpx  = 1;
       + 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";
       +Nur in .: dwm-barpadding-6.6.diff.
       +diff '--color=auto' -up ../dwm-6.6/dwm.c ./dwm.c
       +--- ../dwm-6.6/dwm.c        2025-08-09 15:00:55.740267680 +0200
       ++++ ./dwm.c        2025-11-18 16:16:56.505092231 +0100
       +@@ -240,6 +240,8 @@ static int screen;
       + static int sw, sh;           /* X display screen geometry width, height */
       + static int bh;               /* bar height */
       + 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 *) = {
       +@@ -569,7 +571,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);
       +@@ -710,7 +712,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 - sw - 2 * sp, 0, sw, bh, 0, stext, 0);
       +         }
       +
       +         for (c = m->clients; c; c = c->next) {
       +@@ -736,12 +738,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);
       +@@ -1563,6 +1565,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);
       +@@ -1589,6 +1594,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,
       +@@ -1716,7 +1722,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);
       + }
       +
       +@@ -1827,7 +1833,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);
       +@@ -1842,11 +1848,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
       +@@ -2162,3 +2168,4 @@ main(int argc, char *argv[])
       +         XCloseDisplay(dpy);
       +         return EXIT_SUCCESS;
       + }
       ++
 (DIR) diff --git a/dwm.suckless.org/patches/barpadding/index.md b/dwm.suckless.org/patches/barpadding/index.md
       @@ -19,6 +19,7 @@ Screenshots:
        
        Download
        --------
       +* [dwm-barpadding-6.6.diff](dwm-barpadding-6.6.diff) (2025-11-18)
        * [dwm-barpadding-6.2.diff](dwm-barpadding-6.2.diff) (2019-12-10)
        * [dwm-barpadding-20200720-bb2e722.diff](dwm-barpadding-20200720-bb2e722.diff) (2020-07-20)
        * [dwm-barpadding-20211020-a786211.diff](dwm-barpadding-20211020-a786211.diff) (2021-10-20)
       @@ -27,3 +28,4 @@ Author
        ------
        * Alex Cole
        * Pavel Oborin [pavel@oborin.xyz](mailto:pavel@oborin.xyz) (20200720-bb2e722 port)
       +* Markus Hanetzok (2025-11-18)