Merge remote-tracking branch 'origin/master' into version/4.1

src/pic.c

@@ -225,12 +225,7 @@ find_best_interrupt(pic_t *dev)
 static __inline void
 pic_update_pending_xt(void)
 {
-    if (find_best_interrupt(&pic) != -1) {
-        latched++;
-        if (latched == 1)
-            timer_on_auto(&pic_timer, 0.35);
-    } else if (latched == 0)
-        pic.int_pending = 0;
+    pic.int_pending = (find_best_interrupt(&pic) != -1);
 }
 
 static __inline void
@@ -248,11 +243,7 @@ pic_callback(void *priv)
 {
     pic_t *dev = (pic_t *) priv;
 
-    dev->int_pending = 1;
-
-    latched--;
-    if (latched > 0)
-        timer_on_auto(&pic_timer, 0.35);
+    update_pending();
 }
 
 void
@@ -501,7 +492,10 @@ pic_write(uint16_t addr, uint8_t val, void *priv)
                 break;
             case STATE_NONE:
                 dev->imr = val;
+                if (is286)
                     update_pending();
+                else
+                    timer_on_auto(&pic_timer, .0 * ((10000000.0 * (double) xt_cpu_multi) / (double) cpu_s->rspeed));
                 break;
 
             default:

src/qt/qt_rendererstack.cpp

@@ -73,8 +73,8 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
 
     m_monitor_index = monitor_index;
 #if defined __unix__ && !defined __HAIKU__
-    mousedata.mouse_type = getenv("EMU86BOX_MOUSE"), auto_mouse_type[16];
-    if (!mousedata.mouse_type || (mouse_type[0] == '\0') || !stricmp(mousedata.mouse_type, "auto")) {
+    mousedata.mouse_type = getenv("EMU86BOX_MOUSE"), char auto_mouse_type[16];
+    if (!mousedata.mouse_type || (mousedata.mouse_type[0] == '\0') || !stricmp(mousedata.mouse_type, "auto")) {
         if (QApplication::platformName().contains("wayland"))
             strcpy(auto_mouse_type, "wayland");
         else if (QApplication::platformName() == "eglfs")
@@ -87,17 +87,17 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
     }
 
 #    ifdef WAYLAND
-    if (!stricmp(mouse_type, "wayland")) {
+    if (!stricmp(mousedata.mouse_type, "wayland")) {
         wl_init();
         this->mouse_capture_func   = wl_mouse_capture;
         this->mouse_uncapture_func = wl_mouse_uncapture;
     }
 #    endif
 #    ifdef EVDEV_INPUT
-    if (!stricmp(mouse_type, "evdev"))
+    if (!stricmp(mousedata.mouse_type, "evdev"))
         evdev_init();
 #    endif
-    if (!stricmp(mouse_type, "xinput2")) {
+    if (!stricmp(mousedata.mouse_type, "xinput2")) {
         extern void xinput2_init();
         extern void xinput2_exit();
         xinput2_init();

src/unix/unix_sdl.c

@@ -51,9 +51,6 @@ int                 title_set         = 0;
 int                 resize_pending    = 0;
 int                 resize_w          = 0;
 int                 resize_h          = 0;
-double              mouse_sensitivity = 1.0;                  /* Unused. */
-double              mouse_x_error     = 0.0; /* Unused. */
-double              mouse_y_error     = 0.0; /* Unused. */
 static uint8_t      interpixels[17842176];
 
 extern void RenderImGui(void);