From 496fbaf738fb00824d7e972e874bfdbe85caaee5 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 20 Feb 2020 12:12:30 -0500 Subject: Issue #1053 - Remove conditional android code from widget/ --- widget/NativeKeyToDOMKeyName.h | 110 ----------------------------------------- 1 file changed, 110 deletions(-) (limited to 'widget/NativeKeyToDOMKeyName.h') diff --git a/widget/NativeKeyToDOMKeyName.h b/widget/NativeKeyToDOMKeyName.h index a818108db..ce1e3c3a4 100644 --- a/widget/NativeKeyToDOMKeyName.h +++ b/widget/NativeKeyToDOMKeyName.h @@ -25,7 +25,6 @@ #define KEY_MAP_COCOA(aCPPKeyName, aNativeKey) // GTK #define KEY_MAP_GTK(aCPPKeyName, aNativeKey) -#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) #if defined(XP_WIN) #if defined(NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX) @@ -71,10 +70,6 @@ #undef KEY_MAP_GTK #define KEY_MAP_GTK(aCPPKeyName, aNativeKey) \ NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) -#elif defined(ANDROID) -#undef KEY_MAP_ANDROID -#define KEY_MAP_ANDROID(aCPPKeyName, aNativeKey) \ - NS_NATIVE_KEY_TO_DOM_KEY_NAME_INDEX(aNativeKey, KEY_NAME_INDEX_##aCPPKeyName) #endif /****************************************************************************** @@ -88,8 +83,6 @@ KEY_MAP_COCOA (Alt, kVK_Option) KEY_MAP_COCOA (Alt, kVK_RightOption) KEY_MAP_GTK (Alt, GDK_Alt_L) KEY_MAP_GTK (Alt, GDK_Alt_R) -KEY_MAP_ANDROID (Alt, AKEYCODE_ALT_LEFT) -KEY_MAP_ANDROID (Alt, AKEYCODE_ALT_RIGHT) // AltGraph KEY_MAP_GTK (AltGraph, GDK_Mode_switch /* same as GDK_kana_switch, @@ -109,7 +102,6 @@ KEY_MAP_GTK (AltGraph, GDK_ISO_Level5_Lock) KEY_MAP_WIN (CapsLock, VK_CAPITAL) KEY_MAP_COCOA (CapsLock, kVK_CapsLock) KEY_MAP_GTK (CapsLock, GDK_Caps_Lock) -KEY_MAP_ANDROID (CapsLock, AKEYCODE_CAPS_LOCK) // Control KEY_MAP_WIN (Control, VK_CONTROL) @@ -119,25 +111,19 @@ KEY_MAP_COCOA (Control, kVK_Control) KEY_MAP_COCOA (Control, kVK_RightControl) KEY_MAP_GTK (Control, GDK_Control_L) KEY_MAP_GTK (Control, GDK_Control_R) -KEY_MAP_ANDROID (Control, AKEYCODE_CTRL_LEFT) -KEY_MAP_ANDROID (Control, AKEYCODE_CTRL_RIGHT) // Fn KEY_MAP_COCOA (Fn, kVK_Function) -KEY_MAP_ANDROID (Fn, AKEYCODE_FUNCTION) // Meta KEY_MAP_COCOA (Meta, kVK_Command) KEY_MAP_COCOA (Meta, kVK_RightCommand) KEY_MAP_GTK (Meta, GDK_Meta_L) KEY_MAP_GTK (Meta, GDK_Meta_R) -KEY_MAP_ANDROID (Meta, AKEYCODE_META_LEFT) -KEY_MAP_ANDROID (Meta, AKEYCODE_META_RIGHT) // NumLock KEY_MAP_WIN (NumLock, VK_NUMLOCK) KEY_MAP_GTK (NumLock, GDK_Num_Lock) -KEY_MAP_ANDROID (NumLock, AKEYCODE_NUM_LOCK) // OS KEY_MAP_WIN (OS, VK_LWIN) @@ -150,7 +136,6 @@ KEY_MAP_GTK (OS, GDK_Hyper_R) // ScrollLock KEY_MAP_WIN (ScrollLock, VK_SCROLL) KEY_MAP_GTK (ScrollLock, GDK_Scroll_Lock) -KEY_MAP_ANDROID (ScrollLock, AKEYCODE_SCROLL_LOCK) // Shift KEY_MAP_WIN (Shift, VK_SHIFT) @@ -161,11 +146,8 @@ KEY_MAP_COCOA (Shift, kVK_RightShift) KEY_MAP_GTK (Shift, GDK_Shift_L) KEY_MAP_GTK (Shift, GDK_Shift_R) KEY_MAP_GTK (Shift, GDK_Shift_Lock) // Let's treat as Shift key (bug 769159) -KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_LEFT) -KEY_MAP_ANDROID (Shift, AKEYCODE_SHIFT_RIGHT) // Symbol -KEY_MAP_ANDROID (Symbol, AKEYCODE_SYM) /****************************************************************************** * Whitespace Keys @@ -179,8 +161,6 @@ KEY_MAP_GTK (Enter, GDK_Return) KEY_MAP_GTK (Enter, GDK_KP_Enter) KEY_MAP_GTK (Enter, GDK_ISO_Enter) KEY_MAP_GTK (Enter, GDK_3270_Enter) -KEY_MAP_ANDROID (Enter, AKEYCODE_ENTER) -KEY_MAP_ANDROID (Enter, AKEYCODE_NUMPAD_ENTER) // Tab KEY_MAP_WIN (Tab, VK_TAB) @@ -188,7 +168,6 @@ KEY_MAP_COCOA (Tab, kVK_Tab) KEY_MAP_GTK (Tab, GDK_Tab) KEY_MAP_GTK (Tab, GDK_ISO_Left_Tab) // Shift+Tab KEY_MAP_GTK (Tab, GDK_KP_Tab) -KEY_MAP_ANDROID (Tab, AKEYCODE_TAB) /****************************************************************************** * Navigation Keys @@ -198,56 +177,48 @@ KEY_MAP_WIN (ArrowDown, VK_DOWN) KEY_MAP_COCOA (ArrowDown, kVK_DownArrow) KEY_MAP_GTK (ArrowDown, GDK_Down) KEY_MAP_GTK (ArrowDown, GDK_KP_Down) -KEY_MAP_ANDROID (ArrowDown, AKEYCODE_DPAD_DOWN) // ArrowLeft KEY_MAP_WIN (ArrowLeft, VK_LEFT) KEY_MAP_COCOA (ArrowLeft, kVK_LeftArrow) KEY_MAP_GTK (ArrowLeft, GDK_Left) KEY_MAP_GTK (ArrowLeft, GDK_KP_Left) -KEY_MAP_ANDROID (ArrowLeft, AKEYCODE_DPAD_LEFT) // ArrowRight KEY_MAP_WIN (ArrowRight, VK_RIGHT) KEY_MAP_COCOA (ArrowRight, kVK_RightArrow) KEY_MAP_GTK (ArrowRight, GDK_Right) KEY_MAP_GTK (ArrowRight, GDK_KP_Right) -KEY_MAP_ANDROID (ArrowRight, AKEYCODE_DPAD_RIGHT) // ArrowUp KEY_MAP_WIN (ArrowUp, VK_UP) KEY_MAP_COCOA (ArrowUp, kVK_UpArrow) KEY_MAP_GTK (ArrowUp, GDK_Up) KEY_MAP_GTK (ArrowUp, GDK_KP_Up) -KEY_MAP_ANDROID (ArrowUp, AKEYCODE_DPAD_UP) // End KEY_MAP_WIN (End, VK_END) KEY_MAP_COCOA (End, kVK_End) KEY_MAP_GTK (End, GDK_End) KEY_MAP_GTK (End, GDK_KP_End) -KEY_MAP_ANDROID (End, AKEYCODE_MOVE_END) // Home KEY_MAP_WIN (Home, VK_HOME) KEY_MAP_COCOA (Home, kVK_Home) KEY_MAP_GTK (Home, GDK_Home) KEY_MAP_GTK (Home, GDK_KP_Home) -KEY_MAP_ANDROID (Home, AKEYCODE_MOVE_HOME) // PageDown KEY_MAP_WIN (PageDown, VK_NEXT) KEY_MAP_COCOA (PageDown, kVK_PageDown) KEY_MAP_GTK (PageDown, GDK_Page_Down /* same as GDK_Next */) KEY_MAP_GTK (PageDown, GDK_KP_Page_Down /* same as GDK_KP_Next */) -KEY_MAP_ANDROID (PageDown, AKEYCODE_PAGE_DOWN) // PageUp KEY_MAP_WIN (PageUp, VK_PRIOR) KEY_MAP_COCOA (PageUp, kVK_PageUp) KEY_MAP_GTK (PageUp, GDK_Page_Up /* same as GDK_Prior */) KEY_MAP_GTK (PageUp, GDK_KP_Page_Up /* same as GDK_KP_Prior */) -KEY_MAP_ANDROID (PageUp, AKEYCODE_PAGE_UP) /****************************************************************************** * Editing Keys @@ -256,14 +227,12 @@ KEY_MAP_ANDROID (PageUp, AKEYCODE_PAGE_UP) KEY_MAP_WIN (Backspace, VK_BACK) KEY_MAP_COCOA (Backspace, kVK_PC_Backspace) KEY_MAP_GTK (Backspace, GDK_BackSpace) -KEY_MAP_ANDROID (Backspace, AKEYCODE_DEL) // Clear KEY_MAP_WIN (Clear, VK_CLEAR) KEY_MAP_WIN (Clear, VK_OEM_CLEAR) KEY_MAP_COCOA (Clear, kVK_ANSI_KeypadClear) KEY_MAP_GTK (Clear, GDK_Clear) -KEY_MAP_ANDROID (Clear, AKEYCODE_CLEAR) // Copy KEY_MAP_WIN_CMD (Copy, APPCOMMAND_COPY) @@ -282,7 +251,6 @@ KEY_MAP_WIN (Delete, VK_DELETE) KEY_MAP_COCOA (Delete, kVK_PC_Delete) KEY_MAP_GTK (Delete, GDK_Delete) KEY_MAP_GTK (Delete, GDK_KP_Delete) -KEY_MAP_ANDROID (Delete, AKEYCODE_FORWARD_DEL) // EraseEof KEY_MAP_WIN (EraseEof, VK_EREOF) @@ -296,7 +264,6 @@ KEY_MAP_GTK (ExSel, GDK_3270_ExSelect) // legacy IBM keyboard layout KEY_MAP_WIN (Insert, VK_INSERT) KEY_MAP_GTK (Insert, GDK_Insert) KEY_MAP_GTK (Insert, GDK_KP_Insert) -KEY_MAP_ANDROID (Insert, AKEYCODE_INSERT) // Paste KEY_MAP_WIN_CMD (Paste, APPCOMMAND_PASTE) @@ -315,7 +282,6 @@ KEY_MAP_GTK (Undo, GDK_Undo) ******************************************************************************/ // Accept KEY_MAP_WIN (Accept, VK_ACCEPT) -KEY_MAP_ANDROID (Accept, AKEYCODE_DPAD_CENTER) // Attn KEY_MAP_WIN_OTH (Attn, VK_ATTN) // not valid with Japanese keyboard layout @@ -329,13 +295,11 @@ KEY_MAP_GTK (Cancel, GDK_Cancel) KEY_MAP_WIN (ContextMenu, VK_APPS) KEY_MAP_COCOA (ContextMenu, kVK_PC_ContextMenu) KEY_MAP_GTK (ContextMenu, GDK_Menu) -KEY_MAP_ANDROID (ContextMenu, AKEYCODE_MENU) // Escape KEY_MAP_WIN (Escape, VK_ESCAPE) KEY_MAP_COCOA (Escape, kVK_Escape) KEY_MAP_GTK (Escape, GDK_Escape) -KEY_MAP_ANDROID (Escape, AKEYCODE_ESCAPE) // Execute KEY_MAP_WIN (Execute, VK_EXECUTE) @@ -350,14 +314,12 @@ KEY_MAP_WIN (Help, VK_HELP) KEY_MAP_WIN_CMD (Help, APPCOMMAND_HELP) KEY_MAP_COCOA (Help, kVK_Help) KEY_MAP_GTK (Help, GDK_Help) -KEY_MAP_ANDROID (Help, AKEYCODE_ASSIST) // Pause KEY_MAP_WIN (Pause, VK_PAUSE) KEY_MAP_GTK (Pause, GDK_Pause) // Break is typically mapped to Alt+Pause or Ctrl+Pause on GTK. KEY_MAP_GTK (Pause, GDK_Break) -KEY_MAP_ANDROID (Pause, AKEYCODE_BREAK) // Play KEY_MAP_WIN (Play, VK_PLAY) @@ -369,11 +331,9 @@ KEY_MAP_GTK (Select, GDK_Select) // ZoomIn KEY_MAP_GTK (ZoomIn, GDK_ZoomIn) -KEY_MAP_ANDROID (ZoomIn, AKEYCODE_ZOOM_IN) // ZoomOut KEY_MAP_GTK (ZoomOut, GDK_ZoomOut) -KEY_MAP_ANDROID (ZoomOut, AKEYCODE_ZOOM_OUT) /****************************************************************************** * Device Keys @@ -386,13 +346,11 @@ KEY_MAP_GTK (BrightnessUp, GDK_MonBrightnessUp) // Eject KEY_MAP_GTK (Eject, GDK_Eject) -KEY_MAP_ANDROID (Eject, AKEYCODE_MEDIA_EJECT) // LogOff KEY_MAP_GTK (LogOff, GDK_LogOff) // Power -KEY_MAP_ANDROID (Power, AKEYCODE_POWER) // PowerOff KEY_MAP_GTK (PowerOff, GDK_PowerDown) @@ -403,7 +361,6 @@ KEY_MAP_WIN (PrintScreen, VK_SNAPSHOT) KEY_MAP_GTK (PrintScreen, GDK_3270_PrintScreen) KEY_MAP_GTK (PrintScreen, GDK_Print) KEY_MAP_GTK (PrintScreen, GDK_Sys_Req) -KEY_MAP_ANDROID (PrintScreen, AKEYCODE_SYSRQ) // Hibernate KEY_MAP_GTK (Hibernate, GDK_Hibernate) @@ -437,7 +394,6 @@ KEY_MAP_GTK (Compose, GDK_Multi_key) // "Multi Key" is "Compose key" on X // Convert KEY_MAP_WIN (Convert, VK_CONVERT) KEY_MAP_GTK (Convert, GDK_Henkan) -KEY_MAP_ANDROID (Convert, AKEYCODE_HENKAN) // Dead KEY_MAP_GTK (Dead, GDK_dead_grave) @@ -497,19 +453,16 @@ 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) // NonConvert KEY_MAP_WIN (NonConvert, VK_NONCONVERT) KEY_MAP_GTK (NonConvert, GDK_Muhenkan) -KEY_MAP_ANDROID (NonConvert, AKEYCODE_MUHENKAN) // PreviousCandidate KEY_MAP_GTK (PreviousCandidate, GDK_PreviousCandidate) // OADG 109, Mae Koho @@ -534,7 +487,6 @@ KEY_MAP_WIN (JunjaMode, VK_JUNJA) ******************************************************************************/ // Eisu KEY_MAP_COCOA (Eisu, kVK_JIS_Eisu) -KEY_MAP_ANDROID (Eisu, AKEYCODE_EISU) // Hankaku KEY_MAP_WIN_JPN (Hankaku, VK_OEM_AUTO) @@ -546,7 +498,6 @@ KEY_MAP_GTK (Hiragana, GDK_Hiragana) // HiraganaKatakana KEY_MAP_GTK (HiraganaKatakana, GDK_Hiragana_Katakana) -KEY_MAP_ANDROID (HiraganaKatakana, AKEYCODE_KATAKANA_HIRAGANA) // KanaMode // VK_KANA is never used with modern Japanese keyboard, however, IE maps it to @@ -560,8 +511,6 @@ KEY_MAP_GTK (KanaMode, GDK_Kana_Shift) KEY_MAP_WIN_JPN (KanjiMode, VK_KANJI /* same as VK_HANJA */) KEY_MAP_COCOA (KanjiMode, kVK_JIS_Kana) // Kana key opens IME KEY_MAP_GTK (KanjiMode, GDK_Kanji) // Typically, Alt + Hankaku/Zenkaku key -// Assuming that KANA key of Android is the Kana key on Mac keyboard. -KEY_MAP_ANDROID (KanjiMode, AKEYCODE_KANA) // Katakana KEY_MAP_WIN_JPN (Katakana, VK_OEM_FINISH) @@ -577,7 +526,6 @@ KEY_MAP_GTK (Zenkaku, GDK_Zenkaku) // ZenkakuHankaku KEY_MAP_GTK (ZenkakuHankaku, GDK_Zenkaku_Hankaku) -KEY_MAP_ANDROID (ZenkakuHankaku, AKEYCODE_ZENKAKU_HANKAKU) /****************************************************************************** * General-Purpose Function Keys @@ -587,76 +535,64 @@ KEY_MAP_WIN (F1, VK_F1) KEY_MAP_COCOA (F1, kVK_F1) KEY_MAP_GTK (F1, GDK_F1) KEY_MAP_GTK (F1, GDK_KP_F1) -KEY_MAP_ANDROID (F1, AKEYCODE_F1) // F2 KEY_MAP_WIN (F2, VK_F2) KEY_MAP_COCOA (F2, kVK_F2) KEY_MAP_GTK (F2, GDK_F2) KEY_MAP_GTK (F2, GDK_KP_F2) -KEY_MAP_ANDROID (F2, AKEYCODE_F2) // F3 KEY_MAP_WIN (F3, VK_F3) KEY_MAP_COCOA (F3, kVK_F3) KEY_MAP_GTK (F3, GDK_F3) KEY_MAP_GTK (F3, GDK_KP_F3) -KEY_MAP_ANDROID (F3, AKEYCODE_F3) // F4 KEY_MAP_WIN (F4, VK_F4) KEY_MAP_COCOA (F4, kVK_F4) KEY_MAP_GTK (F4, GDK_F4) KEY_MAP_GTK (F4, GDK_KP_F4) -KEY_MAP_ANDROID (F4, AKEYCODE_F4) // F5 KEY_MAP_WIN (F5, VK_F5) KEY_MAP_COCOA (F5, kVK_F5) KEY_MAP_GTK (F5, GDK_F5) -KEY_MAP_ANDROID (F5, AKEYCODE_F5) // F6 KEY_MAP_WIN (F6, VK_F6) KEY_MAP_COCOA (F6, kVK_F6) KEY_MAP_GTK (F6, GDK_F6) -KEY_MAP_ANDROID (F6, AKEYCODE_F6) // F7 KEY_MAP_WIN (F7, VK_F7) KEY_MAP_COCOA (F7, kVK_F7) KEY_MAP_GTK (F7, GDK_F7) -KEY_MAP_ANDROID (F7, AKEYCODE_F7) // F8 KEY_MAP_WIN (F8, VK_F8) KEY_MAP_COCOA (F8, kVK_F8) KEY_MAP_GTK (F8, GDK_F8) -KEY_MAP_ANDROID (F8, AKEYCODE_F8) // F9 KEY_MAP_WIN (F9, VK_F9) KEY_MAP_COCOA (F9, kVK_F9) KEY_MAP_GTK (F9, GDK_F9) -KEY_MAP_ANDROID (F9, AKEYCODE_F9) // F10 KEY_MAP_WIN (F10, VK_F10) KEY_MAP_COCOA (F10, kVK_F10) KEY_MAP_GTK (F10, GDK_F10) -KEY_MAP_ANDROID (F10, AKEYCODE_F10) // F11 KEY_MAP_WIN (F11, VK_F11) KEY_MAP_COCOA (F11, kVK_F11) KEY_MAP_GTK (F11, GDK_F11 /* same as GDK_L1 */) -KEY_MAP_ANDROID (F11, AKEYCODE_F11) // F12 KEY_MAP_WIN (F12, VK_F12) KEY_MAP_COCOA (F12, kVK_F12) KEY_MAP_GTK (F12, GDK_F12 /* same as GDK_L2 */) -KEY_MAP_ANDROID (F12, AKEYCODE_F12) // F13 KEY_MAP_WIN (F13, VK_F13) @@ -751,11 +687,9 @@ KEY_MAP_GTK (F35, GDK_F35 /* same as GDK_R15 */) ******************************************************************************/ // ChannelDown KEY_MAP_WIN_CMD (ChannelDown, APPCOMMAND_MEDIA_CHANNEL_DOWN) -KEY_MAP_ANDROID (ChannelDown, AKEYCODE_CHANNEL_DOWN) // ChannelUp KEY_MAP_WIN_CMD (ChannelUp, APPCOMMAND_MEDIA_CHANNEL_UP) -KEY_MAP_ANDROID (ChannelUp, AKEYCODE_CHANNEL_UP) // Close // NOTE: This is not a key to close disk tray, this is a key to close document @@ -778,45 +712,37 @@ KEY_MAP_GTK (MailSend, GDK_Send) // MediaPause KEY_MAP_WIN_CMD (MediaPause, APPCOMMAND_MEDIA_PAUSE) KEY_MAP_GTK (MediaPause, GDK_AudioPause) -KEY_MAP_ANDROID (MediaPause, AKEYCODE_MEDIA_PAUSE) // MediaPlay KEY_MAP_WIN_CMD (MediaPlay, APPCOMMAND_MEDIA_PLAY) KEY_MAP_GTK (MediaPlay, GDK_AudioPlay) -KEY_MAP_ANDROID (MediaPlay, AKEYCODE_MEDIA_PLAY) // MediaPlayPause KEY_MAP_WIN (MediaPlayPause, VK_MEDIA_PLAY_PAUSE) KEY_MAP_WIN_CMD (MediaPlayPause, APPCOMMAND_MEDIA_PLAY_PAUSE) -KEY_MAP_ANDROID (MediaPlayPause, AKEYCODE_MEDIA_PLAY_PAUSE) // MediaRecord KEY_MAP_WIN_CMD (MediaRecord, APPCOMMAND_MEDIA_RECORD) KEY_MAP_GTK (MediaRecord, GDK_AudioRecord) -KEY_MAP_ANDROID (MediaRecord, AKEYCODE_MEDIA_RECORD) // MediaRewind KEY_MAP_WIN_CMD (MediaRewind, APPCOMMAND_MEDIA_REWIND) KEY_MAP_GTK (MediaRewind, GDK_AudioRewind) -KEY_MAP_ANDROID (MediaRewind, AKEYCODE_MEDIA_REWIND) // MediaStop KEY_MAP_WIN (MediaStop, VK_MEDIA_STOP) KEY_MAP_WIN_CMD (MediaStop, APPCOMMAND_MEDIA_STOP) KEY_MAP_GTK (MediaStop, GDK_AudioStop) -KEY_MAP_ANDROID (MediaStop, AKEYCODE_MEDIA_STOP) // MediaTrackNext KEY_MAP_WIN (MediaTrackNext, VK_MEDIA_NEXT_TRACK) KEY_MAP_WIN_CMD (MediaTrackNext, APPCOMMAND_MEDIA_NEXTTRACK) KEY_MAP_GTK (MediaTrackNext, GDK_AudioNext) -KEY_MAP_ANDROID (MediaTrackNext, AKEYCODE_MEDIA_NEXT) // MediaTrackPrevious KEY_MAP_WIN (MediaTrackPrevious, VK_MEDIA_PREV_TRACK) KEY_MAP_WIN_CMD (MediaTrackPrevious, APPCOMMAND_MEDIA_PREVIOUSTRACK) KEY_MAP_GTK (MediaTrackPrevious, GDK_AudioPrev) -KEY_MAP_ANDROID (MediaTrackPrevious, AKEYCODE_MEDIA_PREVIOUS) // New KEY_MAP_WIN_CMD (New, APPCOMMAND_NEW) @@ -851,38 +777,32 @@ KEY_MAP_WIN (AudioVolumeDown, VK_VOLUME_DOWN) KEY_MAP_WIN_CMD (AudioVolumeDown, APPCOMMAND_VOLUME_DOWN) KEY_MAP_COCOA (AudioVolumeDown, kVK_VolumeDown) KEY_MAP_GTK (AudioVolumeDown, GDK_AudioLowerVolume) -KEY_MAP_ANDROID (AudioVolumeDown, AKEYCODE_VOLUME_DOWN) // AudioVolumeUp KEY_MAP_WIN (AudioVolumeUp, VK_VOLUME_UP) KEY_MAP_WIN_CMD (AudioVolumeUp, APPCOMMAND_VOLUME_UP) KEY_MAP_COCOA (AudioVolumeUp, kVK_VolumeUp) KEY_MAP_GTK (AudioVolumeUp, GDK_AudioRaiseVolume) -KEY_MAP_ANDROID (AudioVolumeUp, AKEYCODE_VOLUME_UP) // AudioVolumeMute KEY_MAP_WIN (AudioVolumeMute, VK_VOLUME_MUTE) KEY_MAP_WIN_CMD (AudioVolumeMute, APPCOMMAND_VOLUME_MUTE) KEY_MAP_COCOA (AudioVolumeMute, kVK_Mute) KEY_MAP_GTK (AudioVolumeMute, GDK_AudioMute) -KEY_MAP_ANDROID (AudioVolumeMute, AKEYCODE_VOLUME_MUTE) /****************************************************************************** * Application Keys ******************************************************************************/ // LaunchCalculator KEY_MAP_GTK (LaunchCalculator, GDK_Calculator) -KEY_MAP_ANDROID (LaunchCalculator, AKEYCODE_CALCULATOR) // LaunchCalendar KEY_MAP_GTK (LaunchCalendar, GDK_Calendar) -KEY_MAP_ANDROID (LaunchCalendar, AKEYCODE_CALENDAR) // LaunchMail KEY_MAP_WIN (LaunchMail, VK_LAUNCH_MAIL) KEY_MAP_WIN_CMD (LaunchMail, APPCOMMAND_LAUNCH_MAIL) KEY_MAP_GTK (LaunchMail, GDK_Mail) -KEY_MAP_ANDROID (LaunchMail, AKEYCODE_ENVELOPE) // LaunchMediaPlayer KEY_MAP_WIN (LaunchMediaPlayer, VK_LAUNCH_MEDIA_SELECT) @@ -895,7 +815,6 @@ KEY_MAP_GTK (LaunchMediaPlayer, GDK_AudioMedia) // LaunchMusicPlayer KEY_MAP_GTK (LaunchMusicPlayer, GDK_Music) -KEY_MAP_ANDROID (LaunchMusicPlayer, AKEYCODE_MUSIC) // LaunchMyComputer KEY_MAP_GTK (LaunchMyComputer, GDK_MyComputer) @@ -909,7 +828,6 @@ KEY_MAP_GTK (LaunchSpreadsheet, GDK_Excel) // LaunchWebBrowser KEY_MAP_GTK (LaunchWebBrowser, GDK_WWW) -KEY_MAP_ANDROID (LaunchWebBrowser, AKEYCODE_EXPLORER) // LaunchWebCam KEY_MAP_GTK (LaunchWebCam, GDK_WebCam) @@ -980,18 +898,15 @@ KEY_MAP_GTK (LaunchApplication16, GDK_LaunchF) KEY_MAP_WIN (BrowserBack, VK_BROWSER_BACK) KEY_MAP_WIN_CMD (BrowserBack, APPCOMMAND_BROWSER_BACKWARD) KEY_MAP_GTK (BrowserBack, GDK_Back) -KEY_MAP_ANDROID (BrowserBack, AKEYCODE_BACK) // BrowserFavorites KEY_MAP_WIN (BrowserFavorites, VK_BROWSER_FAVORITES) KEY_MAP_WIN_CMD (BrowserFavorites, APPCOMMAND_BROWSER_FAVORITES) -KEY_MAP_ANDROID (BrowserFavorites, AKEYCODE_BOOKMARK) // BrowserForward KEY_MAP_WIN (BrowserForward, VK_BROWSER_FORWARD) KEY_MAP_WIN_CMD (BrowserForward, APPCOMMAND_BROWSER_FORWARD) KEY_MAP_GTK (BrowserForward, GDK_Forward) -KEY_MAP_ANDROID (BrowserForward, AKEYCODE_FORWARD) // BrowserHome KEY_MAP_WIN (BrowserHome, VK_BROWSER_HOME) @@ -1008,7 +923,6 @@ KEY_MAP_GTK (BrowserRefresh, GDK_Reload) KEY_MAP_WIN (BrowserSearch, VK_BROWSER_SEARCH) KEY_MAP_WIN_CMD (BrowserSearch, APPCOMMAND_BROWSER_SEARCH) KEY_MAP_GTK (BrowserSearch, GDK_Search) -KEY_MAP_ANDROID (BrowserSearch, AKEYCODE_SEARCH) // BrowserStop KEY_MAP_WIN (BrowserStop, VK_BROWSER_STOP) @@ -1019,88 +933,67 @@ KEY_MAP_GTK (BrowserStop, GDK_Stop) * Mobile Phone Keys ******************************************************************************/ // Call -KEY_MAP_ANDROID (Call, AKEYCODE_CALL) // Camera -KEY_MAP_ANDROID (Camera, AKEYCODE_CAMERA) // CameraFocus -KEY_MAP_ANDROID (CameraFocus, AKEYCODE_FOCUS) // GoHome -KEY_MAP_ANDROID (GoHome, AKEYCODE_HOME) /****************************************************************************** * TV Keys ******************************************************************************/ // TV -KEY_MAP_ANDROID (TV, AKEYCODE_TV) // TVInput -KEY_MAP_ANDROID (TVInput, AKEYCODE_TV_INPUT) // TVPower -KEY_MAP_ANDROID (TVPower, AKEYCODE_TV_POWER) /****************************************************************************** * Media Controller Keys ******************************************************************************/ // AVRInput -KEY_MAP_ANDROID (AVRInput, AKEYCODE_AVR_INPUT) // AVRPower -KEY_MAP_ANDROID (AVRPower, AKEYCODE_AVR_POWER) // ColorF0Red KEY_MAP_GTK (ColorF0Red, GDK_Red) -KEY_MAP_ANDROID (ColorF0Red, AKEYCODE_PROG_RED) // ColorF1Green KEY_MAP_GTK (ColorF1Green, GDK_Green) -KEY_MAP_ANDROID (ColorF1Green, AKEYCODE_PROG_GREEN) // ColorF2Yellow KEY_MAP_GTK (ColorF2Yellow, GDK_Yellow) -KEY_MAP_ANDROID (ColorF2Yellow, AKEYCODE_PROG_YELLOW) // ColorF3Blue KEY_MAP_GTK (ColorF3Blue, GDK_Blue) -KEY_MAP_ANDROID (ColorF3Blue, AKEYCODE_PROG_BLUE) // Dimmer KEY_MAP_GTK (Dimmer, GDK_BrightnessAdjust) // Guide -KEY_MAP_ANDROID (Guide, AKEYCODE_GUIDE) // Info -KEY_MAP_ANDROID (Info, AKEYCODE_INFO) // MediaFastForward KEY_MAP_WIN_CMD (MediaFastForward, APPCOMMAND_MEDIA_FAST_FORWARD) KEY_MAP_GTK (MediaFastForward, GDK_AudioForward) -KEY_MAP_ANDROID (MediaFastForward, AKEYCODE_MEDIA_FAST_FORWARD) // MediaLast // PinPToggle -KEY_MAP_ANDROID (PinPToggle, AKEYCODE_WINDOW) // RandomToggle KEY_MAP_GTK (RandomToggle, GDK_AudioRandomPlay) // Settings -KEY_MAP_ANDROID (Settings, AKEYCODE_SETTINGS) // STBInput -KEY_MAP_ANDROID (STBInput, AKEYCODE_STB_INPUT) // STBPower -KEY_MAP_ANDROID (STBPower, AKEYCODE_STB_POWER) // Subtitle KEY_MAP_GTK (Subtitle, GDK_Subtitle) -KEY_MAP_ANDROID (Subtitle, AKEYCODE_CAPTIONS) // VideoModeNext KEY_MAP_GTK (VideoModeNext, GDK_Next_VMode) @@ -1112,10 +1005,8 @@ KEY_MAP_WIN (ZoomToggle, VK_ZOOM) * Keys not defined by any standards ******************************************************************************/ // SoftLeft -KEY_MAP_ANDROID (SoftLeft, AKEYCODE_SOFT_LEFT) // SoftRight -KEY_MAP_ANDROID (SoftRight, AKEYCODE_SOFT_RIGHT) #undef KEY_MAP_WIN #undef KEY_MAP_WIN_JPN @@ -1124,4 +1015,3 @@ KEY_MAP_ANDROID (SoftRight, AKEYCODE_SOFT_RIGHT) #undef KEY_MAP_WIN_CMD #undef KEY_MAP_COCOA #undef KEY_MAP_GTK -#undef KEY_MAP_ANDROID -- cgit v1.2.3