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

.ci/Jenkinsfile

@@ -113,9 +113,9 @@ def gitClone(repository, branch) {
 		} else if (env.GIT_COMMIT != scmVars.GIT_COMMIT) {
 			/* Checkout the commit read from the polling log. */
 			if (isUnix())
-				sh returnStatus: true, script: "git checkout ${env.GIT_COMMIT}"
+				sh(returnStatus: true, script: "git checkout ${env.GIT_COMMIT}")
 			else
-				bat returnStatus: true, script: "git checkout ${env.GIT_COMMIT}"
+				bat(returnStatus: true, script: "git checkout ${env.GIT_COMMIT}")
 		}
 		println "[-] Using git commit [${env.GIT_COMMIT}]"
 
@@ -173,8 +173,10 @@ pipeline {
 
 			steps {
 				script {
-					/* Extract the polled commit from the polling log, so that git checkout can be used
-					   to avoid JENKINS-20518 race conditions caused by two pushes too close together. */
+					/* Extract the polled commit from the polling log, so that git checkout
+					   can be used to avoid JENKINS-20518 race conditions caused by the
+					   webhook being triggered more than once in a short period of time.
+					   This is a backup strategy for FilterProxy's webhook queuing. */
 					node('master') { /* must run on master node to read polling log */
 						/* Ignore exceptions as this is not really critical. */
 						try {

src/chipset/ali1489.c

@@ -197,9 +197,7 @@ ali1489_defaults(ali1489_t *dev)
 
     picintc(1 << 10);
     picintc(1 << 15);
-#ifdef OLD_NMI_BEHAVIOR
     nmi = 0;
-#endif
     smi_line = 0;
     in_smm = 0;
 

src/chipset/via_pipc.c

@@ -728,10 +728,8 @@ pipc_fmnmi_read(uint16_t addr, void *priv)
     if  (dev->ac97_regs[0][0x48] & 0x01) {
 	if (dev->ac97_regs[0][0x48] & 0x04)
 		smi_line = 0;
-#ifdef OLD_NMI_BEHAVIOR
 	else
 		nmi = 0;
-#endif
     }
 #endif
 

src/machine/m_amstrad.c

@@ -1068,9 +1068,7 @@ vid_in_200(uint16_t addr, void *priv)
 	case 0x03dd:
 		ret = vid->crtc_index;		/* Read NMI reason */
 		vid->crtc_index &= 0x1f;	/* Reset NMI reason */
-#ifdef OLD_NMI_BEHAVIOR
 		nmi = 0;			/* And reset NMI flag */
-#endif
 		return(ret);
 
 	case 0x03de:

src/network/net_ne2000.c

@@ -1211,7 +1211,7 @@ static const device_config_t ne2000_config[] = {
         .description = "IRQ",
         .type = CONFIG_SELECTION,
         .default_string = "",
-        .default_int = 10,
+        .default_int = 3,
         .file_filter = "",
         .spinner = { 0 },
         .selection = {

src/qt/qt_mainwindow.cpp

@@ -229,7 +229,10 @@ MainWindow::MainWindow(QWidget *parent) :
     });
 
     connect(this, &MainWindow::resizeContents, this, [this](int w, int h) {
-        ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+        if (shownonce) {
+            if (resizableonce == false) ui->stackedWidget->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+            resizableonce = true;
+        }
         if (!QApplication::platformName().contains("eglfs") && vid_resize != 1) {
             w = (w / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.));
 
@@ -558,7 +561,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
             if (renderers[i]) {
                 monitor_settings[i].mon_window_w = renderers[i]->geometry().width();
                 monitor_settings[i].mon_window_h = renderers[i]->geometry().height();
-                if (!QApplication::platformName().contains("wayland")) continue;
+                if (QApplication::platformName().contains("wayland")) continue;
                 monitor_settings[i].mon_window_x = renderers[i]->geometry().x();
                 monitor_settings[i].mon_window_y = renderers[i]->geometry().y();
             }
@@ -582,7 +585,6 @@ void MainWindow::initRendererMonitorSlot(int monitor_index)
     auto& secondaryRenderer = this->renderers[monitor_index];
     secondaryRenderer.reset(new RendererStack(nullptr, monitor_index));
     if (secondaryRenderer) {
-        connect(this, &MainWindow::pollMouse, secondaryRenderer.get(), &RendererStack::mousePoll, Qt::DirectConnection);
         connect(secondaryRenderer.get(), &RendererStack::rendererChanged, this, [this, monitor_index]
         {
             this->renderers[monitor_index]->show();

src/qt/qt_mainwindow.hpp

@@ -141,6 +141,7 @@ private:
     /* If main window should send keyboard input */
     bool send_keyboard_input = true;
     bool shownonce = false;
+    bool resizableonce = false;
 
     friend class SpecifyDimensions;
     friend class ProgSettings;

src/qt/qt_rendererstack.cpp

@@ -34,6 +34,7 @@
 
 #include "evdev_mouse.hpp"
 
+#include <atomic>
 #include <stdexcept>
 
 #include <QScreen>
@@ -53,8 +54,8 @@ double mouse_sensitivity = 1.0;
 }
 
 struct mouseinputdata {
-    int deltax, deltay, deltaz;
-    int mousebuttons;
+    atomic_int deltax, deltay, deltaz;
+    atomic_int mousebuttons;
 };
 static mouseinputdata mousedata;
 
@@ -145,7 +146,7 @@ int ignoreNextMouseEvent = 1;
 void
 RendererStack::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (this->geometry().contains(event->pos()) && event->button() == Qt::LeftButton && !mouse_capture && (isMouseDown & 1)) {
+    if (this->geometry().contains(event->pos()) && event->button() == Qt::LeftButton && !mouse_capture && (isMouseDown & 1) && mouse_get_buttons() != 0) {
         plat_mouse_capture(1);
         this->setCursor(Qt::BlankCursor);
         if (!ignoreNextMouseEvent)
@@ -164,6 +165,7 @@ RendererStack::mouseReleaseEvent(QMouseEvent *event)
     }
     isMouseDown &= ~1;
 }
+
 void
 RendererStack::mousePressEvent(QMouseEvent *event)
 {
@@ -173,6 +175,7 @@ RendererStack::mousePressEvent(QMouseEvent *event)
     }
     event->accept();
 }
+
 void
 RendererStack::wheelEvent(QWheelEvent *event)
 {

src/sound/snd_audiopci.c

@@ -306,9 +306,7 @@ es1371_reset(void *p)
     es1371_t *dev = (es1371_t *) p;
     int       i;
 
-#ifdef OLD_NMI_BEHAVIOR
     nmi = 0;
-#endif
 
     /* Interrupt/Chip Select Control Register, Address 00H
        Addressable as byte, word, longword */

src/video/vid_sigma.c

@@ -245,9 +245,7 @@ sigma_out(uint16_t addr, uint8_t val, void *p)
 		sigma->lastport &= 0x7F;
 		return;
 	case 0x2DC:	/* Reset NMI */
-#ifdef OLD_NMI_BEHAVIOR
 		nmi = 0;
-#endif
 		sigma->lastport &= 0x7F;
 		return;
 	case 0x2DD:	/* Page in RAM at 0xC1800 */