1 files changed, 154 insertions, 171 deletions

diff --git a/src/statistics/statistics.c b/src/statistics/statistics.c
index b8dd2cd3..af5f3a06 100644
--- a/src/statistics/statistics.c
+++ b/src/statistics/statistics.c
@@ -84,40 +84,37 @@ load_graph_draw (LoadGraph * g)
   g->draw_height = g->disp->allocation.height;
 
   if (!g->pixmap)
-    g->pixmap = gdk_pixmap_new (g->disp->window,
-                                g->draw_width, g->draw_height,
-                                gtk_widget_get_visual (g->disp)->depth);
+    g->pixmap =
+        gdk_pixmap_new (g->disp->window, g->draw_width, g->draw_height,
+                        gtk_widget_get_visual (g->disp)->depth);
 
   /* Create GC if necessary. */
   if (!g->gc)
-    {
-      g->gc = gdk_gc_new (g->disp->window);
-      gdk_gc_copy (g->gc, g->disp->style->white_gc);
-    }
+  {
+    g->gc = gdk_gc_new (g->disp->window);
+    gdk_gc_copy (g->gc, g->disp->style->white_gc);
+  }
 
   /* Allocate colors. */
   if (!g->colors_allocated)
-    {
-      GdkColormap *colormap;
+  {
+    GdkColormap *colormap;
 
-      colormap = gdk_window_get_colormap (g->disp->window);
-      for (i = 0; i < 2 + g->count; i++)
-        gdk_color_alloc (colormap, &(g->colors[i]));
+    colormap = gdk_window_get_colormap (g->disp->window);
+    for (i = 0; i < 2 + g->count; i++)
+      gdk_color_alloc (colormap, &(g->colors[i]));
 
-      g->colors_allocated = 1;
-    }
+    g->colors_allocated = 1;
+  }
   /* Erase Rectangle */
   gdk_gc_set_foreground (g->gc, &(g->colors[0]));
-  gdk_draw_rectangle (g->pixmap,
-                      g->gc,
-                      TRUE, 0, 0,
-                      g->disp->allocation.width, g->disp->allocation.height);
+  gdk_draw_rectangle (g->pixmap, g->gc, TRUE, 0, 0, g->disp->allocation.width,
+                      g->disp->allocation.height);
 
   /* draw frame */
   gdk_gc_set_foreground (g->gc, &(g->colors[1]));
-  gdk_draw_rectangle (g->pixmap,
-                      g->gc,
-                      FALSE, 0, 0, g->draw_width, g->disp->allocation.height);
+  gdk_draw_rectangle (g->pixmap, g->gc, FALSE, 0, 0, g->draw_width,
+                      g->disp->allocation.height);
 
   max = 0.26;                   /* force showing at least the 25% line */
   for (i = 0; i < g->num_points - 1; i++)
@@ -127,99 +124,94 @@ load_graph_draw (LoadGraph * g)
   max = max * 1.01;             /* leave top 1% free */
 
   font = gdk_font_load ("fixed");       /* deprecated, but pango is far more than
-                                           what we need here -- fix later? */
+                                         * what we need here -- fix later? */
   /* draw lines at 25%, 50%, 75% and 100% of max */
   dely = g->draw_height / max / 4;
   for (i = 1; i < 5; i++)
+  {
+    gint y1 = g->draw_height + 1 - i * dely;
+
+    if ((dely < 30) && (i != 4))
+      continue;                 /* only print additional
+                                 * lines if there is enough space! */
+    if (y1 > 0)
     {
-      gint y1 = g->draw_height + 1 - i * dely;
-      if ((dely < 30) && (i != 4))
-        continue;               /* only print additional
-                                   lines if there is enough space! */
-      if (y1 > 0)
-        {
-          const gchar *label[] = {
-            NULL,
-            " 25%",
-            " 50%",
-            " 75%",
-            "100%",
-          };
-          gdk_draw_string (g->pixmap, font, g->gc, 10, y1 - 8, label[i]);
-          gdk_draw_line (g->pixmap, g->gc, 0, y1, g->draw_width, y1);
-          if (i == 4)
-            {
-              /* extra-thick line at 100% */
-              gdk_draw_line (g->pixmap, g->gc,
-                             0, y1 - 1, g->draw_width, y1 - 1);
-              gdk_draw_line (g->pixmap, g->gc,
-                             0, y1 + 1, g->draw_width, y1 + 1);
-
-            }
-        }
+      const gchar *label[] = {
+        NULL,
+        " 25%",
+        " 50%",
+        " 75%",
+        "100%",
+      };
+      gdk_draw_string (g->pixmap, font, g->gc, 10, y1 - 8, label[i]);
+      gdk_draw_line (g->pixmap, g->gc, 0, y1, g->draw_width, y1);
+      if (i == 4)
+      {
+        /* extra-thick line at 100% */
+        gdk_draw_line (g->pixmap, g->gc, 0, y1 - 1, g->draw_width, y1 - 1);
+        gdk_draw_line (g->pixmap, g->gc, 0, y1 + 1, g->draw_width, y1 + 1);
+
+      }
     }
-  gdk_gc_set_line_attributes (g->gc,
-                              2,
-                              GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
+  }
+  gdk_gc_set_line_attributes (g->gc, 2, GDK_LINE_SOLID, GDK_CAP_ROUND,
+                              GDK_JOIN_MITER);
   delx = (float) g->draw_width / (g->num_points - 1);
 
   for (j = 0; j < g->count; j++)
+  {
+    gdk_gc_set_foreground (g->gc, &(g->colors[j + 2]));
+    for (i = 0; i < g->num_points - 1; i++)
     {
-      gdk_gc_set_foreground (g->gc, &(g->colors[j + 2]));
-      for (i = 0; i < g->num_points - 1; i++)
+      gint x1 = i * delx;
+      gint x2 = (i + 1) * delx;
+      gint y1 = g->data[i][j] / max * g->draw_height - 1;
+      gint y2 = g->data[i + 1][j] / max * g->draw_height - 1;
+
+      if ((g->data[i][j] != -1) && (g->data[i + 1][j] != -1))
+      {
+        if (stats[g->statIdx].fill <= j)
         {
-          gint x1 = i * delx;
-          gint x2 = (i + 1) * delx;
-          gint y1 = g->data[i][j] / max * g->draw_height - 1;
-          gint y2 = g->data[i + 1][j] / max * g->draw_height - 1;
-
-          if ((g->data[i][j] != -1) && (g->data[i + 1][j] != -1))
-            {
-              if (stats[g->statIdx].fill <= j)
-                {
-                  gdk_draw_line (g->pixmap, g->gc,
-                                 g->draw_width - x2,
-                                 g->draw_height - y2,
-                                 g->draw_width - x1, g->draw_height - y1);
-                }
-              else
-                {
-                  GdkPoint points[4];
-
-                  points[0].x = g->draw_width - x2;
-                  points[0].y = g->draw_height - y2;
-                  points[1].x = g->draw_width - x1;
-                  points[1].y = g->draw_height - y1;
-                  points[2].x = g->draw_width - x1;
-                  points[3].x = g->draw_width - x2;
-                  if (j == 0)
-                    {
-                      points[2].y = g->draw_height;
-                      points[3].y = g->draw_height;
-                    }
-                  else
-                    {
-                      gint ly1 = g->data[i][j - 1] / max * g->draw_height - 1;
-                      gint ly2 =
-                        g->data[i + 1][j - 1] / max * g->draw_height - 1;
-                      points[2].y = g->draw_height - ly1;
-                      points[3].y = g->draw_height - ly2;
-                    }
-                  gdk_draw_polygon (g->pixmap, g->gc, 1, points, 4);
-                }
-            }
+          gdk_draw_line (g->pixmap, g->gc, g->draw_width - x2,
+                         g->draw_height - y2, g->draw_width - x1,
+                         g->draw_height - y1);
         }
+        else
+        {
+          GdkPoint points[4];
+
+          points[0].x = g->draw_width - x2;
+          points[0].y = g->draw_height - y2;
+          points[1].x = g->draw_width - x1;
+          points[1].y = g->draw_height - y1;
+          points[2].x = g->draw_width - x1;
+          points[3].x = g->draw_width - x2;
+          if (j == 0)
+          {
+            points[2].y = g->draw_height;
+            points[3].y = g->draw_height;
+          }
+          else
+          {
+            gint ly1 = g->data[i][j - 1] / max * g->draw_height - 1;
+            gint ly2 = g->data[i + 1][j - 1] / max * g->draw_height - 1;
+
+            points[2].y = g->draw_height - ly1;
+            points[3].y = g->draw_height - ly2;
+          }
+          gdk_draw_polygon (g->pixmap, g->gc, 1, points, 4);
+        }
+      }
     }
+  }
 
-  gdk_gc_set_line_attributes (g->gc, 1,
-                              GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
+  gdk_gc_set_line_attributes (g->gc, 1, GDK_LINE_SOLID, GDK_CAP_ROUND,
+                              GDK_JOIN_MITER);
 
   gdk_draw_pixmap (g->disp->window,
-                   g->disp->style->fg_gc[GTK_WIDGET_STATE (g->disp)],
-                   g->pixmap,
-                   0, 0,
-                   0, 0,
-                   g->disp->allocation.width, g->disp->allocation.height);
+                   g->disp->style->fg_gc[GTK_WIDGET_STATE (g->disp)], g->pixmap,
+                   0, 0, 0, 0, g->disp->allocation.width,
+                   g->disp->allocation.height);
 }
 
 
@@ -246,21 +238,22 @@ static void
 load_graph_unalloc (LoadGraph * g)
 {
   unsigned int i;
+
   if (!g->allocated)
     return;
   for (i = 0; i < g->num_points; i++)
-    {
-      GNUNET_free (g->data[i]);
-      GNUNET_free (g->odata[i]);
-    }
+  {
+    GNUNET_free (g->data[i]);
+    GNUNET_free (g->odata[i]);
+  }
   GNUNET_free (g->data);
   GNUNET_free (g->odata);
   g->data = g->odata = NULL;
   if (g->pixmap)
-    {
-      gdk_pixmap_unref (g->pixmap);
-      g->pixmap = NULL;
-    }
+  {
+    gdk_pixmap_unref (g->pixmap);
+    g->pixmap = NULL;
+  }
   g->allocated = FALSE;
 }
 
@@ -277,10 +270,10 @@ load_graph_alloc (LoadGraph * g)
   g->odata = GNUNET_malloc (sizeof (gfloat *) * g->num_points);
   g->data_size = sizeof (gfloat);
   for (i = 0; i < g->num_points; i++)
-    {
-      g->data[i] = GNUNET_malloc (g->data_size * g->count);
-      g->odata[i] = GNUNET_malloc (g->data_size * g->count);
-    }
+  {
+    g->data[i] = GNUNET_malloc (g->data_size * g->count);
+    g->odata[i] = GNUNET_malloc (g->data_size * g->count);
+  }
   for (i = 0; i < g->num_points; i++)
     for (j = 0; j < g->count; j++)
       g->data[i][j] = -1;
@@ -288,48 +281,42 @@ load_graph_alloc (LoadGraph * g)
 }
 
 static gint
-load_graph_configure (GtkWidget * widget,
-                      GdkEventConfigure * event, gpointer data_ptr)
+load_graph_configure (GtkWidget * widget, GdkEventConfigure * event,
+                      gpointer data_ptr)
 {
   LoadGraph *c = (LoadGraph *) data_ptr;
 
   if (c->pixmap)
-    {
-      gdk_pixmap_unref (c->pixmap);
-      c->pixmap = NULL;
-    }
+  {
+    gdk_pixmap_unref (c->pixmap);
+    c->pixmap = NULL;
+  }
 
   if (!c->pixmap)
-    c->pixmap = gdk_pixmap_new (widget->window,
-                                widget->allocation.width,
-                                widget->allocation.height,
-                                gtk_widget_get_visual (c->disp)->depth);
-  gdk_draw_rectangle (c->pixmap,
-                      widget->style->black_gc,
-                      TRUE, 0, 0,
+    c->pixmap =
+        gdk_pixmap_new (widget->window, widget->allocation.width,
+                        widget->allocation.height,
+                        gtk_widget_get_visual (c->disp)->depth);
+  gdk_draw_rectangle (c->pixmap, widget->style->black_gc, TRUE, 0, 0,
                       widget->allocation.width, widget->allocation.height);
   gdk_draw_pixmap (widget->window,
-                   c->disp->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                   c->pixmap,
-                   0, 0,
-                   0, 0,
-                   c->disp->allocation.width, c->disp->allocation.height);
+                   c->disp->style->fg_gc[GTK_WIDGET_STATE (widget)], c->pixmap,
+                   0, 0, 0, 0, c->disp->allocation.width,
+                   c->disp->allocation.height);
 
   load_graph_draw (c);
   return TRUE;
 }
 
 static gint
-load_graph_expose (GtkWidget * widget,
-                   GdkEventExpose * event, gpointer data_ptr)
+load_graph_expose (GtkWidget * widget, GdkEventExpose * event,
+                   gpointer data_ptr)
 {
   LoadGraph *g = (LoadGraph *) data_ptr;
 
   gdk_draw_pixmap (widget->window,
-                   widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                   g->pixmap,
-                   event->area.x, event->area.y,
-                   event->area.x, event->area.y,
+                   widget->style->fg_gc[GTK_WIDGET_STATE (widget)], g->pixmap,
+                   event->area.x, event->area.y, event->area.x, event->area.y,
                    event->area.width, event->area.height);
   return FALSE;
 }
@@ -340,10 +327,10 @@ load_graph_stop (LoadGraph * g)
   if (!g)
     return;
   if (g->timer_index != -1)
-    {
-      gtk_timeout_remove (g->timer_index);
-      g->timer_index = -1;
-    }
+  {
+    gtk_timeout_remove (g->timer_index);
+    g->timer_index = -1;
+  }
   g->draw = FALSE;
 }
 
@@ -351,6 +338,7 @@ static void
 load_graph_destroy (GtkWidget * widget, gpointer data_ptr)
 {
   LoadGraph *g = (LoadGraph *) data_ptr;
+
   load_graph_stop (g);
   if (g->timer_index != -1)
     gtk_timeout_remove (g->timer_index);
@@ -366,10 +354,10 @@ load_graph_new (int statIdx, const ProcConfig * config)
   unsigned int i;
 
   if (stats[statIdx].count > MAX_COLOR)
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      return NULL;
-    }
+  {
+    GNUNET_GE_BREAK (NULL, 0);
+    return NULL;
+  }
 
   g = GNUNET_malloc (sizeof (LoadGraph));
   g->statIdx = statIdx;
@@ -387,13 +375,12 @@ load_graph_new (int statIdx, const ProcConfig * config)
   gtk_widget_show (g->main_widget);
   g->disp = gtk_drawing_area_new ();
   gtk_widget_show (g->disp);
-  gtk_signal_connect (GTK_OBJECT (g->disp),
-                      "expose_event", GTK_SIGNAL_FUNC (load_graph_expose), g);
-  gtk_signal_connect (GTK_OBJECT (g->disp),
-                      "configure_event",
+  gtk_signal_connect (GTK_OBJECT (g->disp), "expose_event",
+                      GTK_SIGNAL_FUNC (load_graph_expose), g);
+  gtk_signal_connect (GTK_OBJECT (g->disp), "configure_event",
                       GTK_SIGNAL_FUNC (load_graph_configure), g);
-  gtk_signal_connect (GTK_OBJECT (g->disp),
-                      "destroy", GTK_SIGNAL_FUNC (load_graph_destroy), g);
+  gtk_signal_connect (GTK_OBJECT (g->disp), "destroy",
+                      GTK_SIGNAL_FUNC (load_graph_destroy), g);
   gtk_widget_add_events (g->disp, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
   gtk_box_pack_start (GTK_BOX (g->main_widget), g->disp, TRUE, TRUE, 0);
   load_graph_alloc (g);
@@ -419,8 +406,8 @@ create_sys_view (int statIdx, const ProcConfig * config)
   gtk_container_set_border_width (GTK_CONTAINER (mem_frame), GNOME_PAD_SMALL);
   gtk_widget_show (mem_frame);
   if (mem_graph->timer_index == -1)
-    mem_graph->timer_index
-      = gtk_timeout_add (mem_graph->speed, &load_graph_update, mem_graph);
+    mem_graph->timer_index =
+        gtk_timeout_add (mem_graph->speed, &load_graph_update, mem_graph);
   mem_graph->draw = TRUE;
   return mem_frame;
 }
@@ -430,8 +417,7 @@ create_sys_view (int statIdx, const ProcConfig * config)
 
 
 void
-init_stats (struct GNUNET_GE_Context *ectx,
-            struct GNUNET_GC_Configuration *cfg)
+init_stats (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg)
 {
   GtkWidget *statusConnexionsBox;
   GtkWidget *statusConnexionsLabel;
@@ -442,25 +428,22 @@ init_stats (struct GNUNET_GE_Context *ectx,
   int i;
 
   statusConnexionsLabel =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "statusConnexionsLabel");
+      glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "statusConnexionsLabel");
   gtk_label_set_width_chars (GTK_LABEL (statusConnexionsLabel),
                              g_utf8_strlen (_("Connected to %Lu peers"),
                                             40) - 1);
   statusConnexionsBox =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "statusConnexionsBox");
+      glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "statusConnexionsBox");
   gtk_widget_set_sensitive (statusConnexionsBox, TRUE);
-  GNUNET_GC_get_configuration_value_number (cfg,
-                                            "GNUNET-GTK",
-                                            "STATS-INTERVAL",
-                                            1,
-                                            99 * GNUNET_CRON_YEARS,
+  GNUNET_GC_get_configuration_value_number (cfg, "GNUNET-GTK", "STATS-INTERVAL",
+                                            1, 99 * GNUNET_CRON_YEARS,
                                             30 * GNUNET_CRON_SECONDS,
                                             &UPDATE_INTERVAL);
   init_functions (ectx, cfg);
   notebook =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
+      glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
   memset (&config, 0, sizeof (ProcConfig));
   gdk_color_parse ("black", &config.bg_color);
   gdk_color_parse ("gray", &config.frame_color);
@@ -473,14 +456,14 @@ init_stats (struct GNUNET_GE_Context *ectx,
   GNUNET_GE_ASSERT (ectx, MAX_COLOR == 6);
   i = -1;
   while (stats[++i].paneName != NULL)
-    {
-      sys_box = create_sys_view (i, &config);
-      if (sys_box == NULL)
-        continue;               /* oops */
-
-      label = gtk_label_new (gettext (stats[i].paneName));
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, label);
-    }
+  {
+    sys_box = create_sys_view (i, &config);
+    if (sys_box == NULL)
+      continue;                 /* oops */
+
+    label = gtk_label_new (gettext (stats[i].paneName));
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, label);
+  }
   gtk_widget_show (notebook);
 }