[Scummvm-git-logs] scummvm branch-2-2 -> 6d68f2fe8b3965f791c308f2bada6b08eb0ddfee
antoniou79
a.antoniou79 at gmail.com
Fri Oct 9 04:59:08 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6d68f2fe8b ANDROID: Use the input enums from the system headers
Commit: 6d68f2fe8b3965f791c308f2bada6b08eb0ddfee
https://github.com/scummvm/scummvm/commit/6d68f2fe8b3965f791c308f2bada6b08eb0ddfee
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-09T07:58:52+03:00
Commit Message:
ANDROID: Use the input enums from the system headers
Changed paths:
R backends/platform/android/events.h
backends/platform/android/events.cpp
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index fcd0016758..42e6045c0a 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -39,9 +39,10 @@
// for the Android port
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#include <android/input.h>
+
#include "backends/platform/android/android.h"
#include "backends/platform/android/graphics.h"
-#include "backends/platform/android/events.h"
#include "backends/platform/android/jni-android.h"
// floating point. use sparingly
@@ -52,6 +53,325 @@ static inline T scalef(T in, float numerator, float denominator) {
static const int kQueuedInputEventDelay = 50;
+// event type
+enum {
+ JE_SYS_KEY = 0,
+ JE_KEY = 1,
+ JE_DPAD = 2,
+ JE_DOWN = 3,
+ JE_SCROLL = 4,
+ JE_TAP = 5,
+ JE_DOUBLE_TAP = 6,
+ JE_MULTI = 7,
+ JE_BALL = 8,
+ JE_LMB_DOWN = 9,
+ JE_LMB_UP = 10,
+ JE_RMB_DOWN = 11,
+ JE_RMB_UP = 12,
+ JE_MOUSE_MOVE = 13,
+ JE_GAMEPAD = 14,
+ JE_JOYSTICK = 15,
+ JE_MMB_DOWN = 16,
+ JE_MMB_UP = 17,
+ JE_BMB_DOWN = 18,
+ JE_BMB_UP = 19,
+ JE_FMB_DOWN = 20,
+ JE_FMB_UP = 21,
+ JE_QUIT = 0x1000
+};
+
+// meta modifier
+enum {
+ AMETA_CTRL_MASK = AMETA_CTRL_ON | AMETA_CTRL_LEFT_ON | AMETA_CTRL_RIGHT_ON,
+ AMETA_META_MASK = AMETA_META_ON | AMETA_META_LEFT_ON | AMETA_META_RIGHT_ON,
+ AMETA_SHIFT_MASK = AMETA_SHIFT_ON | AMETA_SHIFT_LEFT_ON | AMETA_SHIFT_RIGHT_ON,
+ AMETA_ALT_MASK = AMETA_ALT_ON | AMETA_ALT_LEFT_ON | AMETA_ALT_RIGHT_ON
+};
+
+// map android key codes to our kbd codes
+static const Common::KeyCode jkeymap[] = {
+ Common::KEYCODE_INVALID, // AKEYCODE_UNKNOWN
+ Common::KEYCODE_LEFTSOFT, // AKEYCODE_SOFT_LEFT
+ Common::KEYCODE_RIGHTSOFT, // AKEYCODE_SOFT_RIGHT
+ Common::KEYCODE_AC_HOME, // AKEYCODE_HOME
+ Common::KEYCODE_AC_BACK, // AKEYCODE_BACK
+ Common::KEYCODE_CALL, // AKEYCODE_CALL
+ Common::KEYCODE_HANGUP, // AKEYCODE_ENDCALL
+ Common::KEYCODE_0, // AKEYCODE_0
+ Common::KEYCODE_1, // AKEYCODE_1
+ Common::KEYCODE_2, // AKEYCODE_2
+ Common::KEYCODE_3, // AKEYCODE_3
+ Common::KEYCODE_4, // AKEYCODE_4
+ Common::KEYCODE_5, // AKEYCODE_5
+ Common::KEYCODE_6, // AKEYCODE_6
+ Common::KEYCODE_7, // AKEYCODE_7
+ Common::KEYCODE_8, // AKEYCODE_8
+ Common::KEYCODE_9, // AKEYCODE_9
+ Common::KEYCODE_ASTERISK, // AKEYCODE_STAR
+ Common::KEYCODE_HASH, // AKEYCODE_POUND
+ Common::KEYCODE_UP, // AKEYCODE_DPAD_UP
+ Common::KEYCODE_DOWN, // AKEYCODE_DPAD_DOWN
+ Common::KEYCODE_LEFT, // AKEYCODE_DPAD_LEFT
+ Common::KEYCODE_RIGHT, // AKEYCODE_DPAD_RIGHT
+ Common::KEYCODE_SELECT, // AKEYCODE_DPAD_CENTER
+ Common::KEYCODE_VOLUMEUP, // AKEYCODE_VOLUME_UP
+ Common::KEYCODE_VOLUMEDOWN, // AKEYCODE_VOLUME_DOWN
+ Common::KEYCODE_POWER, // AKEYCODE_POWER
+ Common::KEYCODE_CAMERA, // AKEYCODE_CAMERA
+ Common::KEYCODE_CLEAR, // AKEYCODE_CLEAR
+ Common::KEYCODE_a, // AKEYCODE_A
+ Common::KEYCODE_b, // AKEYCODE_B
+ Common::KEYCODE_c, // AKEYCODE_C
+ Common::KEYCODE_d, // AKEYCODE_D
+ Common::KEYCODE_e, // AKEYCODE_E
+ Common::KEYCODE_f, // AKEYCODE_F
+ Common::KEYCODE_g, // AKEYCODE_G
+ Common::KEYCODE_h, // AKEYCODE_H
+ Common::KEYCODE_i, // AKEYCODE_I
+ Common::KEYCODE_j, // AKEYCODE_J
+ Common::KEYCODE_k, // AKEYCODE_K
+ Common::KEYCODE_l, // AKEYCODE_L
+ Common::KEYCODE_m, // AKEYCODE_M
+ Common::KEYCODE_n, // AKEYCODE_N
+ Common::KEYCODE_o, // AKEYCODE_O
+ Common::KEYCODE_p, // AKEYCODE_P
+ Common::KEYCODE_q, // AKEYCODE_Q
+ Common::KEYCODE_r, // AKEYCODE_R
+ Common::KEYCODE_s, // AKEYCODE_S
+ Common::KEYCODE_t, // AKEYCODE_T
+ Common::KEYCODE_u, // AKEYCODE_U
+ Common::KEYCODE_v, // AKEYCODE_V
+ Common::KEYCODE_w, // AKEYCODE_W
+ Common::KEYCODE_x, // AKEYCODE_X
+ Common::KEYCODE_y, // AKEYCODE_Y
+ Common::KEYCODE_z, // AKEYCODE_Z
+ Common::KEYCODE_COMMA, // AKEYCODE_COMMA
+ Common::KEYCODE_PERIOD, // AKEYCODE_PERIOD
+ Common::KEYCODE_LALT, // AKEYCODE_ALT_LEFT
+ Common::KEYCODE_RALT, // AKEYCODE_ALT_RIGHT
+ Common::KEYCODE_LSHIFT, // AKEYCODE_SHIFT_LEFT
+ Common::KEYCODE_RSHIFT, // AKEYCODE_SHIFT_RIGHT
+ Common::KEYCODE_TAB, // AKEYCODE_TAB
+ Common::KEYCODE_SPACE, // AKEYCODE_SPACE
+ Common::KEYCODE_LCTRL, // AKEYCODE_SYM
+ Common::KEYCODE_WWW, // AKEYCODE_EXPLORER
+ Common::KEYCODE_MAIL, // AKEYCODE_ENVELOPE
+ Common::KEYCODE_RETURN, // AKEYCODE_ENTER
+ Common::KEYCODE_BACKSPACE, // AKEYCODE_DEL
+ Common::KEYCODE_BACKQUOTE, // AKEYCODE_GRAVE
+ Common::KEYCODE_MINUS, // AKEYCODE_MINUS
+ Common::KEYCODE_EQUALS, // AKEYCODE_EQUALS
+ Common::KEYCODE_LEFTPAREN, // AKEYCODE_LEFT_BRACKET
+ Common::KEYCODE_RIGHTPAREN, // AKEYCODE_RIGHT_BRACKET
+ Common::KEYCODE_BACKSLASH, // AKEYCODE_BACKSLASH
+ Common::KEYCODE_SEMICOLON, // AKEYCODE_SEMICOLON
+ Common::KEYCODE_QUOTE, // AKEYCODE_APOSTROPHE
+ Common::KEYCODE_SLASH, // AKEYCODE_SLASH
+ Common::KEYCODE_AT, // AKEYCODE_AT
+ Common::KEYCODE_INVALID, // AKEYCODE_NUM
+ Common::KEYCODE_INVALID, // AKEYCODE_HEADSETHOOK
+ Common::KEYCODE_INVALID, // AKEYCODE_FOCUS
+ Common::KEYCODE_PLUS, // AKEYCODE_PLUS
+ Common::KEYCODE_MENU, // AKEYCODE_MENU
+ Common::KEYCODE_INVALID, // AKEYCODE_NOTIFICATION
+ Common::KEYCODE_AC_SEARCH, // AKEYCODE_SEARCH
+ Common::KEYCODE_AUDIOPLAYPAUSE, // AKEYCODE_MEDIA_PLAY_PAUSE
+ Common::KEYCODE_AUDIOSTOP, // AKEYCODE_MEDIA_STOP
+ Common::KEYCODE_AUDIONEXT, // AKEYCODE_MEDIA_NEXT
+ Common::KEYCODE_AUDIOPREV, // AKEYCODE_MEDIA_PREVIOUS
+ Common::KEYCODE_AUDIOREWIND, // AKEYCODE_MEDIA_REWIND
+ Common::KEYCODE_AUDIOFASTFORWARD, // AKEYCODE_MEDIA_FAST_FORWARD
+ Common::KEYCODE_MUTE, // AKEYCODE_MUTE
+ Common::KEYCODE_PAGEUP, // AKEYCODE_PAGE_UP
+ Common::KEYCODE_PAGEDOWN, // AKEYCODE_PAGE_DOWN
+ Common::KEYCODE_INVALID, // AKEYCODE_PICTSYMBOLS
+ Common::KEYCODE_INVALID, // AKEYCODE_SWITCH_CHARSET
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_A
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_B
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_C
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_X
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_Y
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_Z
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_L1
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_R1
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_L2
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_R2
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_THUMBL
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_THUMBR
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_START
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_SELECT
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_MODE
+ Common::KEYCODE_ESCAPE, // AKEYCODE_ESCAPE
+ Common::KEYCODE_DELETE, // AKEYCODE_FORWARD_DEL
+ Common::KEYCODE_LCTRL, // AKEYCODE_CTRL_LEFT
+ Common::KEYCODE_RCTRL, // AKEYCODE_CTRL_RIGHT
+ Common::KEYCODE_CAPSLOCK, // AKEYCODE_CAPS_LOCK
+ Common::KEYCODE_SCROLLOCK, // AKEYCODE_SCROLL_LOCK
+ Common::KEYCODE_LSUPER, // AKEYCODE_META_LEFT
+ Common::KEYCODE_RSUPER, // AKEYCODE_META_RIGHT
+ Common::KEYCODE_INVALID, // AKEYCODE_FUNCTION
+ Common::KEYCODE_SYSREQ, // AKEYCODE_SYSRQ
+ Common::KEYCODE_BREAK, // AKEYCODE_BREAK
+ Common::KEYCODE_HOME, // AKEYCODE_MOVE_HOME
+ Common::KEYCODE_END, // AKEYCODE_MOVE_END
+ Common::KEYCODE_INSERT, // AKEYCODE_INSERT
+ Common::KEYCODE_AC_FORWARD, // AKEYCODE_FORWARD
+ Common::KEYCODE_AUDIOPLAY, // AKEYCODE_MEDIA_PLAY
+ Common::KEYCODE_AUDIOPAUSE, // AKEYCODE_MEDIA_PAUSE
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_CLOSE
+ Common::KEYCODE_EJECT, // AKEYCODE_MEDIA_EJECT
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_RECORD
+ Common::KEYCODE_F1, // AKEYCODE_F1
+ Common::KEYCODE_F2, // AKEYCODE_F2
+ Common::KEYCODE_F3, // AKEYCODE_F3
+ Common::KEYCODE_F4, // AKEYCODE_F4
+ Common::KEYCODE_F5, // AKEYCODE_F5
+ Common::KEYCODE_F6, // AKEYCODE_F6
+ Common::KEYCODE_F7, // AKEYCODE_F7
+ Common::KEYCODE_F8, // AKEYCODE_F8
+ Common::KEYCODE_F9, // AKEYCODE_F9
+ Common::KEYCODE_F10, // AKEYCODE_F10
+ Common::KEYCODE_F11, // AKEYCODE_F11
+ Common::KEYCODE_F12, // AKEYCODE_F12
+ Common::KEYCODE_NUMLOCK, // AKEYCODE_NUM_LOCK
+ Common::KEYCODE_KP0, // AKEYCODE_NUMPAD_0
+ Common::KEYCODE_KP1, // AKEYCODE_NUMPAD_1
+ Common::KEYCODE_KP2, // AKEYCODE_NUMPAD_2
+ Common::KEYCODE_KP3, // AKEYCODE_NUMPAD_3
+ Common::KEYCODE_KP4, // AKEYCODE_NUMPAD_4
+ Common::KEYCODE_KP5, // AKEYCODE_NUMPAD_5
+ Common::KEYCODE_KP6, // AKEYCODE_NUMPAD_6
+ Common::KEYCODE_KP7, // AKEYCODE_NUMPAD_7
+ Common::KEYCODE_KP8, // AKEYCODE_NUMPAD_8
+ Common::KEYCODE_KP9, // AKEYCODE_NUMPAD_9
+ Common::KEYCODE_KP_DIVIDE, // AKEYCODE_NUMPAD_DIVIDE
+ Common::KEYCODE_KP_MULTIPLY, // AKEYCODE_NUMPAD_MULTIPLY
+ Common::KEYCODE_KP_MINUS, // AKEYCODE_NUMPAD_SUBTRACT
+ Common::KEYCODE_KP_PLUS, // AKEYCODE_NUMPAD_ADD
+ Common::KEYCODE_KP_PERIOD, // AKEYCODE_NUMPAD_DOT
+ Common::KEYCODE_INVALID, // AKEYCODE_NUMPAD_COMMA
+ Common::KEYCODE_KP_ENTER, // AKEYCODE_NUMPAD_ENTER
+ Common::KEYCODE_KP_EQUALS, // AKEYCODE_NUMPAD_EQUALS
+ Common::KEYCODE_INVALID, // AKEYCODE_NUMPAD_LEFT_PAREN
+ Common::KEYCODE_INVALID, // AKEYCODE_NUMPAD_RIGHT_PAREN
+ Common::KEYCODE_INVALID, // AKEYCODE_VOLUME_MUTE
+ Common::KEYCODE_INVALID, // AKEYCODE_INFO
+ Common::KEYCODE_INVALID, // AKEYCODE_CHANNEL_UP
+ Common::KEYCODE_INVALID, // AKEYCODE_CHANNEL_DOWN
+ Common::KEYCODE_INVALID, // AKEYCODE_ZOOM_IN
+ Common::KEYCODE_INVALID, // AKEYCODE_ZOOM_OUT
+ Common::KEYCODE_INVALID, // AKEYCODE_TV
+ Common::KEYCODE_INVALID, // AKEYCODE_WINDOW
+ Common::KEYCODE_INVALID, // AKEYCODE_GUIDE
+ Common::KEYCODE_INVALID, // AKEYCODE_DVR
+ Common::KEYCODE_AC_BOOKMARKS, // AKEYCODE_BOOKMARK
+ Common::KEYCODE_INVALID, // AKEYCODE_CAPTIONS
+ Common::KEYCODE_INVALID, // AKEYCODE_SETTINGS
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_POWER
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT
+ Common::KEYCODE_INVALID, // AKEYCODE_STB_POWER
+ Common::KEYCODE_INVALID, // AKEYCODE_STB_INPUT
+ Common::KEYCODE_INVALID, // AKEYCODE_AVR_POWER
+ Common::KEYCODE_INVALID, // AKEYCODE_AVR_INPUT
+ Common::KEYCODE_INVALID, // AKEYCODE_PROG_RED
+ Common::KEYCODE_INVALID, // AKEYCODE_PROG_GREEN
+ Common::KEYCODE_INVALID, // AKEYCODE_PROG_YELLOW
+ Common::KEYCODE_INVALID, // AKEYCODE_PROG_BLUE
+ Common::KEYCODE_INVALID, // AKEYCODE_APP_SWITCH
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_1
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_2
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_3
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_4
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_5
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_6
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_7
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_8
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_9
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_10
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_11
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_12
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_13
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_14
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_15
+ Common::KEYCODE_INVALID, // AKEYCODE_BUTTON_16
+ Common::KEYCODE_INVALID, // AKEYCODE_LANGUAGE_SWITCH
+ Common::KEYCODE_INVALID, // AKEYCODE_MANNER_MODE
+ Common::KEYCODE_INVALID, // AKEYCODE_3D_MODE
+ Common::KEYCODE_INVALID, // AKEYCODE_CONTACTS
+ Common::KEYCODE_INVALID, // AKEYCODE_CALENDAR
+ Common::KEYCODE_INVALID, // AKEYCODE_MUSIC
+ Common::KEYCODE_CALCULATOR, // AKEYCODE_CALCULATOR
+ Common::KEYCODE_INVALID, // AKEYCODE_ZENKAKU_HANKAKU
+ Common::KEYCODE_INVALID, // AKEYCODE_EISU
+ Common::KEYCODE_INVALID, // AKEYCODE_MUHENKAN
+ Common::KEYCODE_INVALID, // AKEYCODE_HENKAN
+ Common::KEYCODE_INVALID, // AKEYCODE_KATAKANA_HIRAGANA
+ Common::KEYCODE_INVALID, // AKEYCODE_YEN
+ Common::KEYCODE_INVALID, // AKEYCODE_RO
+ Common::KEYCODE_INVALID, // AKEYCODE_KANA
+ Common::KEYCODE_INVALID, // AKEYCODE_ASSIST
+ Common::KEYCODE_INVALID, // AKEYCODE_BRIGHTNESS_DOWN
+ Common::KEYCODE_INVALID, // AKEYCODE_BRIGHTNESS_UP
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_AUDIO_TRACK
+ Common::KEYCODE_SLEEP, // AKEYCODE_SLEEP
+ Common::KEYCODE_INVALID, // AKEYCODE_WAKEUP
+ Common::KEYCODE_INVALID, // AKEYCODE_PAIRING
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_TOP_MENU
+ Common::KEYCODE_INVALID, // AKEYCODE_11
+ Common::KEYCODE_INVALID, // AKEYCODE_12
+ Common::KEYCODE_INVALID, // AKEYCODE_LAST_CHANNEL
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_DATA_SERVICE
+ Common::KEYCODE_INVALID, // AKEYCODE_VOICE_ASSIST
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_RADIO_SERVICE
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_TELETEXT
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_NUMBER_ENTRY
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_TERRESTRIAL_ANALOG
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_TERRESTRIAL_DIGITAL
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_SATELLITE
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_SATELLITE_BS
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_SATELLITE_CS
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_SATELLITE_SERVICE
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_NETWORK
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_ANTENNA_CABLE
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_HDMI_1
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_HDMI_2
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_HDMI_3
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_HDMI_4
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_COMPOSITE_1
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_COMPOSITE_2
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_COMPONENT_1
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_COMPONENT_2
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_INPUT_VGA_1
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_AUDIO_DESCRIPTION
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_ZOOM_MODE
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_CONTENTS_MENU
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_MEDIA_CONTEXT_MENU
+ Common::KEYCODE_INVALID, // AKEYCODE_TV_TIMER_PROGRAMMING
+ Common::KEYCODE_HELP, // AKEYCODE_HELP
+ Common::KEYCODE_INVALID, // AKEYCODE_NAVIGATE_PREVIOUS
+ Common::KEYCODE_INVALID, // AKEYCODE_NAVIGATE_NEXT
+ Common::KEYCODE_INVALID, // AKEYCODE_NAVIGATE_IN
+ Common::KEYCODE_INVALID, // AKEYCODE_NAVIGATE_OUT
+ Common::KEYCODE_INVALID, // AKEYCODE_STEM_PRIMARY
+ Common::KEYCODE_INVALID, // AKEYCODE_STEM_1
+ Common::KEYCODE_INVALID, // AKEYCODE_STEM_2
+ Common::KEYCODE_INVALID, // AKEYCODE_STEM_3
+ Common::KEYCODE_INVALID, // AKEYCODE_DPAD_UP_LEFT
+ Common::KEYCODE_INVALID, // AKEYCODE_DPAD_DOWN_LEFT
+ Common::KEYCODE_INVALID, // AKEYCODE_DPAD_UP_RIGHT
+ Common::KEYCODE_INVALID, // AKEYCODE_DPAD_DOWN_RIGHT
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_SKIP_FORWARD
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_SKIP_BACKWARD
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_STEP_FORWARD
+ Common::KEYCODE_INVALID, // AKEYCODE_MEDIA_STEP_BACKWARD
+ Common::KEYCODE_INVALID, // AKEYCODE_SOFT_SLEEP
+ Common::KEYCODE_CUT, // AKEYCODE_CUT
+ Common::KEYCODE_COPY, // AKEYCODE_COPY
+ Common::KEYCODE_PASTE // AKEYCODE_PASTE
+};
+
void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
int arg4, int arg5, int arg6) {
Common::Event e;
@@ -60,10 +380,10 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
case JE_SYS_KEY:
case JE_KEY:
switch (arg1) {
- case JACTION_DOWN:
+ case AKEY_EVENT_ACTION_DOWN:
e.type = Common::EVENT_KEYDOWN;
break;
- case JACTION_UP:
+ case AKEY_EVENT_ACTION_UP:
e.type = Common::EVENT_KEYUP;
break;
default:
@@ -145,15 +465,15 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
break;
}
- if (arg4 & JMETA_SHIFT_MASK)
+ if (arg4 & AMETA_SHIFT_MASK)
e.kbd.flags |= Common::KBD_SHIFT;
// JMETA_ALT is Fn on physical keyboards!
// when mapping this to ALT - as we know it from PC keyboards - all
// Fn combos will be broken (like Fn+q, which needs to end as 1 and
// not ALT+1). Do not want.
- //if (arg4 & JMETA_ALT_MASK)
+ //if (arg4 & AMETA_ALT_MASK)
// e.kbd.flags |= Common::KBD_ALT;
- if (arg4 & (JMETA_SYM_ON | JMETA_CTRL_MASK))
+ if (arg4 & (AMETA_SYM_ON | AMETA_CTRL_MASK))
e.kbd.flags |= Common::KBD_CTRL;
pushEvent(e);
@@ -162,11 +482,11 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
case JE_DPAD:
switch (arg2) {
- case JKEYCODE_DPAD_UP:
- case JKEYCODE_DPAD_DOWN:
- case JKEYCODE_DPAD_LEFT:
- case JKEYCODE_DPAD_RIGHT:
- if (arg1 != JACTION_DOWN)
+ case AKEYCODE_DPAD_UP:
+ case AKEYCODE_DPAD_DOWN:
+ case AKEYCODE_DPAD_LEFT:
+ case AKEYCODE_DPAD_RIGHT:
+ if (arg1 != AKEY_EVENT_ACTION_DOWN)
return;
e.type = Common::EVENT_MOUSEMOVE;
@@ -177,7 +497,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
int16 *c;
int s;
- if (arg2 == JKEYCODE_DPAD_UP || arg2 == JKEYCODE_DPAD_DOWN) {
+ if (arg2 == AKEYCODE_DPAD_UP || arg2 == AKEYCODE_DPAD_DOWN) {
c = &e.mouse.y;
s = _eventScaleY;
} else {
@@ -189,7 +509,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
// TODO put these values in some option dlg?
int f = CLIP(arg5, 1, 8) * _dpad_scale * 100 / s;
- if (arg2 == JKEYCODE_DPAD_UP || arg2 == JKEYCODE_DPAD_LEFT)
+ if (arg2 == AKEYCODE_DPAD_UP || arg2 == AKEYCODE_DPAD_LEFT)
*c -= f;
else
*c += f;
@@ -199,12 +519,12 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
return;
- case JKEYCODE_DPAD_CENTER:
+ case AKEYCODE_DPAD_CENTER:
switch (arg1) {
- case JACTION_DOWN:
+ case AKEY_EVENT_ACTION_DOWN:
e.type = Common::EVENT_LBUTTONDOWN;
break;
- case JACTION_UP:
+ case AKEY_EVENT_ACTION_UP:
e.type = Common::EVENT_LBUTTONUP;
break;
default:
@@ -312,16 +632,16 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
Common::EventType dptype = Common::EVENT_INVALID;
switch (arg3) {
- case JACTION_DOWN:
+ case AMOTION_EVENT_ACTION_DOWN:
dptype = Common::EVENT_LBUTTONDOWN;
_touch_pt_dt.x = -1;
_touch_pt_dt.y = -1;
break;
- case JACTION_UP:
+ case AMOTION_EVENT_ACTION_UP:
dptype = Common::EVENT_LBUTTONUP;
break;
// held and moved
- case JACTION_MULTIPLE:
+ case AMOTION_EVENT_ACTION_MOVE:
if (_touch_pt_dt.x == -1 && _touch_pt_dt.y == -1) {
_touch_pt_dt.x = arg1;
_touch_pt_dt.y = arg2;
@@ -353,13 +673,13 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
case JE_MULTI:
switch (arg2) {
- case JACTION_POINTER_DOWN:
+ case AMOTION_EVENT_ACTION_POINTER_DOWN:
if (arg1 > _fingersDown)
_fingersDown = arg1;
return;
- case JACTION_POINTER_UP:
+ case AMOTION_EVENT_ACTION_POINTER_UP:
if (arg1 != _fingersDown)
return;
@@ -408,13 +728,13 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
e.mouse = dynamic_cast<AndroidGraphicsManager *>(_graphicsManager)->getMousePosition();
switch (arg1) {
- case JACTION_DOWN:
+ case AMOTION_EVENT_ACTION_DOWN:
e.type = Common::EVENT_LBUTTONDOWN;
break;
- case JACTION_UP:
+ case AMOTION_EVENT_ACTION_UP:
e.type = Common::EVENT_LBUTTONUP;
break;
- case JACTION_MULTIPLE:
+ case AMOTION_EVENT_ACTION_MOVE:
e.type = Common::EVENT_MOUSEMOVE;
// already multiplied by 100
@@ -532,10 +852,10 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
case JE_GAMEPAD:
switch (arg1) {
- case JACTION_DOWN:
+ case AKEY_EVENT_ACTION_DOWN:
e.type = Common::EVENT_KEYDOWN;
break;
- case JACTION_UP:
+ case AKEY_EVENT_ACTION_UP:
e.type = Common::EVENT_KEYUP;
break;
default:
@@ -544,16 +864,16 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
}
switch (arg2) {
- case JKEYCODE_BUTTON_A:
- case JKEYCODE_BUTTON_B:
+ case AKEYCODE_BUTTON_A:
+ case AKEYCODE_BUTTON_B:
switch (arg1) {
- case JACTION_DOWN:
- e.type = (arg2 == JKEYCODE_BUTTON_A?
+ case AKEY_EVENT_ACTION_DOWN:
+ e.type = (arg2 == AKEYCODE_BUTTON_A?
Common::EVENT_LBUTTONDOWN :
Common::EVENT_RBUTTONDOWN);
break;
- case JACTION_UP:
- e.type = (arg2 == JKEYCODE_BUTTON_A?
+ case AKEY_EVENT_ACTION_UP:
+ e.type = (arg2 == AKEYCODE_BUTTON_A?
Common::EVENT_LBUTTONUP :
Common::EVENT_RBUTTONUP);
break;
@@ -563,12 +883,12 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
break;
- case JKEYCODE_BUTTON_X:
+ case AKEYCODE_BUTTON_X:
e.kbd.keycode = Common::KEYCODE_ESCAPE;
e.kbd.ascii = Common::ASCII_ESCAPE;
break;
- case JKEYCODE_BUTTON_Y:
+ case AKEYCODE_BUTTON_Y:
e.type = Common::EVENT_MAINMENU;
break;
@@ -585,7 +905,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
e.mouse = dynamic_cast<AndroidGraphicsManager *>(_graphicsManager)->getMousePosition();
switch (arg1) {
- case JACTION_MULTIPLE:
+ case AMOTION_EVENT_ACTION_MOVE:
e.type = Common::EVENT_MOUSEMOVE;
// already multiplied by 100
diff --git a/backends/platform/android/events.h b/backends/platform/android/events.h
deleted file mode 100644
index 61bb209b5c..0000000000
--- a/backends/platform/android/events.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ANDROID_EVENTS_H
-#define ANDROID_EVENTS_H
-
-#include "common/events.h"
-
-// $ANDROID_NDK/platforms/android-9/arch-arm/usr/include/android/keycodes.h
-// http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob;f=libs/ui/Input.cpp
-// http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob;f=core/java/android/view/KeyEvent.java
-// https://static.javadoc.io/io.appium/java-client/5.0.4/constant-values.html#io.appium.java_client.android.AndroidKeyCode.FLAG_SOFT_KEYBOARD
-
-// event type
-enum {
- JE_SYS_KEY = 0,
- JE_KEY = 1,
- JE_DPAD = 2,
- JE_DOWN = 3,
- JE_SCROLL = 4,
- JE_TAP = 5,
- JE_DOUBLE_TAP = 6,
- JE_MULTI = 7,
- JE_BALL = 8,
- JE_LMB_DOWN = 9,
- JE_LMB_UP = 10,
- JE_RMB_DOWN = 11,
- JE_RMB_UP = 12,
- JE_MOUSE_MOVE = 13,
- JE_GAMEPAD = 14,
- JE_JOYSTICK = 15,
- JE_MMB_DOWN = 16,
- JE_MMB_UP = 17,
- JE_BMB_DOWN = 18,
- JE_BMB_UP = 19,
- JE_FMB_DOWN = 20,
- JE_FMB_UP = 21,
- JE_QUIT = 0x1000
-};
-
-// action type
-enum {
- JACTION_DOWN = 0,
- JACTION_UP = 1,
- JACTION_MULTIPLE = 2,
- JACTION_POINTER_DOWN = 5,
- JACTION_POINTER_UP = 6
-};
-
-// five-way navigation control
-enum {
- JKEYCODE_DPAD_UP = 19,
- JKEYCODE_DPAD_DOWN = 20,
- JKEYCODE_DPAD_LEFT = 21,
- JKEYCODE_DPAD_RIGHT = 22,
- JKEYCODE_DPAD_CENTER = 23
-};
-
-// gamepad
-enum {
- JKEYCODE_BUTTON_A = 96,
- JKEYCODE_BUTTON_B = 97,
- JKEYCODE_BUTTON_C = 98,
- JKEYCODE_BUTTON_X = 99,
- JKEYCODE_BUTTON_Y = 100,
- JKEYCODE_BUTTON_Z = 101,
- JKEYCODE_BUTTON_L1 = 102,
- JKEYCODE_BUTTON_R1 = 103,
- JKEYCODE_BUTTON_L2 = 104,
- JKEYCODE_BUTTON_R2 = 105,
- JKEYCODE_BUTTON_THUMBL = 106,
- JKEYCODE_BUTTON_THUMBR = 107,
- JKEYCODE_BUTTON_START = 108,
- JKEYCODE_BUTTON_SELECT = 109,
- JKEYCODE_BUTTON_MODE = 110,
-};
-
-// meta modifier
-enum {
- JMETA_SHIFT_ON = 0x01,
- JMETA_ALT_ON = 0x02,
- JMETA_SYM_ON = 0x04,
- JMETA_FUNCTION_ON = 0x08,
- JMETA_ALT_LEFT_ON = 0x10,
- JMETA_ALT_RIGHT_ON = 0x20,
- JMETA_SHIFT_LEFT_ON = 0x40,
- JMETA_SHIFT_RIGHT_ON = 0x80,
- JMETA_CTRL_ON = 0x1000,
- JMETA_CTRL_LEFT_ON = 0x2000,
- JMETA_CTRL_RIGHT_ON = 0x4000,
- JMETA_META_ON = 0x10000,
- JMETA_META_LEFT_ON = 0x20000,
- JMETA_META_RIGHT_ON = 0x40000,
- JMETA_CAPS_LOCK_ON = 0x100000,
- JMETA_NUM_LOCK_ON = 0x200000,
- JMETA_SCROLL_LOCK_ON = 0x400000,
-
- JMETA_CTRL_MASK = JMETA_CTRL_ON | JMETA_CTRL_LEFT_ON | JMETA_CTRL_RIGHT_ON,
- JMETA_META_MASK = JMETA_META_ON | JMETA_META_LEFT_ON | JMETA_META_RIGHT_ON,
- JMETA_SHIFT_MASK = JMETA_SHIFT_ON | JMETA_SHIFT_LEFT_ON | JMETA_SHIFT_RIGHT_ON,
- JMETA_ALT_MASK = JMETA_ALT_ON | JMETA_ALT_LEFT_ON | JMETA_ALT_RIGHT_ON
-};
-
-// map android key codes to our kbd codes
-static const Common::KeyCode jkeymap[] = {
- Common::KEYCODE_INVALID, // KEYCODE_UNKNOWN
- Common::KEYCODE_LEFTSOFT, // KEYCODE_SOFT_LEFT
- Common::KEYCODE_RIGHTSOFT, // KEYCODE_SOFT_RIGHT
- Common::KEYCODE_AC_HOME, // KEYCODE_HOME
- Common::KEYCODE_AC_BACK, // KEYCODE_BACK
- Common::KEYCODE_CALL, // KEYCODE_CALL
- Common::KEYCODE_HANGUP, // KEYCODE_ENDCALL
- Common::KEYCODE_0, // KEYCODE_0
- Common::KEYCODE_1, // KEYCODE_1
- Common::KEYCODE_2, // KEYCODE_2
- Common::KEYCODE_3, // KEYCODE_3
- Common::KEYCODE_4, // KEYCODE_4
- Common::KEYCODE_5, // KEYCODE_5
- Common::KEYCODE_6, // KEYCODE_6
- Common::KEYCODE_7, // KEYCODE_7
- Common::KEYCODE_8, // KEYCODE_8
- Common::KEYCODE_9, // KEYCODE_9
- Common::KEYCODE_ASTERISK, // KEYCODE_STAR
- Common::KEYCODE_HASH, // KEYCODE_POUND
- Common::KEYCODE_UP, // KEYCODE_DPAD_UP
- Common::KEYCODE_DOWN, // KEYCODE_DPAD_DOWN
- Common::KEYCODE_LEFT, // KEYCODE_DPAD_LEFT
- Common::KEYCODE_RIGHT, // KEYCODE_DPAD_RIGHT
- Common::KEYCODE_SELECT, // KEYCODE_DPAD_CENTER
- Common::KEYCODE_VOLUMEUP, // KEYCODE_VOLUME_UP
- Common::KEYCODE_VOLUMEDOWN, // KEYCODE_VOLUME_DOWN
- Common::KEYCODE_POWER, // KEYCODE_POWER
- Common::KEYCODE_CAMERA, // KEYCODE_CAMERA
- Common::KEYCODE_CLEAR, // KEYCODE_CLEAR
- Common::KEYCODE_a, // KEYCODE_A
- Common::KEYCODE_b, // KEYCODE_B
- Common::KEYCODE_c, // KEYCODE_C
- Common::KEYCODE_d, // KEYCODE_D
- Common::KEYCODE_e, // KEYCODE_E
- Common::KEYCODE_f, // KEYCODE_F
- Common::KEYCODE_g, // KEYCODE_G
- Common::KEYCODE_h, // KEYCODE_H
- Common::KEYCODE_i, // KEYCODE_I
- Common::KEYCODE_j, // KEYCODE_J
- Common::KEYCODE_k, // KEYCODE_K
- Common::KEYCODE_l, // KEYCODE_L
- Common::KEYCODE_m, // KEYCODE_M
- Common::KEYCODE_n, // KEYCODE_N
- Common::KEYCODE_o, // KEYCODE_O
- Common::KEYCODE_p, // KEYCODE_P
- Common::KEYCODE_q, // KEYCODE_Q
- Common::KEYCODE_r, // KEYCODE_R
- Common::KEYCODE_s, // KEYCODE_S
- Common::KEYCODE_t, // KEYCODE_T
- Common::KEYCODE_u, // KEYCODE_U
- Common::KEYCODE_v, // KEYCODE_V
- Common::KEYCODE_w, // KEYCODE_W
- Common::KEYCODE_x, // KEYCODE_X
- Common::KEYCODE_y, // KEYCODE_Y
- Common::KEYCODE_z, // KEYCODE_Z
- Common::KEYCODE_COMMA, // KEYCODE_COMMA
- Common::KEYCODE_PERIOD, // KEYCODE_PERIOD
- Common::KEYCODE_LALT, // KEYCODE_ALT_LEFT
- Common::KEYCODE_RALT, // KEYCODE_ALT_RIGHT
- Common::KEYCODE_LSHIFT, // KEYCODE_SHIFT_LEFT
- Common::KEYCODE_RSHIFT, // KEYCODE_SHIFT_RIGHT
- Common::KEYCODE_TAB, // KEYCODE_TAB
- Common::KEYCODE_SPACE, // KEYCODE_SPACE
- Common::KEYCODE_LCTRL, // KEYCODE_SYM
- Common::KEYCODE_WWW, // KEYCODE_EXPLORER
- Common::KEYCODE_MAIL, // KEYCODE_ENVELOPE
- Common::KEYCODE_RETURN, // KEYCODE_ENTER
- Common::KEYCODE_BACKSPACE, // KEYCODE_DEL
- Common::KEYCODE_BACKQUOTE, // KEYCODE_GRAVE
- Common::KEYCODE_MINUS, // KEYCODE_MINUS
- Common::KEYCODE_EQUALS, // KEYCODE_EQUALS
- Common::KEYCODE_LEFTPAREN, // KEYCODE_LEFT_BRACKET
- Common::KEYCODE_RIGHTPAREN, // KEYCODE_RIGHT_BRACKET
- Common::KEYCODE_BACKSLASH, // KEYCODE_BACKSLASH
- Common::KEYCODE_SEMICOLON, // KEYCODE_SEMICOLON
- Common::KEYCODE_QUOTE, // KEYCODE_APOSTROPHE
- Common::KEYCODE_SLASH, // KEYCODE_SLASH
- Common::KEYCODE_AT, // KEYCODE_AT
- Common::KEYCODE_INVALID, // KEYCODE_NUM
- Common::KEYCODE_INVALID, // KEYCODE_HEADSETHOOK
- Common::KEYCODE_INVALID, // KEYCODE_FOCUS
- Common::KEYCODE_PLUS, // KEYCODE_PLUS
- Common::KEYCODE_MENU, // KEYCODE_MENU
- Common::KEYCODE_INVALID, // KEYCODE_NOTIFICATION
- Common::KEYCODE_AC_SEARCH, // KEYCODE_SEARCH
- Common::KEYCODE_AUDIOPLAYPAUSE, // KEYCODE_MEDIA_PLAY_PAUSE
- Common::KEYCODE_AUDIOSTOP, // KEYCODE_MEDIA_STOP
- Common::KEYCODE_AUDIONEXT, // KEYCODE_MEDIA_NEXT
- Common::KEYCODE_AUDIOPREV, // KEYCODE_MEDIA_PREVIOUS
- Common::KEYCODE_AUDIOREWIND, // KEYCODE_MEDIA_REWIND
- Common::KEYCODE_AUDIOFASTFORWARD, // KEYCODE_MEDIA_FAST_FORWARD
- Common::KEYCODE_MUTE, // KEYCODE_MUTE
- Common::KEYCODE_PAGEUP, // KEYCODE_PAGE_UP
- Common::KEYCODE_PAGEDOWN, // KEYCODE_PAGE_DOWN
- Common::KEYCODE_INVALID, // KEYCODE_PICTSYMBOLS
- Common::KEYCODE_INVALID, // KEYCODE_SWITCH_CHARSET
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_A
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_B
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_C
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_X
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_Y
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_Z
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_L1
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_R1
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_L2
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_R2
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_THUMBL
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_THUMBR
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_START
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_SELECT
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_MODE
- Common::KEYCODE_ESCAPE, // KEYCODE_ESCAPE
- Common::KEYCODE_DELETE, // KEYCODE_FORWARD_DEL
- Common::KEYCODE_LCTRL, // KEYCODE_CTRL_LEFT
- Common::KEYCODE_RCTRL, // KEYCODE_CTRL_RIGHT
- Common::KEYCODE_CAPSLOCK, // KEYCODE_CAPS_LOCK
- Common::KEYCODE_SCROLLOCK, // KEYCODE_SCROLL_LOCK
- Common::KEYCODE_LSUPER, // KEYCODE_META_LEFT
- Common::KEYCODE_RSUPER, // KEYCODE_META_RIGHT
- Common::KEYCODE_INVALID, // KEYCODE_FUNCTION
- Common::KEYCODE_SYSREQ, // KEYCODE_SYSRQ
- Common::KEYCODE_BREAK, // KEYCODE_BREAK
- Common::KEYCODE_HOME, // KEYCODE_MOVE_HOME
- Common::KEYCODE_END, // KEYCODE_MOVE_END
- Common::KEYCODE_INSERT, // KEYCODE_INSERT
- Common::KEYCODE_AC_FORWARD, // KEYCODE_FORWARD
- Common::KEYCODE_AUDIOPLAY, // KEYCODE_MEDIA_PLAY
- Common::KEYCODE_AUDIOPAUSE, // KEYCODE_MEDIA_PAUSE
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_CLOSE
- Common::KEYCODE_EJECT, // KEYCODE_MEDIA_EJECT
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_RECORD
- Common::KEYCODE_F1, // KEYCODE_F1
- Common::KEYCODE_F2, // KEYCODE_F2
- Common::KEYCODE_F3, // KEYCODE_F3
- Common::KEYCODE_F4, // KEYCODE_F4
- Common::KEYCODE_F5, // KEYCODE_F5
- Common::KEYCODE_F6, // KEYCODE_F6
- Common::KEYCODE_F7, // KEYCODE_F7
- Common::KEYCODE_F8, // KEYCODE_F8
- Common::KEYCODE_F9, // KEYCODE_F9
- Common::KEYCODE_F10, // KEYCODE_F10
- Common::KEYCODE_F11, // KEYCODE_F11
- Common::KEYCODE_F12, // KEYCODE_F12
- Common::KEYCODE_NUMLOCK, // KEYCODE_NUM_LOCK
- Common::KEYCODE_KP0, // KEYCODE_NUMPAD_0
- Common::KEYCODE_KP1, // KEYCODE_NUMPAD_1
- Common::KEYCODE_KP2, // KEYCODE_NUMPAD_2
- Common::KEYCODE_KP3, // KEYCODE_NUMPAD_3
- Common::KEYCODE_KP4, // KEYCODE_NUMPAD_4
- Common::KEYCODE_KP5, // KEYCODE_NUMPAD_5
- Common::KEYCODE_KP6, // KEYCODE_NUMPAD_6
- Common::KEYCODE_KP7, // KEYCODE_NUMPAD_7
- Common::KEYCODE_KP8, // KEYCODE_NUMPAD_8
- Common::KEYCODE_KP9, // KEYCODE_NUMPAD_9
- Common::KEYCODE_KP_DIVIDE, // KEYCODE_NUMPAD_DIVIDE
- Common::KEYCODE_KP_MULTIPLY, // KEYCODE_NUMPAD_MULTIPLY
- Common::KEYCODE_KP_MINUS, // KEYCODE_NUMPAD_SUBTRACT
- Common::KEYCODE_KP_PLUS, // KEYCODE_NUMPAD_ADD
- Common::KEYCODE_KP_PERIOD, // KEYCODE_NUMPAD_DOT
- Common::KEYCODE_INVALID, // KEYCODE_NUMPAD_COMMA
- Common::KEYCODE_KP_ENTER, // KEYCODE_NUMPAD_ENTER
- Common::KEYCODE_KP_EQUALS, // KEYCODE_NUMPAD_EQUALS
- Common::KEYCODE_INVALID, // KEYCODE_NUMPAD_LEFT_PAREN
- Common::KEYCODE_INVALID, // KEYCODE_NUMPAD_RIGHT_PAREN
- Common::KEYCODE_INVALID, // KEYCODE_VOLUME_MUTE
- Common::KEYCODE_INVALID, // KEYCODE_INFO
- Common::KEYCODE_INVALID, // KEYCODE_CHANNEL_UP
- Common::KEYCODE_INVALID, // KEYCODE_CHANNEL_DOWN
- Common::KEYCODE_INVALID, // KEYCODE_ZOOM_IN
- Common::KEYCODE_INVALID, // KEYCODE_ZOOM_OUT
- Common::KEYCODE_INVALID, // KEYCODE_TV
- Common::KEYCODE_INVALID, // KEYCODE_WINDOW
- Common::KEYCODE_INVALID, // KEYCODE_GUIDE
- Common::KEYCODE_INVALID, // KEYCODE_DVR
- Common::KEYCODE_AC_BOOKMARKS, // KEYCODE_BOOKMARK
- Common::KEYCODE_INVALID, // KEYCODE_CAPTIONS
- Common::KEYCODE_INVALID, // KEYCODE_SETTINGS
- Common::KEYCODE_INVALID, // KEYCODE_TV_POWER
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT
- Common::KEYCODE_INVALID, // KEYCODE_STB_POWER
- Common::KEYCODE_INVALID, // KEYCODE_STB_INPUT
- Common::KEYCODE_INVALID, // KEYCODE_AVR_POWER
- Common::KEYCODE_INVALID, // KEYCODE_AVR_INPUT
- Common::KEYCODE_INVALID, // KEYCODE_PROG_RED
- Common::KEYCODE_INVALID, // KEYCODE_PROG_GREEN
- Common::KEYCODE_INVALID, // KEYCODE_PROG_YELLOW
- Common::KEYCODE_INVALID, // KEYCODE_PROG_BLUE
- Common::KEYCODE_INVALID, // KEYCODE_APP_SWITCH
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_1
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_2
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_3
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_4
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_5
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_6
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_7
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_8
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_9
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_10
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_11
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_12
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_13
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_14
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_15
- Common::KEYCODE_INVALID, // KEYCODE_BUTTON_16
- Common::KEYCODE_INVALID, // KEYCODE_LANGUAGE_SWITCH
- Common::KEYCODE_INVALID, // KEYCODE_MANNER_MODE
- Common::KEYCODE_INVALID, // KEYCODE_3D_MODE
- Common::KEYCODE_INVALID, // KEYCODE_CONTACTS
- Common::KEYCODE_INVALID, // KEYCODE_CALENDAR
- Common::KEYCODE_INVALID, // KEYCODE_MUSIC
- Common::KEYCODE_CALCULATOR, // KEYCODE_CALCULATOR
- Common::KEYCODE_INVALID, // KEYCODE_ZENKAKU_HANKAKU
- Common::KEYCODE_INVALID, // KEYCODE_EISU
- Common::KEYCODE_INVALID, // KEYCODE_MUHENKAN
- Common::KEYCODE_INVALID, // KEYCODE_HENKAN
- Common::KEYCODE_INVALID, // KEYCODE_KATAKANA_HIRAGANA
- Common::KEYCODE_INVALID, // KEYCODE_YEN
- Common::KEYCODE_INVALID, // KEYCODE_RO
- Common::KEYCODE_INVALID, // KEYCODE_KANA
- Common::KEYCODE_INVALID, // KEYCODE_ASSIST
- Common::KEYCODE_INVALID, // KEYCODE_BRIGHTNESS_DOWN
- Common::KEYCODE_INVALID, // KEYCODE_BRIGHTNESS_UP
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_AUDIO_TRACK
- Common::KEYCODE_SLEEP, // KEYCODE_SLEEP
- Common::KEYCODE_INVALID, // KEYCODE_WAKEUP
- Common::KEYCODE_INVALID, // KEYCODE_PAIRING
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_TOP_MENU
- Common::KEYCODE_INVALID, // KEYCODE_11
- Common::KEYCODE_INVALID, // KEYCODE_12
- Common::KEYCODE_INVALID, // KEYCODE_LAST_CHANNEL
- Common::KEYCODE_INVALID, // KEYCODE_TV_DATA_SERVICE
- Common::KEYCODE_INVALID, // KEYCODE_VOICE_ASSIST
- Common::KEYCODE_INVALID, // KEYCODE_TV_RADIO_SERVICE
- Common::KEYCODE_INVALID, // KEYCODE_TV_TELETEXT
- Common::KEYCODE_INVALID, // KEYCODE_TV_NUMBER_ENTRY
- Common::KEYCODE_INVALID, // KEYCODE_TV_TERRESTRIAL_ANALOG
- Common::KEYCODE_INVALID, // KEYCODE_TV_TERRESTRIAL_DIGITAL
- Common::KEYCODE_INVALID, // KEYCODE_TV_SATELLITE
- Common::KEYCODE_INVALID, // KEYCODE_TV_SATELLITE_BS
- Common::KEYCODE_INVALID, // KEYCODE_TV_SATELLITE_CS
- Common::KEYCODE_INVALID, // KEYCODE_TV_SATELLITE_SERVICE
- Common::KEYCODE_INVALID, // KEYCODE_TV_NETWORK
- Common::KEYCODE_INVALID, // KEYCODE_TV_ANTENNA_CABLE
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_HDMI_1
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_HDMI_2
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_HDMI_3
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_HDMI_4
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_COMPOSITE_1
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_COMPOSITE_2
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_COMPONENT_1
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_COMPONENT_2
- Common::KEYCODE_INVALID, // KEYCODE_TV_INPUT_VGA_1
- Common::KEYCODE_INVALID, // KEYCODE_TV_AUDIO_DESCRIPTION
- Common::KEYCODE_INVALID, // KEYCODE_TV_AUDIO_DESCRIPTION_MIX_UP
- Common::KEYCODE_INVALID, // KEYCODE_TV_AUDIO_DESCRIPTION_MIX_DOWN
- Common::KEYCODE_INVALID, // KEYCODE_TV_ZOOM_MODE
- Common::KEYCODE_INVALID, // KEYCODE_TV_CONTENTS_MENU
- Common::KEYCODE_INVALID, // KEYCODE_TV_MEDIA_CONTEXT_MENU
- Common::KEYCODE_INVALID, // KEYCODE_TV_TIMER_PROGRAMMING
- Common::KEYCODE_HELP, // KEYCODE_HELP
- Common::KEYCODE_INVALID, // KEYCODE_NAVIGATE_PREVIOUS
- Common::KEYCODE_INVALID, // KEYCODE_NAVIGATE_NEXT
- Common::KEYCODE_INVALID, // KEYCODE_NAVIGATE_IN
- Common::KEYCODE_INVALID, // KEYCODE_NAVIGATE_OUT
- Common::KEYCODE_INVALID, // KEYCODE_STEM_PRIMARY
- Common::KEYCODE_INVALID, // KEYCODE_STEM_1
- Common::KEYCODE_INVALID, // KEYCODE_STEM_2
- Common::KEYCODE_INVALID, // KEYCODE_STEM_3
- Common::KEYCODE_INVALID, // KEYCODE_DPAD_UP_LEFT
- Common::KEYCODE_INVALID, // KEYCODE_DPAD_DOWN_LEFT
- Common::KEYCODE_INVALID, // KEYCODE_DPAD_UP_RIGHT
- Common::KEYCODE_INVALID, // KEYCODE_DPAD_DOWN_RIGHT
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_SKIP_FORWARD
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_SKIP_BACKWARD
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_STEP_FORWARD
- Common::KEYCODE_INVALID, // KEYCODE_MEDIA_STEP_BACKWARD
- Common::KEYCODE_INVALID, // KEYCODE_SOFT_SLEEP
- Common::KEYCODE_CUT, // KEYCODE_CUT
- Common::KEYCODE_COPY, // KEYCODE_COPY
- Common::KEYCODE_PASTE // KEYCODE_PASTE
-};
-
-#endif
More information about the Scummvm-git-logs
mailing list