Rough line-wrapping pass.
diff --git a/src/fullscreen.c b/src/fullscreen.c
index 7a5c97d..7cc96bb 100644
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -138,7 +138,8 @@
if (mode == NULL)
{
- _glfwSetError(GLFW_INVALID_VALUE, "glfwGetDesktopMode: Parameter 'mode' cannot be NULL");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwGetDesktopMode: Parameter 'mode' cannot be NULL");
return;
}
diff --git a/src/input.c b/src/input.c
index 3e0c1c5..0f5cfaa 100644
--- a/src/input.c
+++ b/src/input.c
@@ -53,7 +53,8 @@
if (key < 0 || key > GLFW_KEY_LAST)
{
// TODO: Decide whether key is a value or enum
- _glfwSetError(GLFW_INVALID_VALUE, "glfwGetKey: The specified key is invalid");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwGetKey: The specified key is invalid");
return GLFW_RELEASE;
}
@@ -85,7 +86,8 @@
// Is it a valid mouse button?
if (button < 0 || button > GLFW_MOUSE_BUTTON_LAST)
{
- _glfwSetError(GLFW_INVALID_ENUM, "glfwGetMouseButton: The specified mouse button is invalid");
+ _glfwSetError(GLFW_INVALID_ENUM,
+ "glfwGetMouseButton: The specified mouse button is invalid");
return GLFW_RELEASE;
}
diff --git a/src/opengl.c b/src/opengl.c
index 9b39d0e..7b97d6e 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -255,25 +255,29 @@
if (wndconfig->glMajor < 1 || wndconfig->glMinor < 0)
{
// OpenGL 1.0 is the smallest valid version
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL version requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL version requested");
return GL_FALSE;
}
if (wndconfig->glMajor == 1 && wndconfig->glMinor > 5)
{
// OpenGL 1.x series ended with version 1.5
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL version requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL version requested");
return GL_FALSE;
}
else if (wndconfig->glMajor == 2 && wndconfig->glMinor > 1)
{
// OpenGL 2.x series ended with version 2.1
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL version requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL version requested");
return GL_FALSE;
}
else if (wndconfig->glMajor == 3 && wndconfig->glMinor > 3)
{
// OpenGL 3.x series ended with version 3.3
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL version requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL version requested");
return GL_FALSE;
}
else
@@ -290,7 +294,8 @@
// compatibility with future updates to OpenGL ES, we allow
// everything 2.x and let the driver report invalid 2.x versions
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL ES 2.x version requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL ES 2.x version requested");
return GL_FALSE;
}
}
@@ -299,16 +304,20 @@
if (wndconfig->glProfile != GLFW_OPENGL_CORE_PROFILE &&
wndconfig->glProfile != GLFW_OPENGL_COMPAT_PROFILE)
{
- _glfwSetError(GLFW_INVALID_ENUM, "glfwOpenWindow: Invalid OpenGL profile requested");
+ _glfwSetError(GLFW_INVALID_ENUM,
+ "glfwOpenWindow: Invalid OpenGL profile requested");
return GL_FALSE;
}
- if (wndconfig->glMajor < 3 || (wndconfig->glMajor == 3 && wndconfig->glMinor < 2))
+ if (wndconfig->glMajor < 3 ||
+ (wndconfig->glMajor == 3 && wndconfig->glMinor < 2))
{
// Desktop OpenGL context profiles are only defined for version 3.2
// and above
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Context profiles only exist for OpenGL version 3.2 and above");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Context profiles only exist for "
+ "OpenGL version 3.2 and above");
return GL_FALSE;
}
}
@@ -316,7 +325,9 @@
if (wndconfig->glForward && wndconfig->glMajor < 3)
{
// Forward-compatible contexts are only defined for OpenGL version 3.0 and above
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Forward compatibility only exist for OpenGL version 3.0 and above");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Forward compatibility only exist for "
+ "OpenGL version 3.0 and above");
return GL_FALSE;
}
@@ -325,7 +336,8 @@
if (wndconfig->glRobustness != GLFW_OPENGL_NO_RESET_NOTIFICATION &&
wndconfig->glRobustness != GLFW_OPENGL_LOSE_CONTEXT_ON_RESET)
{
- _glfwSetError(GLFW_INVALID_VALUE, "glfwOpenWindow: Invalid OpenGL robustness mode requested");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "glfwOpenWindow: Invalid OpenGL robustness mode requested");
return GL_FALSE;
}
}
@@ -358,7 +370,8 @@
// For API consistency, we emulate the behavior of the
// {GLX|WGL}_ARB_create_context extension and fail here
- _glfwSetError(GLFW_VERSION_UNAVAILABLE, "glfwOpenWindow: The requested OpenGL version is not available");
+ _glfwSetError(GLFW_VERSION_UNAVAILABLE,
+ "glfwOpenWindow: The requested OpenGL version is not available");
return GL_FALSE;
}
@@ -375,7 +388,9 @@
// on X11/GLX using custom build systems, as it needs explicit
// configuration in order to work
- _glfwSetError(GLFW_PLATFORM_ERROR, "glfwOpenWindow: Entry point retrieval is broken; see the build documentation for your platform");
+ _glfwSetError(GLFW_PLATFORM_ERROR,
+ "glfwOpenWindow: Entry point retrieval is broken; see "
+ "the build documentation for your platform");
return GL_FALSE;
}
}
@@ -614,7 +629,8 @@
if (_glfwLibrary.currentWindow == dst)
{
- _glfwSetError(GLFW_INVALID_VALUE, "Cannot copy OpenGL state to a current context");
+ _glfwSetError(GLFW_INVALID_VALUE,
+ "Cannot copy OpenGL state to a current context");
return;
}
diff --git a/src/win32_fullscreen.c b/src/win32_fullscreen.c
index 24db644..de3d898 100644
--- a/src/win32_fullscreen.c
+++ b/src/win32_fullscreen.c
@@ -265,6 +265,9 @@
// Return desktop mode parameters
mode->width = dm.dmPelsWidth;
mode->height = dm.dmPelsHeight;
- _glfwSplitBPP(dm.dmBitsPerPel, &mode->redBits, &mode->greenBits, &mode->blueBits);
+ _glfwSplitBPP(dm.dmBitsPerPel,
+ &mode->redBits,
+ &mode->greenBits,
+ &mode->blueBits);
}
diff --git a/src/win32_opengl.c b/src/win32_opengl.c
index e60d1e7..1a7faa0 100644
--- a/src/win32_opengl.c
+++ b/src/win32_opengl.c
@@ -124,6 +124,9 @@
void _glfwPlatformCopyContext(_GLFWwindow* src, _GLFWwindow* dst, unsigned long mask)
{
if (!wglCopyContext(src->WGL.context, dst->WGL.context, mask))
- _glfwSetError(GLFW_PLATFORM_ERROR, "Win32/WGL: Failed to copy OpenGL context attributes");
+ {
+ _glfwSetError(GLFW_PLATFORM_ERROR,
+ "Win32/WGL: Failed to copy OpenGL context attributes");
+ }
}
diff --git a/src/window.c b/src/window.c
index 9c985b1..82d84b8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -289,7 +289,8 @@
if (mode != GLFW_WINDOWED && mode != GLFW_FULLSCREEN)
{
- _glfwSetError(GLFW_INVALID_ENUM, "glfwOpenWindow: Invalid enum for 'mode' parameter");
+ _glfwSetError(GLFW_INVALID_ENUM,
+ "glfwOpenWindow: Invalid enum for 'mode' parameter");
return GL_FALSE;
}
@@ -314,7 +315,8 @@
window = (_GLFWwindow*) _glfwMalloc(sizeof(_GLFWwindow));
if (!window)
{
- _glfwSetError(GLFW_OUT_OF_MEMORY, "glfwOpenWindow: Failed to allocate window structure");
+ _glfwSetError(GLFW_OUT_OF_MEMORY,
+ "glfwOpenWindow: Failed to allocate window structure");
return NULL;
}
@@ -750,7 +752,9 @@
case GLFW_OPENGL_ROBUSTNESS:
return window->glRobustness;
default:
- _glfwSetError(GLFW_INVALID_ENUM, "glfwGetWindowParam: Invalid enum value for 'param' parameter");
+ _glfwSetError(GLFW_INVALID_ENUM,
+ "glfwGetWindowParam: Invalid enum value for 'param' "
+ "parameter");
return 0;
}
}
diff --git a/src/x11_init.c b/src/x11_init.c
index c2480ad..03cc617 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -401,7 +401,8 @@
&_glfwLibrary.X11.RandR.majorVersion,
&_glfwLibrary.X11.RandR.minorVersion))
{
- _glfwSetError(GLFW_PLATFORM_ERROR, "X11/GLX: Failed to query RandR version");
+ _glfwSetError(GLFW_PLATFORM_ERROR,
+ "X11/GLX: Failed to query RandR version");
return GL_FALSE;
}
}
@@ -420,7 +421,8 @@
&_glfwLibrary.X11.glxMajor,
&_glfwLibrary.X11.glxMinor))
{
- _glfwSetError(GLFW_OPENGL_UNAVAILABLE, "X11/GLX: Failed to query GLX version");
+ _glfwSetError(GLFW_OPENGL_UNAVAILABLE,
+ "X11/GLX: Failed to query GLX version");
return GL_FALSE;
}
@@ -475,7 +477,8 @@
// This is probably Nvidia RandR with broken gamma support
// Flag it as useless and try Xf86VidMode below, if available
_glfwLibrary.X11.RandR.gammaBroken = GL_TRUE;
- fprintf(stderr, "Ignoring broken nVidia implementation of RandR 1.2+ gamma\n");
+ fprintf(stderr,
+ "Ignoring broken nVidia implementation of RandR 1.2+ gamma\n");
}
XRRFreeScreenResources(rr);
@@ -515,14 +518,17 @@
// TODO: Add error checks
- cursormask = XCreatePixmap(_glfwLibrary.X11.display, _glfwLibrary.X11.root, 1, 1, 1);
+ cursormask = XCreatePixmap(_glfwLibrary.X11.display,
+ _glfwLibrary.X11.root,
+ 1, 1, 1);
xgc.function = GXclear;
gc = XCreateGC(_glfwLibrary.X11.display, cursormask, GCFunction, &xgc);
XFillRectangle(_glfwLibrary.X11.display, cursormask, gc, 0, 0, 1, 1);
col.pixel = 0;
col.red = 0;
col.flags = 4;
- cursor = XCreatePixmapCursor(_glfwLibrary.X11.display, cursormask, cursormask,
+ cursor = XCreatePixmapCursor(_glfwLibrary.X11.display,
+ cursormask, cursormask,
&col, &col, 0, 0);
XFreePixmap(_glfwLibrary.X11.display, cursormask);
XFreeGC(_glfwLibrary.X11.display, gc);
