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

WindowsServer: Add scancode value to KeyEvent

Browse source
This commit is contained in:
Hüseyin ASLITÜRK 2020-05-30 15:54:02 +03:00 • committed by Andreas Kling
parent c6f1962919
commit 9ec6ac31b8
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Services/WindowServer/Event.h
View file

@ -76,11 +76,12 @@ enum class MouseButton : u8 {
class KeyEvent final : public Event { class KeyEvent final : public Event {
public: public:
KeyEvent(Type type, int key, char character, u8 modifiers) KeyEvent(Type type, int key, char character, u8 modifiers, u32 scancode)
: Event(type) : Event(type)
, m_key(key) , m_key(key)
, m_character(character) , m_character(character)
, m_modifiers(modifiers) , m_modifiers(modifiers)
, m_scancode(scancode)
{ {
} }
@ -91,6 +92,7 @@ public:
bool logo() const { return m_modifiers & Mod_Logo; } bool logo() const { return m_modifiers & Mod_Logo; }
u8 modifiers() const { return m_modifiers; } u8 modifiers() const { return m_modifiers; }
char character() const { return m_character; } char character() const { return m_character; }
u32 scancode() const { return m_scancode; }
private: private:
friend class EventLoop; friend class EventLoop;
@ -98,6 +100,7 @@ private:
int m_key { 0 }; int m_key { 0 };
char m_character { 0 }; char m_character { 0 };
u8 m_modifiers { 0 }; u8 m_modifiers { 0 };
u32 m_scancode { 0 };
}; };
class MouseEvent final : public Event { class MouseEvent final : public Event {

2
Services/WindowServer/Screen.cpp
View file

@ -164,7 +164,7 @@ void Screen::on_receive_mouse_data(const MousePacket& packet)
void Screen::on_receive_keyboard_data(::KeyEvent kernel_event) void Screen::on_receive_keyboard_data(::KeyEvent kernel_event)
{ {
m_modifiers = kernel_event.modifiers(); m_modifiers = kernel_event.modifiers();
auto message = make<KeyEvent>(kernel_event.is_press() ? Event::KeyDown : Event::KeyUp, kernel_event.key, kernel_event.character, kernel_event.modifiers()); auto message = make<KeyEvent>(kernel_event.is_press() ? Event::KeyDown : Event::KeyUp, kernel_event.key, kernel_event.character, kernel_event.modifiers(), kernel_event.scancode);
Core::EventLoop::current().post_event(WindowManager::the(), move(message)); Core::EventLoop::current().post_event(WindowManager::the(), move(message));
} }

6
Services/WindowServer/Window.cpp
View file

@ -304,14 +304,16 @@ void Window::event(Core::Event& event)
Messages::WindowClient::KeyDown(m_window_id, Messages::WindowClient::KeyDown(m_window_id,
(u8) static_cast<const KeyEvent&>(event).character(), (u8) static_cast<const KeyEvent&>(event).character(),
(u32) static_cast<const KeyEvent&>(event).key(), (u32) static_cast<const KeyEvent&>(event).key(),
static_cast<const KeyEvent&>(event).modifiers())); static_cast<const KeyEvent&>(event).modifiers(),
(u32) static_cast<const KeyEvent&>(event).scancode()));
break; break;
case Event::KeyUp: case Event::KeyUp:
m_client->post_message( m_client->post_message(
Messages::WindowClient::KeyUp(m_window_id, Messages::WindowClient::KeyUp(m_window_id,
(u8) static_cast<const KeyEvent&>(event).character(), (u8) static_cast<const KeyEvent&>(event).character(),
(u32) static_cast<const KeyEvent&>(event).key(), (u32) static_cast<const KeyEvent&>(event).key(),
static_cast<const KeyEvent&>(event).modifiers())); static_cast<const KeyEvent&>(event).modifiers(),
(u32) static_cast<const KeyEvent&>(event).scancode()));
break; break;
case Event::WindowActivated: case Event::WindowActivated:
m_client->post_message(Messages::WindowClient::WindowActivated(m_window_id)); m_client->post_message(Messages::WindowClient::WindowActivated(m_window_id));

4
Services/WindowServer/WindowClient.ipc
View file

@ -8,8 +8,8 @@ endpoint WindowClient = 4
MouseWheel(i32 window_id, Gfx::Point mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta) =| MouseWheel(i32 window_id, Gfx::Point mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta) =|
WindowEntered(i32 window_id) =| WindowEntered(i32 window_id) =|
WindowLeft(i32 window_id) =| WindowLeft(i32 window_id) =|
KeyDown(i32 window_id, u8 character, u32 key, u32 modifiers) =| KeyDown(i32 window_id, u8 character, u32 key, u32 modifiers, u32 scancode) =|
KeyUp(i32 window_id, u8 character, u32 key, u32 modifiers) =| KeyUp(i32 window_id, u8 character, u32 key, u32 modifiers, u32 scancode) =|
WindowActivated(i32 window_id) =| WindowActivated(i32 window_id) =|
WindowDeactivated(i32 window_id) =| WindowDeactivated(i32 window_id) =|
WindowStateChanged(i32 window_id, bool minimized, bool occluded) =| WindowStateChanged(i32 window_id, bool minimized, bool occluded) =|