Tweak status line

This commit is contained in:
Maxime Coste 2013-04-18 14:28:35 +02:00
parent f4e7da8826
commit 9a361e2657

View File

@ -183,14 +183,15 @@ Client& ClientManager::get_client(const String& name)
throw runtime_error("no client named: " + name); throw runtime_error("no client named: " + name);
} }
static DisplayLine generate_status_line(const Context& context) static DisplayLine generate_status_line(Client& client)
{ {
auto& context = client.context();
auto pos = context.editor().main_selection().last(); auto pos = context.editor().main_selection().last();
auto col = utf8::distance(context.buffer().iterator_at_line_begin(pos), pos); auto col = utf8::distance(context.buffer().iterator_at_line_begin(pos), pos);
std::ostringstream oss; std::ostringstream oss;
oss << context.buffer().display_name() oss << context.buffer().display_name()
<< " " << (int)pos.line()+1 << "," << (int)col+1; << " " << (int)pos.line()+1 << ":" << (int)col+1;
if (context.buffer().is_modified()) if (context.buffer().is_modified())
oss << " [+]"; oss << " [+]";
if (context.input_handler().is_recording()) if (context.input_handler().is_recording())
@ -200,6 +201,7 @@ static DisplayLine generate_status_line(const Context& context)
oss << " [" << context.editor().selections().size() << " sel]"; oss << " [" << context.editor().selections().size() << " sel]";
if (context.editor().is_editing()) if (context.editor().is_editing())
oss << " [insert]"; oss << " [insert]";
oss << " - " << client.name();
return { oss.str(), get_color("StatusLine") }; return { oss.str(), get_color("StatusLine") };
} }
@ -217,7 +219,7 @@ void ClientManager::redraw_clients() const
context.window().update_display_buffer();; context.window().update_display_buffer();;
context.ui().draw(context.window().display_buffer(), context.ui().draw(context.window().display_buffer(),
generate_status_line(context)); generate_status_line(*client));
} }
} }
} }