Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 900400 Support "HiraganaKatakana" and "ZenkakuHankaku" 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 bc55189154
commit b76d23b4bc
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/events/KeyNameList.h
View File

@ -152,13 +152,13 @@ DEFINE_KEYNAME_WITH_SAME_NAME(JunjaMode)
// DEFINE_KEYNAME_WITH_SAME_NAME(Eisu)
DEFINE_KEYNAME_WITH_SAME_NAME(Hankaku)
DEFINE_KEYNAME_WITH_SAME_NAME(Hiragana)
// DEFINE_KEYNAME_WITH_SAME_NAME(HiraganaKatakana)
DEFINE_KEYNAME_WITH_SAME_NAME(HiraganaKatakana)
DEFINE_KEYNAME_WITH_SAME_NAME(KanaMode)
DEFINE_KEYNAME_WITH_SAME_NAME(KanjiMode)
DEFINE_KEYNAME_WITH_SAME_NAME(Katakana)
DEFINE_KEYNAME_WITH_SAME_NAME(Romaji)
DEFINE_KEYNAME_WITH_SAME_NAME(Zenkaku)
// DEFINE_KEYNAME_WITH_SAME_NAME(ZenkakuHankaku)
DEFINE_KEYNAME_WITH_SAME_NAME(ZenkakuHankaku)
/******************************************************************************
* General-Purpose Function Keys

10
widget/NativeKeyToDOMKeyName.h
View File

@ -596,6 +596,11 @@ KEY_MAP_WIN_JPN (Hiragana, VK_OEM_COPY)
KEY_MAP_GTK (Hiragana, GDK_Hiragana)
KEY_MAP_QT (Hiragana, Qt::Key_Hiragana)
// HiraganaKatakana
KEY_MAP_GTK (HiraganaKatakana, GDK_Hiragana_Katakana)
KEY_MAP_QT (HiraganaKatakana, Qt::Key_Hiragana_Katakana)
KEY_MAP_ANDROID (HiraganaKatakana, AKEYCODE_KATAKANA_HIRAGANA)
// KanaMode
// VK_KANA is never used with modern Japanese keyboard, however, IE maps it to
// KanaMode, therefore, we should use same map for it.
@ -632,6 +637,11 @@ KEY_MAP_WIN_JPN (Zenkaku, VK_OEM_ENLW)
KEY_MAP_GTK (Zenkaku, GDK_Zenkaku)
KEY_MAP_QT (Zenkaku, Qt::Key_Zenkaku)
// ZenkakuHankaku
KEY_MAP_GTK (ZenkakuHankaku, GDK_Zenkaku_Hankaku)
KEY_MAP_QT (ZenkakuHankaku, Qt::Key_Zenkaku_Hankaku)
KEY_MAP_ANDROID (ZenkakuHankaku, AKEYCODE_ZENKAKU_HANKAKU)
/******************************************************************************
* General-Purpose Function Keys
******************************************************************************/

3
widget/android/nsWindow.cpp
View File

@ -1433,9 +1433,6 @@ ConvertAndroidKeyCodeToKeyNameIndex(AndroidGeckoEvent& aAndroidGeckoEvent)
case AKEYCODE_CALENDAR:
case AKEYCODE_MUSIC:
case AKEYCODE_CALCULATOR:
case AKEYCODE_ZENKAKU_HANKAKU:
case AKEYCODE_KATAKANA_HIRAGANA:
return KEY_NAME_INDEX_Unidentified;
case AKEYCODE_UNKNOWN:

2
widget/qt/nsQtKeyUtils.cpp
View File

@ -369,8 +369,6 @@ QtKeyCodeToDOMKeyNameIndex(int aKeysym)
case Qt::Key_Backtab:
case Qt::Key_Direction_L:
case Qt::Key_Direction_R:
case Qt::Key_Hiragana_Katakana:
case Qt::Key_Zenkaku_Hankaku:
case Qt::Key_Touroku:
case Qt::Key_Massyo:
case Qt::Key_Hangul: