From 04a7a35f27b73d444f73ab61637e0b3fd04f1d82 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Fri, 26 Jul 2024 20:12:10 +0200 Subject: [PATCH 1/6] Microtouch: add option to turn off visible mouse crosshair for people using touchscreens --- src/device/mouse_microtouch_touchscreen.c | 9 ++++++++- src/include/86box/mouse.h | 2 +- src/qt/qt_rendererstack.cpp | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 01cccfc1f..385dcef74 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -341,7 +341,7 @@ mtouch_init(const device_t *info) timer_on_auto(&dev->host_to_serial_timer, (1000000. / dev->baud_rate) * 10); dev->mode = MODE_TABLET; dev->pen_mode = 3; - mouse_input_mode = 1; + mouse_input_mode = device_get_config_int("crosshair") + 1; mouse_set_buttons(2); mouse_set_poll_ex(mtouch_poll_global); @@ -398,6 +398,13 @@ static const device_config_t mtouch_config[] = { { .description = "1200", .value = 1200 } } }, + { + .name = "crosshair", + .description = "Show Crosshair", + .type = CONFIG_BINARY, + .default_string = "", + .default_int = 1 + }, { .name = "", .description = "", .type = CONFIG_END } // clang-format on }; diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h index e9c1d9b4d..810d62293 100644 --- a/src/include/86box/mouse.h +++ b/src/include/86box/mouse.h @@ -50,7 +50,7 @@ extern "C" { #endif extern int mouse_type; -extern int mouse_input_mode; /* 1 = Absolute, 0 = Relative */ +extern int mouse_input_mode; /* 2 = Absolute (Visible Crosshair), 1 = Absolute, 0 = Relative */ extern int mouse_timed; /* 1 = Timed, 0 = Constant */ extern int mouse_tablet_in_proximity; extern double mouse_x_abs; diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index d043f823c..d594b94f0 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -251,6 +251,8 @@ RendererStack::enterEvent(QEvent *event) mousedata.mouse_tablet_in_proximity = m_monitor_index + 1; if (mouse_input_mode == 1) + QApplication::setOverrideCursor(Qt::BlankCursor); + else if (mouse_input_mode == 2) QApplication::setOverrideCursor(Qt::CrossCursor); } From d0b2efface3b92ffb88cd542010627d0fd379011 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 26 Jul 2024 16:11:54 -0300 Subject: [PATCH 2/6] Modem: Convert phonebook parse failure to pclog --- src/network/net_modem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/net_modem.c b/src/network/net_modem.c index 078320fb4..b3163c06c 100644 --- a/src/network/net_modem.c +++ b/src/network/net_modem.c @@ -263,7 +263,7 @@ modem_read_phonebook_file(modem_t *modem, const char *path) if (strspn(entry.phone, "01234567890*=,;#+>") != strlen(entry.phone)) { /* Invalid characters. */ - modem_log("Modem: Invalid character in phone number %s\n", entry.phone); + pclog("Modem: Invalid character in phone number %s\n", entry.phone); continue; } From e91ffcffa25512ed957ee213c8be304017474d5e Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 26 Jul 2024 16:15:00 -0300 Subject: [PATCH 3/6] Modem: Add SLIP alias for Win9x/IE5 with numbering rules enabled --- src/network/net_modem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/net_modem.c b/src/network/net_modem.c index b3163c06c..45fb00ef2 100644 --- a/src/network/net_modem.c +++ b/src/network/net_modem.c @@ -686,7 +686,7 @@ modem_dial(modem_t *modem, const char *str) { modem->tcpIpConnCounter = 0; modem->tcpIpMode = false; - if (!strncmp(str, "0.0.0.0", sizeof("0.0.0.0") - 1)) { + if (!strcmp(str, "0.0.0.0") || !strcmp(str, "0000")) { modem_log("Turning on SLIP\n"); modem_enter_connected_state(modem); modem->numberinprogress[0] = 0; From b19bf7782b020faa72585019ea4968f3b60444b5 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 26 Jul 2024 16:44:31 -0300 Subject: [PATCH 4/6] MGA: Fix warning with devbranched G100 --- src/video/vid_mga.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index 54d9afc42..1bdbecdf6 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -6821,11 +6821,13 @@ millennium_ii_available(void) return rom_present(ROM_MILLENNIUM_II); } +#ifdef USE_G100 static int matrox_g100_available(void) { return rom_present(ROM_G100); } +#endif static void mystique_speed_changed(void *priv) From b418b0d186ae16c6a714ef724813c1622e941fd4 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 26 Jul 2024 16:45:17 -0300 Subject: [PATCH 5/6] Modem: Clean up some dead code --- src/network/net_modem.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/network/net_modem.c b/src/network/net_modem.c index 45fb00ef2..992270212 100644 --- a/src/network/net_modem.c +++ b/src/network/net_modem.c @@ -575,14 +575,6 @@ modem_send_res(modem_t *modem, const ResTypes response) } else if (response_str != NULL) { modem_send_line(modem, response_str); } - - // if(CSerial::CanReceiveByte()) // very fast response - // if(rqueue->inuse() && CSerial::getRTS()) - // { uint8_t rbyte =rqueue->getb(); - // CSerial::receiveByte(rbyte); - // LOG_MSG("SERIAL: Port %" PRIu8 " modem sending byte %2x back to UART2", - // GetPortNumber(), rbyte); - // } } } From 09ba9a1fb27186a20bdb59ddab40614c5f7f0702 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 26 Jul 2024 17:07:49 -0300 Subject: [PATCH 6/6] Modem: Respond to % escaped commands, fixes Windows autodetection taking a long time --- src/network/net_modem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/network/net_modem.c b/src/network/net_modem.c index 992270212..241e46502 100644 --- a/src/network/net_modem.c +++ b/src/network/net_modem.c @@ -1091,6 +1091,10 @@ modem_do_command(modem_t *modem, int repeat) } break; } + case '%': // % escaped commands + // Windows 98 modem prober sends unknown command AT%V + modem_send_res(modem, ResERROR); + return; case '\0': modem_send_res(modem, ResOK); return;