Finish multi-monitor support

src/qt/qt_mainwindow.cpp

@@ -622,8 +622,8 @@ MainWindow::~MainWindow() {
 void MainWindow::showEvent(QShowEvent *event) {
     if (shownonce) return;
     shownonce = true;
+    if (window_remember) resize(window_w, window_h + menuBar()->height() + (hide_status_bar ? 0 : statusBar()->height()) + (hide_tool_bar ? 0 : ui->toolBar->height()));
     if (window_remember && !QApplication::platformName().contains("wayland")) {
-        fprintf(stderr, "Geom: %i, %i, %i, %i\n", window_x, window_y, window_w, window_h);
         setGeometry(window_x, window_y, window_w, window_h + menuBar()->height() + (hide_status_bar ? 0 : statusBar()->height()) + (hide_tool_bar ? 0 : ui->toolBar->height()));
     }
     if (vid_resize == 2) {
@@ -1991,8 +1991,13 @@ void MainWindow::on_actionRenderer_options_triggered()
 {
     auto dlg = ui->stackedWidget->getOptions(this);
 
-    if (dlg)
-        dlg->exec();
+    if (dlg) {
+        if (dlg->exec() == QDialog::Accepted) {
+            for (int i = 1; i < MONITORS_NUM; i++) {
+                if (renderers[i] && renderers[i]->hasOptions()) renderers[i]->reloadOptions();
+            }
+        }
+    }
 }
 
 void MainWindow::on_actionMCA_devices_triggered()

src/qt/qt_openglrenderer.cpp

@@ -29,6 +29,7 @@
 OpenGLRenderer::OpenGLRenderer(QWidget *parent)
     : QWindow(parent->windowHandle())
     , renderTimer(new QTimer(this))
+    , options(nullptr)
 {
     renderTimer->setTimerType(Qt::PreciseTimer);
     /* TODO: need's more accuracy, maybe target 1ms earlier and spin yield */
@@ -165,9 +166,7 @@ OpenGLRenderer::initialize()
 
         glTexImage2D(GL_TEXTURE_2D, 0, QOpenGLTexture::RGBA8_UNorm, INIT_WIDTH, INIT_HEIGHT, 0, QOpenGLTexture::BGRA, QOpenGLTexture::UInt32_RGBA8_Rev, NULL);
 
-        options = new OpenGLOptions(this, true, glslVersion);
-
-        applyOptions();
+        reloadOptions();
 
         glClearColor(0.f, 0.f, 0.f, 1.f);
 
@@ -304,6 +303,15 @@ OpenGLRenderer::applyOptions()
     currentFilter = options->filter();
 }
 
+void
+OpenGLRenderer::reloadOptions()
+{
+    if (options) { delete options; options = nullptr; }
+    options = new OpenGLOptions(this, true, glslVersion);
+
+    applyOptions();
+}
+
 void
 OpenGLRenderer::applyShader(const OpenGLShaderPass &shader)
 {

src/qt/qt_openglrenderer.hpp

@@ -53,6 +53,7 @@ public:
     void     finalize() override final;
     bool     hasOptions() const override { return true; }
     QDialog *getOptions(QWidget *parent) override;
+    void     reloadOptions() override;
 
 signals:
     void initialized();

src/qt/qt_renderercommon.hpp

@@ -28,6 +28,8 @@ public:
     virtual bool hasOptions() const { return false; }
     /* Returns options dialog for renderer */
     virtual QDialog *getOptions(QWidget *parent) { return nullptr; }
+    /* Reloads options of renderer */
+    virtual void reloadOptions() {}
 
     virtual bool hasBlitFunc() { return false; }
     virtual void blit(int x, int y, int w, int h) {}

src/qt/qt_rendererstack.hpp

@@ -53,6 +53,8 @@ public:
 
     /* Does current renderer implement options dialog */
     bool hasOptions() const { return rendererWindow ? rendererWindow->hasOptions() : false; }
+    /* Reloads options of current renderer */
+    void reloadOptions() const { return rendererWindow->reloadOptions(); }
     /* Returns options dialog for current renderer */
     QDialog *getOptions(QWidget *parent) { return rendererWindow ? rendererWindow->getOptions(parent) : nullptr; }
 

src/qt/qt_settingsdisplay.cpp

@@ -87,9 +87,13 @@ void SettingsDisplay::onCurrentMachineChanged(int machineId) {
 
     if (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0) {
         ui->comboBoxVideo->setEnabled(false);
+        ui->comboBoxVideoSecondary->setEnabled(false);
+        ui->pushButtonConfigureSecondary->setEnabled(false);
         selectedRow = 1;
     } else {
         ui->comboBoxVideo->setEnabled(true);
+        ui->comboBoxVideoSecondary->setEnabled(true);
+        ui->pushButtonConfigureSecondary->setEnabled(true);
     }
     ui->comboBoxVideo->setCurrentIndex(selectedRow);
 }
@@ -137,6 +141,30 @@ void SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index) {
         ui->checkBoxXga->setChecked(xga_enabled);
 
     ui->pushButtonConfigureXga->setEnabled((hasIsa16 || has_MCA) && ui->checkBoxXga->isChecked());
+
+    int c = 2;
+    ui->comboBoxVideoSecondary->clear();
+    ui->comboBoxVideoSecondary->addItem(QObject::tr("None"), 0);
+
+    while (true) {
+        const device_t* video_dev = video_card_getdevice(c);
+        QString name = DeviceConfig::DeviceName(video_dev, video_get_internal_name(c), 1);
+        if (name.isEmpty()) {
+            break;
+        }
+
+        if (video_card_available(c) &&
+            device_is_valid(video_dev, machineId) &&
+            !(video_card_get_flags(c) == video_card_get_flags(videoCard))) {
+                ui->comboBoxVideoSecondary->addItem(name, c);
+                if (c == gfxcard_2)
+                    ui->comboBoxVideoSecondary->setCurrentIndex(ui->comboBoxVideoSecondary->count() - 1);
+        }
+
+        c++;
+    }
+
+    if (gfxcard_2 == 0 || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) ui->comboBoxVideoSecondary->setCurrentIndex(0);
 }
 
 void SettingsDisplay::on_checkBoxVoodoo_stateChanged(int state) {
@@ -146,3 +174,20 @@ void SettingsDisplay::on_checkBoxVoodoo_stateChanged(int state) {
 void SettingsDisplay::on_checkBoxXga_stateChanged(int state) {
     ui->pushButtonConfigureXga->setEnabled(state == Qt::Checked);
 }
+
+void SettingsDisplay::on_comboBoxVideoSecondary_currentIndexChanged(int index)
+{
+    if (index < 0) {
+        return;
+    }
+    int videoCard = ui->comboBoxVideoSecondary->currentData().toInt();
+    ui->pushButtonConfigureSecondary->setEnabled(video_card_has_config(videoCard) > 0);
+}
+
+
+void SettingsDisplay::on_pushButtonConfigureSecondary_clicked()
+{
+    auto* device = video_card_getdevice(ui->comboBoxVideoSecondary->currentData().toInt());
+    DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings*>(Settings::settings));
+}
+

src/qt/qt_settingsdisplay.hpp

@@ -20,6 +20,12 @@ public:
 public slots:
     void onCurrentMachineChanged(int machineId);
 
+private slots:
+    void on_pushButtonConfigureSecondary_clicked();
+
+private slots:
+    void on_comboBoxVideoSecondary_currentIndexChanged(int index);
+
 private slots:
     void on_checkBoxVoodoo_stateChanged(int state);
     void on_checkBoxXga_stateChanged(int state);

src/qt/qt_settingsdisplay.ui

@@ -26,16 +26,29 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBoxVideo"/>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="checkBox8514">
      <property name="text">
-      <string>Video:</string>
+      <string>8514/A</string>
      </property>
     </widget>
    </item>
+   <item row="5" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="comboBoxVideo"/>
+   </item>
    <item row="0" column="2">
     <widget class="QPushButton" name="pushButtonConfigure">
      <property name="sizePolicy">
@@ -49,53 +62,57 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="pushButtonConfigureVoodoo">
-     <property name="text">
-      <string>Configure</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxVoodoo">
      <property name="text">
       <string>Voodoo Graphics</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="checkBox8514">
-     <property name="text">
-      <string>8514/A</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QPushButton" name="pushButtonConfigureXga">
+   <item row="2" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureVoodoo">
      <property name="text">
       <string>Configure</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Video:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="checkBoxXga">
      <property name="text">
       <string>XGA</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="4" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureXga">
+     <property name="text">
+      <string>Configure</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Video #2:</string>
      </property>
-    </spacer>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="comboBoxVideoSecondary"/>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="pushButtonConfigureSecondary">
+     <property name="text">
+      <string>Configure</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>