Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

keyremap plugin use yes_no prompts, bugfix

Browse source 
use the supplied yes_no dialogs for file delete, key reset, save prompt

return to root menu automatically after loading a file

fix bug where deleting the last file in the list exited the menu

Change-Id: Ib98f6b200b9dee3e4350ad4d7ef80bbb95c77481
This commit is contained in:
William Wilgus 2022-02-24 00:26:40 -05:00
parent 295ec3790d
commit bba0564ec1
1 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apps/plugins/keyremap.c
View file

@ -130,7 +130,7 @@ MENU_ITEM(M_LOADKEYS, "Load Keymaps", 1),
MENU_ITEM(M_DELKEYS, "Delete Keymaps", 1), MENU_ITEM(M_DELKEYS, "Delete Keymaps", 1),
MENU_ITEM(M_TMPCORE, "Temp Core Remap", 1), MENU_ITEM(M_TMPCORE, "Temp Core Remap", 1),
MENU_ITEM(M_SETCORE, "Set Core Remap", 1), MENU_ITEM(M_SETCORE, "Set Core Remap", 1),
MENU_ITEM(M_DELCORE, "Delete Core Remap", 1), MENU_ITEM(M_DELCORE, "Remove Core Remap", 1),
MENU_ITEM(M_EXIT, ID2P(LANG_MENU_QUIT), 0), MENU_ITEM(M_EXIT, ID2P(LANG_MENU_QUIT), 0),
MENU_ITEM(M_ACTIONS, "Actions", LAST_ACTION_PLACEHOLDER), MENU_ITEM(M_ACTIONS, "Actions", LAST_ACTION_PLACEHOLDER),
MENU_ITEM(M_BUTTONS, "Buttons", -1), /* Set at runtime in plugin_start: */ MENU_ITEM(M_BUTTONS, "Buttons", -1), /* Set at runtime in plugin_start: */
@ -578,6 +578,8 @@ static int keyremap_load_file(const char *filename)
if (offset == 0 || entries <= 0) if (offset == 0 || entries <= 0)
{ {
logf("keyremap: error reading offset"); logf("keyremap: error reading offset");
count = -15;
goto fail;
} }
logf("keyremap found context: %d file offset: %d entries: %d", logf("keyremap found context: %d file offset: %d entries: %d",
context, offset, entries); context, offset, entries);
@ -591,18 +593,18 @@ static int keyremap_load_file(const char *filename)
bytes = rb->read(fd, &entry, sizeof(struct button_mapping)); bytes = rb->read(fd, &entry, sizeof(struct button_mapping));
if (bytes == sizeof(struct button_mapping)) if (bytes == sizeof(struct button_mapping))
{ {
int action = entry.action_code; int act = entry.action_code;
int button = entry.button_code; int button = entry.button_code;
int prebtn = entry.pre_button_code; int prebtn = entry.pre_button_code;
if (action == (int)CONTEXT_STOPSEARCHING || button == BUTTON_NONE) if (act == (int)CONTEXT_STOPSEARCHING || button == BUTTON_NONE)
{ {
logf("keyremap: entry invalid"); logf("keyremap: entry invalid");
goto fail; goto fail;
} }
logf("keyremap: found ctx: %d, act: %d btn: %d pbtn: %d", logf("keyremap: found ctx: %d, act: %d btn: %d pbtn: %d",
context, action, button, prebtn); context, act, button, prebtn);
keymap_add_button_entry(context, action, button, prebtn); keymap_add_button_entry(context, act, button, prebtn);
} }
else else
goto fail; goto fail;
@ -958,13 +960,7 @@ int menu_action_root(int *action, int selected_item, bool* exit, struct gui_sync
} }
else if (cur->menuid == MENU_ID(M_RESETKEYS)) else if (cur->menuid == MENU_ID(M_RESETKEYS))
{ {
rb->splashf(HZ / 2, "Delete Current?"); if (rb->yesno_pop("Delete Current Entries?") == true)
int usract = ACTION_NONE;
while (usract <= ACTION_UNKNOWN)
{
usract = rb->get_action(CONTEXT_STD, HZ / 10);
}
if (usract == ACTION_STD_OK)
{ {
keyremap_reset_buffer(); keyremap_reset_buffer();
} }
@ -1051,9 +1047,9 @@ int menu_action_setkeys(int *action, int selected_item, bool* exit, struct gui_s
if (ctx_data.act_map[i].display_pos == selected_item - 1) if (ctx_data.act_map[i].display_pos == selected_item - 1)
{ {
int context = ctx_data.act_map[i].context; int context = ctx_data.act_map[i].context;
int action = ctx_data.act_map[i].map.action_code; int act = ctx_data.act_map[i].map.action_code;
int button = ctx_data.act_map[i].map.button_code; int button = ctx_data.act_map[i].map.button_code;
int prebtn = ctx_data.act_map[i].map.pre_button_code; int prebtn = ctx_data.act_map[i].map.pre_button_code;
if (col < 0) if (col < 0)
{ {
@ -1071,7 +1067,7 @@ int menu_action_setkeys(int *action, int selected_item, bool* exit, struct gui_s
else if (col == 1) /* Action */ else if (col == 1) /* Action */
{ {
const struct mainmenu *mainm = &mainmenu[M_ACTIONS]; const struct mainmenu *mainm = &mainmenu[M_ACTIONS];
synclist_set_update(mainm->index, action, mainm->items, 1); synclist_set_update(mainm->index, act, mainm->items, 1);
rb->gui_synclist_draw(lists); rb->gui_synclist_draw(lists);
goto default_handler; goto default_handler;
} }
@ -1203,23 +1199,23 @@ int menu_action_listfiles(int *action, int selected_item, bool* exit, struct gui
if (lists->data == MENU_ID(M_DELKEYS)) if (lists->data == MENU_ID(M_DELKEYS))
{ {
rb->splashf(HZ / 2, "Delete %s ?", buf); const char *lines[] = {ID2P(LANG_DELETE), buf};
int action = ACTION_NONE; const struct text_message message={lines, 2};
while (action <= ACTION_UNKNOWN) if (rb->gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES)
{
action = rb->get_action(CONTEXT_STD, HZ / 10);
}
if (action == ACTION_STD_OK)
{ {
rb->remove(buf); rb->remove(buf);
cur->items--; cur->items--;
lists->nb_items--; lists->nb_items--;
*action = ACTION_NONE;
} }
} }
else if (lists->data == MENU_ID(M_LOADKEYS)) else if (lists->data == MENU_ID(M_LOADKEYS))
{ {
keyremap_load_file(buf); if (keyremap_load_file(buf) > 0)
rb->splashf(HZ * 2, "Loaded %s ", buf); {
rb->splashf(HZ * 2, "Loaded %s ", buf);
*action = ACTION_STD_CANCEL;
}
} }
} }
} }
@ -1425,13 +1421,7 @@ int menu_action_cb(int *action, int selected_item, bool* exit, struct gui_syncli
if (keymap != NULL && keyset.crc32 != rb->crc_32(keymap, if (keymap != NULL && keyset.crc32 != rb->crc_32(keymap,
entries * sizeof(struct button_mapping), 0xFFFFFFFF)) entries * sizeof(struct button_mapping), 0xFFFFFFFF))
{ {
rb->splashf(HZ / 2, "Save?"); if (rb->yesno_pop("Save Keymap?") == true)
int action = ACTION_NONE;
while (action <= ACTION_UNKNOWN)
{
action = rb->get_action(CONTEXT_STD, HZ / 10);
}
if (action == ACTION_STD_OK)
{ {
keyremap_save_user_keys(true); keyremap_save_user_keys(true);
goto default_handler; goto default_handler;