Commit fd3e7e30d929c94316df221329fc0294106a2c76
1 parent
2ebc6b93
Exists in
master
and in
5 other branches
Separando informações de fonte
Showing
3 changed files
with
23 additions
and
24 deletions
Show diff stats
src/include/pw3270/v3270.h
| ... | ... | @@ -64,7 +64,28 @@ |
| 64 | 64 | |
| 65 | 65 | typedef struct _v3270 v3270; |
| 66 | 66 | typedef struct _v3270Class v3270Class; |
| 67 | - typedef struct _v3270FontInfo v3270FontInfo; | |
| 67 | + | |
| 68 | + /** | |
| 69 | + * @brief Informações para desenho de fontes com o cairo. | |
| 70 | + * | |
| 71 | + */ | |
| 72 | + typedef struct _v3270FontInfo { | |
| 73 | + | |
| 74 | + guint width; | |
| 75 | + guint height; | |
| 76 | + guint ascent; | |
| 77 | + guint descent; | |
| 78 | + | |
| 79 | + guint spacing; | |
| 80 | + | |
| 81 | + guint left; | |
| 82 | + guint top; | |
| 83 | + | |
| 84 | + gchar * family; | |
| 85 | + cairo_font_weight_t weight; | |
| 86 | + cairo_scaled_font_t * scaled; | |
| 87 | + | |
| 88 | + } v3270FontInfo; | |
| 68 | 89 | |
| 69 | 90 | enum V3270_COLOR |
| 70 | 91 | { | ... | ... |
src/pw3270/v3270/oia.c
| ... | ... | @@ -226,7 +226,7 @@ static void setup_insert_position(GdkRectangle *rect, v3270FontInfo *metrics, ca |
| 226 | 226 | |
| 227 | 227 | |
| 228 | 228 | |
| 229 | -static void setup_double_char_position(GdkRectangle *rect, struct v3270_metrics *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) | |
| 229 | +static void setup_double_char_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) | |
| 230 | 230 | { |
| 231 | 231 | rect->width <<= 1; |
| 232 | 232 | rect->x -= rect->width; | ... | ... |
src/pw3270/v3270/private.h
| ... | ... | @@ -115,28 +115,6 @@ G_BEGIN_DECLS |
| 115 | 115 | const gchar * message; |
| 116 | 116 | }; |
| 117 | 117 | |
| 118 | - /** | |
| 119 | - * @brief Informações para desenho de fontes com o cairo. | |
| 120 | - * | |
| 121 | - */ | |
| 122 | - struct _v3270FontInfo { | |
| 123 | - | |
| 124 | - guint width; | |
| 125 | - guint height; | |
| 126 | - guint ascent; | |
| 127 | - guint descent; | |
| 128 | - | |
| 129 | - guint spacing; | |
| 130 | - | |
| 131 | - guint left; | |
| 132 | - guint top; | |
| 133 | - | |
| 134 | - gchar * family; | |
| 135 | - cairo_font_weight_t weight; | |
| 136 | - cairo_scaled_font_t * scaled; | |
| 137 | - | |
| 138 | - }; | |
| 139 | - | |
| 140 | 118 | /*--[ Widget data ]----------------------------------------------------------------------------------*/ |
| 141 | 119 | |
| 142 | 120 | struct _v3270 | ... | ... |