mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-11-11 01:28:19 +03:00
Merge branch 'add_glfw_key_last_printable' of https://github.com/Luflosi/kitty
This commit is contained in:
commit
3bf1d73b07
2
glfw/glfw3.h
vendored
2
glfw/glfw3.h
vendored
@ -394,6 +394,8 @@ extern "C" {
|
||||
#define GLFW_KEY_PLUS 163
|
||||
#define GLFW_KEY_UNDERSCORE 164
|
||||
|
||||
#define GLFW_KEY_LAST_PRINTABLE GLFW_KEY_UNDERSCORE
|
||||
|
||||
/* Function keys */
|
||||
#define GLFW_KEY_ESCAPE 256
|
||||
#define GLFW_KEY_ENTER 257
|
||||
|
2
glfw/input.c
vendored
2
glfw/input.c
vendored
@ -691,7 +691,7 @@ GLFWAPI const char* glfwGetKeyName(int key, int scancode)
|
||||
{
|
||||
if (key != GLFW_KEY_KP_EQUAL &&
|
||||
(key < GLFW_KEY_KP_0 || key > GLFW_KEY_KP_ADD) &&
|
||||
(key < GLFW_KEY_APOSTROPHE || key > GLFW_KEY_WORLD_2))
|
||||
(key < GLFW_KEY_APOSTROPHE || key > GLFW_KEY_LAST_PRINTABLE))
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
2
kitty/glfw-wrapper.h
generated
2
kitty/glfw-wrapper.h
generated
@ -151,6 +151,8 @@
|
||||
#define GLFW_KEY_PLUS 163
|
||||
#define GLFW_KEY_UNDERSCORE 164
|
||||
|
||||
#define GLFW_KEY_LAST_PRINTABLE GLFW_KEY_UNDERSCORE
|
||||
|
||||
/* Function keys */
|
||||
#define GLFW_KEY_ESCAPE 256
|
||||
#define GLFW_KEY_ENTER 257
|
||||
|
2
kitty/key_encoding.py
generated
2
kitty/key_encoding.py
generated
@ -298,7 +298,7 @@ def update_encoding():
|
||||
for k in sorted(keys, key=lambda k: getattr(defines, k)):
|
||||
val = getattr(defines, k)
|
||||
name = symbolic_name(k)
|
||||
if val <= defines.GLFW_KEY_LAST and name != 'LAST' and val != defines.GLFW_KEY_UNKNOWN:
|
||||
if val <= defines.GLFW_KEY_LAST and name not in ('LAST', 'LAST_PRINTABLE') and val != defines.GLFW_KEY_UNKNOWN:
|
||||
if name not in ans:
|
||||
ans[name] = encode(i)
|
||||
i += 1
|
||||
|
Loading…
Reference in New Issue
Block a user