Multiload network scale

multiload/global.h

@@ -49,6 +49,7 @@ struct _LoadGraph {
     double loadavg1;
     NetSpeed *netspeed_in;
     NetSpeed *netspeed_out;
+    guint net_granularity;
 
     gboolean visible;
     gboolean tooltip_update;
@@ -58,20 +59,20 @@ struct _LoadGraph {
 struct _MultiloadApplet
 {
 	MatePanelApplet *applet;
-	
+
 	GSettings *settings;
-	
+
 	LoadGraph *graphs[NGRAPHS];
-	
+
 	GtkWidget *box;
-	
+
 	gboolean view_cpuload;
 	gboolean view_memload;
 	gboolean view_netload;
 	gboolean view_swapload;
 	gboolean view_loadavg;
 	gboolean view_diskload;
-	
+
 	GtkWidget *about_dialog;
 	GtkWidget *check_boxes[NGRAPHS];
 	GtkWidget *prop_dialog;

multiload/linux-proc.c

@@ -387,14 +387,10 @@ GetNet (int Maximum, int data [4], LoadGraph *g)
 
 	max = autoscaler_get_max(&scaler, total);
 
-	for (i = 0; i < COUNT_TYPES; i++)
-	    data[i]   = rint (Maximum * (float)delta[i]  / max);
+	for (i = 0; i < COUNT_TYPES; i++) {
+			data[i]   = rint (delta[i]);
+	}
     }
 
-    //data[4] = Maximum - data[3] - data[2] - data[1] - data[0];
-    data[COUNT_TYPES] = Maximum;
-    for (i = 0; i < COUNT_TYPES; i++)
-	data[COUNT_TYPES] -= data[i];
-
     memcpy(past, present, sizeof past);
 }

multiload/load-graph.c

@@ -66,8 +66,8 @@ load_graph_draw (LoadGraph *g)
   cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
   cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
 
-  /* all graphs except Load go this path */
-  if (g->id != 4)
+  /* all graphs except Load and Net go this path */
+  if (g->id != 4 && g->id != 2)
   {
     for (i = 0; i < g->draw_width; i++)
       g->pos [i] = g->draw_height - 1;
@@ -87,7 +87,61 @@ load_graph_draw (LoadGraph *g)
       }
       cairo_stroke (cr);
     }
+  }
+  /* This is for network graph */
+  else if (g->id == 2)
+  {
+    guint maxnet =	1;
+    gint segments = 1;
+    gint combined = 0;
+    for (i = 0; i < g->draw_width; i++)
+    {
+      g->pos [i] = g->draw_height - 1;
+      combined = 0;
+      for (j = 0; j < g->n; j++)
+        combined += g->data[i][j];
+      if (combined > maxnet)
+        maxnet = combined;
+    }
+    maxnet = maxnet/g->net_granularity;
+    segments = MAX (maxnet+1,1);
+    float ratio = (float)g->draw_height/g->net_granularity/segments;
+
+    for (j = 0; j < g->n-1; j++)
+    {
+      gdk_cairo_set_source_rgba (cr, &(g->colors [j]));
 
+      for (i = 0; i < g->draw_width; i++)
+      {
+        cairo_move_to (cr, g->draw_width - i - 0.5, g->pos[i] + 0.5);
+        cairo_line_to (cr, g->draw_width - i - 0.5, g->pos[i] - 0.5 - ((g->data [i][j] * ratio)));
+        g->pos [i] -= ((g->data [i][j] * ratio));
+      }
+      cairo_stroke (cr);
+    }
+
+    for (j = g->n-1; j < g->n; j++)
+    {
+      gdk_cairo_set_source_rgba (cr, &(g->colors [j]));
+      for (i = 0; i < g->draw_width; i++)
+      {
+          cairo_move_to (cr, g->draw_width - i - 0.5, g->pos[i] + 0.5);
+          cairo_line_to (cr, g->draw_width - i - 0.5, 0.5);
+      }
+      cairo_stroke (cr);
+    }
+
+    /* draw grid lines if needed */
+    gdk_cairo_set_source_rgba (cr, &(g->colors [4]));
+
+    double spacing = 0;
+    for (k = 0; k < segments -1; k++)
+    {
+      spacing = ((double) g->draw_height/segments) * (k+1);
+      cairo_move_to (cr, 0.5, spacing);
+      cairo_line_to (cr, g->draw_width-0.5, spacing);
+    }
+    cairo_stroke (cr);
   }
   /* this is Load graph */
   else

multiload/main.c

@@ -363,17 +363,21 @@ multiload_create_graphs(MultiloadApplet *ma)
 	       } graph_types[] = {
 			{ _("CPU Load"),     "cpuload",  5, GetLoad },
 			{ _("Memory Load"),  "memload",  5, GetMemory },
-			{ _("Net Load"),     "netload2",  4, GetNet },
+			{ _("Net Load"),     "netload2",  5, GetNet },
 			{ _("Swap Load"),    "swapload", 2, GetSwap },
 			{ _("Load Average"), "loadavg",  3, GetLoadAvg },
 			{ _("Disk Load"),    "diskload", 3, GetDiskLoad }
 		};
 
 	gint speed, size;
+	guint net_granularity;
 	gint i;
 
 	speed = g_settings_get_int (ma->settings, "speed");
 	size = g_settings_get_int (ma->settings, "size");
+	net_granularity = g_settings_get_uint (ma->settings, "netgranularity");
+	if (net_granularity == 0)
+		net_granularity = 100000;
 	speed = MAX (speed, 50);
 	size = CLAMP (size, 10, 400);
 
@@ -403,8 +407,11 @@ multiload_create_graphs(MultiloadApplet *ma)
 						graph_types[i].name,
 						graph_types[i].callback);
 	}
-    /* for Load graph, colors[2] is grid line color, it should not be used in loop in load-graph.c */
-    ma->graphs[4]->n = 2;
+	/* for Network graph, colors[4] is grid line color, it should not be used in loop in load-graph.c */
+	ma->graphs[2]->n = 4;
+	ma->graphs[2]->net_granularity = net_granularity;
+	/* for Load graph, colors[2] is grid line color, it should not be used in loop in load-graph.c */
+	ma->graphs[4]->n = 2;
 }
 
 /* remove the old graphs and rebuild them */

multiload/org.mate.panel.applet.multiload.gschema.xml.in

@@ -89,6 +89,14 @@
       <default>'#000000'</default>
       <summary>Network graph background color</summary>
     </key>
+    <key name="netload2-color4" type="s">
+      <default>'#ffffff'</default>
+      <summary>Grid line color</summary>
+    </key>
+    <key name="netgranularity" type="u">
+      <default>100000</default>
+      <summary>Network graph granularity in bytes</summary>
+    </key>
     <key name="swapload-color0" type="s">
       <default>'#8b00c3'</default>
       <summary>Graph color for user-related swap usage</summary>

multiload/properties.c

@@ -613,6 +613,7 @@ fill_properties(GtkWidget *dialog, MultiloadApplet *ma)
 	add_color_selector(page, _("_Out"), "netload2-color1", ma);
 	add_color_selector (page, _("_Local"), "netload2-color2", ma);
 	add_color_selector(page, _("_Background"), "netload2-color3", ma);
+	add_color_selector(page, _("_Gridline"), "netload2-color4", ma);
 
 	page = add_page(ma->notebook,  _("Swap Space"));
 	gtk_container_set_border_width (GTK_CONTAINER (page), 12);