gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-30 05:58:52 -05:00
Code Issues Projects Releases Wiki Activity

Fixed RandR per-monitor resolution enumeration.

Browse Source
This commit is contained in:
Camilla Berglund 2012-10-22 00:48:52 +02:00
parent 6fc6c93223
commit 7e225281af
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/x11_monitor.c
View File

@ -52,7 +52,6 @@ typedef struct
static _GLFWvidsize* getResolutions(_GLFWmonitor* monitor, int* found) static _GLFWvidsize* getResolutions(_GLFWmonitor* monitor, int* found)
{ {
int i, j;
_GLFWvidsize* result = NULL; _GLFWvidsize* result = NULL;
*found = 0; *found = 0;
@ -62,28 +61,57 @@ static _GLFWvidsize* getResolutions(_GLFWmonitor* monitor, int* found)
if (_glfwLibrary.X11.RandR.available) if (_glfwLibrary.X11.RandR.available)
{ {
#if defined(_GLFW_HAS_XRANDR) #if defined(_GLFW_HAS_XRANDR)
XRRScreenConfiguration* sc; XRRScreenResources* sr;
XRRScreenSize* sizes; int i, j, count = monitor->X11.output->nmode;
sc = XRRGetScreenInfo(_glfwLibrary.X11.display, _glfwLibrary.X11.root); sr = XRRGetScreenResources(_glfwLibrary.X11.display,
sizes = XRRConfigSizes(sc, found); _glfwLibrary.X11.root);
result = (_GLFWvidsize*) malloc(sizeof(_GLFWvidsize) * *found); result = (_GLFWvidsize*) malloc(sizeof(_GLFWvidsize) * count);
for (i = 0; i < *found; i++) for (i = 0; i < count; i++)
{ {
result[i].width = sizes[i].width; _GLFWvidsize size;
result[i].height = sizes[i].height;
for (j = 0; j < sr->nmode; j++)
{
if (sr->modes[j].id == monitor->X11.output->modes[i])
break;
}
if (j == sr->nmode)
continue;
size.width = sr->modes[j].width;
size.height = sr->modes[j].height;
for (j = 0; j < *found; j++)
{
if (result[j].width == size.width &&
result[j].height == size.height)
{
break;
}
}
if (j < *found)
{
// This is a duplicate, so skip it
continue;
}
result[*found] = size;
(*found)++;
} }
XRRFreeScreenConfigInfo(sc); XRRFreeScreenResources(sr);
#endif /*_GLFW_HAS_XRANDR*/ #endif /*_GLFW_HAS_XRANDR*/
} }
else if (_glfwLibrary.X11.VidMode.available) else if (_glfwLibrary.X11.VidMode.available)
{ {
#if defined(_GLFW_HAS_XF86VIDMODE) #if defined(_GLFW_HAS_XF86VIDMODE)
XF86VidModeModeInfo** modes; XF86VidModeModeInfo** modes;
int modeCount; int i, j, modeCount;
XF86VidModeGetAllModeLines(_glfwLibrary.X11.display, XF86VidModeGetAllModeLines(_glfwLibrary.X11.display,
_glfwLibrary.X11.screen, _glfwLibrary.X11.screen,