diff options
| author | June McEnroe <june@causal.agency> | 2022-02-03 22:10:54 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-02-03 22:10:54 -0500 |
| commit | 8dec54801c210ecbd833e517fb7b1cbeabc3cf1f (patch) | |
| tree | 572c9fbd732269e63d49e42b3ec349bf7a842cf4 | |
| parent | Add C-z s to set spoiler text (diff) | |
| download | catgirl-8dec54801c210ecbd833e517fb7b1cbeabc3cf1f.tar.gz catgirl-8dec54801c210ecbd833e517fb7b1cbeabc3cf1f.zip | |
Add M-s to (temporarily) reveal spoiler text
| -rw-r--r-- | catgirl.1 | 2 | ||||
| -rw-r--r-- | ui.c | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/catgirl.1 b/catgirl.1 index 7b9af11..34b9718 100644 --- a/catgirl.1 +++ b/catgirl.1 @@ -699,6 +699,8 @@ Insert a blank line in the window. Scroll to next highlight. .It Ic M-p Scroll to previous highlight. +.It Ic M-s +Reveal spoiler text. .It Ic M-t Toggle timestamps. .It Ic M-u diff --git a/ui.c b/ui.c index 32aaf2b..369ed75 100644 --- a/ui.c +++ b/ui.c @@ -210,6 +210,7 @@ static short colorPair(short fg, short bg) { X(KeyMetaN, "\33n", NULL) \ X(KeyMetaP, "\33p", NULL) \ X(KeyMetaQ, "\33q", NULL) \ + X(KeyMetaS, "\33s", NULL) \ X(KeyMetaT, "\33t", NULL) \ X(KeyMetaU, "\33u", NULL) \ X(KeyMetaV, "\33v", NULL) \ @@ -384,7 +385,12 @@ static attr_t styleAttr(struct Style style) { return attr | colorAttr(Colors[style.fg]); } +static bool spoilerReveal; + static short stylePair(struct Style style) { + if (spoilerReveal && style.fg == style.bg) { + return colorPair(Colors[Default], Colors[style.bg]); + } return colorPair(Colors[style.fg], Colors[style.bg]); } @@ -986,6 +992,7 @@ static void keyCode(int code) { break; case KeyMetaN: scrollHot(window, +1); break; case KeyMetaP: scrollHot(window, -1); break; case KeyMetaQ: edit(id, EditCollapse, 0); + break; case KeyMetaS: spoilerReveal ^= true; mainUpdate(); break; case KeyMetaT: toggleTime(window); break; case KeyMetaU: scrollTo(window, window->unreadHard); break; case KeyMetaV: scrollPage(window, +1); @@ -1088,6 +1095,7 @@ void uiRead(void) { wint_t ch; static bool paste, style, literal; for (int ret; ERR != (ret = wget_wch(input, &ch));) { + bool spr = spoilerReveal; if (ret == KEY_CODE_YES && ch == KeyPasteOn) { paste = true; } else if (ret == KEY_CODE_YES && ch == KeyPasteOff) { @@ -1113,6 +1121,10 @@ void uiRead(void) { } style = false; literal = false; + if (spr) { + spoilerReveal = false; + mainUpdate(); + } } inputUpdate(); } |