Archives
/
notcurses
mirror of https://github.com/dankamongmen/notcurses
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

python: Use pile rendering to files and buffers

Browse Source
pull/1815/head
igo95862 3 years ago
parent fe275447fb
commit ec0d2b065f
No known key found for this signature in database
GPG Key ID: F1A55E62951B2143
3 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File

69
python/notcurses/context.c
Unescape Escape View File

@ -81,11 +81,11 @@ Notcurses_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
"flags", NULL};
GNU_PY_CHECK_BOOL(PyArg_ParseTupleAndKeywords(args, kwds, "|O!sO!isO!O!O!O!K", keywords,
&PyLong_Type, &main_fd_object,
&term_type, &PyLong_Type, &render_fd_object, &log_level,
&margins_str,
&PyLong_Type, &margin_top, &PyLong_Type, &margin_right, &PyLong_Type, &margin_bottom, &PyLong_Type, &margin_left,
&flags));
&PyLong_Type, &main_fd_object,
&term_type, &PyLong_Type, &render_fd_object, &log_level,
&margins_str,
&PyLong_Type, &margin_top, &PyLong_Type, &margin_right, &PyLong_Type, &margin_bottom, &PyLong_Type, &margin_left,
&flags));
notcurses_options options = {0};
@ -173,53 +173,6 @@ Notcurses_render(NotcursesObject *self, PyObject *Py_UNUSED(args))
Py_RETURN_NONE;
}
/* FIXME deprecated and changed to ncpile_render_to_file() in 2.3.5
static void cleanup_char_buffer(char **buffer_ptr)
{
if (NULL != buffer_ptr)
{
free(*buffer_ptr);
}
}
static PyObject *
Notcurses_render_to_buffer(NotcursesObject *self, PyObject *Py_UNUSED(args))
{
char *buffer __attribute__((cleanup(cleanup_char_buffer))) = NULL;
size_t buffer_len = 0;
CHECK_NOTCURSES(notcurses_render_to_buffer(self->notcurses_ptr, &buffer, &buffer_len));
return PyBytes_FromStringAndSize(buffer, (Py_ssize_t)buffer_len);
}
static void cleanup_file(FILE **file_to_close)
{
if (NULL != file_to_close)
{
fclose(*file_to_close);
}
}
static PyObject *
Notcurses_render_to_file(NotcursesObject *self, PyObject *args)
{
int fd = INT_MAX;
GNU_PY_CHECK_BOOL(PyArg_ParseTuple(args, "i", &fd));
FILE *new_render_file __attribute__((cleanup(cleanup_file))) = fdopen(fd, "w");
if (NULL == new_render_file)
{
return PyErr_SetFromErrno(PyExc_RuntimeError);
}
CHECK_NOTCURSES(notcurses_render_to_file(self->notcurses_ptr, new_render_file));
Py_RETURN_NONE;
}
*/
static PyObject *
Notcurses_top(NotcursesObject *self, PyObject *Py_UNUSED(args))
{
@ -363,11 +316,11 @@ Notcurses_pile_create(NotcursesObject *self, PyObject *args, PyObject *kwds)
"margin_b", "margin_r", NULL};
GNU_PY_CHECK_BOOL(PyArg_ParseTupleAndKeywords(args, kwds, "|iiiisKii", keywords,
&y, &x,
&rows, &cols,
&name,
&flags,
&margin_b, &margin_r));
&y, &x,
&rows, &cols,
&name,
&flags,
&margin_b, &margin_r));
ncplane_options options = {
.y = y,
@ -497,8 +450,6 @@ static PyMethodDef Notcurses_methods[] = {
{"drop_planes", (PyCFunction)Notcurses_drop_planes, METH_NOARGS, "Destroy all ncplanes other than the stdplane."},
{"render", (PyCFunction)Notcurses_render, METH_NOARGS, "Renders and rasterizes the standard pile in one shot. Blocking call."},
//{"render_to_buffer", (PyCFunction)Notcurses_render_to_buffer, METH_NOARGS, "Perform the rendering and rasterization portion of notcurses_render() and write it to bytes object instead of terminal."},
//{"render_to_file", (PyCFunction)Notcurses_render_to_file, METH_VARARGS, "Write the last rendered frame, in its entirety, to file descriptor. If render() has not yet been called, nothing will be written."},
{"top", (PyCFunction)Notcurses_top, METH_NOARGS, "Return the topmost ncplane of the standard pile."},
{"bottom", (PyCFunction)Notcurses_bottom, METH_NOARGS, "Return the bottommost ncplane of the standard pile."},

24
python/notcurses/notcurses.py
Unescape Escape View File

@ -329,18 +329,6 @@ class Notcurses:
"""
raise NotImplementedError('Stub')
def render_to_buffer(self) -> bytes:
"""Perform the rendering and rasterization portion of render()
and write it to bytes object instead of terminal."""
raise NotImplementedError('Stub')
def render_to_file(self, fd: int, /) -> None:
"""Write the last rendered frame, in its entirety, to file descriptor.
If render() has not yet been called, nothing will be written.
"""
raise NotImplementedError('Stub')
def top(self) -> NcPlane:
"""Return the topmost ncplane of the standard pile."""
raise NotImplementedError('Stub')
@ -1325,3 +1313,15 @@ class NcPlane:
"""Make the physical screen match the last
rendered frame from the pile."""
raise NotImplementedError('Stub')
def pile_render_to_buffer(self) -> bytes:
"""Perform the rendering and rasterization portion of render()
and write it to bytes object instead of terminal."""
raise NotImplementedError('Stub')
def pile_render_to_file(self, fd: int, /) -> None:
"""Write the last rendered frame, in its entirety, to file descriptor.
If render() has not yet been called, nothing will be written.
"""
raise NotImplementedError('Stub')

48
python/notcurses/plane.c
Unescape Escape View File

@ -1657,6 +1657,51 @@ NcPlane_pile_rasterize(NcPlaneObject *self, PyObject *Py_UNUSED(args))
Py_RETURN_NONE;
}
static void cleanup_char_buffer(char **buffer_ptr)
{
if (NULL != buffer_ptr)
{
free(*buffer_ptr);
}
}
static PyObject *
NcPlane_pile_render_to_buffer(NcPlaneObject *self, PyObject *Py_UNUSED(args))
{
char *buffer __attribute__((cleanup(cleanup_char_buffer))) = NULL;
size_t buffer_len = 0;
CHECK_NOTCURSES(ncpile_render_to_buffer(self->ncplane_ptr, &buffer, &buffer_len));
return PyBytes_FromStringAndSize(buffer, (Py_ssize_t)buffer_len);
}
static void cleanup_file(FILE **file_to_close)
{
if (NULL != file_to_close)
{
fclose(*file_to_close);
}
}
static PyObject *
NcPlane_pile_render_to_file(NcPlaneObject *self, PyObject *args)
{
int fd = INT_MAX;
GNU_PY_CHECK_BOOL(PyArg_ParseTuple(args, "i", &fd));
FILE *new_render_file __attribute__((cleanup(cleanup_file))) = fdopen(fd, "w");
if (NULL == new_render_file)
{
return PyErr_SetFromErrno(PyExc_RuntimeError);
}
CHECK_NOTCURSES(ncpile_render_to_file(self->ncplane_ptr, new_render_file));
Py_RETURN_NONE;
}
/*
static PyObject *
NcPlane_(NcPlaneObject *self, PyObject *args)
@ -1846,6 +1891,9 @@ static PyMethodDef NcPlane_methods[] = {
{"pile_render", (PyCFunction)NcPlane_pile_render, METH_NOARGS, PyDoc_STR("Renders the pile of which plane is a part.")},
{"pile_rasterize", (PyCFunction)NcPlane_pile_rasterize, METH_NOARGS, PyDoc_STR("Make the physical screen match the last rendered frame from the pile.")},
{"pile_render_to_buffer", (PyCFunction)NcPlane_pile_render_to_buffer, METH_NOARGS, "Perform the rendering and rasterization portion of notcurses_render() and write it to bytes object instead of terminal."},
{"render_to_file", (PyCFunction)NcPlane_pile_render_to_file, METH_VARARGS, "Write the last rendered frame, in its entirety, to file descriptor. If render() has not yet been called, nothing will be written."},
// {"", (PyCFunction) NULL, METH_VARARGS, PyDoc_STR("")},
{NULL, NULL, 0, NULL},
};

Write Preview
Loading…
Cancel
Save