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

Make adding more printable keys slightly easier

Browse Source 
When adding keys after `GLFW_KEY_UNDERSCORE`, one now needs to change a `#define` right below the last printable key instead of changing it elsewhere in the code.
This commit now also marks `GLFW_KEY_PLUS` and `GLFW_KEY_UNDERSCORE` as printable characters.
This commit is contained in:
Luflosi 2019-08-31 21:51:26 +02:00
parent def0c55df3
commit b3b830bb5f
No known key found for this signature in database
GPG Key ID: 14140F703B7D8362
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glfw/glfw3.h vendored
View File

@ -394,6 +394,8 @@ extern "C" {
#define GLFW_KEY_PLUS 163 #define GLFW_KEY_PLUS 163
#define GLFW_KEY_UNDERSCORE 164 #define GLFW_KEY_UNDERSCORE 164
#define GLFW_KEY_LAST_PRINTABLE GLFW_KEY_UNDERSCORE
/* Function keys */ /* Function keys */
#define GLFW_KEY_ESCAPE 256 #define GLFW_KEY_ESCAPE 256
#define GLFW_KEY_ENTER 257 #define GLFW_KEY_ENTER 257

2
glfw/input.c vendored
View File

@ -691,7 +691,7 @@ GLFWAPI const char* glfwGetKeyName(int key, int scancode)
{ {
if (key != GLFW_KEY_KP_EQUAL && if (key != GLFW_KEY_KP_EQUAL &&
(key < GLFW_KEY_KP_0 || key > GLFW_KEY_KP_ADD) && (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; return NULL;
} }

2
kitty/glfw-wrapper.h generated
View File

@ -151,6 +151,8 @@
#define GLFW_KEY_PLUS 163 #define GLFW_KEY_PLUS 163
#define GLFW_KEY_UNDERSCORE 164 #define GLFW_KEY_UNDERSCORE 164
#define GLFW_KEY_LAST_PRINTABLE GLFW_KEY_UNDERSCORE
/* Function keys */ /* Function keys */
#define GLFW_KEY_ESCAPE 256 #define GLFW_KEY_ESCAPE 256
#define GLFW_KEY_ENTER 257 #define GLFW_KEY_ENTER 257

2
kitty/key_encoding.py generated
View File

@ -298,7 +298,7 @@ def update_encoding():
for k in sorted(keys, key=lambda k: getattr(defines, k)): for k in sorted(keys, key=lambda k: getattr(defines, k)):
val = getattr(defines, k) val = getattr(defines, k)
name = symbolic_name(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: if name not in ans:
ans[name] = encode(i) ans[name] = encode(i)
i += 1 i += 1