Stop undo bleeding into other edit windows

Author: cmaughan

TODO.md

@@ -1,9 +1,7 @@
 # Bugs
 
-
 ALL: 
 Undo shouldn't affect other buffers; need to understand how that even happens.
-Tabs don't work well, especially when there isn't room for them
 Tweak the blend fade out.  Understand the ImGui strange behavior
 insert a bad character near the top of the primitives demo before the macros, and the scene goes.
 

include/zep/buffer.h

@@ -2,6 +2,7 @@
 
 #include <functional>
 #include <set>
+#include <stack>
 
 #include "zep/mcommon/logger.h"
 #include "zep/mcommon/signals.h"
@@ -19,6 +20,7 @@ namespace Zep
 class ZepSyntax;
 class ZepTheme;
 class ZepMode;
+class ZepCommand;
 enum class ThemeColor;
 
 enum class Direction
@@ -279,6 +281,9 @@ class ZepBuffer : public ZepComponent
     Zep::signal<void(ZepBuffer& buffer, const GlyphIterator&, const std::string&)> sigPreInsert;
     Zep::signal<void(ZepBuffer& buffer, const GlyphIterator&, const GlyphIterator&)> sigPreDelete;
 
+    std::stack<std::shared_ptr<ZepCommand>>& GetUndoStack();
+    std::stack<std::shared_ptr<ZepCommand>>& GetRedoStack();
+
 private:
     void MarkUpdate();
 
@@ -310,6 +315,9 @@ class ZepBuffer : public ZepComponent
     // Modes
     std::shared_ptr<ZepMode> m_spMode;
     fnKeyNotifier m_postKeyNotifier;
+    
+    std::stack<std::shared_ptr<ZepCommand>> m_undoStack;
+    std::stack<std::shared_ptr<ZepCommand>> m_redoStack;
 };
 
 // Notification payload

include/zep/mode.h

@@ -228,8 +228,6 @@ class ZepMode : public ZepComponent
     virtual void ClearSelection();
 
 protected:
-    std::stack<std::shared_ptr<ZepCommand>> m_undoStack;
-    std::stack<std::shared_ptr<ZepCommand>> m_redoStack;
     EditorMode m_currentMode = EditorMode::Normal;
     bool m_lineWise = false;
     GlyphIterator m_visualBegin;

include/zep/theme.h

@@ -84,6 +84,7 @@ class ZepTheme
     virtual const NVec4f& GetColor(ThemeColor themeColor) const;
     virtual NVec4f GetComplement(const NVec4f& col, const NVec4f& adjust = NVec4f(0.0f)) const;
     virtual ThemeColor GetUniqueColor(uint32_t id) const;
+    virtual void SetColor(ThemeColor themeColor, const NVec4f& col);
 
     void SetThemeType(ThemeType type);
     ThemeType GetThemeType() const;

prebuild.bat

@@ -17,7 +17,7 @@ if not exist "vcpkg\vcpkg.exe" (
 echo Installing libraries for the demo...
 cd vcpkg
 echo Installing Libraries
-vcpkg install imgui[freetype,sdl2-binding,opengl3-binding] tinyfiledialogs gl3w freetype sdl2 --triplet x64-windows-static-md --recurse
+vcpkg install imgui[freetype,sdl2-binding,opengl3-binding] clipp tinyfiledialogs gl3w freetype sdl2 --triplet x64-windows-static-md --recurse
 cd %~dp0
 
 echo %Time%

prebuild.sh

@@ -14,7 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then
 fi
 
 cd vcpkg
-./vcpkg install imgui[freetype,sdl2-binding,opengl3-binding] tinyfiledialogs gl3w freetype sdl2 --triplet ${triplet[0]} --recurse
+./vcpkg install imgui[freetype,sdl2-binding,opengl3-binding] clipp tinyfiledialogs gl3w freetype sdl2 --triplet ${triplet[0]} --recurse
 if [ "$(uname)" != "Darwin" ]; then
 ./vcpkg install glib --triplet ${triplet[0]} --recurse
 fi

src/buffer.cpp

@@ -1766,5 +1766,15 @@ const std::string& ZepBuffer::GetName() const
     }
     return m_strName;
 }
+    
+std::stack<std::shared_ptr<ZepCommand>>& ZepBuffer::GetUndoStack()
+{
+    return m_undoStack;
+}
+
+std::stack<std::shared_ptr<ZepCommand>>& ZepBuffer::GetRedoStack()
+{
+    return m_redoStack;
+}
 
 } // namespace Zep

src/editor.cpp

@@ -1207,8 +1207,7 @@ void ZepEditor::Display()
     if (GetConfig().style == EditorStyle::Normal)
     {
         // A line along the bottom of the tab region
-        m_pDisplay->DrawRectFilled(
-            NRectf(NVec2f(m_tabRegion->rect.Left(), m_tabRegion->rect.Bottom() - DPI_Y(1)), NVec2f(m_tabRegion->rect.Right(), m_tabRegion->rect.Bottom())), GetTheme().GetColor(ThemeColor::TabInactive));
+        //m_pDisplay->DrawRectFilled(NRectf(NVec2f(m_tabRegion->rect.Left(), m_tabRegion->rect.Bottom() - DPI_Y(1)), NVec2f(m_tabRegion->rect.Right(), m_tabRegion->rect.Bottom())), GetTheme().GetColor(ThemeColor::TabInactive));
     }
 
     // Figure out the active region
@@ -1231,7 +1230,7 @@ void ZepEditor::Display()
         virtualSize = m_tabRegion->children.back()->rect.Right();
     }
 
-    const auto selectHeight = int(DPI_Y(tabSelectLine));
+    const auto selectHeight = DPI_Y(tabSelectLine);
 
     // Clamp it
     m_tabOffsetX = std::min(m_tabOffsetX, 0.0f);
@@ -1312,7 +1311,6 @@ void ZepEditor::Display()
         m_pDisplay->DrawChars(uiFont, rc.topLeftPx + DPI_VEC2(NVec2f(textBorder, textBorder)), textCol, (const uint8_t*)text.c_str());
 
         auto drawTabLine = [&](auto yPos, auto col, auto height) {
-            m_pDisplay->DrawRectFilled(NRectf(rc.Left(), yPos, rc.Width(), height / 2), ModifyBackgroundColor(NVec4f(0.0f, 0.0f, 0.0f, 1.0f)));
             m_pDisplay->DrawRectFilled(NRectf(rc.Left(), yPos + height / 2, rc.Width(), height / 2), ModifyBackgroundColor(col));
         };
 

src/mode.cpp

@@ -564,12 +564,15 @@ void ZepMode::AddCommand(std::shared_ptr<ZepCommand> spCmd)
         return;
     }
 
+    auto& undoStack = m_pCurrentWindow->GetBuffer().GetUndoStack();
+    auto& redoStack = m_pCurrentWindow->GetBuffer().GetRedoStack();
+
     spCmd->Redo();
-    m_undoStack.push(spCmd);
+    undoStack.push(spCmd);
 
     // Can't redo anything beyond this point
     std::stack<std::shared_ptr<ZepCommand>> empty;
-    m_redoStack.swap(empty);
+    redoStack.swap(empty);
 
     if (spCmd->GetCursorAfter().Valid())
     {
@@ -584,27 +587,30 @@ void ZepMode::Redo()
         return;
     }
 
-    if (m_redoStack.empty())
+    auto& undoStack = m_pCurrentWindow->GetBuffer().GetUndoStack();
+    auto& redoStack = m_pCurrentWindow->GetBuffer().GetRedoStack();
+
+    if (redoStack.empty())
         return;
 
-    if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(m_redoStack.top()) != nullptr)
+    if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(redoStack.top()) != nullptr)
     {
-        m_undoStack.push(m_redoStack.top());
-        m_redoStack.pop();
+        undoStack.push(redoStack.top());
+        redoStack.pop();
     }
 
-    while (!m_redoStack.empty())
+    while (!redoStack.empty())
     {
-        auto& spCommand = m_redoStack.top();
+        auto& spCommand = redoStack.top();
         spCommand->Redo();
 
         if (spCommand->GetCursorAfter().Valid())
         {
             GetCurrentWindow()->SetBufferCursor(spCommand->GetCursorAfter());
         }
 
-        m_undoStack.push(spCommand);
-        m_redoStack.pop();
+        undoStack.push(spCommand);
+        redoStack.pop();
 
         if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(spCommand) != nullptr)
         {
@@ -620,27 +626,29 @@ void ZepMode::Undo()
         return;
     }
 
-    if (m_undoStack.empty())
+    auto& undoStack = m_pCurrentWindow->GetBuffer().GetUndoStack();
+    auto& redoStack = m_pCurrentWindow->GetBuffer().GetRedoStack();
+    if (undoStack.empty())
         return;
 
-    if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(m_undoStack.top()) != nullptr)
+    if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(undoStack.top()) != nullptr)
     {
-        m_redoStack.push(m_undoStack.top());
-        m_undoStack.pop();
+        redoStack.push(undoStack.top());
+        undoStack.pop();
     }
 
-    while (!m_undoStack.empty())
+    while (!undoStack.empty())
     {
-        auto& spCommand = m_undoStack.top();
+        auto& spCommand = undoStack.top();
         spCommand->Undo();
 
         if (spCommand->GetCursorBefore().Valid())
         {
             GetCurrentWindow()->SetBufferCursor(spCommand->GetCursorBefore());
         }
 
-        m_redoStack.push(spCommand);
-        m_undoStack.pop();
+        redoStack.push(spCommand);
+        undoStack.pop();
 
         if (std::dynamic_pointer_cast<ZepCommand_GroupMarker>(spCommand) != nullptr)
         {

src/theme.cpp

@@ -121,6 +121,11 @@ ThemeColor ZepTheme::GetUniqueColor(uint32_t index) const
     return ThemeColor((uint32_t)ThemeColor::UniqueColor0 + (uint32_t)(index % (uint32_t)ThemeColor::UniqueColorLast));
 }
 
+void ZepTheme::SetColor(ThemeColor themeColor, const NVec4f& col)
+{
+    m_colors[themeColor] = col;
+}
+
 const NVec4f& ZepTheme::GetColor(ThemeColor themeColor) const
 {
     if (themeColor >= ThemeColor::UniqueColor0)

src/window.cpp

@@ -1625,26 +1625,30 @@ void ZepWindow::DisplayMarkerHints()
     const auto lastIndex = m_windowLines[m_visibleLineIndices.y]->lineByteRange.second;
     const auto lineHeight = m_windowLines[m_visibleLineIndices.x]->FullLineHeightPx();
     const float indicatorWidth = 10.0f;
+    auto& theme = m_pBuffer->GetTheme();
+    auto& display = GetEditor().GetDisplay();
+    auto& font = display.GetFont(ZepTextType::Text);
 
     m_pBuffer->ForEachMarker(RangeMarkerType::Mark, Direction::Forward, m_pBuffer->Begin(), m_pBuffer->End(), [&](const std::shared_ptr<RangeMarker>& marker) {
         if (!(marker->displayType & RangeMarkerDisplayType::Background))
         {
             return true;
         }
 
+        auto indicatorWidth = font.GetTextSize((const uint8_t*)"More...").x;
         if (marker->GetRange().second > lastIndex)
         {
             const auto lineInfo = m_windowLines[m_visibleLineIndices.y];
-            auto& display = GetEditor().GetDisplay();
             auto rc = NRectf(m_textRegion->rect.Right() - indicatorWidth, m_textRegion->rect.Bottom() - lineHeight, indicatorWidth, lineHeight);
             display.DrawRectFilled(rc, ModifyBackgroundColor(marker->GetBackgroundColor()));
+            display.DrawChars(font, rc.topLeftPx, theme.GetColor(marker->GetTextColor()), (const uint8_t*)"More...");
         }
         else if (marker->GetRange().first < firstIndex)
         {
             const auto lineInfo = m_windowLines[m_visibleLineIndices.x];
-            auto& display = GetEditor().GetDisplay();
             auto rc = NRectf(m_textRegion->rect.Right() - indicatorWidth, m_textRegion->rect.Top(), indicatorWidth, lineHeight);
             display.DrawRectFilled(rc, ModifyBackgroundColor(marker->GetBackgroundColor()));
+            display.DrawChars(font, rc.topLeftPx, theme.GetColor(marker->GetTextColor()), (const uint8_t*)"More...");
         }
 
         return true;