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

rid ourselves of these functional macros; convert to real functions.

Browse Source 
ok oga@
This commit is contained in:
okan 2009-12-15 03:26:22 +00:00
parent 597cb25820
commit 2ad2b5f31d
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calmwm.h
View File

@ -516,16 +516,15 @@ void group_sticky_toggle_exit(struct client_ctx *);
void group_autogroup(struct client_ctx *); void group_autogroup(struct client_ctx *);
void group_movetogroup(struct client_ctx *, int); void group_movetogroup(struct client_ctx *, int);
int font_ascent(struct screen_ctx *);
int font_descent(struct screen_ctx *);
u_int font_height(struct screen_ctx *);
void font_init(struct screen_ctx *); void font_init(struct screen_ctx *);
int font_width(struct screen_ctx *, const char *, int); int font_width(struct screen_ctx *, const char *, int);
void font_draw(struct screen_ctx *, const char *, int, void font_draw(struct screen_ctx *, const char *, int,
Drawable, int, int); Drawable, int, int);
XftFont *font_make(struct screen_ctx *, const char *); XftFont *font_make(struct screen_ctx *, const char *);
#define font_ascent(sc) sc->font->ascent
#define font_descent(sc) sc->font->descent
#define font_height(sc) sc->fontheight
/* Externs */ /* Externs */
extern Display *X_Dpy; extern Display *X_Dpy;

18
font.c
View File

@ -18,6 +18,24 @@
#include "calmwm.h" #include "calmwm.h"
int
font_ascent(struct screen_ctx *sc)
{
return (sc->font->ascent);
}
int
font_descent(struct screen_ctx *sc)
{
return (sc->font->descent);
}
u_int
font_height(struct screen_ctx *sc)
{
return (sc->fontheight);
}
void void
font_init(struct screen_ctx *sc) font_init(struct screen_ctx *sc)
{ {