mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 17:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement Line.set_char

Browse Source
This commit is contained in:
Kovid Goyal
2016-11-02 19:36:17 +05:30
parent a82b00ffeb
commit 4133fc3db7
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/data-types.h
View File

@@ -36,7 +36,7 @@ typedef unsigned int index_type;
#define CC_SHIFT 16 #define CC_SHIFT 16
#define CURSOR_TO_ATTRS(c, w) \ #define CURSOR_TO_ATTRS(c, w) \
(w | (((c->decoration & 3) << DECORATION_SHIFT) | ((c->bold & 1) << BOLD_SHIFT) | \ ((w) | (((c->decoration & 3) << DECORATION_SHIFT) | ((c->bold & 1) << BOLD_SHIFT) | \
((c->italic & 1) << ITALIC_SHIFT) | ((c->reverse & 1) << REVERSE_SHIFT) | ((c->strikethrough & 1) << STRIKE_SHIFT))) << ATTRS_SHIFT ((c->italic & 1) << ITALIC_SHIFT) | ((c->reverse & 1) << REVERSE_SHIFT) | ((c->strikethrough & 1) << STRIKE_SHIFT))) << ATTRS_SHIFT
#define ATTRS_TO_CURSOR(a, c) \ #define ATTRS_TO_CURSOR(a, c) \

28
kitty/line.c
View File

@@ -223,6 +223,32 @@ left_shift(Line *self, PyObject *args) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject*
set_char(Line *self, PyObject *args) {
#define set_char_doc "set_char(at, ch, width=1, cursor=None) -> Set the character at the specified cell. If cursor is not None, also set attributes from that cursor."
unsigned int at, width=1;
int ch;
Cursor *cursor = NULL;
char_type attrs;
if (!PyArg_ParseTuple(args, "IC|IO!", &at, &ch, &width, &Cursor_Type, &cursor)) return NULL;
if (at >= self->xnum) {
PyErr_SetString(PyExc_ValueError, "Out of bounds");
return NULL;
}
if (cursor == NULL) {
attrs = (((self->chars[at] >> ATTRS_SHIFT) & ~3) | (width & 3)) << ATTRS_SHIFT;
} else {
attrs = CURSOR_TO_ATTRS(cursor, width & 3);
self->colors[at] = (cursor->fg & COL_MASK) | ((color_type)(cursor->bg & COL_MASK) << COL_SHIFT);
self->decoration_fg[at] = cursor->decoration_fg & COL_MASK;
}
self->chars[at] = (ch & CHAR_MASK) | attrs;
self->combining_chars[at] = 0;
Py_RETURN_NONE;
}
static Py_ssize_t static Py_ssize_t
__len__(PyObject *self) { __len__(PyObject *self) {
return (Py_ssize_t)(((Line*)self)->ynum); return (Py_ssize_t)(((Line*)self)->ynum);
@@ -247,6 +273,7 @@ static PyMethodDef methods[] = {
METHOD(copy_char, METH_VARARGS) METHOD(copy_char, METH_VARARGS)
METHOD(right_shift, METH_VARARGS) METHOD(right_shift, METH_VARARGS)
METHOD(left_shift, METH_VARARGS) METHOD(left_shift, METH_VARARGS)
METHOD(set_char, METH_VARARGS)
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
@@ -271,7 +298,6 @@ Line *alloc_line() {
static PyObject* static PyObject*
copy_char(Line* self, PyObject *args) { copy_char(Line* self, PyObject *args) {
#define copy_char_doc "copy_char(src, to, dest) -> Copy the character at src to to the character dest in the line `to`"
unsigned int src, dest; unsigned int src, dest;
Line *to; Line *to;
if (!PyArg_ParseTuple(args, "IO!I", &src, &Line_Type, &to, &dest)) return NULL; if (!PyArg_ParseTuple(args, "IO!I", &src, &Line_Type, &to, &dest)) return NULL;