ethereal->wireshark
[obnox/wireshark/wip.git] / gtk / graph_analysis.c
index e1a4380be976223ee46f4906369cc9126852057e..35dfa82e2835fb78bb7281bac58b2d786001b5ab 100644 (file)
@@ -1,5 +1,5 @@
 /* graph_analysis.c
- * Graphic Analysis addition for ethereal
+ * Graphic Analysis addition for Wireshark
  *
  * $Id$
  *
@@ -9,8 +9,8 @@
  * based on rtp_analysis.c and io_stat
  *
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
 #include "graph_analysis.h"
 
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
 
 #include "util.h"
 #include <epan/tap.h>
 #include "register.h"
 #include <epan/dissectors/packet-rtp.h>
+#include <epan/addr_resolv.h>
 
 /* in /gtk ... */
 #include <gtk/gtk.h>
+#if GTK_MAJOR_VERSION >= 2
+#include <glib-object.h>
+#endif
+
+#include <gdk/gdkkeysyms.h>
 #include "gtkglobals.h"
 
+#if 0
 #include "dlg_utils.h"
-#include "ui_util.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
-#include "tap_menu.h"
+#endif
+#include "file_dlg.h"
+#include "gui_utils.h"
 #include "main.h"
-#include "progress_dlg.h"
 #include "compat_macros.h"
 #include "../color.h"
+#include "epan/filesystem.h"
+#include "file_util.h"
 
-#include <math.h>
-#include <fcntl.h>
 #include <string.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
+#include "simple_dialog.h"
 
-#ifdef HAVE_IO_H
-#include <io.h> /* open/close on win32 */
-#endif
 
-/* Win32 needs the O_BINARY flag for open() */
-#ifndef O_BINARY
-#define O_BINARY 0
+/* XXX FIXME */
+/* GTK-1.x does not have GDK_IS_DRAWABLE so just define is as always being true
+ * so that Wireshark compiles.
+ * At later stage we should implement it as a real fallback for gtk-1.x
+ * but for the time being   us very few gtk-1.2 users at elast can compile.
+ */
+#if (GTK_MAJOR_VERSION < 2)
+#define GDK_IS_DRAWABLE(x) 1
 #endif
-
 /****************************************************************************/
 
 
@@ -89,8 +92,24 @@ GtkRcStyle *rc_style;
 GdkColormap *colormap;
 #endif
 
-typedef const guint8 * ip_addr_p;
+static GtkWidget *save_to_file_w = NULL;
 
+#define MAX_LABEL 50
+#define MAX_COMMENT 100
+#define ITEM_HEIGHT 20
+#define NODE_WIDTH 100
+#define TOP_Y_BORDER 40
+#define BOTTOM_Y_BORDER 0
+#define COMMENT_WIDTH 400
+#define TIME_WIDTH 50
+
+#define NODE_CHARS_WIDTH 20
+#define CONV_TIME_HEADER "Conv.| Time    "
+#define TIME_HEADER "|Time     "
+#define CONV_TIME_EMPTY_HEADER     "     |         "
+#define TIME_EMPTY_HEADER     "|         "
+#define CONV_TIME_HEADER_LENGTH 16
+#define TIME_HEADER_LENGTH 10
 
 /****************************************************************************/
 /* Reset the user_data structure */
@@ -101,9 +120,12 @@ static void graph_analysis_reset(graph_analysis_data_t* user_data)
        user_data->num_nodes = 0;
        user_data->num_items = 0;
        for (i=0; i<MAX_NUM_NODES; i++){
-               user_data->nodes[i] = 0;
+               user_data->nodes[i].type = AT_NONE;
+               user_data->nodes[i].len = 0;
+               g_free((void *)user_data->nodes[i].data);
+               user_data->nodes[i].data = NULL;
        }
-       
+
        user_data->dlg.first_node=0;
        user_data->dlg.first_item=0;
        user_data->dlg.left_x_border=0;
@@ -114,47 +136,66 @@ static void graph_analysis_reset(graph_analysis_data_t* user_data)
 /* Reset the user_data structure */
 static void graph_analysis_init_dlg(graph_analysis_data_t* user_data)
 {
-    /* init dialog_graph */
-    user_data->dlg.needs_redraw=TRUE;
-    user_data->dlg.draw_area=NULL;
-    user_data->dlg.pixmap=NULL;
-    user_data->dlg.h_scrollbar=NULL;
-    user_data->dlg.h_scrollbar_adjustment=NULL;
-    user_data->dlg.v_scrollbar=NULL;
-    user_data->dlg.v_scrollbar_adjustment=NULL;
-    user_data->dlg.pixmap_width=600;
-    user_data->dlg.pixmap_height=400;
+       int i;
+
+       user_data->num_nodes = 0;
+       user_data->num_items = 0;
+       user_data->on_destroy_user_data = NULL;
+       user_data->data = NULL;
+       for (i=0; i<MAX_NUM_NODES; i++){
+               user_data->nodes[i].type = AT_NONE;
+               user_data->nodes[i].len = 0;
+               user_data->nodes[i].data = NULL;
+       }
+
+       user_data->dlg.first_node=0;
+       user_data->dlg.first_item=0;
+       user_data->dlg.left_x_border=0;
+       user_data->dlg.selected_item=0xFFFFFFFF;    /*not item selected */
+       /* init dialog_graph */
+       user_data->dlg.needs_redraw=TRUE;
+       user_data->dlg.draw_area_time=NULL;
+       user_data->dlg.draw_area=NULL;
+       user_data->dlg.pixmap=NULL;
+       user_data->dlg.pixmap_time=NULL;
+       user_data->dlg.draw_area_comments=NULL;
+       user_data->dlg.pixmap_comments=NULL;
+       user_data->dlg.v_scrollbar=NULL;
+       user_data->dlg.v_scrollbar_adjustment=NULL;
+       user_data->dlg.hpane=NULL;
+       user_data->dlg.pixmap_width = 350;
+       user_data->dlg.pixmap_height=400;
        user_data->dlg.first_node=0;
        user_data->dlg.first_item=0;
        user_data->dlg.left_x_border=0;
        user_data->dlg.selected_item=0xFFFFFFFF;    /*not item selected */
        user_data->dlg.window=NULL;
+       user_data->dlg.inverse = FALSE;
+       user_data->dlg.title=NULL;
 }
 
 /****************************************************************************/
 /* CALLBACKS */
 
-
 /****************************************************************************/
-/* close the dialog window and remove the tap listener */
+/* close the dialog window */
 static void on_destroy(GtkWidget *win _U_, graph_analysis_data_t *user_data _U_)
 {
+       int i;
 
-       g_free(user_data);
-}
-
-
-/****************************************************************************/
-static void dialog_graph_set_title(graph_analysis_data_t* user_data)
-{
-       char            *title;
-       if (!user_data->dlg.window){
-               return;
+       for (i=0; i<MAX_NUM_NODES; i++){
+               user_data->nodes[i].type = AT_NONE;
+               user_data->nodes[i].len = 0;
+               g_free((void *)user_data->nodes[i].data);
+               user_data->nodes[i].data = NULL;
        }
-       title = g_strdup_printf("Ale");
+       user_data->dlg.window = NULL;
+       g_free(user_data->dlg.title);
+       user_data->dlg.title = NULL;
 
-       gtk_window_set_title(GTK_WINDOW(user_data->dlg.window), title);
-       g_free(title);  
+       if(user_data->on_destroy_user_data){
+        user_data->on_destroy_user_data(user_data->data);
+       }
 }
 
 #define RIGHT_ARROW 1
@@ -177,35 +218,400 @@ static void draw_arrow(GdkDrawable *pixmap, GdkGC *gc, gint x, gint y, gboolean
        arrow_point[2].x = x;
        arrow_point[2].y = y+HEIGHT_ARROW/2;;
 
-       gdk_draw_polygon(pixmap, gc, TRUE, 
-               arrow_point, 3);
+       if (GDK_IS_DRAWABLE(pixmap)) {
+               gdk_draw_polygon(pixmap, gc, TRUE, arrow_point, 3);
+       }
 }
 
-#define MAX_LABEL 50
-#define MAX_COMMENT 60
-#define ITEM_HEIGHT 20
-#define NODE_WIDTH 100
-#define TOP_Y_BORDER 40
-#define BOTTOM_Y_BORDER 0
-#define COMMENT_WIDTH 250
+/****************************************************************************/
+/* Adds trailing characters to complete the requested length.               */
+/****************************************************************************/
+
+static void enlarge_string(GString *gstr, guint32 length, char pad){
+
+       guint32 i;
+
+       for (i = gstr->len; i < length; i++){
+               g_string_append_c(gstr, pad);
+       }
+}
+
+/****************************************************************************/
+/* overwrites the characters in a string, between positions p1 and p2, with */
+/*   the characters of text_to_insert                                       */
+/*   NB: it does not check that p1 and p2 fit into string                                      */
+/****************************************************************************/
+
+static void overwrite (GString *gstr, char *text_to_insert, guint32 p1, guint32 p2){
+
+       guint32 pos, len;
+
+       if (p1 == p2)
+               return;
+
+       if (p1 > p2){
+               pos = p2;
+               len = p1 - p2;
+       }
+       else{
+               pos = p1;
+               len = p2 - p1;
+       }
+
+       if (len > strlen(text_to_insert)){
+               len = strlen(text_to_insert);
+       }
+
+       if (pos > gstr->len)
+               pos = gstr->len;
+
+       if (pos + len > gstr->len)
+               g_string_truncate(gstr, pos);
+       else
+               g_string_erase(gstr, pos, len);
+
+       g_string_insert(gstr, pos, text_to_insert);
+}
+
+
+/*
+ * XXX - We might want to refactor this to write the graph data directly to
+ * the file instead of loading everything into strings first.
+ */
+
+/****************************************************************************/
+static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data)
+{
+        guint32 i, first_node, display_items, display_nodes;
+       guint32 start_position, end_position, item_width, header_length;
+        guint32 current_item;
+       graph_analysis_item_t *gai;
+       guint16 first_conv_num;
+       gboolean several_convs = FALSE;
+       gboolean first_packet = TRUE;
+
+        GString *label_string, *empty_line,*separator_line, *tmp_str, *tmp_str2;
+        char *empty_header;
+       char src_port[8],dst_port[8];
+
+       GList* list;
+
+       FILE *of;
+
+       of = eth_fopen(user_data->dlg.save_file,"w");
+       if (of==NULL){
+               return FALSE;
+       }
+
+       label_string   = g_string_new("");
+       empty_line     = g_string_new("");
+       separator_line = g_string_new("");
+       tmp_str        = g_string_new("");
+       tmp_str2       = g_string_new("");
+
+       /* get the items to display and fill the matrix array */
+       list = g_list_first(user_data->graph_info->list);
+       current_item = 0;
+       i = 0;
+       while (list)
+       {
+               gai = list->data;
+               if (gai->display){
+                       user_data->dlg.items[current_item].frame_num = gai->frame_num;
+                       user_data->dlg.items[current_item].time = gai->time;
+                       user_data->dlg.items[current_item].port_src = gai->port_src;
+                       user_data->dlg.items[current_item].port_dst = gai->port_dst;
+                       user_data->dlg.items[current_item].frame_label = gai->frame_label;
+                       user_data->dlg.items[current_item].comment = gai->comment;
+                       user_data->dlg.items[current_item].conv_num = gai->conv_num;
+                       user_data->dlg.items[current_item].src_node = gai->src_node;
+                       user_data->dlg.items[current_item].dst_node = gai->dst_node;
+                       if (first_packet){
+                               first_conv_num = gai->conv_num;
+                               first_packet=FALSE;
+                       }
+                       if (user_data->dlg.items[current_item].conv_num != first_conv_num){
+                               several_convs = TRUE;
+                       }
+                       current_item++;
+                       i++;
+               }
+
+               list = g_list_next(list);
+       }
+       display_items = current_item;
+
+       /* if not items to display */
+       if (display_items == 0) goto exit;
+
+       display_nodes = user_data->num_nodes;
+
+       first_node = user_data->dlg.first_node;
+
+       /* Write the conv. and time headers */
+
+       if (several_convs){
+               fprintf (of, CONV_TIME_HEADER);
+               empty_header = CONV_TIME_EMPTY_HEADER;
+               header_length = CONV_TIME_HEADER_LENGTH;
+       }
+       else{
+               fprintf (of, TIME_HEADER);
+               empty_header = TIME_EMPTY_HEADER;
+               header_length = TIME_HEADER_LENGTH;
+       }
+
+       /* Write the node names on top */
+       for (i=0; i<display_nodes; i++){
+               /* print the node identifiers */
+               g_string_sprintf(label_string, "| %s",
+                       get_addr_name(&(user_data->nodes[i+first_node])));
+               enlarge_string(label_string, NODE_CHARS_WIDTH, ' ');
+               fprintf(of, "%s", label_string->str);
+               g_string_sprintf(label_string, "| ");
+               enlarge_string(label_string, NODE_CHARS_WIDTH, ' ');
+               g_string_append(empty_line, label_string->str);
+       }
+       g_string_append_c(empty_line, '|');
+
+       enlarge_string(separator_line, empty_line->len + header_length, '-');
+
+       fprintf(of, "|\n");
+
+       /*
+        * Draw the items
+        */
+
+       for (current_item=0; current_item<display_items; current_item++){
+
+               start_position = (user_data->dlg.items[current_item].src_node-first_node)*NODE_CHARS_WIDTH+NODE_CHARS_WIDTH/2;
+
+               end_position = (user_data->dlg.items[current_item].dst_node-first_node)*NODE_CHARS_WIDTH+NODE_CHARS_WIDTH/2;
+
+               if (start_position > end_position){
+                       item_width=start_position-end_position;
+               }
+               else if (start_position < end_position){
+                       item_width=end_position-start_position;
+               }
+               else{ /* same origin and destination address */
+                       end_position = start_position+NODE_CHARS_WIDTH;
+                       item_width = NODE_CHARS_WIDTH;
+               }
+
+               /* separator between conversations */
+               if (user_data->dlg.items[current_item].conv_num != first_conv_num){
+                       fprintf(of, "%s\n", separator_line->str);
+                       first_conv_num=user_data->dlg.items[current_item].conv_num;
+               }
+
+               /* write the conversation number */
+               if (several_convs){
+                       g_string_sprintf(label_string, "%i", user_data->dlg.items[current_item].conv_num);
+                       enlarge_string(label_string, 5, ' ');
+                       fprintf(of, "%s", label_string->str);
+               }
+
+               /* write the time */
+               g_string_sprintf(label_string, "|%.3f", user_data->dlg.items[current_item].time);
+               enlarge_string(label_string, 10, ' ');
+               fprintf(of, "%s", label_string->str);
+
+               /* write the frame label */
+
+               g_string_sprintf(tmp_str, empty_line->str);
+               overwrite(tmp_str,user_data->dlg.items[current_item].frame_label,
+                       start_position,
+                       end_position
+                       );
+               fprintf(of, "%s", tmp_str->str);
+
+               /* write the comments */
+               fprintf(of, "%s\n", user_data->dlg.items[current_item].comment);
+
+               /* write the arrow and frame label*/
+               fprintf(of, "%s", empty_header);
+
+               g_string_sprintf(tmp_str, empty_line->str);
+
+               g_string_truncate(tmp_str2, 0);
+
+               if (start_position<end_position){
+                       enlarge_string(tmp_str2, item_width-2, '-');
+                       g_string_append_c(tmp_str2, '>');
+               }
+               else{
+                       g_string_sprintf(tmp_str2, "<");
+                       enlarge_string(tmp_str2, item_width-1, '-');
+               }
+
+               overwrite(tmp_str,tmp_str2->str,
+                       start_position,
+                       end_position
+                       );
+
+               g_snprintf(src_port,8,"(%i)", user_data->dlg.items[current_item].port_src);
+               g_snprintf(dst_port,8,"(%i)", user_data->dlg.items[current_item].port_dst);
+
+               if (start_position<end_position){
+                       overwrite(tmp_str,src_port,start_position-9,start_position-1);
+                       overwrite(tmp_str,dst_port,end_position+1,end_position+9);
+               }
+               else{
+                       overwrite(tmp_str,src_port,start_position+1,start_position+9);
+                       overwrite(tmp_str,dst_port,end_position-9,end_position+1);
+               }
+
+               fprintf(of,"%s\n",tmp_str->str);
+       }
+
+exit:
+       g_string_free(label_string, TRUE);
+       g_string_free(empty_line, TRUE);
+       g_string_free(separator_line, TRUE);
+       g_string_free(tmp_str, TRUE);
+       g_string_free(tmp_str2, TRUE);
+
+       fclose (of);
+       return TRUE;
+
+}
+
+/****************************************************************************/
+static void save_to_file_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_)
+{
+       /* Note that we no longer have a Save to file dialog box. */
+       save_to_file_w = NULL;
+}
+
+/****************************************************************************/
+/* save in a file */
+
+/* first an auxiliary function in case we need an overwrite confirmation dialog */
+
+static void overwrite_existing_file_cb(gpointer dialog _U_, gint btn, gpointer user_data _U_)
+{
+       graph_analysis_data_t *user_data_p;
+
+       user_data_p = user_data;
+
+       switch(btn) {
+       case(ESD_BTN_YES):
+           /* overwrite the file*/
+           dialog_graph_dump_to_file(user_data);
+           break;
+       case(ESD_BTN_NO):
+           break;
+       default:
+           g_assert_not_reached();
+       }
+}
+
+/* and then the save in a file dialog itself */
+
+static void save_to_file_ok_cb(GtkWidget *ok_bt _U_, gpointer user_data _U_)
+{
+       FILE *file_test;
+       gpointer dialog;
+       graph_analysis_data_t *user_data_p;
+
+       user_data_p = user_data;
+
+       user_data_p->dlg.save_file = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION (save_to_file_w)));
+
+       /* Perhaps the user specified a directory instead of a file.
+       Check whether they did. */
+       if (test_for_directory(user_data_p->dlg.save_file) == EISDIR) {
+               /* It's a directory - set the file selection box to display it. */
+               set_last_open_dir(user_data_p->dlg.save_file);
+               g_free(user_data_p->dlg.save_file);
+               file_selection_set_current_folder(save_to_file_w, get_last_open_dir());
+               return;
+       }
+
+
+       /* check whether the file exists */
+       file_test = eth_fopen(user_data_p->dlg.save_file,"r");
+       if (file_test!=NULL){
+
+               dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_YES_NO,
+                 "%sFile: \"%s\" already exists!%s\n\n"
+                 "Do you want to overwrite it?",
+                 simple_dialog_primary_start(),user_data_p->dlg.save_file, simple_dialog_primary_end());
+               simple_dialog_set_cb(dialog, overwrite_existing_file_cb, user_data);
+               fclose(file_test);
+       }
+
+       else{
+               if (!dialog_graph_dump_to_file(user_data))
+                       return;
+       }
+       window_destroy(GTK_WIDGET(save_to_file_w));
+
+}
+
+/****************************************************************************/
+static void
+on_save_bt_clicked                    (GtkButton       *button _U_,
+                                        gpointer         user_data _U_)
+{
+       GtkWidget *vertb;
+       GtkWidget *ok_bt;
+
+       if (save_to_file_w != NULL) {
+               /* There's already a Save to file dialog box; reactivate it. */
+               reactivate_window(save_to_file_w);
+               return;
+       }
+
+       save_to_file_w = gtk_file_selection_new("Wireshark: Save graph to file");
+
+       /* Container for each row of widgets */
+       vertb = gtk_vbox_new(FALSE, 0);
+       gtk_container_border_width(GTK_CONTAINER(vertb), 5);
+       gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(save_to_file_w)->action_area),
+               vertb, FALSE, FALSE, 0);
+       gtk_widget_show (vertb);
+
+       ok_bt = GTK_FILE_SELECTION(save_to_file_w)->ok_button;
+       SIGNAL_CONNECT(ok_bt, "clicked", save_to_file_ok_cb, user_data);
+
+       window_set_cancel_button(save_to_file_w,
+       GTK_FILE_SELECTION(save_to_file_w)->cancel_button, window_cancel_button_cb);
+
+       SIGNAL_CONNECT(save_to_file_w, "delete_event", window_delete_event_cb, NULL);
+       SIGNAL_CONNECT(save_to_file_w, "destroy", save_to_file_destroy_cb,
+                      NULL);
+
+       gtk_widget_show(save_to_file_w);
+       window_present(save_to_file_w);
+
+
+}
 
 /****************************************************************************/
 static void dialog_graph_draw(graph_analysis_data_t* user_data)
 {
-        guint32 i, last_item, first_item, last_node, first_node, display_items, display_nodes;
-               guint32 start_arrow, end_arrow, label_x, src_port_x, dst_port_x, arrow_width;
+        guint32 i, last_item, first_item, display_items;
+       guint32 start_arrow, end_arrow, label_x, src_port_x, dst_port_x, arrow_width;
         guint32 current_item;
         guint32 left_x_border;
         guint32 right_x_border;
         guint32 top_y_border;
         guint32 bottom_y_border;
-               graph_analysis_item_t *gai;
-               gboolean display_label;
+       graph_analysis_item_t *gai;
+       guint16 first_conv_num;
+       gboolean several_convs = FALSE;
+       gboolean first_packet = TRUE;
+
+       GdkGC *frame_fg_color;
+       GdkGC *frame_bg_color;
+       GdkGC *div_line_color;
 
 #if GTK_MAJOR_VERSION < 2
         GdkFont *font;
-               FONT_TYPE *big_font;
-               FONT_TYPE *small_font;
+       FONT_TYPE *big_font;
+       FONT_TYPE *small_font;
 #else
         PangoLayout  *layout;
         PangoLayout  *big_layout;
@@ -214,146 +620,243 @@ static void dialog_graph_draw(graph_analysis_data_t* user_data)
         guint32 label_width, label_height;
         guint32 draw_width, draw_height;
         char label_string[MAX_COMMENT];
-               GList* list;
+       GList* list;
 
         /* new variables */
 
 #if GTK_MAJOR_VERSION <2
         font = user_data->dlg.draw_area->style->font;
-               big_font = gdk_font_load("-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1");
-               small_font = gdk_font_load("-adobe-helvetica-bold-r-normal--10-120-75-75-p-70-iso8859-1");
+       big_font = gdk_font_load("-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1");
+       small_font = gdk_font_load("-adobe-helvetica-bold-r-normal--10-120-75-75-p-70-iso8859-1");
 #endif
         if(!user_data->dlg.needs_redraw){
                 return;
         }
         user_data->dlg.needs_redraw=FALSE;
 
-        /*
-         * Clear out old plot
-         */
-        gdk_draw_rectangle(user_data->dlg.pixmap,
-                           user_data->dlg.draw_area->style->white_gc,
-                           TRUE,
-                           0, 0,
-                           user_data->dlg.draw_area->allocation.width,
-                           user_data->dlg.draw_area->allocation.height);
-
-               /* Calculate the y border */
-        top_y_border=TOP_Y_BORDER;     /* to display the node IP address */
-        bottom_y_border=BOTTOM_Y_BORDER;
-
-        draw_height=user_data->dlg.pixmap_height-top_y_border-bottom_y_border;
-
-               first_item = user_data->dlg.first_item;
-               display_items = draw_height/ITEM_HEIGHT;
-               last_item = first_item+display_items-1;
-
-               /* get the items to display and fill the matrix array */
-               list = g_list_first(user_data->graph_info->list);
-               current_item = 0;
-               i = 0;
-               while (list)
-               {
-                       gai = list->data;
-                       if (gai->display){
-                               if (current_item>=display_items) break;         /* the item is outside the display */
-                               if (i>=first_item){
-                                       user_data->dlg.items[current_item].frame_num = gai->frame_num;
-                                       user_data->dlg.items[current_item].time = gai->time;
-                                       user_data->dlg.items[current_item].port_src = gai->port_src;
-                                       user_data->dlg.items[current_item].port_dst = gai->port_dst;
-                                       /* Add "..." if the length is 50 characters */
-                                       if (strlen(gai->frame_label) > 48) {
-                                               gai->frame_label[48] = '.';
-                                               gai->frame_label[47] = '.';
-                                               gai->frame_label[46] = '.';
-                                       }
-                                       user_data->dlg.items[current_item].frame_label = gai->frame_label;
-                                       user_data->dlg.items[current_item].comment = gai->comment;
-                                       user_data->dlg.items[current_item].conv_num = gai->conv_num;
-                                       user_data->dlg.items[current_item].src_node = gai->src_node;
-                                       user_data->dlg.items[current_item].dst_node = gai->dst_node;
-                                       user_data->dlg.items[current_item].line_style = gai->line_style;
-                                       current_item++;
+        /* Clear out old plt */
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_time,
+                                                  user_data->dlg.draw_area_time->style->white_gc,
+                                                  TRUE,
+                                                  0, 0,
+                                                  user_data->dlg.draw_area_time->allocation.width,
+                                                  user_data->dlg.draw_area_time->allocation.height);
+
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap) )
+               gdk_draw_rectangle(user_data->dlg.pixmap,
+                                                  user_data->dlg.draw_area->style->white_gc,
+                                                  TRUE,
+                                                  0, 0,
+                                                  user_data->dlg.draw_area->allocation.width,
+                                                  user_data->dlg.draw_area->allocation.height);
+
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_comments,
+                                                  user_data->dlg.draw_area->style->white_gc,
+                                                  TRUE,
+                                                  0, 0,
+                                                  user_data->dlg.draw_area_comments->allocation.width,
+                                                  user_data->dlg.draw_area_comments->allocation.height);
+
+       /* Calculate the y border */
+        top_y_border=TOP_Y_BORDER;     /* to display the node address */
+        bottom_y_border=2;
+
+           draw_height=user_data->dlg.draw_area->allocation.height-top_y_border-bottom_y_border;
+
+       first_item = user_data->dlg.first_item;
+       display_items = draw_height/ITEM_HEIGHT;
+       last_item = first_item+display_items-1;
+
+       /* get the items to display and fill the matrix array */
+       list = g_list_first(user_data->graph_info->list);
+       current_item = 0;
+       i = 0;
+       while (list)
+       {
+               gai = list->data;
+               if (gai->display){
+                       if (current_item>=display_items) break;         /* the item is outside the display */
+                       if (i>=first_item){
+                               user_data->dlg.items[current_item].frame_num = gai->frame_num;
+                               user_data->dlg.items[current_item].time = gai->time;
+                               user_data->dlg.items[current_item].port_src = gai->port_src;
+                               user_data->dlg.items[current_item].port_dst = gai->port_dst;
+                               /* Add "..." if the length is 50 characters */
+                               if (strlen(gai->frame_label) > 48) {
+                                       gai->frame_label[48] = '.';
+                                       gai->frame_label[47] = '.';
+                                       gai->frame_label[46] = '.';
                                }
-                               i++;
-                       }
+                               user_data->dlg.items[current_item].frame_label = gai->frame_label;
+                               user_data->dlg.items[current_item].comment = gai->comment;
+                               user_data->dlg.items[current_item].conv_num = gai->conv_num;
 
-                       list = g_list_next(list);
-               }
-               /* in case the windows is resized so we have to move the top item */
-               if ((first_item + display_items) > user_data->num_items){
-                       if (display_items>user_data->num_items)
-                               first_item=0;
-                       else
-                               first_item = user_data->num_items - display_items;
+                               if (first_packet){
+                                       first_conv_num = gai->conv_num;
+                                       first_packet=FALSE;
+                               }
+
+                               if (user_data->dlg.items[current_item].conv_num != first_conv_num){
+                                       several_convs = TRUE;
+                               }
+
+                               user_data->dlg.items[current_item].src_node = gai->src_node;
+                               user_data->dlg.items[current_item].dst_node = gai->dst_node;
+                               user_data->dlg.items[current_item].line_style = gai->line_style;
+                               current_item++;
+                       }
+                       i++;
                }
-               
-               /* in case there are less items than possible displayed */
-               display_items = current_item;
-               last_item = first_item+display_items-1;
 
-               /* if not items to display */
-               if (display_items == 0) return;                         
+               list = g_list_next(list);
+       }
+       /* in case the windows is resized so we have to move the top item */
+       if ((first_item + display_items) > user_data->num_items){
+               if (display_items>user_data->num_items)
+                       first_item=0;
+               else
+                       first_item = user_data->num_items - display_items;
+       }
+
+       /* in case there are less items than possible displayed */
+       display_items = current_item;
+       last_item = first_item+display_items-1;
+
+       /* if not items to display */
+       if (display_items == 0) return;
 
 
-               /* Calculate the x borders */
-               /* We use time from the last display item to calcultate the x left border */
-               g_snprintf(label_string, MAX_LABEL, "%.3f", user_data->dlg.items[display_items-1].time);
+       /* Calculate the x borders */
+       /* We use time from the last display item to calcultate the x left border */
+       g_snprintf(label_string, MAX_LABEL, "%.3f", user_data->dlg.items[display_items-1].time);
 #if GTK_MAJOR_VERSION < 2
         label_width=gdk_string_width(font, label_string);
         label_height=gdk_string_height(font, label_string);
 #else
-        layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area, label_string);
-        big_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area, label_string);
-        small_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area, label_string);
+        layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string);
+        big_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string);
+        small_layout = gtk_widget_create_pango_layout(user_data->dlg.draw_area_time, label_string);
 
-               pango_layout_set_font_description(big_layout, pango_font_description_from_string("Helvetica-Bold 8"));
-               pango_layout_set_font_description(small_layout, pango_font_description_from_string("Helvetica-Bold 7"));
+        /* XXX - to prevent messages like "Couldn't load font x, falling back to y", I've changed font
+           description from "Helvetica-Bold 8" to "Helvetica,Sans,Bold 8", this seems to be
+           conforming to the API, see http://developer.gnome.org/doc/API/2.0/pango/pango-Fonts.html */
+       pango_layout_set_font_description(big_layout, pango_font_description_from_string("Helvetica,Sans,Bold 8"));
+       pango_layout_set_font_description(small_layout, pango_font_description_from_string("Helvetica,Sans,Bold 7"));
 
         pango_layout_get_pixel_size(layout, &label_width, &label_height);
 #endif
-        left_x_border=label_width+10;
-               user_data->dlg.left_x_border = left_x_border;
 
-        right_x_border=COMMENT_WIDTH;
+               /* resize the "time" draw area */
 
-               /* Calculate the number of nodes to display */
+        left_x_border=3;
+       user_data->dlg.left_x_border = left_x_border;
+
+        right_x_border=2;
         draw_width=user_data->dlg.pixmap_width-right_x_border-left_x_border;
-               display_nodes = draw_width/NODE_WIDTH;
-               first_node = user_data->dlg.first_node;
-
-               /* in case the windows is resized so we have to move the left node */
-               if ((first_node + display_nodes) > user_data->num_nodes){
-                       if (display_nodes>user_data->num_nodes) 
-                               first_node=0;
-                       else
-                               first_node=user_data->num_nodes - display_nodes;
-               }
 
-               /* in case there are less nodes than possible displayed */
-               if (display_nodes>user_data->num_nodes) display_nodes=user_data->num_nodes;
-
-               last_node = first_node + display_nodes-1;
-
-               /* Paint the background items */ 
-               for (current_item=0; current_item<display_items; current_item++){
-                       /* Paint background */
-               gdk_draw_rectangle(user_data->dlg.pixmap,
-                           user_data->dlg.bg_gc[user_data->dlg.items[current_item].conv_num%MAX_NUM_COL_CONV],
-                           TRUE,
-                           left_x_border, 
-                                                  top_y_border+current_item*ITEM_HEIGHT,
-                           draw_width,
-                           ITEM_HEIGHT);
-               }
+       /* Paint time title background */
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_time,
+                                                  user_data->dlg.draw_area_time->style->bg_gc[2],
+                                                  TRUE,
+                                                  0,
+                                                  0,
+                                                  user_data->dlg.draw_area_time->allocation.width,
+                                                  top_y_border);
+       /* Paint main title background */
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap) )
+               gdk_draw_rectangle(user_data->dlg.pixmap,
+                                                  user_data->dlg.draw_area->style->bg_gc[2],
+                                                  TRUE,
+                                                  0,
+                                                  0,
+                                                  user_data->dlg.draw_area->allocation.width,
+                                                  top_y_border);
+       /* Paint main comment background */
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_comments,
+                                                  user_data->dlg.draw_area_comments->style->bg_gc[2],
+                                                  TRUE,
+                                                  0,
+                                                  0,
+                                                  user_data->dlg.draw_area_comments->allocation.width,
+                                                  top_y_border);
+
+
+       /* Draw the word "Time" on top of time column */
+       g_snprintf(label_string, label_width, "%s", "Time");
+#if GTK_MAJOR_VERSION < 2
+        label_width=gdk_string_width(font, label_string);
+        label_height=gdk_string_height(font, label_string);
+       gdk_draw_string(user_data->dlg.pixmap_time,
+               font,
+               user_data->dlg.draw_area_time->style->black_gc,
+               left_x_border+4,
+               top_y_border/2-label_height/2,
+               label_string);
+#else
+       pango_layout_set_text(layout, label_string, -1);
+        pango_layout_get_pixel_size(layout, &label_width, &label_height);
+       if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_time)) {
+               gdk_draw_layout(user_data->dlg.pixmap_time,
+                                               user_data->dlg.draw_area_time->style->black_gc,
+                                               left_x_border,
+                                               top_y_border/2-label_height/2,
+                                               layout);
+       }
+#endif
+
+       /* Draw the word "Comment" on top of comment column */
+       g_snprintf(label_string, label_width, "%s", "Comment");
+#if GTK_MAJOR_VERSION < 2
+        label_width=gdk_string_width(font, label_string);
+        label_height=gdk_string_height(font, label_string);
+       gdk_draw_string(user_data->dlg.pixmap_comments,
+               font,
+               user_data->dlg.draw_area_comments->style->black_gc,
+               MAX_COMMENT/2-label_width/2,
+               top_y_border/2-label_height/2,
+               label_string);
+#else
+       pango_layout_set_text(layout, label_string, -1);
+        pango_layout_get_pixel_size(layout, &label_width, &label_height);
+       if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments)) {
+               gdk_draw_layout(user_data->dlg.pixmap_comments,
+                          user_data->dlg.draw_area_comments->style->black_gc,
+                          MAX_COMMENT/2-label_width/2,
+                          top_y_border/2-label_height/2,
+                          layout);
+       }
+#endif
 
+       /* Paint the background items */
+       for (current_item=0; current_item<display_items; current_item++){
+               /*select the color. if it is the selected item select blue color */
+               if ( current_item+first_item == user_data->dlg.selected_item ) {
+                       frame_bg_color = user_data->dlg.bg_gc[0];
+               } else {
+                       frame_bg_color = user_data->dlg.bg_gc[1+user_data->dlg.items[current_item].conv_num%MAX_NUM_COL_CONV];
+               }
 
-               /* Draw the node names on top and the division lines */
-               for (i=0; i<display_nodes; i++){
-                       /* draw the node IPs */
-                       g_snprintf(label_string, MAX_LABEL, "%s",
-                               ip_to_str((guint8 *)&(user_data->nodes[i+first_node])));
+               /* Paint background */
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap)) {
+                       gdk_draw_rectangle(user_data->dlg.pixmap,
+                                                          frame_bg_color,
+                                                          TRUE,
+                                                          left_x_border,
+                                                          top_y_border+current_item*ITEM_HEIGHT,
+                                                          draw_width,
+                                                          ITEM_HEIGHT);
+               }
+       }
+       /* Draw the node names on top and the division lines */
+       for (i=0; i<user_data->num_nodes; i++){
+               /* print the node identifiers */
+               /* XXX we assign 5 pixels per character in the node identity */
+               g_snprintf(label_string, NODE_WIDTH/5, "%s",
+                       get_addr_name(&(user_data->nodes[i])));
 #if GTK_MAJOR_VERSION < 2
                label_width=gdk_string_width(font, label_string);
                label_height=gdk_string_height(font, label_string);
@@ -364,316 +867,368 @@ static void dialog_graph_draw(graph_analysis_data_t* user_data)
                 top_y_border/2-label_height/2,
                 label_string);
 #else
-                       pango_layout_set_text(layout, label_string, -1);
+               pango_layout_set_text(layout, label_string, -1);
                pango_layout_get_pixel_size(layout, &label_width, &label_height);
-               gdk_draw_layout(user_data->dlg.pixmap,
-                user_data->dlg.draw_area->style->black_gc,
-                left_x_border+NODE_WIDTH/2-label_width/2+NODE_WIDTH*i,
-                top_y_border/2-label_height/2,
-                layout);
-#endif         
-
-                       /* draw the node division lines */
-                       gdk_draw_line(user_data->dlg.pixmap, user_data->dlg.div_line_gc,
-                               left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
-                               top_y_border,
-                               left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
-                               user_data->dlg.pixmap_height-bottom_y_border);
-
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap)) {
+                       gdk_draw_layout(user_data->dlg.pixmap,
+                                                       user_data->dlg.draw_area->style->black_gc,
+                                                       left_x_border+NODE_WIDTH/2-label_width/2+NODE_WIDTH*i,
+                                                       top_y_border/2-label_height/2,
+                                                       layout);
                }
+#endif
 
-               /*
-                * Draw the items 
-                */
+               /* draw the node division lines */
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap) ) {
+                       gdk_draw_line(user_data->dlg.pixmap, user_data->dlg.div_line_gc[0],
+                                                 left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
+                                                 top_y_border,
+                                                 left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
+                                                 user_data->dlg.draw_area->allocation.height-bottom_y_border);
+               }
 
+       }
 
-               for (current_item=0; current_item<display_items; current_item++){
-                       /* draw the time */
-                       g_snprintf(label_string, MAX_LABEL, "%.3f", user_data->dlg.items[current_item].time);
+       /* Draw the items */
+       for (current_item=0; current_item<display_items; current_item++){
+               /* draw the time */
+               g_snprintf(label_string, MAX_LABEL, "%.3f", user_data->dlg.items[current_item].time);
 #if GTK_MAJOR_VERSION < 2
                label_width=gdk_string_width(font, label_string);
                label_height=gdk_string_height(font, label_string);
-                       gdk_draw_string(user_data->dlg.pixmap,
+                       gdk_draw_string(user_data->dlg.pixmap_time,
                 font,
                 user_data->dlg.draw_area->style->black_gc,
-                left_x_border-label_width-4,
+                3,
                 top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2+label_height/4,
                 label_string);
 #else
-                       pango_layout_set_text(layout, label_string, -1);
+               pango_layout_set_text(layout, label_string, -1);
                pango_layout_get_pixel_size(layout, &label_width, &label_height);
-               gdk_draw_layout(user_data->dlg.pixmap,
-                user_data->dlg.draw_area->style->black_gc,
-                left_x_border-label_width-4,
-                top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
-                layout);
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_time)) {
+                       gdk_draw_layout(user_data->dlg.pixmap_time,
+                                                       user_data->dlg.draw_area->style->black_gc,
+                                                       3,
+                                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
+                                                       layout);
+               }
 #endif
 
-                       /*draw the comments */
-                       g_snprintf(label_string, MAX_COMMENT, "%s", user_data->dlg.items[current_item].comment);
+               /*draw the comments */
+               g_snprintf(label_string, MAX_COMMENT, "%s", user_data->dlg.items[current_item].comment);
 #if GTK_MAJOR_VERSION < 2
-                       label_width=gdk_string_width(small_font, label_string);
-                       label_height=gdk_string_height(small_font, label_string);
-                       gdk_draw_string(user_data->dlg.pixmap,
+               label_width=gdk_string_width(small_font, label_string);
+               label_height=gdk_string_height(small_font, label_string);
+               gdk_draw_string(user_data->dlg.pixmap_comments,
                 small_font,
-                user_data->dlg.draw_area->style->black_gc,
-                user_data->dlg.pixmap_width-right_x_border+3,
+                user_data->dlg.draw_area_comments->style->black_gc,
+                2,
                 top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2+label_height/4,
                 label_string);
 #else
-                       pango_layout_set_text(small_layout, label_string, -1);
-                       pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
-               gdk_draw_layout(user_data->dlg.pixmap,
-                user_data->dlg.draw_area->style->black_gc,
-                user_data->dlg.pixmap_width-right_x_border+3,
-                top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
-                small_layout);
+               pango_layout_set_text(small_layout, label_string, -1);
+               pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments)) {
+                       gdk_draw_layout(user_data->dlg.pixmap_comments,
+                                                       user_data->dlg.draw_area->style->black_gc,
+                                                       2,
+                                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2,
+                                                       small_layout);
+               }
 #endif
-                       
-                       /* draw the arrow an frame label*/
-                       display_label = FALSE;
-                       if (user_data->dlg.items[current_item].src_node>=first_node){
-                               if (user_data->dlg.items[current_item].src_node<=last_node){
-                                       start_arrow = left_x_border+(user_data->dlg.items[current_item].src_node-first_node)*NODE_WIDTH+NODE_WIDTH/2;
-                                       display_label = TRUE;
-                               } else {
-                                       start_arrow = user_data->dlg.pixmap_width - right_x_border;
-                               }
-                       } else {
-                               start_arrow = left_x_border;
-                       }
-
-                       if (user_data->dlg.items[current_item].dst_node>=first_node){
-                               if (user_data->dlg.items[current_item].dst_node<=last_node){
-                                       end_arrow = left_x_border+(user_data->dlg.items[current_item].dst_node-first_node)*NODE_WIDTH+NODE_WIDTH/2;
-                                       display_label = TRUE;
-                               } else {
-                                       end_arrow = user_data->dlg.pixmap_width - right_x_border;
-                               }
-                       } else {
-                               end_arrow = left_x_border;
-                       }
-
-                       if (start_arrow != end_arrow){
-                               /* draw the arrow line */
-                               gdk_draw_line(user_data->dlg.pixmap, user_data->dlg.draw_area->style->black_gc,
+               /* select colors */
+               if ( current_item+first_item == user_data->dlg.selected_item ){
+                       frame_fg_color = user_data->dlg.draw_area->style->white_gc;
+                       div_line_color = user_data->dlg.div_line_gc[1];
+               } else {
+                       frame_fg_color = user_data->dlg.draw_area->style->black_gc;
+                       div_line_color = user_data->dlg.div_line_gc[0];
+               }
+               /* draw the arrow line */
+               start_arrow = left_x_border+(user_data->dlg.items[current_item].src_node)*NODE_WIDTH+NODE_WIDTH/2;
+               end_arrow = left_x_border+(user_data->dlg.items[current_item].dst_node)*NODE_WIDTH+NODE_WIDTH/2;
+
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap) ) {
+                       gdk_draw_line(user_data->dlg.pixmap, frame_fg_color,
+                               start_arrow,
+                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7,
+                               end_arrow,
+                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7);
+
+                       /* draw the additional line when line style is 2 pixels width */
+                       if (user_data->dlg.items[current_item].line_style == 2) {
+                               gdk_draw_line(user_data->dlg.pixmap, frame_fg_color,
                                        start_arrow,
-                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7,
+                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6,
                                        end_arrow,
-                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7);
-
-                               /* draw the additional line when line style is 2 pixels width */
-                               if (user_data->dlg.items[current_item].line_style == 2){
-                                       gdk_draw_line(user_data->dlg.pixmap, user_data->dlg.draw_area->style->black_gc,
-                                               start_arrow,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6,
-                                               end_arrow,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6);
-                               }                                       
-
-                               /* draw the arrow */
-                               if (start_arrow<end_arrow)
-                                       draw_arrow(user_data->dlg.pixmap, user_data->dlg.draw_area->style->black_gc, end_arrow-WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, RIGHT_ARROW);
-                               else
-                                       draw_arrow(user_data->dlg.pixmap, user_data->dlg.draw_area->style->black_gc, end_arrow+WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, LEFT_ARROW);
+                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-6);
                        }
+               }
+
+               /* draw the arrow */
+               if (start_arrow<end_arrow)
+                       draw_arrow(user_data->dlg.pixmap, frame_fg_color, end_arrow-WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, RIGHT_ARROW);
+               else
+                       draw_arrow(user_data->dlg.pixmap, frame_fg_color, end_arrow+WIDTH_ARROW,top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-7, LEFT_ARROW);
 
-                       /* draw the frame comment */
-                       if (display_label){
-                               g_snprintf(label_string, MAX_LABEL, "%s", user_data->dlg.items[current_item].frame_label);
+               /* draw the frame comment */
+               g_snprintf(label_string, MAX_LABEL, "%s", user_data->dlg.items[current_item].frame_label);
 #if GTK_MAJOR_VERSION < 2
-                               label_width=gdk_string_width(big_font, label_string);
-                               label_height=gdk_string_height(big_font, label_string);
+               label_width=gdk_string_width(big_font, label_string);
+               label_height=gdk_string_height(big_font, label_string);
 #else
-                               pango_layout_set_text(big_layout, label_string, -1);
-                               pango_layout_get_pixel_size(big_layout, &label_width, &label_height);
+               pango_layout_set_text(big_layout, label_string, -1);
+               pango_layout_get_pixel_size(big_layout, &label_width, &label_height);
 #endif
+               if (start_arrow<end_arrow){
+                       arrow_width = end_arrow-start_arrow;
+                       label_x = arrow_width/2+start_arrow;
+               }
+               else {
+                       arrow_width = start_arrow-end_arrow;
+                       label_x = arrow_width/2+end_arrow;
+               }
 
-                               if (start_arrow<end_arrow){
-                                       arrow_width = end_arrow-start_arrow;
-                                       label_x = arrow_width/2+start_arrow;
-                               }
-                               else {
-                                       arrow_width = start_arrow-end_arrow;
-                                       label_x = arrow_width/2+end_arrow;
-                               }
-
-                               if (label_width>arrow_width) arrow_width = label_width;
-
-                               if (left_x_border > (label_x-label_width/2)) label_x = left_x_border + label_width/2;
+               if (label_width>arrow_width) arrow_width = label_width;
 
-                               if ((user_data->dlg.pixmap_width - right_x_border) < (label_x+label_width/2)) label_x = user_data->dlg.pixmap_width - right_x_border - label_width/2;
+               if ((int)left_x_border > ((int)label_x-(int)label_width/2))
+                       label_x = left_x_border + label_width/2;
 
 #if GTK_MAJOR_VERSION < 2
-                               gdk_draw_string(user_data->dlg.pixmap,
-                                       big_font,
-                                       user_data->dlg.draw_area->style->black_gc,
-                                       label_x - label_width/2,
-                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2+label_height/4-3,
-                                       label_string);
+               gdk_draw_string(user_data->dlg.pixmap,
+                       big_font,
+                       frame_fg_color,
+                       label_x - label_width/2,
+                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2+label_height/4-3,
+                       label_string);
 #else
-                               gdk_draw_layout(user_data->dlg.pixmap,
-                                       user_data->dlg.draw_area->style->black_gc,
-                                       label_x - label_width/2,
-                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2-3,
-                                       big_layout);
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap)) {
+                       gdk_draw_layout(user_data->dlg.pixmap,
+                                                       frame_fg_color,
+                                                       label_x - label_width/2,
+                                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT/2-label_height/2-3,
+                                                       big_layout);
+               }
 #endif
 
-                               /* draw the source port number */
-                               if ((start_arrow != left_x_border) && (start_arrow != (user_data->dlg.pixmap_width - right_x_border))){ 
-                                       g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_src);
+
+               /* draw the source port number */
+               g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_src);
 #if GTK_MAJOR_VERSION < 2
-                                       label_width=gdk_string_width(small_font, label_string);
-                                       label_height=gdk_string_height(small_font, label_string);
+               label_width=gdk_string_width(small_font, label_string);
+               label_height=gdk_string_height(small_font, label_string);
 #else
-                                       pango_layout_set_text(small_layout, label_string, -1);
-                                       pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
+               pango_layout_set_text(small_layout, label_string, -1);
+               pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
 #endif
-                                       if (start_arrow<end_arrow){
-                                               src_port_x = start_arrow - label_width - 2;
-                                       }
-                                       else {
-                                               src_port_x = start_arrow + 2;
-                                       }
+               if (start_arrow<end_arrow){
+                       src_port_x = start_arrow - label_width - 2;
+               }
+               else {
+                       src_port_x = start_arrow + 2;
+               }
 #if GTK_MAJOR_VERSION < 2
-                                       gdk_draw_string(user_data->dlg.pixmap,
-                                               small_font,
-                                               user_data->dlg.div_line_gc,
-                                               src_port_x,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2+label_height/4-2,
-                                               label_string);
+               gdk_draw_string(user_data->dlg.pixmap,
+                       small_font,
+                       div_line_color,
+                       src_port_x,
+                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2+label_height/4-2,
+                       label_string);
 #else
-                                       gdk_draw_layout(user_data->dlg.pixmap,
-                                               user_data->dlg.div_line_gc,
-                                               src_port_x,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
-                                               small_layout);
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap)) {
+                       gdk_draw_layout(user_data->dlg.pixmap,
+                                                       div_line_color,
+                                                       src_port_x,
+                                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
+                                                       small_layout);
+               }
 #endif
-                               }
 
-                               /* draw the destination port number */
-                               if ((end_arrow != left_x_border) && (end_arrow != (user_data->dlg.pixmap_width - right_x_border))){ 
-                                       g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_dst);
+               /* draw the destination port number */
+               g_snprintf(label_string, MAX_LABEL, "(%i)", user_data->dlg.items[current_item].port_dst);
 #if GTK_MAJOR_VERSION < 2
-                                       label_width=gdk_string_width(small_font, label_string);
-                                       label_height=gdk_string_height(small_font, label_string);
+               label_width=gdk_string_width(small_font, label_string);
+               label_height=gdk_string_height(small_font, label_string);
 #else
-                                       pango_layout_set_text(small_layout, label_string, -1);
-                                       pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
+               pango_layout_set_text(small_layout, label_string, -1);
+               pango_layout_get_pixel_size(small_layout, &label_width, &label_height);
 #endif
-                                       if (start_arrow<end_arrow){
-                                               dst_port_x = end_arrow + 2;
-                                       }
-                                       else {
-                                               dst_port_x = end_arrow - label_width - 2;
-                                       }
+               if (start_arrow<end_arrow){
+                       dst_port_x = end_arrow + 2;
+               }
+               else {
+                       dst_port_x = end_arrow - label_width - 2;
+               }
 #if GTK_MAJOR_VERSION < 2
-                                       gdk_draw_string(user_data->dlg.pixmap,
-                                               small_font,
-                                               user_data->dlg.div_line_gc,
-                                               dst_port_x,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2+label_height/4-2,
-                                               label_string);
+               gdk_draw_string(user_data->dlg.pixmap,
+                       small_font,
+                       div_line_color,
+                       dst_port_x,
+                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2+label_height/4-2,
+                       label_string);
 #else
-                                       gdk_draw_layout(user_data->dlg.pixmap,
-                                               user_data->dlg.div_line_gc,
-                                               dst_port_x,
-                                               top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
-                                               small_layout);
+               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap)) {
+                       gdk_draw_layout(user_data->dlg.pixmap,
+                                                       div_line_color,
+                                                       dst_port_x,
+                                                       top_y_border+current_item*ITEM_HEIGHT+ITEM_HEIGHT-2-label_height/2-2,
+                                                       small_layout);
+               }
 #endif
+               /* draw the div line of the selected item with soft gray*/
+               if ( current_item+first_item == user_data->dlg.selected_item )
+                       for (i=0; i<user_data->num_nodes; i++){
+                               if (GDK_IS_DRAWABLE(user_data->dlg.pixmap) ) {
+                                       gdk_draw_line(user_data->dlg.pixmap, user_data->dlg.div_line_gc[1],
+                                                                 left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
+                                                                 (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER,
+                                                                 left_x_border+NODE_WIDTH/2+NODE_WIDTH*i,
+                                                                 (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER+ITEM_HEIGHT);
                                }
-
                        }
-               }
+       }
+
 
 #if GTK_MAJOR_VERSION >= 2
-        g_object_unref(G_OBJECT(layout));
+       g_object_unref(G_OBJECT(layout));
 #endif
 
-               /* draw the border on the selected item */
-               if ( (user_data->dlg.selected_item != 0xFFFFFFFF) && ( (user_data->dlg.selected_item>=first_item) && (user_data->dlg.selected_item<=last_item) )){
-                       gdk_draw_rectangle(user_data->dlg.pixmap, user_data->dlg.draw_area->style->black_gc,
-                               FALSE,
-                               left_x_border-1,
-                               (user_data->dlg.selected_item-first_item)*ITEM_HEIGHT+TOP_Y_BORDER,
-                               user_data->dlg.pixmap_width-COMMENT_WIDTH-left_x_border+1,
-                               ITEM_HEIGHT);
-               }
-
-
-
-        gdk_draw_pixmap(user_data->dlg.draw_area->window,
-                        user_data->dlg.draw_area->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area)],
-                        user_data->dlg.pixmap,
-                        0, 0,
-                        0, 0,
-                        user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
-
-
-        /* update the h_scrollbar */
-        user_data->dlg.h_scrollbar_adjustment->upper=(gfloat) user_data->num_nodes-1;
-        user_data->dlg.h_scrollbar_adjustment->step_increment=1;
-        user_data->dlg.h_scrollbar_adjustment->page_increment=(gfloat) (last_node-first_node);
-        user_data->dlg.h_scrollbar_adjustment->page_size=(gfloat) (last_node-first_node);
-        user_data->dlg.h_scrollbar_adjustment->value=(gfloat) first_node;
-
-               gtk_adjustment_changed(user_data->dlg.h_scrollbar_adjustment);
-        gtk_adjustment_value_changed(user_data->dlg.h_scrollbar_adjustment);
-
-        /* update the v_scrollbar */
+       /* refresh the draw areas */
+       if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_time->window) )
+               gdk_draw_pixmap(user_data->dlg.draw_area_time->window,
+                                               user_data->dlg.draw_area_time->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area_time)],
+                                               user_data->dlg.pixmap_time,
+                                               0, 0,
+                                               0, 0,
+                                               user_data->dlg.draw_area_time->allocation.width, user_data->dlg.draw_area_time->allocation.height);
+
+       if (GDK_IS_DRAWABLE(user_data->dlg.draw_area->window) )
+               gdk_draw_pixmap(user_data->dlg.draw_area->window,
+                                               user_data->dlg.draw_area->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area)],
+                                               user_data->dlg.pixmap,
+                                               0, 0,
+                                               0, 0,
+                                               user_data->dlg.draw_area->allocation.width, user_data->dlg.draw_area->allocation.height);
+
+       if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_comments->window) )
+               gdk_draw_pixmap(user_data->dlg.draw_area_comments->window,
+                                               user_data->dlg.draw_area_comments->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.draw_area_comments)],
+                                               user_data->dlg.pixmap_comments,
+                                               0, 0,
+                                               0, 0,
+                                               user_data->dlg.draw_area_comments->allocation.width, user_data->dlg.draw_area_comments->allocation.height);
+
+       /* update the v_scrollbar */
         user_data->dlg.v_scrollbar_adjustment->upper=(gfloat) user_data->num_items-1;
         user_data->dlg.v_scrollbar_adjustment->step_increment=1;
         user_data->dlg.v_scrollbar_adjustment->page_increment=(gfloat) (last_item-first_item);
         user_data->dlg.v_scrollbar_adjustment->page_size=(gfloat) (last_item-first_item);
         user_data->dlg.v_scrollbar_adjustment->value=(gfloat) first_item;
 
-               gtk_adjustment_changed(user_data->dlg.v_scrollbar_adjustment);
+       gtk_adjustment_changed(user_data->dlg.v_scrollbar_adjustment);
         gtk_adjustment_value_changed(user_data->dlg.v_scrollbar_adjustment);
-
 }
 
 /****************************************************************************/
 static void dialog_graph_redraw(graph_analysis_data_t* user_data)
 {
         user_data->dlg.needs_redraw=TRUE;
-        dialog_graph_draw(user_data); 
+        dialog_graph_draw(user_data);
 }
 
 /****************************************************************************/
-static gint quit(GtkWidget *widget, GdkEventExpose *event _U_)
+static gint button_press_event(GtkWidget *widget, GdkEventButton *event _U_)
 {
         graph_analysis_data_t *user_data;
+               guint32 item;
 
         user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
 
-               user_data->dlg.window = NULL;
+       if (event->type != GDK_BUTTON_PRESS) return TRUE;
+
+       if (event->y<TOP_Y_BORDER) return TRUE;
+
+       /* get the item clicked */
+       item = ((guint32)event->y - TOP_Y_BORDER) / ITEM_HEIGHT;
+       user_data->dlg.selected_item = item + user_data->dlg.first_item;
+
+       user_data->dlg.needs_redraw=TRUE;
+       dialog_graph_draw(user_data);
+
+       cf_goto_frame(&cfile, user_data->dlg.items[item].frame_num);
 
-               user_data = NULL;
         return TRUE;
 }
 
+#if GTK_MAJOR_VERSION >= 2
+/* scroll events are not available in gtk-1.2 */
 /****************************************************************************/
-static gint button_press_event(GtkWidget *widget, GdkEventButton *event _U_)
+static gint scroll_event(GtkWidget *widget, GdkEventScroll *event)
 {
-        graph_analysis_data_t *user_data;
-               guint32 item;
-
-        user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
+       graph_analysis_data_t *user_data;
 
-               if (event->type != GDK_BUTTON_PRESS) return TRUE;
+       user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
 
-               if (event->y<TOP_Y_BORDER) return TRUE;
+       /* Up scroll */
+       switch(event->direction) {
+       case(GDK_SCROLL_UP):
+               if (user_data->dlg.first_item == 0) return TRUE;
+               if (user_data->dlg.first_item < 3)
+                       user_data->dlg.first_item = 0;
+               else
+                       user_data->dlg.first_item -= 3;
+               break;
+       case(GDK_SCROLL_DOWN):
+               if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)) return TRUE;
+               if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1) > (user_data->num_items-3))
+                       user_data->dlg.first_item = user_data->num_items-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size-1;
+               else
+                       user_data->dlg.first_item += 3;
+           break;
+       case(GDK_SCROLL_LEFT):
+       case(GDK_SCROLL_RIGHT):
+           /* nothing to do */
+           break;
+       }
+       dialog_graph_redraw(user_data);
 
-               /* get the item clicked */
-               item = ((guint32)event->y - TOP_Y_BORDER) / ITEM_HEIGHT;
-               user_data->dlg.selected_item = item + user_data->dlg.first_item;
+       return TRUE;
+}
+#endif
 
-               user_data->dlg.needs_redraw=TRUE;
-               dialog_graph_draw(user_data);
+/****************************************************************************/
+static gint key_press_event(GtkWidget *widget, GdkEventKey *event _U_)
+{
+       graph_analysis_data_t *user_data;
 
-               goto_frame(&cfile, user_data->dlg.items[item].frame_num);
+       user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
 
-        return TRUE;
+       /* if there is nothing selected, just return */
+       if (user_data->dlg.selected_item == 0xFFFFFFFF) return TRUE;
+
+       /* Up arrow */
+       if (event->keyval == GDK_Up){
+               if (user_data->dlg.selected_item == 0) return TRUE;
+               user_data->dlg.selected_item--;
+               if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
+                       user_data->dlg.first_item = user_data->dlg.selected_item;
+               /* Down arrow */
+       } else if (event->keyval == GDK_Down){
+               if (user_data->dlg.selected_item == user_data->num_items-1) return TRUE;
+               user_data->dlg.selected_item++;
+               if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
+                       user_data->dlg.first_item = (guint32)user_data->dlg.selected_item-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size;
+       } else if (event->keyval == GDK_Left){
+               if (user_data->dlg.first_node == 0) return TRUE;
+               user_data->dlg.first_node--;
+       } else return TRUE;
+
+       user_data->dlg.needs_redraw=TRUE;
+       dialog_graph_draw(user_data);
+
+       cf_goto_frame(&cfile, user_data->dlg.items[user_data->dlg.selected_item-user_data->dlg.first_item].frame_num);
+
+       return TRUE;
 }
 
 /****************************************************************************/
@@ -686,38 +1241,85 @@ static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
                 exit(10);
         }
 
+       if (GDK_IS_DRAWABLE(widget->window) )
+               gdk_draw_pixmap(widget->window,
+               widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+               user_data->dlg.pixmap,
+               event->area.x, event->area.y,
+               event->area.x, event->area.y,
+               event->area.width, event->area.height);
+
+        return FALSE;
+}
 
-        gdk_draw_pixmap(widget->window,
-                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
-                        user_data->dlg.pixmap,
-                        event->area.x, event->area.y,
-                        event->area.x, event->area.y,
-                        event->area.width, event->area.height);
+/****************************************************************************/
+static gint expose_event_comments(GtkWidget *widget, GdkEventExpose *event)
+{
+       graph_analysis_data_t *user_data;
+
+       user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
+        if(!user_data){
+                exit(10);
+        }
+
+       if (GDK_IS_DRAWABLE(widget->window) )
+               gdk_draw_pixmap(widget->window,
+               widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+               user_data->dlg.pixmap_comments,
+               event->area.x, event->area.y,
+               event->area.x, event->area.y,
+               event->area.width, event->area.height);
 
         return FALSE;
 }
 
-static const GdkColor COLOR_GRAY = {0, 0x7fff, 0x7fff, 0x7fff};
+/****************************************************************************/
+static gint expose_event_time(GtkWidget *widget, GdkEventExpose *event)
+{
+       graph_analysis_data_t *user_data;
+
+       user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
+        if(!user_data){
+                exit(10);
+        }
+
+       if (GDK_IS_DRAWABLE(widget->window) )
+               gdk_draw_pixmap(widget->window,
+               widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+               user_data->dlg.pixmap_time,
+               event->area.x, event->area.y,
+               event->area.x, event->area.y,
+               event->area.width, event->area.height);
+
+        return FALSE;
+}
 
 /****************************************************************************/
 static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
 {
         graph_analysis_data_t *user_data;
-               int i;
-               GdkColor color_div_line = COLOR_GRAY;
-
-               static GdkColor col[MAX_NUM_COL_CONV] = {
-                       {0,     0x00FF, 0xFFFF, 0x00FF},
-               {0,     0xFFFF, 0xFFFF, 0x00FF},
-               {0,     0xFFFF, 0x00FF, 0x00FF},
-               {0,     0xFFFF, 0x00FF, 0xFFFF},
-                       {0,     0x00FF, 0x00FF, 0xFFFF},
-                       {0,     0x00FF, 0xFFFF, 0xFFFF},
-                       {0,     0xFFFF, 0x80FF, 0x00FF},
-                       {0,     0x80FF, 0x00FF, 0xFFFF},
-                       {0,     0x00FF, 0x80FF, 0xFFFF},
-                       {0,     0xFFFF, 0x00FF, 0x80FF}
-               };
+       int i;
+
+       /* gray and soft gray colors */
+       static GdkColor color_div_line[2] = {
+               {0, 0x64ff, 0x64ff, 0x64ff},
+               {0, 0x7fff, 0x7fff, 0x7fff}
+       };
+
+       /* the first calor is blue to highlight the selected item */
+       static GdkColor col[MAX_NUM_COL_CONV+1] = {
+               {0,     0x00FF, 0x00FF, 0xFFFF},
+       {0,     0x33FF, 0xFFFF, 0x33FF},
+       {0,     0x00FF, 0xCCFF, 0xCCFF},
+               {0,     0x66FF, 0xFFFF, 0xFFFF},
+               {0,     0x99FF, 0x66FF, 0xFFFF},
+               {0,     0xFFFF, 0xFFFF, 0x33FF},
+               {0,     0xCCFF, 0x99FF, 0xFFFF},
+               {0,     0xCCFF, 0xFFFF, 0x33FF},
+               {0,     0xFFFF, 0xCCFF, 0xCCFF},
+               {0,     0xFFFF, 0x99FF, 0x66FF},
+               {0,     0xFFFF, 0xFFFF, 0x99FF}
+       };
 
         user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
 
@@ -734,88 +1336,167 @@ static gint configure_event(GtkWidget *widget, GdkEventConfigure *event _U_)
                         widget->allocation.width,
                         widget->allocation.height,
                         -1);
-        user_data->dlg.pixmap_width=widget->allocation.width;
-        user_data->dlg.pixmap_height=widget->allocation.height;
 
-        gdk_draw_rectangle(user_data->dlg.pixmap,
-                        widget->style->white_gc,
-                        TRUE,
-                        0, 0,
-                        widget->allocation.width,
-                        widget->allocation.height);
-
-               /* create gc for division lines and set the line stype to dash*/
-               user_data->dlg.div_line_gc=gdk_gc_new(user_data->dlg.pixmap);
-               gdk_gc_set_line_attributes(user_data->dlg.div_line_gc, 1, GDK_LINE_ON_OFF_DASH, 0, 0);
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap) )
+                       gdk_draw_rectangle(user_data->dlg.pixmap,
+               widget->style->white_gc,
+               TRUE,
+               0, 0,
+               widget->allocation.width,
+               widget->allocation.height);
+
+       /* create gc for division lines and set the line stype to dash*/
+       for (i=0; i<2; i++){
+               user_data->dlg.div_line_gc[i]=gdk_gc_new(user_data->dlg.pixmap);
+               gdk_gc_set_line_attributes(user_data->dlg.div_line_gc[i], 1, GDK_LINE_ON_OFF_DASH, 0, 0);
 #if GTK_MAJOR_VERSION < 2
-        colormap = gtk_widget_get_colormap (widget);
-        if (!gdk_color_alloc (colormap, &color_div_line)){
-                     g_warning ("Couldn't allocate color");
-        }
-        gdk_gc_set_foreground(user_data->dlg.div_line_gc, &color_div_line);
+               colormap = gtk_widget_get_colormap (widget);
+               if (!gdk_color_alloc (colormap, &color_div_line[i])){
+                                        g_warning ("Couldn't allocate color");
+               }
+               gdk_gc_set_foreground(user_data->dlg.div_line_gc[i], &color_div_line[i]);
 #else
-        gdk_gc_set_rgb_fg_color(user_data->dlg.div_line_gc, &color_div_line);
+       gdk_gc_set_rgb_fg_color(user_data->dlg.div_line_gc[i], &color_div_line[i]);
 #endif
-       
-               /* create gcs for the background items */
+       }
 
-               for (i=0; i<MAX_NUM_COL_CONV; i++){
-                       user_data->dlg.bg_gc[i]=gdk_gc_new(user_data->dlg.pixmap);
+       /* create gcs for the background items */
+       for (i=0; i<MAX_NUM_COL_CONV+1; i++){
+               user_data->dlg.bg_gc[i]=gdk_gc_new(user_data->dlg.pixmap);
 #if GTK_MAJOR_VERSION < 2
-                       colormap = gtk_widget_get_colormap (widget);
-                       if (!gdk_color_alloc (colormap, &col[i])){
-                                                g_warning ("Couldn't allocate color");
-                       }
-                       gdk_gc_set_foreground(user_data->dlg.bg_gc[i], &col[i]);
+               colormap = gtk_widget_get_colormap (widget);
+               if (!gdk_color_alloc (colormap, &col[i])){
+                                        g_warning ("Couldn't allocate color");
+               }
+               gdk_gc_set_foreground(user_data->dlg.bg_gc[i], &col[i]);
 #else
-               gdk_gc_set_rgb_fg_color(user_data->dlg.bg_gc[i], &col[i]);
+       gdk_gc_set_rgb_fg_color(user_data->dlg.bg_gc[i], &col[i]);
 #endif
-               }
+       }
+               
+               dialog_graph_redraw(user_data);
+
+        return TRUE;
+}
+
+/****************************************************************************/
+static gint configure_event_comments(GtkWidget *widget, GdkEventConfigure *event _U_)
+{
+        graph_analysis_data_t *user_data;
+
+        user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
+
+        if(!user_data){
+                exit(10);
+        }
+
+        if(user_data->dlg.pixmap_comments){
+                gdk_pixmap_unref(user_data->dlg.pixmap_comments);
+                user_data->dlg.pixmap_comments=NULL;
+        }
+
+        user_data->dlg.pixmap_comments=gdk_pixmap_new(widget->window,
+                                               widget->allocation.width,
+                        widget->allocation.height,
+                        -1);
+
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_comments,
+                                                  widget->style->white_gc,
+                                                  TRUE,
+                                                  0, 0,
+                                                  widget->allocation.width,
+                                                  widget->allocation.height);
 
        dialog_graph_redraw(user_data);
         return TRUE;
 }
 
 /****************************************************************************/
-static gint h_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
+static gint configure_event_time(GtkWidget *widget, GdkEventConfigure *event _U_)
 {
-    graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
+        graph_analysis_data_t *user_data;
 
-       if ((user_data->dlg.first_node+user_data->dlg.h_scrollbar_adjustment->page_size+1 == user_data->num_nodes) 
-               && (user_data->dlg.h_scrollbar_adjustment->value >= user_data->dlg.first_node ))
-               return TRUE;
+        user_data=(graph_analysis_data_t *)OBJECT_GET_DATA(widget, "graph_analysis_data_t");
 
-       if (user_data->dlg.first_node == (guint16) user_data->dlg.h_scrollbar_adjustment->value)
-               return TRUE;
+        if(!user_data){
+                exit(10);
+        }
 
-    user_data->dlg.first_node = (guint16) user_data->dlg.h_scrollbar_adjustment->value;
+        if(user_data->dlg.pixmap_time){
+                gdk_pixmap_unref(user_data->dlg.pixmap_time);
+                user_data->dlg.pixmap_time=NULL;
+        }
+
+        user_data->dlg.pixmap_time=gdk_pixmap_new(widget->window,
+                                               widget->allocation.width,
+                        widget->allocation.height,
+                        -1);
+
+       if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) )
+               gdk_draw_rectangle(user_data->dlg.pixmap_time,
+                                                  widget->style->white_gc,
+                                                  TRUE,
+                                                  0, 0,
+                                                  widget->allocation.width,
+                                                  widget->allocation.height);
 
        dialog_graph_redraw(user_data);
-    return TRUE;
+
+
+        return TRUE;
 }
+#if GTK_MAJOR_VERSION >= 2
+/****************************************************************************/
+static gint pane_callback(GtkWidget *widget, GParamSpec *pspec _U_, gpointer data)
+{
+        graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
+
+        if(!user_data){
+                exit(10);
+        }
+       if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) > user_data->dlg.pixmap_width)
+               gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), user_data->dlg.pixmap_width);
+       else if (gtk_paned_get_position(GTK_PANED(user_data->dlg.hpane)) < NODE_WIDTH*2)
+               gtk_paned_set_position(GTK_PANED(user_data->dlg.hpane), NODE_WIDTH*2);
+       /* repaint the comment area because when moving the pane position thre are times that the expose_event_comments is not called */
+       if (GDK_IS_DRAWABLE(user_data->dlg.draw_area_comments->window) )
+               gdk_draw_pixmap(user_data->dlg.draw_area_comments->window,
+               user_data->dlg.draw_area_comments->style->fg_gc[GTK_WIDGET_STATE(widget)],
+               user_data->dlg.pixmap_comments,
+                                       0,0,
+                                       0,0,
+                                       user_data->dlg.draw_area_comments->allocation.width,
+               user_data->dlg.draw_area_comments->allocation.height);
+        return TRUE;
+}
+#endif
 
 /****************************************************************************/
 static gint v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 {
-    graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
-       if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items) 
+       graph_analysis_data_t *user_data=(graph_analysis_data_t *)data;
+       if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)
                && (user_data->dlg.v_scrollbar_adjustment->value >= user_data->dlg.first_item ))
                return TRUE;
 
        if (user_data->dlg.first_item == user_data->dlg.v_scrollbar_adjustment->value)
                return TRUE;
-               
-    user_data->dlg.first_item = (guint32) user_data->dlg.v_scrollbar_adjustment->value;
+
+       user_data->dlg.first_item = (guint32) user_data->dlg.v_scrollbar_adjustment->value;
 
        dialog_graph_redraw(user_data);
-    return TRUE;
+       return TRUE;
 }
 
 /****************************************************************************/
 static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
 {
-           GtkWidget *vbox;
+       GtkWidget *vbox;
         GtkWidget *hbox;
+       GtkWidget *viewport;
+       GtkWidget *scroll_window_comments;
+       GtkWidget *viewport_comments;
 
         hbox=gtk_hbox_new(FALSE, 0);
         gtk_widget_show(hbox);
@@ -823,53 +1504,117 @@ static void create_draw_area(graph_analysis_data_t* user_data, GtkWidget *box)
         vbox=gtk_vbox_new(FALSE, 0);
         gtk_widget_show(vbox);
 
+       /* create "time" draw area */
+        user_data->dlg.draw_area_time=gtk_drawing_area_new();
+        WIDGET_SET_SIZE(user_data->dlg.draw_area_time, TIME_WIDTH, user_data->dlg.pixmap_height);
+        OBJECT_SET_DATA(user_data->dlg.draw_area_time, "graph_analysis_data_t", user_data);
+
+       /* create "comments" draw area */
+        user_data->dlg.draw_area_comments=gtk_drawing_area_new();
+        WIDGET_SET_SIZE(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.pixmap_height);
+       scroll_window_comments=gtk_scrolled_window_new(NULL, NULL);
+       WIDGET_SET_SIZE(scroll_window_comments, COMMENT_WIDTH/2, user_data->dlg.pixmap_height);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window_comments), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
+       viewport_comments = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scroll_window_comments)));
+       gtk_container_add(GTK_CONTAINER(viewport_comments), user_data->dlg.draw_area_comments);
+       gtk_container_add(GTK_CONTAINER(scroll_window_comments), viewport_comments);
+       gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport_comments), GTK_SHADOW_NONE);
+        OBJECT_SET_DATA(user_data->dlg.draw_area_comments, "graph_analysis_data_t", user_data);
+       gtk_widget_add_events (user_data->dlg.draw_area_comments, GDK_BUTTON_PRESS_MASK);
 
+#if GTK_MAJOR_VERSION >= 2
+       SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "scroll_event",  scroll_event, user_data);
+#endif
+       /* create main Graph draw area */
         user_data->dlg.draw_area=gtk_drawing_area_new();
-        SIGNAL_CONNECT(user_data->dlg.draw_area, "destroy", quit, user_data);
-        OBJECT_SET_DATA(user_data->dlg.draw_area, "graph_analysis_data_t", user_data);
-
+       if (user_data->num_nodes < 2)
+               user_data->dlg.pixmap_width = 2 * NODE_WIDTH;
+       else
+               user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
         WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+       user_data->dlg.scroll_window=gtk_scrolled_window_new(NULL, NULL);
+       if ( user_data->num_nodes < 6)
+               WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+       else
+               WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
+       viewport = gtk_viewport_new(gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window)));
+       gtk_container_add(GTK_CONTAINER(viewport), user_data->dlg.draw_area);
+       gtk_container_add(GTK_CONTAINER(user_data->dlg.scroll_window), viewport);
+       gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
+        OBJECT_SET_DATA(user_data->dlg.draw_area, "graph_analysis_data_t", user_data);
+       GTK_WIDGET_SET_FLAGS(user_data->dlg.draw_area, GTK_CAN_FOCUS);
+       gtk_widget_grab_focus(user_data->dlg.draw_area);
 
         /* signals needed to handle backing pixmap */
         SIGNAL_CONNECT(user_data->dlg.draw_area, "expose_event", expose_event, NULL);
         SIGNAL_CONNECT(user_data->dlg.draw_area, "configure_event", configure_event, user_data);
 
-               gtk_widget_add_events (user_data->dlg.draw_area,
-                        GDK_BUTTON_PRESS_MASK);
-               SIGNAL_CONNECT(user_data->dlg.draw_area, "button_press_event", button_press_event, user_data);
+        /* signals needed to handle backing pixmap comments*/
+        SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "expose_event", expose_event_comments, NULL);
+        SIGNAL_CONNECT(user_data->dlg.draw_area_comments, "configure_event", configure_event_comments, user_data);
+
+        /* signals needed to handle backing pixmap time*/
+        SIGNAL_CONNECT(user_data->dlg.draw_area_time, "expose_event", expose_event_time, NULL);
+        SIGNAL_CONNECT(user_data->dlg.draw_area_time, "configure_event", configure_event_time, user_data);
 
+       gtk_widget_add_events (user_data->dlg.draw_area, GDK_BUTTON_PRESS_MASK);
+       SIGNAL_CONNECT(user_data->dlg.draw_area, "button_press_event", button_press_event, user_data);
+#if GTK_MAJOR_VERSION >= 2
+       SIGNAL_CONNECT(user_data->dlg.draw_area, "scroll_event",  scroll_event, user_data);
+#endif
+       SIGNAL_CONNECT(user_data->dlg.draw_area, "key_press_event",  key_press_event, user_data);
+
+       gtk_widget_show(user_data->dlg.draw_area_time);
         gtk_widget_show(user_data->dlg.draw_area);
-        gtk_box_pack_start(GTK_BOX(vbox), user_data->dlg.draw_area, TRUE, TRUE, 0);
+       gtk_widget_show(viewport);
+       gtk_widget_show(user_data->dlg.draw_area_comments);
+       gtk_widget_show(viewport_comments);
 
-        /* create the associated h_scrollbar */
-        user_data->dlg.h_scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
-        user_data->dlg.h_scrollbar=gtk_hscrollbar_new(user_data->dlg.h_scrollbar_adjustment);
-        gtk_widget_show(user_data->dlg.h_scrollbar);
-        gtk_box_pack_end(GTK_BOX(vbox), user_data->dlg.h_scrollbar, FALSE, FALSE, 0);
-        SIGNAL_CONNECT(user_data->dlg.h_scrollbar_adjustment, "value_changed", h_scrollbar_changed, user_data);
+       gtk_widget_show(user_data->dlg.scroll_window);
+       gtk_widget_show(scroll_window_comments);
 
-        gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(hbox), user_data->dlg.draw_area_time, FALSE, FALSE, 0);
+
+               user_data->dlg.hpane = gtk_hpaned_new();
+               gtk_paned_pack1(GTK_PANED (user_data->dlg.hpane), user_data->dlg.scroll_window, FALSE, TRUE);
+               gtk_paned_pack2(GTK_PANED (user_data->dlg.hpane), scroll_window_comments, TRUE, TRUE);
+#if GTK_MAJOR_VERSION >= 2
+       SIGNAL_CONNECT(user_data->dlg.hpane, "notify::position",  pane_callback, user_data);
+#endif
+       gtk_widget_show(user_data->dlg.hpane);
+
+        gtk_box_pack_start(GTK_BOX(hbox), user_data->dlg.hpane, TRUE, TRUE, 0);
 
        /* create the associated v_scrollbar */
         user_data->dlg.v_scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0);
         user_data->dlg.v_scrollbar=gtk_vscrollbar_new(user_data->dlg.v_scrollbar_adjustment);
         gtk_widget_show(user_data->dlg.v_scrollbar);
         gtk_box_pack_end(GTK_BOX(hbox), user_data->dlg.v_scrollbar, FALSE, FALSE, 0);
-               SIGNAL_CONNECT(user_data->dlg.v_scrollbar_adjustment, "value_changed", v_scrollbar_changed, user_data);
+       SIGNAL_CONNECT(user_data->dlg.v_scrollbar_adjustment, "value_changed", v_scrollbar_changed, user_data);
+
 
         gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 0);
 }
+/****************************************************************************/
+/* PUBLIC */
+/****************************************************************************/
 
 
 /****************************************************************************/
 static void dialog_graph_create_window(graph_analysis_data_t* user_data)
 {
         GtkWidget *vbox;
-        GtkWidget *hbox;
+        GtkWidget *hbuttonbox;
        GtkWidget *bt_close;
+       GtkWidget *bt_save;
+       GtkTooltips *tooltips = gtk_tooltips_new();
 
         /* create the main window */
-        user_data->dlg.window=window_new(GTK_WINDOW_TOPLEVEL, "Graph Analysis");
+               if (user_data->dlg.title)
+               user_data->dlg.window=window_new(GTK_WINDOW_TOPLEVEL, user_data->dlg.title);
+               else
+               user_data->dlg.window=window_new(GTK_WINDOW_TOPLEVEL, "Graph Analysis");
 
 
         vbox=gtk_vbox_new(FALSE, 0);
@@ -878,14 +1623,28 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
 
         create_draw_area(user_data, vbox);
 
-        hbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-        gtk_widget_show(hbox);
-
-        bt_close = OBJECT_GET_DATA(hbox, GTK_STOCK_CLOSE);
+        /* button row */
+       hbuttonbox = gtk_hbutton_box_new ();
+       gtk_box_pack_start (GTK_BOX (vbox), hbuttonbox, FALSE, FALSE, 0);
+       gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
+       gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30);
+       gtk_widget_show(hbuttonbox);
+
+       bt_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS);
+       gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_save);
+       gtk_widget_show(bt_save);
+       SIGNAL_CONNECT(bt_save, "clicked", on_save_bt_clicked, user_data);
+       gtk_tooltips_set_tip (tooltips, bt_save, "Save an ASCII representation of the graph to a file", NULL);
+
+       bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE);
+       gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
+       GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+       gtk_widget_show(bt_close);
+       gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL);
         window_set_cancel_button(user_data->dlg.window, bt_close, window_cancel_button_cb);
 
         SIGNAL_CONNECT(user_data->dlg.window, "delete_event", window_delete_event_cb, NULL);
+       SIGNAL_CONNECT(user_data->dlg.window, "destroy", on_destroy, user_data);
 
         gtk_widget_show(user_data->dlg.window);
         window_present(user_data->dlg.window);
@@ -895,20 +1654,20 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
  * and Return -2 if the array is full
  */
 /****************************************************************************/
-gint is_node_array(graph_analysis_data_t* user_data, guint32 node)
+static gint is_node_array(graph_analysis_data_t* user_data, address* node)
 {
        int i;
        for (i=0; i<MAX_NUM_NODES; i++){
-               if (user_data->nodes[i] == 0)   return -1;      /* it is not in the array */
-               if (user_data->nodes[i] == node) return i;      /* it is in the array */
+               if (user_data->nodes[i].type == AT_NONE)        return -1;      /* it is not in the array */
+               if (ADDRESSES_EQUAL((&user_data->nodes[i]),node)) return i;     /* it is in the array */
        }
        return -2;              /* array full */
 }
 
 
-/* Get the nodes (IPs) from the list */
+/* Get the nodes from the list */
 /****************************************************************************/
-void get_nodes(graph_analysis_data_t* user_data)
+static void get_nodes(graph_analysis_data_t* user_data)
 {
        GList* list;
        graph_analysis_item_t *gai;
@@ -921,34 +1680,67 @@ void get_nodes(graph_analysis_data_t* user_data)
                gai = list->data;
                if (gai->display){
                        user_data->num_items++;
-                       /* check source IP node */
-                       index = is_node_array(user_data, gai->ip_src);
-                       switch(index){
-                               case -2: /* array full */
-                                       gai->src_node = NODE_OVERFLOW;
-                                       break;
-                               case -1: /* not in array */
-                                       user_data->nodes[user_data->num_nodes] = gai->ip_src;
-                                       gai->src_node = user_data->num_nodes;
-                                       user_data->num_nodes++;
-                                       break;
-                               default: /* it is in the array, just update the src_node */
-                                       gai->src_node = (guint16)index;
-                       }
+                       if (!user_data->dlg.inverse) {
+                               /* check source node address */
+                               index = is_node_array(user_data, &(gai->src_addr));
+                               switch(index){
+                                       case -2: /* array full */
+                                               gai->src_node = NODE_OVERFLOW;
+                                               break;
+                                       case -1: /* not in array */
+                                               COPY_ADDRESS(&(user_data->nodes[user_data->num_nodes]),&(gai->src_addr));
+                                               gai->src_node = user_data->num_nodes;
+                                               user_data->num_nodes++;
+                                               break;
+                                       default: /* it is in the array, just update the src_node */
+                                               gai->src_node = (guint16)index;
+                               }
+
+                               /* check destination node address*/
+                               index = is_node_array(user_data, &(gai->dst_addr));
+                               switch(index){
+                                       case -2: /* array full */
+                                               gai->dst_node = NODE_OVERFLOW;
+                                               break;
+                                       case -1: /* not in array */
+                                               COPY_ADDRESS(&(user_data->nodes[user_data->num_nodes]),&(gai->dst_addr));
+                                               gai->dst_node = user_data->num_nodes;
+                                               user_data->num_nodes++;
+                                               break;
+                                       default: /* it is in the array, just update the dst_node */
+                                               gai->dst_node = (guint16)index;
+                               }
+                       } else {
+                               /* check destination node address*/
+                               index = is_node_array(user_data, &(gai->dst_addr));
+                               switch(index){
+                                       case -2: /* array full */
+                                               gai->dst_node = NODE_OVERFLOW;
+                                               break;
+                                       case -1: /* not in array */
+                                               COPY_ADDRESS(&(user_data->nodes[user_data->num_nodes]),&(gai->dst_addr));
+                                               gai->dst_node = user_data->num_nodes;
+                                               user_data->num_nodes++;
+                                               break;
+                                       default: /* it is in the array, just update the dst_node */
+                                               gai->dst_node = (guint16)index;
+                               }
+
+                               /* check source node address */
+                               index = is_node_array(user_data, &(gai->src_addr));
+                               switch(index){
+                                       case -2: /* array full */
+                                               gai->src_node = NODE_OVERFLOW;
+                                               break;
+                                       case -1: /* not in array */
+                                               COPY_ADDRESS(&(user_data->nodes[user_data->num_nodes]),&(gai->src_addr));
+                                               gai->src_node = user_data->num_nodes;
+                                               user_data->num_nodes++;
+                                               break;
+                                       default: /* it is in the array, just update the src_node */
+                                               gai->src_node = (guint16)index;
+                               }
 
-                       /* check destination  IP node */
-                       index = is_node_array(user_data, gai->ip_dst);
-                       switch(index){
-                               case -2: /* array full */
-                                       gai->dst_node = NODE_OVERFLOW;
-                                       break;
-                               case -1: /* not in array */
-                                       user_data->nodes[user_data->num_nodes] = gai->ip_dst;
-                                       gai->dst_node = user_data->num_nodes;
-                                       user_data->num_nodes++;
-                                       break;
-                               default: /* it is in the array, just update the dst_node */
-                                       gai->dst_node = (guint16)index;
                        }
                }
 
@@ -957,7 +1749,6 @@ void get_nodes(graph_analysis_data_t* user_data)
 }
 
 /****************************************************************************/
-/* XXX only handles IPv4, should add IPv6 support */
 graph_analysis_data_t* graph_analysis_init(void)
 {
        graph_analysis_data_t* user_data;
@@ -969,6 +1760,9 @@ graph_analysis_data_t* graph_analysis_init(void)
 
        return user_data;
 }
+/****************************************************************************/
+/* PUBLIC */
+/****************************************************************************/
 
 /****************************************************************************/
 void graph_analysis_create(graph_analysis_data_t* user_data)
@@ -976,14 +1770,14 @@ void graph_analysis_create(graph_analysis_data_t* user_data)
        /* reset the data */
        graph_analysis_reset(user_data);
 
-       /* get nodes (each node is an IP address) */
+       /* get nodes (each node is an address) */
        get_nodes(user_data);
 
        /* create the graph windows */
        dialog_graph_create_window(user_data);
 
        /* redraw the graph */
-       dialog_graph_redraw(user_data); 
+       dialog_graph_redraw(user_data);
 
        return;
 }
@@ -994,9 +1788,38 @@ void graph_analysis_update(graph_analysis_data_t* user_data)
        /* reset the data */
        graph_analysis_reset(user_data);
 
-       /* get nodes (each node is an IP address) */
+       /* get nodes (each node is an address) */
+       get_nodes(user_data);
+
+       user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
+       WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+       if ( user_data->num_nodes < 6)
+               WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+       else
+               WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+
+       /* redraw the graph */
+       dialog_graph_redraw(user_data);
+
+       window_present(user_data->dlg.window);
+       return;
+}
+
+
+/****************************************************************************/
+void graph_analysis_redraw(graph_analysis_data_t* user_data)
+{
+       /* get nodes (each node is an address) */
        get_nodes(user_data);
 
+       user_data->dlg.pixmap_width = user_data->num_nodes * NODE_WIDTH;
+    WIDGET_SET_SIZE(user_data->dlg.draw_area, user_data->dlg.pixmap_width, user_data->dlg.pixmap_height);
+       if ( user_data->num_nodes < 6)  
+                       WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*user_data->num_nodes, user_data->dlg.pixmap_height);
+               else
+                       WIDGET_SET_SIZE(user_data->dlg.scroll_window, NODE_WIDTH*5, user_data->dlg.pixmap_height);
+
+
        /* redraw the graph */
        dialog_graph_redraw(user_data);