Changeset 130

Timestamp:

08/26/10 15:38:59 (18 months ago)

Author:

Carsten

Message:

Revised custom video mode handling and initialization.

Location:

cafu/branches/cafu_to_wx/Ca3DE

Files:

• AppCafu.cpp (modified) (4 diffs)
• AppCafu.hpp (modified) (2 diffs)
• ConDefs.cpp (modified) (1 diff)
• MainCanvas.cpp (modified) (2 diffs)
• MainFrame.cpp (modified) (2 diffs)

cafu/branches/cafu_to_wx/Ca3DE/AppCafu.cpp

@@ -86 +86 @@
 AppCafu::AppCafu()
     : wxApp(),
-      m_IsFullScreen(false),
+      m_IsCustomVideoMode(false),
       m_MainFrame(NULL)
 {
@@ -143 +143 @@
     SoundShaderManager->RegisterSoundShaderScriptsInDir("Games/"+GameName+"/SoundShader", "Games/"+GameName+"/");
 
-    // Change display mode.
-    wxDisplay Display;
-
-    m_DesktopMode=Display.GetCurrentMode();
-
-    if (m_DesktopMode.w==0) m_DesktopMode.w=wxGetDisplaySize().x;
-    if (m_DesktopMode.h==0) m_DesktopMode.h=wxGetDisplaySize().y;
-
-    m_CurrentMode=m_DesktopMode;
-
-    extern ConVarT Options_ClientWindowSizeX;
-    extern ConVarT Options_ClientWindowSizeY;
-    extern ConVarT Options_ClientDisplayBPP;
-    extern ConVarT Options_ClientDisplayRefresh;
+
+    // Change the video mode. Although the two actions
+    //
+    //     (a) change the screen resolution (video mode) and
+    //     (b) show the Cafu window full-screen
+    //
+    // are theoretically independent of each other, case "(a) but not (b)" does not make sense at all;
+    // case "not (a) but (b)" makes more sense but is atypical as well, and is easily switched from case
+    // "neither (a) nor (b)" by pressing F11. Thus, we are effectively only concerned by two cases:
+    //
+    //     (1) windowed mode:    "neither (a) nor (b)"
+    //     (2) full-screen mode: "both (a) and (b)"
+    //
+    // For case (1), we simply open a normal application window with dimensions Options_ClientWindowSize[X/Y].
+    // For case (2), we change the video mode as specified by Options_Client* and show the application
+    // window full-screen.
+    wxDisplay      Display;
     extern ConVarT Options_ClientFullScreen;
 
     if (Options_ClientFullScreen.GetValueBool())
     {
-        const wxVideoMode VideoMode(Options_ClientWindowSizeX.GetValueInt(),
-                                    Options_ClientWindowSizeY.GetValueInt(),
-                                    Options_ClientDisplayBPP.GetValueInt(),
-                                    Options_ClientDisplayRefresh.GetValueInt());
-
-        if (Display.ChangeMode(VideoMode))
+        extern ConVarT Options_ClientWindowSizeX;
+        extern ConVarT Options_ClientWindowSizeY;
+        extern ConVarT Options_ClientDisplayBPP;
+        extern ConVarT Options_ClientDisplayRefresh;
+
+        const wxVideoMode VideoMode1(Options_ClientWindowSizeX.GetValueInt(),
+                                     Options_ClientWindowSizeY.GetValueInt(),
+                                     Options_ClientDisplayBPP.GetValueInt(),
+                                     Options_ClientDisplayRefresh.GetValueInt());
+
+        const wxVideoMode VideoMode2(Options_ClientWindowSizeX.GetValueInt(),
+                                     Options_ClientWindowSizeY.GetValueInt(),
+                                     Options_ClientDisplayBPP.GetValueInt(), 0);
+
+        const wxVideoMode VideoMode3(Options_ClientWindowSizeX.GetValueInt(),
+                                     Options_ClientWindowSizeY.GetValueInt(), 0, 0);
+
+        if (Display.ChangeMode(VideoMode1))
         {
-            m_CurrentMode=Display.GetCurrentMode();
-            m_IsFullScreen=true;
+            m_IsCustomVideoMode=true;
+        }
+        else if (Display.ChangeMode(VideoMode2))
+        {
+            Options_ClientDisplayRefresh.SetValue(Display.GetCurrentMode().refresh);
+            m_IsCustomVideoMode=true;
+        }
+        else if (Display.ChangeMode(VideoMode3))
+        {
+            Options_ClientDisplayBPP.SetValue(Display.GetCurrentMode().bpp);
+            Options_ClientDisplayRefresh.SetValue(Display.GetCurrentMode().refresh);
+            m_IsCustomVideoMode=true;
         }
         else
         {
             wxMessageBox("Cafu tried to change the video mode to\n"+
-                wxString::Format("        %i x %i, %i BPP at %i Hz,\n", VideoMode.w, VideoMode.h, VideoMode.bpp, VideoMode.refresh)+
+                wxString::Format("        %i x %i, %i bpp at %i Hz,\n", VideoMode1.w, VideoMode1.h, VideoMode1.bpp, VideoMode1.refresh)+
+                wxString::Format("        %i x %i, %i bpp at any refresh rate,\n", VideoMode2.w, VideoMode2.h, VideoMode2.bpp)+
+                wxString::Format("        %i x %i at any color depth and refresh rate,\n", VideoMode3.w, VideoMode3.h)+
                 "but it didn't work out (zero values mean system defaults).\n"+
                 "We will use the currently active video mode instead and continue.\n\n"+
@@ -180 +207 @@
                 "or tweak the video mode details via the console variables.\n",
                 "Could not change the video mode", wxOK | wxICON_EXCLAMATION);
+
+            Options_ClientFullScreen.SetValue(false);
         }
     }
+
+    m_CurrentMode=Display.GetCurrentMode();
+
+    if (m_CurrentMode.w==0) { m_CurrentMode.w=wxGetDisplaySize().x; wxLogDebug("Set m_CurrentMode.w from 0 to %i", m_CurrentMode.w); }
+    if (m_CurrentMode.h==0) { m_CurrentMode.h=wxGetDisplaySize().y; wxLogDebug("Set m_CurrentMode.h from 0 to %i", m_CurrentMode.h); }
+
+    if (m_CurrentMode.w<200) { m_CurrentMode.w=1024; wxLogDebug("Set m_CurrentMode.w from <200 to %i", m_CurrentMode.w); }
+    if (m_CurrentMode.h<150) { m_CurrentMode.h= 768; wxLogDebug("Set m_CurrentMode.h from <150 to %i", m_CurrentMode.h); }
+
 
     // Create the main frame.
@@ -193 +231 @@
 int AppCafu::OnExit()
 {
-    if (m_CurrentMode!=m_DesktopMode)
+    if (m_IsCustomVideoMode)
     {
         wxDisplay Display;
 
-        Display.ChangeMode(m_DesktopMode);
+        // Reset the display to default (desktop) video mode.
+        Display.ChangeMode();
     }
 

cafu/branches/cafu_to_wx/Ca3DE/AppCafu.hpp

@@ -49 +49 @@
     AppCafu();
 
-    /// This method returns the desktops video mode (that was active before the Cafu application was started).
-    const wxVideoMode& GetDesktopMode() const { return m_DesktopMode; }
+    /// Returns whether we successfully set a custom video mode (screen resolution) during initialization.
+    bool IsCustomVideoMode() const { return m_IsCustomVideoMode; }
 
     /// This method returns the current video mode, which may be identical to the desktops video mode
     /// (in which case the mode as not switched at all at app init), or any custom mode.
     const wxVideoMode& GetCurrentMode() const { return m_CurrentMode; }
-
-    /// Returns whether we're running in full-screen mode (with video mode changed, no frame border, etc.)
-    /// or in a regular window (on the desktop, with frame border, etc.).
-    bool IsFullScreen() const { return m_IsFullScreen; }
 
     /// Returns the main frame of the Cafu application.
@@ -72 +68 @@
     bool OnCmdLineParsed(wxCmdLineParser& Parser);
 
-    wxVideoMode m_DesktopMode;      ///< The desktops video mode.
-    wxVideoMode m_CurrentMode;      ///< The video mode we're currently using.
-    bool        m_IsFullScreen;     ///< Whether we are running in full-screen mode (with video mode changed, no frame border, etc.) or in a regular window (on the desktop, with frame border, etc.).
-    MainFrameT* m_MainFrame;
+    bool        m_IsCustomVideoMode;  ///< Whether we successfully set a custom video mode (screen resolution) during initialization.
+    wxVideoMode m_CurrentMode;        ///< The video mode that we're currently using.
+    MainFrameT* m_MainFrame;          ///< The Cafu application main frame.
 };
 

cafu/branches/cafu_to_wx/Ca3DE/ConDefs.cpp

@@ -77 +77 @@
 
 
+static bool CompareModes(const wxVideoMode& Mode1, const wxVideoMode& Mode2)
+{
+    // Compare the widths.
+    if (Mode1.w < Mode2.w) return true;
+    if (Mode1.w > Mode2.w) return false;
+
+    // The widths are equal, now compare the heights.
+    if (Mode1.h < Mode2.h) return true;
+    if (Mode1.h > Mode2.h) return false;
+
+    // The widths and heights are equal, now compare the BPP.
+    if (Mode1.bpp < Mode2.bpp) return true;
+    if (Mode1.bpp > Mode2.bpp) return false;
+
+    // The widths, heights and BPPs are equal, now compare the refresh rate.
+    if (Mode1.refresh < Mode2.refresh) return true;
+    if (Mode1.refresh > Mode2.refresh) return false;
+
+    // The modes are equal.
+    return false;
+}
+
+static std::string GetVideoModes()
+{
+    ArrayT<wxVideoMode> Modes;
+
+    {
+        wxDisplay         Display;
+        wxArrayVideoModes wxModes=Display.GetModes();
+
+        for (size_t ModeNr=0; ModeNr<wxModes.GetCount(); ModeNr++)
+            Modes.PushBack(wxModes[ModeNr]);
+    }
+
+    // Remove modes according to certain filter criteria, cutting excessively long mode lists.
+    for (unsigned long ModeNr=0; ModeNr<Modes.Size(); ModeNr++)
+    {
+        const wxVideoMode& Mode=Modes[ModeNr];
+
+        if (Mode.w==0 || Mode.h==0 || Mode.bpp<15)
+        {
+            Modes.RemoveAt(ModeNr);
+            ModeNr--;
+            continue;
+        }
+
+        for (unsigned long OtherNr=0; OtherNr<Modes.Size(); OtherNr++)
+        {
+            if (OtherNr==ModeNr) continue;
+
+            const wxVideoMode& Other=Modes[OtherNr];
+
+            if (Mode==Other || (Mode.w==Other.w && Mode.h==Other.h && Mode.bpp<32 && Mode.bpp<Other.bpp))
+            {
+                Modes.RemoveAt(ModeNr);
+                ModeNr--;
+                break;
+            }
+        }
+
+        // Note that the above loop is written in a way that allows no additional statements here.
+    }
+
+    // Sort the modes by increasing width, height, BPP and refresh rate.
+    Modes.QuickSort(CompareModes);
+
+    // Build the result string.
+    wxString List;
+
+    for (unsigned long ModeNr=0; ModeNr<Modes.Size(); ModeNr++)
+    {
+        const wxVideoMode& Mode=Modes[ModeNr];
+
+        List+=wxString::Format("%i x %i, %i bpp, %i Hz\n", Mode.w, Mode.h, Mode.bpp, Mode.refresh);
+    }
+
+    return List.ToStdString();
+}
+
+// Note that the format of the VideoModes string is fixed - it is parsed by the Main Menu GUI in order to populate the choice box.
+static ConVarT VideoModes("VideoModes", GetVideoModes(), ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_READ_ONLY, "The list of video modes that are available on your system.");
+
+
 static int ConFunc_CleanupPersistentConfig_Callback(lua_State* LuaState)
 {

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -23 +23 @@
 
 #include "MainCanvas.hpp"
+#include "AppCafu.hpp"
 #include "MainFrame.hpp"
 #include "Client/Client.hpp"
@@ -902 +903 @@
         case WXK_F11:
         {
-            m_Parent->ShowFullScreen(!m_Parent->IsFullScreen());
+            if (!wxGetApp().IsCustomVideoMode())
+            {
+                // Switching full-screen mode with F11 only makes sense if we didn't set a custom video mode (screen resolution).
+                // See AppCafuT::OnInit() for more details.
+                m_Parent->ShowFullScreen(!m_Parent->IsFullScreen());
+            }
             return;
         }

cafu/branches/cafu_to_wx/Ca3DE/MainFrame.cpp

@@ -32 +32 @@
 
 
-static long int GetStyle()
-{
-    // This seems to be a limitation of Windows:
-    // Creating a frame with a border that is shown full-screen in a video mode
-    // other than the default (desktop) mode does not properly fill the screen...
-    return wxGetApp().IsFullScreen() ? 0 : wxDEFAULT_FRAME_STYLE;
-}
-
-
 MainFrameT::MainFrameT()
-    : wxFrame(NULL /*parent*/, wxID_ANY, wxString("Cafu Engine - ") + __DATE__, wxDefaultPosition, wxDefaultSize, GetStyle()),
+    : wxFrame(NULL /*parent*/, wxID_ANY, wxString("Cafu Engine - ") + __DATE__),
       m_MainCanvas(NULL)
 {
@@ -59 +50 @@
 
     // Show the frame - it is not shown by default...
-    if (wxGetApp().IsFullScreen()) ShowFullScreen(true); else Show();
+    if (wxGetApp().IsCustomVideoMode()) ShowFullScreen(true); else Show();
 }