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

eval and exec can use a -try-client option

Browse Source 
When -try-client <client_name> is used, the context used for the
command is either the given client's context if the client is found,
or the  current one if not.
This commit is contained in:
Maxime Coste 2013-12-07 13:44:23 +00:00
parent 05d0397936
commit 0b473ffe58
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/commands.cc
View File

@ -551,17 +551,25 @@ void map_key(CommandParameters params, Context& context)
template<typename Func> template<typename Func>
void context_wrap(CommandParameters params, Context& context, Func func) void context_wrap(CommandParameters params, Context& context, Func func)
{ {
ParametersParser parser(params, { { "client", true }, { "draft", false }, { "itersel", false } }, ParametersParser parser(params, { { "client", true }, { "try-client", true },
{ "draft", false }, { "itersel", false } },
ParametersParser::Flags::OptionsOnlyAtStart, 1); ParametersParser::Flags::OptionsOnlyAtStart, 1);
Context& real_context = parser.has_option("client") ? ClientManager& cm = ClientManager::instance();
ClientManager::instance().get_client(parser.option_value("client")).context() Context* real_context = &context;
: context; if (parser.has_option("client"))
real_context = &cm.get_client(parser.option_value("client")).context();
else if (parser.has_option("try-client"))
{
Client* client = cm.get_client_ifp(parser.option_value("try-client"));
if (client)
real_context = &client->context();
}
if (parser.has_option("draft")) if (parser.has_option("draft"))
{ {
Editor& editor = real_context.editor(); Editor& editor = real_context->editor();
InputHandler input_handler(editor, real_context.name()); InputHandler input_handler(editor, real_context->name());
DynamicSelectionList sels{editor.buffer(), editor.selections()}; DynamicSelectionList sels{editor.buffer(), editor.selections()};
auto restore_sels = on_scope_end([&]{ editor.select(sels); }); auto restore_sels = on_scope_end([&]{ editor.select(sels); });
@ -580,12 +588,12 @@ void context_wrap(CommandParameters params, Context& context, Func func)
{ {
if (parser.has_option("itersel")) if (parser.has_option("itersel"))
throw runtime_error("-itersel makes no sense without -draft"); throw runtime_error("-itersel makes no sense without -draft");
func(parser, real_context); func(parser, *real_context);
} }
// force redraw of this client window // force redraw of this client window
if (parser.has_option("client") and real_context.has_window()) if (real_context != &context and real_context->has_window())
real_context.window().forget_timestamp(); real_context->window().forget_timestamp();
} }
void exec_string(CommandParameters params, Context& context) void exec_string(CommandParameters params, Context& context)