From 63ff53a16e55be8d8b70835327f109b6396fd0fc Mon Sep 17 00:00:00 2001
From: GutPuncher <GodsOfficialMessenger@protonmail.com>
Date: Sun, 26 Nov 2023 04:22:29 -0500
Subject: [PATCH] Remove CtrlAltTab code, replace w/ CtrlAltN, remove
 CtrlAltESC

---
 src/Kernel/KernelA.HH            | 2 +-
 src/Kernel/KeyDev.ZC             | 2 +-
 src/Kernel/Sched.ZC              | 4 ++--
 src/Kernel/SerialDev/Keyboard.ZC | 7 +------
 src/System/Training.ZC           | 4 ----
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH
index 73d5de3d..c29354a6 100755
--- a/src/Kernel/KernelA.HH
+++ b/src/Kernel/KernelA.HH
@@ -780,7 +780,7 @@ class CSema
 #define CTRL_ALT_DEL	0
 #define CTRL_ALT_C		1
 #define CTRL_ALT_X		2
-#define CTRL_ALT_TAB	3
+#define CTRL_ALT_N		3
 
 #help_index "Hash"
 public class CHash
diff --git a/src/Kernel/KeyDev.ZC b/src/Kernel/KeyDev.ZC
index a897da1f..8006c3e7 100755
--- a/src/Kernel/KeyDev.ZC
+++ b/src/Kernel/KeyDev.ZC
@@ -179,7 +179,7 @@ U0 CtrlAltM(I64)
 
 U0 CtrlAltN(I64)
 {
-	LBts(sys_ctrl_alt_flags, CTRL_ALT_TAB);
+	LBts(sys_ctrl_alt_flags, CTRL_ALT_N);
 }
 
 U0 CtrlAltT(I64)
diff --git a/src/Kernel/Sched.ZC b/src/Kernel/Sched.ZC
index 9d472dc3..dfd60f29 100755
--- a/src/Kernel/Sched.ZC
+++ b/src/Kernel/Sched.ZC
@@ -176,7 +176,7 @@ _YIELD::
 				MOV 		RSI, U64 CTask.next_task[RSI]
 
 RESTORE_RSI_TASK:
-				TEST		U64 [SYS_CTRL_ALT_FLAGS], 1 << CTRL_ALT_DEL|1 << CTRL_ALT_TAB|1 << CTRL_ALT_X|1 << CTRL_ALT_C
+				TEST		U64 [SYS_CTRL_ALT_FLAGS], 1 << CTRL_ALT_DEL | 1 << CTRL_ALT_N | 1 << CTRL_ALT_X | 1 << CTRL_ALT_C
 				JNZ 		HANDLE_SYSF_KEY_EVENT
 
 RESTORE_RSI_TASK2:
@@ -230,7 +230,7 @@ HANDLE_SYSF_KEY_EVENT:
 				JE			RESTORE_EXECUTIVE_TASK_IF_READY
 
 				LOCK
-				BTR 		U32 [RAX], CTRL_ALT_TAB
+				BTR 		U32 [RAX], CTRL_ALT_N
 				JNC 		@@05
 				CALL		&TaskFocusNext
 				JMP 		I32 RESTORE_FS_TASK
diff --git a/src/Kernel/SerialDev/Keyboard.ZC b/src/Kernel/SerialDev/Keyboard.ZC
index d5169719..023e0316 100755
--- a/src/Kernel/SerialDev/Keyboard.ZC
+++ b/src/Kernel/SerialDev/Keyboard.ZC
@@ -421,12 +421,7 @@ U0 KbdBuildSC(U8 raw_byte, Bool in_irq, U8 *_last_raw_byte, I64 *_last_sc)
 				CtrlAltDel(sc);
 			else
 			{
-				if (sc & 255 == SC_ESC)
-					ch = 't';
-				else if (sc & 255 == SC_TAB)
-					ch = 'n';
-				else
-					ch = ScanCode2Char(sc & 255);
+				ch = ScanCode2Char(sc & 255);
 				if ('a' <= ch <= 'z')
 				{
 					sc &= ~(SCF_NEW_KEY | SCF_NEW_KEY << 32);
diff --git a/src/System/Training.ZC b/src/System/Training.ZC
index bb58647b..f0f16b6e 100755
--- a/src/System/Training.ZC
+++ b/src/System/Training.ZC
@@ -51,10 +51,6 @@ U0 KeyMapCtrlAltFamily(Bool no_shift, Bool shift)
 		no_shift_f = 0;
 	if (no_shift)
 		KeyMapKeyPrint(SC_DELETE + SCF_CTRL + SCF_ALT + no_shift_f, &Reboot, "Cmd /Reboot");
-	if (no_shift)
-		KeyMapKeyPrint(SC_ESC + SCF_CTRL + SCF_ALT + no_shift_f, &User, "Cmd /Terminal Window");
-	if (no_shift)
-		KeyMapKeyPrint(SC_TAB + SCF_CTRL + SCF_ALT + no_shift_f, &WinToTop, "Cmd /Next Focus Task");
 
 	for (i = 0; i < 26; i++)
 		if (keydev.fp_ctrl_alt_cbs[i])