all repos — openbox @ 60cbb9ee92058b7d52bf2a4542c64c7858b00cdd

openbox fork - make it a bit more like ryudo 

kill the const, use g_new instead of malloc, g_free the font in font_close()
Dana Jansens danakj@orodu.net
commit

60cbb9ee92058b7d52bf2a4542c64c7858b00cdd

parent

a75829699ba5f7e9e6746ae68a04aec38406433a

1 files changed, 7 insertions(+), 5 deletions(-)

jump to
M render/font.c → render/font.c 
@@ -1,10 +1,11 @@ 
-#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)
 {

@@ -44,7 +45,7 @@ ObFont *out;
     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 @@ g_warning(_("Unable to load font: %s\n"), 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 @@ 
 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;