From c55a0bd6541b2a9e4bc9184af3ccc604a54482bc Mon Sep 17 00:00:00 2001 From: sorgelig Date: Mon, 27 May 2019 22:46:54 +0800 Subject: [PATCH] input: reduce logging while HPS screen is active. --- input.cpp | 4 ++-- user_io.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/input.cpp b/input.cpp index 27063ab..3f7feb1 100644 --- a/input.cpp +++ b/input.cpp @@ -2609,7 +2609,7 @@ int input_test(int getchar) if (ev.code == KEY_MENU) ev.code = BTN_MODE; } - if (is_menu_core()) + if (is_menu_core() && !video_fb_state()) { /* if (mapping && mapping_type <= 1 && !(ev.type==EV_KEY && ev.value>1)) @@ -2796,7 +2796,7 @@ int input_test(int getchar) xval = ((data[0] & 0x10) ? -256 : 0) | data[1]; yval = ((data[0] & 0x20) ? -256 : 0) | data[2]; - if (is_menu_core()) printf("%s: btn=0x%02X, dx=%d, dy=%d, scroll=%d\n", input[i].devname, data[0], xval, yval, (int8_t)data[3]); + if (is_menu_core() && !video_fb_state()) printf("%s: btn=0x%02X, dx=%d, dy=%d, scroll=%d\n", input[i].devname, data[0], xval, yval, (int8_t)data[3]); if (cfg.mouse_throttle) throttle = cfg.mouse_throttle; if (ds_mouse_emu) throttle *= 4; diff --git a/user_io.cpp b/user_io.cpp index 0bda9d2..2443220 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -1974,7 +1974,7 @@ void user_io_poll() else if (ps2_wheel < -63) ps2_wheel = -63; // collect movement info and send at predefined rate - if (is_menu_core()) printf("PS2 MOUSE: %x %d %d %d\n", ps2_mouse[0], ps2_mouse[1], ps2_mouse[2], ps2_wheel); + if (is_menu_core() && !video_fb_state()) printf("PS2 MOUSE: %x %d %d %d\n", ps2_mouse[0], ps2_mouse[1], ps2_mouse[2], ps2_wheel); if (!osd_is_visible) { @@ -2595,7 +2595,7 @@ void user_io_kbd(uint16_t key, int press) uint32_t code = get_ps2_code(key); if (!press) { - if (is_menu_core()) printf("PS2 code(break)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255); + if (is_menu_core() && !video_fb_state()) printf("PS2 code(break)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255); if (key == KEY_MENU) key = KEY_F12; if (osd_is_visible) menu_key_set(UPSTROKE | key); @@ -2605,7 +2605,7 @@ void user_io_kbd(uint16_t key, int press) } else { - if (is_menu_core()) printf("PS2 code(make)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255); + if (is_menu_core() && !video_fb_state()) printf("PS2 code(make)%s for core: %d(0x%X)\n", (code & EXT) ? "(ext)" : "", code & 255, code & 255); if (!osd_is_visible && !is_menu_core() && key == KEY_MENU && press == 3) open_joystick_setup(); else if ((has_menu() || osd_is_visible || (get_key_mod() & (LALT | RALT | RGUI | LGUI))) && (((key == KEY_F12) && ((!is_x86_core() && !is_archie()) || (get_key_mod() & (RGUI | LGUI)))) || key == KEY_MENU)) menu_key_set(KEY_F12); else if (osd_is_visible)