diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m index 66f10da9a..be0bc9cd8 100644 --- a/glfw/cocoa_window.m +++ b/glfw/cocoa_window.m @@ -2181,6 +2181,7 @@ GLFWAPI void glfwCocoaRequestRenderFrame(GLFWwindow *w, GLFWcocoarenderframefun GLFWAPI void glfwGetCocoaKeyEquivalent(int glfw_key, int glfw_mods, char cocoa_key[32], int *cocoa_mods) { *cocoa_mods = 0; + memset(cocoa_key, 0, sizeof(cocoa_key)); if (glfw_mods & GLFW_MOD_SHIFT) *cocoa_mods |= NSEventModifierFlagShift; diff --git a/glfw/glfw.py b/glfw/glfw.py index 1caa2536f..6e19ceb81 100755 --- a/glfw/glfw.py +++ b/glfw/glfw.py @@ -166,7 +166,7 @@ def generate_wrappers(glfw_header): GLFWcocoatogglefullscreenfun glfwSetCocoaToggleFullscreenIntercept(GLFWwindow *window, GLFWcocoatogglefullscreenfun callback) GLFWapplicationshouldhandlereopenfun glfwSetApplicationShouldHandleReopen(GLFWapplicationshouldhandlereopenfun callback) GLFWapplicationwillfinishlaunchingfun glfwSetApplicationWillFinishLaunching(GLFWapplicationwillfinishlaunchingfun callback) - void glfwGetCocoaKeyEquivalent(int glfw_key, int glfw_mods, char cocoa_key[32], int* cocoa_mods) + void glfwGetCocoaKeyEquivalent(int glfw_key, int glfw_mods, char[32] cocoa_key, int* cocoa_mods) void glfwCocoaRequestRenderFrame(GLFWwindow *w, GLFWcocoarenderframefun callback) void* glfwGetX11Display(void) int32_t glfwGetX11Window(GLFWwindow* window) diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m index 86713c501..ccf31b280 100644 --- a/kitty/cocoa_window.m +++ b/kitty/cocoa_window.m @@ -105,7 +105,6 @@ cocoa_set_new_window_trigger(PyObject *self UNUSED, PyObject *args) { int mods, key; if (!PyArg_ParseTuple(args, "ii", &mods, &key)) return NULL; int nwm; - memset(new_window_key, 0, sizeof(new_window_key)); get_cocoa_key_equivalent(key, mods, new_window_key, &nwm); new_window_mods = nwm; if (new_window_key[0]) Py_RETURN_TRUE; diff --git a/kitty/glfw-wrapper.h b/kitty/glfw-wrapper.h index 6f72be442..1ed5d952b 100644 --- a/kitty/glfw-wrapper.h +++ b/kitty/glfw-wrapper.h @@ -2083,7 +2083,7 @@ typedef GLFWapplicationwillfinishlaunchingfun (*glfwSetApplicationWillFinishLaun glfwSetApplicationWillFinishLaunching_func glfwSetApplicationWillFinishLaunching_impl; #define glfwSetApplicationWillFinishLaunching glfwSetApplicationWillFinishLaunching_impl -typedef void (*glfwGetCocoaKeyEquivalent_func)(int, int, char, int*); +typedef void (*glfwGetCocoaKeyEquivalent_func)(int, int, char[32], int*); glfwGetCocoaKeyEquivalent_func glfwGetCocoaKeyEquivalent_impl; #define glfwGetCocoaKeyEquivalent glfwGetCocoaKeyEquivalent_impl