summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-08-06 13:25:29 -0400
committerJune McEnroe <june@causal.agency>2019-08-06 13:25:29 -0400
commit5433cfdc280d4aed276e5950c1720ffa9ee4c37f (patch)
tree5065a75cbf2606cf6217623d0c79b434c59eb94f
parentAdd basic viewer (diff)
downloadstream-5433cfdc280d4aed276e5950c1720ffa9ee4c37f.tar.gz
stream-5433cfdc280d4aed276e5950c1720ffa9ee4c37f.zip
Fix RI state return
-rw-r--r--term.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/term.c b/term.c
index bb5d195..48fed10 100644
--- a/term.c
+++ b/term.c
@@ -118,8 +118,8 @@ static char updateNUL(wchar_t ch) {
 enum C1 {
 	RI  = 'M',
 	CSI = '[',
-	OSC = ']',
 	ST  = '\\',
+	OSC = ']',
 };
 
 static char updateESC(wchar_t ch) {
@@ -128,12 +128,12 @@ static char updateESC(wchar_t ch) {
 		discard = false;
 		return NUL;
 	}
+
 	switch (ch) {
-		case '(': discard = true; return ESC;
-		case '=': return NUL;
-		case '>': return NUL;
+		break; case CSI: return CSI;
+		break; case OSC: return OSC;
 
-		case RI: {
+		break; case RI: {
 			move(
 				cell(scroll.top + 1, 0), cell(scroll.top, 0),
 				cols * (scroll.bot - scroll.top)
@@ -141,10 +141,13 @@ static char updateESC(wchar_t ch) {
 			clear(cell(scroll.top, 0), cell(scroll.top, cols - 1));
 		}
 
-		case CSI: return CSI;
-		case OSC: return OSC;
-		default:  return unhandled("ESC %lc", ch);
+		break; case '(': discard = true; return ESC;
+		break; case '=': // ignore
+		break; case '>': // ignore
+
+		break; default:  return unhandled("ESC %lc", ch);
 	}
+	return NUL;
 }
 
 enum SGR {
d> My eyes are so much happier with sct 4500 oh my god. 2021-02-09Show minutes left instead of battery percentageJune McEnroe 2021-02-09Set antialiasing and unhinting globallyJune McEnroe 2021-02-09Open youtube and twitch with mpvJune McEnroe 2021-02-09Add volume control bindings to cwmJune McEnroe sndioctl is nice and easy. 2021-02-09Use w3m to open other URLsJune McEnroe 2021-02-09Disable mouse mode in xtermJune McEnroe I do not ever want to use this feature. 2021-02-09Add pbcopy, pbpaste, open dispatch scriptsJune McEnroe 2021-02-09Use flags for pbd client behaviourJune McEnroe 2021-02-08Add macOS-like copy and paste to xtermJune McEnroe 2021-02-08Only update clock script every minuteJune McEnroe 2021-02-08Use 4M- for window resizing in cwmJune McEnroe 2021-02-08Tweak trackpad scaling, mouse accelerationJune McEnroe This feels more comfortable. 2021-02-08Use xsel in up and add it do install.shJune McEnroe 2021-02-07Swap root window coloursJune McEnroe 2021-02-07Add -X flag to install X stuff on OpenBSDJune McEnroe 2021-02-07Adjust brightness by smaller incrementsJune McEnroe 2021-02-07Fix cwm window cycling, move big by defaultJune McEnroe 2021-02-07Use class names for Foreground, Background, BorderColorJune McEnroe I'm not really sure what difference this makes, but it seems like the right thing to do to be generic? 2021-02-07Add simple battery status and clock to xsessionJune McEnroe I love how simple this is. 2021-02-07Set cursor theme and sizeJune McEnroe 2021-02-07Use scrot for up -s if no screencaptureJune McEnroe Still missing putting the URL in an X selection. 2021-02-07Enable mouse acceleration in XJune McEnroe 2021-02-07Set colours for Xt and cwmJune McEnroe And increase XTerm internalBorder. 2021-02-07Set urgency on bell in xtermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe Weirdly the Fn key doesn't change how the F row registers... I wonder if I can do something about that. 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 11 is what I use on macOS, but I feel like my eyes are working harder here. 2021-02-07Fully configure and rebind cwmJune McEnroe This is sort of a mix of trying to emulate macOS somewhat for my muscle memory and just rebinding some of the cwm defaults to use 4- rather than M-. 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe cwm still needs a lot more rebinding, and I need to actually look at its other options. xterm definitely still needs some configuration, but I at least managed to get it to use a decent looking font. Very happy that OpenBSD includes Luxi Mono, which is what my usual font, Go Mono, is based on anyway. Still missing is xmodmap and such. 2021-02-06Add xterm output to schemeJune McEnroe