center cursor

- Updated `make-app-release` script to use `macdeployqt` with proper verbosity and bundle fixup.
- Introduced post-build fixup using CMake's `BundleUtilities` to internalize non-Qt dylibs.
- Enhanced macOS bundle RPATH settings for accurate Framework resolution.
- Added optional `kge_fixup_bundle` CMake target for post-build handling.
- Refined `default.nix` to load Nixpkgs in a default argument.

.idea/editor.xml

@@ -19,7 +19,7 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppBoostFormatTooManyArgs/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCStyleCast/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCVQualifierCanNotBeAppliedToReference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="HINT" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassCanBeFinal/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassIsIncomplete/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeedsConstructorBecauseOfUninitializedMember/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppClassNeverUsed/@EntryIndexedValue" value="WARNING" type="string" />

.idea/kte.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="CMake" type="CPP_MODULE" version="4">
+<module classpath="CIDR" type="CPP_MODULE" version="4">
   <component name="FacetManager">
     <facet type="Python" name="Python facet">
       <configuration sdkName="" />

CMakeLists.txt

@@ -4,7 +4,7 @@ project(kte)
 include(GNUInstallDirs)
 
 set(CMAKE_CXX_STANDARD 20)
-set(KTE_VERSION "1.5.2")
+set(KTE_VERSION "1.5.5")
 
 # Default to terminal-only build to avoid SDL/OpenGL dependency by default.
 # Enable with -DBUILD_GUI=ON when SDL2/OpenGL/Freetype are available.
@@ -208,6 +208,7 @@ set(FONT_HEADERS
         fonts/Syne.h
         fonts/Triplicate.h
         fonts/Unispace.h
+        fonts/BerkeleyMono.h
 )
 
 set(COMMON_HEADERS
@@ -255,6 +256,7 @@ if (BUILD_GUI)
                 ImGuiFrontend.h
                 ImGuiInputHandler.h
                 ImGuiRenderer.h
+                fonts/BerkeleyMono.h
         )
     endif ()
 endif ()
@@ -379,12 +381,18 @@ if (${BUILD_GUI})
                 ${CMAKE_CURRENT_BINARY_DIR}/kge-Info.plist
                 @ONLY)
 
+        # Ensure proper macOS bundle properties and RPATH so our bundled
+        # frameworks are preferred over system/Homebrew ones.
         set_target_properties(kge PROPERTIES
                 MACOSX_BUNDLE TRUE
                 MACOSX_BUNDLE_GUI_IDENTIFIER ${KGE_BUNDLE_ID}
                 MACOSX_BUNDLE_BUNDLE_NAME "kge"
                 MACOSX_BUNDLE_ICON_FILE ${MACOSX_BUNDLE_ICON_FILE}
-                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/kge-Info.plist")
+                MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/kge-Info.plist"
+                # Prefer the app's bundled frameworks at runtime
+                INSTALL_RPATH "@executable_path/../Frameworks"
+                BUILD_WITH_INSTALL_RPATH TRUE
+        )
 
         add_dependencies(kge kte)
         add_custom_command(TARGET kge POST_BUILD
@@ -408,4 +416,19 @@ if (${BUILD_GUI})
     # Install kge man page only when GUI is built
     install(FILES docs/kge.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
     install(FILES kge.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
+
+    # Optional post-build bundle fixup (can also be run from scripts).
+    # This provides a CMake target to run BundleUtilities' fixup_bundle on the
+    # built app, useful after macdeployqt to ensure non-Qt dylibs are internalized.
+    if (APPLE)
+        include(CMakeParseArguments)
+        add_custom_target(kge_fixup_bundle ALL
+                COMMAND ${CMAKE_COMMAND}
+                -DAPP_BUNDLE=$<TARGET_BUNDLE_DIR:kge>
+                -P ${CMAKE_CURRENT_LIST_DIR}/cmake/fix_bundle.cmake
+                BYPRODUCTS $<TARGET_BUNDLE_DIR:kge>/Contents/Frameworks
+                COMMENT "Running fixup_bundle on kge.app to internalize non-Qt dylibs"
+                VERBATIM)
+        add_dependencies(kge_fixup_bundle kge)
+    endif ()
 endif ()

Command.cc

@@ -2350,7 +2350,8 @@ cmd_newline(CommandContext &ctx)
 					}
 					// Insert replacement if provided
 					if (!with.empty()) {
-               buf->insert_text(static_cast<int>(y), static_cast<int>(p), std::string_view(with));
+						buf->insert_text(static_cast<int>(y), static_cast<int>(p),
+						                 std::string_view(with));
 						if (u) {
 							buf->SetCursor(p, y);
 							u->Begin(UndoType::Insert);
@@ -2405,6 +2406,8 @@ cmd_newline(CommandContext &ctx)
 				ctx.editor.SetStatus(err.empty() ? std::string("Failed to open ") + value : err);
 			} else {
 				ctx.editor.SetStatus(std::string("Opened ") + value);
+				// Center the view on the cursor (e.g. if the buffer restored a cursor position)
+				cmd_center_on_cursor(ctx);
 				// Close the prompt so subsequent typing edits the buffer, not the prompt
 				ctx.editor.CancelPrompt();
 			}
@@ -4202,7 +4205,8 @@ cmd_reflow_paragraph(CommandContext &ctx)
 	// Replace paragraph lines via PieceTable-backed operations
 	for (std::size_t i = para_end; i + 1 > para_start; --i) {
 		buf->delete_row(static_cast<int>(i));
-     if (i == 0) break; // prevent wrap on size_t
+		if (i == 0)
+			break; // prevent wrap on size_t
 	}
 	// Insert new lines starting at para_start
 	std::size_t insert_y = para_start;
@@ -4227,6 +4231,9 @@ cmd_reload_buffer(CommandContext &ctx)
 	Buffer *buf = ctx.editor.CurrentBuffer();
 	if (!buf)
 		return false;
+	// Remember the current cursor position so we can attempt to restore it
+	const std::size_t old_x     = buf->Curx();
+	const std::size_t old_y     = buf->Cury();
 	const std::string &filename = buf->Filename();
 	if (filename.empty()) {
 		ctx.editor.SetStatus("Cannot reload unnamed buffer");
@@ -4237,6 +4244,19 @@ cmd_reload_buffer(CommandContext &ctx)
 		ctx.editor.SetStatus(std::string("Reload failed: ") + err);
 		return false;
 	}
+	// Try to restore the cursor to its previous position if still valid; otherwise clamp
+	{
+		auto &rows              = buf->Rows();
+		const std::size_t nrows = rows.size();
+		if (nrows == 0) {
+			buf->SetCursor(0, 0);
+		} else {
+			const std::size_t new_y    = old_y < nrows ? old_y : (nrows - 1);
+			const std::size_t line_len = rows[new_y].size();
+			const std::size_t new_x    = old_x < line_len ? old_x : line_len;
+			buf->SetCursor(new_x, new_y);
+		}
+	}
 	ctx.editor.SetStatus(std::string("Reloaded ") + filename);
 	ensure_cursor_visible(ctx.editor, *buf);
 	return true;

ImGuiInputHandler.cc

@@ -158,8 +158,9 @@ map_key(const SDL_Keycode key,
 			ascii_key = static_cast<int>(key);
 		}
 		bool ctrl2 = (mod & KMOD_CTRL) != 0;
-		// If user typed a literal 'C' (or '^') as a control qualifier, keep k-prefix active
+  // If user typed a literal 'C' (uppercase) or '^' as a control qualifier, keep k-prefix active
-		if (ascii_key == 'C' || ascii_key == 'c' || ascii_key == '^') {
+  // Do NOT treat lowercase 'c' as a qualifier; 'c' is a valid k-command (BufferClose).
+  if (ascii_key == 'C' || ascii_key == '^') {
       k_ctrl_pending = true;
       // Keep waiting for the next suffix; show status and suppress ensuing TEXTINPUT
       if (ed)
@@ -472,8 +473,8 @@ ImGuiInputHandler::ProcessSDLEvent(const SDL_Event &e)
 					ascii_key = static_cast<int>(c0);
 				}
 				if (ascii_key != 0) {
-					// Qualifier via TEXTINPUT: 'C' or '^'
+     // Qualifier via TEXTINPUT: uppercase 'C' or '^' only
-					if (ascii_key == 'C' || ascii_key == 'c' || ascii_key == '^') {
+     if (ascii_key == 'C' || ascii_key == '^') {
          k_ctrl_pending_ = true;
          if (ed_)
              ed_->SetStatus("C-k C _");

TerminalFrontend.cc

@@ -73,6 +73,7 @@ TerminalFrontend::Init(Editor &ed)
 			have_old_sigint_ = true;
 		}
 	}
+
 	return true;
 }
 

TerminalInputHandler.cc

@@ -178,8 +178,9 @@ map_key_to_command(const int ch,
 			ctrl      = true;
 			ascii_key = 'a' + (ch - 1);
 		}
-		// If user typed literal 'C'/'c' or '^' as a qualifier, keep k-prefix and set pending
+  // If user typed literal 'C' or '^' as a qualifier, keep k-prefix and set pending
-		if (ascii_key == 'C' || ascii_key == 'c' || ascii_key == '^') {
+  // Note: Do NOT treat lowercase 'c' as a qualifier, since 'c' is a valid C-k command (BufferClose).
+  if (ascii_key == 'C' || ascii_key == '^') {
       k_ctrl_pending = true;
       if (ed)
           ed->SetStatus("C-k C _");

default.nix

@@ -1,5 +1,6 @@
 {
-  lib,
+  pkgs ? import <nixpkgs> {},
+  lib ? pkgs.lib,
   stdenv,
   cmake,
   ncurses,

fonts/Font.h

@@ -3,12 +3,12 @@
 #include <string>
 #include <utility>
 
-#include "BrassMonoCode.h"
+#include "BerkeleyMono.h"
 
 namespace kte::Fonts {
 // Provide default embedded font aliases used by GUIFrontend fallback loader
-inline const unsigned int DefaultFontSize  = BrassMonoCode::DefaultFontBoldCompressedSize;
+inline const unsigned int DefaultFontSize  = BerkeleyMono::DefaultFontRegularCompressedSize;
-inline const unsigned int *DefaultFontData = BrassMonoCode::DefaultFontBoldCompressedData;
+inline const unsigned int *DefaultFontData = BerkeleyMono::DefaultFontRegularCompressedData;
 
 class Font {
 public:

fonts/FontList.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "B612Mono.h"
+#include "BerkeleyMono.h"
 #include "BrassMono.h"
 #include "BrassMonoCode.h"
 #include "FiraCode.h"

fonts/FontRegistry.cc

@@ -7,14 +7,24 @@ InstallDefaultFonts()
 {
 	FontRegistry::Instance().Register(std::make_unique<Font>(
 		"default",
-		BrassMono::DefaultFontBoldCompressedData,
+		BerkeleyMono::DefaultFontBoldCompressedData,
-		BrassMono::DefaultFontBoldCompressedSize
+		BerkeleyMono::DefaultFontBoldCompressedSize
 	));
 	FontRegistry::Instance().Register(std::make_unique<Font>(
 		"b612",
 		B612Mono::DefaultFontRegularCompressedData,
 		B612Mono::DefaultFontRegularCompressedSize
 	));
+	FontRegistry::Instance().Register(std::make_unique<Font>(
+		"berkeley",
+		BerkeleyMono::DefaultFontRegularCompressedData,
+		BerkeleyMono::DefaultFontRegularCompressedSize
+	));
+	FontRegistry::Instance().Register(std::make_unique<Font>(
+		"berkeley-bold",
+		BerkeleyMono::DefaultFontBoldCompressedData,
+		BerkeleyMono::DefaultFontBoldCompressedSize
+	));
 	FontRegistry::Instance().Register(std::make_unique<Font>(
 		"brassmono",
 		BrassMono::DefaultFontRegularCompressedData,

main.cc

@@ -192,8 +192,6 @@ main(int argc, const char *argv[])
 	} else if (req_term) {
 		use_gui = false;
 	} else {
-
-
 		// Default depends on build target: kge defaults to GUI, kte to terminal
 #if defined(KTE_DEFAULT_GUI)
 		use_gui = true;
@@ -307,6 +305,8 @@ main(int argc, const char *argv[])
 		return 1;
 	}
 
+	Execute(editor, CommandId::CenterOnCursor);
+
 	bool running = true;
 	while (running) {
 		fe->Step(editor, running);

make-app-release

@@ -16,14 +16,18 @@ open .
 cd ..
 
 mkdir -p cmake-build-release-qt
-cmake -S . -B cmake-build-release -DBUILD_GUI=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_ASAN=OFF
+cmake -S . -B cmake-build-release-qt -DBUILD_GUI=ON -DKTE_USE_QT=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_ASAN=OFF
 
 cd cmake-build-release-qt
 make clean
 rm -fr kge.app* kge-qt.app*
 make
-mv kge.app kge-qt.app
+mv -f kge.app kge-qt.app
-macdeployqt kge-qt.app -always-overwrite
+# Use the same Qt's macdeployqt as used for building; ensure it overwrites in-bundle paths
+macdeployqt kge-qt.app -always-overwrite -verbose=3
+
+# Run CMake BundleUtilities fixup to internalize non-Qt dylibs and rewrite install names
+cmake -DAPP_BUNDLE="$(pwd)/kge-qt.app" -P "${PWD%/*}/cmake/fix_bundle.cmake"
 zip -r kge-qt.app.zip kge-qt.app 
 sha256sum kge-qt.app.zip
 open .