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

menu commands has a -select-cmds option

Browse Source 
when this option is given, menu expect three argument per entry
instead of two, the last one being the command to run when the
entry is selected, but not yet validated.
This commit is contained in:
Maxime Coste 2012-12-15 19:11:22 +01:00
parent df14427210
commit 43ad920bd8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/commands.cc
View File

@ -575,13 +575,17 @@ void eval_string(const CommandParameters& params, Context& context)
void menu(const CommandParameters& params, Context& context) void menu(const CommandParameters& params, Context& context)
{ {
ParametersParser parser(params, { { "auto-single", false } }); ParametersParser parser(params, { { "auto-single", false },
{ "select-cmds", false } });
size_t count = parser.positional_count(); const bool with_select_cmds = parser.has_option("select-cmds");
if (count == 0 or (count % 2) != 0) const size_t modulo = with_select_cmds ? 3 : 2;
const size_t count = parser.positional_count();
if (count == 0 or (count % modulo) != 0)
throw wrong_argument_count(); throw wrong_argument_count();
if (count == 2 and parser.has_option("auto-single")) if (count == modulo and parser.has_option("auto-single"))
{ {
CommandManager::instance().execute(parser[1], context); CommandManager::instance().execute(parser[1], context);
return; return;
@ -589,16 +593,21 @@ void menu(const CommandParameters& params, Context& context)
std::vector<String> choices; std::vector<String> choices;
std::vector<String> commands; std::vector<String> commands;
for (int i = 0; i < count; i += 2) std::vector<String> select_cmds;
for (int i = 0; i < count; i += modulo)
{ {
choices.push_back(parser[i]); choices.push_back(parser[i]);
commands.push_back(parser[i+1]); commands.push_back(parser[i+1]);
if (with_select_cmds)
select_cmds.push_back(parser[i+2]);
} }
context.input_handler().menu(choices, context.input_handler().menu(choices,
[=](int choice, MenuEvent event, Context& context) { [=](int choice, MenuEvent event, Context& context) {
if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size()) if (event == MenuEvent::Validate and choice >= 0 and choice < commands.size())
CommandManager::instance().execute(commands[choice], context); CommandManager::instance().execute(commands[choice], context);
if (event == MenuEvent::Select and choice >= 0 and choice < select_cmds.size())
CommandManager::instance().execute(select_cmds[choice], context);
}, context); }, context);
} }