X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foping.c;h=5c0ead5ee2608f4b69a3da6b59041e278321d7ff;hb=6c682f99f7b995e1c155ab2627687cece54dbfbc;hp=c8d3cdfd104101d2ae4dffc75fd04fd22aa53aa9;hpb=a58f361afd7a6e0d2b112806bd280d173faf9bef;p=liboping.git diff --git a/src/oping.c b/src/oping.c index c8d3cdf..5c0ead5 100644 --- a/src/oping.c +++ b/src/oping.c @@ -75,17 +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 -/* some evilness: ncurses knows how to detect unicode, but won't - expose it, yet there's this function that does what we want, so we - steal it away from it */ -extern int _nc_unicode_locale(void); +# if HAVE_NCURSESW_NCURSES_H +# include +# elif HAVE_NCURSES_H +# include +# endif # define OPING_GREEN 1 # define OPING_YELLOW 2 @@ -159,8 +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; -static int opt_utf8_force = 0; -static int opt_utf8_disable = 0; +#if USE_NCURSES +static int opt_utf8 = 0; +#endif static int host_num = 0; @@ -305,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" @@ -507,7 +512,11 @@ static int read_options (int argc, char **argv) /* {{{ */ while (1) { - optchar = getopt (argc, argv, "46uUc: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; @@ -519,13 +528,6 @@ static int read_options (int argc, char **argv) /* {{{ */ opt_addrfamily = (optchar == '4') ? AF_INET : AF_INET6; break; - case 'u': - opt_utf8_force = 1; - break; - case 'U': - opt_utf8_disable = 1; - break; - case 'c': { int new_count; @@ -585,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; @@ -593,9 +604,6 @@ static int read_options (int argc, char **argv) /* {{{ */ } } - if (opt_utf8_disable && opt_utf8_force) - fprintf (stderr, "Ignoring contradictory unicode flags\n"); - return (optind); } /* }}} read_options */ @@ -647,10 +655,22 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */ } /* }}} void time_calc */ #if USE_NCURSES -static int unicode_locale() /* {{{ */ +static _Bool has_utf8() /* {{{ */ { - return ( _nc_unicode_locale() || opt_utf8_force ) && !opt_utf8_disable; -} /* }}} int unicode_locale */ +# 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) @@ -658,8 +678,6 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ int color = OPING_RED; char const *symbol = "!"; int symbolc = '!'; - size_t hist_symbols_num; - size_t index_symbols; int x_max; int x_pos; @@ -667,33 +685,40 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ x_max = getmaxx (ctx->window); x_pos = ((sequence - 1) % (x_max - 4)) + 2; - if (unicode_locale()) - { - 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 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; + + 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_colors = intensity / hist_symbols_num; - assert (index_colors < hist_colors_num); + index_colors = intensity / symbols_num; + assert (index_colors < colors_num); - index_symbols = intensity % hist_symbols_num; - if (unicode_locale()) + if (has_utf8()) { color = hist_colors_utf8[index_colors]; symbol = hist_symbols_utf8[index_symbols]; @@ -703,25 +728,20 @@ static int update_prettyping_graph (ping_context_t *ctx, /* {{{ */ 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)); - if (unicode_locale()) - { - 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)); + 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)) @@ -778,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);