Merge branch 'master' into pc98x1

CMakeLists.txt

@@ -35,7 +35,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 4.2
+    VERSION 4.2.1
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)

debian/changelog

@@ -1,5 +1,5 @@
-86box (4.2) UNRELEASED; urgency=medium
+86box (4.2.1) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Fri, 26 Jul 2024 00:46:15 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Fri, 26 Jul 2024 21:09:16 +0200

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
 };

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;

src/machine/m_at_socket7.c

@@ -443,7 +443,8 @@ machine_at_epc2102_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
+    device_add_params(&at_nvr_device, (void *) 0x20);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
@@ -456,7 +457,7 @@ machine_at_epc2102_init(const machine_t *model)
     device_add(&piix3_device);
     device_add(&keyboard_ps2_intel_ami_pci_device);
     device_add(&i82091aa_device);
-    device_add(&intel_flash_bxt_device);
+    device_add(&sst_flash_39sf010_device);
 
     return ret;
 }

src/machine/machine_table.c

@@ -5524,10 +5524,10 @@ const machine_t machines[] = {
         .cpu = {
             .package = CPU_PKG_386DX | CPU_PKG_SOCKET1,
             .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
+            .min_bus = 25000000,
+            .max_bus = 66666667,
+            .min_voltage = 5000,
+            .max_voltage = 5000,
             .min_multi = 0,
             .max_multi = 0
         },

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;
         }
 
@@ -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);
-        //	}
     }
 }
 
@@ -686,7 +678,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;
@@ -1099,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;

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);
 }
 

src/unix/assets/86Box.spec

@@ -15,7 +15,7 @@
 %global romver 4.1
 
 Name:		86Box
-Version:	4.2
+Version:	4.2.1
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
@@ -121,5 +121,5 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
-* Fri Jul 26 2024 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.2-1
+* Fri Jul 26 2024 Robert de Rooy <robert.de.rooy[AT]gmail.com> 4.2.1-1
 - Bump release

src/unix/assets/net.86box.86Box.metainfo.xml

@@ -11,7 +11,7 @@
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="4.2" date="2024-07-26"/>
+      <release version="4.2.1" date="2024-07-26"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>

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)

vcpkg.json

@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "4.2",
+    "version-string": "4.2.1",
     "homepage": "https://86box.net/",
     "documentation": "https://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",