Changeset 132

Timestamp:

08/26/10 18:14:55 (18 months ago)

Author:

Carsten

Message:

• Updated the Video Settings dialog of the Main Menu GUI to show the list of video modes that are actually available on the current system.
• Replaced the initial Cafu console to buffer all messages until they can be copied to the in-game console, so that e.g. Main Menu GUI init errors don't get lost.

Location:

cafu/branches/cafu_to_wx

Files:

• Ca3DE/AppCafu.cpp (modified) (3 diffs)
• Ca3DE/ConDefs.cpp (modified) (1 diff)
• Ca3DE/MainCanvas.cpp (modified) (2 diffs)
• Games/DeathMatch/GUIs/MainMenu/MainMenu_main.cgui (modified) (4 diffs)

cafu/branches/cafu_to_wx/Ca3DE/AppCafu.cpp

@@ -27 +27 @@
 #include "ClipSys/CollisionModelMan_impl.hpp"
 #include "ConsoleCommands/ConsoleInterpreterImpl.hpp"
-#include "ConsoleCommands/ConsoleStdout.hpp"
+#include "ConsoleCommands/ConsoleStringBuffer.hpp"
 #include "ConsoleCommands/ConVar.hpp"
 #include "ConsoleCommands/ConFunc.hpp"
@@ -48 +48 @@
 // For each interface that is globally available to the application,
 // provide a definition for the pointer instance and have it point to an implementation.
-static cf::ConsoleStdoutT ConsoleStdout;
-cf::ConsoleI* Console=&ConsoleStdout;
-
-// static cf::ConsoleFileT ConsoleFile("info.log");
+static cf::ConsoleStringBufferT ConsoleStringBuffer;
+cf::ConsoleI* Console=&ConsoleStringBuffer;
+
+// static cf::ConsoleFileT ConsoleFile("console.log");
 // cf::ConsoleI* Console=&ConsoleFile;
 
@@ -203 +203 @@
                 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"+
+                "We will continue with the currently active video mode instead, where you can press F11 to toggle full-screen mode.\n\n"+
                 "Alternatively, you can set a different video mode at the Options menu,\n"+
                 "or tweak the video mode details via the console variables.\n",

cafu/branches/cafu_to_wx/Ca3DE/ConDefs.cpp

@@ -62 +62 @@
 /*static*/ ConVarT Options_ClientRemoteName        ("dlg_clRemoteName", "192.168.1.1", ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Name or IP of the server the client connects to.");
 /*static*/ ConVarT Options_ClientRemotePortNr      ("dlg_clRemotePort",         30000, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "Port number of the remote server.", 0, 0xFFFF);
-/*static*/ ConVarT Options_ClientDisplayBPP        ("dlg_clDisplayBPP",            32, ConVarT::FLAG_MAIN_EXE,                            "The display depth in bits-per-pixel. Normally use 32, or 0 for system default.", 0, 64);
-/*static*/ ConVarT Options_ClientDisplayRefresh    ("dlg_clDisplayRefresh",         0, ConVarT::FLAG_MAIN_EXE,                            "The display refresh rate. Use 0 for system default, check with your monitor specs for any other value.");
+/*static*/ ConVarT Options_ClientDisplayBPP        ("dlg_clDisplayBPP",            32, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "The display depth in bits-per-pixel. Normally use 32, or 0 for system default.", 0, 64);
+/*static*/ ConVarT Options_ClientDisplayRefresh    ("dlg_clDisplayRefresh",         0, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "The display refresh rate. Use 0 for system default, check with your monitor specs for any other value.");
 /*static*/ ConVarT Options_ClientTextureDetail     ("dlg_clTextureDetail",          0, ConVarT::FLAG_MAIN_EXE | ConVarT::FLAG_PERSISTENT, "0 high detail, 1 medium detail, 2 low detail", 0, 2);
 /*static*/ ConVarT Options_ServerGameName          ("dlg_svGameName",    "DeathMatch", ConVarT::FLAG_MAIN_EXE,                            "Name of the game (MOD) to load.");

cafu/branches/cafu_to_wx/Ca3DE/MainCanvas.cpp

@@ -33 +33 @@
 #include "ConsoleCommands/Console.hpp"
 #include "ConsoleCommands/ConsoleInterpreter.hpp"
+#include "ConsoleCommands/ConsoleStringBuffer.hpp"
 #include "ConsoleCommands/ConVar.hpp"
 #include "GuiSys/ConsoleByWindow.hpp"
@@ -438 +439 @@
     m_PrevConsole=Console;
     Console=m_ConByGuiWin;
+
+    // Copy the output to the previous console to the now current console.
+    cf::ConsoleStringBufferT* ConsoleSB=dynamic_cast<cf::ConsoleStringBufferT*>(m_PrevConsole);
+    if (ConsoleSB) Console->Print(ConsoleSB->GetBuffer());
 
     m_InitState=INIT_SUCCESS;

cafu/branches/cafu_to_wx/Games/DeathMatch/GUIs/MainMenu/MainMenu_main.cgui

@@ -19 +19 @@
 
     return "";
+end
+
+-- Parses a string that describes a video mode. It returns the width, height, colour depth and refresh rate.
+function ParseModeStr(ModeStr)
+    -- For case-insensitive matching, translate the entire string to lower case.
+    ModeStr=ModeStr:lower();
+
+    local width, height=ModeStr:match("(%d+)%s*x%s*(%d+)");
+    local bpp          =ModeStr:match("(%d+)%s*bpp");
+    local rate         =ModeStr:match("(%d+)%s*hz");
+
+    if width  then width =tonumber(width);  end
+    if height then height=tonumber(height); end
+    if bpp    then bpp   =tonumber(bpp);    end
+    if rate   then rate  =tonumber(rate);   end
+
+    return width, height, bpp, rate;
 end
 
@@ -544 +561 @@
 
 function OptionsContextMenu.Frame.Video:OnMouseButtonUp()
-    -- Select the first screen resolution that is at least as wide as "dlg_clWindowSizeX" (1024*768 is used as a fall-back).
-    VideoOptionsDialog.Frame.ScreenResChoice:SetSelection(2);   -- Safety if the loop below fails for some reason.
+    -- Select the screen resolution that matches the one specified in the console variables.
+    VideoOptionsDialog.Frame.ScreenResChoice:SetSelection(0);   -- Safety if the loop below fails for some reason.
 
     for ModeNr=0, VideoOptionsDialog.Frame.ScreenResChoice:GetNumChoices()-1 do
-        local ResX=tonumber(VideoOptionsDialog.Frame.ScreenResChoice:GetChoice(ModeNr):match("%d+"));
-
-        if (ResX>=ci.GetValue("dlg_clWindowSizeX")) then
+        local width, height, bpp, rate=ParseModeStr(VideoOptionsDialog.Frame.ScreenResChoice:GetChoice(ModeNr));
+
+        if width==ci.GetValue("dlg_clWindowSizeX") and height==ci.GetValue("dlg_clWindowSizeY") then
+            -- The width and height match, select this mode.
             VideoOptionsDialog.Frame.ScreenResChoice:SetSelection(ModeNr);
-            break;
+
+            if bpp==ci.GetValue("dlg_clDisplayBPP") and rate==ci.GetValue("dlg_clDisplayRefresh") then
+                -- The color depth and refresh rate match, too - stop looking for a better match.
+                break;
+            end
         end
     end
@@ -1160 +1182 @@
 -- Move into OnInit()?
 VideoOptionsDialog.Frame.ScreenResChoice:Clear();
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 640 x 480");
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 800 x 600");
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1024 x 768");
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1152 x 864");
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1280 x 1024");
-VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1600 x 1200");
-VideoOptionsDialog.Frame.ScreenResChoice:SetSelection(2);   -- Set again when the dialog is shown.
+
+-- For each video mode in console variable "VideoModes" (a multi-line string with one
+-- video mode per line, separated by new-lines), append a choice to the choice window.
+for ModeStr in ci.GetValue("VideoModes"):gmatch("[^\n]+") do
+    VideoOptionsDialog.Frame.ScreenResChoice:Append(" "..ModeStr);
+end
+
+-- It is possible (though normally not necessary) to add custom video modes here,
+-- for example when your favorite video mode is not automatically detected and provided above.
+-- There is no guarantee though that the graphics driver can set any custom modes
+-- (or else the mode had been automatically included in the enumeration above).
+-- Examples:
+-- VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1152 x 864");
+-- VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1440 x 900, 32 bpp, 60 Hz");
+
+-- The list of video modes above should never be totally empty,
+-- but still just handle the case here to be totally sure.
+if (VideoOptionsDialog.Frame.ScreenResChoice:GetNumChoices()==0) then
+    Console.Warning("Console variable VideoModes is empty!");
+
+    VideoOptionsDialog.Frame.ScreenResChoice:Append(" 640 x 480");
+    VideoOptionsDialog.Frame.ScreenResChoice:Append(" 800 x 600");
+    VideoOptionsDialog.Frame.ScreenResChoice:Append(" 1024 x 768");
+end
+
+VideoOptionsDialog.Frame.ScreenResChoice:SetSelection(0);   -- Set again when the dialog is shown.
 
 function VideoOptionsDialog.Frame.ScreenResChoice:OnSelectionChanged(SelNum)
@@ -1215 +1256 @@
     local ModeStr=VideoOptionsDialog.Frame.ScreenResChoice:GetChoice(ModeNr);
 
-    local ResX, ResY=ModeStr:match("(%d+)%s*x%s*(%d+)");
-
-    ci.SetValue("dlg_clWindowSizeX",   ResX);
-    ci.SetValue("dlg_clWindowSizeY",   ResY);
+    local width, height, bpp, rate=ParseModeStr(ModeStr);
+
+    if width  then ci.SetValue("dlg_clWindowSizeX",    width ); end
+    if height then ci.SetValue("dlg_clWindowSizeY",    height); end
+    if bpp    then ci.SetValue("dlg_clDisplayBPP",     bpp   ); end
+    if rate   then ci.SetValue("dlg_clDisplayRefresh", rate  ); end
+
     ci.SetValue("dlg_clFullScreen",    VideoOptionsDialog.Frame.FullScreenChoice:GetSelection()==1);
     ci.SetValue("dlg_clTextureDetail", VideoOptionsDialog.Frame.TextureDetailChoice:GetSelection());