Hello suckless-
1) Attached is a patch that enables xft fonts in dmenu 4.2.1.
2) dmenu v4.2.1 appears to be leaking memory. It is missing the
routines to teardown/cleanup memory structures present in previous
versions. This patch also adds them.
For those keeping score, the patch increases by 43 the line count of
dmenu.c/draw.c/draw.h
More details below:
1. Xft support
This patch allows the use of Xft font names in the same command line
option (-fn) as the regular x font or fontset name. I thought this
would be more convenient for users, and it depends on the assumption
that there won't be any collisions among x fonts and xft fonts
This patch simplifies the inconsistent use of color definitions
(between xft and regular x) by encapsulating the color info into a
very simple struct, which replaces the existing array+enum approach. I
find this easier to see/read in the code, but of course I wrote it, so
other opinions are welcome.
This patch combines the loadfont() and initfont() functions as they
appear to be always used sequentially.
And it removes a few small things that don't seem to be necessary
(dc.inverted, DEFFONT)
2. Apparent memory leak, or teardown/cleanup
I was surprised to see no calls to free much of the memory used in
dmenu 4.2.1. This seems to be a mistake, as there is a function called
freedc() which is never called. I added a cleanup() function based on
what I saw in 4.1.1. Let me know if I'm misunderstanding something,
but this appears to be a significant memory leak. Note that xft memory
is (in part) managed by the X system, so valgrind reports some memory
remains unfreed at program close. I think this is OK, right?
Dan
--------------------
diff --git a/config.mk b/config.mk
index ebaab81..1e09c70 100644
--- a/config.mk
+++ b/config.mk
@@ -14,9 +14,13 @@ X11LIB = /usr/X11R6/lib
XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA
+# Xft, comment if you don't want it
+XFTINC = /usr/include/freetype2
+XFTLIBS = -lXft -lXrender -lfreetype -lz -lfontconfig
+
# includes and libs
-INCS = -I${X11INC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
+INCS = -I${X11INC} -I${XFTINC}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
# flags
CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff --git a/dmenu.1 b/dmenu.1
index d2a93d1..ce5a2df 100644
--- a/dmenu.1
+++ b/dmenu.1
@@ -60,7 +60,7 @@ dmenu appears on the given Xinerama screen.
defines the prompt to be displayed to the left of the input field.
.TP
.BI \-fn " font"
-defines the font or font set used.
+defines the font or font set used. eg. "fixed" or
"Monospace-12:normal" (an xft font)
.TP
.BI \-nb " color"
defines the normal background color.
diff --git a/dmenu.c b/dmenu.c
index a24dfe3..e35b17b 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -10,11 +10,13 @@
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
+#include <X11/Xft/Xft.h>
#include "draw.h"
#define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) &&
(y) >= (ry) && (y) < (ry)+(rh))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define DEFFONT "Monospace-11:normal" /* xft example:
"Monospace-11:normal" ; regular example: "fixed" */
typedef struct Item Item;
struct Item {
@@ -25,6 +27,7 @@ struct Item {
static void appenditem(Item *item, Item **list, Item **last);
static void calcoffsets(void);
+static void cleanup(void);
static void drawmenu(void);
static char *fstrstr(const char *s, const char *sub);
static void grabkeyboard(void);
@@ -51,10 +54,12 @@ static const char *normbgcolor = "#cccccc";
static const char *normfgcolor = "#000000";
static const char *selbgcolor = "#0066ff";
static const char *selfgcolor = "#ffffff";
-static unsigned long normcol[ColLast];
-static unsigned long selcol[ColLast];
+static ColorSet normcol;
+static ColorSet selcol;
static Atom utf8;
static Bool topbar = True;
+static Bool running = True;
+static int ret = 0;
static DC *dc;
static Item *items = NULL;
static Item *matches, *sel;
@@ -101,12 +106,12 @@ main(int argc, char *argv[]) {
usage();
dc = initdc();
- initfont(dc, font);
+ loadfont(dc, font ? font : DEFFONT);
readstdin();
setup();
run();
-
- return EXIT_FAILURE; /* should not reach */
+ cleanup();
+ return ret;
}
void
@@ -138,6 +143,25 @@ calcoffsets(void) {
}
void
+cleanup(void) {
+ Item *itm;
+ while(items) {
+ itm = items->next;
+ free(items->text);
+ free(items);
+ items = itm;
+ }
+ if(dc->font.xft_font) {
+ int screen = DefaultScreen(dc->dpy);
+ XftColorFree(dc->dpy, DefaultVisual(dc->dpy, screen),
DefaultColormap(dc->dpy, screen), &normcol.FG_xft);
+ XftColorFree(dc->dpy, DefaultVisual(dc->dpy, screen),
DefaultColormap(dc->dpy, screen), &selcol.FG_xft);
+ }
+ XDestroyWindow(dc->dpy, win);
+ XUngrabKeyboard(dc->dpy, CurrentTime);
+ freedc(dc);
+}
+
+void
drawmenu(void) {
int curpos;
Item *item;
@@ -145,7 +169,7 @@ drawmenu(void) {
dc->x = 0;
dc->y = 0;
dc->h = bh;
- drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
+ drawrect(dc, 0, 0, mw, mh, True, normcol.BG);
if(prompt) {
dc->w = promptw;
@@ -155,7 +179,7 @@ drawmenu(void) {
dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
drawtext(dc, text, normcol);
if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
- drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
+ drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol.FG);
if(lines > 0) {
dc->w = mw - dc->x;
@@ -304,7 +328,8 @@ keypress(XKeyEvent *ev) {
sel = sel->right;
break;
case XK_Escape:
- exit(EXIT_FAILURE);
+ ret = EXIT_FAILURE;
+ running = False;
case XK_Home:
if(sel == matches) {
cursor = 0;
@@ -342,7 +367,8 @@ keypress(XKeyEvent *ev) {
case XK_KP_Enter:
fputs((sel && !(ev->state & ShiftMask)) ? sel->text :
text, stdout);
fflush(stdout);
- exit(EXIT_SUCCESS);
+ ret = EXIT_SUCCESS;
+ running = False;
case XK_Right:
if(cursor < len) {
cursor = nextrune(+1);
@@ -451,7 +477,7 @@ void
run(void) {
XEvent ev;
- while(!XNextEvent(dc->dpy, &ev))
+ while(running && !XNextEvent(dc->dpy, &ev))
switch(ev.type) {
case Expose:
if(ev.xexpose.count == 0)
@@ -484,10 +510,18 @@ setup(void) {
root = RootWindow(dc->dpy, screen);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
- normcol[ColBG] = getcolor(dc, normbgcolor);
- normcol[ColFG] = getcolor(dc, normfgcolor);
- selcol[ColBG] = getcolor(dc, selbgcolor);
- selcol[ColFG] = getcolor(dc, selfgcolor);
+ normcol.BG = getcolor(dc, normbgcolor);
+ normcol.FG = getcolor(dc, normfgcolor);
+ selcol.BG = getcolor(dc, selbgcolor);
+ selcol.FG = getcolor(dc, selfgcolor);
+ if(dc->font.xft_font) {
+ if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, screen),
+ DefaultColormap(dc->dpy, screen), (const char*)normfgcolor,
&normcol.FG_xft))
+ eprintf("error, cannot allocate xft font color '%s'\n",
normfgcolor);
+ if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, screen),
+ DefaultColormap(dc->dpy, screen), (const char*)selfgcolor,
&selcol.FG_xft))
+ eprintf("error, cannot allocate xft font color '%s'\n",
selfgcolor);
+ }
/* menu geometry */
bh = dc->font.height + 2;
diff --git a/draw.c b/draw.c
index 28c658c..1fb8722 100644
--- a/draw.c
+++ b/draw.c
@@ -5,13 +5,11 @@
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
#include "draw.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define DEFFONT "fixed"
-
-static Bool loadfont(DC *dc, const char *fontstr);
#include <string.h>
#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
#include "draw.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define DEFFONT "fixed"
-
-static Bool loadfont(DC *dc, const char *fontstr);
void
drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool
fill, unsigned long color) {
@@ -5,13 +5,11 @@
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
#include "draw.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define DEFFONT "fixed"
-
-static Bool loadfont(DC *dc, const char *fontstr);
void
drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool
fill, unsigned long color) {
@@ -27,7 +25,7 @@ drawrect(DC *dc, int x, int y, unsigned int w,
unsigned int h, Bool fill, unsign
void
-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
+drawtext(DC *dc, const char *text, ColorSet col) {
char buf[256];
size_t n, mn;
@@ -40,21 +38,26 @@ drawtext(DC *dc, const char *text, unsigned long
col[ColLast]) {
if(mn < n)
for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
- drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
+ drawrect(dc, 0, 0, dc->w, dc->h, True, col.BG);
drawtextn(dc, buf, mn, col);
}
void
-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
+drawtextn(DC *dc, const char *text, size_t n, ColorSet col) {
int x, y;
x = dc->x + dc->font.height/2;
y = dc->y + dc->font.ascent+1;
- XSetForeground(dc->dpy, dc->gc, FG(dc, col));
- if(dc->font.set)
+ XSetForeground(dc->dpy, dc->gc, col.FG);
+ if(dc->font.xft_font) {
+ if (!dc->xftdraw)
+ eprintf("error, xft drawable does not exist");
+ XftDrawStringUtf8(dc->xftdraw, &col.FG_xft,
+ dc->font.xft_font, x, y, (unsigned char*)text, n);
+ } else if(dc->font.set) {
XmbDrawString(dc->dpy, dc->canvas, dc->font.set,
dc->gc, x, y, text, n);
- else {
+ } else {
XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
}
@@ -73,11 +76,15 @@ eprintf(const char *fmt, ...) {
void
freedc(DC *dc) {
+ if(dc->font.xft_font) {
+ XftFontClose(dc->dpy, dc->font.xft_font);
+ XftDrawDestroy(dc->xftdraw);
+ }
if(dc->font.set)
XFreeFontSet(dc->dpy, dc->font.set);
- if(dc->font.xfont)
+ if(dc->font.xfont)
XFreeFont(dc->dpy, dc->font.xfont);
- if(dc->canvas)
+ if(dc->canvas)
XFreePixmap(dc->dpy, dc->canvas);
XFreeGC(dc->dpy, dc->gc);
XCloseDisplay(dc->dpy);
@@ -109,29 +116,21 @@ initdc(void) {
XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
dc->font.xfont = NULL;
dc->font.set = NULL;
+ dc->font.xft_font = NULL;
dc->canvas = None;
+ dc->xftdraw = NULL;
return dc;
}
void
-initfont(DC *dc, const char *fontstr) {
- if(!loadfont(dc, fontstr ? fontstr : DEFFONT)) {
- if(fontstr != NULL)
- weprintf("cannot load font '%s'\n", fontstr);
- if(fontstr == NULL || !loadfont(dc, DEFFONT))
- eprintf("cannot load font '%s'\n", DEFFONT);
- }
- dc->font.height = dc->font.ascent + dc->font.descent;
-}
-
-Bool
loadfont(DC *dc, const char *fontstr) {
- char *def, **missing;
+ char *def, **missing=NULL;
int i, n;
- if(!*fontstr)
- return False;
- if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing,
&n, &def))) {
+ if((dc->font.xft_font = XftFontOpenName (dc->dpy,
DefaultScreen(dc->dpy), fontstr))) {
+ dc->font.ascent = dc->font.xft_font->ascent;
+ dc->font.descent = dc->font.xft_font->descent;
+ } else if((dc->font.set = XCreateFontSet(dc->dpy, fontstr,
&missing, &n, &def))) {
char **names;
XFontStruct **xfonts;
@@ -140,14 +139,15 @@ loadfont(DC *dc, const char *fontstr) {
dc->font.ascent = MAX(dc->font.ascent,
xfonts[i]->ascent);
dc->font.descent = MAX(dc->font.descent,
xfonts[i]->descent);
}
- }
- else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+ } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+ if((dc->font.xft_font = XftFontOpenName (dc->dpy,
DefaultScreen(dc->dpy), fontstr))) {
+ dc->font.ascent = dc->font.xft_font->ascent;
+ dc->font.descent = dc->font.xft_font->descent;
+ } else if((dc->font.set = XCreateFontSet(dc->dpy, fontstr,
&missing, &n, &def))) {
char **names;
XFontStruct **xfonts;
@@ -140,14 +139,15 @@ loadfont(DC *dc, const char *fontstr) {
dc->font.ascent = MAX(dc->font.ascent,
xfonts[i]->ascent);
dc->font.descent = MAX(dc->font.descent,
xfonts[i]->descent);
}
- }
- else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+ } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
dc->font.ascent = dc->font.xfont->ascent;
dc->font.descent = dc->font.xfont->descent;
- }
+ } else {
+ eprintf("cannot load font '%s'\n", fontstr);
+ }
if(missing)
XFreeStringList(missing);
- return (dc->font.set || dc->font.xfont);
+ dc->font.height = dc->font.ascent + dc->font.descent;
}
void
@@ -157,25 +157,34 @@ mapdc(DC *dc, Window win, unsigned int w,
unsigned int h) {
void
resizedc(DC *dc, unsigned int w, unsigned int h) {
+ int screen = DefaultScreen(dc->dpy);
if(dc->canvas)
XFreePixmap(dc->dpy, dc->canvas);
dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
- DefaultDepth(dc->dpy,
DefaultScreen(dc->dpy)));
+ DefaultDepth(dc->dpy, screen));
dc->x = dc->y = 0;
dc->w = w;
dc->h = h;
- dc->invert = False;
+ if(dc->font.xft_font && !(dc->xftdraw)) {
+ dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas,
DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen));
+ if(!(dc->xftdraw))
+ eprintf("error, cannot create xft drawable\n");
+ }
}
int
textnw(DC *dc, const char *text, size_t len) {
- if(dc->font.set) {
+ if(dc->font.xft_font) {
+ XGlyphInfo gi;
+ XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const
FcChar8*)text, len, &gi);
+ return gi.width;
+ } else if(dc->font.set) {
XRectangle r;
-
XmbTextExtents(dc->font.set, text, len, NULL, &r);
return r.width;
- }
- return XTextWidth(dc->font.xfont, text, len);
+ } else {
+ return XTextWidth(dc->font.xfont, text, len);
+ }
}
int
diff --git a/draw.h b/draw.h
index ac3943f..ca9a1ac 100644
--- a/draw.h
+++ b/draw.h
@@ -1,32 +1,34 @@
/* See LICENSE file for copyright and license details. */
-#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG])
-#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG])
-
-enum { ColBG, ColFG, ColBorder, ColLast };
-
typedef struct {
int x, y, w, h;
- Bool invert;
Display *dpy;
GC gc;
Pixmap canvas;
+ XftDraw *xftdraw;
struct {
int ascent;
int descent;
int height;
XFontSet set;
XFontStruct *xfont;
+ XftFont *xft_font;
} font;
} DC; /* draw context */
+typedef struct {
+ unsigned long FG;
+ XftColor FG_xft;
+ unsigned long BG;
+} ColorSet;
+
unsigned long getcolor(DC *dc, const char *colstr);
void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h,
Bool fill, unsigned long color);
-void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
-void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
-void initfont(DC *dc, const char *fontstr);
+void drawtext(DC *dc, const char *text, ColorSet col);
+void drawtextn(DC *dc, const char *text, size_t n, ColorSet col);
void freedc(DC *dc);
DC *initdc(void);
+void loadfont(DC *dc, const char *fontstr);
void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
void resizedc(DC *dc, unsigned int w, unsigned int h);
int textnw(DC *dc, const char *text, size_t len);
Received on Sun Nov 21 2010 - 04:56:53 CET
This archive was generated by hypermail 2.2.0 : Sun Nov 21 2010 - 05:00:04 CET