Remove style string macros

master
C. McEnroe 2020-02-02 03:34:05 -05:00
parent 8bb9ea7b7f
commit 052cd2ed26
4 changed files with 4 additions and 10 deletions

6
chat.h
View File

@ -26,12 +26,6 @@
typedef unsigned char byte; typedef unsigned char byte;
#define B "\2"
#define C "\3"
#define R "\17"
#define V "\26"
#define I "\35"
#define U "\37"
enum Color { enum Color {
White, Black, Blue, Green, Red, Brown, Magenta, Orange, White, Black, Blue, Green, Red, Brown, Magenta, Orange,
Yellow, LightGreen, Cyan, LightCyan, LightBlue, Pink, Gray, LightGray, Yellow, LightGreen, Cyan, LightCyan, LightBlue, Pink, Gray, LightGray,

View File

@ -188,7 +188,7 @@ static void handleJoin(struct Message *msg) {
} }
uiFormat( uiFormat(
id, Cold, tagTime(msg), 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] hash(msg->user), msg->nick, idColors[id], idNames[id]
); );
} }

2
irc.c
View File

@ -105,7 +105,7 @@ static void debug(char dir, const char *line) {
if (!self.debug) return; if (!self.debug) return;
size_t len = strcspn(line, "\r\n"); size_t len = strcspn(line, "\r\n");
uiFormat( 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 Gray, dir, dir, (int)len, line
); );
if (!isatty(STDERR_FILENO)) { if (!isatty(STDERR_FILENO)) {

4
ui.c
View File

@ -271,8 +271,8 @@ static void statusUpdate(void) {
int unread; int unread;
char buf[256]; char buf[256];
snprintf( snprintf(
buf, sizeof(buf), C"%d%s %d %s %n("C"%02d%d"C"%d) ", buf, sizeof(buf), "\3%d%s %d %s %n(\3%02d%d\3%d) ",
idColors[window->id], (window == windows.active ? V : ""), idColors[window->id], (window == windows.active ? "\26" : ""),
num, idNames[window->id], num, idNames[window->id],
&unread, (window->heat > Warm ? White : idColors[window->id]), &unread, (window->heat > Warm ? White : idColors[window->id]),
window->unread, window->unread,