Continue reducing header dependencies

mawww · mawww · commit 23aa04dfdc62 · 2025-12-08T10:28:22.000+11:00
Remove option_manager.hh from profile.hh,
       event_manager.hh from client.hh,
       client.hh from window.hh,
       keymap_manager.hh from normal.hh
diff --git a/src/client.cc b/src/client.cc
@@ -11,6 +11,7 @@
 #include "client_manager.hh"
 #include "event_manager.hh"
 #include "hook_manager.hh"
+#include "keymap_manager.hh"
 #include "option_manager.hh"
 #include "shell_manager.hh"
 #include "face_registry.hh"
diff --git a/src/client.hh b/src/client.hh
@@ -5,6 +5,7 @@
 #include "clock.hh"
 #include "display_buffer.hh"
 #include "env_vars.hh"
+#include "event_manager.hh"
 #include "input_handler.hh"
 #include "safe_ptr.hh"
 #include "unique_ptr.hh"
diff --git a/src/command_manager.cc b/src/command_manager.cc
@@ -8,6 +8,7 @@
 #include "file.hh"
 #include "hook_manager.hh"
 #include "optional.hh"
+#include "option_manager.hh"
 #include "option_types.hh"
 #include "profile.hh"
 #include "ranges.hh"
diff --git a/src/commands.cc b/src/commands.cc
@@ -19,6 +19,7 @@
 #include "highlighters.hh"
 #include "input_handler.hh"
 #include "insert_completer.hh"
+#include "keymap_manager.hh"
 #include "normal.hh"
 #include "option_manager.hh"
 #include "option_types.hh"
@@ -1753,7 +1754,7 @@ const CommandDesc source_cmd = {
     filename_completer<true>,
     [](const ParametersParser& parser, Context& context, const ShellContext&)
     {
-        ProfileScope profile{context, [&](std::chrono::microseconds duration) {
+        ProfileScope profile{context.options()["debug"].get<DebugFlags>(), [&](std::chrono::microseconds duration) {
             write_to_debug_buffer(format("sourcing '{}' took {} us", parser[0], (size_t)duration.count()));
         }};
 
diff --git a/src/hook_manager.cc b/src/hook_manager.cc
@@ -5,7 +5,7 @@
 #include "context.hh"
 #include "display_buffer.hh"
 #include "face_registry.hh"
-#include "option.hh"
+#include "option_manager.hh"
 #include "option_types.hh"
 #include "profile.hh"
 #include "ranges.hh"
@@ -136,7 +136,7 @@ void HookManager::run_hook(Hook hook, StringView param, Context& context)
             m_hooks_trash.clear();
     });
 
-    ProfileScope profile{context, [&](std::chrono::microseconds duration) {
+    ProfileScope profile{context.options()["debug"].get<DebugFlags>(), [&](std::chrono::microseconds duration) {
         write_to_debug_buffer(format("hook '{}({})' took {} us", hook_name, param, (size_t)duration.count()));
     }};
 
diff --git a/src/input_handler.cc b/src/input_handler.cc
@@ -7,6 +7,7 @@
 #include "event_manager.hh"
 #include "hook_manager.hh"
 #include "face_registry.hh"
+#include "keymap_manager.hh"
 #include "option_manager.hh"
 #include "insert_completer.hh"
 #include "normal.hh"
diff --git a/src/input_handler.hh b/src/input_handler.hh
@@ -14,7 +14,6 @@
 #include "utils.hh"
 #include "safe_ptr.hh"
 #include "display_buffer.hh"
-#include "event_manager.hh"
 
 namespace Kakoune
 {
@@ -42,6 +41,8 @@ class InputMode;
 enum class KeymapMode : char;
 enum class CursorMode;
 
+class Timer;
+
 using PromptCompleter = Function<Completions (const Context&, StringView, ByteCount)>;
 enum class InsertMode : unsigned
 {
@@ -88,7 +89,7 @@ public:
     // execute callback on next keypress and returns to normal mode
     // if callback does not change the mode itself
     void on_next_key(StringView mode_name, KeymapMode mode, KeyCallback callback,
-                     Timer::Callback idle_callback = Timer::Callback{});
+                     Function<void (Timer& timer)> idle_callback = {});
 
     // process the given key
     void handle_key(Key key, bool synthesized = true);
diff --git a/src/insert_completer.cc b/src/insert_completer.cc
@@ -6,6 +6,7 @@
 #include "command_manager.hh"
 #include "changes.hh"
 #include "context.hh"
+#include "client.hh"
 #include "display_buffer.hh"
 #include "face_registry.hh"
 #include "file.hh"
diff --git a/src/main.cc b/src/main.cc
@@ -15,7 +15,9 @@
 #include "highlighters.hh"
 #include "insert_completer.hh"
 #include "json_ui.hh"
+#include "keymap_manager.hh"
 #include "terminal_ui.hh"
+#include "option_manager.hh"
 #include "option_types.hh"
 #include "parameters_parser.hh"
 #include "profile.hh"
diff --git a/src/normal.cc b/src/normal.cc
@@ -6,6 +6,7 @@
 #include "buffer_manager.hh"
 #include "buffer_utils.hh"
 #include "changes.hh"
+#include "client.hh"
 #include "command_manager.hh"
 #include "context.hh"
 #include "coord.hh"
@@ -14,6 +15,8 @@
 #include "face_registry.hh"
 #include "file.hh"
 #include "flags.hh"
+#include "input_handler.hh"
+#include "keymap_manager.hh"
 #include "option_manager.hh"
 #include "option_types.hh"
 #include "ranges.hh"
diff --git a/src/normal.hh b/src/normal.hh
@@ -3,7 +3,6 @@
 
 #include "optional.hh"
 #include "keys.hh"
-#include "keymap_manager.hh"
 #include "string.hh"
 #include "exception.hh"
 
@@ -12,6 +11,7 @@ namespace Kakoune
 
 class Buffer;
 class Context;
+enum class KeymapMode : char;
 
 struct no_selections_remaining : runtime_error
 {
diff --git a/src/profile.hh b/src/profile.hh
@@ -4,7 +4,6 @@
 #include "clock.hh"
 #include "context.hh"
 #include "debug.hh"
-#include "option_manager.hh"
 
 namespace Kakoune
 {
@@ -19,10 +18,6 @@ public:
         m_callback{std::move(callback)}
     {}
 
-    ProfileScope(const Context& context, Callback&& callback, bool active = true)
-      : ProfileScope{context.options()["debug"].get<DebugFlags>(), std::move(callback), active}
-    {}
-
     ~ProfileScope()
     {
         if (m_active)
diff --git a/src/window.cc b/src/window.cc
@@ -4,6 +4,7 @@
 #include "buffer.hh"
 #include "buffer_utils.hh"
 #include "context.hh"
+#include "client.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"
 #include "input_handler.hh"
@@ -46,6 +47,11 @@ Window::~Window()
     options().unregister_watcher(*this);
 }
 
+void Window::set_client(Client* client)
+{
+    m_client = client;
+}
+
 void Window::scroll(LineCount offset)
 {
     m_position.line = std::max(0_line, m_position.line + offset);
@@ -110,7 +116,7 @@ bool Window::needs_redraw(const Context& context) const
 
 const DisplayBuffer& Window::update_display_buffer(const Context& context)
 {
-    ProfileScope profile{context, [&](std::chrono::microseconds duration) {
+    ProfileScope profile{context.options()["debug"].get<DebugFlags>(), [&](std::chrono::microseconds duration) {
         write_to_debug_buffer(format("window display update for '{}' took {} us",
                                      buffer().display_name(), (size_t)duration.count()));
     }, not (buffer().flags() & Buffer::Flags::Debug)};
diff --git a/src/window.hh b/src/window.hh
@@ -1,18 +1,19 @@
 #ifndef window_hh_INCLUDED
 #define window_hh_INCLUDED
 
-#include "client.hh"
 #include "display_buffer.hh"
 #include "highlighter_group.hh"
 #include "option.hh"
 #include "optional.hh"
 #include "safe_ptr.hh"
+#include "selection.hh"
 #include "scope.hh"
 
 namespace Kakoune
 {
 
 enum class Hook;
+class Client;
 
 // A Window is a view onto a Buffer
 class Window final : public SafeCountable, public Scope, private OptionWatcher
@@ -44,7 +45,7 @@ public:
 
     bool needs_redraw(const Context& context) const;
 
-    void set_client(Client* client) { m_client = client; }
+    void set_client(Client* client);
 
     void clear_display_buffer();
     void run_resize_hook_ifn();
