xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use default values for ncurses options when not specified

Browse Source
This commit is contained in:
Maxime Coste 2015-04-06 20:05:49 +01:00
parent b7144fff6c
commit 87b385b956
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ncurses_ui.cc
View File

@ -867,31 +867,36 @@ void NCursesUI::set_ui_options(const Options& options)
{ {
{ {
auto it = options.find("ncurses_assistant"); auto it = options.find("ncurses_assistant");
if (it != options.end()) if (it == options.end())
{ m_assistant = assistant_clippy;
if (it->second == "cat") else if (it->second == "cat")
m_assistant = assistant_cat; m_assistant = assistant_cat;
else if (it->second == "clippy") else if (it->second == "clippy")
m_assistant = assistant_clippy; m_assistant = assistant_clippy;
else if (it->second == "none" or it->second == "off") else if (it->second == "none" or it->second == "off")
m_assistant = ConstArrayView<StringView>{}; m_assistant = ConstArrayView<StringView>{};
} }
}
{ {
auto it = options.find("ncurses_status_on_top"); auto it = options.find("ncurses_status_on_top");
if (it != options.end()) if (it == options.end())
m_status_on_top = false;
else
m_status_on_top = it->second == "yes" or it->second == "true"; m_status_on_top = it->second == "yes" or it->second == "true";
} }
{ {
auto wheel_down_it = options.find("ncurses_wheel_down_button"); auto wheel_down_it = options.find("ncurses_wheel_down_button");
if (wheel_down_it != options.end()) try { if (wheel_down_it == options.end())
m_wheel_down_button = 2;
else try {
m_wheel_down_button = str_to_int(wheel_down_it->second);; m_wheel_down_button = str_to_int(wheel_down_it->second);;
} catch(...) {} } catch(...) {}
auto wheel_up_it = options.find("ncurses_wheel_up_button"); auto wheel_up_it = options.find("ncurses_wheel_up_button");
if (wheel_up_it != options.end()) try { if (wheel_up_it == options.end())
m_wheel_up_button = 4;
else try {
m_wheel_up_button = str_to_int(wheel_up_it->second);; m_wheel_up_button = str_to_int(wheel_up_it->second);;
} catch(...) {} } catch(...) {}
} }