summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/shotty.c45
1 files changed, 32 insertions, 13 deletions
diff --git a/bin/shotty.c b/bin/shotty.c
index 60e3a2be..e5414c82 100644
--- a/bin/shotty.c
+++ b/bin/shotty.c
@@ -148,22 +148,24 @@ static char updateNUL(wchar_t ch) {
 
 enum {
 	CSI = '[',
+	ST  = '\\',
+	OSC = ']',
 	CUU = 'A',
-	CUD,
-	CUF,
-	CUB,
-	CNL,
-	CPL,
-	CHA,
-	CUP,
-	ED = 'J',
-	EL,
-	DL = 'M',
+	CUD = 'B',
+	CUF = 'C',
+	CUB = 'D',
+	CNL = 'E',
+	CPL = 'F',
+	CHA = 'G',
+	CUP = 'H',
+	ED  = 'J',
+	EL  = 'K',
+	DL  = 'M',
 	DCH = 'P',
 	VPA = 'd',
-	SM = 'h',
-	RM = 'l',
-	SGR,
+	SM  = 'h',
+	RM  = 'l',
+	SGR = 'm',
 };
 
 static char updateESC(wchar_t ch) {
@@ -176,6 +178,7 @@ static char updateESC(wchar_t ch) {
 		case '(': discard = true; return ESC;
 		case '=': return NUL;
 		case CSI: return CSI;
+		case OSC: return OSC;
 		default: warnx("unhandled ESC %lc", ch); return NUL;
 	}
 }
@@ -313,12 +316,28 @@ static char updateCSI(wchar_t ch) {
 	return NUL;
 }
 
+static char updateOSC(wchar_t ch) {
+	static bool esc;
+	switch (ch) {
+		break; case BEL: return NUL;
+		break; case ESC: esc = true;
+		break; case ST: {
+			if (!esc) break;
+			esc = false;
+			return NUL;
+		}
+	}
+	esc = false;
+	return NUL;
+}
+
 static void update(wchar_t ch) {
 	static char seq;
 	switch (seq) {
 		break; case NUL: seq = updateNUL(ch);
 		break; case ESC: seq = updateESC(ch);
 		break; case CSI: seq = updateCSI(ch);
+		break; case OSC: seq = updateOSC(ch);
 	}
 }
 
td/> 2018-07-17Add server map generationJune McEnroe 2018-07-17Tabify sourceJune McEnroe And other style changes. 2018-05-13Fix ncurses color pair numberingJune McEnroe This was dumb. Of course all the color pairs fit in 64, but I was shifting too much because my own representation includes the bright bit. 2018-04-09Use anonymous unionJune McEnroe 2018-04-09Replace #define with enum or const where possibleJune McEnroe 2018-03-31Link against ncursesJune McEnroe 2018-03-05Miscellaneous code cleanupJune McEnroe 2018-03-05Pass message structs by valueJune McEnroe 2018-03-05Use stdio in merge and metaJune McEnroe 2018-03-05Clean up spawn constantsJune McEnroe 2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe 2018-03-05Pack message type enumsJune McEnroe 2018-03-05Undef COLOR_ constants in torus.hJune McEnroe 2018-03-05Generate tagsJune McEnroe 2017-10-03Simplify Makefile with pattern ruleJune McEnroe Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now. 2017-09-27Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 9a6c9c91c8092603b914cc0b3085d059e162ca29. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe