nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kill the const, use g_new instead of malloc, g_free the font in font_close()

Browse source
This commit is contained in:
Dana Jansens 2003-03-19 07:26:25 +00:00
parent a75829699b
commit 60cbb9ee92
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
render/font.c
View file

@ -1,11 +1,12 @@
#include <stdlib.h>
#include <X11/Xft/Xft.h>
#include "../kernel/openbox.h" #include "../kernel/openbox.h"
#include "font.h" #include "font.h"
#include "../src/gettext.h" #include "../src/gettext.h"
#define _(str) gettext(str) #define _(str) gettext(str)
#include <X11/Xft/Xft.h>
#include <glib.h>
void font_startup(void) void font_startup(void)
{ {
#ifdef DEBUG #ifdef DEBUG
@ -44,7 +45,7 @@ ObFont *font_open(char *fontstring)
XftFont *xf; XftFont *xf;
if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) { if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
out = malloc(sizeof(ObFont)); out = g_new(ObFont, 1);
out->xftfont = xf; out->xftfont = xf;
measure_height(out); measure_height(out);
return out; return out;
@ -53,7 +54,7 @@ ObFont *font_open(char *fontstring)
g_warning(_("Trying fallback font: %s\n"), "fixed"); g_warning(_("Trying fallback font: %s\n"), "fixed");
if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) { if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
out = malloc(sizeof(ObFont)); out = g_new(ObFont, 1);
out->xftfont = xf; out->xftfont = xf;
measure_height(out); measure_height(out);
return out; return out;
@ -67,9 +68,10 @@ ObFont *font_open(char *fontstring)
void font_close(ObFont *f) void font_close(ObFont *f)
{ {
XftFontClose(ob_display, f->xftfont); 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; XGlyphInfo info;