From 7b2e25404aef0ee652b7fa8beab601d4b62c1edb Mon Sep 17 00:00:00 2001 From: sorgelig Date: Tue, 30 Jun 2020 03:59:18 +0800 Subject: [PATCH] input: support skip in keyboard definition (for pseudo-keyboard devices). --- input.cpp | 2 +- menu.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/input.cpp b/input.cpp index adb3199..4ec0e7c 100644 --- a/input.cpp +++ b/input.cpp @@ -1698,7 +1698,7 @@ static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int if (ev->type == EV_KEY && mapping && mapping_type == 3 && ev->code == input[dev].mmap[SYS_BTN_OSD_KTGL + 1]) ev->code = KEY_ENTER; - int map_skip = (ev->type == EV_KEY && ev->code == KEY_SPACE && ((mapping_dev >= 0 && mapping_type==1) || mapping_button<0)); + int map_skip = (ev->type == EV_KEY && ((ev->code == KEY_SPACE && mapping_type == 1) || ev->code == KEY_ALTERASE) && (mapping_dev >= 0 || mapping_button<0)); int cancel = (ev->type == EV_KEY && ev->code == KEY_ESC); int enter = (ev->type == EV_KEY && ev->code == KEY_ENTER); int origcode = ev->code; diff --git a/menu.cpp b/menu.cpp index 61693f0..0e3d3d1 100644 --- a/menu.cpp +++ b/menu.cpp @@ -556,7 +556,7 @@ static uint32_t menu_key_get(void) { if (get_map_vid() || get_map_pid()) { - send_map_cmd(KEY_SPACE); + send_map_cmd(KEY_ALTERASE); } } } @@ -2999,7 +2999,7 @@ void HandleUI(void) sprintf(s, " %s ID: %04x:%04x", get_map_type() ? "Joystick" : "Keyboard", get_map_vid(), get_map_pid()); if (get_map_button() > 0 || !joymap_first) { - OsdWrite(7, (get_map_type() && !is_menu()) ? " Space/Menu \x16 Undefine" : " Space \x16 Undefine"); + OsdWrite(7, (get_map_type() && !is_menu()) ? " User/Menu \x16 Undefine" : " User \x16 Undefine"); if (!get_map_type()) OsdWrite(9); } OsdWrite(5, s);