From eb76a66b91c00aa46815eb20003d7e27855b22c9 Mon Sep 17 00:00:00 2001 From: kaoplo Date: Fri, 16 Sep 2022 19:17:23 +0200 Subject: [PATCH] changed my config a little bit --- config.def.h | 4 +- config.h | 4 +- dwm | Bin 72840 -> 72840 bytes dwm-barpadding-6.2.diff | 110 ---------------------------------------- dwm-fullgaps-6.2.diff | 95 ---------------------------------- dwm.o | Bin 59032 -> 58848 bytes 6 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 dwm-barpadding-6.2.diff delete mode 100644 dwm-fullgaps-6.2.diff diff --git a/config.def.h b/config.def.h index 3606a54..c66fdf6 100644 --- a/config.def.h +++ b/config.def.h @@ -16,7 +16,7 @@ static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; +static const char col_cyan[] = "#a1028e"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, @@ -24,7 +24,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "obs", "web", "gam", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "term", "web", "gam", "misc" }; static const Rule rules[] = { /* xprop(1): diff --git a/config.h b/config.h index 3606a54..c66fdf6 100644 --- a/config.h +++ b/config.h @@ -16,7 +16,7 @@ static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; +static const char col_cyan[] = "#a1028e"; static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, @@ -24,7 +24,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "obs", "web", "gam", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "term", "web", "gam", "misc" }; static const Rule rules[] = { /* xprop(1): diff --git a/dwm b/dwm index dc90edf75013ce94e1dc44d802cf6dff28093f39..e4008d278fd72582229bf476ec5acc714df6e074 100755 GIT binary patch delta 6350 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 E1JKsRvj6}9 delta 6414 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 diff --git a/dwm-barpadding-6.2.diff b/dwm-barpadding-6.2.diff deleted file mode 100644 index 4c26e46..0000000 --- a/dwm-barpadding-6.2.diff +++ /dev/null @@ -1,110 +0,0 @@ -Common subdirectories: dwm/.git and dwm-new/.git -diff -up dwm/config.def.h dwm-new/config.def.h ---- dwm/config.def.h 2019-12-10 17:24:37.944708263 +1300 -+++ dwm-new/config.def.h 2019-12-10 17:44:38.447670711 +1300 -@@ -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"; -diff -up dwm/dwm.c dwm-new/dwm.c ---- dwm/dwm.c 2019-12-10 17:24:37.945708263 +1300 -+++ dwm-new/dwm.c 2019-12-10 17:41:46.192676099 +1300 -@@ -241,6 +241,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 *) = { -@@ -567,7 +569,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); -@@ -705,7 +707,7 @@ drawbar(Monitor *m) - if (m == selmon) { /* status is only drawn on selected monitor */ - drw_setscheme(drw, scheme[SchemeNorm]); - sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ -- drw_text(drw, m->ww - sw, 0, sw, 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) { -@@ -731,12 +733,12 @@ drawbar(Monitor *m) - if ((w = m->ww - sw - 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); -@@ -1547,6 +1549,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); -@@ -1573,6 +1578,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, -@@ -1701,7 +1707,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); - } - -@@ -1811,7 +1817,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); -@@ -1826,11 +1832,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 diff --git a/dwm-fullgaps-6.2.diff b/dwm-fullgaps-6.2.diff deleted file mode 100644 index 7206aec..0000000 --- a/dwm-fullgaps-6.2.diff +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 1c0b587..38d2f6c 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -2,6 +2,7 @@ - - /* appearance */ - static const unsigned int borderpx = 1; /* border pixel of windows */ -+static const unsigned int gappx = 5; /* gaps between 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 */ -@@ -84,6 +85,9 @@ static Key keys[] = { - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, -+ { MODKEY, XK_minus, setgaps, {.i = -1 } }, -+ { MODKEY, XK_equal, setgaps, {.i = +1 } }, -+ { MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) -diff --git a/dwm.c b/dwm.c -index 4465af1..4363627 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -119,6 +119,7 @@ struct Monitor { - int by; /* bar geometry */ - int mx, my, mw, mh; /* screen size */ - int wx, wy, ww, wh; /* window area */ -+ int gappx; /* gaps between windows */ - unsigned int seltags; - unsigned int sellt; - unsigned int tagset[2]; -@@ -199,6 +200,7 @@ static void sendmon(Client *c, Monitor *m); - static void setclientstate(Client *c, long state); - static void setfocus(Client *c); - static void setfullscreen(Client *c, int fullscreen); -+static void setgaps(const Arg *arg); - static void setlayout(const Arg *arg); - static void setmfact(const Arg *arg); - static void setup(void); -@@ -638,6 +640,7 @@ 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); -@@ -1497,6 +1500,16 @@ setfullscreen(Client *c, int fullscreen) - } - } - -+void -+setgaps(const Arg *arg) -+{ -+ if ((arg->i == 0) || (selmon->gappx + arg->i < 0)) -+ selmon->gappx = 0; -+ else -+ selmon->gappx += arg->i; -+ arrange(selmon); -+} -+ - void - setlayout(const Arg *arg) - { -@@ -1683,16 +1696,16 @@ tile(Monitor *m) - if (n > m->nmaster) - mw = m->nmaster ? m->ww * m->mfact : 0; - else -- mw = m->ww; -- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) -+ mw = m->ww - m->gappx; -+ for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) - if (i < m->nmaster) { -- h = (m->wh - my) / (MIN(n, m->nmaster) - i); -- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); -- my += HEIGHT(c); -+ 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); -+ my += HEIGHT(c) + m->gappx; - } else { -- h = (m->wh - ty) / (n - i); -- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); -- ty += HEIGHT(c); -+ 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); -+ ty += HEIGHT(c) + m->gappx; - } - } - --- -2.20.1 - diff --git a/dwm.o b/dwm.o index c1372781f89d87bfde25074896d2f6643a0a602e..d86039b11c9de9847f114a811054ee932c306f1c 100644 GIT binary patch delta 4598 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