mirror of
https://github.com/Zeal-Operating-System/ZealOS.git
synced 2025-03-15 04:25:06 +00:00
Remove CtrlAltTab code, replace w/ CtrlAltN, remove CtrlAltESC
This commit is contained in:
parent
cb0198e864
commit
63ff53a16e
5 changed files with 5 additions and 14 deletions
|
@ -780,7 +780,7 @@ class CSema
|
||||||
#define CTRL_ALT_DEL 0
|
#define CTRL_ALT_DEL 0
|
||||||
#define CTRL_ALT_C 1
|
#define CTRL_ALT_C 1
|
||||||
#define CTRL_ALT_X 2
|
#define CTRL_ALT_X 2
|
||||||
#define CTRL_ALT_TAB 3
|
#define CTRL_ALT_N 3
|
||||||
|
|
||||||
#help_index "Hash"
|
#help_index "Hash"
|
||||||
public class CHash
|
public class CHash
|
||||||
|
|
|
@ -179,7 +179,7 @@ U0 CtrlAltM(I64)
|
||||||
|
|
||||||
U0 CtrlAltN(I64)
|
U0 CtrlAltN(I64)
|
||||||
{
|
{
|
||||||
LBts(sys_ctrl_alt_flags, CTRL_ALT_TAB);
|
LBts(sys_ctrl_alt_flags, CTRL_ALT_N);
|
||||||
}
|
}
|
||||||
|
|
||||||
U0 CtrlAltT(I64)
|
U0 CtrlAltT(I64)
|
||||||
|
|
|
@ -176,7 +176,7 @@ _YIELD::
|
||||||
MOV RSI, U64 CTask.next_task[RSI]
|
MOV RSI, U64 CTask.next_task[RSI]
|
||||||
|
|
||||||
RESTORE_RSI_TASK:
|
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
|
JNZ HANDLE_SYSF_KEY_EVENT
|
||||||
|
|
||||||
RESTORE_RSI_TASK2:
|
RESTORE_RSI_TASK2:
|
||||||
|
@ -230,7 +230,7 @@ HANDLE_SYSF_KEY_EVENT:
|
||||||
JE RESTORE_EXECUTIVE_TASK_IF_READY
|
JE RESTORE_EXECUTIVE_TASK_IF_READY
|
||||||
|
|
||||||
LOCK
|
LOCK
|
||||||
BTR U32 [RAX], CTRL_ALT_TAB
|
BTR U32 [RAX], CTRL_ALT_N
|
||||||
JNC @@05
|
JNC @@05
|
||||||
CALL &TaskFocusNext
|
CALL &TaskFocusNext
|
||||||
JMP I32 RESTORE_FS_TASK
|
JMP I32 RESTORE_FS_TASK
|
||||||
|
|
|
@ -421,11 +421,6 @@ U0 KbdBuildSC(U8 raw_byte, Bool in_irq, U8 *_last_raw_byte, I64 *_last_sc)
|
||||||
CtrlAltDel(sc);
|
CtrlAltDel(sc);
|
||||||
else
|
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')
|
if ('a' <= ch <= 'z')
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,10 +51,6 @@ U0 KeyMapCtrlAltFamily(Bool no_shift, Bool shift)
|
||||||
no_shift_f = 0;
|
no_shift_f = 0;
|
||||||
if (no_shift)
|
if (no_shift)
|
||||||
KeyMapKeyPrint(SC_DELETE + SCF_CTRL + SCF_ALT + no_shift_f, &Reboot, "Cmd /Reboot");
|
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++)
|
for (i = 0; i < 26; i++)
|
||||||
if (keydev.fp_ctrl_alt_cbs[i])
|
if (keydev.fp_ctrl_alt_cbs[i])
|
||||||
|
|
Loading…
Reference in a new issue