thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Support FireTV remote

Browse source
This commit is contained in:
Antoniou Athanasios 2023-03-19 21:32:14 +02:00 • committed by antoniou79
parent 528d7477e8
commit 16f626401e
5 changed files with 133 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

90
backends/platform/android/events.cpp
View file

@ -76,6 +76,7 @@ enum {
JE_BMB_UP = 19,
JE_FMB_DOWN = 20,
JE_FMB_UP = 21,
JE_TV_REMOTE = 22,
JE_QUIT = 0x1000,
JE_MENU = 0x1001
};
@ -551,6 +552,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
case AKEYCODE_DPAD_LEFT:
// fall through
case AKEYCODE_DPAD_RIGHT:
// Treat as mouse movement
if (arg1 != AKEY_EVENT_ACTION_DOWN)
return;
@ -586,6 +588,7 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
return;
case AKEYCODE_DPAD_CENTER:
// Treat as mouse click (left click)
switch (arg1) {
case AKEY_EVENT_ACTION_DOWN:
e.type = Common::EVENT_LBUTTONDOWN;
@ -607,6 +610,73 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
return;
}
case JE_TV_REMOTE:
switch (arg1) {
case AKEY_EVENT_ACTION_DOWN:
e.type = Common::EVENT_KEYDOWN;
break;
case AKEY_EVENT_ACTION_UP:
e.type = Common::EVENT_KEYUP;
break;
default:
LOGE("unhandled jaction on key: %d", arg1);
return;
}
switch (arg2) {
case AKEYCODE_MEDIA_FAST_FORWARD:
// fall through
case AKEYCODE_MEDIA_REWIND:
// fall through
case AKEYCODE_MEDIA_PLAY_PAUSE:
// Treat as keyboard presses, since they have equivalent hardware keyboard keys
e.kbd.keycode = jkeymap[arg2];
if (arg5 > 0) {
e.kbdRepeat = true;
}
break;
// Unfortunately CHANNEL_UP or CHANNEL_DOWN do not trigger for the FireStick remote (3rd gen)
// despite the documentation (https://developer.amazon.com/docs/fire-tv/remote-input.html)
// so there's no way as of yet to test this. Also, using Channel up/down as mouse up/down
// is not very useful anyway
// case AKEYCODE_CHANNEL_UP:
// // fall through
// case AKEYCODE_CHANNEL_DOWN:
// // Treat as mouse movement - only on Y axis
// if (arg1 != AKEY_EVENT_ACTION_DOWN)
// return;
//
// e.type = Common::EVENT_MOUSEMOVE;
//
// e.mouse = dynamic_cast<AndroidCommonGraphics *>(_graphicsManager)->getMousePosition();
//
// {
// int16 *c;
// int s;
//
// c = &e.mouse.y;
// s = _eventScaleY;
//
// // the longer the button held, the faster the pointer is
// // TODO put these values in some option dlg?
// int f = CLIP(arg5, 1, 8) * _dpad_scale * 100 / s;
//
// if (arg2 == AKEYCODE_CHANNEL_UP) {
// *c -= f;
// } else {
// *c += f;
// }
// }
// break;
}
pushEvent(e);
return;
case JE_DOWN:
// LOGD("JE_DOWN");
_touch_pt_down = dynamic_cast<AndroidCommonGraphics *>(_graphicsManager)->getMousePosition();
@ -1161,6 +1231,26 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
e.joystick.button = Common::JOYSTICK_BUTTON_RIGHT_STICK;
break;
case AKEYCODE_DPAD_UP:
e.joystick.button = Common::JOYSTICK_BUTTON_DPAD_UP;
break;
case AKEYCODE_DPAD_DOWN:
e.joystick.button = Common::JOYSTICK_BUTTON_DPAD_DOWN;
break;
case AKEYCODE_DPAD_LEFT:
e.joystick.button = Common::JOYSTICK_BUTTON_DPAD_LEFT;
break;
case AKEYCODE_DPAD_RIGHT:
e.joystick.button = Common::JOYSTICK_BUTTON_DPAD_RIGHT;
break;
case AKEYCODE_DPAD_CENTER:
e.joystick.button = Common::JOYSTICK_BUTTON_DPAD_CENTER;
break;
default:
LOGW("unmapped gamepad key: %d", arg2);
return;