ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Video: Distinguish between interlace and non-interlace X11 XRANDR modes

This commit is contained in:
Adam Moss 2015-01-07 20:20:14 +00:00
parent 25fac0282c
commit ee1941769b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/X11Utils.cpp
View File

@ -133,6 +133,7 @@ void XRRConfiguration::Update()
// Get the resolution setings for fullscreen mode // Get the resolution setings for fullscreen mode
unsigned int fullWidth, fullHeight; unsigned int fullWidth, fullHeight;
char *output_name = nullptr; char *output_name = nullptr;
char auxFlag = '\0';
if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.find(':') == if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.find(':') ==
std::string::npos) std::string::npos)
{ {
@ -142,8 +143,10 @@ void XRRConfiguration::Update()
else else
{ {
sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(), sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
"%m[^:]: %ux%u", &output_name, &fullWidth, &fullHeight); "%m[^:]: %ux%u%c", &output_name, &fullWidth, &fullHeight, &auxFlag);
ERROR_LOG(AUDIO, "auxflag = %c", auxFlag);
} }
bool want_interlaced = ('i' == auxFlag);
for (int i = 0; i < screenResources->noutput; i++) for (int i = 0; i < screenResources->noutput; i++)
{ {
@ -170,8 +173,14 @@ void XRRConfiguration::Update()
{ {
if (output_info->modes[j] == screenResources->modes[k].id) if (output_info->modes[j] == screenResources->modes[k].id)
{ {
std::string modename(screenResources->modes[k].name, screenResources->modes[k].nameLength);
ERROR_LOG(AUDIO, "%dx%d: %d %08x / %s", screenResources->modes[k].width,
screenResources->modes[k].height,
screenResources->modes[k].dotClock,
screenResources->modes[k].modeFlags, modename.c_str());
if (fullWidth == screenResources->modes[k].width && if (fullWidth == screenResources->modes[k].width &&
fullHeight == screenResources->modes[k].height) fullHeight == screenResources->modes[k].height &&
want_interlaced == !!(screenResources->modes[k].modeFlags & RR_Interlace))
{ {
fullMode = screenResources->modes[k].id; fullMode = screenResources->modes[k].id;
if (crtcInfo->x + (int)screenResources->modes[k].width > fs_fb_width) if (crtcInfo->x + (int)screenResources->modes[k].width > fs_fb_width)
@ -261,9 +270,10 @@ void XRRConfiguration::AddResolutions(std::vector<std::string>& resos)
{ {
if (output_info->modes[j] == screenResources->modes[k].id) if (output_info->modes[j] == screenResources->modes[k].id)
{ {
bool interlaced = !!(screenResources->modes[k].modeFlags & RR_Interlace);
const std::string strRes = const std::string strRes =
std::string(output_info->name) + ": " + std::string(output_info->name) + ": " +
std::string(screenResources->modes[k].name); std::string(screenResources->modes[k].name) + (interlaced? "i" : "");
// Only add unique resolutions // Only add unique resolutions
if (std::find(resos.begin(), resos.end(), strRes) == resos.end()) if (std::find(resos.begin(), resos.end(), strRes) == resos.end())
{ {