From 86111b4e4ca7510b33962897f502b3c1b8529598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <martin.golini@gmail.com>
Date: Wed, 19 Jul 2023 23:45:46 -0400
Subject: [PATCH] More macOS improvements.

---
 projects/macos/make.sh                      | 2 +-
 projects/macos/make_no_fw.sh                | 2 +-
 src/eepp/ui/doc/syntaxdefinitionmanager.cpp | 2 +-
 src/tools/ecode/ecode.cpp                   | 7 +++++++
 src/tools/ecode/macos/macos.m               | 6 ++++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/projects/macos/make.sh b/projects/macos/make.sh
index 4ba54d061..e421c0f6e 100755
--- a/projects/macos/make.sh
+++ b/projects/macos/make.sh
@@ -5,7 +5,7 @@ premake4 --file=../../premake4.lua --use-frameworks gmake
 cd ../../make/macosx/
 sed -e "s/-Wl,-x//g" -i .make
 
-make -j`nproc` $@
+make -j$(sysctl -n hw.ncpu) $@
 
 cd ../../bin/
 ln -sf ../libs/macosx/libeepp.dylib .
diff --git a/projects/macos/make_no_fw.sh b/projects/macos/make_no_fw.sh
index b8f35e067..9239525ea 100755
--- a/projects/macos/make_no_fw.sh
+++ b/projects/macos/make_no_fw.sh
@@ -5,7 +5,7 @@ premake4 --file=../../premake4.lua gmake
 cd ../../make/macosx/
 sed -e "s/-Wl,-x//g" -i .make
 
-make -j`nproc` $@
+make -j$(sysctl -n hw.ncpu) $@
 
 cd ../../bin/
 ln -sf ../libs/macosx/libeepp.dylib .
diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp
index d11d0d98f..2800e2de6 100644
--- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp
+++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp
@@ -358,7 +358,7 @@ static void addTypeScript() {
 			{ "type", "keyword2" },		 { "typeof", "keyword" },	  { "undefined", "literal" },
 			{ "var", "keyword" },		 { "void", "keyword" },		  { "while", "keyword" },
 			{ "with", "keyword" },		 { "yield", "keyword" },	  { "unknown", "keyword2" },
-			{ "namespace", "keyword" } },
+			{ "namespace", "keyword" },  { "abstract", "keyword"} },
 		  "//" } );
 
 	SyntaxDefinitionManager::instance()->add(
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 0489a0070..bc874d563 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -1802,7 +1802,11 @@ std::map<KeyBindings::Shortcut, std::string> App::getLocalKeybindings() {
 		{ { KEY_P, KeyMod::getDefaultModifier() }, "open-command-palette" },
 		{ { KEY_F, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-global-search" },
 		{ { KEY_L, KeyMod::getDefaultModifier() }, "go-to-line" },
+#if EE_PLATFORM == EE_PLATFORM_MACOSX
+		{ { KEY_M, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "menu-toggle" },
+#else
 		{ { KEY_M, KeyMod::getDefaultModifier() }, "menu-toggle" },
+#endif
 		{ { KEY_S, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "save-all" },
 		{ { KEY_F9, KEYMOD_LALT }, "switch-side-panel" },
 		{ { KEY_J, KEYMOD_CTRL | KEYMOD_LALT | KEYMOD_SHIFT }, "terminal-split-left" },
@@ -1833,6 +1837,9 @@ std::map<std::string, std::string> App::getMigrateKeybindings() {
 		{ "switch-to-tab-6", "alt+6" },		   { "switch-to-tab-7", "alt+7" },
 		{ "switch-to-tab-8", "alt+8" },		   { "switch-to-tab-9", "alt+9" },
 		{ "switch-to-last-tab", "alt+0" },
+#if EE_PLATFORM == EE_PLATFORM_MACOSX
+		{ "menu-toggle", "mod+shift+m" },
+#endif
 	};
 }
 
diff --git a/src/tools/ecode/macos/macos.m b/src/tools/ecode/macos/macos.m
index 967cf7a0d..55438b73b 100644
--- a/src/tools/ecode/macos/macos.m
+++ b/src/tools/ecode/macos/macos.m
@@ -47,9 +47,15 @@ macOS_CreateApplicationMenus(void)
 	[NSApp setAppleMenu:appleMenu];
 
 	windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+
+	menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(miniaturize:) keyEquivalent:@"m"];
+	[menuItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
+	[windowMenu addItem:menuItem];
+
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"Toggle Full Screen" action:@selector(toggleFullScreen:) keyEquivalent:@"f"];
 	[menuItem setKeyEquivalentModifierMask:NSEventModifierFlagControl | NSEventModifierFlagCommand];
 	[windowMenu addItem:menuItem];
+
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:windowMenu];