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

src/qt/qt_harddiskdialog.cpp

@@ -252,7 +252,7 @@ static MVHDGeom create_drive_vhd_dynamic(const QString& fileName, uint16_t cyl,
 static MVHDGeom create_drive_vhd_diff(const QString& fileName, const QString& parentFileName, int blocksize) {
     int vhd_error = 0;
     QByteArray filenameBytes = fileName.toUtf8();
-    QByteArray parentFilenameBytes = fileName.toUtf8();
+    QByteArray parentFilenameBytes = parentFileName.toUtf8();
     MVHDCreationOptions options;
     options.block_size_in_sectors = blocksize;
     options.path = filenameBytes.data();

src/qt/qt_mainwindow.cpp

@@ -221,9 +221,9 @@ MainWindow::MainWindow(QWidget *parent) :
 
     connect(this, &MainWindow::resizeContents, this, [this](int w, int h) {
         if (!QApplication::platformName().contains("eglfs") && vid_resize == 0) {
-            w = qRound(w / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.));
+            w = (w / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.));
 
-            int modifiedHeight = qRound(h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.))
+            int modifiedHeight = (h / (!dpi_scale ? util::screenOfWidget(this)->devicePixelRatio() : 1.))
                 + menuBar()->height()
                 + (statusBar()->height() * !hide_status_bar)
                 + (ui->toolBar->height() * !hide_tool_bar);
@@ -1313,7 +1313,14 @@ void MainWindow::getTitle(wchar_t *title)
 
 bool MainWindow::eventFilter(QObject* receiver, QEvent* event)
 {
-    if (this->keyboardGrabber() == this) {
+    if (!dopause && (mouse_capture || !kbd_req_capture)) {
+        if (event->type() == QEvent::Shortcut) {
+            auto shortcutEvent = (QShortcutEvent*)event;
+            if (shortcutEvent->key() == ui->actionExit->shortcut()) {
+                event->accept();
+                return true;
+            }
+        }
         if (event->type() == QEvent::KeyPress) {
             event->accept();
             this->keyPressEvent((QKeyEvent *) event);

src/sound/midi_fluidsynth.c

@@ -5,6 +5,9 @@
 #    include <stdlib.h>
 #    include <string.h>
 #    include <wchar.h>
+#    ifdef __unix__
+#        include <unistd.h>
+#    endif
 
 #    include <86box/86box.h>
 #    include <86box/config.h>
@@ -248,7 +251,12 @@ fluidsynth_init(const device_t *info)
 
     data->synth = f_new_fluid_synth(data->settings);
 
-    char *sound_font = (char *) device_get_config_string("sound_font");
+    const char *sound_font = (char *) device_get_config_string("sound_font");
+#    ifdef __unix__
+    if (!sound_font || sound_font[0] == 0)
+        sound_font = (access("/usr/share/sounds/sf2/FluidR3_GM.sf2", F_OK) == 0 ? "/usr/share/sounds/sf2/FluidR3_GM.sf2" :
+                      (access("/usr/share/soundfonts/default.sf2", F_OK) == 0 ? "/usr/share/soundfonts/default.sf2" : ""));
+#    endif
     data->sound_font = f_fluid_synth_sfload(data->synth, sound_font, 1);
 
     if (device_get_config_int("chorus")) {

src/sound/snd_cmi8x38.c

@@ -560,12 +560,12 @@ cmi8x38_start_playback(cmi8x38_t *dev)
 
     i = !(val & 0x01);
     if (!dev->dma[0].playback_enabled && i)
-        timer_advance_u64(&dev->dma[0].poll_timer, dev->dma[0].timer_latch);
+        timer_set_delay_u64(&dev->dma[0].poll_timer, dev->dma[0].timer_latch);
     dev->dma[0].playback_enabled = i;
 
     i = !(val & 0x02);
     if (!dev->dma[1].playback_enabled && i)
-        timer_advance_u64(&dev->dma[1].poll_timer, dev->dma[1].timer_latch);
+        timer_set_delay_u64(&dev->dma[1].poll_timer, dev->dma[1].timer_latch);
     dev->dma[1].playback_enabled = i;
 }
 
@@ -722,10 +722,9 @@ cmi8x38_write(uint16_t addr, uint8_t val, void *priv)
             break;
 
         case 0x09:
-#if 0 /* actual CMI8338 behavior unconfirmed; this register is required for the Windows XP driver which outputs 96K */
-        if (dev->type == CMEDIA_CMI8338)
-            return;
-#endif
+            if (dev->type == CMEDIA_CMI8338)
+                return;
+
             /* Update sample rate. */
             dev->io_regs[addr] = val;
             cmi8x38_speed_changed(dev);
@@ -1043,22 +1042,28 @@ cmi8x38_dma_process(void *priv)
 
         /* Check if the fragment size was reached. */
         if (--dma->frame_count_fragment <= 0) {
-            cmi8x38_log("CMI8x38: DMA %d fragment size reached at %04X frames left", dma->id, dma->frame_count_dma - 1);
-
             /* Reset fragment counter. */
             dma->frame_count_fragment = *((uint16_t *) &dev->io_regs[dma->reg | 0x6]) + 1;
-
+#ifdef ENABLE_CMI8X38_LOG
+            if (dma->frame_count_fragment > 1) /* avoid log spam if fragment counting is unused, like on the newer WDM drivers (cmudax3) */
+                cmi8x38_log("CMI8x38: DMA %d fragment size reached at %04X frames left", dma->id, dma->frame_count_dma - 1);
+#endif
             /* Fire interrupt if requested. */
             if (dev->io_regs[0x0e] & dma_bit) {
-                cmi8x38_log(", firing interrupt\n");
-
+#ifdef ENABLE_CMI8X38_LOG
+                if (dma->frame_count_fragment > 1)
+                    cmi8x38_log(", firing interrupt\n");
+#endif
                 /* Set channel interrupt flag. */
                 dev->io_regs[0x10] |= dma_bit;
 
                 /* Fire interrupt. */
                 cmi8x38_update_irqs(dev);
             } else {
-                cmi8x38_log("\n");
+#ifdef ENABLE_CMI8X38_LOG
+                if (dma->frame_count_fragment > 1)
+                    cmi8x38_log("\n");
+#endif
             }
         }
 
@@ -1129,8 +1134,8 @@ cmi8x38_poll(void *priv)
             }
             break;
 
-        case 0x03: /* Stereo, 16-bit PCM */
-            switch (dma->channels) { /* multi-channel requires this data format */
+        case 0x03: /* Stereo, 16-bit PCM, with multi-channel capability */
+            switch (dma->channels) {
                 case 2:
                     if ((dma->fifo_end - dma->fifo_pos) >= 4) {
                         *out_l = *((uint16_t *) &dma->fifo[dma->fifo_pos & (sizeof(dma->fifo) - 1)]);

src/unix/assets/86Box.spec

@@ -0,0 +1,123 @@
+# Fedora RPM spec file for 86Box including roms
+#
+# To create RPM files from this spec file, run the following commands:
+#  sudo dnf install rpm-build
+#  mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+#
+# copy this 86Box.spec file to ~/rpmbuild/SPECS and run the following commands:
+#  cd ~/rpmbuild
+#  sudo dnf builddep SPECS/86Box.spec
+#  rpmbuild --undefine=_disable_source_fetch -ba SPECS/86Box.spec
+#
+# After a successful build, you can install the RPMs as follows:
+#  sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
+
+%global romver 20220319
+
+Name:		86Box
+Version:	3.3
+Release:	1%{?dist}
+Summary:	Classic PC emulator
+License:	GPLv2+
+URL:		https://86box.net
+
+Source0:	https://github.com/86Box/86Box/archive/refs/tags/v%%{version}.tar.gz
+Source1:	https://github.com/86Box/roms/archive/refs/tags/%{romver}.tar.gz
+
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
+BuildRequires: gcc-c++
+BuildRequires: libFAudio-devel
+BuildRequires: libappstream-glib
+BuildRequires: libevdev-devel
+BuildRequires: libXi-devel
+BuildRequires: ninja-build
+BuildRequires: qt5-linguist
+BuildRequires: qt5-qtconfiguration-devel
+BuildRequires: qt5-qtbase-private-devel
+BuildRequires: qt5-qtbase-static
+BuildRequires: rtmidi-devel
+BuildRequires: wayland-devel
+BuildRequires: SDL2-devel
+
+Requires: hicolor-icon-theme
+Requires: fluid-soundfont-gm
+Requires: 86Box-roms
+
+%description
+86Box is a hypervisor and IBM PC system emulator that specializes in
+running old operating systems and software designed for IBM
+PC systems and compatibles from 1981 through fairly recent
+system designs based on the PCI bus.
+
+It supports various models of PCs, graphics and sound cards, and CPUs.
+
+%package	roms
+Summary:	ROMs for use with 86Box
+Version:	%{romver}
+License:	Proprietary
+BuildArch:	noarch
+
+%description	roms
+Collection of ROMs for use with 86Box.
+
+%prep
+%autosetup -p1 -a1
+
+%build
+%ifarch i386 x86_64
+  %cmake -DRELEASE=on
+%else
+  %ifarch arm aarch64
+    %cmake -DRELEASE=on -DNEW_DYNAREC=on
+  %else
+    %cmake -DRELEASE=on -DDYNAREC=off
+  %endif
+%endif
+%cmake_build
+
+%install
+# install base package
+%cmake_install
+
+# install icons
+for i in 48 64 72 96 128 192 256 512; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
+  cp src/unix/assets/${i}x${i}/net.86box.86Box.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/net.86box.86Box.png
+done
+
+# install desktop file
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications src/unix/assets/net.86box.86Box.desktop
+
+# install metadata
+mkdir -p %{buildroot}%{_metainfodir}
+cp src/unix/assets/net.86box.86Box.metainfo.xml %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.86box.86Box.metainfo.xml
+
+# install roms
+pushd roms-%{romver}
+  mkdir -p %{buildroot}%{_datadir}/%{name}/roms
+  cp -a * %{buildroot}%{_datadir}/%{name}/roms/
+  # hack to create symlink in /usr/bin
+  cd %{buildroot}%{_bindir}
+  ln -s ../share/%{name}/roms roms
+popd
+
+# files part of the main package
+%files
+%license COPYING
+%{_bindir}/86Box
+%{_datadir}/applications/net.86box.86Box.desktop
+%{_metainfodir}/net.86box.86Box.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/net.86box.86Box.png
+
+# files part of the rom package
+%files roms
+%license  roms-%{romver}/LICENSE
+%{_datadir}/%{name}/roms
+%{_bindir}/roms
+
+%changelog
+* Sat Mar 19 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.3-1
+- Initial RPM release

src/unix/assets/net.86box.86Box.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=86Box
+GenericName=Classic PC emulator
+Comment=An emulator for classic IBM PC clones
+Exec=86Box
+Icon=net.86box.86Box
+Terminal=false
+Type=Application
+Categories=System;Emulator

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>net.86box.86Box</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0-or-later</project_license>
+    <name>86Box</name>
+    <summary>An emulator for classic IBM PC clones</summary>
+    <categories>
+      <category>Emulation</category>
+    </categories>
+    <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
+    <releases>
+      <release version="3.3" date="2022-03-19"/>
+    </releases>
+    <content_rating type="oars-1.1" />
+    <description>
+        <p>
+            86Box is a hypervisor and IBM PC system emulator that specializes
+            in running old operating systems and software designed for IBM
+            PC systems and compatibles from 1981 through fairly recent
+            system designs based on the PCI bus.
+
+            It supports various models of PCs, graphics and sound
+            cards, and CPUs.
+        </p>
+        <p>
+            To use 86Box you will need to dump BIOS ROMs for each machine you
+            want to emulate.
+        </p>
+    </description>
+    <url type="homepage">https://86box.net</url>
+</component>