diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-06-20 07:58:51 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-06-20 07:58:51 +0000 |
| commit | 3f32dfa87e08556d7f6a58efab9b7479e515be26 (patch) | |
| tree | 95aba7a2acfefeab50b6f98b6dcad92f4c0a53c7 /render/font.h | |
| parent | 49268650b4564def10eeb0d21d5c0dffa4972857 (diff) | |
this is going to break the kernel/ building.
lots of modifications to the render API, prefixing everything, making proper
names for everything. the structures are not hidden/opaque yet, but the naming scheme of the public API works much better now.
Diffstat (limited to 'render/font.h')
| -rw-r--r-- | render/font.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/render/font.h b/render/font.h index 6a5d4c65..393ac88e 100644 --- a/render/font.h +++ b/render/font.h @@ -1,14 +1,20 @@ #ifndef __font_h #define __font_h +#define _XFT_NO_COMPAT_ /* no Xft 1 API */ #include <X11/Xft/Xft.h> #include "render.h" #include "kernel/geom.h" +struct _RrFont { + XftFont *xftfont; + gint elipses_length; +}; + void font_startup(void); -ObFont *font_open(char *fontstring); -void font_close(ObFont *f); -int font_measure_string(ObFont *f, char *str, int shadow, int offset); -int font_height(ObFont *f, int shadow, int offset); -int font_max_char_width(ObFont *f); -void font_draw(XftDraw *d, TextureText *t, Rect *position); +RrFont *font_open(char *fontstring); +void font_close(RrFont *f); +int font_measure_string(RrFont *f, char *str, int shadow, int offset); +int font_height(RrFont *f, int shadow, int offset); +int font_max_char_width(RrFont *f); +void font_draw(XftDraw *d, RrTextureText *t, Rect *position); #endif /* __font_h */ |
