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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-12 11:39:26 +05:30
parent b54dd1cb48
commit 9f865adb83
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/keys.c
View File

@ -284,6 +284,7 @@ static PyMethodDef module_methods[] = {
}; };
// SingleKey {{{ // SingleKey {{{
typedef uint32_t keybitfield;
#define KEY_BITS 21 #define KEY_BITS 21
#define MOD_BITS 10 #define MOD_BITS 10
#if 1 << (MOD_BITS-1) < GLFW_MOD_KITTY #if 1 << (MOD_BITS-1) < GLFW_MOD_KITTY
@ -291,11 +292,11 @@ static PyMethodDef module_methods[] = {
#endif #endif
typedef union Key { typedef union Key {
struct { struct {
uint32_t mods : MOD_BITS; keybitfield mods : MOD_BITS;
uint32_t is_native: 1; keybitfield is_native: 1;
uint32_t key : KEY_BITS; keybitfield key : KEY_BITS;
}; };
uint32_t val; keybitfield val;
} Key; } Key;
static PyTypeObject SingleKey_Type; static PyTypeObject SingleKey_Type;
@ -308,9 +309,9 @@ typedef struct {
static inline void static inline void
SingleKey_set_vals(SingleKey *self, long key, unsigned short mods, int is_native) { SingleKey_set_vals(SingleKey *self, long key, unsigned short mods, int is_native) {
if (key >= 0 && key <= BIT_MASK(uint32_t, KEY_BITS)) { if (key >= 0 && key <= BIT_MASK(keybitfield, KEY_BITS)) {
uint32_t k = (uint32_t)key; keybitfield k = (keybitfield)key;
self->key.key = k & BIT_MASK(uint32_t, KEY_BITS); self->key.key = k & BIT_MASK(keybitfield, KEY_BITS);
} }
if (!(mods & 1 << (MOD_BITS + 1))) self->key.mods = mods & BIT_MASK(u_int32_t, MOD_BITS); if (!(mods & 1 << (MOD_BITS + 1))) self->key.mods = mods & BIT_MASK(u_int32_t, MOD_BITS);
if (is_native > -1) self->key.is_native = is_native ? 1 : 0; if (is_native > -1) self->key.is_native = is_native ? 1 : 0;