Window lifetime is now handled by it's buffer.

A window cannot outlive it's buffer, so it makes sense to keep only a
reference on it hand have the buffer manage the window lifetime.

1 files changed, 20 insertions, 0 deletions

diff --git a/src/buffer.cc b/src/buffer.cc
index 2a09cc5b..81ba07e6 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -1,8 +1,10 @@
 #include "buffer.hh"
 
 #include "buffer_manager.hh"
+#include "window.hh"
 
 #include <cassert>
+#include <algorithm>
 
 namespace Kakoune
 {
@@ -314,4 +316,22 @@ void Buffer::append_modification(Modification&& modification)
     m_current_undo_group.push_back(modification);
 }
 
+struct window_already_registered {};
+
+void Buffer::register_window(Window* window)
+{
+    if (std::find(m_windows.begin(), m_windows.end(), window) != m_windows.end())
+        throw window_already_registered();
+
+    m_windows.push_front(std::unique_ptr<Window>(window));
+}
+
+void Buffer::delete_window(Window* window)
+{
+    assert(&window->buffer() == this);
+    auto window_it = std::find(m_windows.begin(), m_windows.end(), window);
+    assert(window_it != m_windows.end());
+    m_windows.erase(window_it);
+}
+
 }