about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-02-25 16:12:41 -0500
committerJune McEnroe <june@causal.agency>2019-02-25 16:12:41 -0500
commitd85c1c3f9649608bc003d66a6e9d2c696188bf19 (patch)
tree76f5b3f4ee1a96030a9d5073b1922503b8c0d090
parentAdd color to tags (diff)
downloadcatgirl-d85c1c3f9649608bc003d66a6e9d2c696188bf19.tar.gz
catgirl-d85c1c3f9649608bc003d66a6e9d2c696188bf19.zip
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.
-rw-r--r--tag.c8
-rw-r--r--ui.c5
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");
2018-07-19Add ARRAY_LEN macroJune McEnroe 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 34f25ae40a3db9369e9d98b3814f2b93bbc21451. 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