From 421f1b9d46e4f8d7eb9308300261fdc19e59037d Mon Sep 17 00:00:00 2001 From: Mahesh Asolkar Date: Sun, 3 Feb 2019 12:52:15 -0800 Subject: [PATCH] Added bar color modification --- config.h | 2 +- config.mk | 4 ++-- dwm.c | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/config.h b/config.h index da793cf..29028d4 100644 --- a/config.h +++ b/config.h @@ -23,7 +23,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "Media", "Tenor", "Root" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "Media", "Remote", "Root" }; static const Rule rules[] = { /* xprop(1): diff --git a/config.mk b/config.mk index 4861b39..a022c0a 100644 --- a/config.mk +++ b/config.mk @@ -22,8 +22,8 @@ FREETYPEINC = /usr/include/freetype2 #FREETYPEINC = ${X11INC}/freetype2 # includes and libs -INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} +INCS = -I. -I/usr/include -I${X11INC} -I${FREETYPEINC} `pkg-config --cflags xft pango pangoxft` +LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} `pkg-config --libs xft pango pangoxft` # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} diff --git a/dwm.c b/dwm.c index b7537c9..af86f3d 100644 --- a/dwm.c +++ b/dwm.c @@ -201,7 +201,7 @@ static void setfocus(Client *c); static void setfullscreen(Client *c, int fullscreen); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); -static void setup(void); +static void setup(int argc, char *argv[]); static void seturgent(Client *c, int urg); static void showhide(Client *c); static void sigchld(int unused); @@ -1527,7 +1527,7 @@ setmfact(const Arg *arg) } void -setup(void) +setup(int argc, char *argv[]) { int i; XSetWindowAttributes wa; @@ -1570,6 +1570,13 @@ setup(void) scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); for (i = 0; i < LENGTH(colors); i++) scheme[i] = drw_scm_create(drw, colors[i], 3); + if (argc > 0) { + Clr *cuscol = ecalloc(1, sizeof(Clr)); + drw_clr_create(drw, cuscol, argv[1]); + scheme[SchemeSel][ColBg] = cuscol[0]; + scheme[SchemeSel][ColBorder] = cuscol[0]; + } + /* init bars */ updatebars(); updatestatus(); @@ -2133,14 +2140,14 @@ main(int argc, char *argv[]) { if (argc == 2 && !strcmp("-v", argv[1])) die("dwm-"VERSION); - else if (argc != 1) - die("usage: dwm [-v]"); + //else if (argc != 1) + //die("usage: dwm [-v]"); if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) fputs("warning: no locale support\n", stderr); if (!(dpy = XOpenDisplay(NULL))) die("dwm: cannot open display"); checkotherwm(); - setup(); + setup(argc, argv); #ifdef __OpenBSD__ if (pledge("stdio rpath proc exec", NULL) == -1) die("pledge");