ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xrandr: use primary output if window manager reports this information

Browse Source
This commit is contained in:
Deve 2014-08-16 12:20:25 +02:00
parent 990a297154
commit a9bd12bfab
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -1605,6 +1605,8 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
XRROutputInfo *output = NULL;
XRRCrtcInfo* crtc = NULL;
crtc_x = crtc_y = -1;
RROutput primary_id = XRRGetOutputPrimary(display, DefaultRootWindow(display));
for (int i = 0; i < res->noutput; i++)
{
@ -1625,6 +1627,14 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
continue;
}
if (res->outputs[i] == primary_id)
{
output_id = res->outputs[i];
crtc_x = crtc->x;
crtc_y = crtc->y;
break;
}
if (crtc_x == -1 || crtc->x < crtc_x)
{
crtc_x = crtc->x;
@ -1641,7 +1651,7 @@ video::IVideoModeList* CIrrDeviceLinux::getVideoModeList()
XRRFreeCrtcInfo(crtc);
XRRFreeOutputInfo(output);
}
output = XRRGetOutputInfo(display, res, output_id);
crtc = XRRGetCrtcInfo(display, res, output->crtc);