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

LibWeb: Move string literals to {HTML,UIEvents}::EventNames.h

Browse source 
This moves the reamining string literals from GlobalEventHandlers.h to
{HTML,UIEvents}::EventNames.h.
This commit is contained in:
Kenneth Myhra 2023-03-24 18:10:45 +01:00 • committed by Linus Groh
parent bdab61ad93
commit 3aa485aa09
3 changed files with 147 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Userland/Libraries/LibWeb/HTML/EventNames.h
View file

@ -23,13 +23,26 @@ namespace Web::HTML::EventNames {
__ENUMERATE_HTML_EVENT(beforeunload) \ __ENUMERATE_HTML_EVENT(beforeunload) \
__ENUMERATE_HTML_EVENT(blur) \ __ENUMERATE_HTML_EVENT(blur) \
__ENUMERATE_HTML_EVENT(cancel) \ __ENUMERATE_HTML_EVENT(cancel) \
__ENUMERATE_HTML_EVENT(canplay) \
__ENUMERATE_HTML_EVENT(canplaythrough) \
__ENUMERATE_HTML_EVENT(change) \ __ENUMERATE_HTML_EVENT(change) \
__ENUMERATE_HTML_EVENT(click) \ __ENUMERATE_HTML_EVENT(click) \
__ENUMERATE_HTML_EVENT(close) \ __ENUMERATE_HTML_EVENT(close) \
__ENUMERATE_HTML_EVENT(connect) \ __ENUMERATE_HTML_EVENT(connect) \
__ENUMERATE_HTML_EVENT(contextmenu) \ __ENUMERATE_HTML_EVENT(contextmenu) \
__ENUMERATE_HTML_EVENT(copy) \ __ENUMERATE_HTML_EVENT(copy) \
__ENUMERATE_HTML_EVENT(cuechange) \
__ENUMERATE_HTML_EVENT(cut) \ __ENUMERATE_HTML_EVENT(cut) \
__ENUMERATE_HTML_EVENT(drag) \
__ENUMERATE_HTML_EVENT(dragend) \
__ENUMERATE_HTML_EVENT(dragenter) \
__ENUMERATE_HTML_EVENT(dragleave) \
__ENUMERATE_HTML_EVENT(dragover) \
__ENUMERATE_HTML_EVENT(dragstart) \
__ENUMERATE_HTML_EVENT(drop) \
__ENUMERATE_HTML_EVENT(durationchange) \
__ENUMERATE_HTML_EVENT(emptied) \
__ENUMERATE_HTML_EVENT(ended) \
__ENUMERATE_HTML_EVENT(error) \ __ENUMERATE_HTML_EVENT(error) \
__ENUMERATE_HTML_EVENT(focus) \ __ENUMERATE_HTML_EVENT(focus) \
__ENUMERATE_HTML_EVENT(formdata) \ __ENUMERATE_HTML_EVENT(formdata) \
@ -38,6 +51,10 @@ namespace Web::HTML::EventNames {
__ENUMERATE_HTML_EVENT(invalid) \ __ENUMERATE_HTML_EVENT(invalid) \
__ENUMERATE_HTML_EVENT(languagechange) \ __ENUMERATE_HTML_EVENT(languagechange) \
__ENUMERATE_HTML_EVENT(load) \ __ENUMERATE_HTML_EVENT(load) \
__ENUMERATE_HTML_EVENT(loaded) \
__ENUMERATE_HTML_EVENT(loadeddata) \
__ENUMERATE_HTML_EVENT(loadedmetadata) \
__ENUMERATE_HTML_EVENT(loadstart) \
__ENUMERATE_HTML_EVENT(message) \ __ENUMERATE_HTML_EVENT(message) \
__ENUMERATE_HTML_EVENT(messageerror) \ __ENUMERATE_HTML_EVENT(messageerror) \
__ENUMERATE_HTML_EVENT(offline) \ __ENUMERATE_HTML_EVENT(offline) \
@ -46,20 +63,37 @@ namespace Web::HTML::EventNames {
__ENUMERATE_HTML_EVENT(pagehide) \ __ENUMERATE_HTML_EVENT(pagehide) \
__ENUMERATE_HTML_EVENT(pageshow) \ __ENUMERATE_HTML_EVENT(pageshow) \
__ENUMERATE_HTML_EVENT(paste) \ __ENUMERATE_HTML_EVENT(paste) \
__ENUMERATE_HTML_EVENT(pause) \
__ENUMERATE_HTML_EVENT(play) \
__ENUMERATE_HTML_EVENT(playing) \
__ENUMERATE_HTML_EVENT(popstate) \ __ENUMERATE_HTML_EVENT(popstate) \
__ENUMERATE_HTML_EVENT(progress) \
__ENUMERATE_HTML_EVENT(ratechange) \
__ENUMERATE_HTML_EVENT(readystatechange) \ __ENUMERATE_HTML_EVENT(readystatechange) \
__ENUMERATE_HTML_EVENT(rejectionhandled) \ __ENUMERATE_HTML_EVENT(rejectionhandled) \
__ENUMERATE_HTML_EVENT(reset) \ __ENUMERATE_HTML_EVENT(reset) \
__ENUMERATE_HTML_EVENT(resize) \
__ENUMERATE_HTML_EVENT(scroll) \ __ENUMERATE_HTML_EVENT(scroll) \
__ENUMERATE_HTML_EVENT(securitypolicyviolation) \ __ENUMERATE_HTML_EVENT(securitypolicyviolation) \
__ENUMERATE_HTML_EVENT(seeked) \
__ENUMERATE_HTML_EVENT(seeking) \
__ENUMERATE_HTML_EVENT(select) \ __ENUMERATE_HTML_EVENT(select) \
__ENUMERATE_HTML_EVENT(slotchange) \ __ENUMERATE_HTML_EVENT(slotchange) \
__ENUMERATE_HTML_EVENT(stalled) \
__ENUMERATE_HTML_EVENT(storage) \ __ENUMERATE_HTML_EVENT(storage) \
__ENUMERATE_HTML_EVENT(submit) \ __ENUMERATE_HTML_EVENT(submit) \
__ENUMERATE_HTML_EVENT(suspend) \
__ENUMERATE_HTML_EVENT(timeupdate) \
__ENUMERATE_HTML_EVENT(toggle) \ __ENUMERATE_HTML_EVENT(toggle) \
__ENUMERATE_HTML_EVENT(unhandledrejection) \ __ENUMERATE_HTML_EVENT(unhandledrejection) \
__ENUMERATE_HTML_EVENT(unload) \ __ENUMERATE_HTML_EVENT(unload) \
__ENUMERATE_HTML_EVENT(visibilitychange) __ENUMERATE_HTML_EVENT(visibilitychange) \
__ENUMERATE_HTML_EVENT(volumechange) \
__ENUMERATE_HTML_EVENT(waiting) \
__ENUMERATE_HTML_EVENT(webkitanimationend) \
__ENUMERATE_HTML_EVENT(webkitanimationiteration) \
__ENUMERATE_HTML_EVENT(webkitanimationstart) \
__ENUMERATE_HTML_EVENT(webkittransitionend)
#define __ENUMERATE_HTML_EVENT(name) extern DeprecatedFlyString name; #define __ENUMERATE_HTML_EVENT(name) extern DeprecatedFlyString name;
ENUMERATE_HTML_EVENTS ENUMERATE_HTML_EVENTS

92
Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h
View file

@ -11,39 +11,39 @@
#define ENUMERATE_GLOBAL_EVENT_HANDLERS(E) \ #define ENUMERATE_GLOBAL_EVENT_HANDLERS(E) \
E(onabort, HTML::EventNames::abort) \ E(onabort, HTML::EventNames::abort) \
E(onauxclick, "auxclick") \ E(onauxclick, UIEvents::EventNames::auxclick) \
E(onblur, HTML::EventNames::blur) \ E(onblur, HTML::EventNames::blur) \
E(oncancel, HTML::EventNames::cancel) \ E(oncancel, HTML::EventNames::cancel) \
E(oncanplay, "canplay") \ E(oncanplay, HTML::EventNames::canplay) \
E(oncanplaythrough, "canplaythrough") \ E(oncanplaythrough, HTML::EventNames::canplaythrough) \
E(onchange, HTML::EventNames::change) \ E(onchange, HTML::EventNames::change) \
E(onclick, UIEvents::EventNames::click) \ E(onclick, UIEvents::EventNames::click) \
E(onclose, HTML::EventNames::close) \ E(onclose, HTML::EventNames::close) \
E(oncontextmenu, HTML::EventNames::contextmenu) \ E(oncontextmenu, HTML::EventNames::contextmenu) \
E(oncuechange, "cuechange") \ E(oncuechange, HTML::EventNames::cuechange) \
E(ondblclick, "dblclick") \ E(ondblclick, UIEvents::EventNames::dblclick) \
E(ondrag, "drag") \ E(ondrag, HTML::EventNames::drag) \
E(ondragend, "dragend") \ E(ondragend, HTML::EventNames::dragend) \
E(ondragenter, "dragenter") \ E(ondragenter, HTML::EventNames::dragenter) \
E(ondragleave, "dragleave") \ E(ondragleave, HTML::EventNames::dragleave) \
E(ondragover, "dragover") \ E(ondragover, HTML::EventNames::dragover) \
E(ondragstart, "dragstart") \ E(ondragstart, HTML::EventNames::dragstart) \
E(ondrop, "drop") \ E(ondrop, HTML::EventNames::drop) \
E(ondurationchange, "durationchange") \ E(ondurationchange, HTML::EventNames::durationchange) \
E(onemptied, "emptied") \ E(onemptied, HTML::EventNames::emptied) \
E(onended, "ended") \ E(onended, HTML::EventNames::ended) \
E(onerror, HTML::EventNames::error) \ E(onerror, HTML::EventNames::error) \
E(onfocus, "focus") \ E(onfocus, HTML::EventNames::focus) \
E(onformdata, "formdata") \ E(onformdata, HTML::EventNames::formdata) \
E(oninput, HTML::EventNames::input) \ E(oninput, HTML::EventNames::input) \
E(oninvalid, HTML::EventNames::invalid) \ E(oninvalid, HTML::EventNames::invalid) \
E(onkeydown, "keydown") \ E(onkeydown, UIEvents::EventNames::keydown) \
E(onkeypress, "keypress") \ E(onkeypress, UIEvents::EventNames::keypress) \
E(onkeyup, "keyup") \ E(onkeyup, UIEvents::EventNames::keyup) \
E(onload, HTML::EventNames::load) \ E(onload, HTML::EventNames::load) \
E(onloadeddata, "loadeddata") \ E(onloadeddata, HTML::EventNames::loadeddata) \
E(onloadedmetadata, "loadedmetadata") \ E(onloadedmetadata, HTML::EventNames::loadedmetadata) \
E(onloadstart, "loadstart") \ E(onloadstart, HTML::EventNames::loadstart) \
E(onmousedown, UIEvents::EventNames::mousedown) \ E(onmousedown, UIEvents::EventNames::mousedown) \
E(onmouseenter, UIEvents::EventNames::mouseenter) \ E(onmouseenter, UIEvents::EventNames::mouseenter) \
E(onmouseleave, UIEvents::EventNames::mouseleave) \ E(onmouseleave, UIEvents::EventNames::mouseleave) \
@ -51,31 +51,31 @@
E(onmouseout, UIEvents::EventNames::mouseout) \ E(onmouseout, UIEvents::EventNames::mouseout) \
E(onmouseover, UIEvents::EventNames::mouseover) \ E(onmouseover, UIEvents::EventNames::mouseover) \
E(onmouseup, UIEvents::EventNames::mouseup) \ E(onmouseup, UIEvents::EventNames::mouseup) \
E(onpause, "pause") \ E(onpause, HTML::EventNames::pause) \
E(onplay, "play") \ E(onplay, HTML::EventNames::play) \
E(onplaying, "playing") \ E(onplaying, HTML::EventNames::playing) \
E(onprogress, "progress") \ E(onprogress, HTML::EventNames::progress) \
E(onratechange, "ratechange") \ E(onratechange, HTML::EventNames::ratechange) \
E(onreset, "reset") \ E(onreset, HTML::EventNames::reset) \
E(onresize, "resize") \ E(onresize, HTML::EventNames::resize) \
E(onscroll, "scroll") \ E(onscroll, HTML::EventNames::scroll) \
E(onsecuritypolicyviolation, "securitypolicyviolation") \ E(onsecuritypolicyviolation, HTML::EventNames::securitypolicyviolation) \
E(onseeked, "seeked") \ E(onseeked, HTML::EventNames::seeked) \
E(onseeking, "seeking") \ E(onseeking, HTML::EventNames::seeking) \
E(onselect, HTML::EventNames::select) \ E(onselect, HTML::EventNames::select) \
E(onslotchange, "slotchange") \ E(onslotchange, HTML::EventNames::slotchange) \
E(onstalled, "stalled") \ E(onstalled, HTML::EventNames::stalled) \
E(onsubmit, HTML::EventNames::submit) \ E(onsubmit, HTML::EventNames::submit) \
E(onsuspend, "suspend") \ E(onsuspend, HTML::EventNames::suspend) \
E(ontimeupdate, "timeupdate") \ E(ontimeupdate, HTML::EventNames::timeupdate) \
E(ontoggle, "toggle") \ E(ontoggle, HTML::EventNames::toggle) \
E(onvolumechange, "volumechange") \ E(onvolumechange, HTML::EventNames::volumechange) \
E(onwaiting, "waiting") \ E(onwaiting, HTML::EventNames::waiting) \
E(onwebkitanimationend, "webkitanimationend") \ E(onwebkitanimationend, HTML::EventNames::webkitanimationend) \
E(onwebkitanimationiteration, "webkitanimationiteration") \ E(onwebkitanimationiteration, HTML::EventNames::webkitanimationiteration) \
E(onwebkitanimationstart, "webkitanimationstart") \ E(onwebkitanimationstart, HTML::EventNames::webkitanimationstart) \
E(onwebkittransitionend, "webkittransitionend") \ E(onwebkittransitionend, HTML::EventNames::webkittransitionend) \
E(onwheel, "wheel") E(onwheel, UIEvents::EventNames::wheel)
namespace Web::HTML { namespace Web::HTML {

1
Userland/Libraries/LibWeb/UIEvents/EventNames.h
View file

@ -15,6 +15,7 @@ namespace Web::UIEvents::EventNames {
// FIXME: This is not all of the events // FIXME: This is not all of the events
#define ENUMERATE_UI_EVENTS \ #define ENUMERATE_UI_EVENTS \
__ENUMERATE_UI_EVENT(auxclick) \
__ENUMERATE_UI_EVENT(click) \ __ENUMERATE_UI_EVENT(click) \
__ENUMERATE_UI_EVENT(dblclick) \ __ENUMERATE_UI_EVENT(dblclick) \
__ENUMERATE_UI_EVENT(keydown) \ __ENUMERATE_UI_EVENT(keydown) \