From 199f1c60ff13f0ca81a6594373773f0048b52529 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 28 Jan 2022 14:47:36 +0100 Subject: [PATCH] [draw] enum screen_char_attr -> screen_char_attr_T --- src/bfu/menu.c | 2 +- src/document/dom/util.c | 2 +- src/terminal/draw.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bfu/menu.c b/src/bfu/menu.c index 47184476..a381ae46 100644 --- a/src/bfu/menu.c +++ b/src/bfu/menu.c @@ -404,7 +404,7 @@ draw_menu_left_text_hk(struct terminal *term, char *text, { struct color_pair *hk_color = get_bfu_color(term, "menu.hotkey.normal"); struct color_pair *hk_color_sel = get_bfu_color(term, "menu.hotkey.selected"); - enum screen_char_attr hk_attr = get_opt_bool("ui.dialogs.underline_hotkeys", NULL) + screen_char_attr_T hk_attr = get_opt_bool("ui.dialogs.underline_hotkeys", NULL) ? SCREEN_ATTR_UNDERLINE : 0; unsigned char c; int xbase = x + L_TEXT_SPACE; diff --git a/src/document/dom/util.c b/src/document/dom/util.c index 9df52f2e..030d94db 100644 --- a/src/document/dom/util.c +++ b/src/document/dom/util.c @@ -29,7 +29,7 @@ static inline void init_template(struct screen_char *template_, struct document_options *options, - enum screen_char_attr attr, color_T foreground, color_T background) + screen_char_attr_T attr, color_T foreground, color_T background) { struct text_style style = INIT_TEXT_STYLE((int)attr, foreground, background); diff --git a/src/terminal/draw.h b/src/terminal/draw.h index b7f60e60..b8d04885 100644 --- a/src/terminal/draw.h +++ b/src/terminal/draw.h @@ -38,6 +38,8 @@ enum screen_char_attr { SCREEN_ATTR_FRAME = 0x80, }; +typedef unsigned short screen_char_attr_T; + /** One position in the terminal screen's image. */ struct screen_char { /** Contains either character value or frame data.