aboutsummaryrefslogtreecommitdiffstats
path: root/kirc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--kirc.c156
1 files changed, 127 insertions, 29 deletions
diff --git a/kirc.c b/kirc.c
index 6b2f578..95ba5cd 100644
--- a/kirc.c
+++ b/kirc.c
@@ -485,9 +485,10 @@ static int edit(state l)
}
char seq[3];
switch (c) {
+ case 10:
case 13:
edit_enter();
- return 1; /* enter */
+ return 1; /* enter */ /* ctrl+j */
case 3:
errno = EAGAIN;
return -1; /* ctrl-c */
@@ -535,7 +536,7 @@ static int edit(state l)
history_len = HIS_MAX - 1;
history_wrap = 0;
}
- return -1;
+ return 0;
}
edit_delete(l);
return 0;
@@ -598,6 +599,61 @@ static char *ctime_now(char *buf)
return buf;
}
+static inline void fast_itoa(int value, char *str, size_t size) {
+ char tmp;
+ int len;
+
+ if (size == 0) {
+ return;
+ }
+ if (value == 0) {
+ str[0] = '0';
+ str[1] = '\0';
+ return;
+ }
+ len = 0;
+ while (value > 0 && len < (int)size - 1) {
+ str[len] = (value % 10) + 48;
+ value /= 10;
+ len++;
+ }
+ str[len] = '\0';
+ for (int i = 0; i < len / 2; i++) {
+ tmp = str[i];
+ str[i] = str[len - 1 - i];
+ str[len - 1 - i] = tmp;
+ }
+}
+
+static inline int hash(const char* str) {
+ int hash = 1760977460;
+ char *ptr;
+ ptr = (char*)str;
+ while (*ptr != '\0') {
+ hash = (hash << 5) | (hash >> 27);
+ hash ^= *ptr;
+ hash *= 0x27220a95;
+ ptr++;
+ }
+ return (abs(hash) % 14) + 1;
+}
+
+static inline void set_color(char* cbuf, const char *str) {
+ char buf[3] = "";
+ int c = hash(str);
+
+ if (c < 8) {
+ c += 30;
+ }
+ else {
+ c += 90 - 7;
+ }
+ strcpy(cbuf, "\x1b[");
+ fast_itoa(c, buf, sizeof(buf));
+ strcat(cbuf, buf);
+ strcat(cbuf, "m");
+}
+
static void print_error(char *fmt, ...)
{
va_list ap;
@@ -700,16 +756,21 @@ static void message_wrap(param p)
if (!p->message) {
return;
}
+ char color[8];
+ color[0] = '\0';
+ if (strstr(p->message, nick) != NULL) {
+ strcpy(color, "\x1b[36;1m");
+ }
char *tok;
size_t spaceleft = p->maxcols - (9 + strlen(p->nickname) + p->offset);
for (tok = strtok(p->message, " "); tok != NULL; tok = strtok(NULL, " ")) {
size_t wordwidth, spacewidth = 1;
wordwidth = strnlen(tok, MSG_MAX);
if ((wordwidth + spacewidth) > spaceleft) {
- printf("\r\n%*.s%s ", (int)(9 + strlen(p->nickname)), " ", tok);
+ printf("\r\n%s%*.s%s ", color, (int)(9 + strlen(p->nickname)), " ", tok);
spaceleft = p->maxcols - (9 + strlen(p->nickname));
} else {
- printf("%s ", tok);
+ printf("%s%s ", color, tok);
}
spaceleft -= wordwidth + spacewidth;
}
@@ -717,28 +778,43 @@ static void message_wrap(param p)
static inline void param_print_nick(param p)
{
- printf("\x1b[35;1m%*s\x1b[0m ", p->nicklen - 4, p->nickname);
- printf("--> \x1b[35;1m%s\x1b[0m", p->message);
+ char color[6];
+
+ set_color(color, p->nickname);
+ printf("%s%*s\x1b[0m ", color, p->nicklen - 4, p->nickname);
+ set_color(color, p->message);
+ printf("--> %s%s\x1b[0m", color, p->message);
}
static void param_print_part(param p)
{
- printf("%*s<-- \x1b[34;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);
+ char color[6];
+
+ set_color(color, p->nickname);
+ printf("%*s<-- %s%s\x1b[0m", p->nicklen - 3, "", color, p->nickname);
if (p->channel != NULL && strcmp(p->channel + 1, chan)) {
- printf(" [\x1b[33m%s\x1b[0m] ", p->channel);
+ set_color(color, p->channel + 1);
+ printf(" [%s%s\x1b[0m] ", color, p->channel);
}
}
static inline void param_print_quit(param p)
{
- printf("%*s<<< \x1b[34;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);
+ char color[6];
+
+ set_color(color, p->nickname);
+ printf("%*s<<< %s%s\x1b[0m", p->nicklen - 3, "", color, p->nickname);
}
static void param_print_join(param p)
{
- printf("%*s--> \x1b[32;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);
+ char color[6];
+
+ set_color(color, p->nickname);
+ printf("%*s--> %s%s\x1b[0m", p->nicklen - 3, "", color, p->nickname);
if (p->channel != NULL && strcmp(p->channel + 1, chan)) {
- printf(" [\x1b[33m%s\x1b[0m] ", p->channel);
+ set_color(color, p->channel + 1);
+ printf(" [%s%s\x1b[0m] ", color, p->channel);
}
}
@@ -1056,7 +1132,7 @@ static void filter_colors(char *string)
return;
}
-static void print_timestamp(void)
+static inline void print_timestamp(void)
{
time_t rawtime;
struct tm *timeinfo;
@@ -1080,33 +1156,40 @@ static void print_timestamp(void)
static void param_print_private(param p)
{
+ char color[6];
+
+ set_color(color, p->nickname);
print_timestamp();
if (strnlen(p->nickname, p->nicklen) > (size_t)p->nicklen - 8) {
*(p->nickname + p->nicklen - 8) = '\0';
}
if (p->channel != NULL && (strcmp(p->channel, nick) == 0)) {
handle_ctcp(p);
- printf("\x1b[33;1m<%s> [PRIVMSG]\x1b[36m ", p->nickname);
+ printf("%s<%s> \x1b[33;1m[PRIVMSG]\x1b[36;1m ", color, p->nickname);
p->offset += sizeof(" [PRIVMSG]");
} else if (p->channel != NULL && strcmp(p->channel + 1, chan)) {
- printf("\x1b[33;1m<%s>\x1b[0m", p->nickname);
- printf(" [\x1b[33m%s\x1b[0m] ", p->channel);
+ printf("%s<%s>\x1b[0m", color, p->nickname);
+ set_color(color, p->channel + 1);
+ printf(" [%s%s\x1b[0m] ", color, p->channel);
p->offset += 12 + strnlen(p->channel, CHA_MAX);
} else {
if (!memcmp(p->message, "\x01" "ACTION", sizeof("\x01" "ACTION") - 1)) {
p->message += sizeof("ACTION");
p->offset += sizeof(" \x1b[33;1m* ");
- printf(" \x1b[33;1m* %s\x1b[0m ", p->nickname);
+ printf(" %s* %s\x1b[0m ", color, p->nickname);
}
else {
- printf("\x1b[33;1m<%s>\x1b[0m ", p->nickname);
+ printf("%s<%s>\x1b[0m ", color, p->nickname);
}
}
}
static void param_print_channel(param p)
{
- printf(" \x1b[33;1m%s\x1b[0m ", p->nickname);
+ char color[6];
+
+ set_color(color, p->nickname);
+ printf(" %s%s\x1b[0m ", color, p->nickname);
if (p->params) {
printf("%s", p->params);
p->offset += strnlen(p->params, CHA_MAX);
@@ -1277,7 +1360,9 @@ static inline void part_command(state l)
static inline void msg_command(state l)
{
+ char color[2][6];
char *tok;
+ print_timestamp();
strtok_r(l->buf + sizeof("msg"), " ", &tok);
int offset = 0;
while (*(l->buf + sizeof("msg") + offset) == ' ') {
@@ -1285,20 +1370,24 @@ static inline void msg_command(state l)
}
raw("PRIVMSG %s :%s\r\n", l->buf + sizeof("msg") + offset, tok);
if (memcmp(l->buf + sizeof("msg") + offset, "NickServ", sizeof("NickServ") - 1)) {
- printf("\x1b[32m<%s>\x1b[0m \x1b[33;1m[PRIVMSG: %s]\x1b[32;1m %s\x1b[0m\r\n", nick, l->buf + sizeof("msg") + offset, tok);
+ set_color(color[0], nick);
+ set_color(color[1], l->buf + sizeof("msg") + offset);
+ printf("%s<%s>\x1b[0m \x1b[33;1m[PRIVMSG:\x1b[0m %s%s\x1b[33;1m] \x1b[32;1m%s\x1b[0m\r\n", color[0], nick, color[1], l->buf + sizeof("msg") + offset, tok);
}
}
static inline void action_command(state l, const char *nick)
{
+ char color[6];
int offset = 0;
while (*(l->buf + sizeof("action") + offset) == ' ') {
offset ++;
}
+ set_color(color, nick);
print_timestamp();
raw("PRIVMSG #%s :\001ACTION %s\001\r\n", chan, l->buf + sizeof("action") + offset);
- printf(" \x1b[32m* %s\x1b[0m %s\n", nick, l->buf + sizeof("action") + offset);
+ printf(" %s* %s\x1b[0m %s\n", color, nick, l->buf + sizeof("action") + offset);
}
static inline void query_command(state l)
@@ -1603,18 +1692,24 @@ close_fd:
static inline void chan_privmsg(state l, char *channel, int offset, const char *nick, char default_chan)
{
+
+ char color[2][6];
+
print_timestamp();
+ set_color(color[0], nick);
if(l->nick_privmsg == 0) {
raw("PRIVMSG #%s :%s\r\n", channel, l->buf + offset);
if (default_chan == 1) {
- printf("\x1b[32m<%s>\x1b[0m %s\r\n", nick, l->buf + offset);
+ printf("%s<%s>\x1b[0m %s\r\n", color[0], nick, l->buf + offset);
return;
}
- printf("\x1b[32m<%s>\x1b[0m [\x1b[33m#%s\x1b[0m] %s\x1b[0m\r\n", nick, channel, l->buf + offset);
+ set_color(color[1], channel);
+ printf("%s<%s>\x1b[0m [%s#%s\x1b[0m] %s\x1b[0m\r\n", color[0], nick, color[1], channel, l->buf + offset);
}
else {
raw("PRIVMSG %s :%s\r\n", channel, l->buf + offset);
- printf("\x1b[32m<%s>\x1b[0m \x1b[33;1m[PRIVMSG: %s]\x1b[32;1m %s\x1b[0m\r\n", nick, channel, l->buf + offset);
+ set_color(color[1], channel);
+ printf("%s<%s>\x1b[0m \x1b[33;1m[PRIVMSG:\x1b[0m %s%s\x1b[33;1m]\x1b[32;1m %s\x1b[0m\r\n", color[0], nick, color[1], channel, l->buf + offset);
}
}
@@ -1630,12 +1725,13 @@ static inline void chan_privmsg_command(state l)
}
}
-static void handle_user_input(state l, const char *nick)
+static void handle_user_input(state l)
{
if (*l->buf == '\0') {
return;
}
char *tok;
+ char color[2][6];
size_t msg_len = strnlen(l->buf, MSG_MAX);
if (msg_len > 0 && l->buf[msg_len - 1] == '\n') {
l->buf[msg_len - 1] = '\0';
@@ -1689,23 +1785,25 @@ static void handle_user_input(state l, const char *nick)
return;
}
raw("%s\r\n", l->buf + 1);
- printf("\x1b[35m%s\x1b[0m\r\n", l->buf);
return;
case '@': /* send private message to target channel or user */
strtok_r(l->buf, " ", &tok);
if (l->buf[1] != '@') {
raw("PRIVMSG %s :%s\r\n", l->buf + 1, tok);
print_timestamp();
+ set_color(color[0], nick);
if (l->buf[1] == '#') {
- printf("\x1b[32m<%s>\x1b[0m [\x1b[33m#%s\x1b[0m] %s\r\n", nick, l->buf + 2, tok);
+ set_color(color[1], l->buf + 2);
+ printf("%s<%s>\x1b[0m [%s#%s\x1b[0m] %s\r\n", color[0], nick, color[1], l->buf + 2, tok);
}
else {
- printf("\x1b[32m<%s>\x1b[0m \x1b[33;1m[PRIVMSG: %s]\x1b[32;1m %s\x1b[0m\r\n", nick, l->buf + 1, tok);
+ set_color(color[1], l->buf + 1);
+ printf("%s<%s>\x1b[0m \x1b[33;1m[PRIVMSG:\x1b[0m %s%s\x1b[33;1m] \x1b[32;1m%s\x1b[0m\r\n", color[0], nick, color[1], l->buf + 1, tok);
}
return;
}
raw("PRIVMSG %s :\001ACTION %s\001\r\n", l->buf + 2, tok);
- printf("\x1b[35mprivmsg %s :ACTION %s\x1b[0m\r\n", l->buf + 2, tok);
+ printf("\x1b[35mprivmsg %s: ACTION %s\x1b[0m\r\n", l->buf + 2, tok);
return;
default: /* send private message to default channel */
chan_privmsg(l, chan, 0, nick, 1);
@@ -1927,7 +2025,7 @@ int main(int argc, char **argv)
editReturnFlag = edit(&l);
if (editReturnFlag > 0) {
history_add(l.buf);
- handle_user_input(&l, nick);
+ handle_user_input(&l);
state_reset(&l);
} else if (editReturnFlag < 0) {
puts("\r\n");
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js