X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foping.c;h=5c0ead5ee2608f4b69a3da6b59041e278321d7ff;hb=6c682f99f7b995e1c155ab2627687cece54dbfbc;hp=068c55d18964a67e5a2dcfb73768cd6d1c3f64e8;hpb=44e296d605a06a782f4520ace6cb67a2cbe85525;p=liboping.git diff --git a/src/oping.c b/src/oping.c index 068c55d..5c0ead5 100644 --- a/src/oping.c +++ b/src/oping.c @@ -75,12 +75,18 @@ #endif #include +#include #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 + +# if HAVE_NCURSESW_NCURSES_H +# include +# elif HAVE_NCURSES_H +# include +# 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 \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,29 @@ 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 = '!'; int x_max; int x_pos; @@ -629,34 +688,60 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ if (latency >= 0.0) { double ratio; - size_t intensity; - size_t index_colors; + + size_t symbols_num = hist_symbols_acs_num; + size_t colors_num = 1; + size_t index_symbols; + size_t index_colors; + size_t intensity; - ratio = latency / PING_DEF_TTL; + /* latency is in milliseconds, opt_interval is in seconds. */ + ratio = (latency * 0.001) / opt_interval; if (ratio > 1) { ratio = 1.0; } - intensity = (size_t) ((ratio * hist_symbols_num - * hist_colors_num) - 1); + if (has_utf8 ()) + symbols_num = hist_symbols_utf8_num; - index_colors = intensity / hist_symbols_num; - assert (index_colors < hist_colors_num); - color = hist_colors[index_colors]; + if (has_colors () == TRUE) + colors_num = hist_colors_num; + + intensity = (size_t) (ratio * ((double) (symbols_num * colors_num))); + if (intensity >= (symbols_num * colors_num)) + intensity = (symbols_num * colors_num) - 1; + + index_symbols = intensity % symbols_num; + assert (index_symbols < symbols_num); - index_symbols = intensity % hist_symbols_num; - symbol = hist_symbols[index_symbols]; + index_colors = intensity / symbols_num; + assert (index_colors < colors_num); + + 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); - wattroff (ctx->window, COLOR_PAIR(color)); + if (has_colors () == TRUE) + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x_pos, symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x_pos, symbolc); + + if (has_colors () == TRUE) + wattroff (ctx->window, COLOR_PAIR(color)); /* Use negation here to handle NaN correctly. */ if (!(latency >= 0.0)) @@ -713,8 +798,7 @@ static int update_stats_from_context (ping_context_t *ctx, pingobj_iter_t *iter) deviation); } - if (has_colors () == TRUE) - update_prettyping_graph (ctx, latency, sequence); + update_prettyping_graph (ctx, latency, sequence); wrefresh (ctx->window);