diff options
| author | June McEnroe <june@causal.agency> | 2020-02-02 03:34:05 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-02-02 03:34:05 -0500 |
| commit | 052cd2ed2688867f8b980d283ea3aa410d9dd6aa (patch) | |
| tree | 1cc9ec89890a3fe3e1f8085fcbd8e3f19ffa32b9 | |
| parent | Add idColors (diff) | |
| download | catgirl-052cd2ed2688867f8b980d283ea3aa410d9dd6aa.tar.gz catgirl-052cd2ed2688867f8b980d283ea3aa410d9dd6aa.zip | |
Remove style string macros
| -rw-r--r-- | chat.h | 6 | ||||
| -rw-r--r-- | handle.c | 2 | ||||
| -rw-r--r-- | irc.c | 2 | ||||
| -rw-r--r-- | ui.c | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/chat.h b/chat.h index 4ced983..275fef9 100644 --- a/chat.h +++ b/chat.h @@ -26,12 +26,6 @@ typedef unsigned char byte; -#define B "\2" -#define C "\3" -#define R "\17" -#define V "\26" -#define I "\35" -#define U "\37" enum Color { White, Black, Blue, Green, Red, Brown, Magenta, Orange, Yellow, LightGreen, Cyan, LightCyan, LightBlue, Pink, Gray, LightGray, diff --git a/handle.c b/handle.c index f52f6f9..ef61129 100644 --- a/handle.c +++ b/handle.c @@ -188,7 +188,7 @@ static void handleJoin(struct Message *msg) { } uiFormat( id, Cold, tagTime(msg), - C"%02d%s"C" arrives in "C"%02d%s"C, + "\3%02d%s\3 arrives in \3%02d%s\3", hash(msg->user), msg->nick, idColors[id], idNames[id] ); } diff --git a/irc.c b/irc.c index f07fcc8..d8c6a21 100644 --- a/irc.c +++ b/irc.c @@ -105,7 +105,7 @@ static void debug(char dir, const char *line) { if (!self.debug) return; size_t len = strcspn(line, "\r\n"); uiFormat( - Debug, Cold, NULL, C"%d%c%c"C" %.*s", + Debug, Cold, NULL, "\3%d%c%c\3 %.*s", Gray, dir, dir, (int)len, line ); if (!isatty(STDERR_FILENO)) { diff --git a/ui.c b/ui.c index 961e448..3f74e14 100644 --- a/ui.c +++ b/ui.c @@ -271,8 +271,8 @@ static void statusUpdate(void) { int unread; char buf[256]; snprintf( - buf, sizeof(buf), C"%d%s %d %s %n("C"%02d%d"C"%d) ", - idColors[window->id], (window == windows.active ? V : ""), + buf, sizeof(buf), "\3%d%s %d %s %n(\3%02d%d\3%d) ", + idColors[window->id], (window == windows.active ? "\26" : ""), num, idNames[window->id], &unread, (window->heat > Warm ? White : idColors[window->id]), window->unread, |