diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h index 86a0f0f..53ab8f4 100644 --- a/.config/suckless/dwm/config.h +++ b/.config/suckless/dwm/config.h @@ -4,10 +4,6 @@ static const int showbar = 0; static const int topbar = 0; static const char *fonts[] = { "Cascadia Mono:style=Bold:size=10:antialias=true:autohint=true" }; -static const char *colors[][3] = { - [SchemeNorm] = { "#D3C6AA", "#272E33", "#83C092" }, - [SchemeSel] = { "#374145", "#DBBC7F", "#A7C080" }, -}; static const char *tags[] = { "1", "2", "3" }; static const Rule rules[] = { diff --git a/.config/suckless/dwm/dwm.c b/.config/suckless/dwm/dwm.c index 0a123cc..6740c5e 100644 --- a/.config/suckless/dwm/dwm.c +++ b/.config/suckless/dwm/dwm.c @@ -30,7 +30,6 @@ #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ -enum { SchemeNorm, SchemeSel }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ @@ -211,7 +210,6 @@ static void (*handler[LASTEvent]) (XEvent *) = { static Atom wmatom[WMLast], netatom[NetLast]; static int running = 1; static Cur *cursor[CurLast]; -static Clr **scheme; static Display *dpy; static Drw *drw; static Monitor *mons, *selmon; @@ -368,9 +366,6 @@ void cleanup(void) { cleanupmon(mons); for (i = 0; i < CurLast; i++) drw_cur_free(drw, cursor[i]); - for (i = 0; i < LENGTH(colors); i++) - free(scheme[i]); - free(scheme); XDestroyWindow(dpy, wmcheckwin); drw_free(drw); XSync(dpy, False); @@ -558,7 +553,6 @@ void drawbar(Monitor *m) { return; /* draw status first so it can be overdrawn by tags later */ 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); } @@ -571,7 +565,6 @@ void drawbar(Monitor *m) { x = 0; for (i = 0; i < LENGTH(tags); i++) { w = TEXTW(tags[i]); - drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); if (occ & 1 << i) drw_rect(drw, x + boxs, boxs, boxw, boxw, @@ -581,17 +574,14 @@ void drawbar(Monitor *m) { } w = TEXTW(m->ltsymbol); - drw_setscheme(drw, scheme[SchemeNorm]); 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); } } @@ -642,7 +632,7 @@ void focus(Client *c) { seturgent(c, 0); detachstack(c); attachstack(c); - XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel); + XSetWindowBorder(dpy, c->win, BlackPixel(dpy, screen)); setfocus(c); } else { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); @@ -806,7 +796,7 @@ void manage(Window w, XWindowAttributes *wa) { wc.border_width = c->bw; XConfigureWindow(dpy, w, CWBorderWidth, &wc); - XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel); + XSetWindowBorder(dpy, c->win, BlackPixel(dpy, screen)); configure(c); /* propagates border_width, if size doesn't change */ updatewindowtype(c); updatesizehints(c); @@ -1057,7 +1047,6 @@ void setfullscreen(Client *c, int fullscreen) { } void setup(void) { - int i; XSetWindowAttributes wa; Atom utf8string; struct sigaction sa; @@ -1101,10 +1090,6 @@ void setup(void) { cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); cursor[CurResize] = drw_cur_create(drw, XC_sizing); cursor[CurMove] = drw_cur_create(drw, XC_fleur); - /* init appearance */ - scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); - for (i = 0; i < LENGTH(colors); i++) - scheme[i] = drw_scm_create(drw, colors[i], 3); /* init bars */ updatebars(); updatestatus(); @@ -1215,7 +1200,7 @@ void tile(Monitor *m) { void unfocus(Client *c, int setfocus) { if (!c) return; - XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); + XSetWindowBorder(dpy, c->win, BlackPixel(dpy, screen)); if (setfocus) { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]);