Bug 1232919 part.1 Reorganize KeyNameList.h with the latest UI Evnets KeyboardEvent key value spec, add new key values and drop legacy key values which are never used internally r?smaug
This patch reorganizes KeyNameList.h with the latest UI Events KeyboardEvent key values spec.
Additionally adding new key values:
* "Hyper"
* "Super"
* "Key11"
* "Key12"
* "AudioBassBoostToggle"
* "AudioTrebleDown"
* "AudioTrebleUp"
* "MicrophoneToggle"
* "MicrophoneVolumeDown"
* "MicrophoneVolumeUp"
* "MicrophoneVolumeMute"
* "SpeechCorrectionList"
* "SpeechInputToggle"
* "LaunchContacts"
* "LaunchPhone"
* "AppSwitch"
* "Call"
* "CameraFocus"
* "EndCall"
* "GoBack"
* "GoHome"
* "HeadsetHook"
* "LastNumberRedial"
* "Notification"
* "MannerMode"
* "VoiceDial"
* "TV3DMode"
* "TVAntennaCable"
* "TVAudioDescription"
* "TVAudioDescriptionMixDown"
* "TVAudioDescriptionMixUp"
* "TVContentsMenu"
* "TVDataService"
* "TVInput"
* "TVInputComponent1"
* "TVInputComponent2"
* "TVInputComposite1"
* "TVInputComposite2"
* "TVInputHDMI1"
* "TVInputHDMI2"
* "TVInputHDMI3"
* "TVInputHDMI4"
* "TVInputVGA1"
* "TVMediaContext"
* "TVNetwork"
* "TVNumberEntry"
* "TVRadioService"
* "TVSatellite"
* "TVSatelliteBS"
* "TVSatelliteCS"
* "TVSatelliteToggle"
* "TVTerrestrialAnalog"
* "TVTerrestrialDigital"
* "TVTimer"
* "DVR"
* "MediaAudioTrack"
* "MediaSkipBackward"
* "MediaSkipForward"
* "MediaStepBackward"
* "MediaStepForward"
* "MediaTopMenu"
* "NavigateIn"
* "NavigateNext"
* "NavigateOut"
* "NavigatePrevious"
Remove deprecated and unused key values:
* "Separator"
* "MediaSkip"
Pending to remove:
* "MozHomeScreen" (
Bug 1272599)
* "MozCameraFocusAdjust" (
Bug 1272599)
* "MozPhoneCall" (
Bug 1272599)
* "OS" (
Bug 1232918)
* "MediaSelect" (
Bug 1272592)
MozReview-Commit-ID: wrX1UAh8zF
--- a/dom/events/KeyNameList.h
+++ b/dom/events/KeyNameList.h
@@ -39,31 +39,30 @@ DEFINE_KEYNAME_INTERNAL(SoftRight, "MozS
* Modifier Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(Alt)
DEFINE_KEYNAME_WITH_SAME_NAME(AltGraph)
DEFINE_KEYNAME_WITH_SAME_NAME(CapsLock)
DEFINE_KEYNAME_WITH_SAME_NAME(Control)
DEFINE_KEYNAME_WITH_SAME_NAME(Fn)
DEFINE_KEYNAME_WITH_SAME_NAME(FnLock)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Hyper)
+DEFINE_KEYNAME_WITH_SAME_NAME(Hyper)
DEFINE_KEYNAME_WITH_SAME_NAME(Meta)
DEFINE_KEYNAME_WITH_SAME_NAME(NumLock)
-DEFINE_KEYNAME_WITH_SAME_NAME(OS)
+DEFINE_KEYNAME_WITH_SAME_NAME(OS) // Dropped from the latest draft, bug 1232918
DEFINE_KEYNAME_WITH_SAME_NAME(ScrollLock)
DEFINE_KEYNAME_WITH_SAME_NAME(Shift)
-// DEFINE_KEYNAME_WITH_SAME_NAME(Super)
+DEFINE_KEYNAME_WITH_SAME_NAME(Super)
DEFINE_KEYNAME_WITH_SAME_NAME(Symbol)
DEFINE_KEYNAME_WITH_SAME_NAME(SymbolLock)
/******************************************************************************
* Whitespace Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(Enter)
-DEFINE_KEYNAME_WITH_SAME_NAME(Separator)
DEFINE_KEYNAME_WITH_SAME_NAME(Tab)
/******************************************************************************
* Navigation Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(ArrowDown)
DEFINE_KEYNAME_WITH_SAME_NAME(ArrowLeft)
DEFINE_KEYNAME_WITH_SAME_NAME(ArrowRight)
@@ -108,17 +107,16 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Select)
DEFINE_KEYNAME_WITH_SAME_NAME(ZoomIn)
DEFINE_KEYNAME_WITH_SAME_NAME(ZoomOut)
/******************************************************************************
* Device Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(BrightnessDown)
DEFINE_KEYNAME_WITH_SAME_NAME(BrightnessUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(Camera)
DEFINE_KEYNAME_WITH_SAME_NAME(Eject)
DEFINE_KEYNAME_WITH_SAME_NAME(LogOff)
DEFINE_KEYNAME_WITH_SAME_NAME(Power)
DEFINE_KEYNAME_WITH_SAME_NAME(PowerOff)
DEFINE_KEYNAME_WITH_SAME_NAME(PrintScreen)
DEFINE_KEYNAME_WITH_SAME_NAME(Hibernate)
DEFINE_KEYNAME_WITH_SAME_NAME(Standby)
DEFINE_KEYNAME_WITH_SAME_NAME(WakeUp)
@@ -206,43 +204,81 @@ DEFINE_KEYNAME_WITH_SAME_NAME(F35)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft1)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft2)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft3)
DEFINE_KEYNAME_WITH_SAME_NAME(Soft4)
/******************************************************************************
* Multimedia Keys
*****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
DEFINE_KEYNAME_WITH_SAME_NAME(Close)
DEFINE_KEYNAME_WITH_SAME_NAME(MailForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MailReply)
DEFINE_KEYNAME_WITH_SAME_NAME(MailSend)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlayPause)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaSelect)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaStop)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackNext)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaTrackPrevious)
DEFINE_KEYNAME_WITH_SAME_NAME(New)
DEFINE_KEYNAME_WITH_SAME_NAME(Open)
DEFINE_KEYNAME_WITH_SAME_NAME(Print)
DEFINE_KEYNAME_WITH_SAME_NAME(Save)
DEFINE_KEYNAME_WITH_SAME_NAME(SpellCheck)
+
+/******************************************************************************
+ * Multimedia Numpad Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(Key11)
+DEFINE_KEYNAME_WITH_SAME_NAME(Key12)
+
+/******************************************************************************
+ * Audio Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioTrebleDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(AudioTrebleUp)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeDown)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeUp)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeMute)
+DEFINE_KEYNAME_WITH_SAME_NAME(MicrophoneToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(MicrophoneVolumeDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(MicrophoneVolumeUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(MicrophoneVolumeMute)
+
+/******************************************************************************
+ * Speech Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(SpeechCorrectionList)
+DEFINE_KEYNAME_WITH_SAME_NAME(SpeechInputToggle)
/******************************************************************************
* Application Keys
*****************************************************************************/
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalculator)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalendar)
+DEFINE_KEYNAME_WITH_SAME_NAME(LaunchContacts)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMediaPlayer)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaSelect)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMusicPlayer)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMyComputer)
+DEFINE_KEYNAME_WITH_SAME_NAME(LaunchPhone)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchScreenSaver)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchSpreadsheet)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebBrowser)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWebCam)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchWordProcessor)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication1)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchApplication2)
@@ -270,38 +306,80 @@ DEFINE_KEYNAME_WITH_SAME_NAME(BrowserBac
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserFavorites)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserForward)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserHome)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserRefresh)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserSearch)
DEFINE_KEYNAME_WITH_SAME_NAME(BrowserStop)
/******************************************************************************
+ * Mobile Phone Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(AppSwitch)
+DEFINE_KEYNAME_WITH_SAME_NAME(Call)
+DEFINE_KEYNAME_WITH_SAME_NAME(Camera)
+DEFINE_KEYNAME_WITH_SAME_NAME(CameraFocus)
+DEFINE_KEYNAME_WITH_SAME_NAME(EndCall)
+DEFINE_KEYNAME_WITH_SAME_NAME(GoBack)
+DEFINE_KEYNAME_WITH_SAME_NAME(GoHome)
+DEFINE_KEYNAME_WITH_SAME_NAME(HeadsetHook)
+DEFINE_KEYNAME_WITH_SAME_NAME(LastNumberRedial)
+DEFINE_KEYNAME_WITH_SAME_NAME(Notification)
+DEFINE_KEYNAME_WITH_SAME_NAME(MannerMode)
+DEFINE_KEYNAME_WITH_SAME_NAME(VoiceDial)
+
+/******************************************************************************
+ * TV Keys
+ *****************************************************************************/
+DEFINE_KEYNAME_WITH_SAME_NAME(TV)
+DEFINE_KEYNAME_WITH_SAME_NAME(TV3DMode)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVAntennaCable)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVAudioDescription)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVAudioDescriptionMixDown)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVAudioDescriptionMixUp)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVContentsMenu)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVDataService)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputComponent1)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputComponent2)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputComposite1)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputComposite2)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputHDMI1)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputHDMI2)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputHDMI3)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputHDMI4)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVInputVGA1)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVMediaContext)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVNetwork)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVNumberEntry)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVRadioService)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVSatellite)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVSatelliteBS)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVSatelliteCS)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVSatelliteToggle)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVTerrestrialAnalog)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVTerrestrialDigital)
+DEFINE_KEYNAME_WITH_SAME_NAME(TVTimer)
+
+/******************************************************************************
* Media Controller Keys
*****************************************************************************/
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceLeft)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBalanceRight)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioBassBoostUp)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderFront)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioFaderRear)
-DEFINE_KEYNAME_WITH_SAME_NAME(AudioSurroundModeNext)
DEFINE_KEYNAME_WITH_SAME_NAME(AVRInput)
DEFINE_KEYNAME_WITH_SAME_NAME(AVRPower)
-DEFINE_KEYNAME_WITH_SAME_NAME(ChannelDown)
-DEFINE_KEYNAME_WITH_SAME_NAME(ChannelUp)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF0Red)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF1Green)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF2Yellow)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF3Blue)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF4Grey)
DEFINE_KEYNAME_WITH_SAME_NAME(ColorF5Brown)
DEFINE_KEYNAME_WITH_SAME_NAME(ClosedCaptionToggle)
DEFINE_KEYNAME_WITH_SAME_NAME(Dimmer)
DEFINE_KEYNAME_WITH_SAME_NAME(DisplaySwap)
+DEFINE_KEYNAME_WITH_SAME_NAME(DVR)
DEFINE_KEYNAME_WITH_SAME_NAME(Exit)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear0)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear1)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear2)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteClear3)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall0)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall1)
DEFINE_KEYNAME_WITH_SAME_NAME(FavoriteRecall2)
@@ -315,26 +393,32 @@ DEFINE_KEYNAME_WITH_SAME_NAME(GuideNextD
DEFINE_KEYNAME_WITH_SAME_NAME(GuidePreviousDay)
DEFINE_KEYNAME_WITH_SAME_NAME(Info)
DEFINE_KEYNAME_WITH_SAME_NAME(InstantReplay)
DEFINE_KEYNAME_WITH_SAME_NAME(Link)
DEFINE_KEYNAME_WITH_SAME_NAME(ListProgram)
DEFINE_KEYNAME_WITH_SAME_NAME(LiveContent)
DEFINE_KEYNAME_WITH_SAME_NAME(Lock)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaApps)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaAudioTrack)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaFastForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaLast)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaPause)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlay)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaRecord)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaRewind)
-DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkip)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkipBackward)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaSkipForward)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaStepBackward)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaStepForward)
+DEFINE_KEYNAME_WITH_SAME_NAME(MediaTopMenu)
+DEFINE_KEYNAME_WITH_SAME_NAME(NavigateIn)
+DEFINE_KEYNAME_WITH_SAME_NAME(NavigateNext)
+DEFINE_KEYNAME_WITH_SAME_NAME(NavigateOut)
+DEFINE_KEYNAME_WITH_SAME_NAME(NavigatePrevious)
DEFINE_KEYNAME_WITH_SAME_NAME(NextFavoriteChannel)
DEFINE_KEYNAME_WITH_SAME_NAME(NextUserProfile)
DEFINE_KEYNAME_WITH_SAME_NAME(OnDemand)
+DEFINE_KEYNAME_WITH_SAME_NAME(Pairing)
DEFINE_KEYNAME_WITH_SAME_NAME(PinPDown)
DEFINE_KEYNAME_WITH_SAME_NAME(PinPMove)
DEFINE_KEYNAME_WITH_SAME_NAME(PinPToggle)
DEFINE_KEYNAME_WITH_SAME_NAME(PinPUp)
DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedDown)
DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedReset)
DEFINE_KEYNAME_WITH_SAME_NAME(PlaySpeedUp)
DEFINE_KEYNAME_WITH_SAME_NAME(RandomToggle)
@@ -344,17 +428,14 @@ DEFINE_KEYNAME_WITH_SAME_NAME(RfBypass)
DEFINE_KEYNAME_WITH_SAME_NAME(ScanChannelsToggle)
DEFINE_KEYNAME_WITH_SAME_NAME(ScreenModeNext)
DEFINE_KEYNAME_WITH_SAME_NAME(Settings)
DEFINE_KEYNAME_WITH_SAME_NAME(SplitScreenToggle)
DEFINE_KEYNAME_WITH_SAME_NAME(STBInput)
DEFINE_KEYNAME_WITH_SAME_NAME(STBPower)
DEFINE_KEYNAME_WITH_SAME_NAME(Subtitle)
DEFINE_KEYNAME_WITH_SAME_NAME(Teletext)
-DEFINE_KEYNAME_WITH_SAME_NAME(TV)
-DEFINE_KEYNAME_WITH_SAME_NAME(TVInput)
-DEFINE_KEYNAME_WITH_SAME_NAME(TVPower)
DEFINE_KEYNAME_WITH_SAME_NAME(VideoModeNext)
DEFINE_KEYNAME_WITH_SAME_NAME(Wink)
DEFINE_KEYNAME_WITH_SAME_NAME(ZoomToggle)
#undef DEFINE_KEYNAME_WITH_SAME_NAME
#undef DEFINE_KEYNAME_INTERNAL