From 0d165fadfaa060328aa78843ee0e6e27c24534e6 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 5 Dec 2018 14:53:16 -0500 Subject: Send input errors to the current tag --- input.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/input.c b/input.c index a358993..4814841 100644 --- a/input.c +++ b/input.c @@ -39,10 +39,11 @@ static void privmsg(struct Tag tag, bool action, const char *mesg) { free(line); } -static char *param(const char *command, char **params, const char *name) { +static char * +param(struct Tag tag, const char *command, char **params, const char *name) { char *param = strsep(params, " "); if (param) return param; - uiFmt(TagStatus, UIHot, "%s requires a %s", command, name); + uiFmt(tag, UIHot, "%s requires a %s", command, name); return NULL; } @@ -54,14 +55,14 @@ static void inputMe(struct Tag tag, char *params) { static void inputNick(struct Tag tag, char *params) { (void)tag; - char *nick = param("/nick", ¶ms, "name"); + char *nick = param(tag, "/nick", ¶ms, "name"); if (!nick) return; ircFmt("NICK %s\r\n", nick); } static void inputJoin(struct Tag tag, char *params) { (void)tag; - char *chan = param("/join", ¶ms, "channel"); + char *chan = param(tag, "/join", ¶ms, "channel"); if (!chan) return; ircFmt("JOIN %s\r\n", chan); } @@ -76,7 +77,7 @@ static void inputPart(struct Tag tag, char *params) { static void inputQuery(struct Tag tag, char *params) { (void)tag; - char *nick = param("/query", ¶ms, "nick"); + char *nick = param(tag, "/query", ¶ms, "nick"); if (!nick) return; tabTouch(TagNone, nick); uiViewTag(tagFor(nick)); @@ -90,7 +91,7 @@ static void inputWho(struct Tag tag, char *params) { static void inputWhois(struct Tag tag, char *params) { (void)tag; - char *nick = param("/whois", ¶ms, "nick"); + char *nick = param(tag, "/whois", ¶ms, "nick"); if (!nick) return; ircFmt("WHOIS %s\r\n", nick); } @@ -125,7 +126,7 @@ static void inputOpen(struct Tag tag, char *params) { static void inputView(struct Tag tag, char *params) { (void)tag; - char *view = param("/view", ¶ms, "name or number"); + char *view = param(tag, "/view", ¶ms, "name or number"); if (!view) return; int num = strtol(view, &view, 0); if (!view[0]) { @@ -135,7 +136,7 @@ static void inputView(struct Tag tag, char *params) { if (tag.id != TagNone.id) { uiViewTag(tag); } else { - uiFmt(TagStatus, UIHot, "No view for %s", view); + uiFmt(tag, UIHot, "No view for %s", view); } } } @@ -216,7 +217,7 @@ void input(struct Tag tag, char *input) { Commands[i].handler(tag, input); return; } - uiFmt(TagStatus, UIHot, "%s isn't a recognized command", command); + uiFmt(tag, UICold, "%s isn't a recognized command", command); } void inputTab(void) { -- cgit 1.4.1