diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-08-17 09:59:52 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-08-17 09:59:52 +0000 |
| commit | d21c4a02a030b63bc8cf04b40abed137a956b14d (patch) | |
| tree | 266fc7199ac5a9d9782f1367a806e4b17fa30b3b /font.h | |
| parent | vt: remove support for urxvt 'extended' line drawing character set (diff) | |
| parent | shm/render: there's no need to have one pixman image per thread (diff) | |
Merge branch 'pixman'
Diffstat (limited to 'font.h')
| -rw-r--r-- | font.h | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -7,7 +7,7 @@ #include FT_FREETYPE_H #include FT_LCD_FILTER_H #include <fontconfig/fontconfig.h> -#include <cairo.h> +#include <pixman.h> #include "tllist.h" //#include "terminal.h" @@ -16,13 +16,14 @@ typedef tll(const char *) font_list_t; struct glyph { wchar_t wc; - int width; + int cols; - cairo_surface_t *surf; - int left; - int top; + pixman_image_t *pix; + int x; + int y; + int width; + int height; - double pixel_size_fixup; bool valid; }; @@ -40,13 +41,13 @@ struct font { double pixel_size_fixup; /* Scale factor - should only be used with ARGB32 glyphs */ struct { - double position; - double thickness; + int position; + int thickness; } underline; struct { - double position; - double thickness; + int position; + int thickness; } strikeout; bool is_fallback; |
