diff options
| -rw-r--r-- | android/keycode.h | 14 | ||||
| -rw-r--r-- | android/qemulator.c | 24 | ||||
| -rw-r--r-- | android/skin/file.c | 14 | ||||
| -rw-r--r-- | android/skin/keyset.h | 32 | ||||
| -rw-r--r-- | android/skin/window.c | 14 |
5 files changed, 84 insertions, 14 deletions
diff --git a/android/keycode.h b/android/keycode.h index a32ac0d..bbec160 100644 --- a/android/keycode.h +++ b/android/keycode.h @@ -101,6 +101,20 @@ typedef enum { kKeyCodeMenu = KEY_SOFT1, kKeyCodeNotification = KEY_NOTIFICATION, kKeyCodeSearch = KEY_SEARCH, + kKeyCodeTV = KEY_TV, + kKeyCodeEPG = KEY_PROGRAM, + kKeyCodeDVR = KEY_PVR, + kKeyCodePrevious = KEY_PREVIOUS, + kKeyCodeNext = KEY_NEXT, + kKeyCodePlay = KEY_PLAY, + kKeyCodePause = KEY_PAUSE, + kKeyCodeStop = KEY_STOP, + kKeyCodeRewind = KEY_REWIND, + kKeyCodeFastForward = KEY_FASTFORWARD, + kKeyCodeBookmarks = KEY_BOOKMARKS, + kKeyCodeCycleWindows = KEY_CYCLEWINDOWS, + kKeyCodeChannelUp = KEY_CHANNELUP, + kKeyCodeChannelDown = KEY_CHANNELDOWN, } AndroidKeyCode; diff --git a/android/qemulator.c b/android/qemulator.c index 773fcf7..35587ff 100644 --- a/android/qemulator.c +++ b/android/qemulator.c @@ -330,11 +330,11 @@ handle_key_command( void* opaque, SkinKeyCommand command, int down ) { static const struct { SkinKeyCommand cmd; AndroidKeyCode kcode; } keycodes[] = { - { SKIN_KEY_COMMAND_BUTTON_CALL, kKeyCodeCall }, - { SKIN_KEY_COMMAND_BUTTON_HOME, kKeyCodeHome }, - { SKIN_KEY_COMMAND_BUTTON_BACK, kKeyCodeBack }, - { SKIN_KEY_COMMAND_BUTTON_HANGUP, kKeyCodeEndCall }, - { SKIN_KEY_COMMAND_BUTTON_POWER, kKeyCodePower }, + { SKIN_KEY_COMMAND_BUTTON_CALL, kKeyCodeCall }, + { SKIN_KEY_COMMAND_BUTTON_HOME, kKeyCodeHome }, + { SKIN_KEY_COMMAND_BUTTON_BACK, kKeyCodeBack }, + { SKIN_KEY_COMMAND_BUTTON_HANGUP, kKeyCodeEndCall }, + { SKIN_KEY_COMMAND_BUTTON_POWER, kKeyCodePower }, { SKIN_KEY_COMMAND_BUTTON_SEARCH, kKeyCodeSearch }, { SKIN_KEY_COMMAND_BUTTON_MENU, kKeyCodeMenu }, { SKIN_KEY_COMMAND_BUTTON_DPAD_UP, kKeyCodeDpadUp }, @@ -345,6 +345,20 @@ handle_key_command( void* opaque, SkinKeyCommand command, int down ) { SKIN_KEY_COMMAND_BUTTON_VOLUME_UP, kKeyCodeVolumeUp }, { SKIN_KEY_COMMAND_BUTTON_VOLUME_DOWN, kKeyCodeVolumeDown }, { SKIN_KEY_COMMAND_BUTTON_CAMERA, kKeyCodeCamera }, + { SKIN_KEY_COMMAND_BUTTON_TV, kKeyCodeTV }, + { SKIN_KEY_COMMAND_BUTTON_EPG, kKeyCodeEPG }, + { SKIN_KEY_COMMAND_BUTTON_DVR, kKeyCodeDVR }, + { SKIN_KEY_COMMAND_BUTTON_PREV, kKeyCodePrevious }, + { SKIN_KEY_COMMAND_BUTTON_NEXT, kKeyCodeNext }, + { SKIN_KEY_COMMAND_BUTTON_PLAY, kKeyCodePlay }, + { SKIN_KEY_COMMAND_BUTTON_PAUSE, kKeyCodePause }, + { SKIN_KEY_COMMAND_BUTTON_STOP, kKeyCodeStop }, + { SKIN_KEY_COMMAND_BUTTON_REWIND, kKeyCodeRewind }, + { SKIN_KEY_COMMAND_BUTTON_FFWD, kKeyCodeFastForward }, + { SKIN_KEY_COMMAND_BUTTON_BOOKMARKS, kKeyCodeBookmarks }, + { SKIN_KEY_COMMAND_BUTTON_WINDOW, kKeyCodeCycleWindows }, + { SKIN_KEY_COMMAND_BUTTON_CHANNELUP, kKeyCodeChannelUp }, + { SKIN_KEY_COMMAND_BUTTON_CHANNELDOWN, kKeyCodeChannelDown }, { SKIN_KEY_COMMAND_NONE, 0 } }; int nn; diff --git a/android/skin/file.c b/android/skin/file.c index 252a7c4..d947ec2 100644 --- a/android/skin/file.c +++ b/android/skin/file.c @@ -187,6 +187,20 @@ static KeyInfo _keyinfo_table[] = { { "ALT", kKeyCodeAltLeft }, { "ALT2", kKeyCodeAltRight }, { "CAP2", kKeyCodeCapRight }, + { "tv", kKeyCodeTV }, + { "epg", kKeyCodeEPG }, + { "dvr", kKeyCodeDVR }, + { "prev", kKeyCodePrevious }, + { "next", kKeyCodeNext }, + { "play", kKeyCodePlay }, + { "pause", kKeyCodePause }, + { "stop", kKeyCodeStop }, + { "rev", kKeyCodeRewind }, + { "ffwd", kKeyCodeFastForward }, + { "bookmarks", kKeyCodeBookmarks }, + { "window", kKeyCodeCycleWindows }, + { "channel-up", kKeyCodeChannelUp }, + { "channel-down", kKeyCodeChannelDown }, { 0, 0 }, }; diff --git a/android/skin/keyset.h b/android/skin/keyset.h index d68d6a7..81eb2e7 100644 --- a/android/skin/keyset.h +++ b/android/skin/keyset.h @@ -33,20 +33,34 @@ typedef struct SkinKeyset SkinKeyset; _SKIN_KEY_COMMAND(BUTTON_VOLUME_UP,"Volume up button") \ _SKIN_KEY_COMMAND(BUTTON_VOLUME_DOWN,"Volume down button") \ _SKIN_KEY_COMMAND(BUTTON_CAMERA,"Camera button") \ - _SKIN_KEY_COMMAND(CHANGE_LAYOUT_PREV,"switch to previous layout") \ - _SKIN_KEY_COMMAND(CHANGE_LAYOUT_NEXT,"switch to next layout") \ - _SKIN_KEY_COMMAND(TOGGLE_NETWORK,"toggle cell network on/off") \ - _SKIN_KEY_COMMAND(TOGGLE_TRACING,"toggle code profiling") \ - _SKIN_KEY_COMMAND(TOGGLE_FULLSCREEN,"toggle fullscreen mode") \ - _SKIN_KEY_COMMAND(TOGGLE_TRACKBALL,"toggle trackball mode") \ - _SKIN_KEY_COMMAND(SHOW_TRACKBALL,"show trackball") \ + _SKIN_KEY_COMMAND(CHANGE_LAYOUT_PREV,"Switch to previous layout") \ + _SKIN_KEY_COMMAND(CHANGE_LAYOUT_NEXT,"Switch to next layout") \ + _SKIN_KEY_COMMAND(TOGGLE_NETWORK,"Toggle cell network on/off") \ + _SKIN_KEY_COMMAND(TOGGLE_TRACING,"Toggle code profiling") \ + _SKIN_KEY_COMMAND(TOGGLE_FULLSCREEN,"Toggle fullscreen mode") \ + _SKIN_KEY_COMMAND(TOGGLE_TRACKBALL,"Toggle trackball mode") \ + _SKIN_KEY_COMMAND(SHOW_TRACKBALL,"Show trackball") \ _SKIN_KEY_COMMAND(BUTTON_DPAD_CENTER,"DPad center") \ _SKIN_KEY_COMMAND(BUTTON_DPAD_LEFT,"DPad left") \ _SKIN_KEY_COMMAND(BUTTON_DPAD_RIGHT,"DPad right") \ _SKIN_KEY_COMMAND(BUTTON_DPAD_UP,"DPad up") \ _SKIN_KEY_COMMAND(BUTTON_DPAD_DOWN,"DPad down") \ - _SKIN_KEY_COMMAND(ONION_ALPHA_UP,"increase onion alpha") \ - _SKIN_KEY_COMMAND(ONION_ALPHA_DOWN,"decrease onion alpha") \ + _SKIN_KEY_COMMAND(ONION_ALPHA_UP,"Increase onion alpha") \ + _SKIN_KEY_COMMAND(ONION_ALPHA_DOWN,"Decrease onion alpha") \ + _SKIN_KEY_COMMAND(BUTTON_TV,"TV button") \ + _SKIN_KEY_COMMAND(BUTTON_EPG,"EPG button") \ + _SKIN_KEY_COMMAND(BUTTON_DVR,"DVR button") \ + _SKIN_KEY_COMMAND(BUTTON_PREV,"Previous button") \ + _SKIN_KEY_COMMAND(BUTTON_NEXT,"Next button") \ + _SKIN_KEY_COMMAND(BUTTON_PLAY,"Play button") \ + _SKIN_KEY_COMMAND(BUTTON_PAUSE,"Pause button") \ + _SKIN_KEY_COMMAND(BUTTON_STOP,"Stop button") \ + _SKIN_KEY_COMMAND(BUTTON_REWIND,"Rewind button") \ + _SKIN_KEY_COMMAND(BUTTON_FFWD,"Fast forward button") \ + _SKIN_KEY_COMMAND(BUTTON_BOOKMARKS,"Bookmarks button") \ + _SKIN_KEY_COMMAND(BUTTON_WINDOW,"Window button") \ + _SKIN_KEY_COMMAND(BUTTON_CHANNELUP,"Channel up button") \ + _SKIN_KEY_COMMAND(BUTTON_CHANNELDOWN,"Channel down button") \ /* the list of commands in the emulator */ diff --git a/android/skin/window.c b/android/skin/window.c index 9e29a3f..9a72db5 100644 --- a/android/skin/window.c +++ b/android/skin/window.c @@ -1074,6 +1074,20 @@ skin_window_move_mouse( SkinWindow* window, case kKeyCodeBack: case kKeyCodeCall: case kKeyCodeEndCall: + case kKeyCodeTV: + case kKeyCodeEPG: + case kKeyCodeDVR: + case kKeyCodePrevious: + case kKeyCodeNext: + case kKeyCodePlay: + case kKeyCodePause: + case kKeyCodeStop: + case kKeyCodeRewind: + case kKeyCodeFastForward: + case kKeyCodeBookmarks: + case kKeyCodeCycleWindows: + case kKeyCodeChannelUp: + case kKeyCodeChannelDown: break; /* all the rest is assumed to be qwerty */ |