From 679e9f07711e96f9749f7e2d9f892e32b32b2115 Mon Sep 17 00:00:00 2001 From: Tim Stack Date: Thu, 1 Sep 2022 21:46:59 -0700 Subject: [PATCH] [build] try to fix brew build error --- src/lnav.cc | 4 ++-- src/view_curses.cc | 4 ++-- src/view_curses.hh | 2 +- test/drive_mvwattrline.cc | 2 +- test/drive_view_colors.cc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lnav.cc b/src/lnav.cc index 5c7a01b2..856e119c 100644 --- a/src/lnav.cc +++ b/src/lnav.cc @@ -1191,7 +1191,7 @@ looper() define_key("\033Oc", KEY_END); view_colors& vc = view_colors::singleton(); - view_colors::init(); + view_colors::init(false); auto ecb_guard = lnav_data.ld_exec_context.add_error_callback([](const auto& um) { @@ -2982,7 +2982,7 @@ SELECT tbl_name FROM sqlite_master WHERE sql LIKE 'CREATE VIRTUAL TABLE%' textview_curses *log_tc, *text_tc, *tc; bool output_view = true; - view_colors::init(); + view_colors::init(true); rescan_files(true); if (!lnav_data.ld_active_files.fc_name_to_errors.empty()) { for (const auto& pair : diff --git a/src/view_curses.cc b/src/view_curses.cc index 3f0235bc..588b4eae 100644 --- a/src/view_curses.cc +++ b/src/view_curses.cc @@ -520,10 +520,10 @@ static color_listener _COLOR_LISTENER; term_color_palette* view_colors::vc_active_palette; void -view_colors::init() +view_colors::init(bool headless) { vc_active_palette = ansi_colors(); - if (has_colors()) { + if (!headless && has_colors()) { start_color(); if (lnav_config.lc_ui_default_colors) { diff --git a/src/view_curses.hh b/src/view_curses.hh index c6687369..8f0c3ebd 100644 --- a/src/view_curses.hh +++ b/src/view_curses.hh @@ -210,7 +210,7 @@ public: * called before this method, but the returned attributes cannot be used * with curses code until this method is called. */ - static void init(); + static void init(bool headless); void init_roles(const lnav_theme& lt, lnav_config_listener::error_reporter& reporter); diff --git a/test/drive_mvwattrline.cc b/test/drive_mvwattrline.cc index 340902c7..51bddb18 100644 --- a/test/drive_mvwattrline.cc +++ b/test/drive_mvwattrline.cc @@ -61,7 +61,7 @@ main(int argc, char* argv[]) curs_set(0); noecho(); - view_colors::singleton().init(); + view_colors::singleton().init(false); al.with_string("Plain text"); view_curses::mvwattrline(win, y++, 0, al, lr); diff --git a/test/drive_view_colors.cc b/test/drive_view_colors.cc index 344bafe9..f7b38c10 100644 --- a/test/drive_view_colors.cc +++ b/test/drive_view_colors.cc @@ -92,7 +92,7 @@ main(int argc, char* argv[]) } } - view_colors::init(); + view_colors::init(false); curs_set(0); tc.tc_window = win; tc.do_update();