diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-03-19 07:26:25 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-03-19 07:26:25 +0000 |
| commit | 60cbb9ee92058b7d52bf2a4542c64c7858b00cdd (patch) | |
| tree | 8bc1be9b67f196267c431697ca7755c5d857a522 /render | |
| parent | a75829699ba5f7e9e6746ae68a04aec38406433a (diff) | |
kill the const, use g_new instead of malloc, g_free the font in font_close()
Diffstat (limited to 'render')
| -rw-r--r-- | render/font.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/render/font.c b/render/font.c index 157b0c7e..4e38de24 100644 --- a/render/font.c +++ b/render/font.c @@ -1,11 +1,12 @@ -#include <stdlib.h> -#include <X11/Xft/Xft.h> #include "../kernel/openbox.h" #include "font.h" #include "../src/gettext.h" #define _(str) gettext(str) +#include <X11/Xft/Xft.h> +#include <glib.h> + void font_startup(void) { #ifdef DEBUG @@ -44,7 +45,7 @@ ObFont *font_open(char *fontstring) XftFont *xf; if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) { - out = malloc(sizeof(ObFont)); + out = g_new(ObFont, 1); out->xftfont = xf; measure_height(out); return out; @@ -53,7 +54,7 @@ ObFont *font_open(char *fontstring) g_warning(_("Trying fallback font: %s\n"), "fixed"); if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) { - out = malloc(sizeof(ObFont)); + out = g_new(ObFont, 1); out->xftfont = xf; measure_height(out); return out; @@ -67,9 +68,10 @@ ObFont *font_open(char *fontstring) void font_close(ObFont *f) { XftFontClose(ob_display, f->xftfont); + g_free(f); } -int font_measure_string(ObFont *f, const char *str, int shadow, int offset) +int font_measure_string(ObFont *f, char *str, int shadow, int offset) { XGlyphInfo info; |