kovidgoyal/kitty
1
1
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2024-11-13 12:09:35 +03:00
Code Issues Projects Releases Wiki Activity

DRYer

Browse Source 
Also dont store negative values for key. Unset is 0 not -1
This commit is contained in:
Kovid Goyal 2022-08-12 11:35:45 +05:30
parent df4738f080
commit ef621aa099
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kitty/keys.c
View File

@ -299,28 +299,29 @@ typedef union Key {
} Key;
static PyTypeObject SingleKey_Type;
static char *SingleKey_kwds[] = {"mods", "is_native", "key", NULL};
typedef struct {
PyObject_HEAD
Key key;
} SingleKey;
static inline void
SingleKey_set_vals(SingleKey *self, long key, unsigned short mods, int is_native) {
if (key >= 0 && key <= 0x10FFFF) {
uint32_t k = (uint32_t)key;
self->key.key = k & BIT_MASK(uint32_t, KEY_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;
}
static PyObject *
SingleKey_new(PyTypeObject *type, PyObject *args, PyObject *kw) {
long key = -1; unsigned short mods = 0; int is_native = 0;
static char *SingleKey_kwds[] = {"mods", "is_native", "key", NULL};
long key = -1; unsigned short mods = 1 << (MOD_BITS + 1); int is_native = -1;
if (!PyArg_ParseTupleAndKeywords(args, kw, "|Hpl", SingleKey_kwds, &mods, &is_native, &key)) return NULL;
SingleKey *self = (SingleKey *)type->tp_alloc(type, 0);
if (self) {
if (key > 0 && key <= 0x10FFFF) {
uint32_t k = (uint32_t)key;
self->key.key = k & BIT_MASK(uint32_t, KEY_BITS);
}
self->key.mods = mods & BIT_MASK(u_int32_t, MOD_BITS);
if (is_native) self->key.is_native = 1u;
}
if (self) SingleKey_set_vals(self, key, mods, is_native);
return (PyObject*)self;
}
@ -348,8 +349,7 @@ SingleKey_repr(PyObject *s) {
static PyObject*
SingleKey_get_key(SingleKey *self, void UNUSED *closure) {
const unsigned long val = self->key.key;
if (val) return PyLong_FromUnsignedLong(val);
return PyLong_FromLong(-1);
return PyLong_FromUnsignedLong(val);
}
static PyObject*
@ -411,26 +411,16 @@ static PySequenceMethods SingleKey_sequence_methods = {
.sq_item = SingleKey_item,
};
static bool
dict_has_key(PyObject *dict, const char *key) {
PyObject *k = PyUnicode_FromString(key);
if (!k) { PyErr_Print(); return false; }
int ret = PyDict_Contains(dict, k);
Py_DECREF(k);
return ret != 0;
}
static PyObject*
SingleKey_replace(SingleKey *self, PyObject *args, PyObject *kw) {
SingleKey *r = (SingleKey*)SingleKey_new(&SingleKey_Type, args, kw);
if (!r) return NULL;
long key = -2; unsigned short mods = 1 << (MOD_BITS + 1); int is_native = -1;
if (!PyArg_ParseTupleAndKeywords(args, kw, "|Hpl", SingleKey_kwds, &mods, &is_native, &key)) return NULL;
SingleKey *ans = (SingleKey*)SingleKey_Type.tp_alloc(&SingleKey_Type, 0);
if (!ans) { Py_DECREF(r); return NULL; }
ans->key.val = self->key.val;
if (dict_has_key(kw, "mods")) ans->key.mods = r->key.mods;
if (dict_has_key(kw, "is_native")) ans->key.is_native = r->key.is_native;
if (dict_has_key(kw, "key")) ans->key.key = r->key.key;
Py_DECREF(r);
if (ans) {
if (key == -1) key = 0;
ans->key.val = self->key.val;
SingleKey_set_vals(ans, key, mods, is_native);
}
return (PyObject*)ans;
}

2
kitty_tests/datatypes.py
View File

@ -538,7 +538,7 @@ class TestDataTypes(BaseTest):
for m in (GLFW_MOD_KITTY, GLFW_MOD_SHIFT):
s = SingleKey(mods=m)
self.ae(s.mods, m)
self.ae(tuple(iter(SingleKey())), (0, False, -1))
self.ae(tuple(iter(SingleKey())), (0, False, 0))
self.ae(tuple(SingleKey(key=0x10ffff, mods=GLFW_MOD_SHIFT, is_native=True)), (GLFW_MOD_SHIFT, True, 0x10ffff))
self.ae(repr(SingleKey()), 'SingleKey()')
self.ae(repr(SingleKey(key=23, mods=2, is_native=True)), 'SingleKey(mods=2, is_native=True, key=23)')