authors in about
[lttv.git] / ltt / branches / poly / lttv / modules / gui / lttvwindow / lttvwindow / callbacks.c
index edf0f52235952ee437e8cc575d3e78146b608f6c..c101c9c6c792d2624db211943c42fca489ab98c6 100644 (file)
@@ -1,5 +1,5 @@
 /* This file is part of the Linux Trace Toolkit viewer
- * Copyright (C) 2003-2004 XangXiu Yang
+ * Copyright (C) 2003-2004 XangXiu Yang, Mathieu Desnoyers
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -60,6 +60,7 @@ static char remember_trace_dir[PATH_MAX] = "";
 
 
 MainWindow * get_window_data_struct(GtkWidget * widget);
+char * get_load_module(char ** load_module_name, int nb_module);
 char * get_unload_module(char ** loaded_module_name, int nb_module);
 char * get_remove_trace(char ** all_trace_name, int nb_trace);
 char * get_selection(char ** all_name, int nb, char *title, char * column_title);
@@ -74,8 +75,8 @@ void checkbox_changed(GtkTreeView *treeview,
                      GtkTreePath *arg1,
                      GtkTreeViewColumn *arg2,
                      gpointer user_data);
-void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i);
-void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * trace);
+void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i);
+void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * trace);
 Tab *create_new_tab(GtkWidget* widget, gpointer user_data);
 
 LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset);
@@ -149,6 +150,16 @@ LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset)
 }
 
 
+static gboolean viewer_grab_focus(GtkWidget *widget, GdkEventButton *event,
+                                  gpointer data)
+{
+  GtkWidget *viewer_container = GTK_WIDGET(data);
+
+  g_debug("FOCUS GRABBED");
+  g_object_set_data(G_OBJECT(viewer_container), "focused_viewer", widget);
+}
+
+
 /* insert_viewer function constructs an instance of a viewer first,
  * then inserts the widget of the instance into the container of the
  * main window
@@ -167,7 +178,7 @@ insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data)
 /* internal functions */
 void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor)
 {
-  GtkMultiVPaned * multi_vpaned;
+  GtkWidget * viewer_container;
   MainWindow * mw_data = get_window_data_struct(widget);
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
   GtkWidget * viewer;
@@ -183,15 +194,27 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor)
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
 
-  multi_vpaned = tab->multi_vpaned;
+  viewer_container = tab->viewer_container;
 
   s = construct_traceset_selector(tab->traceset_info->traceset);
   viewer = (GtkWidget*)constructor(tab, s, "Traceset_Selector");
   if(viewer)
   {
-    gtk_multi_vpaned_widget_add(multi_vpaned, viewer); 
-    // We unref here, because it is now referenced by the multi_vpaned!
-    g_object_unref(G_OBJECT(viewer));
+    //gtk_multivpaned_widget_add(GTK_MULTIVPANED(multivpaned), viewer); 
+    
+    gtk_box_pack_end(GTK_BOX(viewer_container),
+                     viewer,
+                     TRUE,
+                     TRUE,
+                     0);
+
+    g_signal_connect (G_OBJECT(viewer),
+                      "button-press-event",
+                      G_CALLBACK (viewer_grab_focus),
+                      (gpointer)viewer_container);
+    
+    // We unref here, because it is now referenced by the viewer_container!
+    // not for a box ... g_object_unref(G_OBJECT(viewer));
 
     // The viewer will show itself when it receives a show notify
     // So we call the show notify hooks here. It will
@@ -204,6 +227,132 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor)
   }
 }
 
+/**
+ * Function to set/update traceset for the viewers
+ * @param tab viewer's tab 
+ * @param traceset traceset of the main window.
+ * return value :
+ *  0 : traceset updated
+ *  1 : no traceset hooks to update; not an error.
+ */
+
+int SetTraceset(Tab * tab, LttvTraceset *traceset)
+{
+  LttvTracesetContext *tsc =
+        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+
+  /* Set the tab's time window and current time if
+   * out of bounds */
+  if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0
+     || ltt_time_compare(  ltt_time_add(tab->time_window.start_time,
+                                        tab->time_window.time_width),
+                           time_span.end_time) > 0) {
+    tab->time_window.start_time = time_span.start_time;
+    tab->current_time = time_span.start_time;
+    
+    LttTime tmp_time;
+
+    if(DEFAULT_TIME_WIDTH_S < time_span.end_time.tv_sec)
+      tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
+    else
+      tmp_time.tv_sec = time_span.end_time.tv_sec;
+    tmp_time.tv_nsec = 0;
+    tab->time_window.time_width = tmp_time ;
+  }
+  
+  /* Set scrollbar */
+  GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
+  LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time);
+      
+  g_object_set(G_OBJECT(adjustment),
+               "lower",
+                 0.0, /* lower */
+               "upper",
+               ltt_time_to_double(upper) 
+                 * NANOSECONDS_PER_SECOND, /* upper */
+               "step_increment",
+               ltt_time_to_double(tab->time_window.time_width)
+                             / SCROLL_STEP_PER_PAGE
+                             * NANOSECONDS_PER_SECOND, /* step increment */
+               "page_increment",
+               ltt_time_to_double(tab->time_window.time_width) 
+                 * NANOSECONDS_PER_SECOND, /* page increment */
+               "page_size",
+               ltt_time_to_double(tab->time_window.time_width) 
+                 * NANOSECONDS_PER_SECOND, /* page size */
+               NULL);
+  gtk_adjustment_changed(adjustment);
+
+  g_object_set(G_OBJECT(adjustment),
+               "value",
+               ltt_time_to_double(
+                ltt_time_sub(tab->time_window.start_time, time_span.start_time))
+                   * NANOSECONDS_PER_SECOND, /* value */
+               NULL);
+  gtk_adjustment_value_changed(adjustment);
+
+  /* Finally, call the update hooks of the viewers */
+  LttvHooks * tmp;
+  LttvAttributeValue value;
+  gint retval = 0;
+
+  g_assert( lttv_iattribute_find_by_path(tab->attributes,
+     "hooks/updatetraceset", LTTV_POINTER, &value));
+
+  tmp = (LttvHooks*)*(value.v_pointer);
+  if(tmp == NULL) retval = 1;
+  else lttv_hooks_call(tmp,traceset);
+
+  return retval;
+}
+
+/**
+ * Function to set/update filter for the viewers
+ * @param tab viewer's tab 
+ * @param filter filter of the main window.
+ * return value :
+ * -1 : error
+ *  0 : filters updated
+ *  1 : no filter hooks to update; not an error.
+ */
+
+int SetFilter(Tab * tab, gpointer filter)
+{
+  LttvHooks * tmp;
+  LttvAttributeValue value;
+
+  g_assert(lttv_iattribute_find_by_path(tab->attributes,
+     "hooks/updatefilter", LTTV_POINTER, &value));
+
+  tmp = (LttvHooks*)*(value.v_pointer);
+
+  if(tmp == NULL) return 1;
+  lttv_hooks_call(tmp,filter);
+
+  return 0;
+}
+
+
+
+/**
+ * Function to redraw each viewer belonging to the current tab 
+ * @param tab viewer's tab 
+ */
+
+void update_traceset(Tab *tab)
+{
+  LttvAttributeValue value;
+  LttvHooks * tmp;
+  g_assert(lttv_iattribute_find_by_path(tab->attributes,
+           "hooks/updatetraceset", LTTV_POINTER, &value));
+  tmp = (LttvHooks*)*(value.v_pointer);
+  if(tmp == NULL) return;
+  lttv_hooks_call(tmp, NULL);
+}
+
 
 /* get_label function is used to get user input, it displays an input
  * box, which allows user to input a string 
@@ -294,12 +443,42 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
   }
 }
 
+GtkWidget *viewer_container_focus(GtkWidget *container)
+{
+  GtkWidget *widget;
+
+  widget = (GtkWidget*)g_object_get_data(G_OBJECT(container),
+                    "focused_viewer");
+
+  if(widget == NULL) g_debug("no widget focused");
+  return widget;
+
+
+}
+
+gint viewer_container_position(GtkWidget *container, GtkWidget *child)
+{
+
+  if(child == NULL) return -1;
+
+  gint pos;
+  GValue value = { 0, };
+  g_value_init(&value, G_TYPE_INT);
+  gtk_container_child_get_property(GTK_CONTAINER(container),
+                                   child,
+                                   "position",
+                                   &value);
+  pos = g_value_get_int(&value);
+
+  return pos;
+}
+
 
 /* move_*_viewer functions move the selected view up/down in 
  * the current tab
  */
 
-void move_up_viewer(GtkWidget * widget, gpointer user_data)
+void move_down_viewer(GtkWidget * widget, gpointer user_data)
 {
   MainWindow * mw = get_window_data_struct(widget);
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
@@ -308,17 +487,30 @@ void move_up_viewer(GtkWidget * widget, gpointer user_data)
                       gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
 
   Tab *tab;
-
   if(!page) {
     return;
   } else {
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
 
-  gtk_multi_vpaned_widget_move_up(tab->multi_vpaned);
+  //gtk_multivpaned_widget_move_up(GTK_MULTIVPANED(tab->multivpaned));
+
+  /* change the position in the vbox */
+  GtkWidget *focus_widget;
+  gint position;
+  focus_widget = viewer_container_focus(tab->viewer_container);
+  position = viewer_container_position(tab->viewer_container, focus_widget);
+
+  if(position > 0) {
+    /* can move up one position */
+    gtk_box_reorder_child(GTK_BOX(tab->viewer_container),
+                          focus_widget,
+                          position-1);
+  }
+  
 }
 
-void move_down_viewer(GtkWidget * widget, gpointer user_data)
+void move_up_viewer(GtkWidget * widget, gpointer user_data)
 {
   MainWindow * mw = get_window_data_struct(widget);
   GtkWidget * notebook = lookup_widget(widget, "MNotebook");
@@ -333,7 +525,24 @@ void move_down_viewer(GtkWidget * widget, gpointer user_data)
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
 
-  gtk_multi_vpaned_widget_move_down(tab->multi_vpaned);
+  //gtk_multivpaned_widget_move_down(GTK_MULTIVPANED(tab->multivpaned));
+  /* change the position in the vbox */
+  GtkWidget *focus_widget;
+  gint position;
+  focus_widget = viewer_container_focus(tab->viewer_container);
+  position = viewer_container_position(tab->viewer_container, focus_widget);
+
+  if(position != -1 &&
+  position <
+       g_list_length(gtk_container_get_children(
+                        GTK_CONTAINER(tab->viewer_container)))-1
+      ) {
+    /* can move down one position */
+    gtk_box_reorder_child(GTK_BOX(tab->viewer_container),
+                          focus_widget,
+                          position+1);
+  }
 }
 
 
@@ -355,7 +564,14 @@ void delete_viewer(GtkWidget * widget, gpointer user_data)
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
 
-  gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
+  //gtk_multivpaned_widget_delete(GTK_MULTIVPANED(tab->multivpaned));
+
+  GtkWidget *focus_widget = viewer_container_focus(tab->viewer_container);
+  
+  if(focus_widget != NULL)
+    gtk_widget_destroy(focus_widget);
+
+  g_object_set_data(G_OBJECT(tab->viewer_container), "focused_viewer", NULL);
 }
 
 
@@ -393,6 +609,39 @@ void open_traceset(GtkWidget * widget, gpointer user_data)
 
 }
 
+static void events_request_free(EventsRequest *events_request)
+{
+  if(events_request == NULL) return;
+
+  if(events_request->start_position != NULL)
+       lttv_traceset_context_position_destroy(events_request->start_position);
+  if(events_request->end_position != NULL)
+       lttv_traceset_context_position_destroy(events_request->end_position);
+  if(events_request->before_chunk_traceset != NULL)
+       lttv_hooks_destroy(events_request->before_chunk_traceset);
+  if(events_request->before_chunk_trace != NULL)
+       lttv_hooks_destroy(events_request->before_chunk_trace);
+  if(events_request->before_chunk_tracefile != NULL)
+       lttv_hooks_destroy(events_request->before_chunk_tracefile);
+  if(events_request->event != NULL)
+       lttv_hooks_destroy(events_request->event);
+  if(events_request->event_by_id != NULL)
+       lttv_hooks_by_id_destroy(events_request->event_by_id);
+  if(events_request->after_chunk_tracefile != NULL)
+       lttv_hooks_destroy(events_request->after_chunk_tracefile);
+  if(events_request->after_chunk_trace != NULL)
+       lttv_hooks_destroy(events_request->after_chunk_trace);
+  if(events_request->after_chunk_traceset != NULL)
+       lttv_hooks_destroy(events_request->after_chunk_traceset);
+  if(events_request->before_request != NULL)
+       lttv_hooks_destroy(events_request->before_request);
+  if(events_request->after_request != NULL)
+       lttv_hooks_destroy(events_request->after_request);
+
+  g_free(events_request);
+}
+
+
 
 /* lttvwindow_process_pending_requests
  * 
@@ -433,8 +682,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
   guint count;
   LttvTracesetContextPosition *end_position;
   
-  if(tab == NULL)
+  if(tab == NULL) {
+    g_critical("Foreground processing : tab does not exist. Processing removed.");
     return FALSE;
+  }
 
   /* There is no events requests pending : we should never have been called! */
   g_assert(g_slist_length(list_out) != 0);
@@ -442,6 +693,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
   tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
 
   //set the cursor to be X shape, indicating that the computer is busy in doing its job
+#if 0
   new = gdk_cursor_new(GDK_X_CURSOR);
   widget = lookup_widget(tab->mw->mwindow, "MToolbar1");
   win = gtk_widget_get_parent_window(widget);  
@@ -449,6 +701,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
   gdk_cursor_unref(new);  
   gdk_window_stick(win);
   gdk_window_unstick(win);
+#endif //0
 
   g_debug("SIZE events req len  : %d", g_slist_length(list_out));
   
@@ -480,7 +733,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
         GSList *remove_iter = iter;
 
         iter = g_slist_next(iter);
-        if(free_data) g_free(remove_iter->data);
+        if(free_data) events_request_free((EventsRequest*)remove_iter->data);
         list_out = g_slist_remove_link(list_out, remove_iter);
       } else { // not remove
         iter = g_slist_next(iter);
@@ -488,11 +741,34 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
     }
   }
   
+  /* 0.1 Lock Traces */
+  {
+    guint iter_trace=0;
+    
+    for(iter_trace=0; 
+        iter_trace<lttv_traceset_number(tsc->ts);
+        iter_trace++) {
+      LttvTrace *trace_v = lttv_traceset_get(tsc->ts, iter_trace);
+
+      if(lttvwindowtraces_lock(trace_v) != 0) {
+        g_critical("Foreground processing : Unable to get trace lock");
+        return TRUE; /* Cannot get lock, try later */
+      }
+    }
+  }
+
+  /* 0.2 Seek tracefiles positions to context position */
+  lttv_process_traceset_synchronize_tracefiles(tsc);
+
+  
   /* Events processing algorithm implementation */
+  /* Warning : the gtk_events_pending takes a LOT of cpu time. So what we do
+   * instead is to leave the control to GTK and take it back.
+   */
   /* A. Servicing loop */
-  while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
-     /*    && !gtk_events_pending() )  */
-
+  //while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
+  if((g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) {
+    /* Servicing */
     /* 1. If list_in is empty (need a seek) */
     if( g_slist_length(list_in) ==  0 ) {
 
@@ -534,7 +810,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
           lpos = g_slist_append(lpos, g_slist_nth_data(list_out, 0));
         for(iter=g_slist_nth(list_out,1);iter!=NULL;iter=g_slist_next(iter)) {
           /* Find all position requests with the lowest position in list_out */
-          guint index_lpos = g_array_index(lpos, guint, 0);
           EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0);
           EventsRequest *event_request_list_out = (EventsRequest*)iter->data;
 
@@ -558,7 +833,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
           }
         }
         
-        /* 1.1.3 If lpos.start time < ltime */
         {
           EventsRequest *event_request_lpos = (EventsRequest*)g_slist_nth_data(lpos, 0);
           EventsRequest *event_request_ltime = (EventsRequest*)g_slist_nth_data(ltime, 0);
@@ -566,22 +840,24 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
           
           if(event_request_lpos != NULL 
               && event_request_lpos->start_position != NULL) {
-
             lpos_start_time = lttv_traceset_context_position_get_time(
                                       event_request_lpos->start_position);
-            if(ltt_time_compare(lpos_start_time,
-                                event_request_ltime->start_time)<0) {
-              /* Add lpos to list_in, remove them from list_out */
-              
-              for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) {
-                /* Add to list_in */
-                EventsRequest *event_request_lpos = 
-                                      (EventsRequest*)iter->data;
-
-                list_in = g_slist_append(list_in, event_request_lpos);
-                /* Remove from list_out */
-                list_out = g_slist_remove(list_out, event_request_lpos);
-              }
+          }
+          
+          /* 1.1.3 If lpos.start time < ltime */
+          if(event_request_lpos != NULL
+              && event_request_lpos->start_position != NULL
+              && ltt_time_compare(lpos_start_time,
+                              event_request_ltime->start_time)<0) {
+            /* Add lpos to list_in, remove them from list_out */
+            for(iter=lpos;iter!=NULL;iter=g_slist_next(iter)) {
+              /* Add to list_in */
+              EventsRequest *event_request_lpos = 
+                                    (EventsRequest*)iter->data;
+
+              list_in = g_slist_append(list_in, event_request_lpos);
+              /* Remove from list_out */
+              list_out = g_slist_remove(list_out, event_request_lpos);
             }
           } else {
             /* 1.1.4 (lpos.start time >= ltime) */
@@ -633,12 +909,23 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
           /* Else, the first request in list_in is a position request */
           /* If first req in list_in pos != current pos */
           g_assert(events_request->start_position != NULL);
+          g_debug("SEEK POS time : %lu, %lu", 
+                 lttv_traceset_context_position_get_time(
+                      events_request->start_position).tv_sec,
+                 lttv_traceset_context_position_get_time(
+                      events_request->start_position).tv_nsec);
+
+          g_debug("SEEK POS context time : %lu, %lu", 
+               lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_sec,
+               lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_nsec);
+          g_assert(events_request->start_position != NULL);
           if(lttv_traceset_context_ctx_pos_compare(tsc,
                      events_request->start_position) != 0) {
             /* 1.2.2.1 Seek to that position */
             g_debug("SEEK POSITION");
             //lttv_process_traceset_seek_position(tsc, events_request->start_position);
-            pos_time = lttv_traceset_context_position_get_time(events_request->start_position);
+            pos_time = lttv_traceset_context_position_get_time(
+                                     events_request->start_position);
             
             lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc),
                                                   pos_time);
@@ -649,6 +936,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                             ltt_time_infinite,
                                             G_MAXUINT,
                                             events_request->start_position);
+            g_assert(lttv_traceset_context_ctx_pos_compare(tsc,
+                         events_request->start_position) == 0);
 
 
           }
@@ -681,7 +970,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       }
     } else {
       /* 2. Else, list_in is not empty, we continue a read */
-
+      
       {
         /* 2.0 For each req of list_in */
         GSList *iter = list_in;
@@ -704,13 +993,17 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       }
 
       {
-        GSList *iter = NULL;
         tfc = lttv_traceset_context_get_current_tfc(tsc);
       
         /* 2.1 For each req of list_out */
-        for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) {
-          EventsRequest *events_request = (EventsRequest*)iter->data;
+        GSList *iter = list_out;
+    
+        while(iter != NULL) {
 
+          gboolean remove = FALSE;
+          gboolean free_data = FALSE;
+          EventsRequest *events_request = (EventsRequest *)iter->data;
+          
           /* if req.start time == current context time 
            * or req.start position == current position*/
           if(  ltt_time_compare(events_request->start_time,
@@ -723,7 +1016,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
              ) {
             /* - Add to list_in, remove from list_out */
             list_in = g_slist_append(list_in, events_request);
-            list_out = g_slist_remove(list_out, events_request);
+            remove = TRUE;
+            free_data = FALSE;
 
             /* - If !servicing */
             if(events_request->servicing == FALSE) {
@@ -742,6 +1036,18 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                                              events_request->event,
                                              events_request->event_by_id);
           }
+
+          /* Go to next */
+          if(remove)
+          {
+            GSList *remove_iter = iter;
+
+            iter = g_slist_next(iter);
+            if(free_data) events_request_free((EventsRequest*)remove_iter->data);
+            list_out = g_slist_remove_link(list_out, remove_iter);
+          } else { // not remove
+            iter = g_slist_next(iter);
+          }
         }
       }
     }
@@ -828,12 +1134,15 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
     {
       /* 4. Call process traceset middle */
-      g_critical("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
+      g_debug("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position);
       count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position);
 
       tfc = lttv_traceset_context_get_current_tfc(tsc);
-      g_critical("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
+      if(tfc != NULL)
+        g_debug("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec,
                                                         tfc->timestamp.tv_nsec);
+      else
+        g_debug("End of trace reached after middle.");
 
     }
     {
@@ -874,7 +1183,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
             GSList *remove_iter = iter;
 
             iter = g_slist_next(iter);
-            if(free_data) g_free(remove_iter->data);
+            if(free_data) events_request_free((EventsRequest*)remove_iter->data);
             list_in = g_slist_remove_link(list_in, remove_iter);
           } else { // not remove
             iter = g_slist_next(iter);
@@ -920,10 +1229,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
                 ltt_time_compare(tfc->timestamp,
                                          events_request->end_time) >= 0
               ||
-                  (events_request->start_position != NULL 
+                  (events_request->end_position != NULL 
                  &&
                   lttv_traceset_context_ctx_pos_compare(tsc,
-                            events_request->start_position) != 0)
+                            events_request->end_position) == 0)
 
               ) {
             g_assert(events_request->servicing == TRUE);
@@ -942,7 +1251,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
             GSList *remove_iter = iter;
 
             iter = g_slist_next(iter);
-            if(free_data) g_free(remove_iter->data);
+            if(free_data) events_request_free((EventsRequest*)remove_iter->data);
             list_in = g_slist_remove_link(list_in, remove_iter);
           } else { // not remove
             iter = g_slist_next(iter);
@@ -950,9 +1259,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
         }
       }
     }
-
-    if(gtk_events_pending()) break;
   }
+  /* End of removed servicing loop : leave control to GTK instead. */
+  //  if(gtk_events_pending()) break;
+  //}
 
   /* B. When interrupted between chunks */
 
@@ -969,7 +1279,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
       /* 1.1. Use current postition as start position */
       if(events_request->start_position != NULL)
         lttv_traceset_context_position_destroy(events_request->start_position);
-      events_request->start_position = ltt_traceset_context_position_new();
+      events_request->start_position = lttv_traceset_context_position_new();
       lttv_traceset_context_position_save(tsc, events_request->start_position);
 
       /* 1.2. Remove start time */
@@ -987,7 +1297,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
         GSList *remove_iter = iter;
 
         iter = g_slist_next(iter);
-        if(free_data) g_free(remove_iter->data);
+        if(free_data) events_request_free((EventsRequest*)remove_iter->data);
         list_in = g_slist_remove_link(list_in, remove_iter);
       } else { // not remove
         iter = g_slist_next(iter);
@@ -996,21 +1306,48 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
 
 
   }
+  
+  /* C Unlock Traces */
+  {
+    //lttv_process_traceset_get_sync_data(tsc);
+    
+    guint iter_trace;
+    
+    for(iter_trace=0; 
+        iter_trace<lttv_traceset_number(tsc->ts);
+        iter_trace++) {
+      LttvTrace *trace_v = lttv_traceset_get(tsc->ts, iter_trace);
 
+      lttvwindowtraces_unlock(trace_v);
+    }
+  }
+
+#if 0
   //set the cursor back to normal
   gdk_window_set_cursor(win, NULL);  
-
+#endif //0
 
   g_assert(g_slist_length(list_in) == 0);
 
   if( g_slist_length(list_out) == 0 ) {
     /* Put tab's request pending flag back to normal */
     tab->events_request_pending = FALSE;
-    g_critical("remove the idle fct");
+    g_debug("remove the idle fct");
     return FALSE; /* Remove the idle function */
   }
-  g_critical("leave the idle fct");
+  g_debug("leave the idle fct");
   return TRUE; /* Leave the idle function */
+
+  /* We do not use simili-round-robin, it may require to read 1 meg buffers
+   * again and again if many tracesets use the same tracefiles. */
+  /* Hack for round-robin idle functions */
+  /* It will put the idle function at the end of the pool */
+  /*g_idle_add_full((G_PRIORITY_HIGH_IDLE + 21),
+                  (GSourceFunc)execute_events_requests,
+                  tab,
+                  NULL);
+  return FALSE;
+  */
 }
 
 #undef list_out
@@ -1020,8 +1357,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab)
  * selector (filter), when a trace is added into traceset, the selector should 
  * reflect the change. The function is used to update the selector 
  */
-
-void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
+#if 0
+void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * t)
 {
   int j, k, m, nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event;
   LttvTracesetSelector  * s;
@@ -1033,7 +1370,7 @@ void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
   LttFacility           * fac;
   LttEventType          * et;
 
-  w = gtk_multi_vpaned_get_first_widget(paned);  
+  w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(paned));
   while(w){
     s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
     
@@ -1067,18 +1404,19 @@ void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
       }
     }else g_warning("Module does not support filtering\n");
 
-    w = gtk_multi_vpaned_get_next_widget(paned);  
+    w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(paned));
   }
 }
-
+#endif //0
 
 static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
 {
   LttvTraceset *traceset = tab->traceset_info->traceset;
   guint i;
+  guint num_traces = lttv_traceset_number(traceset);
 
  //Verify if trace is already present.
-  for(i=0; i<lttv_traceset_number(traceset); i++)
+  for(i=0; i<num_traces; i++)
   {
     LttvTrace * trace = lttv_traceset_get(traceset, i);
     if(trace == trace_v)
@@ -1111,36 +1449,6 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
                                       traceset_context),
             traceset); 
 
-  /* Set the tab's time window and current time if currently 0, 0 */
-  if(tab->time_window.start_time.tv_sec == 0 &&
-                      tab->time_window.start_time.tv_nsec == 0)
-    tab->time_window.start_time = 
-        LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                               time_span.start_time;
-  if(tab->time_window.time_width.tv_sec == 0 &&
-                      tab->time_window.time_width.tv_nsec == 0) {
-    LttTime tmp_time;
-
-    if(DEFAULT_TIME_WIDTH_S <
-            LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                           time_span.end_time.tv_sec)
-      tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
-    else
-      tmp_time.tv_sec =
-              LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                           time_span.end_time.tv_sec;
-    tmp_time.tv_nsec = 0;
-    tab->time_window.time_width = tmp_time ;
-  }
-  if(tab->current_time.tv_sec == 0 &&  tab->current_time.tv_nsec == 0) {
-    tab->current_time.tv_sec = 
-       LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                             time_span.start_time.tv_sec;
-    tab->current_time.tv_nsec = 
-       LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
-                             time_span.start_time.tv_nsec;
-  }
-
 
   //add state update hooks
   lttv_state_add_event_hooks(
@@ -1152,7 +1460,8 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
     lttv_trace_unref(trace);
   }
 
-  add_trace_into_traceset_selector(tab->multi_vpaned, lttv_trace(trace_v));
+  //FIXME
+  //add_trace_into_traceset_selector(GTK_MULTIVPANED(tab->multivpaned), lttv_trace(trace_v));
 }
 
 /* add_trace adds a trace into the current traceset. It first displays a 
@@ -1239,14 +1548,14 @@ void add_trace(GtkWidget * widget, gpointer user_data)
  * selector (filter), when a trace is remove from traceset, the selector should 
  * reflect the change. The function is used to update the selector 
  */
-
-void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i)
+#if 0
+void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i)
 {
   LttvTracesetSelector * s;
   LttvTraceSelector * t;
   GtkWidget * w; 
   
-  w = gtk_multi_vpaned_get_first_widget(paned);  
+  w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(paned));
   while(w){
     s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
     if(s){
@@ -1254,10 +1563,10 @@ void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i)
       lttv_traceset_selector_trace_remove(s, i);
       lttv_trace_selector_destroy(t);
     }g_warning("Module dose not support filtering\n");
-    w = gtk_multi_vpaned_get_next_widget(paned);  
+    w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(paned));
   }
 }
-
+#endif //0
 
 /* remove_trace removes a trace from the current traceset if all viewers in 
  * the current tab are not interested in the trace. It first displays a 
@@ -1268,6 +1577,98 @@ void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i)
  * current traceset, it will delete all viewers of the current tab
  */
 
+// MD : no filter version.
+void remove_trace(GtkWidget *widget, gpointer user_data)
+{
+  LttTrace *trace;
+  LttvTrace * trace_v;
+  LttvTraceset * traceset;
+  gint i, j, nb_trace, index=-1;
+  char ** name, *remove_trace_name;
+  MainWindow * mw_data = get_window_data_struct(widget);
+  GtkWidget * notebook = lookup_widget(widget, "MNotebook");
+
+  GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+                      gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+  Tab *tab;
+
+  if(!page) {
+    return;
+  } else {
+    tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+  }
+
+  nb_trace =lttv_traceset_number(tab->traceset_info->traceset); 
+  name = g_new(char*,nb_trace);
+  for(i = 0; i < nb_trace; i++){
+    trace_v = lttv_traceset_get(tab->traceset_info->traceset, i);
+    trace = lttv_trace(trace_v);
+    name[i] = ltt_trace_name(trace);
+  }
+
+  remove_trace_name = get_remove_trace(name, nb_trace);
+
+
+  if(remove_trace_name){
+
+    /* yuk, cut n paste from old code.. should be better (MD)*/
+    for(i = 0; i<nb_trace; i++) {
+      if(strcmp(remove_trace_name,name[i]) == 0){
+        index = i;
+      }
+    }
+    
+    traceset = tab->traceset_info->traceset;
+    //Keep a reference to the traces so they are not freed.
+    for(j=0; j<lttv_traceset_number(traceset); j++)
+    {
+      LttvTrace * trace = lttv_traceset_get(traceset, j);
+      lttv_trace_ref(trace);
+    }
+
+    //remove state update hooks
+    lttv_state_remove_event_hooks(
+         (LttvTracesetState*)tab->traceset_info->traceset_context);
+    lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context));
+    g_object_unref(tab->traceset_info->traceset_context);
+
+    trace_v = lttv_traceset_get(traceset, index);
+
+    lttv_traceset_remove(traceset, index);
+    lttv_trace_unref(trace_v);  // Remove local reference
+
+    if(lttv_trace_get_ref_number(trace_v) <= 1) {
+      /* ref 1 : lttvwindowtraces only*/
+      ltt_trace_close(lttv_trace(trace_v));
+      /* lttvwindowtraces_remove_trace takes care of destroying
+       * the traceset linked with the trace_v and also of destroying
+       * the trace_v at the same time.
+       */
+      lttvwindowtraces_remove_trace(trace_v);
+    }
+    
+    tab->traceset_info->traceset_context =
+      g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+    lttv_context_init(
+          LTTV_TRACESET_CONTEXT(tab->
+              traceset_info->traceset_context),traceset);      
+      //add state update hooks
+    lttv_state_add_event_hooks(
+      (LttvTracesetState*)tab->traceset_info->traceset_context);
+
+    //Remove local reference to the traces.
+    for(j=0; j<lttv_traceset_number(traceset); j++)
+    {
+      LttvTrace * trace = lttv_traceset_get(traceset, j);
+      lttv_trace_unref(trace);
+    }
+
+    SetTraceset(tab, (gpointer)traceset);
+  }
+  g_free(name);
+}
+
+#if 0
 void remove_trace(GtkWidget * widget, gpointer user_data)
 {
   LttTrace *trace;
@@ -1306,7 +1707,8 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
     for(i=0; i<nb_trace; i++){
       if(strcmp(remove_trace_name,name[i]) == 0){
              //unselect the trace from the current viewer
-       w = gtk_multi_vpaned_get_widget(tab->multi_vpaned);  
+        //FIXME
+       w = gtk_multivpaned_get_widget(GTK_MULTIVPANED(tab->multivpaned));
        if(w){
          s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
          if(s){
@@ -1315,7 +1717,7 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
          }
 
           //check if other viewers select the trace
-          w = gtk_multi_vpaned_get_first_widget(tab->multi_vpaned);  
+          w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(tab->multivpaned));
           while(w){
             s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
             if(s){
@@ -1323,13 +1725,13 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
               selected = lttv_trace_selector_get_selected(t);
               if(selected)break;
             }
-            w = gtk_multi_vpaned_get_next_widget(tab->multi_vpaned);  
+            w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(tab->multivpaned));
           }
         }else selected = FALSE;
 
         //if no viewer selects the trace, remove it
         if(!selected){
-          remove_trace_from_traceset_selector(tab->multi_vpaned, i);
+          remove_trace_from_traceset_selector(GTK_MULTIVPANED(tab->multivpaned), i);
 
           traceset = tab->traceset_info->traceset;
          //Keep a reference to the traces so they are not freed.
@@ -1379,19 +1781,19 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
 
           //update current tab
           //update_traceset(mw_data);
-          if(nb_trace > 1){
+          //if(nb_trace > 1){
 
-            SetTraceset(mw_data, (gpointer)traceset);
+            SetTraceset(tab, (gpointer)traceset);
             // in expose now call_pending_read_hooks(mw_data);
 
             //lttvwindow_report_current_time(mw_data,&(tab->current_time));
-          }else{
-            if(tab){
-              while(tab->multi_vpaned->num_children){
-                gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
-              }    
-            }      
-          }
+          //}else{
+          //  if(tab){
+          //    while(tab->multi_vpaned->num_children){
+          //      gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
+          //    }    
+          //  }            
+          //}
         }
         break;
       }
@@ -1400,7 +1802,7 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
 
   g_free(name);
 }
-
+#endif //0
 
 /* Redraw all the viewers in the current tab */
 void redraw(GtkWidget *widget, gpointer user_data)
@@ -1465,18 +1867,19 @@ void stop_processing(GtkWidget *widget, gpointer user_data)
   } else {
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
-  GSList *events_requests = tab->events_requests;
-
-  GSList *iter = events_requests;
+  GSList *iter = tab->events_requests;
   
   while(iter != NULL) {
     GSList *remove_iter = iter;
     iter = g_slist_next(iter);
     
     g_free(remove_iter->data);
-    events_requests = g_slist_remove_link(events_requests, remove_iter);
+    tab->events_requests = 
+                       g_slist_remove_link(tab->events_requests, remove_iter);
   }
-  g_assert(g_slist_length(events_requests) == 0);
+  tab->events_request_pending = FALSE;
+  g_idle_remove_by_data(tab);
+  g_assert(g_slist_length(tab->events_requests) == 0);
 }
 
 
@@ -1502,7 +1905,7 @@ void save_as(GtkWidget * widget, gpointer user_data)
 
 void zoom(GtkWidget * widget, double size)
 {
-  TimeInterval *time_span;
+  TimeInterval time_span;
   TimeWindow new_time_window;
   LttTime    current_time, time_delta, time_s, time_e, time_tmp;
   MainWindow * mw_data = get_window_data_struct(widget);
@@ -1522,19 +1925,19 @@ void zoom(GtkWidget * widget, double size)
   if(size == 1) return;
 
   tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
-  time_span = &tsc->time_span;
+  time_span = tsc->time_span;
   new_time_window =  tab->time_window;
   current_time = tab->current_time;
   
-  time_delta = ltt_time_sub(time_span->end_time,time_span->start_time);
+  time_delta = ltt_time_sub(time_span.end_time,time_span.start_time);
   if(size == 0){
-    new_time_window.start_time = time_span->start_time;
+    new_time_window.start_time = time_span.start_time;
     new_time_window.time_width = time_delta;
   }else{
     new_time_window.time_width = ltt_time_div(new_time_window.time_width, size);
     if(ltt_time_compare(new_time_window.time_width,time_delta) > 0)
     { /* Case where zoom out is bigger than trace length */
-      new_time_window.start_time = time_span->start_time;
+      new_time_window.start_time = time_span.start_time;
       new_time_window.time_width = time_delta;
     }
     else
@@ -1543,25 +1946,23 @@ void zoom(GtkWidget * widget, double size)
       new_time_window.start_time = 
         ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0));
       /* If on borders, don't fall off */
-      if(ltt_time_compare(new_time_window.start_time, time_span->start_time) <0)
+      if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0)
       {
-        new_time_window.start_time = time_span->start_time;
+        new_time_window.start_time = time_span.start_time;
       }
       else 
       {
         if(ltt_time_compare(
            ltt_time_add(new_time_window.start_time, new_time_window.time_width),
-           time_span->end_time) > 0)
+           time_span.end_time) > 0)
         {
           new_time_window.start_time = 
-                  ltt_time_sub(time_span->end_time, new_time_window.time_width);
+                  ltt_time_sub(time_span.end_time, new_time_window.time_width);
         }
       }
       
     }
 
-    
-
     //time_tmp = ltt_time_div(new_time_window.time_width, 2);
     //if(ltt_time_compare(current_time, time_tmp) < 0){
     //  time_s = time_span->startTime;
@@ -1582,9 +1983,79 @@ void zoom(GtkWidget * widget, double size)
   //call_pending_read_hooks(mw_data);
 
   //lttvwindow_report_current_time(mw_data,&(tab->current_time));
-  set_time_window(tab, &new_time_window);
+  //set_time_window(tab, &new_time_window);
   // in expose now call_pending_read_hooks(mw_data);
-  gtk_multi_vpaned_set_adjust(tab->multi_vpaned, &new_time_window, FALSE);
+  //gtk_multi_vpaned_set_adjust(tab->multi_vpaned, &new_time_window, FALSE);
+  //
+  //
+
+ LttTime rel_time =
+       ltt_time_sub(new_time_window.start_time, time_span.start_time); 
+ if(   ltt_time_to_double(new_time_window.time_width)
+                             * NANOSECONDS_PER_SECOND
+                             / SCROLL_STEP_PER_PAGE/* step increment */
+       +
+       ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */
+                    == 
+       ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */
+       ) {
+    g_warning("Can not zoom that far due to scrollbar precision");
+ } else if(
+     ltt_time_compare(
+       ltt_time_from_double( 
+            ltt_time_to_double(new_time_window.time_width)
+                                 /SCROLL_STEP_PER_PAGE ),
+       ltt_time_zero)
+     == 0 ) {
+    g_warning("Can not zoom that far due to time nanosecond precision");
+ } else {
+    /* Set scrollbar */
+    GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar));
+        
+    g_object_set(G_OBJECT(adjustment),
+                 //"value",
+                 //ltt_time_to_double(new_time_window.start_time) 
+                 //  * NANOSECONDS_PER_SECOND, /* value */
+                 "lower",
+                   0.0, /* lower */
+                 "upper",
+                 ltt_time_to_double(
+                   ltt_time_sub(time_span.end_time, time_span.start_time))
+                   * NANOSECONDS_PER_SECOND, /* upper */
+                 "step_increment",
+                 ltt_time_to_double(new_time_window.time_width)
+                               / SCROLL_STEP_PER_PAGE
+                               * NANOSECONDS_PER_SECOND, /* step increment */
+                 "page_increment",
+                 ltt_time_to_double(new_time_window.time_width) 
+                   * NANOSECONDS_PER_SECOND, /* page increment */
+                 "page_size",
+                 ltt_time_to_double(new_time_window.time_width) 
+                   * NANOSECONDS_PER_SECOND, /* page size */
+                 NULL);
+    gtk_adjustment_changed(adjustment);
+    //gtk_range_set_adjustment(GTK_RANGE(tab->scrollbar), adjustment);
+    //gtk_adjustment_value_changed(adjustment);
+    g_object_set(G_OBJECT(adjustment),
+                 "value",
+                 ltt_time_to_double(
+                   ltt_time_sub(new_time_window.start_time, time_span.start_time))
+                   * NANOSECONDS_PER_SECOND, /* value */
+                 NULL);
+    gtk_adjustment_value_changed(adjustment);
+   
+
+    //g_object_set(G_OBJECT(adjustment),
+    //             "value",
+    //             ltt_time_to_double(time_window->start_time) 
+    //               * NANOSECONDS_PER_SECOND, /* value */
+    //               NULL);
+    /* Note : the set value will call set_time_window if scrollbar value changed
+     */
+    //gtk_adjustment_set_value(adjustment,
+    //                         ltt_time_to_double(new_time_window.start_time)
+    //                         * NANOSECONDS_PER_SECOND);
+  }
 }
 
 void zoom_in(GtkWidget * widget, gpointer user_data)
@@ -1858,6 +2329,7 @@ on_remove_viewer_activate              (GtkMenuItem     *menuitem,
   delete_viewer((GtkWidget*)menuitem, user_data);
 }
 
+#if 0
 void
 on_trace_filter_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1877,7 +2349,7 @@ on_trace_filter_activate              (GtkMenuItem     *menuitem,
     tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
   }
 
-  w = gtk_multi_vpaned_get_widget(tab->multi_vpaned);
+  w = gtk_multivpaned_get_widget(GTK_MULTIVPANED(tab->multivpaned));
   
   s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
   if(!s){
@@ -1891,6 +2363,7 @@ on_trace_filter_activate              (GtkMenuItem     *menuitem,
     //lttvwindow_report_current_time(mw_data,&(tab->current_time));
   }
 }
+#endif //0
 
 void
 on_trace_facility_activate              (GtkMenuItem     *menuitem,
@@ -1900,50 +2373,306 @@ on_trace_facility_activate              (GtkMenuItem     *menuitem,
 }
 
 
+/* Dispaly a file selection dialogue to let user select a library, then call
+ * lttv_library_load().
+ */
+
+void
+on_load_library_activate                (GtkMenuItem     *menuitem,
+                                         gpointer         user_data)
+{
+  GError *error = NULL;
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+
+  gchar load_module_path_alter[PATH_MAX];
+  {
+    GPtrArray *name;
+    guint nb,i;
+    gchar *load_module_path;
+    name = g_ptr_array_new();
+    nb = lttv_library_path_number();
+    /* ask for the library path */
+
+    for(i=0;i<nb;i++){
+      gchar *path;
+      path = lttv_library_path_get(i);
+      g_ptr_array_add(name, path);
+    }
+
+    load_module_path = get_selection((char **)(name->pdata), name->len,
+                             "Select a library path", "Library paths");
+    if(load_module_path != NULL)
+      strncpy(load_module_path_alter, load_module_path, PATH_MAX-1); // -1 for /
+
+    g_ptr_array_free(name, TRUE);
+
+    if(load_module_path == NULL) return;
+  }
+
+  {
+    /* Make sure the module path ends with a / */
+    gchar *ptr = load_module_path_alter;
+
+    ptr = strchr(ptr, '\0');
+
+    if(*(ptr-1) != '/') {
+      *ptr = '/';
+      *(ptr+1) = '\0';
+    }
+  }
+
+  {
+    /* Ask for the library to load : list files in the previously selected
+     * directory */
+    gchar str[PATH_MAX];
+    gchar ** dir;
+    gint id;
+    GtkFileSelection * file_selector =
+      (GtkFileSelection *)gtk_file_selection_new("Select a module");
+    gtk_file_selection_set_filename(file_selector, load_module_path_alter);
+    gtk_file_selection_hide_fileop_buttons(file_selector);
+    
+    str[0] = '\0';
+    id = gtk_dialog_run(GTK_DIALOG(file_selector));
+    switch(id){
+      case GTK_RESPONSE_ACCEPT:
+      case GTK_RESPONSE_OK:
+        dir = gtk_file_selection_get_selections (file_selector);
+        strncpy(str,dir[0],PATH_MAX);
+        strncpy(remember_plugins_dir,dir[0],PATH_MAX);
+        /* only keep file name */
+        gchar *str1;
+        str1 = strrchr(str,'/');
+        if(str1)str1++;
+        else{
+          str1 = strrchr(str,'\\');
+          str1++;
+        }
+#if 0
+        /* remove "lib" */
+        if(*str1 == 'l' && *(str1+1)== 'i' && *(str1+2)=='b')
+          str1=str1+3;
+         remove info after . */
+        {
+          gchar *str2 = str1;
+
+          str2 = strrchr(str2, '.');
+          if(str2 != NULL) *str2 = '\0';
+        }
+        lttv_module_require(str1, &error);
+#endif //0   
+        lttv_library_load(str1, &error);
+        if(error != NULL) g_warning(error->message);
+        else g_printf("Load library: %s\n", str);
+        g_strfreev(dir);
+      case GTK_RESPONSE_REJECT:
+      case GTK_RESPONSE_CANCEL:
+      default:
+        gtk_widget_destroy((GtkWidget*)file_selector);
+        break;
+    }
+
+  }
+
+
+
+}
+
+
+/* Display all loaded modules, let user to select a module to unload
+ * by calling lttv_module_unload
+ */
+
+void
+on_unload_library_activate              (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+
+  LttvLibrary *library;
+  {
+    GPtrArray *name;
+    guint nb,i;
+    gchar *lib_name;
+    name = g_ptr_array_new();
+    nb = lttv_library_number();
+    LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb);
+    /* ask for the library name */
+
+    for(i=0;i<nb;i++){
+      LttvLibrary *iter_lib = lttv_library_get(i);
+      lttv_library_info(iter_lib, &lib_info[i]);
+      
+      gchar *path = lib_info[i].name;
+      g_ptr_array_add(name, lib_info[i].name);
+    }
+    lib_name = get_selection((char **)(name->pdata), name->len,
+                             "Select a library", "Libraries");
+    if(lib_name != NULL) {
+      for(i=0;i<nb;i++){
+        if(strcmp(lib_name, lib_info[i].name) == 0) {
+          library = lttv_library_get(i);
+          break;
+        }
+      }
+    }
+    g_ptr_array_free(name, TRUE);
+    g_free(lib_info);
+
+    if(lib_name == NULL) return;
+  }
+  
+  lttv_library_unload(library);
+}
+
+
 /* Dispaly a file selection dialogue to let user select a module, then call
- * lttv_module_load(), finally insert tool button and menu entry in the main window
- * for the loaded  module
+ * lttv_module_require().
  */
 
 void
 on_load_module_activate                (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  char ** dir;
-  gint id;
-  char str[PATH_MAX], *str1;
+  GError *error = NULL;
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
-  GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
-  if(remember_plugins_dir[0] != '\0')
-    gtk_file_selection_set_filename(file_selector, remember_plugins_dir);
-  gtk_file_selection_hide_fileop_buttons(file_selector);
-  
-  str[0] = '\0';
-  id = gtk_dialog_run(GTK_DIALOG(file_selector));
-  switch(id){
-    case GTK_RESPONSE_ACCEPT:
-    case GTK_RESPONSE_OK:
-      dir = gtk_file_selection_get_selections (file_selector);
-      strncpy(str,dir[0],PATH_MAX);
-      strncpy(remember_plugins_dir,dir[0],PATH_MAX);
-      str1 = strrchr(str,'/');
-      if(str1)str1++;
-      else{
-       str1 = strrchr(str,'\\');
-       str1++;
+
+  LttvLibrary *library;
+  {
+    GPtrArray *name;
+    guint nb,i;
+    gchar *lib_name;
+    name = g_ptr_array_new();
+    nb = lttv_library_number();
+    LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb);
+    /* ask for the library name */
+
+    for(i=0;i<nb;i++){
+      LttvLibrary *iter_lib = lttv_library_get(i);
+      lttv_library_info(iter_lib, &lib_info[i]);
+      
+      gchar *path = lib_info[i].name;
+      g_ptr_array_add(name, path);
+    }
+    lib_name = get_selection((char **)(name->pdata), name->len,
+                             "Select a library", "Libraries");
+    if(lib_name != NULL) {
+      for(i=0;i<nb;i++){
+        if(strcmp(lib_name, lib_info[i].name) == 0) {
+          library = lttv_library_get(i);
+          break;
+        }
       }
-      lttv_module_require(str1, NULL);
-      g_strfreev(dir);
-    case GTK_RESPONSE_REJECT:
-    case GTK_RESPONSE_CANCEL:
-    default:
-      gtk_widget_destroy((GtkWidget*)file_selector);
-      break;
+    }
+    g_ptr_array_free(name, TRUE);
+    g_free(lib_info);
+
+    if(lib_name == NULL) return;
+  }
+
+  //LttvModule *module;
+  gchar module_name_out[PATH_MAX];
+  {
+    /* Ask for the module to load : list modules in the selected lib */
+    GPtrArray *name;
+    guint nb,i;
+    gchar *module_name;
+    LttvModuleInfo *module_info = g_new(LttvModuleInfo,nb);
+    name = g_ptr_array_new();
+    nb = lttv_library_module_number(library);
+    /* ask for the module name */
+
+    for(i=0;i<nb;i++){
+      LttvModule *iter_module = lttv_library_module_get(library, i);
+      lttv_module_info(iter_module, &module_info[i]);
+
+      gchar *path = module_info[i].name;
+      g_ptr_array_add(name, path);
+    }
+    module_name = get_selection((char **)(name->pdata), name->len,
+                             "Select a module", "Modules");
+    if(module_name != NULL) {
+      for(i=0;i<nb;i++){
+        if(strcmp(module_name, module_info[i].name) == 0) {
+          strncpy(module_name_out, module_name, PATH_MAX);
+          //module = lttv_library_module_get(i);
+          break;
+        }
+      }
+    }
+
+    g_ptr_array_free(name, TRUE);
+    g_free(module_info);
+
+    if(module_name == NULL) return;
   }
-  g_printf("Load module: %s\n", str);
+  
+  lttv_module_require(module_name_out, &error);
+  if(error != NULL) g_warning(error->message);
+  else g_printf("Load module: %s\n", module_name_out);
+
+
+#if 0
+  {
+
+
+    gchar str[PATH_MAX];
+    gchar ** dir;
+    gint id;
+    GtkFileSelection * file_selector =
+      (GtkFileSelection *)gtk_file_selection_new("Select a module");
+    gtk_file_selection_set_filename(file_selector, load_module_path_alter);
+    gtk_file_selection_hide_fileop_buttons(file_selector);
+    
+    str[0] = '\0';
+    id = gtk_dialog_run(GTK_DIALOG(file_selector));
+    switch(id){
+      case GTK_RESPONSE_ACCEPT:
+      case GTK_RESPONSE_OK:
+        dir = gtk_file_selection_get_selections (file_selector);
+        strncpy(str,dir[0],PATH_MAX);
+        strncpy(remember_plugins_dir,dir[0],PATH_MAX);
+        {
+          /* only keep file name */
+          gchar *str1;
+          str1 = strrchr(str,'/');
+          if(str1)str1++;
+          else{
+            str1 = strrchr(str,'\\');
+            str1++;
+          }
+#if 0
+        /* remove "lib" */
+        if(*str1 == 'l' && *(str1+1)== 'i' && *(str1+2)=='b')
+          str1=str1+3;
+         remove info after . */
+        {
+          gchar *str2 = str1;
+
+          str2 = strrchr(str2, '.');
+          if(str2 != NULL) *str2 = '\0';
+        }
+        lttv_module_require(str1, &error);
+#endif //0   
+        lttv_library_load(str1, &error);
+        if(error != NULL) g_warning(error->message);
+        else g_printf("Load library: %s\n", str);
+        g_strfreev(dir);
+      case GTK_RESPONSE_REJECT:
+      case GTK_RESPONSE_CANCEL:
+      default:
+        gtk_widget_destroy((GtkWidget*)file_selector);
+        break;
+    }
+
+  }
+#endif //0
+
+
 }
 
 
+
 /* Display all loaded modules, let user to select a module to unload
  * by calling lttv_module_unload
  */
@@ -1952,48 +2681,93 @@ void
 on_unload_module_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  int i;
-  GPtrArray *name;
-  char *unload_module_name;
-  guint nb;
-  LttvLibrary *library;
-  LttvLibraryInfo library_info;
+  GError *error = NULL;
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
-  
-  name  = g_ptr_array_new();
-  nb = lttv_library_number();
 
-  for(i=0;i<nb;i++){
-    library = lttv_library_get(i);
-    lttv_library_info(library, &library_info);
-    if(library_info.load_count > 0) g_ptr_array_add(name, library_info.name);
-  }
+  LttvLibrary *library;
+  {
+    GPtrArray *name;
+    guint nb,i;
+    gchar *lib_name;
+    name = g_ptr_array_new();
+    nb = lttv_library_number();
+    LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb);
+    /* ask for the library name */
 
-  unload_module_name =get_unload_module((char **)(name->pdata), name->len);
-  
-  if(unload_module_name){
     for(i=0;i<nb;i++){
-      library = lttv_library_get(i);
-      lttv_library_info(library, &library_info);
-      if(strcmp(unload_module_name, library_info.name) == 0){
-             lttv_library_unload(library);
-       break;
+      LttvLibrary *iter_lib = lttv_library_get(i);
+      lttv_library_info(iter_lib, &lib_info[i]);
+      
+      gchar *path = lib_info[i].name;
+      g_ptr_array_add(name, path);
+    }
+    lib_name = get_selection((char **)(name->pdata), name->len,
+                             "Select a library", "Libraries");
+    if(lib_name != NULL) {
+      for(i=0;i<nb;i++){
+        if(strcmp(lib_name, lib_info[i].name) == 0) {
+          library = lttv_library_get(i);
+          break;
+        }
       }
-    }    
+    }
+    g_ptr_array_free(name, TRUE);
+    g_free(lib_info);
+
+    if(lib_name == NULL) return;
   }
 
-  g_ptr_array_free(name, TRUE);
+  LttvModule *module;
+  {
+    /* Ask for the module to load : list modules in the selected lib */
+    GPtrArray *name;
+    guint nb,i;
+    gchar *module_name;
+    nb = lttv_library_module_number(library);
+    LttvModuleInfo *module_info = g_new(LttvModuleInfo,nb);
+    name = g_ptr_array_new();
+    /* ask for the module name */
+
+    for(i=0;i<nb;i++){
+      LttvModule *iter_module = lttv_library_module_get(library, i);
+      lttv_module_info(iter_module, &module_info[i]);
+
+      gchar *path = module_info[i].name;
+      if(module_info[i].use_count > 0) g_ptr_array_add(name, path);
+    }
+    module_name = get_selection((char **)(name->pdata), name->len,
+                             "Select a module", "Modules");
+    if(module_name != NULL) {
+      for(i=0;i<nb;i++){
+        if(strcmp(module_name, module_info[i].name) == 0) {
+          module = lttv_library_module_get(library, i);
+          break;
+        }
+      }
+    }
+
+    g_ptr_array_free(name, TRUE);
+    g_free(module_info);
+
+    if(module_name == NULL) return;
+  }
+  
+  LttvModuleInfo module_info;
+  lttv_module_info(module, &module_info);
+  g_printf("Release module: %s\n", module_info.name);
+  lttv_module_release(module);
 }
 
 
-/* Display a directory dialogue to let user select a path for module searching
+/* Display a directory dialogue to let user select a path for library searching
  */
 
 void
-on_add_module_search_path_activate     (GtkMenuItem     *menuitem,
+on_add_library_search_path_activate     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select module path");
+  GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select library path");
   const char * dir;
   gint id;
 
@@ -2018,6 +2792,39 @@ on_add_module_search_path_activate     (GtkMenuItem     *menuitem,
 }
 
 
+/* Display a directory dialogue to let user select a path for library searching
+ */
+
+void
+on_remove_library_search_path_activate     (GtkMenuItem     *menuitem,
+                                            gpointer         user_data)
+{
+  MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+
+  const char *lib_path;
+  {
+    GPtrArray *name;
+    guint nb,i;
+    gchar *lib_name;
+    name = g_ptr_array_new();
+    nb = lttv_library_path_number();
+    /* ask for the library name */
+
+    for(i=0;i<nb;i++){
+      gchar *path = lttv_library_path_get(i);
+      g_ptr_array_add(name, path);
+    }
+    lib_path = get_selection((char **)(name->pdata), name->len,
+                             "Select a library path", "Library paths");
+
+    g_ptr_array_free(name, TRUE);
+
+    if(lib_path == NULL) return;
+  }
+  
+  lttv_library_path_remove(lib_path);
+}
+
 void
 on_color_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -2050,11 +2857,90 @@ on_content_activate                    (GtkMenuItem     *menuitem,
 }
 
 
+static void 
+on_about_close_activate                (GtkButton       *button,
+                                        gpointer         user_data)
+{
+  GtkWidget *about_widget = GTK_WIDGET(user_data);
+
+  gtk_widget_destroy(about_widget);
+}
+
 void
 on_about_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  g_printf("About...\n");
+  MainWindow *main_window = get_window_data_struct(GTK_WIDGET(menuitem));
+  GtkWidget *window_widget = main_window->mwindow;
+  GtkWidget *about_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+  GtkWindow *about_window = GTK_WINDOW(about_widget);
+  gint window_width, window_height;
+  
+  gtk_window_set_title(about_window, "About Linux Trace Toolkit");
+
+  gtk_window_set_resizable(about_window, FALSE);
+  gtk_window_set_transient_for(GTK_WINDOW(window_widget), about_window);
+  gtk_window_set_destroy_with_parent(about_window, TRUE);
+  gtk_window_set_modal(about_window, FALSE);
+
+  /* Put the about window at the center of the screen */
+  gtk_window_get_size(about_window, &window_width, &window_height);
+  gtk_window_move (about_window,
+                   (gdk_screen_width() - window_width)/2,
+                   (gdk_screen_height() - window_height)/2);
+  GtkWidget *vbox = gtk_vbox_new(FALSE, 1);
+
+  gtk_container_add(GTK_CONTAINER(about_widget), vbox);
+
+    
+  /* Text to show */
+  GtkWidget *label1 = gtk_label_new("");
+  gtk_misc_set_padding(GTK_MISC(label1), 10, 20);
+  gtk_label_set_markup(GTK_LABEL(label1), "\
+<big>Linux Trace Toolkit</big>");
+  gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_CENTER);
+  
+  GtkWidget *label2 = gtk_label_new("");
+  gtk_misc_set_padding(GTK_MISC(label2), 10, 20);
+  gtk_label_set_markup(GTK_LABEL(label2), "\
+Project author: Karim Yaghmour\n\
+\n\
+Contributors :\n\
+\n\
+Michel Dagenais (New trace format, lttv main)\n\
+Mathieu Desnoyers (Directory structure, build with automake/conf,\n\
+                   lttv gui, control flow view, gui green threads\n\
+                   with interruptible foreground and background computation,\n\
+                   detailed event list)\n\
+Benoit Des Ligneris (Cluster adaptation)\n\
+Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\
+               detailed event list and statistics view)\n\
+Tom Zanussi (RelayFS)");
+
+  GtkWidget *label3 = gtk_label_new("");
+  gtk_label_set_markup(GTK_LABEL(label3), "\
+Linux Trace Toolkit, Copyright (C) 2004  Karim Yaghmour\n\
+Linux Trace Toolkit comes with ABSOLUTELY NO WARRANTY.\n\
+This is free software, and you are welcome to redistribute it\n\
+under certain conditions. See COPYING for details.");
+  gtk_misc_set_padding(GTK_MISC(label3), 10, 20);
+
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label1);
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label2);
+  gtk_box_pack_start_defaults(GTK_BOX(vbox), label3);
+
+  GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
+  gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  GtkWidget *close_button = gtk_button_new_with_mnemonic("_Close");
+  gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 0);
+  gtk_container_set_border_width(GTK_CONTAINER(close_button), 20);
+
+  g_signal_connect(G_OBJECT(close_button), "clicked",
+      G_CALLBACK(on_about_close_activate),
+      (gpointer)about_widget);
+  
+  gtk_widget_show_all(about_widget);
 }
 
 
@@ -2272,6 +3158,49 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
 }
 
 
+void scroll_value_changed_cb(GtkWidget *scrollbar,
+                             gpointer user_data)
+{
+  Tab *tab = (Tab *)user_data;
+  TimeWindow time_window;
+  LttTime time;
+  GtkAdjustment *adjust = gtk_range_get_adjustment(GTK_RANGE(scrollbar));
+  gdouble value = gtk_adjustment_get_value(adjust);
+  gdouble upper, lower, ratio, page_size;
+  LttvTracesetContext * tsc = 
+    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  TimeInterval time_span = tsc->time_span;
+
+  //time_window = tab->time_window;
+
+  lower = adjust->lower;
+  upper = adjust->upper;
+  ratio = (value - lower) / (upper - lower);
+  g_info("lower %lu, upper %lu, value %lu, ratio %lu", lower, upper, value, ratio);
+  
+  //time = ltt_time_sub(time_span->end_time, time_span->start_time);
+  //time = ltt_time_mul(time, (float)ratio);
+  //time = ltt_time_add(time_span->start_time, time);
+  time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND),
+                      time_span.start_time);
+
+  time_window.start_time = time;
+  
+  page_size = adjust->page_size;
+
+  time_window.time_width = 
+    ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND);
+  //time = ltt_time_sub(time_span.end_time, time);
+  //if(ltt_time_compare(time,time_window.time_width) < 0){
+  //  time_window.time_width = time;
+  //}
+
+  /* call viewer hooks for new time window */
+  set_time_window(tab, &time_window);
+
+}
+
+
 /* callback function to check or uncheck the check box (filter)
  */
 
@@ -2513,13 +3442,25 @@ char * get_remove_trace(char ** all_trace_name, int nb_trace)
 }
 
 
+/* Select a module which will be loaded
+ */
+
+char * get_load_module(char ** load_module_name, int nb_module)
+{
+  return get_selection(load_module_name, nb_module, 
+                      "Select a module to load", "Module name");
+}
+
+
+
+
 /* Select a module which will be unloaded
  */
 
 char * get_unload_module(char ** loaded_module_name, int nb_module)
 {
   return get_selection(loaded_module_name, nb_module, 
-                      "Select an unload module", "Module pathname");
+                      "Select a module to unload", "Module name");
 }
 
 
@@ -2766,9 +3707,13 @@ void construct_main_window(MainWindow * parent)
     new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset");
   } else {
     new_tab = create_tab(new_m_window, NULL, notebook, "Traceset");
+    /* First window, use command line trace */
     if(g_init_trace != NULL){
       lttvwindow_add_trace(new_tab,
                            g_init_trace);
+
+      LttvTraceset *traceset = new_tab->traceset_info->traceset;
+      SetTraceset(new_tab, traceset);
     }
   }
 
@@ -2844,12 +3789,13 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
     tab->traceset_info->traceset = lttv_traceset_new();
   }
 
-//FIXME : this is g_debug level
+#ifdef DEBUG
   lttv_attribute_write_xml(
       lttv_traceset_attribute(tab->traceset_info->traceset),
       stdout,
       0, 4);
   fflush(stdout);
+#endif //DEBUG
 
 
   //FIXME copy not implemented in lower level
@@ -2890,8 +3836,27 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
   }
   tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
-  tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new();
-  gtk_widget_show((GtkWidget*)tab->multi_vpaned);
+  tab->vbox = gtk_vbox_new(FALSE, 2);
+  tab->viewer_container = gtk_vbox_new(TRUE, 2);
+  tab->scrollbar = gtk_hscrollbar_new(NULL);
+  //tab->multivpaned = gtk_multi_vpaned_new();
+  
+  gtk_box_pack_start(GTK_BOX(tab->vbox),
+                     tab->viewer_container,
+                     TRUE, /* expand */
+                     TRUE, /* Give the extra space to the child */
+                     0);    /* No padding */
+  gtk_box_pack_end(GTK_BOX(tab->vbox),
+                   tab->scrollbar,
+                   FALSE, /* Do not expand */
+                   FALSE, /* Fill has no effect here  (expand false) */
+                   0);    /* No padding */
+  g_object_set_data(G_OBJECT(tab->viewer_container), "focused_viewer", NULL);
+
+
   tab->mw   = mw;
   
   /*{
@@ -2925,7 +3890,12 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
 
 
   tab->label = gtk_label_new (label);
-  gtk_widget_show (tab->label);
+
+  gtk_widget_show(tab->label);
+  gtk_widget_show(tab->scrollbar);
+  gtk_widget_show(tab->viewer_container);
+  gtk_widget_show(tab->vbox);
+  //gtk_widget_show(tab->multivpaned);
 
 
   /* Start with empty events requests list */
@@ -2933,15 +3903,21 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab,
   tab->events_request_pending = FALSE;
 
   g_object_set_data_full(
-           G_OBJECT(tab->multi_vpaned),
+           G_OBJECT(tab->vbox),
            "Tab_Info",
                 tab,
                 (GDestroyNotify)tab_destructor);
 
+  g_signal_connect(G_OBJECT(tab->scrollbar), "value-changed",
+      G_CALLBACK(scroll_value_changed_cb), tab);
+  //g_signal_connect(G_OBJECT(tab->scrollbar), "changed",
+  //    G_CALLBACK(scroll_value_changed_cb), tab);
+
+
  //insert tab into notebook
   gtk_notebook_append_page(notebook,
-                          (GtkWidget*)tab->multi_vpaned,
-                          tab->label);  
+                           tab->vbox,
+                           tab->label);  
   list = gtk_container_get_children(GTK_CONTAINER(notebook));
   gtk_notebook_set_current_page(notebook,g_list_length(list)-1);
   // always show : not if(g_list_length(list)>1)
This page took 0.045905 seconds and 4 git commands to generate.