1
1
mirror of https://github.com/mawww/kakoune.git synced 2024-12-25 12:36:11 +03:00

move context implementation to context.cc

This commit is contained in:
Maxime Coste 2013-04-09 19:39:03 +02:00
parent 240e0321e8
commit 34b8604f90
7 changed files with 213 additions and 154 deletions

View File

@ -1,10 +1,12 @@
#include "client_manager.hh" #include "client_manager.hh"
#include "event_manager.hh"
#include "buffer_manager.hh" #include "buffer_manager.hh"
#include "command_manager.hh"
#include "file.hh"
#include "color_registry.hh" #include "color_registry.hh"
#include "command_manager.hh"
#include "event_manager.hh"
#include "file.hh"
#include "user_interface.hh"
#include "window.hh"
namespace Kakoune namespace Kakoune
{ {

View File

@ -1,26 +1,28 @@
#include "commands.hh" #include "commands.hh"
#include "command_manager.hh"
#include "buffer_manager.hh"
#include "option_manager.hh"
#include "context.hh"
#include "buffer.hh" #include "buffer.hh"
#include "window.hh" #include "buffer_manager.hh"
#include "client_manager.hh"
#include "color_registry.hh"
#include "command_manager.hh"
#include "completion.hh"
#include "context.hh"
#include "debug.hh"
#include "event_manager.hh"
#include "file.hh" #include "file.hh"
#include "input_handler.hh" #include "filter.hh"
#include "string.hh"
#include "highlighter.hh" #include "highlighter.hh"
#include "highlighters.hh" #include "highlighters.hh"
#include "filter.hh" #include "input_handler.hh"
#include "register_manager.hh" #include "option_manager.hh"
#include "completion.hh"
#include "shell_manager.hh"
#include "event_manager.hh"
#include "color_registry.hh"
#include "client_manager.hh"
#include "parameters_parser.hh"
#include "utf8_iterator.hh"
#include "option_types.hh" #include "option_types.hh"
#include "parameters_parser.hh"
#include "register_manager.hh"
#include "shell_manager.hh"
#include "string.hh"
#include "user_interface.hh"
#include "utf8_iterator.hh"
#include "window.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

152
src/context.cc Normal file
View File

@ -0,0 +1,152 @@
#include "context.hh"
#include "input_handler.hh"
#include "user_interface.hh"
#include "window.hh"
namespace Kakoune
{
Context::Context() = default;
Context::Context(Editor& editor)
: m_editor(&editor) {}
Context::Context(InputHandler& input_handler, UserInterface& ui)
: m_input_handler(&input_handler), m_ui(&ui) {}
Context::~Context() = default;
Buffer& Context::buffer() const
{
if (not has_buffer())
throw runtime_error("no buffer in context");
return m_editor->buffer();
}
Editor& Context::editor() const
{
if (not has_editor())
throw runtime_error("no editor in context");
return *m_editor.get();
}
Window& Context::window() const
{
if (not has_window())
throw runtime_error("no window in context");
return *dynamic_cast<Window*>(m_editor.get());
}
bool Context::has_window() const
{
return (bool)m_editor and dynamic_cast<Window*>(m_editor.get());
}
InputHandler& Context::input_handler() const
{
if (not has_input_handler())
throw runtime_error("no input handler in context");
return *m_input_handler;
}
UserInterface& Context::ui() const
{
if (not has_ui())
throw runtime_error("no user interface in context");
return *m_ui;
}
OptionManager& Context::options() const
{
if (has_window())
return window().options();
if (has_buffer())
return buffer().options();
return GlobalOptions::instance();
}
HookManager& Context::hooks() const
{
if (has_window())
return window().hooks();
if (has_buffer())
return buffer().hooks();
return GlobalHooks::instance();
}
void Context::print_status(const DisplayLine& status) const
{
if (has_ui())
ui().print_status(status);
}
void Context::push_jump()
{
const SelectionList& jump = editor().selections();
if (m_current_jump != m_jump_list.end())
{
auto begin = m_current_jump;
if (&editor().buffer() != &begin->buffer() or
(const SelectionList&)(*begin) != jump)
++begin;
m_jump_list.erase(begin, m_jump_list.end());
}
m_jump_list.erase(std::remove(begin(m_jump_list), end(m_jump_list), jump),
end(m_jump_list));
m_jump_list.push_back({editor().buffer(), jump});
m_current_jump = m_jump_list.end();
}
const SelectionList& Context::jump_forward()
{
if (m_current_jump != m_jump_list.end() and
m_current_jump + 1 != m_jump_list.end())
return *++m_current_jump;
throw runtime_error("no next jump");
}
const SelectionList& Context::jump_backward()
{
if (m_current_jump != m_jump_list.begin())
{
if (m_current_jump == m_jump_list.end())
{
push_jump();
--m_current_jump;
}
return *--m_current_jump;
}
throw runtime_error("no previous jump");
}
void Context::forget_jumps_to_buffer(Buffer& buffer)
{
for (auto it = m_jump_list.begin(); it != m_jump_list.end();)
{
if (&it->buffer() == &buffer)
{
if (it < m_current_jump)
--m_current_jump;
else if (it == m_current_jump)
m_current_jump = m_jump_list.end()-1;
it = m_jump_list.erase(it);
}
else
++it;
}
}
void Context::change_editor(Editor& editor)
{
m_editor.reset(&editor);
if (has_window())
{
if (has_ui())
window().set_dimensions(ui().dimensions());
window().hooks().run_hook("WinDisplay", buffer().name(), *this);
}
}
}

View File

@ -1,13 +1,17 @@
#ifndef context_hh_INCLUDED #ifndef context_hh_INCLUDED
#define context_hh_INCLUDED #define context_hh_INCLUDED
#include "window.hh" #include "dynamic_selection_list.hh"
#include "user_interface.hh"
namespace Kakoune namespace Kakoune
{ {
class Editor;
class Window;
class Buffer;
class InputHandler; class InputHandler;
class UserInterface;
class DisplayLine;
// A Context is used to access non singleton objects for various services // A Context is used to access non singleton objects for various services
// in commands. // in commands.
@ -17,151 +21,45 @@ class InputHandler;
// a hook execution or a macro replay. // a hook execution or a macro replay.
struct Context struct Context
{ {
Context() {} Context();
explicit Context(Editor& editor) explicit Context(Editor& editor);
: m_editor(&editor) {} Context(InputHandler& input_handler, UserInterface& ui);
Context(InputHandler& input_handler, UserInterface& ui) ~Context();
: m_input_handler(&input_handler), m_ui(&ui) {}
Context(const Context&) = delete; Context(const Context&) = delete;
Context& operator=(const Context&) = delete; Context& operator=(const Context&) = delete;
Buffer& buffer() const Buffer& buffer() const;
{
if (not has_buffer())
throw runtime_error("no buffer in context");
return m_editor->buffer();
}
bool has_buffer() const { return (bool)m_editor; } bool has_buffer() const { return (bool)m_editor; }
Editor& editor() const Editor& editor() const;
{
if (not has_editor())
throw runtime_error("no editor in context");
return *m_editor.get();
}
bool has_editor() const { return (bool)m_editor; } bool has_editor() const { return (bool)m_editor; }
Window& window() const Window& window() const;
{ bool has_window() const;
if (not has_window())
throw runtime_error("no window in context");
return *dynamic_cast<Window*>(m_editor.get());
}
bool has_window() const { return (bool)m_editor and dynamic_cast<Window*>(m_editor.get()); }
InputHandler& input_handler() const InputHandler& input_handler() const;
{
if (not has_input_handler())
throw runtime_error("no input handler in context");
return *m_input_handler;
}
bool has_input_handler() const { return (bool)m_input_handler; } bool has_input_handler() const { return (bool)m_input_handler; }
UserInterface& ui() const UserInterface& ui() const;
{
if (not has_ui())
throw runtime_error("no user interface in context");
return *m_ui;
}
bool has_ui() const { return (bool)m_ui; } bool has_ui() const { return (bool)m_ui; }
void change_editor(Editor& editor) void change_editor(Editor& editor);
{
m_editor.reset(&editor);
if (has_window())
{
if (has_ui())
window().set_dimensions(ui().dimensions());
window().hooks().run_hook("WinDisplay", buffer().name(), *this);
}
}
OptionManager& options() const OptionManager& options() const;
{ HookManager& hooks() const;
if (has_window())
return window().options();
if (has_buffer())
return buffer().options();
return GlobalOptions::instance();
}
HookManager& hooks() const void print_status(const DisplayLine& status) const;
{
if (has_window())
return window().hooks();
if (has_buffer())
return buffer().hooks();
return GlobalHooks::instance();
}
void print_status(const DisplayLine& status) const void push_jump();
{ const SelectionList& jump_forward();
if (has_ui()) const SelectionList& jump_backward();
ui().print_status(status); void forget_jumps_to_buffer(Buffer& buffer);
}
void push_jump()
{
const SelectionList& jump = editor().selections();
if (m_current_jump != m_jump_list.end())
{
auto begin = m_current_jump;
if (&editor().buffer() != &begin->buffer() or
(const SelectionList&)(*begin) != jump)
++begin;
m_jump_list.erase(begin, m_jump_list.end());
}
m_jump_list.erase(std::remove(begin(m_jump_list), end(m_jump_list), jump),
end(m_jump_list));
m_jump_list.push_back({editor().buffer(), jump});
m_current_jump = m_jump_list.end();
}
const SelectionList& jump_forward()
{
if (m_current_jump != m_jump_list.end() and
m_current_jump + 1 != m_jump_list.end())
return *++m_current_jump;
throw runtime_error("no next jump");
}
const SelectionList& jump_backward()
{
if (m_current_jump != m_jump_list.begin())
{
if (m_current_jump == m_jump_list.end())
{
push_jump();
--m_current_jump;
}
return *--m_current_jump;
}
throw runtime_error("no previous jump");
}
void forget_jumps_to_buffer(Buffer& buffer)
{
for (auto it = m_jump_list.begin(); it != m_jump_list.end();)
{
if (&it->buffer() == &buffer)
{
if (it < m_current_jump)
--m_current_jump;
else if (it == m_current_jump)
m_current_jump = m_jump_list.end()-1;
it = m_jump_list.erase(it);
}
else
++it;
}
}
int& numeric_param() { return m_numeric_param; } int& numeric_param() { return m_numeric_param; }
private: private:
safe_ptr<Editor> m_editor; safe_ptr<Editor> m_editor;
InputHandler* m_input_handler = nullptr; safe_ptr<InputHandler> m_input_handler;
safe_ptr<UserInterface> m_ui; safe_ptr<UserInterface> m_ui;
int m_numeric_param = 0; int m_numeric_param = 0;

View File

@ -1,13 +1,14 @@
#include "highlighters.hh" #include "highlighters.hh"
#include "assert.hh" #include "assert.hh"
#include "color_registry.hh" #include "color_registry.hh"
#include "register_manager.hh"
#include "context.hh" #include "context.hh"
#include "option_types.hh"
#include "register_manager.hh"
#include "string.hh" #include "string.hh"
#include "utf8.hh" #include "utf8.hh"
#include "utf8_iterator.hh" #include "utf8_iterator.hh"
#include "window.hh"
#include "option_types.hh"
#include <sstream> #include <sstream>
#include <locale> #include <locale>

View File

@ -1,11 +1,13 @@
#include "input_handler.hh" #include "input_handler.hh"
#include "color_registry.hh"
#include "context.hh" #include "context.hh"
#include "editor.hh" #include "editor.hh"
#include "register_manager.hh"
#include "event_manager.hh" #include "event_manager.hh"
#include "register_manager.hh"
#include "user_interface.hh"
#include "utf8.hh" #include "utf8.hh"
#include "color_registry.hh" #include "window.hh"
#include <unordered_map> #include <unordered_map>

View File

@ -1,11 +1,13 @@
#ifndef input_handler_hh_INCLUDED #ifndef input_handler_hh_INCLUDED
#define input_handler_hh_INCLUDED #define input_handler_hh_INCLUDED
#include "keys.hh" #include "color.hh"
#include "completion.hh" #include "completion.hh"
#include "utils.hh"
#include "string.hh"
#include "context.hh" #include "context.hh"
#include "editor.hh"
#include "keys.hh"
#include "string.hh"
#include "utils.hh"
namespace Kakoune namespace Kakoune
{ {