Merge branch 'glfw_reduce_difference' of https://github.com/Luflosi/kitty

glfw/cocoa_window.m

@@ -715,11 +715,10 @@ static GLFWapplicationshouldhandlereopenfun handle_reopen_callback = NULL;
 - (void)mouseDown:(NSEvent *)event
 {
     if (!window) return;
-    _glfwInputMouseClick(
+    _glfwInputMouseClick(window,
-            window,
+                         GLFW_MOUSE_BUTTON_LEFT,
-            GLFW_MOUSE_BUTTON_LEFT,
+                         GLFW_PRESS,
-            GLFW_PRESS,
+                         translateFlags([event modifierFlags]));
-            translateFlags([event modifierFlags]));
 }
 
 - (void)mouseDragged:(NSEvent *)event
@@ -730,11 +729,10 @@ static GLFWapplicationshouldhandlereopenfun handle_reopen_callback = NULL;
 - (void)mouseUp:(NSEvent *)event
 {
     if (!window) return;
-    _glfwInputMouseClick(
+    _glfwInputMouseClick(window,
-            window,
+                         GLFW_MOUSE_BUTTON_LEFT,
-            GLFW_MOUSE_BUTTON_LEFT,
+                         GLFW_RELEASE,
-            GLFW_RELEASE,
+                         translateFlags([event modifierFlags]));
-            translateFlags([event modifierFlags]));
 }
 
 - (void)mouseMoved:(NSEvent *)event

glfw/input.c

@@ -256,7 +256,7 @@ static bool parseMapping(_GLFWmapping* mapping, const char* string)
 //////                         GLFW event API                       //////
 //////////////////////////////////////////////////////////////////////////
 
-// Notifies shared code of a key event
+// Notifies shared code of a physical key event
 //
 void _glfwInputKeyboard(_GLFWwindow* window, int key, int scancode, int action, int mods, const char* text, int state)
 {
@@ -568,7 +568,7 @@ const char* _glfwGetKeyName(int key)
     }
 }
 
-// Center the cursor in the middle of the content area of the specified window
+// Center the cursor in the content area of the specified window
 //
 void _glfwCenterCursorInContentArea(_GLFWwindow* window)
 {

glfw/window.c

@@ -183,7 +183,6 @@ void _glfwInputWindowMonitor(_GLFWwindow* window, _GLFWmonitor* monitor)
     window->monitor = monitor;
 }
 
-
 //////////////////////////////////////////////////////////////////////////
 //////                        GLFW public API                       //////
 //////////////////////////////////////////////////////////////////////////
@@ -1167,6 +1166,5 @@ GLFWAPI GLFWwindowcontentscalefun glfwSetWindowContentScaleCallback(GLFWwindow*
 GLFWAPI void glfwPostEmptyEvent(void)
 {
     _GLFW_REQUIRE_INIT();
-
     _glfwPlatformPostEmptyEvent();
 }