Add support for arranging graphs into multiple columns

Author: hamishcoleman

src/oping.c

@@ -207,6 +207,7 @@ static double  opt_exit_status_threshold = 1.0;
 #if USE_NCURSES
 static int     opt_show_graph = 1;
 static int     opt_utf8       = 0;
+static int     opt_columns    = 1;
 #endif
 static char   *opt_outfile    = NULL;
 static int     opt_bell       = 0;
@@ -655,7 +656,7 @@ static int read_options (int argc, char **argv) /* {{{ */
 	{
 		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
 #if USE_NCURSES
-				"uUg:"
+				"uUg:C:"
 #endif
 				);
 
@@ -791,6 +792,16 @@ static int read_options (int argc, char **argv) /* {{{ */
 			case 'U':
 				opt_utf8 = 1;
 				break;
+                        case 'C':
+                        {
+                                int new_columns = atoi(optarg);
+                                if (new_columns > 0)
+                                    opt_columns = new_columns;
+                                else
+                                    fprintf (stderr, "Ignoring invalid number of columns: %s\n",
+                                                    optarg);
+                                break;
+                        }
 #endif
 			case 'b':
 				opt_bell = 1;
@@ -1281,7 +1292,11 @@ static int on_resize (pingobj_t *ping) /* {{{ */
 	if ((height < 1) || (width < 1))
 		return (EINVAL);
 
-	main_win_height = height - (box_height * host_num);
+        int box_rows_count = host_num / opt_columns;
+        if (box_rows_count < 1)
+            box_rows_count = 1;
+
+	main_win_height = height - (box_height * box_rows_count);
 	wresize (main_win, main_win_height, /* width = */ width);
 	/* Allow scrolling */
 	scrollok (main_win, TRUE);
@@ -1290,6 +1305,8 @@ static int on_resize (pingobj_t *ping) /* {{{ */
 	idlok (main_win, TRUE);
 	wrefresh (main_win);
 
+        width = width / opt_columns;
+
 	for (iter = ping_iterator_get (ping);
 			iter != NULL;
 			iter = ping_iterator_next (iter))
@@ -1307,8 +1324,8 @@ static int on_resize (pingobj_t *ping) /* {{{ */
 		}
 		context->window = newwin (/* height = */ box_height,
 				/* width = */ width,
-				/* y = */ main_win_height + (box_height * context->index),
-				/* x = */ 0);
+				/* y = */ main_win_height + (box_height * (context->index / opt_columns)),
+				/* x = */ width * (context->index % opt_columns));
 	}
 
 	return (0);
@@ -1368,7 +1385,11 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */
 		init_pair (OPING_RED_HIST,    COLOR_RED,    COLOR_YELLOW);
 	}
 
-	main_win_height = height - (box_height * host_num);
+        int box_rows_count = host_num / opt_columns;
+        if (box_rows_count < 1)
+            box_rows_count = 1;
+
+	main_win_height = height - (box_height * box_rows_count);
 	main_win = newwin (/* height = */ main_win_height,
 			/* width = */ width,
 			/* y = */ 0, /* x = */ 0);
@@ -1380,6 +1401,8 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */
 	wmove (main_win, /* y = */ main_win_height - 1, /* x = */ 0);
 	wrefresh (main_win);
 
+        width = width / opt_columns;
+
 	for (iter = ping_iterator_get (ping);
 			iter != NULL;
 			iter = ping_iterator_next (iter))
@@ -1397,8 +1420,8 @@ static int pre_loop_hook (pingobj_t *ping) /* {{{ */
 		}
 		context->window = newwin (/* height = */ box_height,
 				/* width = */ width,
-				/* y = */ main_win_height + (box_height * context->index),
-				/* x = */ 0);
+				/* y = */ main_win_height + (box_height * (context->index / opt_columns)),
+				/* x = */ width * (context->index % opt_columns));
 	}