summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-10 18:13:52 -0500
committerJune McEnroe <june@causal.agency>2019-11-10 18:13:52 -0500
commitdbfe19bb701fdef6e5a7d5d73c0856cac741d82e (patch)
tree08b59b4cd13bafa822bd006421d96ceea619e78b
parentRename listen to local (diff)
downloadpounce-dbfe19bb701fdef6e5a7d5d73c0856cac741d82e.tar.gz
pounce-dbfe19bb701fdef6e5a7d5d73c0856cac741d82e.zip
Filter ACCOUNT, AWAY, CHGHOST for incapable clients
-rw-r--r--client.c42
1 files changed, 42 insertions, 0 deletions
diff --git a/client.c b/client.c
index 40bba1c..ec07b91 100644
--- a/client.c
+++ b/client.c
@@ -275,10 +275,52 @@ size_t clientDiff(const struct Client *client) {
 	return ringDiff(client->consumer);
 }
 
+typedef const char *Filter(const char *line);
+
+static const char *cmd(const char *line) {
+	static char buf[512];
+	if (*line == ':') {
+		line += strcspn(line, " ");
+		if (*line) line++;
+	}
+	snprintf(buf, sizeof(buf), "%.*s", (int)strcspn(line, " "), line);
+	return buf;
+}
+
+static const char *filterAccountNotify(const char *line) {
+	return (strcmp(cmd(line), "ACCOUNT") ? line : NULL);
+}
+
+static const char *filterAwayNotify(const char *line) {
+	return (strcmp(cmd(line), "AWAY") ? line : NULL);
+}
+
+static const char *filterChghost(const char *line) {
+	return (strcmp(cmd(line), "CHGHOST") ? line : NULL);
+}
+
+static Filter *Filters[] = {
+	[CapAccountNotifyBit] = filterAccountNotify,
+	[CapAwayNotifyBit] = filterAwayNotify,
+	[CapChghostBit] = filterChghost,
+};
+
 void clientConsume(struct Client *client) {
 	time_t time;
 	const char *line = ringPeek(&time, client->consumer);
 	if (!line) return;
+
+	enum Cap diff = client->caps ^ stateCaps;
+	for (size_t i = 0; line && i < ARRAY_LEN(Filters); ++i) {
+		if (!Filters[i]) continue;
+		if (diff & (1 << i)) line = Filters[i](line);
+	}
+	if (!line) {
+		ringConsume(NULL, client->consumer);
+		return;
+	}
+
+	// TODO: Move into a filter?
 	if (client->caps & CapServerTime) {
 		char ts[sizeof("YYYY-MM-DDThh:mm:ss.sssZ")];
 		struct tm *tm = gmtime(&time);
td>Enable 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 2021-02-06Add xterm output to schemeJune McEnroe