From d85c1c3f9649608bc003d66a6e9d2c696188bf19 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Mon, 25 Feb 2019 16:12:41 -0500
Subject: Update tag colors
This kind of incurs a lot of writes usually for no reason. The only
place this matters is when cold-opening a /query. I wonder if there's a
better way to do that.
---
tag.c | 8 ++++++--
ui.c | 5 ++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/tag.c b/tag.c
index 13f59d0..649ac49 100644
--- a/tag.c
+++ b/tag.c
@@ -45,11 +45,15 @@ struct Tag tagFind(const char *name) {
struct Tag tagFor(const char *name, enum IRCColor color) {
struct Tag tag = tagFind(name);
- if (tag.id != TagNone.id) return tag;
+ if (tag.id != TagNone.id) {
+ tag.color = tags.color[tag.id] = color;
+ return tag;
+ }
if (tags.len == TagsLen) return TagStatus;
+
size_t id = tags.len++;
tags.name[id] = strdup(name);
- if (!tags.name[id]) err(EX_OSERR, "strdup");
tags.color[id] = color;
+ if (!tags.name[id]) err(EX_OSERR, "strdup");
return (struct Tag) { id, tags.name[id], color };
}
diff --git a/ui.c b/ui.c
index ffb2916..7654e36 100644
--- a/ui.c
+++ b/ui.c
@@ -85,7 +85,10 @@ static void windowRemove(struct Window *win) {
static struct Window *windowFor(struct Tag tag) {
struct Window *win = windows.tag[tag.id];
- if (win) return win;
+ if (win) {
+ win->tag = tag;
+ return win;
+ }
win = calloc(1, sizeof(*win));
if (!win) err(EX_OSERR, "calloc");
--
cgit 1.4.1