mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:27:35 +00:00
LibWeb: Add the missing KeyboardEvent IDL constructor
This commit also does a bit of general cleanup on the header file.
This commit is contained in:
parent
c5b924b1e6
commit
f74b612aa4
5 changed files with 99 additions and 35 deletions
|
@ -8,30 +8,45 @@
|
|||
|
||||
#include <AK/TypeCasts.h>
|
||||
#include <Kernel/API/KeyCode.h>
|
||||
#include <LibWeb/UIEvents/EventModifier.h>
|
||||
#include <LibWeb/UIEvents/UIEvent.h>
|
||||
|
||||
namespace Web::UIEvents {
|
||||
|
||||
struct KeyboardEventInit : public EventModifierInit {
|
||||
String key { "" };
|
||||
String code { "" };
|
||||
u32 location { 0 };
|
||||
bool repeat { false };
|
||||
bool is_composing { false };
|
||||
u32 key_code { 0 };
|
||||
u32 char_code { 0 };
|
||||
};
|
||||
|
||||
// https://www.w3.org/TR/uievents/#interface-keyboardevent
|
||||
class KeyboardEvent final : public UIEvent {
|
||||
public:
|
||||
using WrapperType = Bindings::KeyboardEventWrapper;
|
||||
|
||||
static NonnullRefPtr<KeyboardEvent> create(FlyString event_name, String key, String code, unsigned long location, bool ctrl_key, bool shift_key, bool alt_key, bool meta_key, bool repeat, bool is_composing, unsigned long key_code, unsigned long char_code)
|
||||
static NonnullRefPtr<KeyboardEvent> create(FlyString const& event_name, KeyboardEventInit const& event_init = {})
|
||||
{
|
||||
return adopt_ref(*new KeyboardEvent(move(event_name), move(key), move(code), location, ctrl_key, shift_key, alt_key, meta_key, repeat, is_composing, key_code, char_code));
|
||||
return adopt_ref(*new KeyboardEvent(event_name, event_init));
|
||||
}
|
||||
static NonnullRefPtr<KeyboardEvent> create_with_global_object(Bindings::WindowObject&, FlyString const& event_name, KeyboardEventInit const& event_init)
|
||||
{
|
||||
return KeyboardEvent::create(event_name, event_init);
|
||||
}
|
||||
|
||||
static NonnullRefPtr<KeyboardEvent> create_from_platform_event(FlyString event_name, KeyCode, unsigned modifiers, u32 code_point);
|
||||
static NonnullRefPtr<KeyboardEvent> create_from_platform_event(FlyString const& event_name, KeyCode, unsigned modifiers, u32 code_point);
|
||||
|
||||
virtual ~KeyboardEvent() override;
|
||||
virtual ~KeyboardEvent() override = default;
|
||||
|
||||
unsigned long key_code() const { return m_key_code; }
|
||||
unsigned long char_code() const { return m_char_code; }
|
||||
u32 key_code() const { return m_key_code; }
|
||||
u32 char_code() const { return m_char_code; }
|
||||
|
||||
String key() const { return m_key; }
|
||||
String code() const { return m_code; }
|
||||
unsigned long location() const { return m_location; }
|
||||
u32 location() const { return m_location; }
|
||||
|
||||
bool ctrl_key() const { return m_ctrl_key; }
|
||||
bool shift_key() const { return m_shift_key; }
|
||||
|
@ -44,19 +59,31 @@ public:
|
|||
bool get_modifier_state(String const& key_arg);
|
||||
|
||||
private:
|
||||
KeyboardEvent(FlyString event_name, String key, String code, unsigned long location, bool ctrl_key, bool shift_key, bool alt_key, bool meta_key, bool repeat, bool is_composing, unsigned long key_code, unsigned long char_code);
|
||||
KeyboardEvent(FlyString const& event_name, KeyboardEventInit const& event_init)
|
||||
: UIEvent(event_name, event_init)
|
||||
, m_key(event_init.key)
|
||||
, m_code(event_init.code)
|
||||
, m_location(event_init.location)
|
||||
, m_ctrl_key(event_init.ctrl_key)
|
||||
, m_shift_key(event_init.shift_key)
|
||||
, m_alt_key(event_init.alt_key)
|
||||
, m_meta_key(event_init.meta_key)
|
||||
, m_repeat(event_init.repeat)
|
||||
, m_is_composing(event_init.is_composing)
|
||||
, m_key_code(event_init.key_code)
|
||||
, m_char_code(event_init.char_code) {};
|
||||
|
||||
String m_key;
|
||||
String m_code;
|
||||
unsigned long m_location { 0 };
|
||||
u32 m_location { 0 };
|
||||
bool m_ctrl_key { false };
|
||||
bool m_shift_key { false };
|
||||
bool m_alt_key { false };
|
||||
bool m_meta_key { false };
|
||||
bool m_repeat { false };
|
||||
bool m_is_composing { false };
|
||||
unsigned long m_key_code { 0 };
|
||||
unsigned long m_char_code { 0 };
|
||||
u32 m_key_code { 0 };
|
||||
u32 m_char_code { 0 };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue