From 9fb34e719dae441f6e0a7fa84db470abc45e09fd Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 21 Jul 2017 19:57:46 -0400 Subject: Add hnel --- curtis/.bin/hnel.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ link.sh | 1 + 2 files changed, 99 insertions(+) create mode 100755 curtis/.bin/hnel.c diff --git a/curtis/.bin/hnel.c b/curtis/.bin/hnel.c new file mode 100755 index 00000000..0e270a5c --- /dev/null +++ b/curtis/.bin/hnel.c @@ -0,0 +1,98 @@ +#if 0 +exec cc -Wall -Wextra -pedantic $@ -lutil -o $(dirname $0)/hnel $0 +#endif + +// Wrapper for preserving HJKL in Tarmak layouts. + +#include +#include +#include +#include +#include +#include + +#if defined __FreeBSD__ +#include +#elif defined __linux__ +#include +#else +#include +#endif + +static ssize_t writeAll(int fd, const char *buf, size_t len) { + ssize_t writeLen; + while (0 < (writeLen = write(fd, buf, len))) { + buf += writeLen; + len -= writeLen; + } + return writeLen; +} + +static struct termios saveTerm; + +static void restoreTerm(void) { + tcsetattr(STDERR_FILENO, TCSADRAIN, &saveTerm); +} + +int main(int argc, char *argv[]) { + if (argc < 2) return EX_USAGE; + + char table[256] = {0}; + table['n'] = 'j'; table['N'] = 'J'; table[CTRL('N')] = CTRL('J'); + table['e'] = 'k'; table['E'] = 'K'; table[CTRL('E')] = CTRL('K'); + table['j'] = 'e'; table['J'] = 'E'; table[CTRL('J')] = CTRL('E'); + table['k'] = 'n'; table['K'] = 'N'; table[CTRL('K')] = CTRL('N'); + + int master; + pid_t pid = forkpty(&master, NULL, NULL, NULL); + if (pid < 0) err(EX_OSERR, "forkpty"); + + if (!pid) { + execvp(argv[1], argv + 1); + err(EX_OSERR, "%s", argv[1]); + } + + int error = tcgetattr(STDERR_FILENO, &saveTerm); + if (error) err(EX_IOERR, "tcgetattr"); + atexit(restoreTerm); + + struct termios raw; + cfmakeraw(&raw); + error = tcsetattr(STDERR_FILENO, TCSADRAIN, &raw); + if (error) err(EX_IOERR, "tcsetattr"); + + struct pollfd fds[2] = { + { .fd = STDIN_FILENO, .events = POLLIN }, + { .fd = master, .events = POLLIN }, + }; + + char buf[4096]; + ssize_t len; + while (0 < poll(fds, 2, -1)) { + if (fds[0].revents) { + len = read(STDIN_FILENO, buf, sizeof(buf)); + if (len < 0) err(EX_IOERR, "read(%d)", STDIN_FILENO); + + if (len == 1) { + unsigned char c = buf[0]; + if (table[c]) buf[0] = table[c]; + } + + len = writeAll(master, buf, len); + if (len < 0) err(EX_IOERR, "write(%d)", master); + } + + if (fds[1].revents) { + len = read(master, buf, sizeof(buf)); + if (len < 0) err(EX_IOERR, "read(%d)", master); + len = writeAll(STDOUT_FILENO, buf, len); + if (len < 0) err(EX_IOERR, "write(%d)", STDOUT_FILENO); + } + + int status; + pid_t dead = waitpid(pid, &status, WNOHANG); + if (dead < 0) err(EX_OSERR, "waitpid(%d)", pid); + if (dead) return WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE; + } + err(EX_IOERR, "poll"); +} diff --git a/link.sh b/link.sh index 2886d7c5..079d03dc 100755 --- a/link.sh +++ b/link.sh @@ -23,6 +23,7 @@ link() { link '.bin/bri.c' link '.bin/dtch.c' +link '.bin/hnel.c' link '.bin/jrp.c' link '.bin/pbd.c' link '.bin/xx.c' -- cgit 1.4.1 '3' class='logmsg'> 2022-07-08Remove TOURJune McEnroe There is not that much distinct stuff here anymore. 2022-07-03Add The Bone Shard EmperorJune McEnroe Suffers a little bit from middle book but I really enjoyed it. Read it faster than the first one too, despite its length. 2022-06-25Bump xterm font size to 12June McEnroe 2022-06-10Handle subshells (and functions) inside substitutionsJune McEnroe 2022-06-10Switch to jorts Install scriptJune McEnroe 2022-06-08Indicate if still reading or no resultsJune McEnroe 2022-06-08Add Maiden, Mother, CroneJune McEnroe Mixed bag like most collections of short stories. Some of them are pretty good. The author of the worst written story also has the worst written bio. 2022-06-05FIRST SHOW IN 2.5 YEARS BABEY!!!June McEnroe 2022-06-03Set line number on File linesJune McEnroe 2022-06-03Stop polling stdin after EOFJune McEnroe 2022-06-02Set TABSIZE=4June McEnroe Absolutely indiscriminately. 2022-06-02Do basic match highlightingJune McEnroe 2022-06-02Clean up parsing a littleJune McEnroe 2022-06-02Don't duplicate path stringJune McEnroe 2022-06-02Use stderr instead of /dev/tty, realloc buffer if lines too longJune McEnroe For some reason I haven't been able to figure out, trying to poll /dev/tty returns POLLNVAL (and this was using 100% CPU looping), but using stderr instead works fine. 2022-06-02Add initial working version of qfJune McEnroe 2022-05-29Set prompt for okshJune McEnroe