diff options
| -rw-r--r-- | calmwm.h | 9 | ||||
| -rw-r--r-- | font.c | 18 |
2 files changed, 22 insertions, 5 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.h,v 1.111 2009/12/15 03:24:36 okan Exp $ + * $Id: calmwm.h,v 1.112 2009/12/15 03:26:22 okan Exp $ */ #ifndef _CALMWM_H_ @@ -516,16 +516,15 @@ void group_sticky_toggle_exit(struct client_ctx *); void group_autogroup(struct client_ctx *); 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 *); int font_width(struct screen_ctx *, const char *, int); void font_draw(struct screen_ctx *, const char *, int, Drawable, int, int); 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 */ extern Display *X_Dpy; @@ -18,6 +18,24 @@ #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 font_init(struct screen_ctx *sc) { |