From ad6e5857c9b4d39009f2ac3da11a1d3059335b11 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Fri, 7 Jul 2023 14:40:59 -0400 Subject: Revert "Work-in-progress showing prefixes" This reverts commit dc132b4350d207d147bb79d997c3f8b511c4ac30. --- input.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index b4f5b5e..6b33b93 100644 --- a/input.c +++ b/input.c @@ -174,45 +174,37 @@ void inputUpdate(void) { const char *ptr = editString(&edits[id], &buf, &cap, &pos); if (!ptr) err(EX_OSERR, "editString"); - const char *head = ""; - char prefix[2] = ""; + const char *prefix = ""; const char *prompt = self.nick; - const char *tail = ""; + const char *suffix = ""; const char *skip = buf; struct Style stylePrompt = { .fg = self.color, .bg = Default }; struct Style styleInput = StyleDefault; - if (self.showPrefix) { - uint *bits = completeBits(id, self.nick); - if (bits) prefix[0] = bitPrefix(*bits); - } size_t split = commandWillSplit(id, buf); const char *privmsg = commandIsPrivmsg(id, buf); const char *notice = commandIsNotice(id, buf); const char *action = commandIsAction(id, buf); if (privmsg) { - head = "<"; tail = "> "; + prefix = "<"; suffix = "> "; skip = privmsg; } else if (notice) { - head = "-"; tail = "- "; + prefix = "-"; suffix = "- "; styleInput.fg = LightGray; skip = notice; } else if (action) { - head = "* "; tail = " "; + prefix = "* "; suffix = " "; stylePrompt.attr |= Italic; styleInput.attr |= Italic; skip = action; } else if (id == Debug && buf[0] != '/') { - prefix[0] = '\0'; prompt = "<< "; stylePrompt.fg = Gray; } else { - prefix[0] = '\0'; prompt = ""; } if (skip > &buf[pos]) { - prefix[0] = '\0'; - head = prompt = tail = ""; + prefix = prompt = suffix = ""; skip = buf; } @@ -223,10 +215,9 @@ void inputUpdate(void) { wmove(uiInput, 0, windowTime.width); } wattr_set(uiInput, uiAttr(stylePrompt), uiPair(stylePrompt), NULL); - waddstr(uiInput, head); waddstr(uiInput, prefix); waddstr(uiInput, prompt); - waddstr(uiInput, tail); + waddstr(uiInput, suffix); getyx(uiInput, y, x); int posx; -- cgit 1.4.1