Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 10:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1027007 Support multimedia keyboard's special key values "Close", "MailForward", "MailReply", "MailSend", "New", "Open", "Print" and "SpellCheck" on GTK and Qt r=smaug+karlt+romaxa

Browse Source
This commit is contained in:
Masayuki Nakano 2014-12-30 10:47:55 +09:00
parent 4cfc2a5d68
commit 478c8eafdf
3 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dom/events/KeyNameList.h
View File

@ -206,20 +206,20 @@ DEFINE_KEYNAME_WITH_SAME_NAME(F35)
/******************************************************************************
* Multimedia Keys
*****************************************************************************/
// 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(Close)
DEFINE_KEYNAME_WITH_SAME_NAME(MailForward)
DEFINE_KEYNAME_WITH_SAME_NAME(MailReply)
DEFINE_KEYNAME_WITH_SAME_NAME(MailSend)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaPlayPause)
DEFINE_KEYNAME_WITH_SAME_NAME(MediaSelect)
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)
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)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeDown)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeUp)
DEFINE_KEYNAME_WITH_SAME_NAME(VolumeMute)

35
widget/NativeKeyToDOMKeyName.h
View File

@ -861,6 +861,24 @@ KEY_MAP_QT (F35, Qt::Key_F35)
/******************************************************************************
* Multimedia Keys
******************************************************************************/
// Close
// NOTE: This is not a key to close disk tray, this is a key to close document
// or window.
KEY_MAP_GTK (Close, GDK_Close)
KEY_MAP_QT (Close, Qt::Key_Close)
// MailForward
KEY_MAP_GTK (MailForward, GDK_MailForward)
KEY_MAP_QT (MailForward, Qt::Key_MailForward)
// MailReply
KEY_MAP_GTK (MailReply, GDK_Reply)
KEY_MAP_QT (MailReply, Qt::Key_Reply)
// MailSend
KEY_MAP_GTK (MailSend, GDK_Send)
KEY_MAP_QT (MailSend, Qt::Key_Send)
// MediaPlayPause
KEY_MAP_WIN (MediaPlayPause, VK_MEDIA_PLAY_PAUSE)
KEY_MAP_QT (MediaPlayPause, Qt::Key_MediaTogglePlayPause)
@ -888,6 +906,23 @@ KEY_MAP_GTK (MediaTrackPrevious, GDK_AudioPrev)
KEY_MAP_QT (MediaTrackPrevious, Qt::Key_MediaPrevious)
KEY_MAP_ANDROID (MediaTrackPrevious, AKEYCODE_MEDIA_PREVIOUS)
// New
KEY_MAP_GTK (New, GDK_New)
// Open
KEY_MAP_GTK (Open, GDK_Open)
// Print
KEY_MAP_QT (Print, Qt::Key_Printer)
// Save
KEY_MAP_GTK (Save, GDK_Save)
KEY_MAP_QT (Save, Qt::Key_Save)
// SpellCheck
KEY_MAP_GTK (SpellCheck, GDK_Spell)
KEY_MAP_QT (SpellCheck, Qt::Key_Spell)
// VolumeDown
KEY_MAP_WIN (VolumeDown, VK_VOLUME_DOWN)
KEY_MAP_COCOA (VolumeDown, kVK_VolumeDown)

7
widget/qt/nsQtKeyUtils.cpp
View File

@ -402,7 +402,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_Book:
case Qt::Key_ToDoList:
case Qt::Key_ClearGrab:
case Qt::Key_Close:
case Qt::Key_Display:
case Qt::Key_DOS:
case Qt::Key_Documents:
@ -418,13 +417,9 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_OfficeHome:
case Qt::Key_Option:
case Qt::Key_Phone:
case Qt::Key_Reply:
case Qt::Key_RotateWindows:
case Qt::Key_RotationPB:
case Qt::Key_RotationKB:
case Qt::Key_Save:
case Qt::Key_Send:
case Qt::Key_Spell:
case Qt::Key_SplitScreen:
case Qt::Key_Support:
case Qt::Key_TaskPane:
@ -434,7 +429,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_Xfer:
case Qt::Key_Away:
case Qt::Key_Messenger:
case Qt::Key_MailForward:
case Qt::Key_Pictures:
case Qt::Key_Battery:
case Qt::Key_Bluetooth:
@ -464,7 +458,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_ToggleCallHangup:
case Qt::Key_VoiceDial:
case Qt::Key_LastNumberRedial:
case Qt::Key_Printer:
default:
return KEY_NAME_INDEX_Unidentified;
}