Changeset 10065 for ps

Timestamp:

08/23/11 00:34:59 (13 years ago)

Author:

philip

Message:

Report desktop display size (not just window size)

Location:

ps/trunk/source/ps

Files:

• GameSetup/HWDetect.cpp (modified) (2 diffs)
• VideoMode.cpp (modified) (1 diff)
• VideoMode.h (modified) (1 diff)

ps/trunk/source/ps/GameSetup/HWDetect.cpp

@@ -201 +201 @@
     scriptInterface.SetProperty(settings.get(), "video_bpp", g_VideoMode.GetBPP());
 
+    scriptInterface.SetProperty(settings.get(), "video_desktop_xres", g_VideoMode.GetDesktopXRes());
+    scriptInterface.SetProperty(settings.get(), "video_desktop_yres", g_VideoMode.GetDesktopYRes());
+    scriptInterface.SetProperty(settings.get(), "video_desktop_bpp", g_VideoMode.GetDesktopBPP());
+    scriptInterface.SetProperty(settings.get(), "video_desktop_freq", g_VideoMode.GetDesktopFreq());
+
     struct utsname un;
     uname(&un);
@@ -259 +264 @@
 
     // Send the same data to the reporting system
-    g_UserReporter.SubmitReport("hwdetect", 7, scriptInterface.StringifyJSON(settings.get(), false));
+    g_UserReporter.SubmitReport("hwdetect", 8, scriptInterface.StringifyJSON(settings.get(), false));
 
     // Run the detection script:

ps/trunk/source/ps/VideoMode.cpp

@@ -381 +381 @@
     return m_CurrentBPP;
 }
+
+int CVideoMode::GetDesktopXRes()
+{
+    ENSURE(m_IsInitialised);
+    return m_PreferredW;
+}
+
+int CVideoMode::GetDesktopYRes()
+{
+    ENSURE(m_IsInitialised);
+    return m_PreferredH;
+}
+
+int CVideoMode::GetDesktopBPP()
+{
+    ENSURE(m_IsInitialised);
+    return m_PreferredBPP;
+}
+
+int CVideoMode::GetDesktopFreq()
+{
+    ENSURE(m_IsInitialised);
+    return m_PreferredFreq;
+}

ps/trunk/source/ps/VideoMode.h

@@ -67 +67 @@
     int GetBPP();
 
+    int GetDesktopXRes();
+    int GetDesktopYRes();
+    int GetDesktopBPP();
+    int GetDesktopFreq();
+
 private:
     void ReadConfig();