1 files changed, 53 insertions, 21 deletions

diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index c7979843..c7a0f98e 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -2,12 +2,12 @@
  * Toxic -- Tox Curses Client
  */
 
-#include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <ctype.h>
 #include <time.h>
+#include <limits.h>
 
 #include "../../core/Messenger.h"
 #include "../../core/network.h"
@@ -20,7 +20,7 @@
 
 typedef struct {
     int friendnum;
-    char line[MAX_STR_SIZE];
+    wchar_t line[MAX_STR_SIZE];
     size_t pos;
     WINDOW *history;
     WINDOW *linewin;
@@ -50,8 +50,6 @@ static void chat_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *msg,
     getname(m, num, (uint8_t *) &nick);
     msg[len - 1] = '\0';
     nick[MAX_NAME_LENGTH - 1] = '\0';
-    fix_name(msg);
-    fix_name(nick);
 
     wattron(ctx->history, COLOR_PAIR(2));
     wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
@@ -74,7 +72,6 @@ static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *actio
         return;
 
     action[len - 1] = '\0';
-    fix_name(action);
 
     wattron(ctx->history, COLOR_PAIR(2));
     wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
@@ -101,7 +98,6 @@ static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t
     wattroff(ctx->history, COLOR_PAIR(2));
 
     nick[len - 1] = '\0';
-    fix_name(nick);
     snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
 
     wattron(ctx->history, COLOR_PAIR(3));
@@ -122,7 +118,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
     wattroff(ctx->history, COLOR_PAIR(2));
 
     status[len - 1] = '\0';
-    fix_name(status);
+    snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
 
     wattron(ctx->history, COLOR_PAIR(3));
     wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
@@ -140,7 +136,43 @@ int string_is_empty(char *string)
     return rc;
 }
 
-static void chat_onKey(ToxWindow *self, Messenger *m, int key)
+/* convert wide characters to null terminated string */
+static char *wcs_to_char(wchar_t *string)
+{
+    size_t len = 0;
+    char *ret = NULL;
+
+    len = wcstombs(NULL, string, 0);
+    if (len != (size_t) -1) {
+        len++;
+        ret = malloc(len);
+        wcstombs(ret, string, len);
+    } else {
+        ret = malloc(2);
+        ret[0] = ' ';
+        ret[1] = '\0';
+    }
+    return ret;
+}
+
+/* convert a wide char to null terminated string */
+static char *wc_to_char(wchar_t ch)
+{
+    int len = 0;
+    static char ret[MB_LEN_MAX + 1];
+
+    len = wctomb(ret, ch);
+    if (len == -1) {
+        ret[0] = ' ';
+        ret[1] = '\0';
+    } else {
+        ret[len] = '\0';
+    }
+
+    return ret;
+}
+
+static void chat_onKey(ToxWindow *self, Messenger *m, wint_t key)
 {
     ChatContext *ctx = (ChatContext *) self->x;
     struct tm *timeinfo = get_time();
@@ -150,18 +182,18 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
     getmaxyx(self->window, y2, x2);
 
     /* Add printable chars to buffer and print on input space */
-    if (isprint(key)) {
+    if (iswprint(key)) {
         if (ctx->pos != sizeof(ctx->line) - 1) {
-            mvwaddch(self->window, y, x, key);
+            mvwaddstr(self->window, y, x, wc_to_char(key));
             ctx->line[ctx->pos++] = key;
-            ctx->line[ctx->pos] = '\0';
+            ctx->line[ctx->pos] = L'\0';
         }
     }
 
     /* BACKSPACE key: Remove one character from line */
     else if (key == 0x107 || key == 0x8 || key == 0x7f) {
         if (ctx->pos > 0) {
-            ctx->line[--ctx->pos] = '\0';
+            ctx->line[--ctx->pos] = L'\0';
 
             if (x == 0)
                 mvwdelch(self->window, y - 1, x2 - 1);
@@ -172,18 +204,18 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
 
     /* RETURN key: Execute command or print line */
     else if (key == '\n') {
+        char *line = wcs_to_char(ctx->line);
         wclear(ctx->linewin);
         wmove(self->window, y2 - CURS_Y_OFFSET, 0);
         wclrtobot(self->window);
 
-        if (ctx->line[0] == '/')
-            execute(self, ctx, m, ctx->line);
+        if (line[0] == '/')
+            execute(self, ctx, m, line);
         else {
             /* make sure the string has at least non-space character */
-            if (!string_is_empty(ctx->line)) {
+            if (!string_is_empty(line)) {
                 uint8_t selfname[MAX_NAME_LENGTH];
                 getself_name(m, selfname, sizeof(selfname));
-                fix_name(selfname);
 
                 wattron(ctx->history, COLOR_PAIR(2));
                 wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
@@ -191,9 +223,9 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
                 wattron(ctx->history, COLOR_PAIR(1));
                 wprintw(ctx->history, "%s: ", selfname);
                 wattroff(ctx->history, COLOR_PAIR(1));
-                wprintw(ctx->history, "%s\n", ctx->line);
+                wprintw(ctx->history, "%s\n", line);
 
-                if (m_sendmessage(m, ctx->friendnum, (uint8_t *) ctx->line, strlen(ctx->line) + 1) == 0) {
+                if (m_sendmessage(m, ctx->friendnum, (uint8_t *) line, strlen(line) + 1) == 0) {
                     wattron(ctx->history, COLOR_PAIR(3));
                     wprintw(ctx->history, " * Failed to send message.\n");
                     wattroff(ctx->history, COLOR_PAIR(3));
@@ -201,8 +233,9 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key)
             }
         }
 
-        ctx->line[0] = '\0';
+        ctx->line[0] = L'\0';
         ctx->pos = 0;
+        free(line);
     }
 }
 
@@ -331,7 +364,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
         wprintw(ctx->history, "%s\n", id);
     }
 
-    else if (strcmp(ctx->line, "/close") == 0) {
+    else if (strcmp(cmd, "/close") == 0) {
         int f_num = ctx->friendnum;
         delwin(ctx->linewin);
         del_window(self);
@@ -398,7 +431,6 @@ ToxWindow new_chat(Messenger *m, int friendnum)
 
     uint8_t nick[MAX_NAME_LENGTH] = {0};
     getname(m, friendnum, (uint8_t *) &nick);
-    fix_name(nick);
 
     snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);