mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

screen font -> xftfont

Browse Source
This commit is contained in:
okan 2012-12-17 14:20:52 +00:00
parent 96cd288a2a
commit 980c6de1ff
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.h
View File

@ -220,7 +220,7 @@ struct screen_ctx {
struct cycle_entry_q mruq; struct cycle_entry_q mruq;
XftColor xftcolor[CWM_COLOR_MENU_MAX]; XftColor xftcolor[CWM_COLOR_MENU_MAX];
XftDraw *xftdraw; XftDraw *xftdraw;
XftFont *font; XftFont *xftfont;
int xinerama_no; int xinerama_no;
XineramaScreenInfo *xinerama; XineramaScreenInfo *xinerama;
#define CALMWM_NGROUPS 9 #define CALMWM_NGROUPS 9

14
font.c
View File

@ -33,19 +33,19 @@
int int
font_ascent(struct screen_ctx *sc) font_ascent(struct screen_ctx *sc)
{ {
return (sc->font->ascent); return (sc->xftfont->ascent);
} }
int int
font_descent(struct screen_ctx *sc) font_descent(struct screen_ctx *sc)
{ {
return (sc->font->descent); return (sc->xftfont->descent);
} }
u_int u_int
font_height(struct screen_ctx *sc) font_height(struct screen_ctx *sc)
{ {
return (sc->font->height + 1); return (sc->xftfont->height + 1);
} }
void void
@ -59,8 +59,8 @@ font_init(struct screen_ctx *sc, const char *name, const char **color)
if (sc->xftdraw == NULL) if (sc->xftdraw == NULL)
errx(1, "XftDrawCreate"); errx(1, "XftDrawCreate");
sc->font = XftFontOpenName(X_Dpy, sc->which, name); sc->xftfont = XftFontOpenName(X_Dpy, sc->which, name);
if (sc->font == NULL) if (sc->xftfont == NULL)
errx(1, "XftFontOpenName"); errx(1, "XftFontOpenName");
for (i = 0; i < CWM_COLOR_MENU_MAX; i++) { for (i = 0; i < CWM_COLOR_MENU_MAX; i++) {
@ -88,7 +88,7 @@ font_width(struct screen_ctx *sc, const char *text, int len)
{ {
XGlyphInfo extents; XGlyphInfo extents;
XftTextExtentsUtf8(X_Dpy, sc->font, (const FcChar8*)text, XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)text,
len, &extents); len, &extents);
return (extents.xOff); return (extents.xOff);
@ -102,6 +102,6 @@ font_draw(struct screen_ctx *sc, const char *text, int len,
color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT; color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
XftDrawChange(sc->xftdraw, d); XftDrawChange(sc->xftdraw, d);
XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[color], sc->font, x, y, XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[color], sc->xftfont, x, y,
(const FcChar8*)text, len); (const FcChar8*)text, len);
} }