mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 17:27:35 +00:00
LibGUI+WindowServer: Add new WMEvent
Super+Digit
This adds a keyboard event for Super+0 to Super+9. Later to be consumed in the taskbar. Currently only this keyboard sequence is supported: - Super key down - Digit key down But not this: - Super key down - Digit key down - Digit key up - Digit key down
This commit is contained in:
parent
001b08dec9
commit
6992a07afc
6 changed files with 41 additions and 0 deletions
|
@ -66,6 +66,7 @@ public:
|
||||||
WM_AppletAreaSizeChanged,
|
WM_AppletAreaSizeChanged,
|
||||||
WM_SuperKeyPressed,
|
WM_SuperKeyPressed,
|
||||||
WM_SuperSpaceKeyPressed,
|
WM_SuperSpaceKeyPressed,
|
||||||
|
WM_SuperDigitKeyPressed,
|
||||||
WM_WorkspaceChanged,
|
WM_WorkspaceChanged,
|
||||||
WM_KeymapChanged,
|
WM_KeymapChanged,
|
||||||
__End_WM_Events,
|
__End_WM_Events,
|
||||||
|
@ -115,6 +116,20 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class WMSuperDigitKeyPressedEvent : public WMEvent {
|
||||||
|
public:
|
||||||
|
WMSuperDigitKeyPressedEvent(int client_id, u8 digit)
|
||||||
|
: WMEvent(Event::Type::WM_SuperDigitKeyPressed, client_id, 0)
|
||||||
|
, m_digit(digit)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
u8 digit() const { return m_digit; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
u8 m_digit { 0 };
|
||||||
|
};
|
||||||
|
|
||||||
class WMAppletAreaSizeChangedEvent : public WMEvent {
|
class WMAppletAreaSizeChangedEvent : public WMEvent {
|
||||||
public:
|
public:
|
||||||
explicit WMAppletAreaSizeChangedEvent(const Gfx::IntSize& size)
|
explicit WMAppletAreaSizeChangedEvent(const Gfx::IntSize& size)
|
||||||
|
|
|
@ -64,6 +64,12 @@ void WindowManagerServerConnection::super_space_key_pressed(i32 wm_id)
|
||||||
Core::EventLoop::current().post_event(*window, make<WMSuperSpaceKeyPressedEvent>(wm_id));
|
Core::EventLoop::current().post_event(*window, make<WMSuperSpaceKeyPressedEvent>(wm_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WindowManagerServerConnection::super_digit_key_pressed(i32 wm_id, u8 digit)
|
||||||
|
{
|
||||||
|
if (auto* window = Window::from_window_id(wm_id))
|
||||||
|
Core::EventLoop::current().post_event(*window, make<WMSuperDigitKeyPressedEvent>(wm_id, digit));
|
||||||
|
}
|
||||||
|
|
||||||
void WindowManagerServerConnection::workspace_changed(i32 wm_id, u32 row, u32 column)
|
void WindowManagerServerConnection::workspace_changed(i32 wm_id, u32 row, u32 column)
|
||||||
{
|
{
|
||||||
if (auto* window = Window::from_window_id(wm_id))
|
if (auto* window = Window::from_window_id(wm_id))
|
||||||
|
|
|
@ -34,6 +34,7 @@ private:
|
||||||
virtual void applet_area_size_changed(i32, Gfx::IntSize const&) override;
|
virtual void applet_area_size_changed(i32, Gfx::IntSize const&) override;
|
||||||
virtual void super_key_pressed(i32) override;
|
virtual void super_key_pressed(i32) override;
|
||||||
virtual void super_space_key_pressed(i32) override;
|
virtual void super_space_key_pressed(i32) override;
|
||||||
|
virtual void super_digit_key_pressed(i32, u8) override;
|
||||||
virtual void workspace_changed(i32, u32, u32) override;
|
virtual void workspace_changed(i32, u32, u32) override;
|
||||||
virtual void keymap_changed(i32, String const&) override;
|
virtual void keymap_changed(i32, String const&) override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -546,6 +546,17 @@ void WindowManager::tell_wms_super_space_key_pressed()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WindowManager::tell_wms_super_digit_key_pressed(u8 digit)
|
||||||
|
{
|
||||||
|
for_each_window_manager([digit](WMClientConnection& conn) {
|
||||||
|
if (conn.window_id() < 0)
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
|
||||||
|
conn.async_super_digit_key_pressed(conn.window_id(), digit);
|
||||||
|
return IterationDecision::Continue;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void WindowManager::tell_wms_current_window_stack_changed()
|
void WindowManager::tell_wms_current_window_stack_changed()
|
||||||
{
|
{
|
||||||
for_each_window_manager([&](WMClientConnection& conn) {
|
for_each_window_manager([&](WMClientConnection& conn) {
|
||||||
|
@ -1603,6 +1614,12 @@ void WindowManager::process_key_event(KeyEvent& event)
|
||||||
tell_wms_super_space_key_pressed();
|
tell_wms_super_space_key_pressed();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (event.type() == Event::KeyDown && event.key() >= Key_0 && event.key() <= Key_9) {
|
||||||
|
auto digit = event.key() - Key_0;
|
||||||
|
tell_wms_super_digit_key_pressed(digit);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (MenuManager::the().current_menu() && event.key() != Key_Super) {
|
if (MenuManager::the().current_menu() && event.key() != Key_Super) {
|
||||||
|
|
|
@ -187,6 +187,7 @@ public:
|
||||||
void tell_wms_applet_area_size_changed(Gfx::IntSize const&);
|
void tell_wms_applet_area_size_changed(Gfx::IntSize const&);
|
||||||
void tell_wms_super_key_pressed();
|
void tell_wms_super_key_pressed();
|
||||||
void tell_wms_super_space_key_pressed();
|
void tell_wms_super_space_key_pressed();
|
||||||
|
void tell_wms_super_digit_key_pressed(u8);
|
||||||
void tell_wms_current_window_stack_changed();
|
void tell_wms_current_window_stack_changed();
|
||||||
|
|
||||||
bool is_active_window_or_accessory(Window&) const;
|
bool is_active_window_or_accessory(Window&) const;
|
||||||
|
|
|
@ -9,6 +9,7 @@ endpoint WindowManagerClient
|
||||||
applet_area_size_changed(i32 wm_id, Gfx::IntSize size) =|
|
applet_area_size_changed(i32 wm_id, Gfx::IntSize size) =|
|
||||||
super_key_pressed(i32 wm_id) =|
|
super_key_pressed(i32 wm_id) =|
|
||||||
super_space_key_pressed(i32 wm_id) =|
|
super_space_key_pressed(i32 wm_id) =|
|
||||||
|
super_digit_key_pressed(i32 wm_id, u8 digit) =|
|
||||||
workspace_changed(i32 wm_id, u32 row, u32 column) =|
|
workspace_changed(i32 wm_id, u32 row, u32 column) =|
|
||||||
keymap_changed(i32 wm_id, [UTF8] String keymap) =|
|
keymap_changed(i32 wm_id, [UTF8] String keymap) =|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue