Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-22 00:49:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/fullscreen.c
	src/internal.h
	src/win32_fullscreen.c
	src/win32_platform.h
	src/x11_fullscreen.c
	tests/modes.c
This commit is contained in:
Camilla Berglund
2012-08-03 02:57:33 +02:00
parent f4880b9206 3c912cbc3c
commit 854e634fec
28 changed files with 1330 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/win32_fullscreen.c
+60 -25
View File
@@ -182,52 +182,87 @@ void _glfwRestoreVideoMode(void)
// Get a list of available video modes
//========================================================================
int _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, GLFWvidmode* list, int maxcount)
GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* found)
{
DWORD deviceModeIndex = 0;
int modeCount = 0;
int deviceModeIndex = 0, count = 0;
GLFWvidmode* result = NULL;
WCHAR* deviceName;
WCHAR* deviceName = _glfwCreateWideStringFromUTF8(monitor->Win32.name);
deviceName = _glfwCreateWideStringFromUTF8(monitor->Win32.name);
if (!deviceName)
return 0;
{
_glfwSetError(GLFW_PLATFORM_ERROR, "Win32: Failed to convert device name");
return NULL;
}
*found = 0;
for (;;)
{
int i;
GLFWvidmode mode;
DEVMODE deviceMode;
DEVMODE dm;
ZeroMemory(&deviceMode, sizeof(DEVMODE));
deviceMode.dmSize = sizeof(DEVMODE);
ZeroMemory(&dm, sizeof(DEVMODE));
dm.dmSize = sizeof(DEVMODE);
if (!EnumDisplaySettings(deviceName, deviceModeIndex, &deviceMode))
break;
if (!EnumDisplaySettings(deviceName, deviceModeIndex, &dm))
break;
deviceModeIndex++;
if (deviceMode.dmBitsPerPel < 15)
if (dm.dmBitsPerPel < 15)
{
// Skip modes with less than 15 BPP
continue;
}
mode.height = deviceMode.dmPelsHeight;
mode.width = deviceMode.dmPelsWidth;
_glfwSplitBPP(deviceMode.dmBitsPerPel,
&mode.redBits,
&mode.greenBits,
&mode.blueBits);
mode.width = dm.dmPelsWidth;
mode.height = dm.dmPelsHeight;
_glfwSplitBPP(dm.dmBitsPerPel,
&mode.redBits,
&mode.greenBits,
&mode.blueBits);
// Skip duplicate modes
if (bsearch(&mode, list, modeCount, sizeof(GLFWvidmode), _glfwCompareVideoModes))
for (i = 0; i < *found; i++)
{
if (_glfwCompareVideoModes(result + i, &mode) == 0)
break;
}
if (i < *found)
{
// This is a duplicate, so skip it
continue;
}
list[modeCount] = mode;
modeCount++;
if (*found == count)
{
void* larger;
qsort(list, modeCount, sizeof(GLFWvidmode), _glfwCompareVideoModes);
if (count)
count *= 2;
else
count = 128;
if (modeCount >= maxcount)
break;
larger = realloc(result, count * sizeof(GLFWvidmode));
if (!larger)
{
free(result);
_glfwSetError(GLFW_OUT_OF_MEMORY, NULL);
return NULL;
}
result = (GLFWvidmode*) larger;
}
result[*found] = mode;
(*found)++;
}
free(deviceName);
return modeCount;
return result;
}