From 461bfca37855b68ab7dab1a89d154bd483716840 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 11 Aug 2018 15:49:39 -0400 Subject: Add term.c for extra terminal features Look at the cute little state machine! --- Makefile | 2 +- README | 1 + chat.h | 14 ++++++++++++++ term.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 term.c diff --git a/Makefile b/Makefile index bf7b011..f9c903e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CFLAGS += -Wall -Wextra -Wpedantic CFLAGS += -I/usr/local/include -I/usr/local/opt/libressl/include LDFLAGS += -L/usr/local/lib -L/usr/local/opt/libressl/lib LDLIBS = -lcursesw -ltls -OBJS = chat.o edit.o handle.o input.o irc.o pls.o tab.o tag.o ui.o url.o +OBJS = chat.o edit.o handle.o input.o irc.o pls.o tab.o tag.o term.o ui.o url.o all: tags chat diff --git a/README b/README index 9a93b9d..a5e2421 100644 --- a/README +++ b/README @@ -9,6 +9,7 @@ This software requires LibreSSL and targets FreeBSD and Darwin. input.c Input command handling irc.c TLS client connection ui.c Curses UI and mIRC formatting + term.c Terminal features unsupported by curses edit.c Line editing tab.c Tab-complete url.c URL detection diff --git a/chat.h b/chat.h index 9219334..f900172 100644 --- a/chat.h +++ b/chat.h @@ -79,6 +79,20 @@ void uiTopic(struct Tag tag, const char *topic); void uiLog(struct Tag tag, const wchar_t *line); void uiFmt(struct Tag tag, const wchar_t *format, ...); +enum TermMode { + TERM_FOCUS, + TERM_PASTE, +}; +enum TermEvent { + TERM_NONE, + TERM_FOCUS_IN, + TERM_FOCUS_OUT, + TERM_PASTE_START, + TERM_PASTE_END, +}; +void termMode(enum TermMode mode, bool set); +enum TermEvent termEvent(char ch); + enum Edit { EDIT_LEFT, EDIT_RIGHT, diff --git a/term.c b/term.c new file mode 100644 index 0000000..c603d32 --- /dev/null +++ b/term.c @@ -0,0 +1,53 @@ +/* Copyright (C) 2018 Curtis McEnroe + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#include +#include +#include + +#include "chat.h" + +#define PAIR(a, b) (((short)(a) << 8) | ((short)(b) & 0xFF)) + +static void privateMode(const char *mode, bool set) { + printf("\33[?%s%c", mode, (set ? 'h' : 'l')); + fflush(stdout); +} + +void termMode(enum TermMode mode, bool set) { + switch (mode) { + break; case TERM_FOCUS: privateMode("1004", set); + break; case TERM_PASTE: privateMode("2004", set); + } +} + +enum TermEvent termEvent(char ch) { + static char state = '\0'; + switch (PAIR(state, ch)) { + break; case PAIR('\0', '\33'): state = '\33'; + break; case PAIR('\33', '['): state = '['; + break; case PAIR('[', 'I'): state = '\0'; return TERM_FOCUS_IN; + break; case PAIR('[', 'O'): state = '\0'; return TERM_FOCUS_OUT; + break; case PAIR('[', '2'): state = '2'; + break; case PAIR('2', '0'): state = '0'; + break; case PAIR('0', '0'): state = '0'; + break; case PAIR('0', '~'): state = '\0'; return TERM_PASTE_START; + break; case PAIR('0', '1'): state = '1'; + break; case PAIR('1', '~'): state = '\0'; return TERM_PASTE_END; + break; default: state = '\0'; + } + return TERM_NONE; +} -- cgit 1.4.0 00'>2019-08-28Use rand(3) in beefJune McEnroe 2019-08-28Remove wakeJune McEnroe RIP again, thursday. I don't think the RPi3 even knows how to suspend. 2019-08-28Add The Fated SkyJune McEnroe 2019-08-28Factor out cap_rights_limit error handlingJune McEnroe 2019-08-27Cast %lc parameter to wint_tJune McEnroe I hadn't realized that's what type %lc takes and suddenly started seeing warnings about it for some reason. 2019-08-27Remove host thursdayJune McEnroe RIP. 2019-08-22Add cards to causal.agencyJune McEnroe 2019-08-20Add Record of a Spaceborn FewJune McEnroe 2019-08-13Add The Calculating StarsJune McEnroe 2019-08-12Make dtch one command, add sinkingJune McEnroe 2019-08-03Add ImagoJune McEnroe 2019-07-29Add KindredJune McEnroe 2019-07-27Clean up home filesJune McEnroe 2019-07-27Fix shell script style in ~/.local/binJune McEnroe 2019-07-27Shell script style passJune McEnroe 2019-07-27Add c11.pdfJune McEnroe 2019-07-27Move pdf script to MakefileJune McEnroe 2019-07-27Update macOS neovim to 0.3.8June McEnroe Which somehow still doesn't include my man fix. 2019-07-27Rewrite port makefiles consistentlyJune McEnroe 2019-07-27Rewrite Makefile once more with more organizationJune McEnroe 2019-07-27Reference png.h in bin.7June McEnroe 2019-07-27Revert "Use scheme to style HTMLs"June McEnroe This reverts commit 4b7d5161a30645b0a23691687ef1aafdda62d3bb. I don't know why but I don't like it. 2019-07-27Remove scheme text linkJune McEnroe No standard base64 encoder so no way to maintain it. 2019-07-26Update Dark.terminalJune McEnroe Why are the blobs so much bigger now? 2019-07-26Lighten dark whiteJune McEnroe 2019-07-25Add png.3 man pageJune McEnroe 2019-07-25Use scheme to style HTMLsJune McEnroe 2019-07-25Don't match comments in strings in makeJune McEnroe 2019-07-25Generate index.html with links from bin.7June McEnroe 2019-07-24Warn when date has changedJune McEnroe 2019-07-24Add whenJune McEnroe When? Now. 2019-07-24Remove histedit from bitJune McEnroe