From 7807848bda7a0522f20fa942b1c46fd55ad2beba Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Wed, 3 Feb 2021 14:52:16 -0500 Subject: [PATCH] Add C-z C-v for literal next A little annoying to make it a "chord" like this, but C-v is already used for scrolling, following Emacs-style key bindings (in order to have a way to scroll without using "special" keys like the arrows and page up/down), and C-z is at least already in the business of inserting control characters. This makes it possible to manually enter some things that are otherwise only possible with /exec printf. --- catgirl.1 | 6 ++++-- ui.c | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/catgirl.1 b/catgirl.1 index d572a8b..03b708e 100644 --- a/catgirl.1 +++ b/catgirl.1 @@ -1,4 +1,4 @@ -.Dd January 26, 2021 +.Dd February 3, 2021 .Dt CATGIRL 1 .Os . @@ -658,7 +658,9 @@ Scroll up a page. .El . .Ss IRC Formatting -.Bl -tag -width Ds -compact +.Bl -tag -width "C-z C-v" -compact +.It Ic C-z C-v +Insert the next input character literally. .It Ic C-z b Toggle bold. .It Ic C-z c diff --git a/ui.c b/ui.c index e75e0eb..557d0dc 100644 --- a/ui.c +++ b/ui.c @@ -1003,19 +1003,22 @@ void uiRead(void) { } wint_t ch; - static bool paste, style; + static bool paste, style, literal; for (int ret; ERR != (ret = wget_wch(input, &ch));) { if (ret == KEY_CODE_YES && ch == KeyPasteOn) { paste = true; } else if (ret == KEY_CODE_YES && ch == KeyPasteOff) { paste = false; - } else if (paste) { + } else if (paste || literal) { edit(windows.ptrs[windows.show]->id, EditInsert, ch); } else if (ret == KEY_CODE_YES) { keyCode(ch); } else if (ch == (L'Z' ^ L'@')) { style = true; continue; + } else if (style && ch == (L'V' ^ L'@')) { + literal = true; + continue; } else if (style) { keyStyle(ch); } else if (iswcntrl(ch)) { @@ -1024,6 +1027,7 @@ void uiRead(void) { edit(windows.ptrs[windows.show]->id, EditInsert, ch); } style = false; + literal = false; } inputUpdate(); }