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

LibWeb: Implement KeyboardEvent.location closer to the spec

Browse source
This commit is contained in:
Timothy Flynn 2023-07-08 19:30:36 -04:00 • committed by Andreas Kling
parent 71bf9f1d0d
commit cd995d113b
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibWeb/UIEvents/KeyboardEvent.cpp
View file

@ -484,6 +484,25 @@ static ErrorOr<String> get_event_code(KeyCode platform_key, unsigned modifiers)
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
// 5.6.2. Keyboard Event Key Location, https://www.w3.org/TR/uievents/#events-keyboard-key-location
static DOMKeyLocation get_event_location(KeyCode platform_key, unsigned modifiers)
{
if ((modifiers & Mod_Keypad) != 0)
return DOMKeyLocation::Numpad;
// FIXME: Detect left vs. right for Control and Alt keys.
switch (platform_key) {
case KeyCode::Key_LeftShift:
return DOMKeyLocation::Left;
case KeyCode::Key_RightShift:
return DOMKeyLocation::Right;
default:
break;
}
return DOMKeyLocation::Standard;
}
WebIDL::ExceptionOr<JS::NonnullGCPtr<KeyboardEvent>> KeyboardEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, KeyCode platform_key, unsigned modifiers, u32 code_point) WebIDL::ExceptionOr<JS::NonnullGCPtr<KeyboardEvent>> KeyboardEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, KeyCode platform_key, unsigned modifiers, u32 code_point)
{ {
auto& vm = realm.vm(); auto& vm = realm.vm();
@ -495,7 +514,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<KeyboardEvent>> KeyboardEvent::create_from_
KeyboardEventInit event_init {}; KeyboardEventInit event_init {};
event_init.key = move(event_key); event_init.key = move(event_key);
event_init.code = move(event_code); event_init.code = move(event_code);
event_init.location = 0; event_init.location = to_underlying(get_event_location(platform_key, modifiers));
event_init.ctrl_key = modifiers & Mod_Ctrl; event_init.ctrl_key = modifiers & Mod_Ctrl;
event_init.shift_key = modifiers & Mod_Shift; event_init.shift_key = modifiers & Mod_Shift;
event_init.alt_key = modifiers & Mod_Alt; event_init.alt_key = modifiers & Mod_Alt;

7
Userland/Libraries/LibWeb/UIEvents/KeyboardEvent.h
View file

@ -24,6 +24,13 @@ struct KeyboardEventInit : public EventModifierInit {
u32 char_code { 0 }; u32 char_code { 0 };
}; };
enum class DOMKeyLocation {
Standard = 0,
Left = 1,
Right = 2,
Numpad = 3,
};
// https://www.w3.org/TR/uievents/#interface-keyboardevent // https://www.w3.org/TR/uievents/#interface-keyboardevent
class KeyboardEvent final : public UIEvent { class KeyboardEvent final : public UIEvent {
WEB_PLATFORM_OBJECT(KeyboardEvent, UIEvent); WEB_PLATFORM_OBJECT(KeyboardEvent, UIEvent);