diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/pango.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/pango.h b/include/pango.h index 93affc23..2f14d2bb 100644 --- a/include/pango.h +++ b/include/pango.h | |||
@@ -17,7 +17,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, | |||
17 | const char *text, double scale, bool markup); | 17 | const char *text, double scale, bool markup); |
18 | void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, | 18 | void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, |
19 | int *baseline, double scale, bool markup, const char *fmt, ...); | 19 | int *baseline, double scale, bool markup, const char *fmt, ...); |
20 | void get_text_metrics(const char *font, int *height, int *baseline); | 20 | void get_text_metrics(const PangoFontDescription *font, int *height, int *baseline); |
21 | void render_text(cairo_t *cairo, const char *font, | 21 | void render_text(cairo_t *cairo, const char *font, |
22 | double scale, bool markup, const char *fmt, ...); | 22 | double scale, bool markup, const char *fmt, ...); |
23 | 23 | ||
diff --git a/include/sway/config.h b/include/sway/config.h index 05678c33..8939af00 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #include "sway/input/tablet.h" | 17 | #include "sway/input/tablet.h" |
18 | #include "sway/tree/root.h" | 18 | #include "sway/tree/root.h" |
19 | #include "wlr-layer-shell-unstable-v1-protocol.h" | 19 | #include "wlr-layer-shell-unstable-v1-protocol.h" |
20 | #include <pango/pangocairo.h> | ||
20 | 21 | ||
21 | // TODO: Refactor this shit | 22 | // TODO: Refactor this shit |
22 | 23 | ||
@@ -504,7 +505,8 @@ struct sway_config { | |||
504 | char *floating_scroll_right_cmd; | 505 | char *floating_scroll_right_cmd; |
505 | enum sway_container_layout default_orientation; | 506 | enum sway_container_layout default_orientation; |
506 | enum sway_container_layout default_layout; | 507 | enum sway_container_layout default_layout; |
507 | char *font; | 508 | char *font; // Use mostly for IPC. |
509 | PangoFontDescription *font_description; // Used internally for rendering and validating. | ||
508 | int font_height; | 510 | int font_height; |
509 | int font_baseline; | 511 | int font_baseline; |
510 | bool pango_markup; | 512 | bool pango_markup; |