Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-21 16:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	include/GL/glfw3.h
	readme.html
	src/fullscreen.c
	src/internal.h
	src/window.c
	src/x11_fullscreen.c
This commit is contained in:
Camilla Berglund
2012-12-31 21:13:10 +01:00
parent 02598570cb 1790194828
commit 835f00eb10
44 changed files with 321 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/monitor.c
+20 -20
View File
@@ -87,7 +87,7 @@ _GLFWmonitor* _glfwCreateMonitor(const char* name,
_GLFWmonitor* monitor = (_GLFWmonitor*) calloc(1, sizeof(_GLFWmonitor));
if (!monitor)
{
_glfwSetError(GLFW_OUT_OF_MEMORY, NULL);
_glfwInputError(GLFW_OUT_OF_MEMORY, NULL);
return NULL;
}
@@ -284,13 +284,13 @@ GLFWAPI const GLFWmonitor* glfwGetMonitors(int* count)
{
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return NULL;
}
if (count == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE, NULL);
_glfwInputError(GLFW_INVALID_VALUE, NULL);
return NULL;
}
@@ -310,7 +310,7 @@ GLFWAPI GLFWmonitor glfwGetPrimaryMonitor(void)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return NULL;
}
@@ -325,7 +325,7 @@ GLFWAPI GLFWmonitor glfwGetPrimaryMonitor(void)
if (!handle)
{
_glfwSetError(GLFW_PLATFORM_ERROR, NULL);
_glfwInputError(GLFW_PLATFORM_ERROR, NULL);
return NULL;
}
@@ -343,14 +343,14 @@ GLFWAPI int glfwGetMonitorParam(GLFWmonitor handle, int param)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return 0;
}
if (monitor == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE,
"glfwGetMonitorParam: Invalid monitor handle");
_glfwInputError(GLFW_INVALID_VALUE,
"glfwGetMonitorParam: Invalid monitor handle");
return 0;
}
@@ -366,8 +366,8 @@ GLFWAPI int glfwGetMonitorParam(GLFWmonitor handle, int param)
return monitor->positionY;
}
_glfwSetError(GLFW_INVALID_ENUM,
"glfwGetMonitorParam: Invalid enum value for 'param' parameter");
_glfwInputError(GLFW_INVALID_ENUM,
"glfwGetMonitorParam: Invalid enum value for 'param' parameter");
return 0;
}
@@ -382,14 +382,14 @@ GLFWAPI const char* glfwGetMonitorName(GLFWmonitor handle)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return NULL;
}
if (monitor == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE,
"glfwGetMonitorString: Invalid monitor handle");
_glfwInputError(GLFW_INVALID_VALUE,
"glfwGetMonitorString: Invalid monitor handle");
return NULL;
}
@@ -405,7 +405,7 @@ GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
{
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
@@ -423,20 +423,20 @@ GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor handle, int* count)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return NULL;
}
if (monitor == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE,
"glfwGetVideoModes: Invalid monitor handle");
_glfwInputError(GLFW_INVALID_VALUE,
"glfwGetVideoModes: Invalid monitor handle");
return 0;
}
if (count == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE, NULL);
_glfwInputError(GLFW_INVALID_VALUE, NULL);
return NULL;
}
@@ -466,13 +466,13 @@ GLFWAPI void glfwGetVideoMode(GLFWmonitor handle, GLFWvidmode* mode)
if (!_glfwInitialized)
{
_glfwSetError(GLFW_NOT_INITIALIZED, NULL);
_glfwInputError(GLFW_NOT_INITIALIZED, NULL);
return;
}
if (mode == NULL)
{
_glfwSetError(GLFW_INVALID_VALUE, NULL);
_glfwInputError(GLFW_INVALID_VALUE, NULL);
return;
}