KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update glfw

Browse Source 
Fixes #439
This commit is contained in:
Kovid Goyal 2018-04-06 20:18:03 +05:30
parent 2fde0ea86b
commit 20b5084904
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glfw/glfw3.h vendored
View File

@ -1383,7 +1383,7 @@ typedef void (* GLFWscrollfun)(GLFWwindow*,double,double);
* So, for example, if on a US-ASCII keyboard the user presses Shift+= GLFW * So, for example, if on a US-ASCII keyboard the user presses Shift+= GLFW
* will report the text "+" and the key as GLFW_KEY_EQUAL. The reported key takes into * will report the text "+" and the key as GLFW_KEY_EQUAL. The reported key takes into
* account any current keyboard maps defined in the OS. So with a dvorak mapping, pressing * account any current keyboard maps defined in the OS. So with a dvorak mapping, pressing
* the "q" key will generate text "d" and GLFW_KEY_D. * the "s" key will generate text "o" and GLFW_KEY_O.
* *
* @param[in] window The window that received the event. * @param[in] window The window that received the event.
* @param[in] key The [keyboard key](@ref keys) that was pressed or released. * @param[in] key The [keyboard key](@ref keys) that was pressed or released.

12
glfw/xkb_glfw.c vendored
View File

@ -216,6 +216,7 @@ glfw_xkb_compile_keymap(_GLFWXKBData *xkb, const char *map_str) {
struct xkb_compose_table* compose_table = NULL; struct xkb_compose_table* compose_table = NULL;
struct xkb_compose_state* compose_state = NULL; struct xkb_compose_state* compose_state = NULL;
(void)(map_str); // not needed on X11 (void)(map_str); // not needed on X11
GLFWbool ok = GLFW_FALSE;
xkb_glfw_load_keymap(keymap, map_str); xkb_glfw_load_keymap(keymap, map_str);
if (!keymap) _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to compile XKB keymap"); if (!keymap) _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to compile XKB keymap");
@ -226,6 +227,7 @@ glfw_xkb_compile_keymap(_GLFWXKBData *xkb, const char *map_str) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB state"); _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB state");
xkb_keymap_unref(keymap); keymap = NULL; xkb_keymap_unref(keymap); keymap = NULL;
} else { } else {
ok = GLFW_TRUE;
/* Look up the preferred locale, falling back to "C" as default. */ /* Look up the preferred locale, falling back to "C" as default. */
locale = getenv("LC_ALL"); locale = getenv("LC_ALL");
if (!locale) locale = getenv("LC_CTYPE"); if (!locale) locale = getenv("LC_CTYPE");
@ -234,20 +236,16 @@ glfw_xkb_compile_keymap(_GLFWXKBData *xkb, const char *map_str) {
compose_table = xkb_compose_table_new_from_locale(xkb->context, locale, XKB_COMPOSE_COMPILE_NO_FLAGS); compose_table = xkb_compose_table_new_from_locale(xkb->context, locale, XKB_COMPOSE_COMPILE_NO_FLAGS);
if (!compose_table) { if (!compose_table) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB compose table"); _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB compose table");
xkb_keymap_unref(keymap); keymap = NULL;
xkb_state_unref(state); state = NULL;
} else { } else {
compose_state = xkb_compose_state_new(compose_table, XKB_COMPOSE_STATE_NO_FLAGS); compose_state = xkb_compose_state_new(compose_table, XKB_COMPOSE_STATE_NO_FLAGS);
xkb_compose_table_unref(compose_table); compose_table = NULL; xkb_compose_table_unref(compose_table); compose_table = NULL;
if (!compose_state) { if (!compose_state) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB compose state"); _glfwInputError(GLFW_PLATFORM_ERROR, "Failed to create XKB compose state");
xkb_keymap_unref(keymap); keymap = NULL;
xkb_state_unref(state); state = NULL;
} }
} }
} }
} }
if (keymap && state && clean_state && compose_state) { if (keymap && state && clean_state) {
if (xkb->composeState) xkb_compose_state_unref(xkb->composeState); if (xkb->composeState) xkb_compose_state_unref(xkb->composeState);
xkb->composeState = compose_state; xkb->composeState = compose_state;
if (xkb->keymap) xkb_keymap_unref(xkb->keymap); if (xkb->keymap) xkb_keymap_unref(xkb->keymap);
@ -272,7 +270,7 @@ glfw_xkb_compile_keymap(_GLFWXKBData *xkb, const char *map_str) {
} }
#undef S #undef S
} }
return GLFW_TRUE; return ok;
} }
static inline xkb_mod_mask_t static inline xkb_mod_mask_t
@ -311,7 +309,7 @@ static char text[256];
static inline xkb_keysym_t static inline xkb_keysym_t
compose_symbol(_GLFWXKBData *xkb, xkb_keysym_t sym) { compose_symbol(_GLFWXKBData *xkb, xkb_keysym_t sym) {
if (sym == XKB_KEY_NoSymbol) return sym; if (sym == XKB_KEY_NoSymbol || !xkb->composeState) return sym;
if (xkb_compose_state_feed(xkb->composeState, sym) != XKB_COMPOSE_FEED_ACCEPTED) return sym; if (xkb_compose_state_feed(xkb->composeState, sym) != XKB_COMPOSE_FEED_ACCEPTED) return sym;
switch (xkb_compose_state_get_status(xkb->composeState)) { switch (xkb_compose_state_get_status(xkb->composeState)) {
case XKB_COMPOSE_COMPOSED: case XKB_COMPOSE_COMPOSED:

2
kitty/glfw-wrapper.h generated
View File

@ -1141,7 +1141,7 @@ typedef void (* GLFWscrollfun)(GLFWwindow*,double,double);
* So, for example, if on a US-ASCII keyboard the user presses Shift+= GLFW * So, for example, if on a US-ASCII keyboard the user presses Shift+= GLFW
* will report the text "+" and the key as GLFW_KEY_EQUAL. The reported key takes into * will report the text "+" and the key as GLFW_KEY_EQUAL. The reported key takes into
* account any current keyboard maps defined in the OS. So with a dvorak mapping, pressing * account any current keyboard maps defined in the OS. So with a dvorak mapping, pressing
* the "q" key will generate text "d" and GLFW_KEY_D. * the "s" key will generate text "o" and GLFW_KEY_O.
* *
* @param[in] window The window that received the event. * @param[in] window The window that received the event.
* @param[in] key The [keyboard key](@ref keys) that was pressed or released. * @param[in] key The [keyboard key](@ref keys) that was pressed or released.