diff -up kitty-0.16.0/kittens/choose/choose-data-types.h.me kitty-0.16.0/kittens/choose/choose-data-types.h

diff -up kitty-0.16.0/kitty/glfw-wrapper.h.me kitty-0.16.0/kitty/glfw-wrapper.h

--- kitty-0.16.0/kitty/glfw-wrapper.h.me	2020-03-05 15:24:21.496526344 +0100

+++ kitty-0.16.0/kitty/glfw-wrapper.h	2020-03-05 15:35:19.352255301 +0100

@@ -1584,547 +1584,547 @@ typedef void (*GLFWwaylandframecallbackf

 typedef void (*GLFWDBusnotificationcreatedfun)(unsigned long long, uint32_t, void*);

 typedef void (*GLFWDBusnotificationactivatedfun)(uint32_t, const char*);

 typedef int (*glfwInit_func)(monotonic_t);

-glfwInit_func glfwInit_impl;

+extern glfwInit_func glfwInit_impl;

 #define glfwInit glfwInit_impl

 typedef void (*glfwRunMainLoop_func)(GLFWtickcallback, void*);

-glfwRunMainLoop_func glfwRunMainLoop_impl;

+extern glfwRunMainLoop_func glfwRunMainLoop_impl;

 #define glfwRunMainLoop glfwRunMainLoop_impl

 typedef void (*glfwStopMainLoop_func)(void);

-glfwStopMainLoop_func glfwStopMainLoop_impl;

+extern glfwStopMainLoop_func glfwStopMainLoop_impl;

 #define glfwStopMainLoop glfwStopMainLoop_impl

 typedef unsigned long long (*glfwAddTimer_func)(monotonic_t, bool, GLFWuserdatafun, void *, GLFWuserdatafun);

-glfwAddTimer_func glfwAddTimer_impl;

+extern glfwAddTimer_func glfwAddTimer_impl;

 #define glfwAddTimer glfwAddTimer_impl

 typedef void (*glfwUpdateTimer_func)(unsigned long long, monotonic_t, bool);

-glfwUpdateTimer_func glfwUpdateTimer_impl;

+extern glfwUpdateTimer_func glfwUpdateTimer_impl;

 #define glfwUpdateTimer glfwUpdateTimer_impl

 typedef void (*glfwRemoveTimer_func)(unsigned long);

-glfwRemoveTimer_func glfwRemoveTimer_impl;

+extern glfwRemoveTimer_func glfwRemoveTimer_impl;

 #define glfwRemoveTimer glfwRemoveTimer_impl

 typedef void (*glfwTerminate_func)(void);

-glfwTerminate_func glfwTerminate_impl;

+extern glfwTerminate_func glfwTerminate_impl;

 #define glfwTerminate glfwTerminate_impl

 typedef void (*glfwInitHint_func)(int, int);

-glfwInitHint_func glfwInitHint_impl;

+extern glfwInitHint_func glfwInitHint_impl;

 #define glfwInitHint glfwInitHint_impl

 typedef void (*glfwGetVersion_func)(int*, int*, int*);

-glfwGetVersion_func glfwGetVersion_impl;

+extern glfwGetVersion_func glfwGetVersion_impl;

 #define glfwGetVersion glfwGetVersion_impl

 typedef const char* (*glfwGetVersionString_func)(void);

-glfwGetVersionString_func glfwGetVersionString_impl;

+extern glfwGetVersionString_func glfwGetVersionString_impl;

 #define glfwGetVersionString glfwGetVersionString_impl

 typedef int (*glfwGetError_func)(const char**);

-glfwGetError_func glfwGetError_impl;

+extern glfwGetError_func glfwGetError_impl;

 #define glfwGetError glfwGetError_impl

 typedef GLFWerrorfun (*glfwSetErrorCallback_func)(GLFWerrorfun);

-glfwSetErrorCallback_func glfwSetErrorCallback_impl;

+extern glfwSetErrorCallback_func glfwSetErrorCallback_impl;

 #define glfwSetErrorCallback glfwSetErrorCallback_impl

 typedef GLFWmonitor** (*glfwGetMonitors_func)(int*);

-glfwGetMonitors_func glfwGetMonitors_impl;

+extern glfwGetMonitors_func glfwGetMonitors_impl;

 #define glfwGetMonitors glfwGetMonitors_impl

 typedef GLFWmonitor* (*glfwGetPrimaryMonitor_func)(void);

-glfwGetPrimaryMonitor_func glfwGetPrimaryMonitor_impl;

+extern glfwGetPrimaryMonitor_func glfwGetPrimaryMonitor_impl;

 #define glfwGetPrimaryMonitor glfwGetPrimaryMonitor_impl

 typedef void (*glfwGetMonitorPos_func)(GLFWmonitor*, int*, int*);

-glfwGetMonitorPos_func glfwGetMonitorPos_impl;

+extern glfwGetMonitorPos_func glfwGetMonitorPos_impl;

 #define glfwGetMonitorPos glfwGetMonitorPos_impl

 typedef void (*glfwGetMonitorWorkarea_func)(GLFWmonitor*, int*, int*, int*, int*);

-glfwGetMonitorWorkarea_func glfwGetMonitorWorkarea_impl;

+extern glfwGetMonitorWorkarea_func glfwGetMonitorWorkarea_impl;

 #define glfwGetMonitorWorkarea glfwGetMonitorWorkarea_impl

 typedef void (*glfwGetMonitorPhysicalSize_func)(GLFWmonitor*, int*, int*);

-glfwGetMonitorPhysicalSize_func glfwGetMonitorPhysicalSize_impl;

+extern glfwGetMonitorPhysicalSize_func glfwGetMonitorPhysicalSize_impl;

 #define glfwGetMonitorPhysicalSize glfwGetMonitorPhysicalSize_impl

 typedef void (*glfwGetMonitorContentScale_func)(GLFWmonitor*, float*, float*);

-glfwGetMonitorContentScale_func glfwGetMonitorContentScale_impl;

+extern glfwGetMonitorContentScale_func glfwGetMonitorContentScale_impl;

 #define glfwGetMonitorContentScale glfwGetMonitorContentScale_impl

 typedef const char* (*glfwGetMonitorName_func)(GLFWmonitor*);

-glfwGetMonitorName_func glfwGetMonitorName_impl;

+extern glfwGetMonitorName_func glfwGetMonitorName_impl;

 #define glfwGetMonitorName glfwGetMonitorName_impl

 typedef void (*glfwSetMonitorUserPointer_func)(GLFWmonitor*, void*);

-glfwSetMonitorUserPointer_func glfwSetMonitorUserPointer_impl;

+extern glfwSetMonitorUserPointer_func glfwSetMonitorUserPointer_impl;

 #define glfwSetMonitorUserPointer glfwSetMonitorUserPointer_impl

 typedef void* (*glfwGetMonitorUserPointer_func)(GLFWmonitor*);

-glfwGetMonitorUserPointer_func glfwGetMonitorUserPointer_impl;

+extern glfwGetMonitorUserPointer_func glfwGetMonitorUserPointer_impl;

 #define glfwGetMonitorUserPointer glfwGetMonitorUserPointer_impl

 typedef GLFWmonitorfun (*glfwSetMonitorCallback_func)(GLFWmonitorfun);

-glfwSetMonitorCallback_func glfwSetMonitorCallback_impl;

+extern glfwSetMonitorCallback_func glfwSetMonitorCallback_impl;

 #define glfwSetMonitorCallback glfwSetMonitorCallback_impl

 typedef const GLFWvidmode* (*glfwGetVideoModes_func)(GLFWmonitor*, int*);

-glfwGetVideoModes_func glfwGetVideoModes_impl;

+extern glfwGetVideoModes_func glfwGetVideoModes_impl;

 #define glfwGetVideoModes glfwGetVideoModes_impl

 typedef const GLFWvidmode* (*glfwGetVideoMode_func)(GLFWmonitor*);

-glfwGetVideoMode_func glfwGetVideoMode_impl;

+extern glfwGetVideoMode_func glfwGetVideoMode_impl;

 #define glfwGetVideoMode glfwGetVideoMode_impl

 typedef void (*glfwSetGamma_func)(GLFWmonitor*, float);

-glfwSetGamma_func glfwSetGamma_impl;

+extern glfwSetGamma_func glfwSetGamma_impl;

 #define glfwSetGamma glfwSetGamma_impl

 typedef const GLFWgammaramp* (*glfwGetGammaRamp_func)(GLFWmonitor*);

-glfwGetGammaRamp_func glfwGetGammaRamp_impl;

+extern glfwGetGammaRamp_func glfwGetGammaRamp_impl;

 #define glfwGetGammaRamp glfwGetGammaRamp_impl

 typedef void (*glfwSetGammaRamp_func)(GLFWmonitor*, const GLFWgammaramp*);

-glfwSetGammaRamp_func glfwSetGammaRamp_impl;

+extern glfwSetGammaRamp_func glfwSetGammaRamp_impl;

 #define glfwSetGammaRamp glfwSetGammaRamp_impl

 typedef void (*glfwDefaultWindowHints_func)(void);

-glfwDefaultWindowHints_func glfwDefaultWindowHints_impl;

+extern glfwDefaultWindowHints_func glfwDefaultWindowHints_impl;

 #define glfwDefaultWindowHints glfwDefaultWindowHints_impl

 typedef void (*glfwWindowHint_func)(int, int);

-glfwWindowHint_func glfwWindowHint_impl;

+extern glfwWindowHint_func glfwWindowHint_impl;

 #define glfwWindowHint glfwWindowHint_impl

 typedef void (*glfwWindowHintString_func)(int, const char*);

-glfwWindowHintString_func glfwWindowHintString_impl;

+extern glfwWindowHintString_func glfwWindowHintString_impl;

 #define glfwWindowHintString glfwWindowHintString_impl

 typedef GLFWwindow* (*glfwCreateWindow_func)(int, int, const char*, GLFWmonitor*, GLFWwindow*);

-glfwCreateWindow_func glfwCreateWindow_impl;

+extern glfwCreateWindow_func glfwCreateWindow_impl;

 #define glfwCreateWindow glfwCreateWindow_impl

 typedef bool (*glfwToggleFullscreen_func)(GLFWwindow*, unsigned int);

-glfwToggleFullscreen_func glfwToggleFullscreen_impl;

+extern glfwToggleFullscreen_func glfwToggleFullscreen_impl;

 #define glfwToggleFullscreen glfwToggleFullscreen_impl

 typedef void (*glfwDestroyWindow_func)(GLFWwindow*);

-glfwDestroyWindow_func glfwDestroyWindow_impl;

+extern glfwDestroyWindow_func glfwDestroyWindow_impl;

 #define glfwDestroyWindow glfwDestroyWindow_impl

 typedef int (*glfwWindowShouldClose_func)(GLFWwindow*);

-glfwWindowShouldClose_func glfwWindowShouldClose_impl;

+extern glfwWindowShouldClose_func glfwWindowShouldClose_impl;

 #define glfwWindowShouldClose glfwWindowShouldClose_impl

 typedef void (*glfwSetWindowShouldClose_func)(GLFWwindow*, int);

-glfwSetWindowShouldClose_func glfwSetWindowShouldClose_impl;

+extern glfwSetWindowShouldClose_func glfwSetWindowShouldClose_impl;

 #define glfwSetWindowShouldClose glfwSetWindowShouldClose_impl

 typedef void (*glfwSetWindowTitle_func)(GLFWwindow*, const char*);

-glfwSetWindowTitle_func glfwSetWindowTitle_impl;

+extern glfwSetWindowTitle_func glfwSetWindowTitle_impl;

 #define glfwSetWindowTitle glfwSetWindowTitle_impl

 typedef void (*glfwSetWindowIcon_func)(GLFWwindow*, int, const GLFWimage*);

-glfwSetWindowIcon_func glfwSetWindowIcon_impl;

+extern glfwSetWindowIcon_func glfwSetWindowIcon_impl;

 #define glfwSetWindowIcon glfwSetWindowIcon_impl

 typedef void (*glfwGetWindowPos_func)(GLFWwindow*, int*, int*);

-glfwGetWindowPos_func glfwGetWindowPos_impl;

+extern glfwGetWindowPos_func glfwGetWindowPos_impl;

 #define glfwGetWindowPos glfwGetWindowPos_impl

 typedef void (*glfwSetWindowPos_func)(GLFWwindow*, int, int);

-glfwSetWindowPos_func glfwSetWindowPos_impl;

+extern glfwSetWindowPos_func glfwSetWindowPos_impl;

 #define glfwSetWindowPos glfwSetWindowPos_impl

 typedef void (*glfwGetWindowSize_func)(GLFWwindow*, int*, int*);

-glfwGetWindowSize_func glfwGetWindowSize_impl;

+extern glfwGetWindowSize_func glfwGetWindowSize_impl;

 #define glfwGetWindowSize glfwGetWindowSize_impl

 typedef void (*glfwSetWindowSizeLimits_func)(GLFWwindow*, int, int, int, int);

-glfwSetWindowSizeLimits_func glfwSetWindowSizeLimits_impl;

+extern glfwSetWindowSizeLimits_func glfwSetWindowSizeLimits_impl;

 #define glfwSetWindowSizeLimits glfwSetWindowSizeLimits_impl

 typedef void (*glfwSetWindowAspectRatio_func)(GLFWwindow*, int, int);

-glfwSetWindowAspectRatio_func glfwSetWindowAspectRatio_impl;

+extern glfwSetWindowAspectRatio_func glfwSetWindowAspectRatio_impl;

 #define glfwSetWindowAspectRatio glfwSetWindowAspectRatio_impl

 typedef void (*glfwSetWindowSizeIncrements_func)(GLFWwindow*, int, int);

-glfwSetWindowSizeIncrements_func glfwSetWindowSizeIncrements_impl;

+extern glfwSetWindowSizeIncrements_func glfwSetWindowSizeIncrements_impl;

 #define glfwSetWindowSizeIncrements glfwSetWindowSizeIncrements_impl

 typedef void (*glfwSetWindowSize_func)(GLFWwindow*, int, int);

-glfwSetWindowSize_func glfwSetWindowSize_impl;

+extern glfwSetWindowSize_func glfwSetWindowSize_impl;

 #define glfwSetWindowSize glfwSetWindowSize_impl

 typedef void (*glfwGetFramebufferSize_func)(GLFWwindow*, int*, int*);

-glfwGetFramebufferSize_func glfwGetFramebufferSize_impl;

+extern glfwGetFramebufferSize_func glfwGetFramebufferSize_impl;

 #define glfwGetFramebufferSize glfwGetFramebufferSize_impl

 typedef void (*glfwGetWindowFrameSize_func)(GLFWwindow*, int*, int*, int*, int*);

-glfwGetWindowFrameSize_func glfwGetWindowFrameSize_impl;

+extern glfwGetWindowFrameSize_func glfwGetWindowFrameSize_impl;

 #define glfwGetWindowFrameSize glfwGetWindowFrameSize_impl

 typedef void (*glfwGetWindowContentScale_func)(GLFWwindow*, float*, float*);

-glfwGetWindowContentScale_func glfwGetWindowContentScale_impl;

+extern glfwGetWindowContentScale_func glfwGetWindowContentScale_impl;

 #define glfwGetWindowContentScale glfwGetWindowContentScale_impl

 typedef monotonic_t (*glfwGetDoubleClickInterval_func)(GLFWwindow*);

-glfwGetDoubleClickInterval_func glfwGetDoubleClickInterval_impl;

+extern glfwGetDoubleClickInterval_func glfwGetDoubleClickInterval_impl;

 #define glfwGetDoubleClickInterval glfwGetDoubleClickInterval_impl

 typedef float (*glfwGetWindowOpacity_func)(GLFWwindow*);

-glfwGetWindowOpacity_func glfwGetWindowOpacity_impl;

+extern glfwGetWindowOpacity_func glfwGetWindowOpacity_impl;

 #define glfwGetWindowOpacity glfwGetWindowOpacity_impl

 typedef void (*glfwSetWindowOpacity_func)(GLFWwindow*, float);

-glfwSetWindowOpacity_func glfwSetWindowOpacity_impl;

+extern glfwSetWindowOpacity_func glfwSetWindowOpacity_impl;

 #define glfwSetWindowOpacity glfwSetWindowOpacity_impl

 typedef void (*glfwIconifyWindow_func)(GLFWwindow*);

-glfwIconifyWindow_func glfwIconifyWindow_impl;

+extern glfwIconifyWindow_func glfwIconifyWindow_impl;

 #define glfwIconifyWindow glfwIconifyWindow_impl

 typedef void (*glfwRestoreWindow_func)(GLFWwindow*);

-glfwRestoreWindow_func glfwRestoreWindow_impl;

+extern glfwRestoreWindow_func glfwRestoreWindow_impl;

 #define glfwRestoreWindow glfwRestoreWindow_impl

 typedef void (*glfwMaximizeWindow_func)(GLFWwindow*);

-glfwMaximizeWindow_func glfwMaximizeWindow_impl;

+extern glfwMaximizeWindow_func glfwMaximizeWindow_impl;

 #define glfwMaximizeWindow glfwMaximizeWindow_impl

 typedef void (*glfwShowWindow_func)(GLFWwindow*);

-glfwShowWindow_func glfwShowWindow_impl;

+extern glfwShowWindow_func glfwShowWindow_impl;

 #define glfwShowWindow glfwShowWindow_impl

 typedef void (*glfwHideWindow_func)(GLFWwindow*);

-glfwHideWindow_func glfwHideWindow_impl;

+extern glfwHideWindow_func glfwHideWindow_impl;

 #define glfwHideWindow glfwHideWindow_impl

 typedef void (*glfwFocusWindow_func)(GLFWwindow*);

-glfwFocusWindow_func glfwFocusWindow_impl;

+extern glfwFocusWindow_func glfwFocusWindow_impl;

 #define glfwFocusWindow glfwFocusWindow_impl

 typedef void (*glfwRequestWindowAttention_func)(GLFWwindow*);

-glfwRequestWindowAttention_func glfwRequestWindowAttention_impl;

+extern glfwRequestWindowAttention_func glfwRequestWindowAttention_impl;

 #define glfwRequestWindowAttention glfwRequestWindowAttention_impl

 typedef int (*glfwWindowBell_func)(GLFWwindow*);

-glfwWindowBell_func glfwWindowBell_impl;

+extern glfwWindowBell_func glfwWindowBell_impl;

 #define glfwWindowBell glfwWindowBell_impl

 typedef GLFWmonitor* (*glfwGetWindowMonitor_func)(GLFWwindow*);

-glfwGetWindowMonitor_func glfwGetWindowMonitor_impl;

+extern glfwGetWindowMonitor_func glfwGetWindowMonitor_impl;

 #define glfwGetWindowMonitor glfwGetWindowMonitor_impl

 typedef void (*glfwSetWindowMonitor_func)(GLFWwindow*, GLFWmonitor*, int, int, int, int, int);

-glfwSetWindowMonitor_func glfwSetWindowMonitor_impl;

+extern glfwSetWindowMonitor_func glfwSetWindowMonitor_impl;

 #define glfwSetWindowMonitor glfwSetWindowMonitor_impl

 typedef int (*glfwGetWindowAttrib_func)(GLFWwindow*, int);

-glfwGetWindowAttrib_func glfwGetWindowAttrib_impl;

+extern glfwGetWindowAttrib_func glfwGetWindowAttrib_impl;

 #define glfwGetWindowAttrib glfwGetWindowAttrib_impl

 typedef void (*glfwSetWindowAttrib_func)(GLFWwindow*, int, int);

-glfwSetWindowAttrib_func glfwSetWindowAttrib_impl;

+extern glfwSetWindowAttrib_func glfwSetWindowAttrib_impl;

 #define glfwSetWindowAttrib glfwSetWindowAttrib_impl

 typedef void (*glfwSetWindowUserPointer_func)(GLFWwindow*, void*);

-glfwSetWindowUserPointer_func glfwSetWindowUserPointer_impl;

+extern glfwSetWindowUserPointer_func glfwSetWindowUserPointer_impl;

 #define glfwSetWindowUserPointer glfwSetWindowUserPointer_impl

 typedef void* (*glfwGetWindowUserPointer_func)(GLFWwindow*);

-glfwGetWindowUserPointer_func glfwGetWindowUserPointer_impl;

+extern glfwGetWindowUserPointer_func glfwGetWindowUserPointer_impl;

 #define glfwGetWindowUserPointer glfwGetWindowUserPointer_impl

 typedef GLFWwindowposfun (*glfwSetWindowPosCallback_func)(GLFWwindow*, GLFWwindowposfun);

-glfwSetWindowPosCallback_func glfwSetWindowPosCallback_impl;

+extern glfwSetWindowPosCallback_func glfwSetWindowPosCallback_impl;

 #define glfwSetWindowPosCallback glfwSetWindowPosCallback_impl

 typedef GLFWwindowsizefun (*glfwSetWindowSizeCallback_func)(GLFWwindow*, GLFWwindowsizefun);

-glfwSetWindowSizeCallback_func glfwSetWindowSizeCallback_impl;

+extern glfwSetWindowSizeCallback_func glfwSetWindowSizeCallback_impl;

 #define glfwSetWindowSizeCallback glfwSetWindowSizeCallback_impl

 typedef GLFWwindowclosefun (*glfwSetWindowCloseCallback_func)(GLFWwindow*, GLFWwindowclosefun);

-glfwSetWindowCloseCallback_func glfwSetWindowCloseCallback_impl;

+extern glfwSetWindowCloseCallback_func glfwSetWindowCloseCallback_impl;

 #define glfwSetWindowCloseCallback glfwSetWindowCloseCallback_impl

 typedef GLFWwindowrefreshfun (*glfwSetWindowRefreshCallback_func)(GLFWwindow*, GLFWwindowrefreshfun);

-glfwSetWindowRefreshCallback_func glfwSetWindowRefreshCallback_impl;

+extern glfwSetWindowRefreshCallback_func glfwSetWindowRefreshCallback_impl;

 #define glfwSetWindowRefreshCallback glfwSetWindowRefreshCallback_impl

 typedef GLFWwindowfocusfun (*glfwSetWindowFocusCallback_func)(GLFWwindow*, GLFWwindowfocusfun);

-glfwSetWindowFocusCallback_func glfwSetWindowFocusCallback_impl;

+extern glfwSetWindowFocusCallback_func glfwSetWindowFocusCallback_impl;

 #define glfwSetWindowFocusCallback glfwSetWindowFocusCallback_impl

 typedef GLFWwindowocclusionfun (*glfwSetWindowOcclusionCallback_func)(GLFWwindow*, GLFWwindowocclusionfun);

-glfwSetWindowOcclusionCallback_func glfwSetWindowOcclusionCallback_impl;

+extern glfwSetWindowOcclusionCallback_func glfwSetWindowOcclusionCallback_impl;

 #define glfwSetWindowOcclusionCallback glfwSetWindowOcclusionCallback_impl

 typedef GLFWwindowiconifyfun (*glfwSetWindowIconifyCallback_func)(GLFWwindow*, GLFWwindowiconifyfun);

-glfwSetWindowIconifyCallback_func glfwSetWindowIconifyCallback_impl;

+extern glfwSetWindowIconifyCallback_func glfwSetWindowIconifyCallback_impl;

 #define glfwSetWindowIconifyCallback glfwSetWindowIconifyCallback_impl

 typedef GLFWwindowmaximizefun (*glfwSetWindowMaximizeCallback_func)(GLFWwindow*, GLFWwindowmaximizefun);

-glfwSetWindowMaximizeCallback_func glfwSetWindowMaximizeCallback_impl;

+extern glfwSetWindowMaximizeCallback_func glfwSetWindowMaximizeCallback_impl;

 #define glfwSetWindowMaximizeCallback glfwSetWindowMaximizeCallback_impl

 typedef GLFWframebuffersizefun (*glfwSetFramebufferSizeCallback_func)(GLFWwindow*, GLFWframebuffersizefun);

-glfwSetFramebufferSizeCallback_func glfwSetFramebufferSizeCallback_impl;

+extern glfwSetFramebufferSizeCallback_func glfwSetFramebufferSizeCallback_impl;

 #define glfwSetFramebufferSizeCallback glfwSetFramebufferSizeCallback_impl

 typedef GLFWwindowcontentscalefun (*glfwSetWindowContentScaleCallback_func)(GLFWwindow*, GLFWwindowcontentscalefun);

-glfwSetWindowContentScaleCallback_func glfwSetWindowContentScaleCallback_impl;

+extern glfwSetWindowContentScaleCallback_func glfwSetWindowContentScaleCallback_impl;

 #define glfwSetWindowContentScaleCallback glfwSetWindowContentScaleCallback_impl

 typedef void (*glfwPostEmptyEvent_func)(void);

-glfwPostEmptyEvent_func glfwPostEmptyEvent_impl;

+extern glfwPostEmptyEvent_func glfwPostEmptyEvent_impl;

 #define glfwPostEmptyEvent glfwPostEmptyEvent_impl

 typedef int (*glfwGetInputMode_func)(GLFWwindow*, int);

-glfwGetInputMode_func glfwGetInputMode_impl;

+extern glfwGetInputMode_func glfwGetInputMode_impl;

 #define glfwGetInputMode glfwGetInputMode_impl

 typedef void (*glfwSetInputMode_func)(GLFWwindow*, int, int);

-glfwSetInputMode_func glfwSetInputMode_impl;

+extern glfwSetInputMode_func glfwSetInputMode_impl;

 #define glfwSetInputMode glfwSetInputMode_impl

 typedef const char* (*glfwGetKeyName_func)(int, int);

-glfwGetKeyName_func glfwGetKeyName_impl;

+extern glfwGetKeyName_func glfwGetKeyName_impl;

 #define glfwGetKeyName glfwGetKeyName_impl

 typedef int (*glfwGetNativeKeyForKey_func)(int);

-glfwGetNativeKeyForKey_func glfwGetNativeKeyForKey_impl;

+extern glfwGetNativeKeyForKey_func glfwGetNativeKeyForKey_impl;

 #define glfwGetNativeKeyForKey glfwGetNativeKeyForKey_impl

 typedef int (*glfwGetKey_func)(GLFWwindow*, int);

-glfwGetKey_func glfwGetKey_impl;

+extern glfwGetKey_func glfwGetKey_impl;

 #define glfwGetKey glfwGetKey_impl

 typedef int (*glfwGetMouseButton_func)(GLFWwindow*, int);

-glfwGetMouseButton_func glfwGetMouseButton_impl;

+extern glfwGetMouseButton_func glfwGetMouseButton_impl;

 #define glfwGetMouseButton glfwGetMouseButton_impl

 typedef void (*glfwGetCursorPos_func)(GLFWwindow*, double*, double*);

-glfwGetCursorPos_func glfwGetCursorPos_impl;

+extern glfwGetCursorPos_func glfwGetCursorPos_impl;

 #define glfwGetCursorPos glfwGetCursorPos_impl

 typedef void (*glfwSetCursorPos_func)(GLFWwindow*, double, double);

-glfwSetCursorPos_func glfwSetCursorPos_impl;

+extern glfwSetCursorPos_func glfwSetCursorPos_impl;

 #define glfwSetCursorPos glfwSetCursorPos_impl

 typedef GLFWcursor* (*glfwCreateCursor_func)(const GLFWimage*, int, int, int);

-glfwCreateCursor_func glfwCreateCursor_impl;

+extern glfwCreateCursor_func glfwCreateCursor_impl;

 #define glfwCreateCursor glfwCreateCursor_impl

 typedef GLFWcursor* (*glfwCreateStandardCursor_func)(GLFWCursorShape);

-glfwCreateStandardCursor_func glfwCreateStandardCursor_impl;

+extern glfwCreateStandardCursor_func glfwCreateStandardCursor_impl;

 #define glfwCreateStandardCursor glfwCreateStandardCursor_impl

 typedef void (*glfwDestroyCursor_func)(GLFWcursor*);

-glfwDestroyCursor_func glfwDestroyCursor_impl;

+extern glfwDestroyCursor_func glfwDestroyCursor_impl;

 #define glfwDestroyCursor glfwDestroyCursor_impl

 typedef void (*glfwSetCursor_func)(GLFWwindow*, GLFWcursor*);

-glfwSetCursor_func glfwSetCursor_impl;

+extern glfwSetCursor_func glfwSetCursor_impl;

 #define glfwSetCursor glfwSetCursor_impl

 typedef GLFWkeyboardfun (*glfwSetKeyboardCallback_func)(GLFWwindow*, GLFWkeyboardfun);

-glfwSetKeyboardCallback_func glfwSetKeyboardCallback_impl;

+extern glfwSetKeyboardCallback_func glfwSetKeyboardCallback_impl;

 #define glfwSetKeyboardCallback glfwSetKeyboardCallback_impl

 typedef void (*glfwUpdateIMEState_func)(GLFWwindow*, int, int, int, int, int);

-glfwUpdateIMEState_func glfwUpdateIMEState_impl;

+extern glfwUpdateIMEState_func glfwUpdateIMEState_impl;

 #define glfwUpdateIMEState glfwUpdateIMEState_impl

 typedef GLFWmousebuttonfun (*glfwSetMouseButtonCallback_func)(GLFWwindow*, GLFWmousebuttonfun);

-glfwSetMouseButtonCallback_func glfwSetMouseButtonCallback_impl;

+extern glfwSetMouseButtonCallback_func glfwSetMouseButtonCallback_impl;

 #define glfwSetMouseButtonCallback glfwSetMouseButtonCallback_impl

 typedef GLFWcursorposfun (*glfwSetCursorPosCallback_func)(GLFWwindow*, GLFWcursorposfun);

-glfwSetCursorPosCallback_func glfwSetCursorPosCallback_impl;

+extern glfwSetCursorPosCallback_func glfwSetCursorPosCallback_impl;

 #define glfwSetCursorPosCallback glfwSetCursorPosCallback_impl

 typedef GLFWcursorenterfun (*glfwSetCursorEnterCallback_func)(GLFWwindow*, GLFWcursorenterfun);

-glfwSetCursorEnterCallback_func glfwSetCursorEnterCallback_impl;

+extern glfwSetCursorEnterCallback_func glfwSetCursorEnterCallback_impl;

 #define glfwSetCursorEnterCallback glfwSetCursorEnterCallback_impl

 typedef GLFWscrollfun (*glfwSetScrollCallback_func)(GLFWwindow*, GLFWscrollfun);

-glfwSetScrollCallback_func glfwSetScrollCallback_impl;

+extern glfwSetScrollCallback_func glfwSetScrollCallback_impl;

 #define glfwSetScrollCallback glfwSetScrollCallback_impl

 typedef GLFWdropfun (*glfwSetDropCallback_func)(GLFWwindow*, GLFWdropfun);

-glfwSetDropCallback_func glfwSetDropCallback_impl;

+extern glfwSetDropCallback_func glfwSetDropCallback_impl;

 #define glfwSetDropCallback glfwSetDropCallback_impl

 typedef GLFWliveresizefun (*glfwSetLiveResizeCallback_func)(GLFWwindow*, GLFWliveresizefun);

-glfwSetLiveResizeCallback_func glfwSetLiveResizeCallback_impl;

+extern glfwSetLiveResizeCallback_func glfwSetLiveResizeCallback_impl;

 #define glfwSetLiveResizeCallback glfwSetLiveResizeCallback_impl

 typedef int (*glfwJoystickPresent_func)(int);

-glfwJoystickPresent_func glfwJoystickPresent_impl;

+extern glfwJoystickPresent_func glfwJoystickPresent_impl;

 #define glfwJoystickPresent glfwJoystickPresent_impl

 typedef const float* (*glfwGetJoystickAxes_func)(int, int*);

-glfwGetJoystickAxes_func glfwGetJoystickAxes_impl;

+extern glfwGetJoystickAxes_func glfwGetJoystickAxes_impl;

 #define glfwGetJoystickAxes glfwGetJoystickAxes_impl

 typedef const unsigned char* (*glfwGetJoystickButtons_func)(int, int*);

-glfwGetJoystickButtons_func glfwGetJoystickButtons_impl;

+extern glfwGetJoystickButtons_func glfwGetJoystickButtons_impl;

 #define glfwGetJoystickButtons glfwGetJoystickButtons_impl

 typedef const unsigned char* (*glfwGetJoystickHats_func)(int, int*);

-glfwGetJoystickHats_func glfwGetJoystickHats_impl;

+extern glfwGetJoystickHats_func glfwGetJoystickHats_impl;

 #define glfwGetJoystickHats glfwGetJoystickHats_impl

 typedef const char* (*glfwGetJoystickName_func)(int);

-glfwGetJoystickName_func glfwGetJoystickName_impl;

+extern glfwGetJoystickName_func glfwGetJoystickName_impl;

 #define glfwGetJoystickName glfwGetJoystickName_impl

 typedef const char* (*glfwGetJoystickGUID_func)(int);

-glfwGetJoystickGUID_func glfwGetJoystickGUID_impl;

+extern glfwGetJoystickGUID_func glfwGetJoystickGUID_impl;

 #define glfwGetJoystickGUID glfwGetJoystickGUID_impl

 typedef void (*glfwSetJoystickUserPointer_func)(int, void*);

-glfwSetJoystickUserPointer_func glfwSetJoystickUserPointer_impl;

+extern glfwSetJoystickUserPointer_func glfwSetJoystickUserPointer_impl;

 #define glfwSetJoystickUserPointer glfwSetJoystickUserPointer_impl

 typedef void* (*glfwGetJoystickUserPointer_func)(int);

-glfwGetJoystickUserPointer_func glfwGetJoystickUserPointer_impl;

+extern glfwGetJoystickUserPointer_func glfwGetJoystickUserPointer_impl;

 #define glfwGetJoystickUserPointer glfwGetJoystickUserPointer_impl

 typedef int (*glfwJoystickIsGamepad_func)(int);

-glfwJoystickIsGamepad_func glfwJoystickIsGamepad_impl;

+extern glfwJoystickIsGamepad_func glfwJoystickIsGamepad_impl;

 #define glfwJoystickIsGamepad glfwJoystickIsGamepad_impl

 typedef GLFWjoystickfun (*glfwSetJoystickCallback_func)(GLFWjoystickfun);

-glfwSetJoystickCallback_func glfwSetJoystickCallback_impl;

+extern glfwSetJoystickCallback_func glfwSetJoystickCallback_impl;

 #define glfwSetJoystickCallback glfwSetJoystickCallback_impl

 typedef int (*glfwUpdateGamepadMappings_func)(const char*);

-glfwUpdateGamepadMappings_func glfwUpdateGamepadMappings_impl;

+extern glfwUpdateGamepadMappings_func glfwUpdateGamepadMappings_impl;

 #define glfwUpdateGamepadMappings glfwUpdateGamepadMappings_impl

 typedef const char* (*glfwGetGamepadName_func)(int);

-glfwGetGamepadName_func glfwGetGamepadName_impl;

+extern glfwGetGamepadName_func glfwGetGamepadName_impl;

 #define glfwGetGamepadName glfwGetGamepadName_impl

 typedef int (*glfwGetGamepadState_func)(int, GLFWgamepadstate*);

-glfwGetGamepadState_func glfwGetGamepadState_impl;

+extern glfwGetGamepadState_func glfwGetGamepadState_impl;

 #define glfwGetGamepadState glfwGetGamepadState_impl

 typedef void (*glfwSetClipboardString_func)(GLFWwindow*, const char*);

-glfwSetClipboardString_func glfwSetClipboardString_impl;

+extern glfwSetClipboardString_func glfwSetClipboardString_impl;

 #define glfwSetClipboardString glfwSetClipboardString_impl

 typedef const char* (*glfwGetClipboardString_func)(GLFWwindow*);

-glfwGetClipboardString_func glfwGetClipboardString_impl;

+extern glfwGetClipboardString_func glfwGetClipboardString_impl;

 #define glfwGetClipboardString glfwGetClipboardString_impl

 typedef monotonic_t (*glfwGetTime_func)(void);

-glfwGetTime_func glfwGetTime_impl;

+extern glfwGetTime_func glfwGetTime_impl;

 #define glfwGetTime glfwGetTime_impl

 typedef void (*glfwMakeContextCurrent_func)(GLFWwindow*);

-glfwMakeContextCurrent_func glfwMakeContextCurrent_impl;

+extern glfwMakeContextCurrent_func glfwMakeContextCurrent_impl;

 #define glfwMakeContextCurrent glfwMakeContextCurrent_impl

 typedef GLFWwindow* (*glfwGetCurrentContext_func)(void);

-glfwGetCurrentContext_func glfwGetCurrentContext_impl;

+extern glfwGetCurrentContext_func glfwGetCurrentContext_impl;

 #define glfwGetCurrentContext glfwGetCurrentContext_impl

 typedef void (*glfwSwapBuffers_func)(GLFWwindow*);

-glfwSwapBuffers_func glfwSwapBuffers_impl;

+extern glfwSwapBuffers_func glfwSwapBuffers_impl;

 #define glfwSwapBuffers glfwSwapBuffers_impl

 typedef void (*glfwSwapInterval_func)(int);

-glfwSwapInterval_func glfwSwapInterval_impl;

+extern glfwSwapInterval_func glfwSwapInterval_impl;

 #define glfwSwapInterval glfwSwapInterval_impl

 typedef int (*glfwExtensionSupported_func)(const char*);

-glfwExtensionSupported_func glfwExtensionSupported_impl;

+extern glfwExtensionSupported_func glfwExtensionSupported_impl;

 #define glfwExtensionSupported glfwExtensionSupported_impl

 typedef GLFWglproc (*glfwGetProcAddress_func)(const char*);

-glfwGetProcAddress_func glfwGetProcAddress_impl;

+extern glfwGetProcAddress_func glfwGetProcAddress_impl;

 #define glfwGetProcAddress glfwGetProcAddress_impl

 typedef int (*glfwVulkanSupported_func)(void);

-glfwVulkanSupported_func glfwVulkanSupported_impl;

+extern glfwVulkanSupported_func glfwVulkanSupported_impl;

 #define glfwVulkanSupported glfwVulkanSupported_impl

 typedef const char** (*glfwGetRequiredInstanceExtensions_func)(uint32_t*);

-glfwGetRequiredInstanceExtensions_func glfwGetRequiredInstanceExtensions_impl;

+extern glfwGetRequiredInstanceExtensions_func glfwGetRequiredInstanceExtensions_impl;

 #define glfwGetRequiredInstanceExtensions glfwGetRequiredInstanceExtensions_impl

 typedef void* (*glfwGetCocoaWindow_func)(GLFWwindow*);

-glfwGetCocoaWindow_func glfwGetCocoaWindow_impl;

+extern glfwGetCocoaWindow_func glfwGetCocoaWindow_impl;

 #define glfwGetCocoaWindow glfwGetCocoaWindow_impl

 typedef void* (*glfwGetNSGLContext_func)(GLFWwindow*);

-glfwGetNSGLContext_func glfwGetNSGLContext_impl;

+extern glfwGetNSGLContext_func glfwGetNSGLContext_impl;

 #define glfwGetNSGLContext glfwGetNSGLContext_impl

 typedef uint32_t (*glfwGetCocoaMonitor_func)(GLFWmonitor*);

-glfwGetCocoaMonitor_func glfwGetCocoaMonitor_impl;

+extern glfwGetCocoaMonitor_func glfwGetCocoaMonitor_impl;

 #define glfwGetCocoaMonitor glfwGetCocoaMonitor_impl

 typedef GLFWcocoatextinputfilterfun (*glfwSetCocoaTextInputFilter_func)(GLFWwindow*, GLFWcocoatextinputfilterfun);

-glfwSetCocoaTextInputFilter_func glfwSetCocoaTextInputFilter_impl;

+extern glfwSetCocoaTextInputFilter_func glfwSetCocoaTextInputFilter_impl;

 #define glfwSetCocoaTextInputFilter glfwSetCocoaTextInputFilter_impl

 typedef GLFWcocoatogglefullscreenfun (*glfwSetCocoaToggleFullscreenIntercept_func)(GLFWwindow*, GLFWcocoatogglefullscreenfun);

-glfwSetCocoaToggleFullscreenIntercept_func glfwSetCocoaToggleFullscreenIntercept_impl;

+extern glfwSetCocoaToggleFullscreenIntercept_func glfwSetCocoaToggleFullscreenIntercept_impl;

 #define glfwSetCocoaToggleFullscreenIntercept glfwSetCocoaToggleFullscreenIntercept_impl

 typedef GLFWapplicationshouldhandlereopenfun (*glfwSetApplicationShouldHandleReopen_func)(GLFWapplicationshouldhandlereopenfun);

-glfwSetApplicationShouldHandleReopen_func glfwSetApplicationShouldHandleReopen_impl;

+extern glfwSetApplicationShouldHandleReopen_func glfwSetApplicationShouldHandleReopen_impl;

 #define glfwSetApplicationShouldHandleReopen glfwSetApplicationShouldHandleReopen_impl

 typedef GLFWapplicationwillfinishlaunchingfun (*glfwSetApplicationWillFinishLaunching_func)(GLFWapplicationwillfinishlaunchingfun);

-glfwSetApplicationWillFinishLaunching_func glfwSetApplicationWillFinishLaunching_impl;

+extern glfwSetApplicationWillFinishLaunching_func glfwSetApplicationWillFinishLaunching_impl;

 #define glfwSetApplicationWillFinishLaunching glfwSetApplicationWillFinishLaunching_impl

 typedef void (*glfwGetCocoaKeyEquivalent_func)(int, int, char*, size_t, int*);

-glfwGetCocoaKeyEquivalent_func glfwGetCocoaKeyEquivalent_impl;

+extern glfwGetCocoaKeyEquivalent_func glfwGetCocoaKeyEquivalent_impl;

 #define glfwGetCocoaKeyEquivalent glfwGetCocoaKeyEquivalent_impl

 typedef void (*glfwCocoaRequestRenderFrame_func)(GLFWwindow*, GLFWcocoarenderframefun);

-glfwCocoaRequestRenderFrame_func glfwCocoaRequestRenderFrame_impl;

+extern glfwCocoaRequestRenderFrame_func glfwCocoaRequestRenderFrame_impl;

 #define glfwCocoaRequestRenderFrame glfwCocoaRequestRenderFrame_impl

 typedef void* (*glfwGetX11Display_func)(void);

-glfwGetX11Display_func glfwGetX11Display_impl;

+extern glfwGetX11Display_func glfwGetX11Display_impl;

 #define glfwGetX11Display glfwGetX11Display_impl

 typedef int32_t (*glfwGetX11Window_func)(GLFWwindow*);

-glfwGetX11Window_func glfwGetX11Window_impl;

+extern glfwGetX11Window_func glfwGetX11Window_impl;

 #define glfwGetX11Window glfwGetX11Window_impl

 typedef void (*glfwSetPrimarySelectionString_func)(GLFWwindow*, const char*);

-glfwSetPrimarySelectionString_func glfwSetPrimarySelectionString_impl;

+extern glfwSetPrimarySelectionString_func glfwSetPrimarySelectionString_impl;

 #define glfwSetPrimarySelectionString glfwSetPrimarySelectionString_impl

 typedef const char* (*glfwGetPrimarySelectionString_func)(GLFWwindow*);

-glfwGetPrimarySelectionString_func glfwGetPrimarySelectionString_impl;

+extern glfwGetPrimarySelectionString_func glfwGetPrimarySelectionString_impl;

 #define glfwGetPrimarySelectionString glfwGetPrimarySelectionString_impl

 typedef int (*glfwGetNativeKeyForName_func)(const char*, int);

-glfwGetNativeKeyForName_func glfwGetNativeKeyForName_impl;

+extern glfwGetNativeKeyForName_func glfwGetNativeKeyForName_impl;

 #define glfwGetNativeKeyForName glfwGetNativeKeyForName_impl

 typedef void (*glfwRequestWaylandFrameEvent_func)(GLFWwindow*, unsigned long long, GLFWwaylandframecallbackfunc);

-glfwRequestWaylandFrameEvent_func glfwRequestWaylandFrameEvent_impl;

+extern glfwRequestWaylandFrameEvent_func glfwRequestWaylandFrameEvent_impl;

 #define glfwRequestWaylandFrameEvent glfwRequestWaylandFrameEvent_impl

 typedef unsigned long long (*glfwDBusUserNotify_func)(const char*, const char*, const char*, const char*, const char*, int32_t, GLFWDBusnotificationcreatedfun, void*);

-glfwDBusUserNotify_func glfwDBusUserNotify_impl;

+extern glfwDBusUserNotify_func glfwDBusUserNotify_impl;

 #define glfwDBusUserNotify glfwDBusUserNotify_impl

 typedef void (*glfwDBusSetUserNotificationHandler_func)(GLFWDBusnotificationactivatedfun);

-glfwDBusSetUserNotificationHandler_func glfwDBusSetUserNotificationHandler_impl;

+extern glfwDBusSetUserNotificationHandler_func glfwDBusSetUserNotificationHandler_impl;

 #define glfwDBusSetUserNotificationHandler glfwDBusSetUserNotificationHandler_impl

 const char* load_glfw(const char* path);

diff -up kitty-0.16.0/kitty/glfw-wrapper.c.me kitty-0.16.0/kitty/glfw-wrapper.c

--- kitty-0.16.0/kitty/glfw-wrapper.c.me	2020-03-05 15:44:59.293515436 +0100

+++ kitty-0.16.0/kitty/glfw-wrapper.c	2020-03-05 15:53:38.246972639 +0100

@@ -5,6 +5,143 @@

 static void* handle = NULL;

+glfwInit_func glfwInit_impl;

+glfwRunMainLoop_func glfwRunMainLoop_impl;

+glfwStopMainLoop_func glfwStopMainLoop_impl;

+glfwAddTimer_func glfwAddTimer_impl;

+glfwUpdateTimer_func glfwUpdateTimer_impl;

+glfwRemoveTimer_func glfwRemoveTimer_impl;

+glfwTerminate_func glfwTerminate_impl;

+glfwInitHint_func glfwInitHint_impl;

+glfwGetVersion_func glfwGetVersion_impl;

+glfwGetVersionString_func glfwGetVersionString_impl;

+glfwGetError_func glfwGetError_impl;

+glfwSetErrorCallback_func glfwSetErrorCallback_impl;

+glfwGetMonitors_func glfwGetMonitors_impl;

+glfwGetPrimaryMonitor_func glfwGetPrimaryMonitor_impl;

+glfwGetMonitorPos_func glfwGetMonitorPos_impl;

+glfwGetMonitorWorkarea_func glfwGetMonitorWorkarea_impl;

+glfwGetMonitorPhysicalSize_func glfwGetMonitorPhysicalSize_impl;

+glfwGetMonitorContentScale_func glfwGetMonitorContentScale_impl;

+glfwGetMonitorName_func glfwGetMonitorName_impl;

+glfwSetMonitorUserPointer_func glfwSetMonitorUserPointer_impl;

+glfwGetMonitorUserPointer_func glfwGetMonitorUserPointer_impl;

+glfwSetMonitorCallback_func glfwSetMonitorCallback_impl;

+glfwGetVideoModes_func glfwGetVideoModes_impl;