Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Report desktop display size (not just window size)

Browse Source 
This was SVN commit r10065.
This commit is contained in:
Ykkrosh 2011-08-22 22:34:59 +00:00
parent 27e5581d27
commit e13aeee36c
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/ps/GameSetup/HWDetect.cpp
View File

@ -200,6 +200,11 @@ void RunHardwareDetection()
scriptInterface.SetProperty(settings.get(), "video_yres", g_VideoMode.GetYRes());
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);
scriptInterface.SetProperty(settings.get(), "uname_sysname", std::string(un.sysname));
@ -258,7 +263,7 @@ void RunHardwareDetection()
#endif
// 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:

24
source/ps/VideoMode.cpp
View File

@ -380,3 +380,27 @@ int CVideoMode::GetBPP()
ENSURE(m_IsInitialised);
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;
}

5
source/ps/VideoMode.h
View File

@ -66,6 +66,11 @@ public:
int GetYRes();
int GetBPP();
int GetDesktopXRes();
int GetDesktopYRes();
int GetDesktopBPP();
int GetDesktopFreq();
private:
void ReadConfig();
int GetBestBPP();