wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-20 22:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Convert uses of KEY_MAP_ANDROID_EXCEPT_B2G to KEY_MAP_ANDROID

Browse source
This commit is contained in:
wolfbeast 2018-05-12 15:03:33 +02:00 • committed by Roy Tam
commit 9195e9e4e3
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
widget/NativeKeyToDOMKeyName.h
View file

@ -25,12 +25,7 @@
#define KEY_MAP_COCOA(aCPPKeyName, aNativeKey) #define KEY_MAP_COCOA(aCPPKeyName, aNativeKey)
// GTK // GTK
#define KEY_MAP_GTK(aCPPKeyName, aNativeKey) #define KEY_MAP_GTK(aCPPKeyName, aNativeKey)
// Android and B2G
#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) #define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey)
// Only for Android
#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey)
// Only for B2G
#define KEY_MAP_B2G(aCPPKeyName, aNativeKey)
#if defined(XP_WIN) #if defined(XP_WIN)
#if defined(NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX) #if defined(NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX)
@ -80,9 +75,6 @@
#undef KEY_MAP_ANDROID #undef KEY_MAP_ANDROID
#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \ #define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \
NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
#undef KEY_MAP_ANDROID_EXCEPT_B2G
#define KEY_MAP_ANDROID_EXCEPT_B2G(aCPPKeyName, aNativeKey) \
NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName)
#endif #endif
/****************************************************************************** /******************************************************************************
@ -1033,11 +1025,10 @@ KEY_MAP_ANDROID (Call, AKEYCODE_CALL)
KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA) KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA)
// CameraFocus // CameraFocus
KEY_MAP_ANDROID_EXCEPT_B2G(CameraFocus, AKEYCODE_FOCUS) KEY_MAP_ANDROID (CameraFocus, AKEYCODE_FOCUS)
// GoHome // GoHome
KEY_MAP_ANDROID_EXCEPT_B2G(GoHome, AKEYCODE_HOME) KEY_MAP_ANDROID (GoHome, AKEYCODE_HOME)
KEY_MAP_B2G (HomeScreen, AKEYCODE_HOME)
/****************************************************************************** /******************************************************************************
* TV Keys * TV Keys
@ -1134,5 +1125,3 @@ KEY_MAP_ANDROID (SoftRight, AKEYCODE_SOFT_RIGHT)
#undef KEY_MAP_COCOA #undef KEY_MAP_COCOA
#undef KEY_MAP_GTK #undef KEY_MAP_GTK
#undef KEY_MAP_ANDROID #undef KEY_MAP_ANDROID
#undef KEY_MAP_ANDROID_EXCEPT_B2G
#undef KEY_MAP_B2G