From 6f166676c7cbd9fd572ffa2938f3737436a10f42 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sat, 21 Sep 2024 13:17:36 +0200 Subject: PDCurses/WinGUI: fixed Unicode icons on win32 * Turns out that "%C" in wprintw() does not work with non-ANSI chars. * We still don't want to introduce the Curses widechar API, so I added teco_curses_add_wc() as a replacement for wadd_wch(). --- src/interface-curses/interface.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/interface-curses/interface.c') diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c index bf7770d..f4b2796 100644 --- a/src/interface-curses/interface.c +++ b/src/interface-curses/interface.c @@ -976,11 +976,14 @@ teco_interface_draw_info(void) const gchar *info_type_str; + waddstr(teco_interface.info_window, PACKAGE_NAME " "); + switch (teco_interface.info_type) { case TECO_INFO_TYPE_QREG: info_type_str = PACKAGE_NAME " - "; - wprintw(teco_interface.info_window, "%s %C ", PACKAGE_NAME, - teco_ed & TECO_ED_ICONS ? TECO_CURSES_ICONS_QREG : '-'); + teco_curses_add_wc(teco_interface.info_window, + teco_ed & TECO_ED_ICONS ? TECO_CURSES_ICONS_QREG : '-'); + waddstr(teco_interface.info_window, " "); /* same formatting as in command lines */ teco_curses_format_str(teco_interface.info_window, teco_interface.info_current.data, @@ -990,8 +993,9 @@ teco_interface_draw_info(void) case TECO_INFO_TYPE_BUFFER: info_type_str = PACKAGE_NAME " - "; g_assert(!teco_string_contains(&teco_interface.info_current, '\0')); - wprintw(teco_interface.info_window, "%s %C ", PACKAGE_NAME, - teco_ed & TECO_ED_ICONS ? teco_curses_icons_lookup_file(teco_interface.info_current.data) : '-'); + teco_curses_add_wc(teco_interface.info_window, + teco_ed & TECO_ED_ICONS ? teco_curses_icons_lookup_file(teco_interface.info_current.data) : '-'); + waddstr(teco_interface.info_window, " "); teco_curses_format_filename(teco_interface.info_window, teco_interface.info_current.data, getmaxx(teco_interface.info_window) - -- cgit v1.2.3