Moved new cursor input code to other cursor input code.

include/GL/glfw3.h

@@ -575,9 +575,9 @@ GLFWAPI void glfwSetKeyCallback(GLFWkeyfun cbfun);
 GLFWAPI void glfwSetCharCallback(GLFWcharfun cbfun);
 GLFWAPI void glfwSetMouseButtonCallback(GLFWmousebuttonfun cbfun);
 GLFWAPI void glfwSetMousePosCallback(GLFWmouseposfun cbfun);
-GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun);
 GLFWAPI void glfwSetCursorEnterCallback(GLFWcursorenterfun cbfun);
 GLFWAPI void glfwSetCursorLeaveCallback(GLFWcursorleavefun cbfun);
+GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun);
 
 /* Joystick input */
 GLFWAPI int glfwGetJoystickParam(int joy, int param);

src/input.c

@@ -146,6 +146,28 @@ void _glfwInputCursorMotion(_GLFWwindow* window, int x, int y)
 }
 
 
+//========================================================================
+// Register cursor enter events
+//========================================================================
+
+void _glfwInputCursorEnter(_GLFWwindow* window)
+{
+    if (_glfwLibrary.cursorEnterCallback)
+        _glfwLibrary.cursorEnterCallback(window);
+}
+
+
+//========================================================================
+// Register cursor leave events
+//========================================================================
+
+void _glfwInputCursorLeave(_GLFWwindow* window)
+{
+    if (_glfwLibrary.cursorLeaveCallback)
+        _glfwLibrary.cursorLeaveCallback(window);
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 //////                        GLFW public API                       //////
 //////////////////////////////////////////////////////////////////////////
@@ -421,10 +443,10 @@ GLFWAPI void glfwSetMousePosCallback(GLFWmouseposfun cbfun)
 
 
 //========================================================================
-// Set callback function for scroll events
+// Set callback function for cursor enter events
 //========================================================================
 
-GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun)
+GLFWAPI void glfwSetCursorEnterCallback(GLFWcursorenterfun cbfun)
 {
     if (!_glfwInitialized)
     {
@@ -432,8 +454,7 @@ GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun)
         return;
     }
 
-    // Set callback function
+    _glfwLibrary.cursorEnterCallback = cbfun;
-    _glfwLibrary.scrollCallback = cbfun;
 }
 
 
@@ -441,7 +462,7 @@ GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun)
 // Set callback function for cursor enter events
 //========================================================================
 
-GLFWAPI void glfwSetCursorEnterCallback(GLFWcursorenterfun cbfun)
+GLFWAPI void glfwSetCursorLeaveCallback(GLFWcursorleavefun cbfun)
 {
     if (!_glfwInitialized)
     {
@@ -449,15 +470,15 @@ GLFWAPI void glfwSetCursorEnterCallback(GLFWcursorenterfun cbfun)
         return;
     }
 
-    _glfwLibrary.cursorEnterCallback = cbfun;
+    _glfwLibrary.cursorLeaveCallback = cbfun;
 }
 
 
 //========================================================================
-// Set callback function for cursor enter events
+// Set callback function for scroll events
 //========================================================================
 
-GLFWAPI void glfwSetCursorLeaveCallback(GLFWcursorleavefun cbfun)
+GLFWAPI void glfwSetScrollCallback(GLFWscrollfun cbfun)
 {
     if (!_glfwInitialized)
     {
@@ -465,6 +486,7 @@ GLFWAPI void glfwSetCursorLeaveCallback(GLFWcursorleavefun cbfun)
         return;
     }
 
-    _glfwLibrary.cursorLeaveCallback = cbfun;
+    // Set callback function
+    _glfwLibrary.scrollCallback = cbfun;
 }
 

src/internal.h

@@ -237,11 +237,11 @@ struct _GLFWlibrary
     GLFWwindowiconifyfun windowIconifyCallback;
     GLFWmousebuttonfun   mouseButtonCallback;
     GLFWmouseposfun      mousePosCallback;
+    GLFWcursorenterfun   cursorEnterCallback;
+    GLFWcursorleavefun   cursorLeaveCallback;
     GLFWscrollfun        scrollCallback;
     GLFWkeyfun           keyCallback;
     GLFWcharfun          charCallback;
-    GLFWcursorenterfun   cursorEnterCallback;
-    GLFWcursorleavefun   cursorLeaveCallback;
 
     GLFWthreadmodel      threading;
     GLFWallocator        allocator;

src/window.c

@@ -205,25 +205,6 @@ void _glfwInputWindowDamage(_GLFWwindow* window)
         _glfwLibrary.windowRefreshCallback(window);
 }
 
-//========================================================================
-// Register cursor enter events
-//========================================================================
-
-void _glfwInputCursorEnter(_GLFWwindow* window)
-{
-    if (_glfwLibrary.cursorEnterCallback)
-        _glfwLibrary.cursorEnterCallback(window);
-}
-
-//========================================================================
-// Register cursor leave events
-//========================================================================
-
-void _glfwInputCursorLeave(_GLFWwindow* window)
-{
-    if (_glfwLibrary.cursorLeaveCallback)
-        _glfwLibrary.cursorLeaveCallback(window);
-}
 
 //////////////////////////////////////////////////////////////////////////
 //////                        GLFW public API                       //////