[hackers] [dwm] reverting to plain X11 fonts in order to implement draw.c default || anselm

From: <hg_AT_suckless.org>
Date: Sun, 18 Nov 2012 10:56:46 +0100 (CET)

changeset: 1611:1166b378cfa8
tag: tip
user: anselm_AT_garbe.us
date: Sun Nov 18 10:56:54 2012 +0100
files: config.def.h config.mk dwm.c
description:
reverting to plain X11 fonts in order to implement draw.c default


diff -r 0faf5566b925 -r 1166b378cfa8 config.def.h
--- a/config.def.h Sat Nov 17 20:04:04 2012 +0100
+++ b/config.def.h Sun Nov 18 10:56:54 2012 +0100
_AT_@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
 static const char normbordercolor[] = "#444444";
 static const char normbgcolor[] = "#222222";
 static const char normfgcolor[] = "#bbbbbb";
diff -r 0faf5566b925 -r 1166b378cfa8 config.mk
--- a/config.mk Sat Nov 17 20:04:04 2012 +0100
+++ b/config.mk Sun Nov 18 10:56:54 2012 +0100
_AT_@ -15,8 +15,8 @@
 XINERAMAFLAGS = -DXINERAMA
 
 # includes and libs
-INCS = -I${X11INC} -I/usr/include/freetype2
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} -lutil -lXext -lXft -lfontconfig
+INCS = -I${X11INC}
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
 CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff -r 0faf5566b925 -r 1166b378cfa8 dwm.c
--- a/dwm.c Sat Nov 17 20:04:04 2012 +0100
+++ b/dwm.c Sun Nov 18 10:56:54 2012 +0100
_AT_@ -37,8 +37,6 @@
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
-#include <fontconfig/fontconfig.h>
-#include <X11/Xft/Xft.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif /* XINERAMA */
_AT_@ -104,15 +102,16 @@
 
 typedef struct {
         int x, y, w, h;
- XftColor norm[ColLast];
- XftColor sel[ColLast];
+ unsigned long norm[ColLast];
+ unsigned long sel[ColLast];
         Drawable drawable;
         GC gc;
         struct {
                 int ascent;
                 int descent;
                 int height;
- XftFont *xfont;
+ XFontSet set;
+ XFontStruct *xfont;
         } font;
 } DC; /* draw context */
 
_AT_@ -182,15 +181,15 @@
 static Monitor *dirtomon(int dir);
 static void drawbar(Monitor *m);
 static void drawbars(void);
-static void drawsquare(Bool filled, Bool empty, Bool invert, XftColor col[ColLast]);
-static void drawtext(const char *text, XftColor col[ColLast], Bool invert);
+static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 static void enternotify(XEvent *e);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
-static XftColor getcolor(const char *colstr);
+static unsigned long getcolor(const char *colstr);
 static Bool getrootptr(int *x, int *y);
 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
_AT_@ -490,6 +489,10 @@
         for(m = mons; m; m = m->next)
                 while(m->stack)
                         unmanage(m->stack, False);
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ else
+ XFreeFont(dpy, dc.font.xfont);
         XUngrabKey(dpy, AnyKey, AnyModifier, root);
         XFreePixmap(dpy, dc.drawable);
         XFreeGC(dpy, dc.gc);
_AT_@ -722,7 +725,7 @@
 drawbar(Monitor *m) {
         int x;
         unsigned int i, occ = 0, urg = 0;
- XftColor *col;
+ unsigned long *col;
         Client *c;
 
         for(c = m->clients; c; c = c->next) {
_AT_@ -777,10 +780,10 @@
 }
 
 void
-drawsquare(Bool filled, Bool empty, Bool invert, XftColor col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
         int x;
 
- XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG].pixel);
+ XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
         x = (dc.font.ascent + dc.font.descent + 2) / 4;
         if(filled)
                 XFillRectangle(dpy, dc.drawable, dc.gc, dc.x+1, dc.y+1, x+1, x+1);
_AT_@ -789,12 +792,11 @@
 }
 
 void
-drawtext(const char *text, XftColor col[ColLast], Bool invert) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
         char buf[256];
         int i, x, y, h, len, olen;
- XftDraw *d;
 
- XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG].pixel);
+ XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
         XFillRectangle(dpy, dc.drawable, dc.gc, dc.x, dc.y, dc.w, dc.h);
         if(!text)
                 return;
_AT_@ -809,11 +811,11 @@
         memcpy(buf, text, len);
         if(len < olen)
                 for(i = len; i && i > len - 3; buf[--i] = '.');
-
- d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen));
-
- XftDrawStringUtf8(d, &col[invert ? ColBG : ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len);
- XftDrawDestroy(d);
+ XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
+ if(dc.font.set)
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+ else
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
 void
_AT_@ -859,7 +861,7 @@
                 detachstack(c);
                 attachstack(c);
                 grabbuttons(c, True);
- XSetWindowBorder(dpy, c->win, dc.sel[ColBorder].pixel);
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                 setfocus(c);
         }
         else {
_AT_@ -933,14 +935,14 @@
         return atom;
 }
 
-XftColor
+unsigned long
 getcolor(const char *colstr) {
- XftColor color;
+ Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
 
- if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color))
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
                 die("error, cannot allocate color '%s'\n", colstr);
-
- return color;
+ return color.pixel;
 }
 
 Bool
_AT_@ -1041,13 +1043,35 @@
 
 void
 initfont(const char *fontstr) {
+ char *def, **missing;
+ int n;
 
- if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr))
- && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed")))
- die("error, cannot load font: '%s'\n", fontstr);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(missing) {
+ while(n--)
+ fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
+ XFreeStringList(missing);
+ }
+ if(dc.font.set) {
+ XFontStruct **xfonts;
+ char **font_names;
 
- dc.font.ascent = dc.font.xfont->ascent;
- dc.font.descent = dc.font.xfont->descent;
+ dc.font.ascent = dc.font.descent = 0;
+ XExtentsOfFontSet(dc.font.set);
+ n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+ while(n--) {
+ dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+ dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
+ xfonts++;
+ }
+ }
+ else {
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+ && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+ die("error, cannot load font: '%s'\n", fontstr);
+ dc.font.ascent = dc.font.xfont->ascent;
+ dc.font.descent = dc.font.xfont->descent;
+ }
         dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
_AT_@ -1132,7 +1156,7 @@
 
         wc.border_width = c->bw;
         XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, dc.norm[ColBorder].pixel);
+ XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
         configure(c); /* propagates border_width, if size doesn't change */
         updatewindowtype(c);
         updatesizehints(c);
_AT_@ -1622,6 +1646,8 @@
         dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
         dc.gc = XCreateGC(dpy, root, 0, NULL);
         XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ if(!dc.font.set)
+ XSetFont(dpy, dc.gc, dc.font.xfont->fid);
         /* init bars */
         updatebars();
         updatestatus();
_AT_@ -1694,9 +1720,13 @@
 
 int
 textnw(const char *text, unsigned int len) {
- XGlyphInfo ext;
- XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext);
- return ext.xOff;
+ XRectangle r;
+
+ if(dc.font.set) {
+ XmbTextExtents(dc.font.set, text, len, NULL, &r);
+ return r.width;
+ }
+ return XTextWidth(dc.font.xfont, text, len);
 }
 
 void
_AT_@ -1776,7 +1806,7 @@
         if(!c)
                 return;
         grabbuttons(c, False);
- XSetWindowBorder(dpy, c->win, dc.norm[ColBorder].pixel);
+ XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
         if(setfocus) {
                 XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                 XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
Received on Sun Nov 18 2012 - 10:56:46 CET

This archive was generated by hypermail 2.3.0 : Sun Nov 18 2012 - 11:00:09 CET