wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 674739 - Implement DOM3 KeyboardEvent types, use volume keys in android widget code r=jchen

Browse Source
This commit is contained in:
Brad Lassey 2013-02-04 18:27:56 -05:00
parent 16fe066050
commit 95a66d6597
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
widget/android/nsWindow.cpp
View File

@ -1425,7 +1425,9 @@ static unsigned int ConvertAndroidKeyCodeToDOMKeyCode(int androidKeyCode)
case AndroidKeyEvent::KEYCODE_DPAD_LEFT: return NS_VK_LEFT;
case AndroidKeyEvent::KEYCODE_DPAD_RIGHT: return NS_VK_RIGHT;
case AndroidKeyEvent::KEYCODE_DPAD_CENTER: return NS_VK_RETURN;
// KEYCODE_VOLUME_UP (24) ... KEYCODE_Z (54)
case AndroidKeyEvent::KEYCODE_VOLUME_UP: return NS_VK_VOLUME_UP;
case AndroidKeyEvent::KEYCODE_VOLUME_DOWN: return NS_VK_VOLUME_DOWN;
// KEYCODE_VOLUME_POWER (26) ... KEYCODE_Z (54)
case AndroidKeyEvent::KEYCODE_COMMA: return NS_VK_COMMA;
case AndroidKeyEvent::KEYCODE_PERIOD: return NS_VK_PERIOD;
case AndroidKeyEvent::KEYCODE_ALT_LEFT: return NS_VK_ALT;
@ -1446,7 +1448,8 @@ static unsigned int ConvertAndroidKeyCodeToDOMKeyCode(int androidKeyCode)
case AndroidKeyEvent::KEYCODE_SEMICOLON: return NS_VK_SEMICOLON;
// KEYCODE_APOSTROPHE (75)
case AndroidKeyEvent::KEYCODE_SLASH: return NS_VK_SLASH;
// KEYCODE_AT (77) ... KEYCODE_MUTE (91)
// KEYCODE_AT (77) ... KEYCODE_MEDIA_FAST_FORWARD (90)
case AndroidKeyEvent::KEYCODE_MUTE: return NS_VK_VOLUME_MUTE;
case AndroidKeyEvent::KEYCODE_PAGE_UP: return NS_VK_PAGE_UP;
case AndroidKeyEvent::KEYCODE_PAGE_DOWN: return NS_VK_PAGE_DOWN;
// KEYCODE_PICTSYMBOLS (94) ... KEYCODE_BUTTON_MODE (110)
@ -1586,14 +1589,6 @@ nsWindow::HandleSpecialKey(AndroidGeckoEvent *ae)
doCommand = true;
}
break;
case AndroidKeyEvent::KEYCODE_VOLUME_UP:
command = nsGkAtoms::VolumeUp;
doCommand = true;
break;
case AndroidKeyEvent::KEYCODE_VOLUME_DOWN:
command = nsGkAtoms::VolumeDown;
doCommand = true;
break;
case AndroidKeyEvent::KEYCODE_MENU:
gMenu = true;
gMenuConsumed = isLongPress;
@ -1667,8 +1662,6 @@ nsWindow::OnKeyEvent(AndroidGeckoEvent *ae)
case AndroidKeyEvent::KEYCODE_BACK:
case AndroidKeyEvent::KEYCODE_MENU:
case AndroidKeyEvent::KEYCODE_SEARCH:
case AndroidKeyEvent::KEYCODE_VOLUME_UP:
case AndroidKeyEvent::KEYCODE_VOLUME_DOWN:
HandleSpecialKey(ae);
return;
}