fixed incorrect monitor selection

Author: Youda008

DoomRunner.pro

@@ -86,8 +86,6 @@ DISTFILES += \
 
 win32:RC_ICONS += Resources/DoomRunner.ico
 
-unix: LIBS += -lX11 -lXrandr
-
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin

Sources/MainWindow.cpp

@@ -1964,7 +1964,8 @@ void MainWindow::restoreLaunchOptions( const LaunchOptions & opts )
 	ui->allowCheatsChkBox->setChecked( opts.allowCheats );
 
 	// video
-	ui->monitorCmbBox->setCurrentIndex( opts.monitorIdx );
+	if (opts.monitorIdx < ui->monitorCmbBox->count())
+		ui->monitorCmbBox->setCurrentIndex( opts.monitorIdx );
 	if (opts.resolutionX > 0)
 		ui->resolutionXLine->setText( QString::number( opts.resolutionX ) );
 	if (opts.resolutionY > 0)
@@ -2165,7 +2166,15 @@ QString MainWindow::generateLaunchCommand( const QString & baseDir )
 		cmdStream << " +sv_cheats 1";
 
 	if (ui->monitorCmbBox->currentIndex() > 0)  // the first item is a placeholder for leaving it default
-		cmdStream << " +vid_adapter " << ui->monitorCmbBox->currentIndex();  // and ZDoom indexes monitors from 1
+	{
+		// terrible hack, but it's not my fault
+		int vid_adapter;
+		if (selectedEngineIdx >= 0 && getFileNameFromPath( engineModel[ selectedEngineIdx ].path ).startsWith("zdoom"))
+			vid_adapter = ui->monitorCmbBox->currentIndex();      // in ZDoom monitors are indexed from 1
+		else
+			vid_adapter = ui->monitorCmbBox->currentIndex() - 1;  // but in newer derivatives from 0
+		cmdStream << " +vid_adapter " << vid_adapter;
+	}
 	if (!ui->resolutionXLine->text().isEmpty())
 		cmdStream << " -width " << ui->resolutionXLine->text();
 	if (!ui->resolutionYLine->text().isEmpty())

Sources/OSUtils.cpp

@@ -10,21 +10,26 @@
 
 #include <QStandardPaths>
 #include <QApplication>
+#include <QGuiApplication>
+#include <QScreen>
+
 #include <QDebug>
 
 #ifdef _WIN32
-#include <windows.h>
+//#include <windows.h>
 #else
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
+//#include <X11/Xlib.h>
+//#include <X11/extensions/Xrandr.h>
+//#include <SDL2/SDL.h>
+//#include <SDL2/SDL_vulkan.h>
 #endif // _WIN32
 
 
 //======================================================================================================================
 
 #ifdef _WIN32
-static BOOL CALLBACK enumMonitorCallback( HMONITOR hMonitor, HDC /*hdc*/, LPRECT /*lprcClip*/, LPARAM userData )
-{
+//static BOOL CALLBACK enumMonitorCallback( HMONITOR hMonitor, HDC /*hdc*/, LPRECT /*lprcClip*/, LPARAM userData )
+/*{
 	QVector< MonitorInfo > * monitors = (QVector< MonitorInfo > *)userData;
 
 	MONITORINFOEXA theirInfo;
@@ -40,22 +45,34 @@ static BOOL CALLBACK enumMonitorCallback( HMONITOR hMonitor, HDC /*hdc*/, LPRECT
 	}
 
 	return TRUE;
-};
+};*/
 #endif // _WIN32
 
 QVector< MonitorInfo > listMonitors()
 {
 	QVector< MonitorInfo > monitors;
 
-	// We can't use Qt for that because Qt reorders the monitors so that the primary one is always first,
-	// but we need them in the original order given by system.
+	// in the end this work well for both platforms, just ZDoom indexes the monitors from 1 while GZDoom from 0
+	QList<QScreen *> screens = QGuiApplication::screens();
+	for (int monitorIdx = 0; monitorIdx < screens.count(); monitorIdx++)
+	{
+		MonitorInfo myInfo;
+		myInfo.name = screens[ monitorIdx ]->name();
+		myInfo.width = screens[ monitorIdx ]->size().width();
+		myInfo.height = screens[ monitorIdx ]->size().height();
+		myInfo.isPrimary = monitorIdx == 0;
+		monitors.push_back( myInfo );
+	}
 
 #ifdef _WIN32
 
+/* WinAPI
 	EnumDisplayMonitors( nullptr, nullptr, (MONITORENUMPROC)enumMonitorCallback, (LONG_PTR)&monitors );
+*/
 
 #else
 
+/* libXrandr
 	Display * display = XOpenDisplay( nullptr );
 	if (!display)
 	{
@@ -104,6 +121,26 @@ QVector< MonitorInfo > listMonitors()
 
 	XFree( xMonitors );
 	XCloseDisplay( display );
+*/
+
+/* SDL2
+	SDL_Init( SDL_INIT_VIDEO );
+
+	int monitorCnt = SDL_GetNumVideoDisplays();
+	for (int monitorIdx = 0; monitorIdx < monitorCnt; monitorIdx++)
+	{
+		MonitorInfo myInfo;
+		SDL_DisplayMode mode;
+		SDL_GetCurrentDisplayMode( monitorIdx, &mode );
+		myInfo.name = SDL_GetDisplayName( monitorIdx );
+		myInfo.width = mode.w;
+		myInfo.height = mode.h;
+		myInfo.isPrimary = monitorIdx == 0;
+		monitors.push_back( myInfo );
+	}
+
+	SDL_Quit();
+*/
 
 #endif // _WIN32