summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-02-22 23:56:55 -0500
committerJune McEnroe <june@causal.agency>2019-02-22 23:56:55 -0500
commitc168e54f0687d7c0c87dbbdd1f735400b35eb6da (patch)
treea66f88fd920975b9e56e3b68638a8032887a1717
parentDisable terminal flow control (diff)
downloadcatgirl-c168e54f0687d7c0c87dbbdd1f735400b35eb6da.tar.gz
catgirl-c168e54f0687d7c0c87dbbdd1f735400b35eb6da.zip
Move IRC formatting reset to C-s
Opens C-n for window switching.
-rw-r--r--catgirl.18
-rw-r--r--ui.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/catgirl.1 b/catgirl.1
index 3a6b2f5..f28900b 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 21, 2019
+.Dd February 22, 2019
 .Dt CATGIRL 1
 .Os
 .
@@ -246,14 +246,12 @@ commands, nicks and channels.
 .
 .Ss IRC Formatting
 .Bl -tag -width Ds -compact
-.It Ic C-n
-Reset formatting.
 .It Ic C-o
 Toggle bold.
-This may need to be typed as
-.Ic C-v C-o .
 .It Ic C-r
 Set or reset color.
+.It Ic C-s
+Reset formatting.
 .It Ic C-t
 Toggle italics.
 .It Ic C-u
diff --git a/ui.c b/ui.c
index 4db7e02..847e37c 100644
--- a/ui.c
+++ b/ui.c
@@ -493,9 +493,9 @@ static void keyChar(wchar_t ch) {
 		break; case CTRL(L'W'): edit(win->tag, EditKillBackWord, 0);
 
 		break; case CTRL(L'C'): edit(win->tag, EditInsert, IRCColor);
-		break; case CTRL(L'N'): edit(win->tag, EditInsert, IRCReset);
 		break; case CTRL(L'O'): edit(win->tag, EditInsert, IRCBold);
 		break; case CTRL(L'R'): edit(win->tag, EditInsert, IRCColor);
+		break; case CTRL(L'S'): edit(win->tag, EditInsert, IRCReset);
 		break; case CTRL(L'T'): edit(win->tag, EditInsert, IRCItalic);
 		break; case CTRL(L'U'): edit(win->tag, EditInsert, IRCUnderline);
 		break; case CTRL(L'V'): edit(win->tag, EditInsert, IRCReverse);
placed on static regex_t regex(const char *pattern, int flags) in title.c. 2022-03-24Add The Invisible Life of Addie LaRueJune McEnroe So good, but so long. Reminded me of The Ten Thousand Doors of January at the beginning, and more of that N. K. Jemisin series about gods later. I like this interacting with gods and becoming something like one sort of thing. God, it took me a whole month (more?) to read and this is only my third book of the year :( I need some more novellas to read, but the other books I have from the library currently are also thick. 2022-03-22Source ~/.profile.local if it existsJune McEnroe 2022-03-18Publish "Addendum 2021"June McEnroe 2022-03-16Remove wcwidth portJune McEnroe DYLD_FORCE_FLAT_NAMESPACE no longer exists in macOS 12 so this approach doesn't work anymore. Moved to <https://git.causal.agency/jorts/tree/wcwidth> and compiled into <https://git.causal.agency/jorts/tree/ncurses>. 2022-03-16Remove -j4 from ./PlanJune McEnroe Plan learned to set this automatically! 2022-03-15Rewrite Linux install.sh for DebianJune McEnroe 2022-03-15Remove dashJune McEnroe