[CONTACT]

[ABOUT]

[POLICY]

git clone dmenu dmenu Log gph

Found at: gopher.r-36.net:70/scm/dmenu/commit/14133be5bd4d819579d62ad99c2b6de20040ff13.gph

treverting - dmenu - Dmenu fork with xft fonts.

git clone git://r-36.net/dmenu

Log

Files

Refs

README

LICENSE

---

commit 14133be5bd4d819579d62ad99c2b6de20040ff13

parent 3b590beda2fb23400f74394badd7a5231d4d7920

Author: arg@mmvi <unknown>

Date:   Tue, 26 Sep 2006 13:39:00 +0200
reverting
Diffstat:
  dmenu.h                             |       3 +--
  draw.c                              |       5 ++---
  main.c                              |       8 ++++----
3 files changed, 7 insertions(+), 9 deletions(-)
---

diff --git a/dmenu.h b/dmenu.h

t@@ -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

t@@ -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

t@@ -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;
.


AD:

NEW PAGES:

[ODDNUGGET]

[GOPHER]