ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting: Implement input sequence numbers

This commit is contained in:
Vicki Pfau 2023-01-02 01:30:04 -08:00
parent e5ed2b4119
commit 47bf00da5e
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/input.c
View File

@ -28,6 +28,7 @@ static const struct mScriptType* eventTypes[mSCRIPT_EV_TYPE_MAX] = {
}; };
struct mScriptInputContext { struct mScriptInputContext {
uint64_t seq;
struct Table activeKeys; struct Table activeKeys;
}; };
@ -40,6 +41,7 @@ mSCRIPT_DECLARE_STRUCT_C_METHOD(mScriptInputContext, BOOL, isKeyActive, _mScript
mSCRIPT_DEFINE_STRUCT(mScriptInputContext) mSCRIPT_DEFINE_STRUCT(mScriptInputContext)
mSCRIPT_DEFINE_STRUCT_DEINIT(mScriptInputContext) mSCRIPT_DEFINE_STRUCT_DEINIT(mScriptInputContext)
mSCRIPT_DEFINE_STRUCT_MEMBER(mScriptInputContext, U64, seq)
mSCRIPT_DEFINE_STRUCT_METHOD(mScriptInputContext, isKeyActive) mSCRIPT_DEFINE_STRUCT_METHOD(mScriptInputContext, isKeyActive)
mSCRIPT_DEFINE_END; mSCRIPT_DEFINE_END;
@ -96,6 +98,7 @@ void mScriptContextAttachInput(struct mScriptContext* context) {
value->flags = mSCRIPT_VALUE_FLAG_FREE_BUFFER; value->flags = mSCRIPT_VALUE_FLAG_FREE_BUFFER;
value->value.opaque = inputContext; value->value.opaque = inputContext;
inputContext->seq = 0;
TableInit(&inputContext->activeKeys, 0, NULL); TableInit(&inputContext->activeKeys, 0, NULL);
mScriptContextSetGlobal(context, "input", value); mScriptContextSetGlobal(context, "input", value);
@ -227,6 +230,12 @@ static bool _updateKeys(struct mScriptContext* context, struct mScriptKeyEvent*
} }
void mScriptContextFireEvent(struct mScriptContext* context, struct mScriptEvent* event) { void mScriptContextFireEvent(struct mScriptContext* context, struct mScriptEvent* event) {
struct mScriptValue* input = mScriptContextGetGlobal(context, "input");
if (!input) {
return;
}
struct mScriptInputContext* inputContext = input->value.opaque;
switch (event->type) { switch (event->type) {
case mSCRIPT_EV_TYPE_KEY: case mSCRIPT_EV_TYPE_KEY:
if (!_updateKeys(context, (struct mScriptKeyEvent*) event)) { if (!_updateKeys(context, (struct mScriptKeyEvent*) event)) {
@ -244,6 +253,8 @@ void mScriptContextFireEvent(struct mScriptContext* context, struct mScriptEvent
value->refs = mSCRIPT_VALUE_UNREF; value->refs = mSCRIPT_VALUE_UNREF;
value->flags = 0; value->flags = 0;
value->value.opaque = event; value->value.opaque = event;
event->seq = inputContext->seq;
++inputContext->seq;
mScriptContextTriggerCallback(context, eventNames[event->type], &args); mScriptContextTriggerCallback(context, eventNames[event->type], &args);
mScriptListDeinit(&args); mScriptListDeinit(&args);
} }

30
src/script/test/input.c
View File

@ -37,10 +37,39 @@ M_TEST_DEFINE(members) {
SETUP_LUA; SETUP_LUA;
TEST_PROGRAM("assert(input)"); TEST_PROGRAM("assert(input)");
TEST_PROGRAM("assert(input.seq == 0)");
TEST_PROGRAM("assert(input.isKeyActive)"); TEST_PROGRAM("assert(input.isKeyActive)");
mScriptContextDeinit(&context); mScriptContextDeinit(&context);
} }
M_TEST_DEFINE(seq) {
SETUP_LUA;
TEST_PROGRAM("assert(input.seq == 0)");
TEST_PROGRAM(
"seq = nil\n"
"function cb(ev)\n"
" seq = ev.seq\n"
"end\n"
"id = callbacks:add('key', cb)\n"
);
struct mScriptKeyEvent keyEvent = {
.d = { .type = mSCRIPT_EV_TYPE_KEY },
.state = mSCRIPT_INPUT_STATE_DOWN,
};
mScriptContextFireEvent(&context, &keyEvent.d);
TEST_PROGRAM("assert(input.seq == 1)");
TEST_PROGRAM("assert(seq == 0)");
mScriptContextFireEvent(&context, &keyEvent.d);
TEST_PROGRAM("assert(input.seq == 2)");
TEST_PROGRAM("assert(seq == 1)");
mScriptContextDeinit(&context);
}
M_TEST_DEFINE(fireKey) { M_TEST_DEFINE(fireKey) {
SETUP_LUA; SETUP_LUA;
@ -82,5 +111,6 @@ M_TEST_DEFINE(fireKey) {
M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(mScriptInput, M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(mScriptInput,
cmocka_unit_test(members), cmocka_unit_test(members),
cmocka_unit_test(seq),
cmocka_unit_test(fireKey), cmocka_unit_test(fireKey),
) )