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

Add some color to mode specific mode line info

Browse Source
This commit is contained in:
Maxime Coste 2014-09-10 19:06:53 +01:00
parent c18e2ac90e
commit 827a77539a
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.cc
View File

@ -53,7 +53,6 @@ DisplayLine Client::generate_mode_line() const
DisplayLine status; DisplayLine status;
Face info_face = get_face("Information"); Face info_face = get_face("Information");
Face status_face = get_face("StatusLine"); Face status_face = get_face("StatusLine");
Face prompt_face = get_face("Prompt");
status.push_back({ context().buffer().display_name(), status_face }); status.push_back({ context().buffer().display_name(), status_face });
status.push_back({ " " + to_string((int)pos.line+1) + ":" + to_string((int)col+1) + " ", status_face }); status.push_back({ " " + to_string((int)pos.line+1) + ":" + to_string((int)col+1) + " ", status_face });
@ -68,7 +67,8 @@ DisplayLine Client::generate_mode_line() const
if (context().buffer().flags() & Buffer::Flags::Fifo) if (context().buffer().flags() & Buffer::Flags::Fifo)
status.push_back({ "[fifo]", info_face }); status.push_back({ "[fifo]", info_face });
status.push_back({ " ", status_face }); status.push_back({ " ", status_face });
status.push_back({ m_input_handler.mode_string(), prompt_face }); for (auto& atom : m_input_handler.mode_line())
status.push_back(std::move(atom));
status.push_back({ " - " + context().name() + "@[" + Server::instance().session() + "]", status_face }); status.push_back({ " - " + context().name() + "@[" + Server::instance().session() + "]", status_face });
return status; return status;

33
src/input_handler.cc
View File

@ -30,7 +30,7 @@ public:
virtual void on_disabled() {} virtual void on_disabled() {}
Context& context() const { return m_input_handler.context(); } Context& context() const { return m_input_handler.context(); }
virtual String description() const = 0; virtual DisplayLine mode_line() const = 0;
virtual KeymapMode keymap_mode() const = 0; virtual KeymapMode keymap_mode() const = 0;
@ -128,10 +128,15 @@ public:
m_idle_timer.set_next_date(Clock::now() + idle_timeout); m_idle_timer.set_next_date(Clock::now() + idle_timeout);
} }
String description() const override DisplayLine mode_line() const override
{ {
return to_string(context().selections().size()) + AtomList atoms = { { to_string(context().selections().size()) + " sel", Face(Colors::Blue) } };
(m_count != 0 ? " sel; param=" + to_string(m_count) : " sel"); if (m_count != 0)
{
atoms.push_back({ "; param=", Face(Colors::Yellow) });
atoms.push_back({ to_string(m_count), Face(Colors::Green) });
}
return atoms;
} }
KeymapMode keymap_mode() const override { return KeymapMode::Normal; } KeymapMode keymap_mode() const override { return KeymapMode::Normal; }
@ -407,9 +412,9 @@ public:
} }
} }
String description() const override DisplayLine mode_line() const override
{ {
return "menu"; return { "menu", Face(Colors::Yellow) };
} }
KeymapMode keymap_mode() const override { return KeymapMode::Menu; } KeymapMode keymap_mode() const override { return KeymapMode::Menu; }
@ -657,9 +662,9 @@ public:
} }
} }
String description() const override DisplayLine mode_line() const override
{ {
return "prompt"; return { "prompt", Face(Colors::Yellow) };
} }
KeymapMode keymap_mode() const override { return KeymapMode::Prompt; } KeymapMode keymap_mode() const override { return KeymapMode::Prompt; }
@ -734,9 +739,9 @@ public:
m_callback(key, context()); m_callback(key, context());
} }
String description() const override DisplayLine mode_line() const override
{ {
return "enter key"; return { "enter key", Face(Colors::Yellow) };
} }
KeymapMode keymap_mode() const override { return KeymapMode::None; } KeymapMode keymap_mode() const override { return KeymapMode::None; }
@ -879,9 +884,9 @@ public:
context().hooks().run_hook("InsertMove", key_to_str(key), context()); context().hooks().run_hook("InsertMove", key_to_str(key), context());
} }
String description() const override DisplayLine mode_line() const override
{ {
return "insert"; return { "insert", Face(Colors::Green) };
} }
KeymapMode keymap_mode() const override { return KeymapMode::Insert; } KeymapMode keymap_mode() const override { return KeymapMode::Insert; }
@ -1130,9 +1135,9 @@ void InputHandler::reset_normal_mode()
change_input_mode(new InputModes::Normal(*this)); change_input_mode(new InputModes::Normal(*this));
} }
String InputHandler::mode_string() const DisplayLine InputHandler::mode_line() const
{ {
return m_mode->description(); return m_mode->mode_line();
} }
void InputHandler::clear_mode_trash() void InputHandler::clear_mode_trash()

3
src/input_handler.hh
View File

@ -31,6 +31,7 @@ using PromptCallback = std::function<void (const String&, PromptEvent, Context&)
using KeyCallback = std::function<void (Key, Context&)>; using KeyCallback = std::function<void (Key, Context&)>;
class InputMode; class InputMode;
class DisplayLine;
enum class InsertMode : unsigned; enum class InsertMode : unsigned;
class InputHandler : public SafeCountable class InputHandler : public SafeCountable
@ -76,7 +77,7 @@ public:
Context& context() { return m_context; } Context& context() { return m_context; }
const Context& context() const { return m_context; } const Context& context() const { return m_context; }
String mode_string() const; DisplayLine mode_line() const;
void clear_mode_trash(); void clear_mode_trash();
private: private:
Context m_context; Context m_context;