Add multi-display device support

src/engine/screen.cpp

@@ -1071,8 +1071,10 @@ namespace
             }
 
             flags |= SDL_WINDOW_RESIZABLE;
-
-            _window = SDL_CreateWindow( _previousWindowTitle.data(), _prevWindowPos.x, _prevWindowPos.y, resolutionInfo.screenWidth, resolutionInfo.screenHeight, flags );
+            SDL_Rect monRect;
+            SDL_GetDisplayBounds( DisplayMonitor(), &monRect );
+            _window = SDL_CreateWindow( _previousWindowTitle.data(), monRect.x + _prevWindowPos.x, monRect.y + _prevWindowPos.y, resolutionInfo.screenWidth,
+                                        resolutionInfo.screenHeight, flags );
             if ( _window == nullptr ) {
                 ERROR_LOG( "Failed to create an application window of " << resolutionInfo.screenWidth << " x " << resolutionInfo.screenHeight
                                                                         << " size. The error: " << SDL_GetError() )
@@ -1161,7 +1163,6 @@ namespace
         SDL_Renderer * _renderer;
         SDL_Texture * _texture;
         int _driverIndex;
-
         std::string _previousWindowTitle;
         fheroes2::Point _prevWindowPos;
         fheroes2::Size _currentScreenResolution;
@@ -1336,11 +1337,11 @@ namespace fheroes2
              && info.screenHeight == _screenSize.height ) // nothing to resize
             return;
 
+        _engine->setDisplayMonitor( _displayMonitor );
         const bool isFullScreen = _engine->isFullScreen();
 
         // deallocate engine resources
         _engine->clear();
-
         _prevRoi = {};
 
         // allocate engine resources

src/engine/screen.h

@@ -139,10 +139,21 @@ namespace fheroes2
             return _nearestScaling;
         }
 
+        int DisplayMonitor() const
+        {
+            return _displayMonitor;
+        }
+
+        void setDisplayMonitor( int monitor )
+        {
+            _displayMonitor = monitor;
+        }
+
     protected:
         BaseRenderEngine()
             : _isFullScreen( false )
             , _nearestScaling( false )
+
         {
             // Do nothing.
         }
@@ -178,6 +189,8 @@ namespace fheroes2
     private:
         bool _isFullScreen;
 
+        int _displayMonitor{ 0 };
+
         bool _nearestScaling;
     };
 
@@ -210,6 +223,16 @@ namespace fheroes2
         // Do not call this method. It serves as a patch over the basic class.
         void resize( int32_t width_, int32_t height_ ) override;
 
+        void setDisplayMonitor( int monitor )
+        {
+            _displayMonitor = monitor;
+        }
+
+        int DisplayMonitor() const
+        {
+            return _displayMonitor;
+        }
+
         void setResolution( ResolutionInfo info );
 
         bool isDefaultSize() const
@@ -252,6 +275,7 @@ namespace fheroes2
         PostRenderProcessing _postprocessing;
 
         uint8_t * _renderSurface;
+        int _displayMonitor;
 
         // Previous area drawn on the screen.
         Rect _prevRoi;

src/fheroes2/dialog/dialog_graphics_settings.cpp

@@ -24,6 +24,8 @@
 #include <string>
 #include <utility>
 
+#include <SDL_video.h>
+
 #include "agg_image.h"
 #include "dialog_resolution.h"
 #include "game_hotkeys.h"
@@ -49,17 +51,27 @@ namespace
         Mode,
         VSync,
         SystemInfo,
+        MonitorList,
         Exit
     };
 
-    const fheroes2::Size offsetBetweenOptions{ 118, 110 };
-    const fheroes2::Point optionOffset{ 69, 47 };
+    const fheroes2::Size offsetBetweenOptions{ 92, 110 };
+    const fheroes2::Point optionOffset{ 36, 47 };
     const int32_t optionWindowSize{ 65 };
 
     const fheroes2::Rect resolutionRoi{ optionOffset.x, optionOffset.y, optionWindowSize, optionWindowSize };
     const fheroes2::Rect modeRoi{ optionOffset.x + offsetBetweenOptions.width, optionOffset.y, optionWindowSize, optionWindowSize };
     const fheroes2::Rect vSyncRoi{ optionOffset.x, optionOffset.y + offsetBetweenOptions.height, optionWindowSize, optionWindowSize };
     const fheroes2::Rect systemInfoRoi{ optionOffset.x + offsetBetweenOptions.width, optionOffset.y + offsetBetweenOptions.height, optionWindowSize, optionWindowSize };
+    const fheroes2::Rect monitorList{ optionOffset.x + offsetBetweenOptions.width * 2, optionOffset.y, optionWindowSize, optionWindowSize };
+    const fheroes2::Rect fillerRoi{ optionOffset.x + offsetBetweenOptions.width * 2, optionOffset.y + offsetBetweenOptions.height, optionWindowSize, optionWindowSize };
+
+    void drawMonitor( const fheroes2::Rect & optionRoi )
+    {
+        const Settings & conf = Settings::Get();
+        fheroes2::drawOption( optionRoi, fheroes2::AGG::GetICN( ICN::SPANEL, Settings::Get().isEvilInterfaceEnabled() ? 17 : 16 ), "Display Monitor",
+                              SDL_GetDisplayName( conf.DisplayMonitor() ), fheroes2::UiOptionTextWidth::TWO_ELEMENTS_ROW );
+    }
 
     void drawResolution( const fheroes2::Rect & optionRoi )
     {
@@ -126,8 +138,11 @@ namespace
 
         const Settings & conf = Settings::Get();
         const bool isEvilInterface = conf.isEvilInterfaceEnabled();
-        const fheroes2::Sprite & dialog = fheroes2::AGG::GetICN( ( isEvilInterface ? ICN::ESPANBKG_EVIL : ICN::ESPANBKG ), 0 );
+        const fheroes2::Sprite & dialog = fheroes2::AGG::GetICN( ( isEvilInterface ? ICN::CSPANBKE : ICN::CSPANBKG ), 0 );
         const fheroes2::Sprite & dialogShadow = fheroes2::AGG::GetICN( ( isEvilInterface ? ICN::CSPANBKE : ICN::CSPANBKG ), 1 );
+        fheroes2::Sprite placeholder = fheroes2::AGG::GetICN( Settings::Get().isEvilInterfaceEnabled() ? ICN::STONBAKE : ICN::STONEBAK, 0 );
+        // this image needs to be bigger than other buttons cause it's gonna fill in shadow as well
+        placeholder = fheroes2::Crop( placeholder, 0, 0, optionWindowSize + 20, optionWindowSize + 20 );
 
         const fheroes2::Point dialogOffset( ( display.width() - dialog.width() ) / 2, ( display.height() - dialog.height() ) / 2 );
         const fheroes2::Point shadowOffset( dialogOffset.x - BORDERWIDTH, dialogOffset.y );
@@ -138,19 +153,23 @@ namespace
 
         fheroes2::Blit( dialogShadow, display, windowRoi.x - BORDERWIDTH, windowRoi.y + BORDERWIDTH );
         fheroes2::Blit( dialog, display, windowRoi.x, windowRoi.y );
+        // filling the empty space alognside the shadow
+        fheroes2::Blit( placeholder, display, windowRoi.x + optionOffset.x - 10 + offsetBetweenOptions.width * 2,
+                        windowRoi.y + optionOffset.y - 10 + offsetBetweenOptions.height );
 
         fheroes2::ImageRestorer emptyDialogRestorer( display, windowRoi.x, windowRoi.y, windowRoi.width, windowRoi.height );
 
         const fheroes2::Rect windowResolutionRoi( resolutionRoi + windowRoi.getPosition() );
         const fheroes2::Rect windowModeRoi( modeRoi + windowRoi.getPosition() );
         const fheroes2::Rect windowVSyncRoi( vSyncRoi + windowRoi.getPosition() );
         const fheroes2::Rect windowSystemInfoRoi( systemInfoRoi + windowRoi.getPosition() );
-
-        const auto drawOptions = [&windowResolutionRoi, &windowModeRoi, &windowVSyncRoi, &windowSystemInfoRoi]() {
+        const fheroes2::Rect windowMonitorList( monitorList + windowRoi.getPosition() );
+        const auto drawOptions = [&windowResolutionRoi, &windowModeRoi, &windowVSyncRoi, &windowSystemInfoRoi, &windowMonitorList]() {
             drawResolution( windowResolutionRoi );
             drawMode( windowModeRoi );
             drawVSync( windowVSyncRoi );
             drawSystemInfo( windowSystemInfoRoi );
+            drawMonitor( windowMonitorList );
         };
 
         drawOptions();
@@ -187,6 +206,9 @@ namespace
             if ( le.MouseClickLeft( windowSystemInfoRoi ) ) {
                 return SelectedWindow::SystemInfo;
             }
+            if ( le.MouseClickLeft( windowMonitorList ) ) {
+                return SelectedWindow::MonitorList;
+            }
 
             if ( le.MousePressRight( windowResolutionRoi ) ) {
                 fheroes2::showStandardTextMessage( _( "Select Game Resolution" ), _( "Change the resolution of the game." ), 0 );
@@ -197,6 +219,9 @@ namespace
             else if ( le.MousePressRight( windowVSyncRoi ) ) {
                 fheroes2::showStandardTextMessage( _( "V-Sync" ), _( "The V-Sync option can be enabled to resolve flickering issues on some monitors." ), 0 );
             }
+            else if ( le.MousePressRight( windowMonitorList ) ) {
+                fheroes2::showStandardTextMessage( _( "Monitor Selection" ), _( "Toggle Between available monitors, Restart Required to take Effect" ), 0 );
+            }
             if ( le.MousePressRight( windowSystemInfoRoi ) ) {
                 fheroes2::showStandardTextMessage( _( "System Info" ), _( "Show extra information such as FPS and current time." ), 0 );
             }
@@ -253,6 +278,11 @@ namespace fheroes2
                 conf.Save( Settings::configFileName );
                 windowType = SelectedWindow::Configuration;
                 break;
+            case SelectedWindow::MonitorList:
+                conf.setDisplayMonitor( ( conf.DisplayMonitor() + 1 ) % SDL_GetNumVideoDisplays() );
+                conf.Save( Settings::configFileName );
+                windowType = SelectedWindow::Configuration;
+                break;
             default:
                 return;
             }

src/fheroes2/dialog/dialog_selectfile.cpp

@@ -509,6 +509,7 @@ namespace
                     listbox.updateScrollBarImage();
 
                     listbox.SetListContent( lists );
+                    listbox.SetCurrent( std::max( listId - 1, 0 ) );
                 }
 
                 needRedraw = true;

src/fheroes2/game/fheroes2.cpp

@@ -166,10 +166,12 @@ namespace
                         bestResolution = info;
                     }
                 }
-
+                // set display monitor to first monitor available
+                display.setDisplayMonitor( 0 );
                 display.setResolution( bestResolution );
             }
             else {
+                display.setDisplayMonitor( conf.DisplayMonitor() );
                 display.setResolution( conf.currentResolutionInfo() );
             }
 

src/fheroes2/system/settings.cpp

@@ -91,6 +91,7 @@ std::string Settings::GetVersion()
 
 Settings::Settings()
     : _resolutionInfo( fheroes2::Display::DEFAULT_WIDTH, fheroes2::Display::DEFAULT_HEIGHT )
+    , _displayMonitor( 0 )
     , game_difficulty( Difficulty::NORMAL )
     , sound_volume( 6 )
     , music_volume( 6 )
@@ -326,6 +327,10 @@ bool Settings::Read( const std::string & filePath )
         _optGlobal.SetModes( GLOBAL_ENABLE_EDITOR );
     }
 
+    if ( config.Exists( "monitor" ) ) {
+        setDisplayMonitor( std::max( config.IntParams( "monitor" ), 0 ) );
+    }
+
     return true;
 }
 
@@ -477,6 +482,9 @@ std::string Settings::String() const
         os << "editor = beta" << std::endl;
     }
 
+    os << std::endl << "# Display Monitor for Multi-Monitor Setups (defaults to first monitor)" << std::endl;
+    os << "monitor = " << DisplayMonitor() << std::endl;
+
     return os.str();
 }
 
@@ -955,6 +963,11 @@ void Settings::setDebug( int debug )
     Logging::setDebugLevel( debug );
 }
 
+void Settings::setDisplayMonitor( int monitor )
+{
+    _displayMonitor = monitor;
+}
+
 void Settings::SetSoundVolume( int v )
 {
     sound_volume = std::clamp( v, 0, 10 );

src/fheroes2/system/settings.h

@@ -249,7 +249,7 @@ class Settings
     void setHideInterface( const bool enable );
     void setEvilInterface( const bool enable );
     void setScreenScalingTypeNearest( const bool enable );
-
+    void setDisplayMonitor( int monitor );
     void SetSoundVolume( int v );
     void SetMusicVolume( int v );
 
@@ -260,6 +260,11 @@ class Settings
 
     bool setGameLanguage( const std::string & language );
 
+    int DisplayMonitor() const
+    {
+        return _displayMonitor;
+    }
+
     int SoundVolume() const
     {
         return sound_volume;
@@ -443,6 +448,8 @@ class Settings
     BitModes _optGlobal;
 
     fheroes2::ResolutionInfo _resolutionInfo;
+    int _displayMonitor;
+
     int game_difficulty;
 
     std::string path_program;