RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:57:34 +00:00
Code Issues Activity Actions

Everywhere: Rename "logo" key to "super" key

Browse source 
This seems to be the most common way to refer to this key, so let's
call it what people actually call it.
This commit is contained in:
Andreas Kling 2021-03-11 18:50:23 +01:00
parent 822d7da6cc
commit 38f11cc1ba
11 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/API/KeyCode.h
View file

@ -134,7 +134,7 @@
__ENUMERATE_KEY_CODE(Pipe, "|") \
__ENUMERATE_KEY_CODE(Tilde, "~") \
__ENUMERATE_KEY_CODE(Backtick, "`") \
__ENUMERATE_KEY_CODE(Logo, "Logo") \
__ENUMERATE_KEY_CODE(Super, "Super") \
__ENUMERATE_KEY_CODE(Menu, "Menu")
enum KeyCode : u8 {
@ -145,14 +145,14 @@ enum KeyCode : u8 {
Key_Shift
= Key_LeftShift,
};
const int key_code_count = Key_Logo;
const int key_code_count = Key_Super;
enum KeyModifier {
Mod_None = 0x00,
Mod_Alt = 0x01,
Mod_Ctrl = 0x02,
Mod_Shift = 0x04,
Mod_Logo = 0x08,
Mod_Super = 0x08,
Mod_AltGr = 0x10,
Mod_Mask = 0x1f,
@ -169,7 +169,7 @@ struct KeyEvent {
bool alt() const { return flags & Mod_Alt; }
bool ctrl() const { return flags & Mod_Ctrl; }
bool shift() const { return flags & Mod_Shift; }
bool logo() const { return flags & Mod_Logo; }
bool super() const { return flags & Mod_Super; }
bool altgr() const { return flags & Mod_AltGr; }
unsigned modifiers() const { return flags & Mod_Mask; }
bool is_press() const { return flags & Is_Press; }

6
Kernel/Devices/KeyboardDevice.cpp
View file

@ -131,7 +131,7 @@ static const KeyCode unshifted_key_map[0x80] = {
Key_F12,
Key_Invalid,
Key_Invalid,
Key_Logo,
Key_Super,
Key_Invalid,
Key_Menu,
};
@ -228,7 +228,7 @@ static const KeyCode shifted_key_map[0x100] = {
Key_F12,
Key_Invalid,
Key_Invalid,
Key_Logo,
Key_Super,
Key_Invalid,
Key_Menu,
};
@ -312,7 +312,7 @@ void KeyboardDevice::irq_handle_byte_read(u8 byte)
update_modifier(Mod_Ctrl, pressed);
break;
case 0x5b:
update_modifier(Mod_Logo, pressed);
update_modifier(Mod_Super, pressed);
break;
case 0x2a:
case 0x36: