Bug 936322 Support "GroupFirst", "GroupLast", "GroupNext" and "GroupPrevious" key values on GTK, Android and Gonk r=nchen+karlt+mwu+smaug

This commit is contained in:
Masayuki Nakano 2014-12-30 10:47:55 +09:00
Родитель 569bacdbd2
Коммит 3801317282
3 изменённых файлов: 17 добавлений и 5 удалений

Просмотреть файл

@ -128,10 +128,10 @@ DEFINE_KEYNAME_WITH_SAME_NAME(Compose)
DEFINE_KEYNAME_WITH_SAME_NAME(Convert)
DEFINE_KEYNAME_WITH_SAME_NAME(Dead)
DEFINE_KEYNAME_WITH_SAME_NAME(FinalMode)
// DEFINE_KEYNAME_WITH_SAME_NAME(GroupFirst)
// DEFINE_KEYNAME_WITH_SAME_NAME(GroupLast)
// DEFINE_KEYNAME_WITH_SAME_NAME(GroupNext)
// DEFINE_KEYNAME_WITH_SAME_NAME(GroupPrevious)
DEFINE_KEYNAME_WITH_SAME_NAME(GroupFirst)
DEFINE_KEYNAME_WITH_SAME_NAME(GroupLast)
DEFINE_KEYNAME_WITH_SAME_NAME(GroupNext)
DEFINE_KEYNAME_WITH_SAME_NAME(GroupPrevious)
DEFINE_KEYNAME_WITH_SAME_NAME(ModeChange)
// DEFINE_KEYNAME_WITH_SAME_NAME(NextCandidate)
DEFINE_KEYNAME_WITH_SAME_NAME(NonConvert)

Просмотреть файл

@ -553,6 +553,19 @@ KEY_MAP_QT (Dead, Qt::Key_Dead_Horn)
// FinalMode
KEY_MAP_WIN (FinalMode, VK_FINAL)
// GroupFirst
KEY_MAP_GTK (GroupFirst, GDK_ISO_First_Group)
// GroupLast
KEY_MAP_GTK (GroupLast, GDK_ISO_Last_Group)
// GroupNext
KEY_MAP_GTK (GroupNext, GDK_ISO_Next_Group)
KEY_MAP_ANDROID (GroupNext, AKEYCODE_LANGUAGE_SWITCH)
// GroupPrevious
KEY_MAP_GTK (GroupPrevious, GDK_ISO_Prev_Group)
// ModeChange
KEY_MAP_WIN (ModeChange, VK_MODECHANGE)
KEY_MAP_ANDROID (ModeChange, AKEYCODE_SWITCH_CHARSET)

Просмотреть файл

@ -1426,7 +1426,6 @@ ConvertAndroidKeyCodeToKeyNameIndex(AndroidGeckoEvent& aAndroidGeckoEvent)
case AKEYCODE_BUTTON_15:
case AKEYCODE_BUTTON_16:
case AKEYCODE_LANGUAGE_SWITCH:
case AKEYCODE_MANNER_MODE:
case AKEYCODE_3D_MODE:
case AKEYCODE_CONTACTS: