Add missing cmake for macos.

- 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" />
@@ -58,6 +58,7 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultInitializationWithNoUserConstructor/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultIsUsedAsIdentifier/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefaultedSpecialMemberFunctionIsImplicitlyDeleted/@EntryIndexedValue" value="WARNING" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDefinitionsOrder/@EntryIndexedValue" value="HINT" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeletingVoidPointer/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTemplateWithoutTemplateKeyword/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDependentTypeWithoutTypenameKeyword/@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.3")
+set(KTE_VERSION "1.5.7")
 
 # Default to terminal-only build to avoid SDL/OpenGL dependency by default.
 # Enable with -DBUILD_GUI=ON when SDL2/OpenGL/Freetype are available.
@@ -63,7 +63,7 @@ endif ()
 
 message(STATUS "Build system: ${CMAKE_HOST_SYSTEM_NAME}")
 
-if (${BUILD_GUI})
+if (BUILD_GUI)
     include(cmake/imgui.cmake)
 endif ()
 
@@ -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 ()
@@ -324,7 +326,7 @@ if (BUILD_TESTS)
     endif ()
 endif ()
 
-if (${BUILD_GUI})
+if (BUILD_GUI)
     # ImGui::CreateContext();
     # ImGuiIO& io = ImGui::GetIO();
 
@@ -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,20 @@ 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 AND TARGET kge)
+        get_target_property(IS_BUNDLE kge MACOSX_BUNDLE)
+        if (IS_BUNDLE)
+            add_custom_target(kge_fixup_bundle ALL
+                    COMMAND ${CMAKE_COMMAND}
+                    -DAPP_BUNDLE=${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:kge,MACOSX_BUNDLE_BUNDLE_NAME>.app
+                    -P ${CMAKE_CURRENT_LIST_DIR}/cmake/fix_bundle.cmake
+                    COMMENT "Running fixup_bundle on kge.app to internalize non-Qt dylibs"
+                    VERBATIM)
+            add_dependencies(kge_fixup_bundle kge)
+        endif ()
+    endif ()
 endif ()

TerminalFrontend.cc

@@ -73,6 +73,7 @@ TerminalFrontend::Init(Editor &ed)
 			have_old_sigint_ = true;
 		}
 	}
+
 	return true;
 }
 
@@ -120,4 +121,4 @@ TerminalFrontend::Shutdown()
 		have_old_sigint_ = false;
 	}
 	endwin();
-}
+}

cmake/fix_bundle.cmake

@@ -0,0 +1,78 @@
+cmake_minimum_required(VERSION 3.15)
+
+# Fix up a macOS .app bundle by copying non-Qt dylibs into
+# Contents/Frameworks and rewriting install names to use @rpath/@loader_path.
+#
+# Usage:
+#   cmake -DAPP_BUNDLE=/path/to/kge.app -P cmake/fix_bundle.cmake
+
+if (NOT APP_BUNDLE)
+    message(FATAL_ERROR "APP_BUNDLE not set. Invoke with -DAPP_BUNDLE=/path/to/App.app")
+endif ()
+
+get_filename_component(APP_DIR "${APP_BUNDLE}" ABSOLUTE)
+set(EXECUTABLE "${APP_DIR}/Contents/MacOS/kge")
+
+if (NOT EXISTS "${EXECUTABLE}")
+    message(FATAL_ERROR "Executable not found at: ${EXECUTABLE}")
+endif ()
+
+include(BundleUtilities)
+
+# Directories to search when resolving prerequisites. We include Homebrew so that
+# if any deps are currently resolved from there, fixup_bundle will copy them into
+# the bundle and rewrite install names to be self-contained.
+set(DIRS
+        "/usr/local/lib"
+        "/opt/homebrew/lib"
+        "/opt/homebrew/opt"
+)
+
+# Note: We pass empty plugin list so fixup_bundle scans the executable and all
+# libs it references recursively. Qt frameworks already live in the bundle after
+# macdeployqt; this step is primarily for non-Qt dylibs (glib, icu, pcre2, zstd,
+# dbus, etc.).
+# fixup_bundle often fails if copied libraries are read-only.
+# We also try to use the system install_name_tool and otool to avoid issues with Anaconda's version.
+# Note: BundleUtilities uses find_program(gp_otool "otool") internally, so we might need to set it differently.
+set(gp_otool "/usr/bin/otool")
+set(CMAKE_INSTALL_NAME_TOOL "/usr/bin/install_name_tool")
+set(CMAKE_OTOOL "/usr/bin/otool")
+set(ENV{PATH} "/usr/bin:/bin:/usr/sbin:/sbin")
+
+execute_process(COMMAND chmod -R u+w "${APP_DIR}/Contents/Frameworks")
+
+fixup_bundle("${APP_DIR}" "" "${DIRS}")
+
+# On Apple Silicon (and modern macOS in general), modifications by fixup_bundle
+# invalidate code signatures. We must re-sign the bundle (at least ad-hoc)
+# for it to be allowed to run.
+# We sign deep, but sometimes explicit signing of components is more reliable.
+message(STATUS "Re-signing ${APP_DIR} after fixup...")
+
+# 1. Sign dylibs in Frameworks
+file(GLOB_RECURSE DYLIBS "${APP_DIR}/Contents/Frameworks/*.dylib")
+foreach (DYLIB ${DYLIBS})
+    message(STATUS "Signing ${DYLIB}...")
+    execute_process(COMMAND /usr/bin/codesign --force --sign - "${DYLIB}")
+endforeach ()
+
+# 2. Sign nested executables
+message(STATUS "Signing nested kte...")
+execute_process(COMMAND /usr/bin/codesign --force --sign - "${APP_DIR}/Contents/MacOS/kte")
+
+# 3. Sign the main executable explicitly
+message(STATUS "Signing main kge...")
+execute_process(COMMAND /usr/bin/codesign --force --sign - "${APP_DIR}/Contents/MacOS/kge")
+
+# 4. Sign the main bundle
+execute_process(
+        COMMAND /usr/bin/codesign --force --deep --sign - "${APP_DIR}"
+        RESULT_VARIABLE CODESIGN_RESULT
+)
+
+if (NOT CODESIGN_RESULT EQUAL 0)
+    message(FATAL_ERROR "Codesign failed with error: ${CODESIGN_RESULT}")
+endif ()
+
+message(STATUS "fix_bundle.cmake completed for ${APP_DIR}")

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 *DefaultFontData = BrassMonoCode::DefaultFontBoldCompressedData;
+inline const unsigned int DefaultFontSize  = BerkeleyMono::DefaultFontRegularCompressedSize;
+inline const unsigned int *DefaultFontData = BerkeleyMono::DefaultFontRegularCompressedData;
 
 class Font {
 public:
@@ -31,4 +31,4 @@ private:
 	const unsigned int *data_{nullptr};
 	unsigned int size_{0};
 };
-}
+}

fonts/FontList.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "B612Mono.h"
+#include "BerkeleyMono.h"
 #include "BrassMono.h"
 #include "BrassMonoCode.h"
 #include "FiraCode.h"
@@ -14,4 +15,4 @@
 #include "SpaceMono.h"
 #include "Syne.h"
 #include "Triplicate.h"
-#include "Unispace.h"
+#include "Unispace.h"

fonts/FontRegistry.cc

@@ -7,28 +7,38 @@ InstallDefaultFonts()
 {
 	FontRegistry::Instance().Register(std::make_unique<Font>(
 		"default",
-		BrassMono::DefaultFontBoldCompressedData,
-		BrassMono::DefaultFontBoldCompressedSize
+		BerkeleyMono::DefaultFontBoldCompressedData,
+		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,
 		BrassMono::DefaultFontRegularCompressedSize
 	));
 	FontRegistry::Instance().Register(std::make_unique<Font>(
-	    "brassmono-bold",
-	    BrassMono::DefaultFontBoldCompressedData,
-	    BrassMono::DefaultFontBoldCompressedSize
+		"brassmono-bold",
+		BrassMono::DefaultFontBoldCompressedData,
+		BrassMono::DefaultFontBoldCompressedSize
 	));
 	FontRegistry::Instance().Register(std::make_unique<Font>(
-	    "brassmonocode",
-	    BrassMonoCode::DefaultFontRegularCompressedData,
-	    BrassMonoCode::DefaultFontRegularCompressedSize
+		"brassmonocode",
+		BrassMonoCode::DefaultFontRegularCompressedData,
+		BrassMonoCode::DefaultFontRegularCompressedSize
 	));
 	FontRegistry::Instance().Register(std::make_unique<Font>(
 		"brassmonocode-bold",
@@ -101,4 +111,4 @@ InstallDefaultFonts()
 		Unispace::DefaultFontRegularCompressedSize
 	));
 }
-}
+}

main.cc

@@ -192,13 +192,11 @@ 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
+		// Default depends on build target: kge defaults to GUI, kte to terminal
 #if defined(KTE_DEFAULT_GUI)
-	use_gui = true;
+		use_gui = true;
 #else
-	use_gui = false;
+		use_gui = false;
 #endif
 	}
 #endif
@@ -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);
@@ -315,4 +315,4 @@ main(int argc, const char *argv[])
 	fe->Shutdown();
 
 	return 0;
-}
+}

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
-macdeployqt kge-qt.app -always-overwrite
+mv -f kge.app kge-qt.app
+# 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 .