Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1026939 Support "LaunchFoo" key values which launches specific application on GTK, Qt, Android and Gonk r=nchen+karlt+mwu+smaug+romaxa

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

20
dom/events/KeyNameList.h
View File

@ -227,17 +227,17 @@ DEFINE_KEYNAME_WITH_SAME_NAME(VolumeMute)
/******************************************************************************
* Application Keys
*****************************************************************************/
// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalculator)
// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalendar)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalculator)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchCalendar)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMail)
// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMediaPlayer)
// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMusicPlayer)
// DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMyComputer)
// 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(LaunchMediaPlayer)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMusicPlayer)
DEFINE_KEYNAME_WITH_SAME_NAME(LaunchMyComputer)
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)

52
widget/NativeKeyToDOMKeyName.h
View File

@ -868,6 +868,7 @@ KEY_MAP_ANDROID (MediaPlayPause, AKEYCODE_MEDIA_PLAY_PAUSE)
// MediaSelect
KEY_MAP_WIN (MediaSelect, VK_LAUNCH_MEDIA_SELECT)
KEY_MAP_GTK (MediaSelect, GDK_AudioMedia)
// MediaStop
KEY_MAP_WIN (MediaStop, VK_MEDIA_STOP)
@ -911,17 +912,66 @@ KEY_MAP_ANDROID (VolumeMute, AKEYCODE_VOLUME_MUTE)
/******************************************************************************
* Application Keys
******************************************************************************/
// LaunchCalculator
KEY_MAP_GTK (LaunchCalculator, GDK_Calculator)
KEY_MAP_QT (LaunchCalculator, Qt::Key_Calculator)
KEY_MAP_ANDROID (LaunchCalculator, AKEYCODE_CALCULATOR)
// LaunchCalendar
KEY_MAP_GTK (LaunchCalendar, GDK_Calendar)
KEY_MAP_QT (LaunchCalendar, Qt::Key_Calendar)
KEY_MAP_ANDROID (LaunchCalendar, AKEYCODE_CALENDAR)
// LaunchMail
KEY_MAP_WIN (LaunchMail, VK_LAUNCH_MAIL)
KEY_MAP_GTK (LaunchMail, GDK_Mail)
KEY_MAP_QT (LaunchMail, Qt::Key_LaunchMail)
KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE)
// LaunchMediaPlayer
// GDK_CD is defined as "Launch CD/DVD player" in XF86keysym.h.
// Therefore, let's map it to media player rather than music player.
KEY_MAP_GTK (LaunchMediaPlayer, GDK_CD)
KEY_MAP_GTK (LaunchMediaPlayer, GDK_Video)
KEY_MAP_QT (LaunchMediaPlayer, Qt::Key_LaunchMedia)
KEY_MAP_QT (LaunchMediaPlayer, Qt::Key_CD)
KEY_MAP_QT (LaunchMediaPlayer, Qt::Key_Video)
// LaunchMusicPlayer
KEY_MAP_GTK (LaunchMusicPlayer, GDK_Music)
KEY_MAP_QT (LaunchMusicPlayer, Qt::Key_Music)
KEY_MAP_ANDROID (LaunchMusicPlayer, AKEYCODE_MUSIC)
// LaunchMyComputer
KEY_MAP_GTK (LaunchMyComputer, GDK_MyComputer)
KEY_MAP_GTK (LaunchMyComputer, GDK_Explorer)
KEY_MAP_QT (LaunchMyComputer, Qt::Key_Explorer)
// LaunchScreenSaver
KEY_MAP_GTK (LaunchScreenSaver, GDK_ScreenSaver)
KEY_MAP_QT (LaunchScreenSaver, Qt::Key_ScreenSaver)
// LaunchSpreadsheet
KEY_MAP_GTK (LaunchSpreadsheet, GDK_Excel)
KEY_MAP_QT (LaunchSpreadsheet, Qt::Key_Excel)
// LaunchWebBrowser
KEY_MAP_GTK (LaunchWebBrowser, GDK_WWW)
KEY_MAP_QT (LaunchWebBrowser, Qt::Key_WWW)
KEY_MAP_ANDROID (LaunchWebBrowser, AKEYCODE_EXPLORER)
// LaunchWebCam
KEY_MAP_GTK (LaunchWebCam, GDK_WebCam)
KEY_MAP_QT (LaunchWebCam, Qt::Key_WebCam)
// LaunchWordProcessor
KEY_MAP_GTK (LaunchWordProcessor, GDK_Word)
KEY_MAP_QT (LaunchWordProcessor, Qt::Key_Word)
// LaunchApplication1
KEY_MAP_WIN (LaunchApplication1, VK_LAUNCH_APP1)
KEY_MAP_GTK (LaunchApplication1, GDK_Launch0)
KEY_MAP_QT (LaunchApplication1, Qt::Key_Launch0)
KEY_MAP_ANDROID (LaunchApplication1, AKEYCODE_EXPLORER)
// LaunchApplication2
KEY_MAP_WIN (LaunchApplication2, VK_LAUNCH_APP2)

3
widget/android/nsWindow.cpp
View File

@ -1423,9 +1423,6 @@ ConvertAndroidKeyCodeToKeyNameIndex(AndroidGeckoEvent& aAndroidGeckoEvent)
case AKEYCODE_MANNER_MODE:
case AKEYCODE_3D_MODE:
case AKEYCODE_CONTACTS:
case AKEYCODE_CALENDAR:
case AKEYCODE_MUSIC:
case AKEYCODE_CALCULATOR:
return KEY_NAME_INDEX_Unidentified;
case AKEYCODE_UNKNOWN:

12
widget/qt/nsQtKeyUtils.cpp
View File

@ -385,12 +385,9 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_TrebleUp:
case Qt::Key_TrebleDown:
case Qt::Key_OpenUrl:
case Qt::Key_LaunchMedia:
case Qt::Key_KeyboardLightOnOff:
case Qt::Key_KeyboardBrightnessUp:
case Qt::Key_KeyboardBrightnessDown:
case Qt::Key_ScreenSaver:
case Qt::Key_WWW:
case Qt::Key_Memo:
case Qt::Key_LightBulb:
case Qt::Key_Shop:
@ -403,16 +400,12 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_ApplicationLeft:
case Qt::Key_ApplicationRight:
case Qt::Key_Book:
case Qt::Key_CD:
case Qt::Key_Calculator:
case Qt::Key_ToDoList:
case Qt::Key_ClearGrab:
case Qt::Key_Close:
case Qt::Key_Display:
case Qt::Key_DOS:
case Qt::Key_Documents:
case Qt::Key_Excel:
case Qt::Key_Explorer:
case Qt::Key_Game:
case Qt::Key_Go:
case Qt::Key_iTouch:
@ -425,7 +418,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_OfficeHome:
case Qt::Key_Option:
case Qt::Key_Phone:
case Qt::Key_Calendar:
case Qt::Key_Reply:
case Qt::Key_RotateWindows:
case Qt::Key_RotationPB:
@ -439,15 +431,11 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_Terminal:
case Qt::Key_Tools:
case Qt::Key_Travel:
case Qt::Key_Video:
case Qt::Key_Word:
case Qt::Key_Xfer:
case Qt::Key_Away:
case Qt::Key_Messenger:
case Qt::Key_WebCam:
case Qt::Key_MailForward:
case Qt::Key_Pictures:
case Qt::Key_Music:
case Qt::Key_Battery:
case Qt::Key_Bluetooth:
case Qt::Key_WLAN: