From a0fe569f7ea206d33f0ea677f94f216622edceac Mon Sep 17 00:00:00 2001 From: BitHeaven Date: Fri, 31 May 2024 18:39:01 +0500 Subject: [PATCH] Add barpadding + notitle patch --- PATCHES | 2 ++ config.def.h | 1 - config.h | 1 - dwm | Bin 68464 -> 68464 bytes dwm.c | 58 ++++++++++++++++++++------------------------------- dwm.o | Bin 63384 -> 62976 bytes layouts.c | 20 +++++++++--------- 7 files changed, 35 insertions(+), 47 deletions(-) diff --git a/PATCHES b/PATCHES index c8820b7..84b7f2f 100644 --- a/PATCHES +++ b/PATCHES @@ -3,5 +3,7 @@ quitprompt fullgaps gaplessgrid status2d + extrabar +barpadding + notitle anycorners +fonts? diff --git a/config.def.h b/config.def.h index f14efef..e28ecff 100644 --- a/config.def.h +++ b/config.def.h @@ -153,7 +153,6 @@ static const Button buttons[] = { /* click event mask button function argument */ { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, { ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, diff --git a/config.h b/config.h index f14efef..e28ecff 100644 --- a/config.h +++ b/config.h @@ -153,7 +153,6 @@ static const Button buttons[] = { /* click event mask button function argument */ { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, { ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, diff --git a/dwm b/dwm index 475999212dd507c5c156fa76557da624b4b386a9..56b52e599966997d22eb8b88cd6c8baa81d07dc3 100755 GIT binary patch delta 16922 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 delta 17167 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
_7I1pi2-Xt})w0Jkq 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 < x + TEXTW(selmon->ltsymbol)) click = ClkLtSymbol; - else if (ev->x > selmon->ww - (int)TEXTW(stext)) - click = ClkStatusText; else - click = ClkWinTitle; + click = ClkStatusText; } else if ((c = wintoclient(ev->window))) { focus(c); restack(selmon); @@ -578,8 +575,8 @@ 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->extrabarwin, m->wx, m->eby, m->ww, bh); + XMoveResizeWindow(dpy, m->barwin, m->wx + gappx, m->by + gappx, m->ww - 2 * gappx, bh); + XMoveResizeWindow(dpy, m->extrabarwin, m->wx + gappx, m->eby - gappx, m->ww - 2 * gappx, bh); } focus(NULL); arrange(NULL); @@ -650,7 +647,6 @@ createmon(void) m->nmaster = nmaster; m->showbar = showbar; m->topbar = topbar; - m->gappx = gappx; m->lt[0] = &layouts[0]; m->lt[1] = &layouts[1 % LENGTH(layouts)]; strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol); @@ -744,11 +740,11 @@ drawstatusbar(Monitor *m, int bh, int extra, char* stext) { text = p; if (extra) { - w = m->ww; - ret = x = 1; + w = m->ww - 2 * gappx; + ret = x = 0; } else { - w += 2; /* 1px padding on both sides */ - ret = x = m->ww - w; + ret = m->ww - w; + x = ret - 2 * gappx; } drw_setscheme(drw, scheme[LENGTH(colors)]); @@ -859,15 +855,8 @@ drawbar(Monitor *m) x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); 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); - 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_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x, 0, w - 2 * gappx, bh, 1, 1); } drw_map(drw, m->barwin, 0, 0, m->ww, bh); @@ -1359,11 +1348,8 @@ propertynotify(XEvent *e) drawbars(); break; } - if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { + if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) updatetitle(c); - if (c == c->mon->sel) - drawbar(c->mon); - } if (ev->atom == netatom[NetWMWindowType]) updatewindowtype(c); } @@ -1829,8 +1815,8 @@ togglebar(const Arg *arg) { selmon->showbar = !selmon->showbar; updatebarpos(selmon); - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); - XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx, selmon->eby, selmon->ww, bh); + XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + gappx, selmon->by + gappx, selmon->ww - 2 * gappx, bh); + XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx + gappx, selmon->eby - gappx, selmon->ww - 2 * gappx, bh); arrange(selmon); } @@ -1947,7 +1933,7 @@ updatebars(void) XClassHint ch = {"dwm", "dwm"}; for (m = mons; m; m = m->next) { if (!m->barwin) { - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), + m->barwin = XCreateWindow(dpy, root, m->wx + gappx, m->by + gappx, m->ww - 2 * gappx, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); @@ -1955,7 +1941,7 @@ updatebars(void) XSetClassHint(dpy, m->barwin, &ch); } if (!m->extrabarwin) { - m->extrabarwin = XCreateWindow(dpy, root, m->wx, m->eby, m->ww, bh, 0, DefaultDepth(dpy, screen), + m->extrabarwin = XCreateWindow(dpy, root, m->wx + gappx, m->eby - gappx, m->ww - 2 * gappx, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, m->extrabarwin, cursor[CurNormal]->cursor); @@ -1979,13 +1965,15 @@ updatebarpos(Monitor *m) m->wy = m->my; m->wh = m->mh; m->wh -= bh * m->showbar * 2; - m->wy = m->showbar ? m->wy + bh : m->wy; + m->wy = m->showbar ? m->wy + bh + gappx : 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; + m->by = m->topbar ? m->wy - bh - gappx : m->wy + m->wh + gappx; + m->eby = m->topbar ? m->wy + m->wh - gappx : m->wy - bh - gappx * 2; + m->wy = topbar ? m->wy : m->wy - gappx * 2; + m->wh = topbar ? m->wh - gappx * 2 : m->wh + gappx * 2; } else { - m->by = -bh; - m->eby = -bh; + m->by = -bh - gappx; + m->eby = -bh + gappx; } } diff --git a/dwm.o b/dwm.o index 5dce9c24751d61a59e4399eb3629a31c04ec9626..83f6d6ab7e5bb81255d62f428eb6f97218c3191c 100644 GIT binary patch delta 21421 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 delta 21972 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 m->nmaster) mw = m->nmaster ? m->ww * m->mfact : 0; else - mw = m->ww - m->gappx; - for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + mw = m->ww - gappx; + for (i = 0, my = ty = gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) if (i < m->nmaster) { - h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx; - resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0); - if (my + HEIGHT(c) + m->gappx < m->wh) - my += HEIGHT(c) + m->gappx; + h = (m->wh - my) / (MIN(n, m->nmaster) - i) - gappx; + resize(c, m->wx + gappx, m->wy + my, mw - (2*c->bw) - gappx, h - (2*c->bw), 0); + if (my + HEIGHT(c) + gappx < m->wh) + my += HEIGHT(c) + gappx; } else { - h = (m->wh - ty) / (n - i) - m->gappx; - resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0); - if (ty + HEIGHT(c) + m->gappx < m->wh) - ty += HEIGHT(c) + m->gappx; + h = (m->wh - ty) / (n - i) - gappx; + resize(c, m->wx + mw + gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*gappx, h - (2*c->bw), 0); + if (ty + HEIGHT(c) + gappx < m->wh) + ty += HEIGHT(c) + gappx; } }