Add support for both, ncurses and ncursesw.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 068c55d..4a60553 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -75,12 +75,18 @@
 #endif
 
 #include <locale.h>
+#include <langinfo.h>
 
 #if USE_NCURSES
 # define NCURSES_OPAQUE 1
 /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
 # define _X_OPEN_SOURCE_EXTENDED
-# include <ncursesw/ncurses.h>
+
+# if HAVE_NCURSESW_NCURSES_H
+#  include <ncursesw/ncurses.h>
+# elif HAVE_NCURSES_H
+#  include <ncurses.h>
+# endif
 
 # define OPING_GREEN 1
 # define OPING_YELLOW 2
@@ -89,15 +95,31 @@
 # define OPING_YELLOW_HIST 5
 # define OPING_RED_HIST 6
 
-static char const * const hist_symbols[] = {
+static char const * const hist_symbols_utf8[] = {
        "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" };
-static size_t const hist_symbols_num = sizeof (hist_symbols)
-       / sizeof (hist_symbols[0]);
-
-static int const hist_colors[] = {
+static size_t const hist_symbols_utf8_num = sizeof (hist_symbols_utf8)
+       / sizeof (hist_symbols_utf8[0]);
+
+/* scancodes for 6 levels of horizontal bars, ncurses-specific */
+/* those are not the usual constants because those are not constant */
+static int const hist_symbols_acs[] = {
+       115, /* ACS_S9 "⎽" */
+       114, /* ACS_S7 "⎼" */
+       113, /* ACS_S5 "─" */
+       112, /* ACS_S3 "⎻" */
+       111  /* ACS_S1 "⎺" */
+};
+static size_t const hist_symbols_acs_num = sizeof (hist_symbols_acs)
+       / sizeof (hist_symbols_acs[0]);
+
+/* use different colors without a background for scancodes */
+static int const hist_colors_utf8[] = {
        OPING_GREEN_HIST, OPING_YELLOW_HIST, OPING_RED_HIST };
-static size_t const hist_colors_num = sizeof (hist_colors)
-       / sizeof (hist_colors[0]);
+static int const hist_colors_acs[] = {
+       OPING_GREEN, OPING_YELLOW, OPING_RED };
+/* assuming that both arrays are the same size */
+static size_t const hist_colors_num = sizeof (hist_colors_utf8)
+       / sizeof (hist_colors_utf8[0]);
 #endif
 
 #include "oping.h"
@@ -138,6 +160,9 @@ static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
 static uint8_t opt_send_qos   = 0;
+#if USE_NCURSES
+static int     opt_utf8       = 0;
+#endif
 
 static int host_num = 0;
 
@@ -282,6 +307,9 @@ static void usage_exit (const char *name, int status) /* {{{ */
                        "  -I srcaddr   source address\n"
                        "  -D device    outgoing interface name\n"
                        "  -f filename  filename to read hosts from\n"
+#if USE_NCURSES
+                       "  -u / -U      force / disable UTF-8 output\n"
+#endif
 
                        "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
@@ -484,7 +512,11 @@ static int read_options (int argc, char **argv) /* {{{ */
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:"
+#if USE_NCURSES
+                               "uU"
+#endif
+                               );
 
                if (optchar == -1)
                        break;
@@ -555,6 +587,15 @@ static int read_options (int argc, char **argv) /* {{{ */
                                set_opt_send_qos (optarg);
                                break;
 
+#if USE_NCURSES
+                       case 'u':
+                               opt_utf8 = 2;
+                               break;
+                       case 'U':
+                               opt_utf8 = 1;
+                               break;
+#endif
+
                        case 'h':
                                usage_exit (argv[0], 0);
                                break;
@@ -614,11 +655,31 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */
 } /* }}} void time_calc */
 
 #if USE_NCURSES
+static _Bool has_utf8() /* {{{ */
+{
+# if HAVE_NCURSESW_NCURSES_H
+       if (!opt_utf8)
+       {
+               /* Automatically determine */
+               if (strcasecmp ("UTF-8", nl_langinfo (CODESET)) == 0)
+                       opt_utf8 = 2;
+               else
+                       opt_utf8 = 1;
+       }
+       return ((_Bool) (opt_utf8 - 1));
+# else
+       return (0);
+# endif
+} /* }}} _Bool has_utf8 */
+
 static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */
                double latency, unsigned int sequence)
 {
        int color = OPING_RED;
        char const *symbol = "!";
+       int symbolc = '!';
+       size_t hist_symbols_num;
+       size_t index_symbols;
 
        int x_max;
        int x_pos;
@@ -626,12 +687,19 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */
        x_max = getmaxx (ctx->window);
        x_pos = ((sequence - 1) % (x_max - 4)) + 2;
 
+       if (has_utf8())
+       {
+               hist_symbols_num = hist_symbols_utf8_num;
+       }
+       else {
+               hist_symbols_num = hist_symbols_acs_num;
+       }
+
        if (latency >= 0.0)
        {
                double ratio;
                size_t intensity;
                size_t index_colors;
-               size_t index_symbols;
 
                ratio = latency / PING_DEF_TTL;
                if (ratio > 1) {
@@ -643,19 +711,36 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */
 
                index_colors = intensity / hist_symbols_num;
                assert (index_colors < hist_colors_num);
-               color = hist_colors[index_colors];
 
                index_symbols = intensity % hist_symbols_num;
-               symbol = hist_symbols[index_symbols];
-       }
+               if (has_utf8())
+               {
+                       color = hist_colors_utf8[index_colors];
+                       symbol = hist_symbols_utf8[index_symbols];
+               }
+               else
+               {
+                       color = hist_colors_acs[index_colors];
+                       symbolc = hist_symbols_acs[index_symbols] | A_ALTCHARSET;
+               }
+        }
        else /* if (!(latency >= 0.0)) */
                wattron (ctx->window, A_BOLD);
 
        wattron (ctx->window, COLOR_PAIR(color));
-       mvwprintw (ctx->window,
-                       /* y = */ 3,
-                       /* x = */ x_pos,
-                       symbol);
+       if (has_utf8())
+       {
+               mvwprintw (ctx->window,
+                          /* y = */ 3,
+                          /* x = */ x_pos,
+                          symbol);
+       }
+       else {
+               mvwaddch (ctx->window,
+                         /* y = */ 3,
+                         /* x = */ x_pos,
+                         symbolc);
+       }
        wattroff (ctx->window, COLOR_PAIR(color));
 
        /* Use negation here to handle NaN correctly. */