Merge branch 'master' of https://github.com/86Box/86Box

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/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/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)