From 7359d5e8a20073a9e40f92c6ad37d61ed5326859 Mon Sep 17 00:00:00 2001 From: tdro Date: Thu, 17 Mar 2022 22:07:02 -0400 Subject: Makefile: Add patches and shell environment --- patches/xresources.patch | 158 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 patches/xresources.patch (limited to 'patches/xresources.patch') diff --git a/patches/xresources.patch b/patches/xresources.patch new file mode 100644 index 0000000..f2d048e --- /dev/null +++ b/patches/xresources.patch @@ -0,0 +1,158 @@ +diff --git a/dmenu.c b/dmenu.c +index eca67ac..902f67d 100644 +--- a/dmenu.c ++++ b/dmenu.c +@@ -15,6 +15,7 @@ + #include + #endif + #include ++#include + + #include "drw.h" + #include "util.h" +@@ -53,6 +54,10 @@ static XIC xic; + static Drw *drw; + static Clr *scheme[SchemeLast]; + ++/* Temporary arrays to allow overriding xresources values */ ++static char *colortemp[8]; ++static char *tempfonts; ++ + #include "config.h" + + static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +@@ -619,8 +624,13 @@ setup(void) + int a, di, n, area = 0; + #endif + /* init appearance */ +- for (j = 0; j < SchemeLast; j++) +- scheme[j] = drw_scm_create(drw, colors[j], 2); ++ for (j = 0; j < SchemeLast; j++) { ++ scheme[j] = drw_scm_create(drw, (const char**)colors[j], 2); ++ } ++ for (j = 0; j < SchemeOut; ++j) { ++ for (i = 0; i < 2; ++i) ++ free((char *) colors[j][i]); ++ } + + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); +@@ -712,6 +722,57 @@ usage(void) + exit(1); + } + ++void ++readxresources(void) { ++ XrmInitialize(); ++ ++ char* xrm; ++ if ((xrm = XResourceManagerString(drw->dpy))) { ++ char *type; ++ XrmDatabase xdb = XrmGetStringDatabase(xrm); ++ XrmValue xval; ++ ++ if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval)) ++ fonts[0] = strdup(xval.addr); ++ else ++ fonts[0] = strdup(fonts[0]); ++ if (XrmGetResource(xdb, "dmenu.background", "*", &type, &xval)) ++ colors[SchemeNorm][ColBg] = strdup(xval.addr); ++ else ++ colors[SchemeNorm][ColBg] = strdup(colors[SchemeNorm][ColBg]); ++ if (XrmGetResource(xdb, "dmenu.foreground", "*", &type, &xval)) ++ colors[SchemeNorm][ColFg] = strdup(xval.addr); ++ else ++ colors[SchemeNorm][ColFg] = strdup(colors[SchemeNorm][ColFg]); ++ if (XrmGetResource(xdb, "dmenu.selbackground", "*", &type, &xval)) ++ colors[SchemeSel][ColBg] = strdup(xval.addr); ++ else ++ colors[SchemeSel][ColBg] = strdup(colors[SchemeSel][ColBg]); ++ if (XrmGetResource(xdb, "dmenu.selforeground", "*", &type, &xval)) ++ colors[SchemeSel][ColFg] = strdup(xval.addr); ++ else ++ colors[SchemeSel][ColFg] = strdup(colors[SchemeSel][ColFg]); ++ if (XrmGetResource(xdb, "dmenu.selhiforeground", "*", &type, &xval)) ++ colors[SchemeSelHighlight][ColFg] = strdup(xval.addr); ++ else ++ colors[SchemeSelHighlight][ColFg] = strdup(colors[SchemeSelHighlight][ColFg]); ++ if (XrmGetResource(xdb, "dmenu.selhibackground", "*", &type, &xval)) ++ colors[SchemeSelHighlight][ColBg] = strdup(xval.addr); ++ else ++ colors[SchemeSelHighlight][ColBg] = strdup(colors[SchemeSelHighlight][ColBg]); ++ if (XrmGetResource(xdb, "dmenu.normhiforeground", "*", &type, &xval)) ++ colors[SchemeNormHighlight][ColFg] = strdup(xval.addr); ++ else ++ colors[SchemeNormHighlight][ColFg] = strdup(colors[SchemeNormHighlight][ColFg]); ++ if (XrmGetResource(xdb, "dmenu.normhibackground", "*", &type, &xval)) ++ colors[SchemeNormHighlight][ColBg] = strdup(xval.addr); ++ else ++ colors[SchemeNormHighlight][ColBg] = strdup(colors[SchemeNormHighlight][ColBg]); ++ ++ XrmDestroyDatabase(xdb); ++ } ++} ++ + int + main(int argc, char *argv[]) + { +@@ -740,15 +801,23 @@ main(int argc, char *argv[]) + else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ + prompt = argv[++i]; + else if (!strcmp(argv[i], "-fn")) /* font or font set */ +- fonts[0] = argv[++i]; ++ tempfonts = argv[++i]; + else if (!strcmp(argv[i], "-nb")) /* normal background color */ +- colors[SchemeNorm][ColBg] = argv[++i]; ++ colortemp[0] = argv[++i]; + else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ +- colors[SchemeNorm][ColFg] = argv[++i]; ++ colortemp[1] = argv[++i]; + else if (!strcmp(argv[i], "-sb")) /* selected background color */ +- colors[SchemeSel][ColBg] = argv[++i]; ++ colortemp[2] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ +- colors[SchemeSel][ColFg] = argv[++i]; ++ colortemp[3] = argv[++i]; ++ else if (!strcmp(argv[i], "-shf")) /* selected highlight foreground color */ ++ colortemp[4] = argv[++i]; ++ else if (!strcmp(argv[i], "-shb")) /* selected highlight background color */ ++ colortemp[5] = argv[++i]; ++ else if (!strcmp(argv[i], "-nhf")) /* normal highlight foreground color */ ++ colortemp[6] = argv[++i]; ++ else if (!strcmp(argv[i], "-nhb")) /* normal highlight background color */ ++ colortemp[7] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; + else +@@ -766,8 +835,30 @@ main(int argc, char *argv[]) + die("could not get embedding window attributes: 0x%lx", + parentwin); + drw = drw_create(dpy, screen, root, wa.width, wa.height); +- if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) ++ readxresources(); ++ /* Now we check whether to override xresources with commandline parameters */ ++ if ( tempfonts ) ++ fonts[0] = strdup(tempfonts); ++ if ( colortemp[0]) ++ colors[SchemeNorm][ColBg] = strdup(colortemp[0]); ++ if ( colortemp[1]) ++ colors[SchemeNorm][ColFg] = strdup(colortemp[1]); ++ if ( colortemp[2]) ++ colors[SchemeSel][ColBg] = strdup(colortemp[2]); ++ if ( colortemp[3]) ++ colors[SchemeSel][ColFg] = strdup(colortemp[3]); ++ if ( colortemp[4]) ++ colors[SchemeSelHighlight][ColFg] = strdup(colortemp[4]); ++ if ( colortemp[5]) ++ colors[SchemeSelHighlight][ColBg] = strdup(colortemp[5]); ++ if ( colortemp[6]) ++ colors[SchemeNormHighlight][ColFg] = strdup(colortemp[6]); ++ if ( colortemp[7]) ++ colors[SchemeNormHighlight][ColBg] = strdup(colortemp[7]); ++ if (!drw_fontset_create(drw, (const char**)fonts, LENGTH(fonts))) + die("no fonts could be loaded."); ++ ++ free((char *) fonts[0]); + lrpad = drw->fonts->h; + + #ifdef __OpenBSD__ -- cgit v1.2.3