From fd3e7e30d929c94316df221329fc0294106a2c76 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 13 Aug 2015 19:41:42 +0000 Subject: [PATCH] Separando informações de fonte --- src/include/pw3270/v3270.h | 23 ++++++++++++++++++++++- src/pw3270/v3270/oia.c | 2 +- src/pw3270/v3270/private.h | 22 ---------------------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/include/pw3270/v3270.h b/src/include/pw3270/v3270.h index 2706b15..fb287d6 100644 --- a/src/include/pw3270/v3270.h +++ b/src/include/pw3270/v3270.h @@ -64,7 +64,28 @@ typedef struct _v3270 v3270; typedef struct _v3270Class v3270Class; - typedef struct _v3270FontInfo v3270FontInfo; + + /** + * @brief Informações para desenho de fontes com o cairo. + * + */ + typedef struct _v3270FontInfo { + + guint width; + guint height; + guint ascent; + guint descent; + + guint spacing; + + guint left; + guint top; + + gchar * family; + cairo_font_weight_t weight; + cairo_scaled_font_t * scaled; + + } v3270FontInfo; enum V3270_COLOR { diff --git a/src/pw3270/v3270/oia.c b/src/pw3270/v3270/oia.c index c21de07..e6a4dbb 100644 --- a/src/pw3270/v3270/oia.c +++ b/src/pw3270/v3270/oia.c @@ -226,7 +226,7 @@ static void setup_insert_position(GdkRectangle *rect, v3270FontInfo *metrics, ca -static void setup_double_char_position(GdkRectangle *rect, struct v3270_metrics *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_double_char_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) { rect->width <<= 1; rect->x -= rect->width; diff --git a/src/pw3270/v3270/private.h b/src/pw3270/v3270/private.h index 9dcbdf1..37ea6e7 100644 --- a/src/pw3270/v3270/private.h +++ b/src/pw3270/v3270/private.h @@ -115,28 +115,6 @@ G_BEGIN_DECLS const gchar * message; }; - /** - * @brief Informações para desenho de fontes com o cairo. - * - */ - struct _v3270FontInfo { - - guint width; - guint height; - guint ascent; - guint descent; - - guint spacing; - - guint left; - guint top; - - gchar * family; - cairo_font_weight_t weight; - cairo_scaled_font_t * scaled; - - }; - /*--[ Widget data ]----------------------------------------------------------------------------------*/ struct _v3270 -- libgit2 0.21.2