summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dmenu.h3
-rw-r--r--draw.c5
-rw-r--r--main.c8
3 files changed, 7 insertions, 9 deletions
diff --git a/dmenu.h b/dmenu.h
index b58a32b..d4065d2 100644
--- a/dmenu.h
+++ b/dmenu.h
@@ -43,8 +43,7 @@ extern DC dc; /* global drawing context */
/* draw.c */
extern void drawtext(const char *text,
unsigned long col[ColLast]); /* draws text with the defined color tuple */
-extern unsigned long getcolor(
- const char *colstr, const char *alternate); /* returns color of colstr */
+extern unsigned long getcolor(const char *colstr); /* returns color of colstr */
extern void setfont(const char *fontstr); /* sets global font */
extern unsigned int textw(const char *text); /* returns width of text in px */
diff --git a/draw.c b/draw.c
index dafc107..10a011d 100644
--- a/draw.c
+++ b/draw.c
@@ -76,12 +76,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
}
unsigned long
-getcolor(const char *colstr, const char *alternate) {
+getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
- if(XAllocNamedColor(dpy, cmap, colstr, &color, &color) != Success)
- XAllocNamedColor(dpy, cmap, alternate, &color, &color);
+ XAllocNamedColor(dpy, cmap, colstr, &color, &color);
return color.pixel;
}
diff --git a/main.c b/main.c
index 5a9b3b9..f1bba6b 100644
--- a/main.c
+++ b/main.c
@@ -341,10 +341,10 @@ main(int argc, char *argv[]) {
maxname = readstdin();
/* style */
- dc.norm[ColBG] = getcolor(normbg, NORMBGCOLOR);
- dc.norm[ColFG] = getcolor(normfg, NORMFGCOLOR);
- dc.sel[ColBG] = getcolor(selbg, SELBGCOLOR);
- dc.sel[ColFG] = getcolor(selfg, SELFGCOLOR);
+ dc.norm[ColBG] = getcolor(normbg);
+ dc.norm[ColFG] = getcolor(normfg);
+ dc.sel[ColBG] = getcolor(selbg);
+ dc.sel[ColFG] = getcolor(selfg);
setfont(font);
wa.override_redirect = 1;
dad5f4e?s=13&d=retro' width='13' height='13' alt='Gravatar' /> BanceDev 1-0/+4 2024-09-10removed demo image to cleanupGravatar Lance Borden 2-4/+1 2024-09-10higher quality image for readmeGravatar BanceDev 1-0/+0 2024-09-10added better demo to readmeGravatar BanceDev 2-0/+10 2024-09-10added handling for when prompt gets longer than terminal widthGravatar BanceDev 1-0/+36 2024-09-10added support for multiline promptsGravatar BanceDev 1-4/+35 2024-09-10lua api functions for getting terminal width and heightGravatar BanceDev 4-0/+46 2024-09-09added coloring to help commandGravatar BanceDev 1-2/+2 2024-09-09add aliasing to init.luaGravatar BanceDev 9-14/+258 2024-09-09bugfix to inline backspace and delete on multiline bufferGravatar BanceDev 1-7/+23 2024-09-09fixed line wrapping when deleting inlineGravatar BanceDev 1-0/+8 2024-09-09updated gitignoreGravatar BanceDev 2-1/+2 2024-09-09fixed wrapping bug due to not using updated prompt_lengthGravatar BanceDev 1-3/+6 2024-09-09added stripping of escape sequences from prompt size to allow for coloringGravatar BanceDev 1-5/+26 2024-09-09added support for init.lua for configuring shellGravatar BanceDev 8-38/+180 2024-09-09docs: update pathGravatar Christopher Lane 1-1/+1 2024-09-08added getenv and putenv to Lua APIGravatar BanceDev 2-5/+33 2024-09-08added lua api functions for indexing historyGravatar BanceDev 2-0/+35 2024-09-08added support for cli args for lua scriptsGravatar BanceDev 4-3/+28 2024-09-07added --version flagGravatar BanceDev 1-1/+9 2024-09-07fixed error in install.sh instructionsGravatar BanceDev 1-1/+1 2024-09-07fixed bug with cursor alignment when adding text within the bufferGravatar BanceDev 1-1/+11 2024-09-06added API guide to readmeGravatar BanceDev 1-1/+5 2024-09-06Update README.mdGravatar Lance Borden 1-1/+1 2024-09-06better readmeGravatar BanceDev 2-2/+14