bump version

Add regex search, search/replace, and buffer read-only mode functionality with help text
add regex and search/replace functionality to editor
2025-12-01 11:22:47 -08:00 · 2025-12-01 02:54:40 -08:00 · 2025-11-30 23:33:17 -08:00 · 2025-11-30 22:02:43 -08:00 · 2025-11-30 22:02:23 -08:00
19 changed files with 1328 additions and 450 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 !.idea
 cmake-build*
 build
+/imgui.ini
+result
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -33,10 +33,20 @@
    </configurations>
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="e1fe3ab0-3650-4fca-8664-a247d5dfa457" name="Changes" comment="Actually add the screenshot.">
+    <list default="true" id="e1fe3ab0-3650-4fca-8664-a247d5dfa457" name="Changes" comment="add regex and search/replace functionality to editor">
+      <change afterPath="$PROJECT_DIR$/HelpText.cc" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/HelpText.h" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Buffer.cc" beforeDir="false" afterPath="$PROJECT_DIR$/Buffer.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Buffer.h" beforeDir="false" afterPath="$PROJECT_DIR$/Buffer.h" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Command.cc" beforeDir="false" afterPath="$PROJECT_DIR$/Command.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Command.h" beforeDir="false" afterPath="$PROJECT_DIR$/Command.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Editor.h" beforeDir="false" afterPath="$PROJECT_DIR$/Editor.h" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/GUIRenderer.cc" beforeDir="false" afterPath="$PROJECT_DIR$/GUIRenderer.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/KKeymap.cc" beforeDir="false" afterPath="$PROJECT_DIR$/KKeymap.cc" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ROADMAP.md" beforeDir="false" afterPath="$PROJECT_DIR$/ROADMAP.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/TerminalRenderer.cc" beforeDir="false" afterPath="$PROJECT_DIR$/TerminalRenderer.cc" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -63,10 +73,14 @@
  <component name="HighlightingSettingsPerFile">
    <setting file="mock:///AIAssistantSnippet.." root0="SKIP_HIGHLIGHTING" />
    <setting file="mock:///AIAssistantSnippet.." root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///AIAssistantSnippet.." root0="SKIP_HIGHLIGHTING" />
  </component>
  <component name="OptimizeOnSaveOptions">
    <option name="myRunOnSave" value="true" />
  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="AISelfReview" />
+  </component>
  <component name="ProjectApplicationVersion">
    <option name="ide" value="CLion" />
    <option name="majorVersion" value="2025" />
@@ -139,7 +153,7 @@
        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
      </method>
    </configuration>
-    <configuration name="kge" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$PROJECT_DIR$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="kte" TARGET_NAME="kge" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="kte" RUN_TARGET_NAME="kge">
+    <configuration name="kge" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="$PROJECT_DIR$/cmake-build-debug/test.txt" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" WORKING_DIR="file://$PROJECT_DIR$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="kte" TARGET_NAME="kge" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="kte" RUN_TARGET_NAME="kge">
      <method v="2">
        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
      </method>
@@ -170,7 +184,7 @@
      <workItem from="1764539556448" duration="156000" />
      <workItem from="1764539725338" duration="1075000" />
      <workItem from="1764542392763" duration="3512000" />
-      <workItem from="1764548345516" duration="12773000" />
+      <workItem from="1764548345516" duration="28341000" />
    </task>
    <task id="LOCAL-00001" summary="Add undo/redo infrastructure and buffer management additions.">
      <option name="closed" value="true" />
@@ -284,7 +298,23 @@
      <option name="project" value="LOCAL" />
      <updated>1764557759844</updated>
    </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Fix void crash in kge.">
+      <option name="closed" value="true" />
+      <created>1764568264996</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1764568264996</updated>
+    </task>
+    <task id="LOCAL-00016" summary="add regex and search/replace functionality to editor">
+      <option name="closed" value="true" />
+      <created>1764574397967</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1764574397967</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -312,7 +342,9 @@
    <MESSAGE value="Introduce file picker and GUI configuration with enhancements.&#10;&#10;- Add visual file picker for GUI with toggle support.&#10;- Introduce `GUIConfig` class for loading GUI settings from configuration file.&#10;- Refactor window initialization to support dynamic sizing based on configuration.&#10;- Add macOS-specific handling for fullscreen behavior.&#10;- Improve header inclusion order and minor code cleanup." />
    <MESSAGE value="Add buffer position display and documentation improvements.&#10;&#10;- Display buffer position prefix &quot;[x/N]&quot; in GUI and terminal renderers.&#10;- Improve `kte` and `kge` man pages with frontend usage details and project homepage.&#10;- Update README with GUI invocation instructions.&#10;- Bump version to 1.0.0." />
    <MESSAGE value="Actually add the screenshot." />
-    <option name="LAST_COMMIT_MESSAGE" value="Actually add the screenshot." />
+    <MESSAGE value="Fix void crash in kge." />
+    <MESSAGE value="add regex and search/replace functionality to editor" />
+    <option name="LAST_COMMIT_MESSAGE" value="add regex and search/replace functionality to editor" />
  </component>
  <component name="XSLT-Support.FileAssociations.UIState">
    <expand />
--- a/Buffer.cc
+++ b/Buffer.cc
@@ -36,6 +36,7 @@ Buffer::Buffer(const Buffer &other)
 	filename_       = other.filename_;
 	is_file_backed_ = other.is_file_backed_;
 	dirty_          = other.dirty_;
+	read_only_      = other.read_only_;
 	mark_set_       = other.mark_set_;
 	mark_curx_      = other.mark_curx_;
 	mark_cury_      = other.mark_cury_;
@@ -60,6 +61,7 @@ Buffer::operator=(const Buffer &other)
 	filename_       = other.filename_;
 	is_file_backed_ = other.is_file_backed_;
 	dirty_          = other.dirty_;
+	read_only_      = other.read_only_;
 	mark_set_       = other.mark_set_;
 	mark_curx_      = other.mark_curx_;
 	mark_cury_      = other.mark_cury_;
@@ -82,6 +84,7 @@ Buffer::Buffer(Buffer &&other) noexcept
 	  filename_(std::move(other.filename_)),
 	  is_file_backed_(other.is_file_backed_),
 	  dirty_(other.dirty_),
+	  read_only_(other.read_only_),
 	  mark_set_(other.mark_set_),
 	  mark_curx_(other.mark_curx_),
 	  mark_cury_(other.mark_cury_),
@@ -112,6 +115,7 @@ Buffer::operator=(Buffer &&other) noexcept
 	filename_       = std::move(other.filename_);
 	is_file_backed_ = other.is_file_backed_;
 	dirty_          = other.dirty_;
+	read_only_      = other.read_only_;
 	mark_set_       = other.mark_set_;
 	mark_curx_      = other.mark_curx_;
 	mark_cury_      = other.mark_cury_;
@@ -366,7 +370,7 @@ Buffer::insert_text(int row, int col, std::string_view text)
 		// Split line at x
  std::string tail = rows_[y].substr(x);
  rows_[y].erase(x);
-		rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1), tail);
+  rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1), Line(tail));
 		y += 1;
 		x = 0;
 		remain.erase(0, pos + 1);
@@ -427,7 +431,7 @@ Buffer::split_line(int row, const int col)
 	const auto x    = std::min<std::size_t>(static_cast<std::size_t>(col), rows_[y].size());
 	const auto tail = rows_[y].substr(x);
 rows_[y].erase(x);
-	rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1), tail);
+ rows_.insert(rows_.begin() + static_cast<std::ptrdiff_t>(y + 1), Line(tail));
 }


@@ -455,7 +459,7 @@ Buffer::insert_row(int row, const std::string_view text)
 		row = 0;
 	if (static_cast<std::size_t>(row) > rows_.size())
 		row = static_cast<int>(rows_.size());
-	rows_.insert(rows_.begin() + row, std::string(text));
+ rows_.insert(rows_.begin() + row, Line(std::string(text)));
 }


--- a/Buffer.h
+++ b/Buffer.h
@@ -77,13 +77,13 @@ public:
 		Line() = default;


-		Line(const char *s)
+		explicit Line(const char *s)
 		{
 			assign_from(s ? std::string(s) : std::string());
 		}


-		Line(const std::string &s)
+		explicit Line(const std::string &s)
 		{
 			assign_from(s);
 		}
@@ -139,29 +139,38 @@ public:


 		// conversions
-		operator std::string() const
+		explicit operator std::string() const
 		{
-			return std::string(buf_.Data() ? buf_.Data() : "", buf_.Size());
+			return {buf_.Data() ? buf_.Data() : "", buf_.Size()};
 		}


 		// string-like API used by command/renderer layers (implemented via materialization for now)
-		std::string substr(std::size_t pos) const
+		[[nodiscard]] std::string substr(std::size_t pos) const
 		{
 			const std::size_t n = buf_.Size();
 			if (pos >= n)
-				return std::string();
-			return std::string(buf_.Data() + pos, n - pos);
+				return {};
+			return {buf_.Data() + pos, n - pos};
 		}


-		std::string substr(std::size_t pos, std::size_t len) const
+		[[nodiscard]] std::string substr(std::size_t pos, std::size_t len) const
 		{
 			const std::size_t n = buf_.Size();
 			if (pos >= n)
-				return std::string();
+				return {};
 			const std::size_t take = (pos + len > n) ? (n - pos) : len;
-			return std::string(buf_.Data() + pos, take);
+			return {buf_.Data() + pos, take};
+		}
+
+
+		// minimal find() to support search within a line
+		[[nodiscard]] std::size_t find(const std::string &needle, const std::size_t pos = 0) const
+		{
+			// Materialize to std::string for now; Line is backed by AppendBuffer
+			const auto s = static_cast<std::string>(*this);
+			return s.find(needle, pos);
 		}


@@ -253,6 +262,14 @@ public:
 		return filename_;
 	}

+	// Set a virtual (non file-backed) display name for this buffer, e.g. "+HELP+"
+	// This does not mark the buffer as file-backed.
+	void SetVirtualName(const std::string &name)
+	{
+		filename_ = name;
+		is_file_backed_ = false;
+	}
+

 	[[nodiscard]] bool IsFileBacked() const
 	{
@@ -265,21 +282,37 @@ public:
     return dirty_;
 }

+ // Read-only flag
+ [[nodiscard]] bool IsReadOnly() const
+ {
+     return read_only_;
+ }

-	void SetCursor(std::size_t x, std::size_t y)
+ void SetReadOnly(bool ro)
+ {
+     read_only_ = ro;
+ }
+
+ void ToggleReadOnly()
+ {
+     read_only_ = !read_only_;
+ }
+
+
+	void SetCursor(const std::size_t x, const std::size_t y)
 	{
 		curx_ = x;
 		cury_ = y;
 	}


-	void SetRenderX(std::size_t rx)
+	void SetRenderX(const std::size_t rx)
 	{
 		rx_ = rx;
 	}


-	void SetOffsets(std::size_t row, std::size_t col)
+	void SetOffsets(const std::size_t row, const std::size_t col)
 	{
 		rowoffs_ = row;
 		coloffs_ = col;
@@ -299,7 +332,7 @@ public:
 	}


-	void SetMark(std::size_t x, std::size_t y)
+	void SetMark(const std::size_t x, const std::size_t y)
 	{
 		mark_set_  = true;
 		mark_curx_ = x;
@@ -344,7 +377,7 @@ public:
 	// Undo system accessors (created per-buffer)
 	UndoSystem *Undo();

-	const UndoSystem *Undo() const;
+	[[nodiscard]] const UndoSystem *Undo() const;

 private:
    // State mirroring original C struct (without undo_tree)
@@ -356,6 +389,7 @@ private:
 	std::string filename_;
 bool is_file_backed_   = false;
 bool dirty_            = false;
+ bool read_only_        = false;
 bool mark_set_         = false;
 std::size_t mark_curx_ = 0, mark_cury_ = 0;

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,15 @@ project(kte)
 include(GNUInstallDirs)

 set(CMAKE_CXX_STANDARD 17)
-set(KTE_VERSION "1.0.4")
+set(KTE_VERSION "1.0.5")

 # Default to terminal-only build to avoid SDL/OpenGL dependency by default.
 # Enable with -DBUILD_GUI=ON when SDL2/OpenGL/Freetype are available.
-set(BUILD_GUI OFF CACHE BOOL "Enable building the graphical version.")
+set(BUILD_GUI ON CACHE BOOL "Enable building the graphical version.")
 set(BUILD_TESTS OFF CACHE BOOL "Enable building test programs.")
 option(KTE_USE_PIECE_TABLE "Use PieceTable instead of GapBuffer implementation" ON)
 set(KTE_FONT_SIZE "18.0" CACHE STRING "Default font size for GUI")
+option(KTE_UNDO_DEBUG "Enable undo instrumentation logs" OFF)

 if (CMAKE_HOST_UNIX)
    message(STATUS "Build system is POSIX.")
@@ -55,6 +56,7 @@ set(COMMON_SOURCES
        Buffer.cc
        Editor.cc
        Command.cc
+        HelpText.cc
        KKeymap.cc
        TerminalInputHandler.cc
        TerminalRenderer.cc
@@ -74,6 +76,7 @@ set(COMMON_HEADERS
        Editor.h
        AppendBuffer.h
        Command.h
+        HelpText.h
        KKeymap.h
        InputHandler.h
        TerminalInputHandler.h
@@ -99,6 +102,9 @@ add_executable(kte
 if (KTE_USE_PIECE_TABLE)
    target_compile_definitions(kte PRIVATE KTE_USE_PIECE_TABLE=1)
 endif ()
+if (KTE_UNDO_DEBUG)
+    target_compile_definitions(kte PRIVATE KTE_UNDO_DEBUG=1)
+endif ()

 target_link_libraries(kte ${CURSES_LIBRARIES})

@@ -121,6 +127,10 @@ if (BUILD_TESTS)
        target_compile_definitions(test_undo PRIVATE KTE_USE_PIECE_TABLE=1)
    endif ()

+    if (KTE_UNDO_DEBUG)
+        target_compile_definitions(test_undo PRIVATE KTE_UNDO_DEBUG=1)
+    endif ()
+

    target_link_libraries(test_undo ${CURSES_LIBRARIES})
 endif ()
@@ -153,6 +163,9 @@ if (${BUILD_GUI})
            GUIFrontend.cc
            GUIFrontend.h)
    target_compile_definitions(kge PRIVATE KTE_BUILD_GUI=1 KTE_DEFAULT_GUI=1 KTE_FONT_SIZE=${KTE_FONT_SIZE})
+    if (KTE_UNDO_DEBUG)
+        target_compile_definitions(kge PRIVATE KTE_UNDO_DEBUG=1)
+    endif ()
    target_link_libraries(kge ${CURSES_LIBRARIES} imgui)

    # On macOS, build kge as a proper .app bundle
--- a/Command.cc
+++ b/Command.cc
@@ -1,11 +1,15 @@
 #include <algorithm>
 #include <filesystem>
 #include <cstdlib>
+#include <regex>
+#include <fstream>
+#include <sstream>

 #include "Command.h"
 #include "Editor.h"
 #include "Buffer.h"
 #include "UndoSystem.h"
+#include "HelpText.h"


 // Keep buffer viewport offsets so that the cursor stays within the visible
@@ -61,7 +65,7 @@ ensure_cursor_visible(const Editor &ed, Buffer &buf)
 	std::size_t rx    = 0;
 	const auto &lines = buf.Rows();
 if (cury < lines.size()) {
-		rx = compute_render_x(lines[cury], curx, 8);
+        rx = compute_render_x(static_cast<std::string>(lines[cury]), curx, 8);
    }
 	if (rx < coloffs) {
 		coloffs = rx;
@@ -83,6 +87,31 @@ ensure_at_least_one_line(Buffer &buf)
 	}
 }

+// Determine if a command mutates the buffer contents (text edits)
+static bool is_mutating_command(CommandId id)
+{
+    switch (id) {
+    case CommandId::InsertText:
+    case CommandId::Newline:
+    case CommandId::Backspace:
+    case CommandId::DeleteChar:
+    case CommandId::KillToEOL:
+    case CommandId::KillLine:
+    case CommandId::Yank:
+    case CommandId::DeleteWordPrev:
+    case CommandId::DeleteWordNext:
+    case CommandId::IndentRegion:
+    case CommandId::UnindentRegion:
+    case CommandId::ReflowParagraph:
+    case CommandId::KillRegion:
+    case CommandId::Undo:
+    case CommandId::Redo:
+        return true;
+    default:
+        return false;
+    }
+}
+

 // --- UI/status helpers ---
 static bool
@@ -148,7 +177,7 @@ extract_region_text(const Buffer &buf, std::size_t sx, std::size_t sy, std::size
    }
    // middle lines full
    for (std::size_t y = sy + 1; y < ey; ++y) {
-		out += rows[y];
+        out += static_cast<std::string>(rows[y]);
        out += '\n';
    }
 	// last line head
@@ -238,7 +267,7 @@ insert_text_at_cursor(Buffer &buf, const std::string &text)
 		std::string after = rows[cur_y].substr(cur_x);
 		rows[cur_y].erase(cur_x);
 		// create new line after current with the 'after' tail
-		rows.insert(rows.begin() + static_cast<std::ptrdiff_t>(cur_y + 1), after);
+  rows.insert(rows.begin() + static_cast<std::ptrdiff_t>(cur_y + 1), Buffer::Line(after));
 		// move to start of next line
 		cur_y += 1;
 		cur_x = 0;
@@ -327,7 +356,7 @@ cmd_move_cursor_to(CommandContext &ctx)
 					}
 					if (by >= lines2.size())
 						by = lines2.size() - 1;
-					const std::string &line2 = lines2[by];
+     std::string line2 = static_cast<std::string>(lines2[by]);
 					std::size_t rx_target    = bco + vx;
 					std::size_t sx           = inverse_render_to_source_col(line2, rx_target, 8);
 					row                      = by;
@@ -347,7 +376,7 @@ cmd_move_cursor_to(CommandContext &ctx)
 	}
 	if (row >= lines.size())
 		row = lines.size() - 1;
-	const std::string &line = lines[row];
+ std::string line = static_cast<std::string>(lines[row]);
 	if (col > line.size())
 		col = line.size();
 	buf->SetCursor(col, row);
@@ -365,7 +394,7 @@ search_compute_matches(const Buffer &buf, const std::string &q)
 		return out;
 	const auto &rows = buf.Rows();
 for (std::size_t y = 0; y < rows.size(); ++y) {
-		const std::string &line = rows[y];
+        std::string line = static_cast<std::string>(rows[y]);
        std::size_t pos         = 0;
        while (!q.empty() && (pos = line.find(q, pos)) != std::string::npos) {
            out.emplace_back(y, pos);
@@ -376,6 +405,71 @@ search_compute_matches(const Buffer &buf, const std::string &q)
 }


+// Regex-based matches (per-line), capturing match length for highlighting
+struct RegexMatch {
+	std::size_t y;
+	std::size_t x;
+	std::size_t len;
+};
+
+
+static std::vector<RegexMatch>
+search_compute_matches_regex(const Buffer &buf, const std::string &pattern, std::string &err_out)
+{
+	std::vector<RegexMatch> out;
+	err_out.clear();
+	if (pattern.empty())
+		return out;
+	try {
+		const std::regex rx(pattern);
+		const auto &rows = buf.Rows();
+  for (std::size_t y = 0; y < rows.size(); ++y) {
+            std::string line = static_cast<std::string>(rows[y]);
+            for (auto it = std::sregex_iterator(line.begin(), line.end(), rx);
+                 it != std::sregex_iterator(); ++it) {
+                const auto &m = *it;
+                out.push_back(RegexMatch{
+                    y, static_cast<std::size_t>(m.position()), static_cast<std::size_t>(m.length())
+                });
+            }
+        }
+	} catch (const std::regex_error &e) {
+		err_out = e.what();
+		// Return empty results on error
+	}
+	return out;
+}
+
+
+static void
+search_apply_match_regex(Editor &ed, Buffer &buf, const std::vector<RegexMatch> &matches)
+{
+	const std::string &q = ed.SearchQuery();
+	if (matches.empty()) {
+		ed.SetSearchMatch(0, 0, 0);
+		// Restore cursor to origin if present
+		if (ed.SearchOriginSet()) {
+			buf.SetCursor(ed.SearchOrigX(), ed.SearchOrigY());
+			buf.SetOffsets(ed.SearchOrigRowoffs(), ed.SearchOrigColoffs());
+		}
+		ed.SetSearchIndex(-1);
+		ed.SetStatus("Regex: " + q);
+		return;
+	}
+	int idx = ed.SearchIndex();
+	if (idx < 0 || idx >= static_cast<int>(matches.size()))
+		idx = 0;
+	const auto &m = matches[static_cast<std::size_t>(idx)];
+	ed.SetSearchMatch(m.y, m.x, m.len);
+	buf.SetCursor(m.x, m.y);
+	ensure_cursor_visible(ed, buf);
+	char tmp[64];
+	snprintf(tmp, sizeof(tmp), "%d/%zu", idx + 1, matches.size());
+	ed.SetStatus(std::string("Regex: ") + q + "  " + tmp);
+	ed.SetSearchIndex(idx);
+}
+
+
 static void
 search_apply_match(Editor &ed, Buffer &buf, const std::vector<std::pair<std::size_t, std::size_t> > &matches)
 {
@@ -666,6 +760,77 @@ cmd_find_start(CommandContext &ctx)
 }


+static bool
+cmd_regex_find_start(CommandContext &ctx)
+{
+	Buffer *buf = ctx.editor.CurrentBuffer();
+	if (!buf) {
+		ctx.editor.SetStatus("No buffer to search");
+		return false;
+	}
+
+	// Save origin for cancel
+	ctx.editor.SetSearchOrigin(buf->Curx(), buf->Cury(), buf->Rowoffs(), buf->Coloffs());
+
+	// Enter regex search mode using the generic prompt system
+	ctx.editor.SetSearchActive(true);
+	ctx.editor.SetSearchQuery("");
+	ctx.editor.SetSearchMatch(0, 0, 0);
+	ctx.editor.SetSearchIndex(-1);
+	ctx.editor.StartPrompt(Editor::PromptKind::RegexSearch, "Regex", "");
+	ctx.editor.SetStatus("Regex: ");
+	return true;
+}
+
+
+static bool
+cmd_search_replace_start(CommandContext &ctx)
+{
+	Buffer *buf = ctx.editor.CurrentBuffer();
+	if (!buf) {
+		ctx.editor.SetStatus("No buffer to search");
+		return false;
+	}
+	// Save original cursor/viewport to restore on cancel
+	ctx.editor.SetSearchOrigin(buf->Curx(), buf->Cury(), buf->Rowoffs(), buf->Coloffs());
+	// Enter search-highlighting mode for the find step
+	ctx.editor.SetSearchActive(true);
+	ctx.editor.SetSearchQuery("");
+	ctx.editor.SetSearchMatch(0, 0, 0);
+	ctx.editor.SetSearchIndex(-1);
+	// Two-step prompt: first collect find string, then replacement
+	ctx.editor.SetReplaceFindTmp("");
+	ctx.editor.SetReplaceWithTmp("");
+	ctx.editor.StartPrompt(Editor::PromptKind::ReplaceFind, "Replace: find", "");
+	ctx.editor.SetStatus("Replace: find: ");
+	return true;
+}
+
+
+static bool
+cmd_regex_replace_start(CommandContext &ctx)
+{
+    Buffer *buf = ctx.editor.CurrentBuffer();
+    if (!buf) {
+        ctx.editor.SetStatus("No buffer to search");
+        return false;
+    }
+    // Save original cursor/viewport to restore on cancel
+    ctx.editor.SetSearchOrigin(buf->Curx(), buf->Cury(), buf->Rowoffs(), buf->Coloffs());
+    // Enter search-highlighting mode for the find step (regex)
+    ctx.editor.SetSearchActive(true);
+    ctx.editor.SetSearchQuery("");
+    ctx.editor.SetSearchMatch(0, 0, 0);
+    ctx.editor.SetSearchIndex(-1);
+    // Two-step prompt: first collect regex find pattern, then replacement
+    ctx.editor.SetReplaceFindTmp("");
+    ctx.editor.SetReplaceWithTmp("");
+    ctx.editor.StartPrompt(Editor::PromptKind::RegexReplaceFind, "Regex replace: find", "");
+    ctx.editor.SetStatus("Regex replace: find: ");
+    return true;
+}
+
+
 static bool
 cmd_open_file_start(CommandContext &ctx)
 {
@@ -955,13 +1120,30 @@ cmd_insert_text(CommandContext &ctx)

 		ctx.editor.AppendPromptText(ctx.arg);
 		// If it's a search prompt, mirror text to search state
-		if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search) {
+  if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search ||
+      ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+      ctx.editor.CurrentPromptKind() == Editor::PromptKind::ReplaceFind ||
+      ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind) {
      ctx.editor.SetSearchQuery(ctx.editor.PromptText());
+      if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+          ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind) {
+          std::string err;
+          auto rmatches = search_compute_matches_regex(*buf, ctx.editor.SearchQuery(), err);
+          if (!err.empty()) {
+              ctx.editor.SetStatus(
+                  std::string("Regex: ") + ctx.editor.PromptText() + "  [error: " + err +
+                  "]");
+          }
+          if (ctx.editor.SearchIndex() >= static_cast<int>(rmatches.size()))
+              ctx.editor.SetSearchIndex(rmatches.empty() ? -1 : 0);
+          search_apply_match_regex(ctx.editor, *buf, rmatches);
+      } else {
          auto matches = search_compute_matches(*buf, ctx.editor.SearchQuery());
          // Keep index stable unless out of range
          if (ctx.editor.SearchIndex() >= static_cast<int>(matches.size()))
              ctx.editor.SetSearchIndex(matches.empty() ? -1 : 0);
          search_apply_match(ctx.editor, *buf, matches);
+      }
  } else {
      // For other prompts, just echo label:text in status
      ctx.editor.SetStatus(ctx.editor.PromptLabel() + ": " + ctx.editor.PromptText());
@@ -979,7 +1161,7 @@ cmd_insert_text(CommandContext &ctx)
 		std::vector<std::pair<std::size_t, std::size_t> > matches;
 		if (!q.empty()) {
 			for (std::size_t y = 0; y < rows.size(); ++y) {
-				const std::string &line = rows[y];
+    std::string line = static_cast<std::string>(rows[y]);
 				std::size_t pos         = 0;
 				while (!q.empty() && (pos = line.find(q, pos)) != std::string::npos) {
 					matches.emplace_back(y, pos);
@@ -1041,6 +1223,204 @@ cmd_insert_text(CommandContext &ctx)
 	return true;
 }

+// Toggle read-only state of the current buffer
+static bool
+cmd_toggle_read_only(CommandContext &ctx)
+{
+    Buffer *buf = ctx.editor.CurrentBuffer();
+    if (!buf) {
+        ctx.editor.SetStatus("No buffer");
+        return false;
+    }
+    buf->ToggleReadOnly();
+    ctx.editor.SetStatus(std::string("Read-only: ") + (buf->IsReadOnly() ? "ON" : "OFF"));
+    return true;
+}
+
+
+// Open or refresh the +HELP+ buffer with content from docs/kte.1
+static bool
+cmd_show_help(CommandContext &ctx)
+{
+    const std::string help_name = "+HELP+";
+    // Try to locate existing +HELP+ buffer
+    std::vector<Buffer> &bufs = ctx.editor.Buffers();
+    std::size_t help_index = static_cast<std::size_t>(-1);
+    for (std::size_t i = 0; i < bufs.size(); ++i) {
+        if (bufs[i].Filename() == help_name && !bufs[i].IsFileBacked()) {
+            help_index = i;
+            break;
+        }
+    }
+
+    auto roff_to_text = [](const std::string &in) -> std::string {
+        std::istringstream iss(in);
+        std::ostringstream out;
+        std::string line;
+        auto unquote = [](std::string s) {
+            if (!s.empty() && (s.front() == '"' || s.front() == '\'')) s.erase(s.begin());
+            if (!s.empty() && (s.back() == '"' || s.back() == '\'')) s.pop_back();
+            return s;
+        };
+        while (std::getline(iss, line)) {
+            if (line.rfind("'", 0) == 0) {
+                continue; // comment line
+            }
+            if (line.rfind(".", 0) == 0) {
+                // Macro line
+                std::istringstream ls(line);
+                std::string dot, macro;
+                ls >> dot >> macro;
+                if (macro == "TH" || macro == "SH") {
+                    std::string title;
+                    std::getline(ls, title);
+                    // trim leading spaces
+                    while (!title.empty() && (title.front() == ' ' || title.front() == '\t')) title.erase(title.begin());
+                    title = unquote(title);
+                    out << "\n\n";
+                    for (auto &c : title) c = static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
+                    out << title << "\n";
+                } else if (macro == "PP" || macro == "P" || macro == "TP") {
+                    out << "\n";
+                } else if (macro == "B" || macro == "I" || macro == "BR" || macro == "IR") {
+                    std::string rest;
+                    std::getline(ls, rest);
+                    while (!rest.empty() && (rest.front() == ' ' || rest.front() == '\t')) rest.erase(rest.begin());
+                    out << unquote(rest) << "\n";
+                } else if (macro == "nf" || macro == "fi") {
+                    // ignore fill mode toggles for now
+                } else {
+                    // Unhandled macro: ignore
+                }
+                continue;
+            }
+            // Regular text; apply minimal escape replacements
+            for (std::size_t i = 0; i < line.size(); ++i) {
+                if (line[i] == '\\') {
+                    if (i + 1 < line.size() && line[i + 1] == '-') { out << '-'; ++i; continue; }
+                    if (i + 3 < line.size() && line[i + 1] == '(') {
+                        std::string esc = line.substr(i + 2, 2);
+                        if (esc == "em") { out << "—"; i += 3; continue; }
+                        if (esc == "en") { out << "-"; i += 3; continue; }
+                    }
+                }
+                out << line[i];
+            }
+            out << "\n";
+        }
+        return out.str();
+    };
+
+    auto load_help_text = [&](bool &used_man) -> std::string {
+        // 1) Prefer embedded/customizable help content
+        {
+            std::string embedded = HelpText::Text();
+            if (!embedded.empty()) { used_man = false; return embedded; }
+        }
+
+        // 2) Fall back to the manpage and convert roff to plain text
+        const char *man_candidates[] = {
+            "docs/kte.1",
+            "./docs/kte.1",
+            "/usr/local/share/man/man1/kte.1",
+            "/usr/share/man/man1/kte.1"
+        };
+        for (const char *p : man_candidates) {
+            std::ifstream in(p);
+            if (in.good()) {
+                std::string s((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
+                if (!s.empty()) { used_man = true; return roff_to_text(s); }
+            }
+        }
+        // Fallback minimal help text
+        used_man = false;
+        return std::string(
+            "KTE - Kyle's Text Editor\n\n"
+            "About:\n"
+            "  kte is Kyle's Text Editor and is probably ill-suited to everyone else. It was\n"
+            "  inspired by Antirez' kilo text editor by way of someone's writeup of the\n"
+            "  process of writing a text editor from scratch. It has keybindings inspired by\n"
+            "  VDE (and the Wordstar family) and emacs; its spiritual parent is mg(1).\n\n"
+            "Core keybindings:\n"
+            "  C-k h        Show this help\n"
+            "  C-k s        Save buffer\n"
+            "  C-k x        Save and quit\n"
+            "  C-k q        Quit (confirm if dirty)\n"
+            "  C-k C-q      Quit now (no confirm)\n"
+            "  C-k c        Close current buffer\n"
+            "  C-k b        Switch buffer\n"
+            "  C-k p        Next buffer\n"
+            "  C-k n        Previous buffer\n"
+            "  C-k e        Open file (prompt)\n"
+            "  C-k g        Jump to line\n"
+            "  C-k u        Undo\n"
+            "  C-k r        Redo\n"
+            "  C-k d        Kill to end of line\n"
+            "  C-k C-d      Kill entire line\n"
+            "  C-k =        Indent region\n"
+            "  C-k -        Unindent region\n"
+            "  C-k '        Toggle read-only\n"
+            "  C-k l        Reload buffer from disk\n"
+            "  C-k a        Mark all and jump to end\n"
+            "  C-k v        Toggle visual file picker (GUI)\n"
+            "  C-k w        Show working directory\n"
+            "  C-k o        Change working directory (prompt)\n\n"
+            "ESC/Alt commands:\n"
+            "  ESC q        Reflow paragraph\n"
+            "  ESC BACKSPACE Delete previous word\n"
+            "  ESC d        Delete next word\n"
+            "  Alt-w        Copy region to kill ring\n\n"
+            "Buffers:\n  +HELP+ is read-only. Press C-k ' to toggle if you need to edit; C-k h restores it.\n");
+    };
+
+    auto populate_from_text = [](Buffer &b, const std::string &text) {
+        auto &rows = b.Rows();
+        rows.clear();
+        std::string line;
+        line.reserve(128);
+        for (char ch : text) {
+            if (ch == '\n') {
+                rows.emplace_back(line);
+                line.clear();
+            } else if (ch != '\r') {
+                line.push_back(ch);
+            }
+        }
+        // Add last line (even if empty)
+        rows.emplace_back(line);
+        b.SetDirty(false);
+        b.SetCursor(0, 0);
+        b.SetOffsets(0, 0);
+        b.SetRenderX(0);
+    };
+
+    if (help_index != static_cast<std::size_t>(-1)) {
+        Buffer &hb = bufs[help_index];
+        // If dirty, overwrite with original contents
+        if (hb.Dirty()) {
+            bool used_man = false;
+            std::string text = load_help_text(used_man);
+            populate_from_text(hb, text);
+        }
+        hb.SetReadOnly(true);
+        ctx.editor.SwitchTo(help_index);
+        ctx.editor.SetStatus("Help opened");
+        return true;
+    }
+
+    // Create a new help buffer
+    Buffer help;
+    help.SetVirtualName(help_name);
+    bool used_man = false;
+    std::string text = load_help_text(used_man);
+    populate_from_text(help, text);
+    help.SetReadOnly(true);
+    std::size_t idx = ctx.editor.AddBuffer(std::move(help));
+    ctx.editor.SwitchTo(idx);
+    ctx.editor.SetStatus("Help opened");
+    return true;
+}
+

 static bool
 cmd_newline(CommandContext &ctx)
@@ -1050,15 +1430,113 @@ cmd_newline(CommandContext &ctx)
 		Editor::PromptKind kind = ctx.editor.CurrentPromptKind();
 		std::string value       = ctx.editor.PromptText();
 		ctx.editor.AcceptPrompt();
-		if (kind == Editor::PromptKind::Search) {
+		if (kind == Editor::PromptKind::Search || kind == Editor::PromptKind::RegexSearch) {
 			// Finish search: keep cursor where it is, clear search UI prompt
 			ctx.editor.SetSearchActive(false);
 			ctx.editor.SetSearchMatch(0, 0, 0);
 			ctx.editor.ClearSearchOrigin();
-			ctx.editor.SetStatus("Find done");
+			ctx.editor.SetStatus(kind == Editor::PromptKind::RegexSearch ? "Regex find done" : "Find done");
 			Buffer *b = ctx.editor.CurrentBuffer();
 			if (b)
 				ensure_cursor_visible(ctx.editor, *b);
+		} else if (kind == Editor::PromptKind::ReplaceFind) {
+			// Proceed to replacement text prompt
+			ctx.editor.SetReplaceFindTmp(value);
+			// Keep search highlights active using the collected find string
+			ctx.editor.SetSearchActive(true);
+			ctx.editor.SetSearchQuery(value);
+			if (Buffer *b = ctx.editor.CurrentBuffer()) {
+				auto matches = search_compute_matches(*b, ctx.editor.SearchQuery());
+				search_apply_match(ctx.editor, *b, matches);
+			}
+			ctx.editor.StartPrompt(Editor::PromptKind::ReplaceWith, "Replace: with", "");
+			ctx.editor.SetStatus("Replace: with: ");
+			return true;
+  } else if (kind == Editor::PromptKind::ReplaceWith) {
+            // Execute replace-all
+            Buffer *buf = ctx.editor.CurrentBuffer();
+            if (!buf)
+                return false;
+            if (buf->IsReadOnly()) {
+                ctx.editor.SetStatus("Read-only buffer");
+                // Clear search UI state
+                ctx.editor.SetSearchActive(false);
+                ctx.editor.SetSearchQuery("");
+                ctx.editor.SetSearchMatch(0, 0, 0);
+                ctx.editor.ClearSearchOrigin();
+                ctx.editor.SetSearchIndex(-1);
+                return true;
+            }
+            const std::string find = ctx.editor.ReplaceFindTmp();
+            const std::string with = value;
+            ctx.editor.SetReplaceWithTmp(with);
+			if (find.empty()) {
+				ctx.editor.SetStatus("Replace canceled (empty find)");
+				// Clear search UI state
+				ctx.editor.SetSearchActive(false);
+				ctx.editor.SetSearchQuery("");
+				ctx.editor.SetSearchMatch(0, 0, 0);
+				ctx.editor.ClearSearchOrigin();
+				ctx.editor.SetSearchIndex(-1);
+				return true;
+			}
+			// Save original cursor to restore after operations
+			std::size_t orig_x = buf->Curx();
+			std::size_t orig_y = buf->Cury();
+			auto &rows         = buf->Rows();
+			std::size_t total  = 0;
+			UndoSystem *u      = buf->Undo();
+			if (u)
+				u->commit(); // end any pending batch
+			for (std::size_t y = 0; y < rows.size(); ++y) {
+				std::size_t pos = 0;
+				while (!find.empty()) {
+					pos = rows[y].find(find, pos);
+					if (pos == std::string::npos)
+						break;
+					// Perform delete of matched segment
+					rows[y].erase(pos, find.size());
+					if (u) {
+						buf->SetCursor(pos, y);
+						u->Begin(UndoType::Delete);
+						u->Append(std::string_view(find));
+					}
+					// Insert replacement
+					if (!with.empty()) {
+						rows[y].insert(pos, with);
+						if (u) {
+							buf->SetCursor(pos, y);
+							u->Begin(UndoType::Insert);
+							u->Append(std::string_view(with));
+						}
+						pos += with.size();
+					}
+					++total;
+					if (with.empty()) {
+						// Avoid infinite loop when replacing with empty
+						// pos remains the same; move forward by 1 to continue search
+						if (pos < rows[y].size())
+							++pos;
+						else
+							break;
+					}
+				}
+			}
+			buf->SetDirty(true);
+			// Restore original cursor
+			if (orig_y < rows.size())
+				buf->SetCursor(orig_x, orig_y);
+			ensure_cursor_visible(ctx.editor, *buf);
+			char msg[128];
+			std::snprintf(msg, sizeof(msg), "Replaced %zu occurrence%s", total, (total == 1 ? "" : "s"));
+			ctx.editor.SetStatus(msg);
+			// Clear search-highlighting state after replace completes
+			ctx.editor.SetSearchActive(false);
+			ctx.editor.SetSearchQuery("");
+			ctx.editor.SetSearchMatch(0, 0, 0);
+			ctx.editor.ClearSearchOrigin();
+			ctx.editor.SetSearchIndex(-1);
+			return true;
 		} else if (kind == Editor::PromptKind::OpenFile) {
 			std::string err;
 			// Expand "~" to the user's home directory
@@ -1249,6 +1727,84 @@ cmd_newline(CommandContext &ctx)
 			} catch (const std::exception &e) {
 				ctx.editor.SetStatus(std::string("chdir failed: ") + e.what());
 			}
+		} else if (kind == Editor::PromptKind::RegexReplaceFind) {
+			// Proceed to regex replacement text prompt
+			ctx.editor.SetReplaceFindTmp(value);
+			// Keep search highlights active using the collected regex pattern
+			ctx.editor.SetSearchActive(true);
+			ctx.editor.SetSearchQuery(value);
+			if (Buffer *b = ctx.editor.CurrentBuffer()) {
+				std::string err;
+				auto rm = search_compute_matches_regex(*b, ctx.editor.SearchQuery(), err);
+				if (!err.empty()) {
+					ctx.editor.SetStatus(std::string("Regex: ") + value + "  [error: " + err + "]");
+				}
+				search_apply_match_regex(ctx.editor, *b, rm);
+			}
+			ctx.editor.StartPrompt(Editor::PromptKind::RegexReplaceWith, "Regex replace: with", "");
+			ctx.editor.SetStatus("Regex replace: with: ");
+			return true;
+  } else if (kind == Editor::PromptKind::RegexReplaceWith) {
+            // Execute regex replace-all
+            Buffer *buf = ctx.editor.CurrentBuffer();
+            if (!buf)
+                return false;
+            if (buf->IsReadOnly()) {
+                ctx.editor.SetStatus("Read-only buffer");
+                // Clear search UI state
+                ctx.editor.SetSearchActive(false);
+                ctx.editor.SetSearchQuery("");
+                ctx.editor.SetSearchMatch(0, 0, 0);
+                ctx.editor.ClearSearchOrigin();
+                ctx.editor.SetSearchIndex(-1);
+                return true;
+            }
+            const std::string patt = ctx.editor.ReplaceFindTmp();
+            const std::string repl = value;
+            ctx.editor.SetReplaceWithTmp(repl);
+			if (patt.empty()) {
+				ctx.editor.SetStatus("Regex replace canceled (empty pattern)");
+				ctx.editor.SetSearchActive(false);
+				ctx.editor.SetSearchQuery("");
+				ctx.editor.SetSearchMatch(0, 0, 0);
+				ctx.editor.ClearSearchOrigin();
+				ctx.editor.SetSearchIndex(-1);
+				return true;
+			}
+			std::regex rx;
+			try {
+				rx = std::regex(patt);
+			} catch (const std::regex_error &e) {
+				ctx.editor.SetStatus(std::string("Regex error: ") + e.what());
+				// Clear search UI state
+				ctx.editor.SetSearchActive(false);
+				ctx.editor.SetSearchQuery("");
+				ctx.editor.SetSearchMatch(0, 0, 0);
+				ctx.editor.ClearSearchOrigin();
+				ctx.editor.SetSearchIndex(-1);
+				return true;
+			}
+			auto &rows = buf->Rows();
+			std::size_t changed = 0;
+   for (auto &line : rows) {
+                std::string before = static_cast<std::string>(line);
+                std::string after  = std::regex_replace(before, rx, repl);
+                if (after != before) {
+                    line = after;
+                    ++changed;
+                }
+            }
+			buf->SetDirty(true);
+			ctx.editor.SetStatus("Regex replaced in " + std::to_string(changed) + " line(s)");
+			// Clear search UI state
+			ctx.editor.SetSearchActive(false);
+			ctx.editor.SetSearchQuery("");
+			ctx.editor.SetSearchMatch(0, 0, 0);
+			ctx.editor.ClearSearchOrigin();
+			ctx.editor.SetSearchIndex(-1);
+			if (auto *b = ctx.editor.CurrentBuffer())
+				ensure_cursor_visible(ctx.editor, *b);
+			return true;
 		}
 		return true;
 	}
@@ -1282,7 +1838,7 @@ cmd_newline(CommandContext &ctx)
 			tail = line.substr(x);
 			line.erase(x);
 		}
-		rows.insert(rows.begin() + static_cast<std::ptrdiff_t>(y + 1), tail);
+  rows.insert(rows.begin() + static_cast<std::ptrdiff_t>(y + 1), Buffer::Line(tail));
 		y += 1;
 		x = 0;
 	}
@@ -1304,13 +1860,28 @@ cmd_backspace(CommandContext &ctx)
 	// If a prompt is active, backspace edits the prompt text
 	if (ctx.editor.PromptActive()) {
 		ctx.editor.BackspacePromptText();
-		if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search) {
+        if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search ||
+            ctx.editor.CurrentPromptKind() == Editor::PromptKind::ReplaceFind ||
+            ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+            ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind) {
            Buffer *buf2 = ctx.editor.CurrentBuffer();
            if (buf2) {
                ctx.editor.SetSearchQuery(ctx.editor.PromptText());
+                if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+                    ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind) {
+                    std::string err;
+                    auto rm = search_compute_matches_regex(*buf2, ctx.editor.SearchQuery(), err);
+                    if (!err.empty()) {
+                        ctx.editor.SetStatus(
+                            std::string("Regex: ") + ctx.editor.PromptText() + "  [error: "
+                            + err + "]");
+                    }
+                    search_apply_match_regex(ctx.editor, *buf2, rm);
+                } else {
                    auto matches = search_compute_matches(*buf2, ctx.editor.SearchQuery());
                    search_apply_match(ctx.editor, *buf2, matches);
                }
+            }
        } else {
            ctx.editor.SetStatus(ctx.editor.PromptLabel() + ": " + ctx.editor.PromptText());
        }
@@ -1523,12 +2094,12 @@ cmd_kill_line(CommandContext &ctx)
 			break;
 		if (rows.size() == 1) {
 			// last remaining line: clear its contents
-			killed_total += rows[0];
+   killed_total += static_cast<std::string>(rows[0]);
 			rows[0].Clear();
 			y = 0;
 		} else if (y < rows.size()) {
 			// erase current line; keep y pointing at the next line
-			killed_total += rows[y];
+   killed_total += static_cast<std::string>(rows[y]);
 			killed_total += "\n";
 			rows.erase(rows.begin() + static_cast<std::ptrdiff_t>(y));
 			if (y >= rows.size()) {
@@ -1723,7 +2294,28 @@ cmd_move_left(CommandContext &ctx)
 	if (auto *u = buf->Undo())
 		u->commit();
 	// If a prompt is active and it's search, go to previous match
-	if (ctx.editor.PromptActive() && ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search) {
+	if (ctx.editor.PromptActive() &&
+	    (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search ||
+	     ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+	     ctx.editor.CurrentPromptKind() == Editor::PromptKind::ReplaceFind)) {
+		if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch) {
+			std::string err;
+			auto rmatches = search_compute_matches_regex(*buf, ctx.editor.SearchQuery(), err);
+			if (!err.empty()) {
+				ctx.editor.SetStatus(
+					std::string("Regex: ") + ctx.editor.PromptText() + "  [error: " + err + "]");
+			}
+			if (!rmatches.empty()) {
+				int idx = ctx.editor.SearchIndex();
+				if (idx < 0)
+					idx = 0;
+				idx = (idx - 1 + static_cast<int>(rmatches.size())) % static_cast<int>(rmatches.size());
+				ctx.editor.SetSearchIndex(idx);
+				search_apply_match_regex(ctx.editor, *buf, rmatches);
+			} else {
+				search_apply_match_regex(ctx.editor, *buf, rmatches);
+			}
+		} else {
 			auto matches = search_compute_matches(*buf, ctx.editor.SearchQuery());
 			if (!matches.empty()) {
 				int idx = ctx.editor.SearchIndex();
@@ -1735,6 +2327,7 @@ cmd_move_left(CommandContext &ctx)
 			} else {
 				search_apply_match(ctx.editor, *buf, matches);
 			}
+		}
 		return true;
 	}
 	if (ctx.editor.SearchActive()) {
@@ -1778,7 +2371,28 @@ cmd_move_right(CommandContext &ctx)
 		return false;
 	if (auto *u = buf->Undo())
 		u->commit();
-	if (ctx.editor.PromptActive() && ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search) {
+	if (ctx.editor.PromptActive() &&
+	    (ctx.editor.CurrentPromptKind() == Editor::PromptKind::Search ||
+	     ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch ||
+	     ctx.editor.CurrentPromptKind() == Editor::PromptKind::ReplaceFind)) {
+		if (ctx.editor.CurrentPromptKind() == Editor::PromptKind::RegexSearch) {
+			std::string err;
+			auto rmatches = search_compute_matches_regex(*buf, ctx.editor.SearchQuery(), err);
+			if (!err.empty()) {
+				ctx.editor.SetStatus(
+					std::string("Regex: ") + ctx.editor.PromptText() + "  [error: " + err + "]");
+			}
+			if (!rmatches.empty()) {
+				int idx = ctx.editor.SearchIndex();
+				if (idx < 0)
+					idx = 0;
+				idx = (idx + 1) % static_cast<int>(rmatches.size());
+				ctx.editor.SetSearchIndex(idx);
+				search_apply_match_regex(ctx.editor, *buf, rmatches);
+			} else {
+				search_apply_match_regex(ctx.editor, *buf, rmatches);
+			}
+		} else {
 			auto matches = search_compute_matches(*buf, ctx.editor.SearchQuery());
 			if (!matches.empty()) {
 				int idx = ctx.editor.SearchIndex();
@@ -1790,6 +2404,7 @@ cmd_move_right(CommandContext &ctx)
 			} else {
 				search_apply_match(ctx.editor, *buf, matches);
 			}
+		}
 		return true;
 	}
 	if (ctx.editor.SearchActive()) {
@@ -2209,7 +2824,7 @@ cmd_delete_word_prev(CommandContext &ctx)
 			// Then collect complete lines between y and start_y
 			for (std::size_t ly = y + 1; ly < start_y; ++ly) {
 				deleted += "\n";
-				deleted += rows[ly];
+    deleted += static_cast<std::string>(rows[ly]);
 			}
 			// Finally, collect from beginning of start_y to start_x
 			if (start_y < rows.size()) {
@@ -2306,7 +2921,7 @@ cmd_delete_word_next(CommandContext &ctx)
 			// Then collect complete lines between start_y and y
 			for (std::size_t ly = start_y + 1; ly < y; ++ly) {
 				deleted += "\n";
-				deleted += rows[ly];
+    deleted += static_cast<std::string>(rows[ly]);
 			}
 			// Finally, collect from beginning of y to x
 			if (y < rows.size()) {
@@ -2576,6 +3191,15 @@ InstallDefaultCommands()
 		cmd_unknown_kcommand
 	});
 	CommandRegistry::Register({CommandId::FindStart, "find-start", "Begin incremental search", cmd_find_start});
+	CommandRegistry::Register({
+		CommandId::RegexFindStart, "regex-find-start", "Begin regex search", cmd_regex_find_start
+	});
+	CommandRegistry::Register({
+		CommandId::RegexpReplace, "regex-replace", "Begin regex search & replace", cmd_regex_replace_start
+	});
+	CommandRegistry::Register({
+		CommandId::SearchReplace, "search-replace", "Begin search & replace", cmd_search_replace_start
+	});
 	CommandRegistry::Register({
 		CommandId::OpenFileStart, "open-file-start", "Begin open-file prompt", cmd_open_file_start
 	});
@@ -2645,9 +3269,15 @@ InstallDefaultCommands()
 CommandRegistry::Register({
     CommandId::ReflowParagraph, "reflow-paragraph", "Reflow paragraph to column width", cmd_reflow_paragraph
 });
+ // Read-only
+ CommandRegistry::Register({CommandId::ToggleReadOnly, "toggle-read-only", "Toggle buffer read-only", cmd_toggle_read_only});
 // Buffer operations
 CommandRegistry::Register({
     CommandId::ReloadBuffer, "reload-buffer", "Reload buffer from disk", cmd_reload_buffer
+ });
+ // Help
+ CommandRegistry::Register({
+     CommandId::ShowHelp, "help", "+HELP+ buffer with manual text", cmd_show_help
 });
 	CommandRegistry::Register({
 		CommandId::MarkAllAndJumpEnd, "mark-all-jump-end", "Set mark at beginning and jump to end",
@@ -2689,6 +3319,15 @@ Execute(Editor &ed, CommandId id, const std::string &arg, int count)
 	    CommandId::CopyRegion && id != CommandId::DeleteWordPrev && id != CommandId::DeleteWordNext) {
 		ed.SetKillChain(false);
 	}
+    // If buffer is read-only, block mutating commands outside of prompts
+    if (!ed.PromptActive()) {
+        Buffer *b = ed.CurrentBuffer();
+        if (b && b->IsReadOnly() && is_mutating_command(id)) {
+            ed.SetStatus("Read-only buffer");
+            return true; // treated as handled, but no change
+        }
+    }
+
    CommandContext ctx{ed, arg, count};
    return cmd->handler ? cmd->handler(ctx) : false;
 }
--- a/Command.h
+++ b/Command.h
@@ -23,8 +23,10 @@ enum class CommandId {
 	Refresh, // force redraw
 	KPrefix, // show "C-k _" prompt in status when entering k-command
 	FindStart, // begin incremental search (placeholder)
+	RegexFindStart, // begin regex search (C-r)
+	RegexpReplace, // begin regex search & replace (C-t)
+	SearchReplace, // begin search & replace (two-step prompt)
 	OpenFileStart, // begin open-file prompt
-	// GUI: visual file picker
 	VisualFilePickerToggle,
 	// Buffers
 	BufferSwitchStart, // begin buffer switch prompt
@@ -71,6 +73,8 @@ enum class CommandId {
 	IndentRegion, // indent region (C-k =)
 	UnindentRegion, // unindent region (C-k -)
 	ReflowParagraph, // reflow paragraph to column width (ESC q)
+	// Read-only buffers
+	ToggleReadOnly, // toggle current buffer read-only (C-k ')
 	// Buffer operations
 	ReloadBuffer, // reload buffer from disk (C-k l)
 	MarkAllAndJumpEnd, // set mark at beginning, jump to end (C-k a)
@@ -78,6 +82,8 @@ enum class CommandId {
 	JumpToLine, // prompt for line and jump (C-k g)
 	ShowWorkingDirectory, // Display the current working directory in the editor message.
 	ChangeWorkingDirectory, // Change the editor's current directory.
+	// Help
+	ShowHelp, // open +HELP+ buffer with manual text (C-k h)
 	// Meta
 	UnknownKCommand, // arg: single character that was not recognized after C-k
 };
--- a/Editor.h
+++ b/Editor.h
@@ -302,7 +302,21 @@ public:


 // --- Generic Prompt subsystem (for search, open-file, save-as, etc.) ---
-	enum class PromptKind { None = 0, Search, OpenFile, SaveAs, Confirm, BufferSwitch, GotoLine, Chdir };
+ enum class PromptKind {
+     None = 0,
+     Search,
+     RegexSearch,
+     RegexReplaceFind,  // step 1 of Regex Search & Replace: find pattern
+     RegexReplaceWith,  // step 2 of Regex Search & Replace: replacement text
+     OpenFile,
+     SaveAs,
+     Confirm,
+     BufferSwitch,
+     GotoLine,
+     Chdir,
+     ReplaceFind,  // step 1 of Search & Replace: find what
+     ReplaceWith   // step 2 of Search & Replace: replace with
+ };


 	void StartPrompt(PromptKind kind, const std::string &label, const std::string &initial)
@@ -507,6 +521,17 @@ private:
    // GUI-only state (safe no-op in terminal builds)
    bool file_picker_visible_ = false;
    std::string file_picker_dir_;
+
+    // Temporary state for Search & Replace flow
+public:
+    void SetReplaceFindTmp(const std::string &s) { replace_find_tmp_ = s; }
+    void SetReplaceWithTmp(const std::string &s) { replace_with_tmp_ = s; }
+    [[nodiscard]] const std::string &ReplaceFindTmp() const { return replace_find_tmp_; }
+    [[nodiscard]] const std::string &ReplaceWithTmp() const { return replace_with_tmp_; }
+
+private:
+    std::string replace_find_tmp_;
+    std::string replace_with_tmp_;
 };

 #endif // KTE_EDITOR_H
--- a/GUIRenderer.cc
+++ b/GUIRenderer.cc
@@ -7,6 +7,7 @@
 #include <string>

 #include <imgui.h>
+#include <regex>

 #include "GUIRenderer.h"
 #include "Buffer.h"
@@ -190,7 +191,7 @@ GUIRenderer::Draw(Editor &ed)
            } else {
                // Convert pixel X to a render-column target including horizontal col offset
                // Use our own tab expansion of width 8 to match command layer logic.
-                const std::string &line_clicked = lines[by];
+                std::string line_clicked = static_cast<std::string>(lines[by]);
                const std::size_t tabw          = 8;
                // We iterate source columns computing absolute rendered column (rx_abs) from 0,
                // then translate to viewport-space by subtracting Coloffs.
@@ -244,13 +245,74 @@ GUIRenderer::Draw(Editor &ed)
  for (std::size_t i = rowoffs; i < lines.size(); ++i) {
            // Capture the screen position before drawing the line
            ImVec2 line_pos         = ImGui::GetCursorScreenPos();
-			const std::string &line = lines[i];
+            std::string line = static_cast<std::string>(lines[i]);

            // Expand tabs to spaces with width=8 and apply horizontal scroll offset
            const std::size_t tabw = 8;
            std::string expanded;
            expanded.reserve(line.size() + 16);
            std::size_t rx_abs_draw = 0; // rendered column for drawing
+            // Compute search highlight ranges for this line in source indices
+            bool search_mode = ed.SearchActive() && !ed.SearchQuery().empty();
+            std::vector<std::pair<std::size_t, std::size_t>> hl_src_ranges;
+            if (search_mode) {
+                // If we're in RegexSearch or RegexReplaceFind mode, compute ranges using regex; otherwise plain substring
+                if (ed.PromptActive() && (ed.CurrentPromptKind() == Editor::PromptKind::RegexSearch || ed.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind)) {
+                    try {
+                        std::regex rx(ed.SearchQuery());
+                        for (auto it = std::sregex_iterator(line.begin(), line.end(), rx);
+                             it != std::sregex_iterator(); ++it) {
+                            const auto &m = *it;
+                            std::size_t sx = static_cast<std::size_t>(m.position());
+                            std::size_t ex = sx + static_cast<std::size_t>(m.length());
+                            hl_src_ranges.emplace_back(sx, ex);
+                        }
+                    } catch (const std::regex_error &) {
+                        // ignore invalid patterns here; status line already shows the error
+                    }
+                } else {
+                    const std::string &q = ed.SearchQuery();
+                    std::size_t pos = 0;
+                    while (!q.empty() && (pos = line.find(q, pos)) != std::string::npos) {
+                        hl_src_ranges.emplace_back(pos, pos + q.size());
+                        pos += q.size();
+                    }
+                }
+            }
+            auto src_to_rx = [&](std::size_t upto_src_exclusive) -> std::size_t {
+                std::size_t rx = 0;
+                std::size_t s  = 0;
+                while (s < upto_src_exclusive && s < line.size()) {
+                    if (line[s] == '\t')
+                        rx += (tabw - (rx % tabw));
+                    else
+                        rx += 1;
+                    ++s;
+                }
+                return rx;
+            };
+            // Draw background highlights (under text)
+            if (search_mode && !hl_src_ranges.empty()) {
+                // Current match emphasis
+                bool has_current = ed.SearchMatchLen() > 0 && ed.SearchMatchY() == i;
+                std::size_t cur_x = has_current ? ed.SearchMatchX() : 0;
+                std::size_t cur_end = has_current ? (ed.SearchMatchX() + ed.SearchMatchLen()) : 0;
+                for (const auto &rg : hl_src_ranges) {
+                    std::size_t sx = rg.first, ex = rg.second;
+                    std::size_t rx_start = src_to_rx(sx);
+                    std::size_t rx_end   = src_to_rx(ex);
+                    // Apply horizontal scroll offset
+                    if (rx_end <= coloffs_now) continue; // fully left of view
+                    std::size_t vx0 = (rx_start > coloffs_now) ? (rx_start - coloffs_now) : 0;
+                    std::size_t vx1 = rx_end - coloffs_now;
+                    ImVec2 p0 = ImVec2(line_pos.x + static_cast<float>(vx0) * space_w, line_pos.y);
+                    ImVec2 p1 = ImVec2(line_pos.x + static_cast<float>(vx1) * space_w, line_pos.y + line_h);
+                    // Choose color: current match stronger
+                    bool is_current = has_current && sx == cur_x && ex == cur_end;
+                    ImU32 col = is_current ? IM_COL32(255, 220, 120, 140) : IM_COL32(200, 200, 0, 90);
+                    ImGui::GetWindowDrawList()->AddRectFilled(p0, p1, col);
+                }
+            }
            // Emit entire line (ImGui child scrolling will handle clipping)
            for (std::size_t src = 0; src < line.size(); ++src) {
                char c = line[src];
@@ -304,8 +366,7 @@ GUIRenderer::Draw(Editor &ed)
  ImGui::GetWindowDrawList()->AddRectFilled(p0, p1, bg_col);
  // If a prompt is active, replace the entire status bar with the prompt text
  if (ed.PromptActive()) {
-      std::string msg = ed.PromptLabel();
-      if (!msg.empty()) msg += ": ";
+      std::string label = ed.PromptLabel();
      std::string ptext = ed.PromptText();
      auto kind         = ed.CurrentPromptKind();
      if (kind == Editor::PromptKind::OpenFile || kind == Editor::PromptKind::SaveAs ||
@@ -322,14 +383,62 @@ GUIRenderer::Draw(Editor &ed)
              }
          }
      }
-      msg += ptext;

      float pad = 6.f;
-      ImVec2 msg_sz = ImGui::CalcTextSize(msg.c_str());
      float left_x = p0.x + pad;
+      float right_x = p1.x - pad;
+      float max_px = std::max(0.0f, right_x - left_x);
+
+      std::string prefix;
+      if (!label.empty()) prefix = label + ": ";
+
+      // Compose showing right-end of filename portion when too long for space
+      std::string final_msg;
+      ImVec2 prefix_sz = ImGui::CalcTextSize(prefix.c_str());
+      float avail_px = std::max(0.0f, max_px - prefix_sz.x);
+      if ((kind == Editor::PromptKind::OpenFile || kind == Editor::PromptKind::SaveAs || kind == Editor::PromptKind::Chdir) && avail_px > 0.0f) {
+          // Trim from left until it fits by pixel width
+          std::string tail = ptext;
+          ImVec2 tail_sz = ImGui::CalcTextSize(tail.c_str());
+          if (tail_sz.x > avail_px) {
+              // Remove leading chars until it fits
+              // Use a simple loop; text lengths are small here
+              size_t start = 0;
+              // To avoid O(n^2) worst-case, remove chunks
+              while (start < tail.size()) {
+                  // Estimate how many chars to skip based on ratio
+                  float ratio = tail_sz.x / avail_px;
+                  size_t skip = ratio > 1.5f ? std::min(tail.size() - start, (size_t)std::max<size_t>(1, (size_t)(tail.size() / 4))) : 1;
+                  start += skip;
+                  std::string candidate = tail.substr(start);
+                  ImVec2 cand_sz = ImGui::CalcTextSize(candidate.c_str());
+                  if (cand_sz.x <= avail_px) {
+                      tail = candidate;
+                      tail_sz = cand_sz;
+                      break;
+                  }
+              }
+              if (ImGui::CalcTextSize(tail.c_str()).x > avail_px && !tail.empty()) {
+                  // As a last resort, ensure fit by chopping exactly
+                  // binary reduce
+                  size_t lo = 0, hi = tail.size();
+                  while (lo < hi) {
+                      size_t mid = (lo + hi) / 2;
+                      std::string cand = tail.substr(mid);
+                      if (ImGui::CalcTextSize(cand.c_str()).x <= avail_px) hi = mid; else lo = mid + 1;
+                  }
+                  tail = tail.substr(lo);
+              }
+          }
+          final_msg = prefix + tail;
+      } else {
+          final_msg = prefix + ptext;
+      }
+
+      ImVec2 msg_sz = ImGui::CalcTextSize(final_msg.c_str());
      ImGui::PushClipRect(ImVec2(p0.x, p0.y), ImVec2(p1.x, p1.y), true);
      ImGui::SetCursorScreenPos(ImVec2(left_x, p0.y + (bar_h - msg_sz.y) * 0.5f));
-      ImGui::TextUnformatted(msg.c_str());
+      ImGui::TextUnformatted(final_msg.c_str());
      ImGui::PopClipRect();
      // Advance cursor to after the bar to keep layout consistent
      ImGui::Dummy(ImVec2(x1 - x0, bar_h));
--- a/HelpText.cc
+++ b/HelpText.cc
@@ -0,0 +1,55 @@
+/*
+ * HelpText.cc - embedded/customizable help content
+ */
+
+#include "HelpText.h"
+
+
+std::string
+HelpText::Text()
+{
+	// Customize the help text here. This string will be used by C-k h first.
+	// You can keep it empty to fall back to the manpage or built-in defaults.
+	// Note: keep newline characters as-is; the renderer splits lines on '\n'.
+
+	return std::string(
+		"KTE - Kyle's Text Editor\n\n"
+		"About:\n"
+		"  kte is Kyle's Text Editor and is probably ill-suited to everyone else. It was\n"
+		"  inspired by Antirez' kilo text editor by way of someone's writeup of the\n"
+		"  process of writing a text editor from scratch. It has keybindings inspired by\n"
+		"  VDE (and the Wordstar family) and emacs; its spiritual parent is mg(1).\n"
+		"\n"
+		"Core keybindings:\n"
+		"  C-k '        Toggle read-only\n"
+		"  C-k -        Unindent region\n"
+		"  C-k =        Indent region\n"
+		"  C-k C-d      Kill entire line\n"
+		"  C-k C-q      Quit now (no confirm)\n"
+		"  C-k a        Mark all and jump to end\n"
+		"  C-k b        Switch buffer\n"
+		"  C-k c        Close current buffer\n"
+		"  C-k d        Kill to end of line\n"
+		"  C-k e        Open file (prompt)\n"
+		"  C-k g        Jump to line\n"
+		"  C-k h        Show this help\n"
+		"  C-k l        Reload buffer from disk\n"
+		"  C-k n        Previous buffer\n"
+		"  C-k o        Change working directory (prompt)\n"
+		"  C-k p        Next buffer\n"
+		"  C-k q        Quit (confirm if dirty)\n"
+		"  C-k r        Redo\n"
+		"  C-k s        Save buffer\n"
+		"  C-k u        Undo\n"
+		"  C-k v        Toggle visual file picker (GUI)\n"
+		"  C-k w        Show working directory\n"
+		"  C-k x        Save and quit\n"
+		"\n"
+		"ESC/Alt commands:\n"
+		"  ESC q        Reflow paragraph\n"
+		"  ESC BACKSPACE Delete previous word\n"
+		"  ESC d        Delete next word\n"
+		"  Alt-w        Copy region to kill ring\n\n"
+		"Buffers:\n  +HELP+ is read-only. Press C-k ' to toggle if you need to edit; C-k h restores it.\n"
+	);
+}
--- a/HelpText.h
+++ b/HelpText.h
@@ -0,0 +1,17 @@
+/*
+ * HelpText.h - embedded/customizable help content
+ */
+#ifndef KTE_HELPTEXT_H
+#define KTE_HELPTEXT_H
+
+#include <string>
+
+class HelpText {
+public:
+    // Returns the embedded help text as a single string with newlines.
+    // Project maintainers can customize the returned string below
+    // (in HelpText.cc) without touching the help command logic.
+    static std::string Text();
+};
+
+#endif // KTE_HELPTEXT_H
--- a/KKeymap.cc
+++ b/KKeymap.cc
@@ -33,6 +33,10 @@ KLookupKCommand(const int ascii_key, const bool ctrl, CommandId &out) -> bool
 		out = CommandId::Redo; // C-k r (redo)
 		return true;
 	}
+    if (ascii_key == '\'') {
+        out = CommandId::ToggleReadOnly; // C-k ' (toggle read-only)
+        return true;
+    }

 	switch (k_lower) {
 	case 'a':
@@ -59,6 +63,9 @@ KLookupKCommand(const int ascii_key, const bool ctrl, CommandId &out) -> bool
 	case 'g':
 		out = CommandId::JumpToLine;
 		return true;
+	case 'h':
+		out = CommandId::ShowHelp;
+		return true;
 	case 'j':
 		out = CommandId::JumpToMark;
 		return true;
@@ -145,6 +152,15 @@ KLookupCtrlCommand(const int ascii_key, CommandId &out) -> bool
 	case 's':
 		out = CommandId::FindStart;
 		return true;
+ case 'r':
+        out = CommandId::RegexFindStart; // C-r regex search
+        return true;
+    case 't':
+        out = CommandId::RegexpReplace; // C-t regex search & replace
+        return true;
+	case 'h':
+		out = CommandId::SearchReplace; // C-h: search & replace
+		return true;
 	case 'l':
 		out = CommandId::Refresh;
 		return true;
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,10 +1,10 @@
 ROADMAP / TODO:

- [ ] Search + Replace
- [ ] Regex search + replace
+- [x] Search + Replace
+- [x] Regex search + replace
 - [ ] The undo system should actually work
- [ ] Able to mark buffers as read-only
- [ ] Built-in help text
- [ ] Shorten paths in the homedir with ~
- [ ] When the filename is longer than the message window, scoot left to
-  to keep it in view
+- [x] Able to mark buffers as read-only
+- [x] Built-in help text
+- [x] Shorten paths in the homedir with ~
+- [x] When the filename is longer than the message window, scoot left to
+  keep it in view
--- a/TerminalRenderer.cc
+++ b/TerminalRenderer.cc
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <cstdlib>
 #include <ncurses.h>
+#include <regex>
 #include <string>

 #include "TerminalRenderer.h"
@@ -45,13 +46,54 @@ TerminalRenderer::Draw(Editor &ed)
            std::size_t li = rowoffs + static_cast<std::size_t>(r);
            std::size_t render_col = 0;
            std::size_t src_i = 0;
-			bool do_hl = ed.SearchActive() && li == ed.SearchMatchY() && ed.SearchMatchLen() > 0;
-			std::size_t mx = do_hl ? ed.SearchMatchX() : 0;
-			std::size_t mlen = do_hl ? ed.SearchMatchLen() : 0;
+            // Compute matches for this line if search highlighting is active
+            bool search_mode = ed.SearchActive() && !ed.SearchQuery().empty();
+            std::vector<std::pair<std::size_t, std::size_t>> ranges; // [start, end)
+            if (search_mode && li < lines.size()) {
+                std::string sline = static_cast<std::string>(lines[li]);
+                // If regex search prompt is active (RegexSearch or RegexReplaceFind), use regex to compute highlight ranges
+                if (ed.PromptActive() && (ed.CurrentPromptKind() == Editor::PromptKind::RegexSearch || ed.CurrentPromptKind() == Editor::PromptKind::RegexReplaceFind)) {
+                    try {
+                        std::regex rx(ed.SearchQuery());
+                        for (auto it = std::sregex_iterator(sline.begin(), sline.end(), rx);
+                             it != std::sregex_iterator(); ++it) {
+                            const auto &m = *it;
+                            std::size_t sx = static_cast<std::size_t>(m.position());
+                            std::size_t ex = sx + static_cast<std::size_t>(m.length());
+                            ranges.emplace_back(sx, ex);
+                        }
+                    } catch (const std::regex_error &) {
+                        // ignore invalid patterns here; status shows error
+                    }
+                } else {
+                    const std::string &q = ed.SearchQuery();
+                    std::size_t pos      = 0;
+                    while (!q.empty() && (pos = sline.find(q, pos)) != std::string::npos) {
+                        ranges.emplace_back(pos, pos + q.size());
+                        pos += q.size();
+                    }
+                }
+            }
+            auto is_src_in_hl = [&](std::size_t si) -> bool {
+                if (ranges.empty()) return false;
+                // ranges are non-overlapping and ordered by construction
+                // linear scan is fine for now
+                for (const auto &rg : ranges) {
+                    if (si < rg.first) break;
+                    if (si >= rg.first && si < rg.second) return true;
+                }
+                return false;
+            };
+            // Track current-match to optionally emphasize
+            const bool has_current = ed.SearchActive() && ed.SearchMatchLen() > 0;
+            const std::size_t cur_mx = has_current ? ed.SearchMatchX() : 0;
+            const std::size_t cur_my = has_current ? ed.SearchMatchY() : 0;
+            const std::size_t cur_mend = has_current ? (ed.SearchMatchX() + ed.SearchMatchLen()) : 0;
            bool hl_on = false;
+            bool cur_on = false;
            int written = 0;
            if (li < lines.size()) {
-				const std::string &line = lines[li];
+                std::string line = static_cast<std::string>(lines[li]);
                src_i                   = 0;
                render_col              = 0;
                while (written < cols) {
@@ -76,16 +118,16 @@ TerminalRenderer::Draw(Editor &ed)
                            }
                            // Now render visible spaces
                            while (next_tab > 0 && written < cols) {
-								bool in_hl = do_hl && src_i >= mx && src_i < mx + mlen;
-								// highlight by source index
-								if (in_hl && !hl_on) {
-									attron(A_STANDOUT);
-									hl_on = true;
-								}
-								if (!in_hl && hl_on) {
-									attroff(A_STANDOUT);
-									hl_on = false;
-								}
+                                bool in_hl = search_mode && is_src_in_hl(src_i);
+                                bool in_cur = has_current && li == cur_my && src_i >= cur_mx && src_i < cur_mend;
+                                // Toggle highlight attributes
+                                int attr = 0;
+                                if (in_hl) attr |= A_STANDOUT;
+                                if (in_cur) attr |= A_BOLD;
+                                if ((attr & A_STANDOUT) && !hl_on) { attron(A_STANDOUT); hl_on = true; }
+                                if (!(attr & A_STANDOUT) && hl_on) { attroff(A_STANDOUT); hl_on = false; }
+                                if ((attr & A_BOLD) && !cur_on) { attron(A_BOLD); cur_on = true; }
+                                if (!(attr & A_BOLD) && cur_on) { attroff(A_BOLD); cur_on = false; }
                                addch(' ');
                                ++written;
                                ++render_col;
@@ -108,17 +150,12 @@ TerminalRenderer::Draw(Editor &ed)
                        ch       = ' ';
                        from_src = false;
                    }
-					if (do_hl) {
-						bool in_hl = from_src && src_i >= mx && src_i < mx + mlen;
-						if (in_hl && !hl_on) {
-							attron(A_STANDOUT);
-							hl_on = true;
-						}
-						if (!in_hl && hl_on) {
-							attroff(A_STANDOUT);
-							hl_on = false;
-						}
-					}
+                    bool in_hl = search_mode && from_src && is_src_in_hl(src_i);
+                    bool in_cur = has_current && li == cur_my && from_src && src_i >= cur_mx && src_i < cur_mend;
+                    if (in_hl && !hl_on) { attron(A_STANDOUT); hl_on = true; }
+                    if (!in_hl && hl_on) { attroff(A_STANDOUT); hl_on = false; }
+                    if (in_cur && !cur_on) { attron(A_BOLD); cur_on = true; }
+                    if (!in_cur && cur_on) { attroff(A_BOLD); cur_on = false; }
                    addch(static_cast<unsigned char>(ch));
                    ++written;
                    ++render_col;
@@ -132,6 +169,10 @@ TerminalRenderer::Draw(Editor &ed)
                attroff(A_STANDOUT);
                hl_on = false;
            }
+            if (cur_on) {
+                attroff(A_BOLD);
+                cur_on = false;
+            }
            clrtoeol();
        }

@@ -161,9 +202,7 @@ TerminalRenderer::Draw(Editor &ed)
 // If a prompt is active, replace the status bar with the full prompt text
 if (ed.PromptActive()) {
     // Build prompt text: "Label: text" and shorten HOME path for file-related prompts
-     std::string msg = ed.PromptLabel();
-     if (!msg.empty())
-         msg += ": ";
+     std::string label = ed.PromptLabel();
     std::string ptext = ed.PromptText();
     auto kind         = ed.CurrentPromptKind();
     if (kind == Editor::PromptKind::OpenFile || kind == Editor::PromptKind::SaveAs ||
@@ -181,7 +220,30 @@ TerminalRenderer::Draw(Editor &ed)
             }
         }
     }
+     // Prefer keeping the tail of the filename visible when it exceeds the window
+     std::string msg;
+     if (!label.empty()) {
+         msg = label + ": ";
+     }
+     // When dealing with file-related prompts, left-trim the filename text so the tail stays visible
+     if ((kind == Editor::PromptKind::OpenFile || kind == Editor::PromptKind::SaveAs || kind == Editor::PromptKind::Chdir) && cols > 0) {
+         int avail = cols - static_cast<int>(msg.size());
+         if (avail <= 0) {
+             // No room for label; fall back to showing the rightmost portion of the whole string
+             std::string whole = msg + ptext;
+             if ((int)whole.size() > cols)
+                 whole = whole.substr(whole.size() - cols);
+             msg = whole;
+         } else {
+             if ((int)ptext.size() > avail) {
+                 ptext = ptext.substr(ptext.size() - avail);
+             }
             msg += ptext;
+         }
+     } else {
+         // Non-file prompts: simple concatenation and clip by terminal
+         msg += ptext;
+     }

     // Draw left-aligned, clipped to width
     if (!msg.empty())
@@ -233,6 +295,9 @@ TerminalRenderer::Draw(Editor &ed)
 		left += fname;
 		if (b && b->Dirty())
 			left += " *";
+		// Append read-only indicator
+		if (b && b->IsReadOnly())
+			left += " [RO]";
 		// Append total line count as "<n>L"
 		if (b) {
 			unsigned long lcount = static_cast<unsigned long>(b->Rows().size());
--- a/default-gui.nix
+++ b/default-gui.nix
@@ -1,53 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  ncurses,
-  SDL2,
-  libGL,
-  xorg,
-  installShellFiles,
-  ...
-}:
-let
-  cmakeContent = builtins.readFile ./CMakeLists.txt;
-  cmakeLines = lib.splitString "\n" cmakeContent;
-  versionLine = lib.findFirst (l: builtins.match ".*set\\(KTE_VERSION \".+\"\\).*" l != null) (throw "KTE_VERSION not found in CMakeLists.txt") cmakeLines;
-  version = builtins.head (builtins.match ".*set\\(KTE_VERSION \"(.+)\"\\).*" versionLine);
-in
-stdenv.mkDerivation {
-  pname = "kte";
-  inherit version;
-
-  src = lib.cleanSource ./.;
-
-  nativeBuildInputs = [
-    cmake
-    ncurses
-    SDL2
-    libGL
-    xorg.libX11
-    installShellFiles
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_GUI=ON"
-    "-DCMAKE_BUILD_TYPE=Debug"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp kte $out/bin/
-    cp kge $out/bin/
-
-    installManPage ../docs/kte.1
-    installManPage ../docs/kge.1
-
-    mkdir -p $out/share/icons
-    cp ../kge.png $out/share/icons/
-
-    runHook postInstall
-  '';
-}
--- a/default-nogui.nix
+++ b/default-nogui.nix
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  ncurses,
-  installShellFiles,
-  ...
-}:
-let
-  cmakeContent = builtins.readFile ./CMakeLists.txt;
-  cmakeLines = lib.splitString "\n" cmakeContent;
-  versionLine = lib.findFirst (l: builtins.match ".*set\\(KTE_VERSION \".+\"\\).*" l != null) (throw "KTE_VERSION not found in CMakeLists.txt") cmakeLines;
-  version = builtins.head (builtins.match ".*set\\(KTE_VERSION \"(.+)\"\\).*" versionLine);
-in
-stdenv.mkDerivation {
-  pname = "kte";
-  inherit version;
-
-  src = lib.cleanSource ./.;
-
-  nativeBuildInputs = [
-    cmake
-    ncurses
-    installShellFiles
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_GUI=OFF"
-    "-DCMAKE_BUILD_TYPE=Debug"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    cp kte $out/bin/
-
-    installManPage ../docs/kte.1
-
-    runHook postInstall
-  '';
-}
--- a/default.nix
+++ b/default.nix
@@ -7,12 +7,16 @@
  libGL,
  xorg,
  installShellFiles,
+
+  graphical ? false,
  ...
 }:
 let
  cmakeContent = builtins.readFile ./CMakeLists.txt;
  cmakeLines = lib.splitString "\n" cmakeContent;
-  versionLine = lib.findFirst (l: builtins.match ".*set\\(KTE_VERSION \".+\"\\).*" l != null) (throw "KTE_VERSION not found in CMakeLists.txt") cmakeLines;
+  versionLine = lib.findFirst (
+    l: builtins.match ".*set\\(KTE_VERSION \".+\"\\).*" l != null
+  ) (throw "KTE_VERSION not found in CMakeLists.txt") cmakeLines;
  version = builtins.head (builtins.match ".*set\\(KTE_VERSION \"(.+)\"\\).*" versionLine);
 in
 stdenv.mkDerivation {
@@ -24,14 +28,16 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    cmake
    ncurses
+    installShellFiles
+  ]
+  ++ lib.optionals graphical [
    SDL2
    libGL
    xorg.libX11
-    installShellFiles
  ];

  cmakeFlags = [
-    "-DBUILD_GUI=ON"
+    "-DBUILD_GUI=${if graphical then "ON" else "OFF"}"
    "-DCMAKE_BUILD_TYPE=Debug"
  ];

@@ -40,14 +46,17 @@ stdenv.mkDerivation {

    mkdir -p $out/bin
    cp kte $out/bin/
-    cp kge $out/bin/

    installManPage ../docs/kte.1
-    installManPage ../docs/kge.1

+  ''
+  + lib.optionalString graphical ''
+    cp kge $out/bin/
+    installManPage ../docs/kge.1
    mkdir -p $out/share/icons
    cp ../kge.png $out/share/icons/
-
+  ''
+  + ''
    runHook postInstall
  '';
 }
--- a/flake-gui.nix
+++ b/flake-gui.nix
@@ -1,55 +0,0 @@
-# flake.nix
-{
-  description = "kte  ImGui/SDL2 text editor";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in {
-        packages.default = pkgs.stdenv.mkDerivation {
-          pname = "kte";
-          version = "0.1.0";
-          src = ./.;
-
-          nativeBuildInputs = [ pkgs.cmake pkgs.pkg-config ];
-          buildInputs = with pkgs; [
-            ncurses
-            SDL2
-            libGL
-            xorg.libX11
-          ];
-
-          cmakeFlags = [
-            "-DBUILD_GUI=ON"
-            "-DCURSES_NEED_NCURSES=TRUE"
-            "-DCURSES_NEED_WIDE=TRUE"
-          ];
-
-          # Alternative (even stronger): completely hide the broken module
-          preConfigure = ''
-            # If the project ships its own FindSDL2.cmake in cmake/, hide it
-            if [ -f cmake/FindSDL2.cmake ]; then
-              mv cmake/FindSDL2.cmake cmake/FindSDL2.cmake.disabled
-              echo "Disabled bundled FindSDL2.cmake"
-            fi
-          '';
-
-          meta = with pkgs.lib; {
-            description = "kte  ImGui/SDL2 GUI editor";
-            mainProgram = "kte";
-            platforms = platforms.linux;
-          };
-        };
-
-        devShells.default = pkgs.mkShell {
-          inputsFrom = [ self.packages.${system}.default ];
-          packages = with pkgs; [ gdb clang-tools ];
-        };
-      });
-}
--- a/flake.nix
+++ b/flake.nix
@@ -3,16 +3,18 @@

  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

-  outputs = inputs @ { self, nixpkgs, ... }:
+  outputs =
+    inputs@{ self, nixpkgs, ... }:
    let
      eachSystem = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
      pkgsFor = system: import nixpkgs { inherit system; };
-    in {
-      packages = eachSystem (system: {
-        default = (pkgsFor system).callPackage ./default-nogui.nix { };
-        kge     = (pkgsFor system).callPackage ./default-gui.nix   { };
-        kte     = (pkgsFor system).callPackage ./default-nogui.nix { };
-        full    = (pkgsFor system).callPackage ./default.nix       { };
+    in
+    {
+      packages = eachSystem (system: rec {
+        default = kte;
+        full = kge;
+        kte = (pkgsFor system).callPackage ./default.nix { graphical = false; };
+        kge = (pkgsFor system).callPackage ./default.nix { graphical = true; };
      });
    };
 }
Author	SHA1	Message	Date
Kyle Isom	0cb7d36f2a	bump version Some checks failed Release / Bump Homebrew formula (push) Has been cancelled Release / Build Linux amd64 (push) Has been cancelled Release / Build Linux arm64 (push) Has been cancelled Release / Build macOS arm64 (.app) (push) Has been cancelled Release / Create GitHub Release (push) Has been cancelled	2025-12-01 11:22:47 -08:00
Kyle Isom	09a6df0c33	Add regex search, search/replace, and buffer read-only mode functionality with help text	2025-12-01 02:54:40 -08:00
Kyle Isom	69457c424c	add regex and search/replace functionality to editor	2025-11-30 23:33:17 -08:00
Kyle Isom	24c8040d8a	trash flake-gui	2025-11-30 22:02:43 -08:00
Kyle Isom	e869249a7c	thaaaaanks jeremy	2025-11-30 22:02:23 -08:00