aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile3
-rw-r--r--man/termkey_advisereadable.32
-rw-r--r--man/termkey_get_buffer_remaining.33
-rw-r--r--man/termkey_getkey.3.sh3
-rw-r--r--man/termkey_push_bytes.323
-rw-r--r--t/02getkey.c29
-rw-r--r--t/03utf8.c71
-rw-r--r--t/04flags.c13
-rw-r--r--t/05read.c66
-rw-r--r--termkey.c23
-rw-r--r--termkey.h.in2
11 files changed, 158 insertions, 80 deletions
diff --git a/Makefile b/Makefile
index 55c6aec..f6ec087 100644
--- a/Makefile
+++ b/Makefile
@@ -126,3 +126,6 @@ TARBALL=$(DISTDIR).tar.gz
dist: distdir
tar -czf $(TARBALL) $(DISTDIR)
rm -rf $(DISTDIR)
+
+htmldocs:
+ perl $(HOME)/src/perl/Parse-Man/examples/man-to-html.pl -O $(HOME)/website-source2/code/libtermkey/doc --file-extension tmpl --link-extension html --template home_lou.tt2 *.3
diff --git a/man/termkey_advisereadable.3 b/man/termkey_advisereadable.3
index 06e0467..3c63fdd 100644
--- a/man/termkey_advisereadable.3
+++ b/man/termkey_advisereadable.3
@@ -12,7 +12,7 @@ Link with \fI-ltermkey\fP.
.SH DESCRIPTION
\fBtermkey_advisereadable\fP() informs the instance that new input may be available on the underlying file descriptor and so it should call \fBread\fP(2) to obtain it. If at least one more byte was read it will return \fBTERMKEY_RES_AGAIN\fP to indicate it may be useful to call \fBtermkey_getkey\fP(3) again. If no more input was read then \fBTERMKEY_RES_NONE\fP is returned. If there was no buffer space remaining, then \fBTERMKEY_RES_ERROR\fP is returned with \fIerrno\fP set to \fBENOMEM\fP.
.PP
-This function, along with \fBtermkey_getkey\fP(3) make it possible to use the termkey instance in an asynchronous program.
+This function, along with \fBtermkey_getkey\fP(3) make it possible to use the termkey instance in an asynchronous program. To provide bytes without using a readable file handle, use \fBtermkey_push_bytes\fP(3).
.PP
For synchronous usage, \fBtermkey_waitkey\fP(3) performs the input blocking task.
.SH "RETURN VALUE"
diff --git a/man/termkey_get_buffer_remaining.3 b/man/termkey_get_buffer_remaining.3
index a7f7885..6f85f99 100644
--- a/man/termkey_get_buffer_remaining.3
+++ b/man/termkey_get_buffer_remaining.3
@@ -10,11 +10,12 @@ termkey_get_buffer_remaining \- returns the free buffer space
.sp
Link with \fI-ltermkey\fP.
.SH DESCRIPTION
-A termkey instance contains a buffer of pending bytes that have been read by \fBtermkey_advisereadable\fP(3) but not yet consumed by \fBtermkey_getkey\fP(3). \fBtermkey_get_buffer_remaining\fP() returns the number of bytes of buffer space currently free in the termkey instance.
+A termkey instance contains a buffer of pending bytes that have been read by \fBtermkey_advisereadable\fP(3) or provided by \fBtermkey_push_bytes\fP(3) but not yet consumed by \fBtermkey_getkey\fP(3). \fBtermkey_get_buffer_remaining\fP() returns the number of bytes of buffer space currently free in the termkey instance.
.PP
.SH "RETURN VALUE"
\fBtermkey_get_buffer_remaining\fP() returns a size in bytes.
.SH "SEE ALSO"
.BR termkey_new (3),
+.BR termkey_push_bytes (3),
.BR termkey_advisereadable (3),
.BR termkey_getkey (3)
diff --git a/man/termkey_getkey.3.sh b/man/termkey_getkey.3.sh
index 022f209..6f210c1 100644
--- a/man/termkey_getkey.3.sh
+++ b/man/termkey_getkey.3.sh
@@ -30,7 +30,7 @@ no bytes are waiting in the buffer.
.PP
\fBtermkey_getkey_force\fP() is similar to \fBtermkey_getkey\fP() but will not return \fBTERMKEY_RES_AGAIN\fP if a partial match is found. Instead, it will force an interpretation of the bytes, even if this means interpreting the start of an Escape-prefixed multi-byte sequence as a literal "Escape" key followed by normal letters.
.PP
-Neither of these functions will block or perform any IO operations on the underlying filehandle. To use the instance in an asynchronous program, see \fBtermkey_advisereadable\fP(3). For a blocking call suitable for use in a synchronous program, use \fBtermkey_waitkey\fP(3) instead of \fBtermkey_getkey\fP().
+Neither of these functions will block or perform any IO operations on the underlying filehandle. To use the instance in an asynchronous program, see \fBtermkey_advisereadable\fP(3). For a blocking call suitable for use in a synchronous program, use \fBtermkey_waitkey\fP(3) instead of \fBtermkey_getkey\fP(). For providing input without a readable filehandle, use \fBtermkey_push_bytes\fP(3).
.PP
Before returning, this function canonicalises the \fIkey\fP structure according to the rules given for \fBtermkey_canonicalise\fP(3).
.PP
@@ -86,6 +86,7 @@ cat <<EOF
.SH "SEE ALSO"
.BR termkey_new (3),
.BR termkey_advisereadable (3),
+.BR termkey_push_bytes (3),
.BR termkey_waitkey (3),
.BR termkey_set_waittime (3),
.BR termkey_get_keyname (3),
diff --git a/man/termkey_push_bytes.3 b/man/termkey_push_bytes.3
new file mode 100644
index 0000000..c7dc999
--- /dev/null
+++ b/man/termkey_push_bytes.3
@@ -0,0 +1,23 @@
+.TH TERMKEY_PUSH_BYTES 3
+.SH NAME
+termkey_push_bytes \- supply more bytes to the input buffer
+.SH SYNOPSIS
+.nf
+.B #include <termkey.h>
+.sp
+.BI "size_t termkey_push_bytes(TermKey *" tk ", const char *" bytes ", size_t " len ");
+.fi
+.sp
+Link with \fI-ltermkey\fP.
+.SH DESCRIPTION
+\fBtermkey_push_bytes\fP() allows more bytes of input to be supplied directly into the input buffer of the termkey instance. If there was no buffer space remaining, then -1 is returned with \fIerrno\fP set to \fBENOMEM\fP.
+.PP
+This function, along with \fBtermkey_getkey\fP(3) make it possible to use the termkey instance in an asynchronous program, or with a source of bytes other than from reading a filehandle.
+.PP
+For synchronous usage, \fBtermkey_waitkey\fP(3) performs the input blocking task. For use against a regular stream filehandle that supports \fBread\fP(2), see \fBtermkey_advisereadable\fP(3).
+.SH "RETURN VALUE"
+\fBtermkey_push_bytes\fP() the number of bytes consumed from the input (which may be smaller than the length provided, if the buffer runs out of space) or -1 cast to \fBsize_t\fP if an error occurs.
+.SH "SEE ALSO"
+.BR termkey_new (3),
+.BR termkey_getkey (3),
+.BR termkey_advise_readable (3)
diff --git a/t/02getkey.c b/t/02getkey.c
index 79d7976..6d076cb 100644
--- a/t/02getkey.c
+++ b/t/02getkey.c
@@ -4,30 +4,23 @@
int main(int argc, char *argv[])
{
- int fd[2];
TermKey *tk;
TermKeyKey key;
- plan_tests(29);
-
- pipe(fd);
+ plan_tests(27);
/* Sanitise this just in case */
putenv("TERM=vt100");
- tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS);
+ tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS);
is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE when empty");
- write(fd[1], "h", 1);
-
- is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE before advisereadable");
-
- is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after h");
+ is_int(termkey_push_bytes(tk, "h", 1), 1, "push_bytes returns 1");
- is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after advisereadable");
+ is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after push_bytes");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h");
@@ -40,9 +33,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE a second time");
- write(fd[1], "\x01", 1);
-
- is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after C-a");
+ termkey_push_bytes(tk, "\x01", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after C-a");
@@ -50,9 +41,7 @@ int main(int argc, char *argv[])
is_int(key.code.number, 'a', "key.code.number after C-a");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after C-a");
- write(fd[1], "\eOA", 3);
-
- is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after Up");
+ termkey_push_bytes(tk, "\eOA", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Up");
@@ -60,15 +49,13 @@ int main(int argc, char *argv[])
is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.sym after Up");
is_int(key.modifiers, 0, "key.modifiers after Up");
- write(fd[1], "\eO", 2);
- termkey_advisereadable(tk);
+ is_int(termkey_push_bytes(tk, "\eO", 2), 2, "push_bytes returns 2");
is_int(termkey_get_buffer_remaining(tk), 254, "buffer free 254 after partial write");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN after partial write");
- write(fd[1], "C", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "C", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Right completion");
diff --git a/t/03utf8.c b/t/03utf8.c
index 34fce6f..9290613 100644
--- a/t/03utf8.c
+++ b/t/03utf8.c
@@ -3,22 +3,18 @@
int main(int argc, char *argv[])
{
- int fd[2];
TermKey *tk;
TermKeyKey key;
plan_tests(57);
- pipe(fd);
-
/* Sanitise this just in case */
putenv("TERM=vt100");
- tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS|TERMKEY_FLAG_UTF8);
+ tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS|TERMKEY_FLAG_UTF8);
- write(fd[1], "a", 1);
+ termkey_push_bytes(tk, "a", 1);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY low ASCII");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type low ASCII");
is_int(key.code.number, 'a', "key.code.number low ASCII");
@@ -26,97 +22,85 @@ int main(int argc, char *argv[])
/* 2-byte UTF-8 range is U+0080 to U+07FF (0xDF 0xBF) */
/* However, we'd best avoid the C1 range, so we'll start at U+00A0 (0xC2 0xA0) */
- write(fd[1], "\xC2\xA0", 2);
+ termkey_push_bytes(tk, "\xC2\xA0", 2);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 low");
is_int(key.code.number, 0x00A0, "key.code.number UTF-8 2 low");
- write(fd[1], "\xDF\xBF", 2);
+ termkey_push_bytes(tk, "\xDF\xBF", 2);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 high");
is_int(key.code.number, 0x07FF, "key.code.number UTF-8 2 high");
/* 3-byte UTF-8 range is U+0800 (0xE0 0xA0 0x80) to U+FFFD (0xEF 0xBF 0xBD) */
- write(fd[1], "\xE0\xA0\x80", 3);
+ termkey_push_bytes(tk, "\xE0\xA0\x80", 3);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 low");
is_int(key.code.number, 0x0800, "key.code.number UTF-8 3 low");
- write(fd[1], "\xEF\xBF\xBD", 3);
+ termkey_push_bytes(tk, "\xEF\xBF\xBD", 3);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 high");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 high");
/* 4-byte UTF-8 range is U+10000 (0xF0 0x90 0x80 0x80) to U+10FFFF (0xF4 0x8F 0xBF 0xBF) */
- write(fd[1], "\xF0\x90\x80\x80", 4);
+ termkey_push_bytes(tk, "\xF0\x90\x80\x80", 4);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 low");
is_int(key.code.number, 0x10000, "key.code.number UTF-8 4 low");
- write(fd[1], "\xF4\x8F\xBF\xBF", 4);
+ termkey_push_bytes(tk, "\xF4\x8F\xBF\xBF", 4);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 high");
is_int(key.code.number, 0x10FFFF, "key.code.number UTF-8 4 high");
/* Invalid continuations */
- write(fd[1], "\xC2!", 2);
+ termkey_push_bytes(tk, "\xC2!", 2);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 2 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 2 invalid after");
- write(fd[1], "\xE0!", 2);
+ termkey_push_bytes(tk, "\xE0!", 2);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 3 invalid after");
- write(fd[1], "\xE0\xA0!", 3);
+ termkey_push_bytes(tk, "\xE0\xA0!", 3);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont 2");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 3 invalid after");
- write(fd[1], "\xF0!", 2);
+ termkey_push_bytes(tk, "\xF0!", 2);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 4 invalid after");
- write(fd[1], "\xF0\x90!", 3);
+ termkey_push_bytes(tk, "\xF0\x90!", 3);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 2");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 4 invalid after");
- write(fd[1], "\xF0\x90\x80!", 4);
+ termkey_push_bytes(tk, "\xF0\x90\x80!", 4);
- termkey_advisereadable(tk);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 3");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont 3");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
@@ -124,42 +108,33 @@ int main(int argc, char *argv[])
/* Partials */
- write(fd[1], "\xC2", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\xC2", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 2 partial");
- write(fd[1], "\xA0", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\xA0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 partial");
is_int(key.code.number, 0x00A0, "key.code.number UTF-8 2 partial");
- write(fd[1], "\xE0", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\xE0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial");
- write(fd[1], "\xA0", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\xA0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial");
- write(fd[1], "\x80", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 partial");
is_int(key.code.number, 0x0800, "key.code.number UTF-8 3 partial");
- write(fd[1], "\xF0", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\xF0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial");
- write(fd[1], "\x90", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\x90", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial");
- write(fd[1], "\x80", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial");
- write(fd[1], "\x80", 1);
- termkey_advisereadable(tk);
+ termkey_push_bytes(tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 partial");
is_int(key.code.number, 0x10000, "key.code.number UTF-8 4 partial");
diff --git a/t/04flags.c b/t/04flags.c
index 8c30483..cf8e2c3 100644
--- a/t/04flags.c
+++ b/t/04flags.c
@@ -4,22 +4,19 @@
int main(int argc, char *argv[])
{
- int fd[2];
TermKey *tk;
TermKeyKey key;
plan_tests(8);
- pipe(fd);
-
/* Sanitise this just in case */
putenv("TERM=vt100");
- tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS);
+ tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS);
- write(fd[1], " ", 1);
+ termkey_push_bytes(tk, " ", 1);
- is_int(termkey_waitkey(tk, &key), TERMKEY_RES_KEY, "waitkey yields RES_KEY after space");
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after space");
is_int(key.code.number, ' ', "key.code.number after space");
@@ -27,9 +24,9 @@ int main(int argc, char *argv[])
termkey_set_flags(tk, TERMKEY_FLAG_SPACESYMBOL);
- write(fd[1], " ", 1);
+ termkey_push_bytes(tk, " ", 1);
- is_int(termkey_waitkey(tk, &key), TERMKEY_RES_KEY, "waitkey yields RES_KEY after space");
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after space with FLAG_SPACESYMBOL");
is_int(key.code.number, TERMKEY_SYM_SPACE, "key.code.sym after space with FLAG_SPACESYMBOL");
diff --git a/t/05read.c b/t/05read.c
new file mode 100644
index 0000000..00fb640
--- /dev/null
+++ b/t/05read.c
@@ -0,0 +1,66 @@
+#include <stdio.h>
+#include "../termkey.h"
+#include "taplib.h"
+
+int main(int argc, char *argv[])
+{
+ int fd[2];
+ TermKey *tk;
+ TermKeyKey key;
+
+ plan_tests(19);
+
+ /* We'll need a real filehandle we can write/read.
+ * pipe() can make us one */
+ pipe(fd);
+
+ /* Sanitise this just in case */
+ putenv("TERM=vt100");
+
+ tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS);
+
+ is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256");
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE when empty");
+
+ write(fd[1], "h", 1);
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE before advisereadable");
+
+ is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after h");
+
+ is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after advisereadable");
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h");
+
+ is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h");
+ is_int(key.code.number, 'h', "key.code.number after h");
+ is_int(key.modifiers, 0, "key.modifiers after h");
+ is_str(key.utf8, "h", "key.utf8 after h");
+
+ is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after getkey");
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE a second time");
+
+ write(fd[1], "\eO", 2);
+ termkey_advisereadable(tk);
+
+ is_int(termkey_get_buffer_remaining(tk), 254, "buffer free 254 after partial write");
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN after partial write");
+
+ write(fd[1], "C", 1);
+ termkey_advisereadable(tk);
+
+ is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Right completion");
+
+ is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right");
+ is_int(key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right");
+ is_int(key.modifiers, 0, "key.modifiers after Right");
+
+ is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after completion");
+
+ termkey_destroy(tk);
+
+ return exit_status();
+}
diff --git a/termkey.c b/termkey.c
index a55b106..249fc22 100644
--- a/termkey.c
+++ b/termkey.c
@@ -976,6 +976,29 @@ retry:
}
}
+size_t termkey_push_bytes(TermKey *tk, const char *bytes, size_t len)
+{
+ if(tk->buffstart) {
+ memmove(tk->buffer, tk->buffer + tk->buffstart, tk->buffcount);
+ tk->buffstart = 0;
+ }
+
+ /* Not expecting it ever to be greater but doesn't hurt to handle that */
+ if(tk->buffcount >= tk->buffsize) {
+ errno = ENOMEM;
+ return (size_t)-1;
+ }
+
+ if(len > tk->buffsize - tk->buffcount)
+ len = tk->buffsize - tk->buffcount;
+
+ // memcpy(), not strncpy() in case of null bytes in input
+ memcpy(tk->buffer + tk->buffcount, bytes, len);
+ tk->buffcount += len;
+
+ return len;
+}
+
TermKeySym termkey_register_keyname(TermKey *tk, TermKeySym sym, const char *name)
{
if(!sym)
diff --git a/termkey.h.in b/termkey.h.in
index 0349fe7..d29893d 100644
--- a/termkey.h.in
+++ b/termkey.h.in
@@ -181,6 +181,8 @@ TermKeyResult termkey_waitkey(TermKey *tk, TermKeyKey *key);
TermKeyResult termkey_advisereadable(TermKey *tk);
+size_t termkey_push_bytes(TermKey *tk, const char *bytes, size_t len);
+
TermKeySym termkey_register_keyname(TermKey *tk, TermKeySym sym, const char *name);
const char *termkey_get_keyname(TermKey *tk, TermKeySym sym);
char *termkey_lookup_keyname(TermKey *tk, const char *str, TermKeySym *sym);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-26 16:51:44 +0000