5 files changed, 13 insertions, 2 deletions

diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index 53316afb..b59cb55e 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -15,6 +15,11 @@ add_executable(${exe_name}
         chat.c
         configdir.c)
 
+if(CURSES_HAVE_WIDE_CHAR)
+        add_definitions( -D_XOPEN_SOURCE_EXTENDED )
+        add_definitions( -DHAVE_WIDE_CHAR )
+endif()
+
 include_directories(${CURSES_INCLUDE_DIR})
 
 target_link_libraries(${exe_name}
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index c7a0f98e..9454010f 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -182,7 +182,11 @@ static void chat_onKey(ToxWindow *self, Messenger *m, wint_t key)
     getmaxyx(self->window, y2, x2);
 
     /* Add printable chars to buffer and print on input space */
+#if HAVE_WIDECHAR
     if (iswprint(key)) {
+#else
+    if (isprint(key)) {
+#endif
         if (ctx->pos != sizeof(ctx->line) - 1) {
             mvwaddstr(self->window, y, x, wc_to_char(key));
             ctx->line[ctx->pos++] = key;
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 12b529fc..2d4a39ad 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -2,7 +2,6 @@
  * Toxic -- Tox Curses Client
  */
 
-#define _XOPEN_SOURCE_EXTENDED
 #include <curses.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index f50bdc2d..7f547d0a 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -234,7 +234,11 @@ void draw_active_window(Messenger *m)
     a->onDraw(a, m);
 
     /* Handle input */
+#ifdef HAVE_WIDECHAR
     get_wch(&ch);
+#else
+    ch = getch();
+#endif
 
     if (ch == '\t' || ch == KEY_BTAB)
         set_next_window((int) ch);
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 227040b9..0f3b82bd 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -4,7 +4,6 @@
 #ifndef _windows_h
 #define _windows_h
 
-#define _XOPEN_SOURCE_EXTENDED
 #include <curses.h>
 #include <stdint.h>
 #include <stdbool.h>