font: split out of draw

Signed-off-by: Julien Danjou <julien@danjou.info>

CMakeLists.txt

@@ -64,6 +64,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/window.c
     ${SOURCE_DIR}/image.c
     ${SOURCE_DIR}/draw.c
+    ${SOURCE_DIR}/font.c
     ${SOURCE_DIR}/color.c
     ${SOURCE_DIR}/timer.c
     ${SOURCE_DIR}/common/buffer.c

client.h

@@ -25,6 +25,7 @@
 #include "mouse.h"
 #include "stack.h"
 #include "strut.h"
+#include "draw.h"
 #include "common/luaobject.h"
 
 #define CLIENT_SELECT_INPUT_EVENT_MASK (XCB_EVENT_MASK_STRUCTURE_NOTIFY \

draw.c

@@ -89,57 +89,6 @@ draw_iso2utf8(const char *iso, size_t len, char **dest, ssize_t *dlen)
     return true;
 }
 
-/** Create a new Pango font.
- * \param fontname Pango fontname (e.g. [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]).
- * \return A new font.
- */
-font_t *
-draw_font_new(const char *fontname)
-{
-    cairo_surface_t *surface;
-    xcb_screen_t *s = xutil_screen_get(globalconf.connection, globalconf.default_screen);
-    cairo_t *cr;
-    PangoLayout *layout;
-    font_t *font = p_new(font_t, 1);
-
-    /* Create a dummy cairo surface, cairo context and pango layout in
-     * order to get font informations */
-    surface = cairo_xcb_surface_create(globalconf.connection,
-                                       globalconf.default_screen,
-                                       globalconf.screens.tab[0].visual,
-                                       s->width_in_pixels,
-                                       s->height_in_pixels);
-
-    cr = cairo_create(surface);
-    layout = pango_cairo_create_layout(cr);
-
-    /* Get the font description used to set text on a PangoLayout */
-    font->desc = pango_font_description_from_string(fontname);
-    pango_layout_set_font_description(layout, font->desc);
-
-    /* Get height */
-    pango_layout_get_pixel_size(layout, NULL, &font->height);
-
-    g_object_unref(layout);
-    cairo_destroy(cr);
-    cairo_surface_destroy(surface);
-
-    return font;
-}
-
-/** Delete a font.
- * \param font Font to delete.
- */
-void
-draw_font_delete(font_t **font)
-{
-    if(*font)
-    {
-        pango_font_description_free((*font)->desc);
-        p_delete(font);
-    }
-}
-
 /** Initialize a draw_text_context_t with text data.
  * \param data The draw text context to init.
  * \param str The text string to render.

draw.h

@@ -67,12 +67,6 @@ struct area_t
 #define AREA_RIGHT(a)   ((a).x + (a).width)
 #define AREA_BOTTOM(a)    ((a).y + (a).height)
 
-typedef struct
-{
-    PangoFontDescription *desc;
-    int height;
-} font_t;
-
 typedef struct
 {
     xcb_pixmap_t pixmap;
@@ -112,9 +106,6 @@ draw_context_wipe(draw_context_t *ctx)
     }
 }
 
-font_t *draw_font_new(const char *);
-void draw_font_delete(font_t **);
-
 bool draw_iso2utf8(const char *, size_t, char **, ssize_t *);
 
 /** Convert a string to UTF-8.

font.c

@@ -0,0 +1,81 @@
+/*
+ * font.c - font functions
+ *
+ * Copyright © 2007-2009 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <cairo/cairo-xcb.h>
+#include <pango/pangocairo.h>
+
+#include "font.h"
+#include "screen.h"
+#include "globalconf.h"
+#include "common/xutil.h"
+
+/** Create a new Pango font.
+ * \param fontname Pango fontname (e.g. [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]).
+ * \return A new font.
+ */
+font_t *
+draw_font_new(const char *fontname)
+{
+    cairo_surface_t *surface;
+    xcb_screen_t *s = xutil_screen_get(globalconf.connection, globalconf.default_screen);
+    cairo_t *cr;
+    PangoLayout *layout;
+    font_t *font = p_new(font_t, 1);
+
+    /* Create a dummy cairo surface, cairo context and pango layout in
+     * order to get font informations */
+    surface = cairo_xcb_surface_create(globalconf.connection,
+                                       globalconf.default_screen,
+                                       globalconf.screens.tab[0].visual,
+                                       s->width_in_pixels,
+                                       s->height_in_pixels);
+
+    cr = cairo_create(surface);
+    layout = pango_cairo_create_layout(cr);
+
+    /* Get the font description used to set text on a PangoLayout */
+    font->desc = pango_font_description_from_string(fontname);
+    pango_layout_set_font_description(layout, font->desc);
+
+    /* Get height */
+    pango_layout_get_pixel_size(layout, NULL, &font->height);
+
+    g_object_unref(layout);
+    cairo_destroy(cr);
+    cairo_surface_destroy(surface);
+
+    return font;
+}
+
+/** Delete a font.
+ * \param font Font to delete.
+ */
+void
+draw_font_delete(font_t **font)
+{
+    if(*font)
+    {
+        pango_font_description_free((*font)->desc);
+        p_delete(font);
+    }
+}
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

font.h

@@ -0,0 +1,37 @@
+/*
+ * font.h - font functions header
+ *
+ * Copyright © 2009 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef AWESOME_FONT_H
+#define AWESOME_FONT_H
+
+#include <pango/pango-font.h>
+
+typedef struct
+{
+    PangoFontDescription *desc;
+    int height;
+} font_t;
+
+font_t *draw_font_new(const char *);
+void draw_font_delete(font_t **);
+
+#endif
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

globalconf.h

@@ -31,7 +31,8 @@
 #include <xcb/xcb_keysyms.h>
 
 #include "key.h"
-#include "draw.h"
+#include "color.h"
+#include "font.h"
 #include "common/xembed.h"
 
 typedef struct wibox_t wibox_t;

screen.h

@@ -23,6 +23,7 @@
 #define AWESOME_SCREEN_H
 
 #include "globalconf.h"
+#include "draw.h"
 
 struct a_screen
 {

widget.h

@@ -23,6 +23,7 @@
 #define AWESOME_WIDGET_H
 
 #include "button.h"
+#include "draw.h"
 #include "common/tokenize.h"
 
 typedef widget_t *(widget_constructor_t)(widget_t *);

window.h

@@ -1,7 +1,7 @@
 /*
  * window.h - window handling functions header
  *
- * Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
+ * Copyright © 2007-2009 Julien Danjou <julien@danjou.info>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #define AWESOME_WINDOW_H
 
 #include "globalconf.h"
+#include "draw.h"
 
 void window_state_set(xcb_window_t, long);
 xcb_get_property_cookie_t window_state_get_unchecked(xcb_window_t);