git clone dmenu dmenu Log gph
Found at: gopher.r-36.net:70/scm/dmenu/commit/13ef97e65ea5a713a3d5ab46916d1ac6d071b825.gph
tupdated dmenu to borderless drawing as well - dmenu - Dmenu fork with xft fonts.
git clone git://r-36.net/dmenu
---
commit 13ef97e65ea5a713a3d5ab46916d1ac6d071b825
parent 65be999a3f76ad51fb97e12f2fb481f5038f6817
Date: Fri, 25 Aug 2006 14:45:17 +0200
updated dmenu to borderless drawing as well
Diffstat:
config.arg.h | 7 ++++---
config.default.h | 7 ++++---
dmenu.h | 10 ++++++----
draw.c | 33 ++++++++-----------------------
main.c | 19 ++++++++++---------
5 files changed, 32 insertions(+), 44 deletions(-)
---
diff --git a/config.arg.h b/config.arg.h
t@@ -4,6 +4,7 @@
*/
#define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define BGCOLOR "#666699"
-#define FGCOLOR "#eeeeee"
-#define BORDERCOLOR "#9999CC"
+#define SELBGCOLOR "#666699"
+#define SELFGCOLOR "#eeeeee"
+#define NORMBGCOLOR "#333366"
+#define NORMFGCOLOR "#cccccc"
diff --git a/config.default.h b/config.default.h
t@@ -4,6 +4,7 @@
*/
#define FONT "fixed"
-#define BGCOLOR "#666699"
-#define FGCOLOR "#eeeeee"
-#define BORDERCOLOR "#9999CC"
+#define SELBGCOLOR "#666699"
+#define SELFGCOLOR "#eeeeee"
+#define NORMBGCOLOR "#333366"
+#define NORMFGCOLOR "#cccccc"
diff --git a/dmenu.h b/dmenu.h
t@@ -9,6 +9,9 @@
#define SPACE 30 /* px */
+/* color */
+enum { ColFG, ColBG, ColLast };
+
typedef struct DC DC;
typedef struct Fnt Fnt;
t@@ -22,9 +25,8 @@ struct Fnt {
struct DC { /* draw context */
int x, y, w, h;
- unsigned long bg;
- unsigned long fg;
- unsigned long border;
+ unsigned long norm[ColLast];
+ unsigned long sel[ColLast];
Drawable drawable;
Fnt font;
GC gc;
t@@ -35,7 +37,7 @@ extern Display *dpy;
extern DC dc;
/* draw.c */
-extern void drawtext(const char *text, Bool invert, Bool border);
+extern void drawtext(const char *text, unsigned long col[ColLast]);
extern unsigned long getcolor(const char *colstr);
extern void setfont(const char *fontstr);
extern unsigned int textw(const char *text);
t@@ -24,37 +24,21 @@ textnw(const char *text, unsigned int len)
/* extern */
void
-drawtext(const char *text, Bool invert, Bool border)
+drawtext(const char *text, unsigned long col[ColLast])
{
int x, y, w, h;
static char buf[256];
unsigned int len, olen;
XGCValues gcv;
- XPoint points[5];
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+ XSetForeground(dpy, dc.gc, col[ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- w = 0;
- if(border) {
- points[0].x = dc.x;
- points[0].y = dc.y;
- points[1].x = dc.w - 1;
- points[1].y = 0;
- points[2].x = 0;
- points[2].y = dc.h - 1;
- points[3].x = -(dc.w - 1);
- points[3].y = 0;
- points[4].x = 0;
- points[4].y = -(dc.h - 1);
- XSetForeground(dpy, dc.gc, dc.border);
- XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
- }
-
if(!text)
return;
+ w = 0;
olen = len = strlen(text);
if(len >= sizeof(buf))
len = sizeof(buf) - 1;
t@@ -80,17 +64,16 @@ drawtext(const char *text, Bool invert, Bool border)
if(w > dc.w)
return; /* too long */
- gcv.foreground = invert ? dc.bg : dc.fg;
- gcv.background = invert ? dc.fg : dc.bg;
+ gcv.foreground = col[ColFG];
if(dc.font.set) {
- XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
- XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
x, y, buf, len);
}
else {
gcv.font = dc.font.xfont->fid;
- XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
- XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+ XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
}
t@@ -77,17 +77,17 @@ drawmenu()
dc.y = 0;
dc.w = mw;
dc.h = mh;
- drawtext(NULL, False, False);
+ drawtext(NULL, dc.norm);
/* print command */
if(cmdw && item)
dc.w = cmdw;
- drawtext(text[0] ? text : NULL, False, False);
+ drawtext(text[0] ? text : NULL, dc.norm);
dc.x += cmdw;
if(curr) {
dc.w = SPACE;
- drawtext((curr && curr->left) ? "<" : NULL, False, False);
+ drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
dc.x += dc.w;
/* determine maximum items */
t@@ -95,13 +95,13 @@ drawmenu()
dc.w = textw(i->text);
if(dc.w > mw / 3)
dc.w = mw / 3;
- drawtext(i->text, sel == i, sel == i);
+ drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
dc.x += dc.w;
}
dc.x = mw - SPACE;
dc.w = SPACE;
- drawtext(next ? ">" : NULL, False, False);
+ drawtext(next ? ">" : NULL, dc.norm);
}
XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
XFlush(dpy);
t@@ -315,9 +315,10 @@ main(int argc, char *argv[])
usleep(1000);
/* style */
- dc.bg = getcolor(BGCOLOR);
- dc.fg = getcolor(FGCOLOR);
- dc.border = getcolor(BORDERCOLOR);
+ dc.sel[ColBG] = getcolor(SELBGCOLOR);
+ dc.sel[ColFG] = getcolor(SELFGCOLOR);
+ dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+ dc.norm[ColFG] = getcolor(NORMFGCOLOR);
setfont(FONT);
wa.override_redirect = 1;
t@@ -326,7 +327,7 @@ main(int argc, char *argv[])
mx = my = 0;
mw = DisplayWidth(dpy, screen);
- mh = dc.font.height + 4;
+ mh = dc.font.height + 2;
win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
.