diff options
author | June McEnroe <june@causal.agency> | 2018-08-11 19:30:30 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2018-08-11 20:02:03 -0400 |
commit | a281f89592cf5531ebf53863768fccd054de252c (patch) | |
tree | 502042617c3909ed5143d3e51562a7314666b250 /tab.c | |
parent | Add term.c for extra terminal features (diff) | |
download | test-a281f89592cf5531ebf53863768fccd054de252c.tar.gz test-a281f89592cf5531ebf53863768fccd054de252c.zip |
Rework UI code for multi-channel
Tags are now permanently assigned (and I'm betting on never needing more than 256 of them) and the UI maps tags to a linked list of views for easy reordering and removal. Currently, views can only be added. Views don't have a topic window until they need one. All UI code wants to be functional reactive. Beeping is temporarily removed until message priorities (status, message, ping) can be added to the UI. At that point spawning notify-send should also be possible. Priorities will also help with unnecessary markers, which will not appear for status messages. The tab system is now used to send QUIT and NICK messages to all the relevant tags. Verbose output now goes to its own tag, and sending to it sends raw IRC. IRC colors are now listed in chat.h and handler functions for numeric replies have real names. The color algorithm now uses a real hash function for hopefully better results. QUIT, PART and KICK messages are scanned for URLs.
Diffstat (limited to 'tab.c')
-rw-r--r-- | tab.c | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/tab.c b/tab.c index c0a96a4..87e4f02 100644 --- a/tab.c +++ b/tab.c @@ -22,7 +22,7 @@ #include "chat.h" static struct Entry { - size_t tag; + struct Tag tag; char *word; struct Entry *prev; struct Entry *next; @@ -49,7 +49,7 @@ static void touch(struct Entry *entry) { void tabTouch(struct Tag tag, const char *word) { for (struct Entry *entry = head; entry; entry = entry->next) { - if (entry->tag != tag.id) continue; + if (entry->tag.id != tag.id) continue; if (strcmp(entry->word, word)) continue; touch(entry); return; @@ -58,30 +58,28 @@ void tabTouch(struct Tag tag, const char *word) { struct Entry *entry = malloc(sizeof(*entry)); if (!entry) err(EX_OSERR, "malloc"); - entry->tag = tag.id; + entry->tag = tag; entry->word = strdup(word); if (!entry->word) err(EX_OSERR, "strdup"); prepend(entry); } -void tabReplace(const char *prev, const char *next) { - for (struct Entry *entry = head; entry; entry = entry->next) { - if (strcmp(entry->word, prev)) continue; - free(entry->word); - entry->word = strdup(next); - if (!entry->word) err(EX_OSERR, "strdup"); - } +void tabReplace(struct Tag tag, const char *prev, const char *next) { + tabTouch(tag, prev); + free(head->word); + head->word = strdup(next); + if (!head->word) err(EX_OSERR, "strdup"); } -static struct Entry *match; +static struct Entry *iter; void tabRemove(struct Tag tag, const char *word) { for (struct Entry *entry = head; entry; entry = entry->next) { - if (tag.id != TAG_ALL.id && entry->tag != tag.id) continue; + if (entry->tag.id != tag.id) continue; if (strcmp(entry->word, word)) continue; + if (iter == entry) iter = entry->prev; unlink(entry); - if (match == entry) match = entry->prev; free(entry->word); free(entry); return; @@ -90,33 +88,44 @@ void tabRemove(struct Tag tag, const char *word) { void tabClear(struct Tag tag) { for (struct Entry *entry = head; entry; entry = entry->next) { - if (entry->tag != tag.id) continue; + if (entry->tag.id != tag.id) continue; + if (iter == entry) iter = entry->prev; unlink(entry); - if (match == entry) match = entry->prev; free(entry->word); free(entry); } } +struct Tag tabTag(const char *word) { + struct Entry *start = (iter ? iter->next : head); + for (struct Entry *entry = start; entry; entry = entry->next) { + if (strcmp(entry->word, word)) continue; + iter = entry; + return entry->tag; + } + iter = NULL; + return TAG_NONE; +} + const char *tabNext(struct Tag tag, const char *prefix) { size_t len = strlen(prefix); - struct Entry *start = (match ? match->next : head); + struct Entry *start = (iter ? iter->next : head); for (struct Entry *entry = start; entry; entry = entry->next) { - if (entry->tag != TAG_DEFAULT.id && entry->tag != tag.id) continue; + if (entry->tag.id != TAG_NONE.id && entry->tag.id != tag.id) continue; if (strncasecmp(entry->word, prefix, len)) continue; - match = entry; + iter = entry; return entry->word; } - if (!match) return NULL; - match = NULL; + if (!iter) return NULL; + iter = NULL; return tabNext(tag, prefix); } void tabAccept(void) { - if (match) touch(match); - match = NULL; + if (iter) touch(iter); + iter = NULL; } void tabReject(void) { - match = NULL; + iter = NULL; } |