Cleanup

src/input.c

@@ -354,11 +354,11 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* handle, int mode)
             return window->stickyKeys;
         case GLFW_STICKY_MOUSE_BUTTONS:
             return window->stickyMouseButtons;
-        default:
+    }
+
     _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0x%08X", mode);
     return 0;
 }
-}
 
 GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
 {
@@ -367,9 +367,7 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
 
     _GLFW_REQUIRE_INIT();
 
-    switch (mode)
+    if (mode == GLFW_CURSOR)
-    {
-        case GLFW_CURSOR:
     {
         if (value != GLFW_CURSOR_NORMAL &&
             value != GLFW_CURSOR_HIDDEN &&
@@ -392,12 +390,10 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
 
         if (_glfwPlatformWindowFocused(window))
             _glfwPlatformSetCursorMode(window, value);
-
-            return;
     }
-
+    else if (mode == GLFW_STICKY_KEYS)
-        case GLFW_STICKY_KEYS:
     {
+        value = value ? GLFW_TRUE : GLFW_FALSE;
         if (window->stickyKeys == value)
             return;
 
@@ -414,11 +410,10 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
         }
 
         window->stickyKeys = value ? GLFW_TRUE : GLFW_FALSE;
-            return;
     }
-
+    else if (mode == GLFW_STICKY_MOUSE_BUTTONS)
-        case GLFW_STICKY_MOUSE_BUTTONS:
     {
+        value = value ? GLFW_TRUE : GLFW_FALSE;
         if (window->stickyMouseButtons == value)
             return;
 
@@ -435,10 +430,8 @@ GLFWAPI void glfwSetInputMode(GLFWwindow* handle, int mode, int value)
         }
 
         window->stickyMouseButtons = value ? GLFW_TRUE : GLFW_FALSE;
-            return;
     }
-    }
+    else
-
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid input mode 0x%08X", mode);
 }
 

src/window.c

@@ -278,119 +278,118 @@ GLFWAPI void glfwWindowHint(int hint, int value)
     {
         case GLFW_RED_BITS:
             _glfw.hints.framebuffer.redBits = value;
-            break;
+            return;
         case GLFW_GREEN_BITS:
             _glfw.hints.framebuffer.greenBits = value;
-            break;
+            return;
         case GLFW_BLUE_BITS:
             _glfw.hints.framebuffer.blueBits = value;
-            break;
+            return;
         case GLFW_ALPHA_BITS:
             _glfw.hints.framebuffer.alphaBits = value;
-            break;
+            return;
         case GLFW_DEPTH_BITS:
             _glfw.hints.framebuffer.depthBits = value;
-            break;
+            return;
         case GLFW_STENCIL_BITS:
             _glfw.hints.framebuffer.stencilBits = value;
-            break;
+            return;
         case GLFW_ACCUM_RED_BITS:
             _glfw.hints.framebuffer.accumRedBits = value;
-            break;
+            return;
         case GLFW_ACCUM_GREEN_BITS:
             _glfw.hints.framebuffer.accumGreenBits = value;
-            break;
+            return;
         case GLFW_ACCUM_BLUE_BITS:
             _glfw.hints.framebuffer.accumBlueBits = value;
-            break;
+            return;
         case GLFW_ACCUM_ALPHA_BITS:
             _glfw.hints.framebuffer.accumAlphaBits = value;
-            break;
+            return;
         case GLFW_AUX_BUFFERS:
             _glfw.hints.framebuffer.auxBuffers = value;
-            break;
+            return;
         case GLFW_STEREO:
             _glfw.hints.framebuffer.stereo = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_DOUBLEBUFFER:
             _glfw.hints.framebuffer.doublebuffer = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_SAMPLES:
             _glfw.hints.framebuffer.samples = value;
-            break;
+            return;
         case GLFW_SRGB_CAPABLE:
             _glfw.hints.framebuffer.sRGB = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_RESIZABLE:
             _glfw.hints.window.resizable = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_DECORATED:
             _glfw.hints.window.decorated = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_FOCUSED:
             _glfw.hints.window.focused = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_AUTO_ICONIFY:
             _glfw.hints.window.autoIconify = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_FLOATING:
             _glfw.hints.window.floating = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_MAXIMIZED:
             _glfw.hints.window.maximized = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_VISIBLE:
             _glfw.hints.window.visible = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_COCOA_RETINA_FRAMEBUFFER:
             _glfw.hints.window.ns.retina = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_COCOA_FRAME_AUTOSAVE:
             _glfw.hints.window.ns.frame = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_COCOA_GRAPHICS_SWITCHING:
             _glfw.hints.context.nsgl.offline = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_CENTER_CURSOR:
             _glfw.hints.window.centerCursor = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_CLIENT_API:
             _glfw.hints.context.client = value;
-            break;
+            return;
         case GLFW_CONTEXT_CREATION_API:
             _glfw.hints.context.source = value;
-            break;
+            return;
         case GLFW_CONTEXT_VERSION_MAJOR:
             _glfw.hints.context.major = value;
-            break;
+            return;
         case GLFW_CONTEXT_VERSION_MINOR:
             _glfw.hints.context.minor = value;
-            break;
+            return;
         case GLFW_CONTEXT_ROBUSTNESS:
             _glfw.hints.context.robustness = value;
-            break;
+            return;
         case GLFW_OPENGL_FORWARD_COMPAT:
             _glfw.hints.context.forward = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_OPENGL_DEBUG_CONTEXT:
             _glfw.hints.context.debug = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_CONTEXT_NO_ERROR:
             _glfw.hints.context.noerror = value ? GLFW_TRUE : GLFW_FALSE;
-            break;
+            return;
         case GLFW_OPENGL_PROFILE:
             _glfw.hints.context.profile = value;
-            break;
+            return;
         case GLFW_CONTEXT_RELEASE_BEHAVIOR:
             _glfw.hints.context.release = value;
-            break;
+            return;
         case GLFW_REFRESH_RATE:
             _glfw.hints.refreshRate = value;
-            break;
+            return;
-        default:
-            _glfwInputError(GLFW_INVALID_ENUM, "Invalid window hint 0x%08X", hint);
-            break;
     }
+
+    _glfwInputError(GLFW_INVALID_ENUM, "Invalid window hint 0x%08X", hint);
 }
 
 GLFWAPI void glfwDestroyWindow(GLFWwindow* handle)
@@ -770,40 +769,36 @@ GLFWAPI void glfwSetWindowAttrib(GLFWwindow* handle, int attrib, int value)
 
     value = value ? GLFW_TRUE : GLFW_FALSE;
 
-    switch (attrib)
+    if (attrib == GLFW_AUTO_ICONIFY)
-    {
+        window->autoIconify = value;
-        case GLFW_RESIZABLE:
+    else if (attrib == GLFW_RESIZABLE)
-            if (window->resizable != value)
     {
+        if (window->resizable == value)
+            return;
+
         window->resizable = value;
         if (!window->monitor)
             _glfwPlatformSetWindowResizable(window, value);
     }
+    else if (attrib == GLFW_DECORATED)
+    {
+        if (window->decorated == value)
             return;
 
-        case GLFW_DECORATED:
-            if (window->decorated != value)
-            {
         window->decorated = value;
         if (!window->monitor)
             _glfwPlatformSetWindowDecorated(window, value);
     }
+    else if (attrib == GLFW_FLOATING)
+    {
+        if (window->floating == value)
             return;
 
-        case GLFW_FLOATING:
-            if (window->floating != value)
-            {
         window->floating = value;
         if (!window->monitor)
             _glfwPlatformSetWindowFloating(window, value);
     }
-            return;
+    else
-
-        case GLFW_AUTO_ICONIFY:
-            window->autoIconify = value;
-            return;
-    }
-
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid window attribute 0x%08X", attrib);
 }