aboutsummaryrefslogtreecommitdiffstats
path: root/android/skin
diff options
context:
space:
mode:
authorMaciek Molerus <maciek@google.com>2011-07-06 12:27:56 +0200
committerMaciek Molerus <maciek@google.com>2011-07-12 11:11:40 +0200
commit62ffc423bdf158d98ee2902916963c4fde7fbe47 (patch)
tree334f3cc835e286702b7d14888c8fca980f9a5d12 /android/skin
parentb0fb4888979957e742ecf4f98957ac199f5e51db (diff)
downloadexternal_qemu-62ffc423bdf158d98ee2902916963c4fde7fbe47.zip
external_qemu-62ffc423bdf158d98ee2902916963c4fde7fbe47.tar.gz
external_qemu-62ffc423bdf158d98ee2902916963c4fde7fbe47.tar.bz2
Added GTV related keys
Adds the definitions for keys present in GoogleTV. Standard linux definitions are used to send notifications to emulated system. Change-Id: Id87aebfc86c5ce8b7331314352f2640a00ef36ae
Diffstat (limited to 'android/skin')
-rw-r--r--android/skin/file.c14
-rw-r--r--android/skin/keyset.h32
-rw-r--r--android/skin/window.c14
3 files changed, 51 insertions, 9 deletions
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 */