Lots of small fixes

Navigation between split panes and closing them.
Fixed delete in insert mode; not sure how I missed that one.
Fixed some errors pointed out by code analysis.
Added a crude :e command to load a file; but not implemented properly
yet.
You can now :vsplit, :split, :close.

Author: cmaughan

.gitignore

@@ -24,6 +24,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 
+git_stats
 # Visual Studio 2015 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot

demo_imgui/main.cpp

@@ -234,7 +234,7 @@ int main(int argc, char** argv)
     cfg.PixelSnapH = true;
     io.Fonts->AddFontFromFileTTF((std::string(SDL_GetBasePath()) + "ProggyClean.ttf").c_str(), 16.0f, &cfg );
     */
-    bool show_demo_window = true;
+    bool show_demo_window = false;
     bool show_another_window = false;
     ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
 

src/buffer.cpp

@@ -54,7 +54,6 @@ namespace Zep
 const char* Msg_Buffer = "Buffer";
 ZepBuffer::ZepBuffer(ZepEditor& editor, const std::string& strName)
     : ZepComponent(editor)
-    , m_threadPool()
     , m_strName(strName)
 {
     SetText("");
@@ -606,7 +605,10 @@ void ZepBuffer::SetText(const std::string& text)
     m_dirty = 0;
 }
 
-// TODO: These can be cleaner
+// TODO: This can be cleaner
+// The function needs to find the point on the line which bufferLocation is on.
+// It needs to account for empty lines or the last line, zero terminated.
+// It shouldn't walk away to another line!
 BufferLocation ZepBuffer::GetLinePos(BufferLocation bufferLocation, LineLocation lineLocation) const
 {
     if (lineLocation == LineLocation::None)
@@ -618,7 +620,7 @@ BufferLocation ZepBuffer::GetLinePos(BufferLocation bufferLocation, LineLocation
     if (m_gapBuffer.empty())
         return bufferLocation;
 
-    // If we are on the CR, move back 1
+    // If we are on the CR, move back 1, unless the \n is all that is on the line
     if (m_gapBuffer[bufferLocation] == '\n')
     {
         bufferLocation--;

src/buffer.h

@@ -172,16 +172,16 @@ class ZepBuffer : public ZepComponent
     void ProcessInput(const std::string& str);
 
 private:
-    bool m_dirty;                 // Is the text modified?
+    bool m_dirty = false;         // Is the text modified?
     bool m_readOnly = false;      // Is the text read only?
     bool m_viewOnly = false;      // Is the text not editable, only view?
     GapBuffer<utf8> m_gapBuffer;  // Storage for the text - a gap buffer for efficiency
     std::vector<long> m_lineEnds; // End of each line
     ThreadPool m_threadPool;
-    uint32_t m_flags;
+    uint32_t m_flags = 0;
     std::shared_ptr<ZepSyntax> m_spSyntax;
     std::string m_strName;
-    uint32_t m_fileFlags;
+    uint32_t m_fileFlags = 0;
     fs::path m_filePath;
     std::shared_ptr<ZepTheme> m_spOverrideTheme;
 };

src/commands.h

@@ -81,7 +81,7 @@ class ZepCommand_Insert : public ZepCommand
     BufferLocation m_startOffset;
     std::string m_strInsert;
 
-    BufferLocation m_endOffsetInserted;
+    BufferLocation m_endOffsetInserted = -1;
 };
 
 } // namespace Zep

src/display.h

@@ -11,10 +11,10 @@ class ZepTabWindow;
 struct SelectRegion
 {
     // For vertical select, we will have a list of spans...
-    BufferLocation start;
-    BufferLocation end;
-    bool visible;
-    bool vertical; // Not yet supported
+    BufferLocation start = 0;
+    BufferLocation end = 0;
+    bool visible = true;
+    bool vertical = false; // Not yet supported
 };
 
 // Display interface

src/mcommon/FileWatcher/FileWatcherWin32.cpp

@@ -136,6 +136,8 @@ WatchStruct* CreateWatch(LPCTSTR szDirectory, bool recursive, DWORD mNotifyFilte
     WatchStruct* pWatch;
     size_t ptrsize = sizeof(*pWatch);
     pWatch = static_cast<WatchStruct*>(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ptrsize));
+    if (!pWatch)
+        return nullptr;
 
     pWatch->mDirHandle = CreateFile(szDirectory, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL);
 
@@ -151,8 +153,14 @@ WatchStruct* CreateWatch(LPCTSTR szDirectory, bool recursive, DWORD mNotifyFilte
         }
         else
         {
-            CloseHandle(pWatch->mOverlapped.hEvent);
-            CloseHandle(pWatch->mDirHandle);
+            if (pWatch->mOverlapped.hEvent != 0)
+            {
+                CloseHandle(pWatch->mOverlapped.hEvent);
+            }
+            if (pWatch->mDirHandle != 0)
+            {
+                CloseHandle(pWatch->mDirHandle);
+            }
         }
     }
 
@@ -252,6 +260,7 @@ void FileWatcherWin32::handleAction(WatchStruct* watch, const String& filename,
             fwAction = Actions::Delete;
             break;
         case FILE_ACTION_MODIFIED:
+        default:
             fwAction = Actions::Modified;
             break;
     };

src/mcommon/animation/timer.h

@@ -15,7 +15,7 @@ enum class TimerSample : uint32_t
 
 struct timer
 {
-    int64_t startTime;
+    int64_t startTime = 0;
 };
 extern timer globalTimer;
 
@@ -36,7 +36,7 @@ class TimerBlock
 public:
     std::string strTimer;
     timer blockTimer;
-    uint64_t elapsed;
+    uint64_t elapsed = 0;
 
     TimerBlock(const std::string& timer);
     ~TimerBlock();

src/mcommon/file/archive.h

@@ -38,7 +38,7 @@ struct ArchiveSection
 // The tables index into the loaded string, which is poked full of 0's to deliniate the data
 struct Archive
 {
-    bool saving;
+    bool saving = false;
     uint64_t currentSectionIndex;
 
     // Path of this file

src/mcommon/logger.h

@@ -16,7 +16,7 @@
 // than out to the console sometimes, and as long as you are building on Windows, you are referencing the necessary
 // kernel32.dll....
 extern "C" {
-__declspec(dllimport) void __stdcall OutputDebugStringA(const char* pszChar);
+__declspec(dllimport) void __stdcall OutputDebugStringA(_In_opt_ const char* pszChar);
 }
 #endif
 

src/mcommon/math/math.h

@@ -346,6 +346,10 @@ struct NRect
     {
         return bottomRightPx.x - topLeftPx.x;
     }
+    NVec2f Center() const
+    {
+        return (bottomRightPx + topLeftPx) * .5f;
+    }
     NVec2f Size() const
     {
         return bottomRightPx - topLeftPx;

src/mode.cpp

@@ -10,7 +10,6 @@ namespace Zep
 
 ZepMode::ZepMode(ZepEditor& editor)
     : ZepComponent(editor)
-    , m_currentMode(EditorMode::Normal)
 {
 }
 

src/mode.h

@@ -81,11 +81,11 @@ class ZepMode : public ZepComponent
 protected:
     std::stack<std::shared_ptr<ZepCommand>> m_undoStack;
     std::stack<std::shared_ptr<ZepCommand>> m_redoStack;
-    EditorMode m_currentMode;
+    EditorMode m_currentMode = EditorMode::Normal;
     bool m_lineWise = false;
-    BufferLocation m_insertBegin;
-    BufferLocation m_visualBegin;
-    BufferLocation m_visualEnd;
+    BufferLocation m_insertBegin = 0;
+    BufferLocation m_visualBegin = 0;
+    BufferLocation m_visualEnd = 0;
 };
 
 } // namespace Zep

src/mode_vim.cpp

@@ -422,6 +422,27 @@ bool ZepMode_Vim::GetCommand(CommandContext& context)
         GetCurrentWindow()->SetBufferCursor(context.buffer.GetLinePos(bufferCursor, LineLocation::LineFirstGraphChar));
         return true;
     }
+    // Moving between splits
+    else if (context.command == "j" && (context.modifierKeys & ModifierKey::Ctrl))
+    {
+        GetCurrentWindow()->GetTabWindow().DoMotion(WindowMotion::Down);
+        return true;
+    }
+    else if (context.command == "k" && (context.modifierKeys & ModifierKey::Ctrl))
+    {
+        GetCurrentWindow()->GetTabWindow().DoMotion(WindowMotion::Up);
+        return true;
+    }
+    else if (context.command == "h" && (context.modifierKeys & ModifierKey::Ctrl))
+    {
+        GetCurrentWindow()->GetTabWindow().DoMotion(WindowMotion::Left);
+        return true;
+    }
+    else if (context.command == "l" && (context.modifierKeys & ModifierKey::Ctrl))
+    {
+        GetCurrentWindow()->GetTabWindow().DoMotion(WindowMotion::Right);
+        return true;
+    }
     else if (context.command == "j" || context.command == "+" || context.lastKey == ExtKeys::DOWN)
     {
         GetCurrentWindow()->MoveCursorY(context.count);
@@ -991,18 +1012,34 @@ bool ZepMode_Vim::GetCommand(CommandContext& context)
                     pTab->AddWindow(&GetEditor().GetActiveTabWindow()->GetActiveWindow()->GetBuffer(), pTab->GetActiveWindow(), true);
                 }
             }
-            else if (context.command == ":hsplit")
+            else if (context.command == ":hsplit" || 
+                context.command == ":split")
             {
                 auto pTab = GetEditor().GetActiveTabWindow();
                 if (pTab)
                 {
                     pTab->AddWindow(&GetEditor().GetActiveTabWindow()->GetActiveWindow()->GetBuffer(), pTab->GetActiveWindow(), false);
                 }
             }
+            else if (context.command.find(":e") == 0)
+            {
+                auto strTok = string_split(context.command, " ");
+                if (strTok.size() > 1)
+                {
+                    auto fname = strTok[1];
+                    auto pBuffer = GetEditor().AddBuffer(fname);
+                    pBuffer->Load(fname);
+                    GetEditor().GetActiveTabWindow()->GetActiveWindow()->SetBuffer(pBuffer);
+                }
+            }
             else if (context.command == ":w")
             {
                 GetEditor().SaveBuffer(context.buffer);
             }
+            else if (context.command == ":close" || context.command == ":clo")
+            {
+                GetEditor().GetActiveTabWindow()->CloseActiveWindow();
+            }
             else if (context.command[1] == 'q')
             {
                 if (context.command == ":q")
@@ -1385,6 +1422,7 @@ void ZepMode_Vim::HandleInsert(uint32_t key)
             // There is more work to do here to support keyboard combos in insert mode
             // (not that I can think of ones that I use!)
             CommandContext context("", *this, key, 0, EditorMode::Insert);
+            context.bufferCursor = bufferCursor;
             if (GetCommand(context) && context.commandResult.spCommand)
             {
                 AddCommand(context.commandResult.spCommand);

src/mode_vim.h

@@ -132,7 +132,7 @@ class ZepMode_Vim : public ZepMode
 
     std::string m_currentCommand;
     std::string m_lastCommand;
-    int m_lastCount;
+    int m_lastCount = 0;
     std::string m_lastInsertString;
 
     bool m_pendingEscape = false;

src/splits.h

@@ -23,23 +23,45 @@ enum Flags
 
 struct Region
 {
+    const char* pszName = nullptr;
     uint32_t flags = RegionFlags::Expanding;
     float ratio = 1.0f;
     NRectf rect;
     NVec2f min_size = NVec2f(0.0f, 0.0f);
     NVec2f fixed_size = NVec2f(0.0f, 0.0f);
     bool vertical = true;
 
-    Region* pParent = nullptr;
+    std::shared_ptr<Region> pParent;
     std::vector<std::shared_ptr<Region>> children;
 };
 
 inline std::ostream& operator<<(std::ostream& str, const Region& region)
 {
-    str << region.rect;
+    static int indent = 0;
+    auto do_indent = [&str](int sz) { for (int i = 0; i < sz; i++) str << " "; };
+
+    do_indent(indent);
+    if (region.pszName)
+        str << region.pszName << " ";
+    str << std::hex << &region << " -> ";
+
+    str << "RC: " << region.rect << ", pParent: " << std::hex << region.pParent;
+    if (!region.children.empty())
+    {
+        str << std::endl;
+        for (auto& child : region.children)
+        {
+            indent++;
+            str << *child;
+            indent--;
+        }
+    }
+    str << std::endl;
+
     return str;
 }
 
 void LayoutRegion(Region& region);
 
+
 } // namespace Zep