X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=300b4406b1503516e91745f1c3f3aef5efd444a1;hb=6ced96ef9d5c1af6dbef8ef6e26f71ed6abdd676;hp=baea60a9ee018ccf00078ccdce971bdea12510e7;hpb=20fde85fa4660fbc6ec44101c8d7e9fe2aca94fa;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
index baea60a9..300b4406 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c
@@ -60,7 +60,7 @@ 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);
 gboolean get_filter_selection(LttvTracesetSelector *s, char *title, char * column_title);
-void * create_tab(MainWindow * parent, MainWindow * current_window,
+Tab* create_tab(MainWindow * mw, Tab *copy_tab,
 		  GtkNotebook * notebook, char * label);
 
 static void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor);
@@ -72,6 +72,7 @@ void checkbox_changed(GtkTreeView *treeview,
 		      gpointer user_data);
 void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i);
 void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * trace);
+Tab *create_new_tab(GtkWidget* widget, gpointer user_data);
 
 LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset);
 
@@ -164,12 +165,20 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor)
 {
   GtkMultiVPaned * multi_vpaned;
   MainWindow * mw_data = get_window_data_struct(widget);
+  GtkWidget * notebook = lookup_widget(widget, "MNotebook");
   GtkWidget * viewer;
   LttvTracesetSelector  * s;
   TimeInterval * time_interval;
-  Tab *tab = mw_data->current_tab;
+  GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+                      gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+  Tab *tab;
+  
+  if(!page) {
+    tab = create_new_tab(widget, NULL);
+  } else {
+    tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+  }
 
-  if(!tab) return;
   multi_vpaned = tab->multi_vpaned;
 
   s = construct_traceset_selector(tab->traceset_info->traceset);
@@ -289,15 +298,38 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
 void move_up_viewer(GtkWidget * widget, gpointer user_data)
 {
   MainWindow * mw = get_window_data_struct(widget);
-  if(!mw->current_tab) return;
-  gtk_multi_vpaned_widget_move_up(mw->current_tab->multi_vpaned);
+  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");
+  }
+
+  gtk_multi_vpaned_widget_move_up(tab->multi_vpaned);
 }
 
 void move_down_viewer(GtkWidget * widget, gpointer user_data)
 {
   MainWindow * mw = get_window_data_struct(widget);
-  if(!mw->current_tab) return;
-  gtk_multi_vpaned_widget_move_down(mw->current_tab->multi_vpaned);
+  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");
+  }
+
+  gtk_multi_vpaned_widget_move_down(tab->multi_vpaned);
 }
 
 
@@ -307,8 +339,19 @@ void move_down_viewer(GtkWidget * widget, gpointer user_data)
 void delete_viewer(GtkWidget * widget, gpointer user_data)
 {
   MainWindow * mw = get_window_data_struct(widget);
-  if(!mw->current_tab) return;
-  gtk_multi_vpaned_widget_delete(mw->current_tab->multi_vpaned);
+  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");
+  }
+
+  gtk_multi_vpaned_widget_delete(tab->multi_vpaned);
 }
 
 
@@ -927,6 +970,48 @@ void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
 }
 
 
+static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v)
+{
+  LttvTraceset *traceset = tab->traceset_info->traceset;
+  guint i;
+
+  //Keep a reference to the traces so they are not freed.
+  for(i=0; i<lttv_traceset_number(traceset); i++)
+  {
+    LttvTrace * trace = lttv_traceset_get(traceset, i);
+    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);
+
+  lttv_traceset_add(traceset, trace_v);
+
+  /* Create new context */
+  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(i=0; i<lttv_traceset_number(traceset); i++)
+  {
+    LttvTrace * trace = lttv_traceset_get(traceset, i);
+    lttv_trace_unref(trace);
+  }
+
+  add_trace_into_traceset_selector(tab->multi_vpaned, lttv_trace(trace_v));
+}
+
 /* add_trace adds a trace into the current traceset. It first displays a 
  * directory selection dialogue to let user choose a trace, then recreates
  * tracset_context, and redraws all the viewer of the current tab 
@@ -941,8 +1026,21 @@ void add_trace(GtkWidget * widget, gpointer user_data)
   gint id;
   gint i;
   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) {
+    tab = create_new_tab(widget, NULL);
+  } else {
+    tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+  }
+
   GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
   gtk_dir_selection_hide_fileop_buttons(file_selector);
+  
   if(remember_trace_dir[0] != '\0')
     gtk_dir_selection_set_filename(file_selector, remember_trace_dir);
   
@@ -959,75 +1057,21 @@ void add_trace(GtkWidget * widget, gpointer user_data)
       trace = ltt_trace_open(dir);
       if(trace == NULL) g_critical("cannot open trace %s", dir);
       trace_v = lttv_trace_new(trace);
-      traceset = mw_data->current_tab->traceset_info->traceset;
 
-      //Keep a reference to the traces so they are not freed.
-      for(i=0; i<lttv_traceset_number(traceset); i++)
-      {
-        LttvTrace * trace = lttv_traceset_get(traceset, i);
-        lttv_trace_ref(trace);
-      }
-
-      //remove state update hooks
-      lttv_state_remove_event_hooks(
-         (LttvTracesetState*)mw_data->current_tab->traceset_info->traceset_context);
-
-      lttv_context_fini(LTTV_TRACESET_CONTEXT(
-              mw_data->current_tab->traceset_info->traceset_context));
-      g_object_unref(mw_data->current_tab->traceset_info->traceset_context);
-  
-
-      lttv_traceset_add(traceset, trace_v);
-
-      /* Create new context */
-      mw_data->current_tab->traceset_info->traceset_context =
-                            	g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
-      lttv_context_init(
-              	LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->
-			                                    traceset_context),
-                traceset); 
-      //add state update hooks
-      lttv_state_add_event_hooks(
-      (LttvTracesetState*)mw_data->current_tab->traceset_info->traceset_context);
-      //Remove local reference to the traces.
-      for(i=0; i<lttv_traceset_number(traceset); i++)
-      {
-        LttvTrace * trace = lttv_traceset_get(traceset, i);
-        lttv_trace_unref(trace);
-      }
-
-
-      add_trace_into_traceset_selector(mw_data->current_tab->multi_vpaned, trace);
+      lttvwindow_add_trace(tab, trace_v);
 
       gtk_widget_destroy((GtkWidget*)file_selector);
       
       //update current tab
       //update_traceset(mw_data);
 
-      //get_traceset_time_span(mw_data,LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->traceset_context)->Time_Span);
-      if(
-       lttv_traceset_number(mw_data->current_tab->traceset_info->traceset) == 1
-       || ltt_time_compare(mw_data->current_tab->current_time,
-            LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->
-                    traceset_context)->time_span.start_time)<0)
-      {
-        /* Set initial time if this is the first trace in the traceset */
-      	mw_data->current_tab->current_time = 
-           LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->
-                        traceset_context)->time_span.start_time;
-	      mw_data->current_tab->time_window.start_time = 
-           mw_data->current_tab->current_time;
-	      mw_data->current_tab->time_window.time_width.tv_sec = 
-           DEFAULT_TIME_WIDTH_S;
-	      mw_data->current_tab->time_window.time_width.tv_nsec = 0;
-      } 
-
       /* Call the updatetraceset hooks */
       
-      SetTraceset(mw_data->current_tab, traceset);
+      traceset = tab->traceset_info->traceset;
+      SetTraceset(tab, traceset);
       // in expose now call_pending_read_hooks(mw_data);
       
-      //lttvwindow_report_current_time(mw_data,&(mw_data->current_tab->current_time));
+      //lttvwindow_report_current_time(mw_data,&(tab->current_time));
       break;
     case GTK_RESPONSE_REJECT:
     case GTK_RESPONSE_CANCEL:
@@ -1083,12 +1127,22 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
   LttvTraceSelector * t;
   GtkWidget * w; 
   gboolean selected;
-  
-  nb_trace =lttv_traceset_number(mw_data->current_tab->traceset_info->traceset); 
+  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(mw_data->current_tab->
-				traceset_info->traceset, i);
+    trace_v = lttv_traceset_get(tab->traceset_info->traceset, i);
     trace = lttv_trace(trace_v);
     name[i] = ltt_trace_name(trace);
   }
@@ -1098,90 +1152,92 @@ void remove_trace(GtkWidget * widget, gpointer user_data)
   if(remove_trace_name){
     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(mw_data->current_tab->multi_vpaned);  
-	if(w){
-	  s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
-	  if(s){
-	    t = lttv_traceset_selector_trace_get(s,i);
-	    lttv_trace_selector_set_selected(t, FALSE);
-	  }
-
-	  //check if other viewers select the trace
-	  w = gtk_multi_vpaned_get_first_widget(mw_data->current_tab->multi_vpaned);  
-	  while(w){
-	    s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
-	    if(s){
-	      t = lttv_traceset_selector_trace_get(s,i);
-	      selected = lttv_trace_selector_get_selected(t);
-	      if(selected)break;
-	    }
-	    w = gtk_multi_vpaned_get_next_widget(mw_data->current_tab->multi_vpaned);  
-	  }
-	}else selected = FALSE;
+	      //unselect the trace from the current viewer
+      	w = gtk_multi_vpaned_get_widget(tab->multi_vpaned);  
+      	if(w){
+      	  s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
+      	  if(s){
+      	    t = lttv_traceset_selector_trace_get(s,i);
+      	    lttv_trace_selector_set_selected(t, FALSE);
+      	  }
+
+          //check if other viewers select the trace
+          w = gtk_multi_vpaned_get_first_widget(tab->multi_vpaned);  
+          while(w){
+            s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
+            if(s){
+              t = lttv_traceset_selector_trace_get(s,i);
+              selected = lttv_trace_selector_get_selected(t);
+              if(selected)break;
+            }
+            w = gtk_multi_vpaned_get_next_widget(tab->multi_vpaned);  
+          }
+        }else selected = FALSE;
 
-	//if no viewer selects the trace, remove it
-	if(!selected){
-	  remove_trace_from_traceset_selector(mw_data->current_tab->multi_vpaned, i);
+        //if no viewer selects the trace, remove it
+        if(!selected){
+          remove_trace_from_traceset_selector(tab->multi_vpaned, i);
 
-	  traceset = mw_data->current_tab->traceset_info->traceset;
-	  trace_v = lttv_traceset_get(traceset, i);
-	  if(lttv_trace_get_ref_number(trace_v) <= 1)
-	    ltt_trace_close(lttv_trace(trace_v));
+          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);
+          }
 
-    //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);
 
-    //remove state update hooks
-    lttv_state_remove_event_hooks(
-         (LttvTracesetState*)mw_data->current_tab->traceset_info->traceset_context);
-    lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->traceset_context));
-    g_object_unref(mw_data->current_tab->traceset_info->traceset_context);
 
-    
-	  lttv_traceset_remove(traceset, i);
-    lttv_trace_unref(trace_v);  // Remove local reference
-	  if(!lttv_trace_get_ref_number(trace_v))
-	     lttv_trace_destroy(trace_v);
-    
-	  mw_data->current_tab->traceset_info->traceset_context =
-	    g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
-    lttv_context_init(
-			    LTTV_TRACESET_CONTEXT(mw_data->current_tab->
-				      traceset_info->traceset_context),traceset);      
-      //add state update hooks
-    lttv_state_add_event_hooks(
-      (LttvTracesetState*)mw_data->current_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);
-    }
+          trace_v = lttv_traceset_get(traceset, i);
 
+          if(lttv_trace_get_ref_number(trace_v) <= 1)
+            ltt_trace_close(lttv_trace(trace_v));
+          
+          lttv_traceset_remove(traceset, i);
+          lttv_trace_unref(trace_v);  // Remove local reference
 
-	  //update current tab
-	  //update_traceset(mw_data);
-	  if(nb_trace > 1){
+          if(!lttv_trace_get_ref_number(trace_v))
+             lttv_trace_destroy(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(mw_data, (gpointer)traceset);
-  	  // in expose now call_pending_read_hooks(mw_data);
 
-	    //lttvwindow_report_current_time(mw_data,&(mw_data->current_tab->current_time));
-	  }else{
-	    if(mw_data->current_tab){
-	      while(mw_data->current_tab->multi_vpaned->num_children){
-		gtk_multi_vpaned_widget_delete(mw_data->current_tab->multi_vpaned);
-	      }    
-	    }	    
-	  }
-	}
-	break;
+          //update current tab
+          //update_traceset(mw_data);
+          if(nb_trace > 1){
+
+            SetTraceset(mw_data, (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);
+              }    
+            }	    
+          }
+        }
+        break;
       }
     }
   }
@@ -1216,12 +1272,22 @@ void zoom(GtkWidget * widget, double size)
   TimeWindow new_time_window;
   LttTime    current_time, time_delta, time_s, time_e, time_tmp;
   MainWindow * mw_data = get_window_data_struct(widget);
-  Tab *tab = mw_data->current_tab;
-  LttvTracesetContext *tsc =
-    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
+  LttvTracesetContext *tsc;
+  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");
+  }
 
   if(size == 1) return;
 
+  tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context);
   time_span = &tsc->time_span;
   new_time_window =  tab->time_window;
   current_time = tab->current_time;
@@ -1282,7 +1348,7 @@ void zoom(GtkWidget * widget, double size)
   //lttvwindow_report_time_window(mw_data, &new_time_window);
   //call_pending_read_hooks(mw_data);
 
-  //lttvwindow_report_current_time(mw_data,&(mw_data->current_tab->current_time));
+  //lttvwindow_report_current_time(mw_data,&(tab->current_time));
   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);
@@ -1335,18 +1401,28 @@ on_clone_traceset_activate             (GtkMenuItem     *menuitem,
 /* create_new_tab calls create_tab to construct a new tab in the main window
  */
 
-void create_new_tab(GtkWidget* widget, gpointer user_data){
+Tab *create_new_tab(GtkWidget* widget, gpointer user_data){
   gchar label[PATH_LENGTH];
   MainWindow * mw_data = get_window_data_struct(widget);
+
   GtkNotebook * notebook = (GtkNotebook *)lookup_widget(widget, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
-    return;
+    return NULL;
   }
-
+  GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+                      gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
+  Tab *copy_tab;
+
+  if(!page) {
+    copy_tab = NULL;
+  } else {
+    copy_tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+  }
+  
   strcpy(label,"Page");
   if(get_label(mw_data, label,"Get the name of the tab","Please input tab's name"))    
-    create_tab (NULL, mw_data, notebook, label);
+    return (create_tab (mw_data, copy_tab, notebook, label));
 }
 
 void
@@ -1374,41 +1450,27 @@ on_close_activate                      (GtkMenuItem     *menuitem,
 }
 
 
-/* remove the current tab from the main window if it is not the default tab
+/* remove the current tab from the main window
  */
 
 void
 on_close_tab_activate                  (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-  GList * list;
-  int count = 0;
+  gint page_num;
   GtkWidget * notebook;
-  Tab * tmp;
+  GtkWidget * page;
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
   if(notebook == NULL){
     g_printf("Notebook does not exist\n");
     return;
   }
+
+  page_num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
   
-  if(mw_data->tab == mw_data->current_tab){
-    //    tmp = mw_data->current_tb;
-    //    mw_data->tab = mw_data->current_tab->next;
-    g_printf("The default TAB can not be deleted\n");
-    return;
-  }else{
-    tmp = mw_data->tab;
-    while(tmp != mw_data->current_tab){
-      tmp = tmp->next;
-      count++;      
-    }
-  }
+  gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_num);
 
-  gtk_notebook_remove_page((GtkNotebook*)notebook, count);  
-  list = gtk_container_get_children(GTK_CONTAINER(notebook));
-  if(g_list_length(list)==1)
-    gtk_notebook_set_show_tabs((GtkNotebook*)notebook, FALSE);
 }
 
 
@@ -1553,7 +1615,20 @@ on_trace_filter_activate              (GtkMenuItem     *menuitem,
 {
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
   LttvTracesetSelector * s;
-  GtkWidget * w = gtk_multi_vpaned_get_widget(mw_data->current_tab->multi_vpaned);
+  GtkWidget * w;
+  GtkWidget * notebook = lookup_widget(GTK_WIDGET(menuitem), "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");
+  }
+
+  w = gtk_multi_vpaned_get_widget(tab->multi_vpaned);
   
   s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
   if(!s){
@@ -1564,7 +1639,7 @@ on_trace_filter_activate              (GtkMenuItem     *menuitem,
     //FIXME report filter change
     //update_traceset(mw_data);
     //call_pending_read_hooks(mw_data);
-    //lttvwindow_report_current_time(mw_data,&(mw_data->current_tab->current_time));
+    //lttvwindow_report_current_time(mw_data,&(tab->current_time));
   }
 }
 
@@ -1886,7 +1961,6 @@ on_MWindow_configure                   (GtkWidget         *widget,
 {
   MainWindow * mw_data = get_window_data_struct((GtkWidget*)widget);
   float width = event->width;
-  Tab * tab = mw_data->tab;
   TimeWindow time_win;
   double ratio;
   TimeInterval *time_span;
@@ -1923,14 +1997,7 @@ on_MNotebook_switch_page               (GtkNotebook     *notebook,
                                         guint            page_num,
                                         gpointer         user_data)
 {
-  MainWindow * mw = get_window_data_struct((GtkWidget*)notebook);
-  Tab * tab = mw->tab;
- 
-  while(page_num){
-    tab = tab->next;
-    page_num--;
-  }
-  mw->current_tab = tab;
+
 }
 
 
@@ -2377,6 +2444,7 @@ void construct_main_window(MainWindow * parent)
   LttvIAttribute *attributes =
 	  LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
   LttvAttributeValue value;
+  Tab *new_tab;
          
   new_m_window = g_new(MainWindow, 1);
 
@@ -2388,8 +2456,6 @@ void construct_main_window(MainWindow * parent)
   gtk_widget_show (new_window);
     
   new_m_window->mwindow = new_window;
-  new_m_window->tab = NULL;
-  new_m_window->current_tab = NULL;
   new_m_window->attributes = attributes;
 
   g_assert(lttv_iattribute_find_by_path(attributes,
@@ -2414,7 +2480,25 @@ void construct_main_window(MainWindow * parent)
   }
   //for now there is no name field in LttvTraceset structure
   //Use "Traceset" as the label for the default tab
-  create_tab(parent, new_m_window, notebook, "Traceset");
+  if(parent) {
+    GtkWidget * parent_notebook = lookup_widget(parent->mwindow, "MNotebook");
+    GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(parent_notebook),
+                 gtk_notebook_get_current_page(GTK_NOTEBOOK(parent_notebook)));
+    Tab *parent_tab;
+
+    if(!page) {
+      parent_tab = NULL;
+    } else {
+      parent_tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info");
+    }
+    new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset");
+  } else {
+    new_tab = create_tab(new_m_window, NULL, notebook, "Traceset");
+    if(g_init_trace != NULL){
+      lttvwindow_add_trace(new_tab,
+                           g_init_trace);
+    }
+  }
 
   g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
 }
@@ -2436,17 +2520,6 @@ void tab_destructor(Tab * tab_instance)
     g_object_unref(tab_instance->interrupted_state);
 
 
-  if(tab_instance->mw->tab == tab_instance){
-    tab_instance->mw->tab = tab_instance->next;
-  }else{
-    Tab * tmp1, *tmp = tab_instance->mw->tab;
-    while(tmp != tab_instance){
-      tmp1 = tmp;
-      tmp = tmp->next;
-    }
-    tmp1->next = tab_instance->next;
-  }
-
   if(tab_instance->traceset_info->traceset_context != NULL){
     //remove state update hooks
     lttv_state_remove_event_hooks(
@@ -2481,157 +2554,99 @@ void tab_destructor(Tab * tab_instance)
 /* Create a tab and insert it into the current main window
  */
 
-void * create_tab(MainWindow * parent, MainWindow* current_window, 
+Tab* create_tab(MainWindow * mw, Tab *copy_tab, 
 		  GtkNotebook * notebook, char * label)
 {
   GList * list;
-  Tab * tmp_tab;
-  MainWindow * mw_data = current_window;
+  Tab * tab;
   LttTime tmp_time;
   
   //create a new tab data structure
-  tmp_tab = mw_data->tab;
-  while(tmp_tab && tmp_tab->next) tmp_tab = tmp_tab->next;
-  if(!tmp_tab){
-    mw_data->current_tab = NULL;
-    tmp_tab = g_new(Tab,1);
-    mw_data->tab = tmp_tab;    
-  }else{
-    tmp_tab->next = g_new(Tab,1);
-    tmp_tab = tmp_tab->next;
-  }
+  tab = g_new(Tab,1);
 
   //construct and initialize the traceset_info
-  tmp_tab->traceset_info = g_new(TracesetInfo,1);
-  if(parent){
-    if(parent->current_tab){
-      tmp_tab->traceset_info->traceset = 
-        lttv_traceset_copy(parent->current_tab->traceset_info->traceset);
-    }else{
-      tmp_tab->traceset_info->traceset = lttv_traceset_new();
-    }
+  tab->traceset_info = g_new(TracesetInfo,1);
 
-  }else{  /* Initial window */
-    if(mw_data->current_tab){
-      tmp_tab->traceset_info->traceset = 
-        lttv_traceset_copy(mw_data->current_tab->traceset_info->traceset);
-    }else{
-      tmp_tab->traceset_info->traceset = lttv_traceset_new();    
-      /* Add the command line trace */
-      if(g_init_trace != NULL){
-	lttv_traceset_add(tmp_tab->traceset_info->traceset, g_init_trace);
-      }
-    }
+  if(copy_tab) {
+    tab->traceset_info->traceset = 
+      lttv_traceset_copy(copy_tab->traceset_info->traceset);
+  } else {
+    tab->traceset_info->traceset = lttv_traceset_new();
   }
 
 //FIXME : this is g_debug level
   lttv_attribute_write_xml(
-      lttv_traceset_attribute(tmp_tab->traceset_info->traceset),
+      lttv_traceset_attribute(tab->traceset_info->traceset),
       stdout,
       0, 4);
   fflush(stdout);
 
 
   //FIXME copy not implemented in lower level
-  tmp_tab->traceset_info->traceset_context =
+  tab->traceset_info->traceset_context =
     g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
-  g_assert(tmp_tab->traceset_info->traceset_context != NULL);
+  g_assert(tab->traceset_info->traceset_context != NULL);
   lttv_context_init(
-	    LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context),
-	                          tmp_tab->traceset_info->traceset);
+	    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context),
+	                          tab->traceset_info->traceset);
   //add state update hooks
   lttv_state_add_event_hooks(
-       (LttvTracesetState*)tmp_tab->traceset_info->traceset_context);
+       (LttvTracesetState*)tab->traceset_info->traceset_context);
   
   //determine the current_time and time_window of the tab
-  if(mw_data->current_tab){
-    // Will have to read directly at the main window level, as we want
-    // to be able to modify a traceset on the fly.
-    tmp_tab->time_window      = mw_data->current_tab->time_window;
-    tmp_tab->current_time     = mw_data->current_tab->current_time;
+  if(copy_tab != NULL){
+    tab->time_window      = copy_tab->time_window;
+    tab->current_time     = copy_tab->current_time;
   }else{
-    // Will have to read directly at the main window level, as we want
-    // to be able to modify a traceset on the fly.
-    // get_traceset_time_span(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime);
-    tmp_tab->time_window.start_time   = 
-	    LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.start_time;
+    tab->time_window.start_time = 
+	    LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+                             time_span.start_time;
     if(DEFAULT_TIME_WIDTH_S <
-              LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.end_time.tv_sec)
+              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(tmp_tab->traceset_info->traceset_context)->time_span.end_time.tv_sec;
+              LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->
+                             time_span.end_time.tv_sec;
     tmp_time.tv_nsec = 0;
-    tmp_tab->time_window.time_width = tmp_time ;
-    tmp_tab->current_time.tv_sec = 
-       LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.start_time.tv_sec;
-    tmp_tab->current_time.tv_nsec = 
-       LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.start_time.tv_nsec;
+    tab->time_window.time_width = tmp_time ;
+    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;
   }
-  /* Become the current tab */
-  mw_data->current_tab = tmp_tab;
-
-  tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
-  tmp_tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
-  tmp_tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new();
-  tmp_tab->multi_vpaned->tab = mw_data->current_tab;
-  gtk_widget_show((GtkWidget*)tmp_tab->multi_vpaned);
-  tmp_tab->next = NULL;    
-  tmp_tab->mw   = mw_data;
+  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->mw   = mw;
 
-  tmp_tab->label = gtk_label_new (label);
-  gtk_widget_show (tmp_tab->label);
+  tab->label = gtk_label_new (label);
+  gtk_widget_show (tab->label);
 
   /* Start with empty events requests list */
-  tmp_tab->events_requests = NULL;
-  tmp_tab->events_request_pending = FALSE;
+  tab->events_requests = NULL;
+  tab->events_request_pending = FALSE;
 
   g_object_set_data_full(
-           G_OBJECT(tmp_tab->multi_vpaned),
+           G_OBJECT(tab->multi_vpaned),
            "Tab_Info",
-	   tmp_tab,
-	   (GDestroyNotify)tab_destructor);
+	         tab,
+	         (GDestroyNotify)tab_destructor);
 
  //insert tab into notebook
-  gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->multi_vpaned, tmp_tab->label);  
+  gtk_notebook_append_page(notebook,
+                          (GtkWidget*)tab->multi_vpaned,
+                          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)
   gtk_notebook_set_show_tabs(notebook, TRUE);
  
-}
-
-/**
- * Function to show each viewer in the current tab.
- * It will be called by main window, call show on each registered viewer,
- * will call process traceset and then it will
- * @param main_win the main window the viewer belongs to.
- */
-//FIXME Only one time request maximum for now!
-void show_viewer(MainWindow *main_win)
-{
-  LttvAttributeValue value;
-  LttvHooks * tmp;
-  int i;
-  LttvTracesetContext * tsc = 
-              (LttvTracesetContext*)main_win->current_tab->
-                                      traceset_info->traceset_context;
-  
-  g_assert(lttv_iattribute_find_by_path(main_win->current_tab->attributes,
-           "hooks/showviewer", LTTV_POINTER, &value));
-  tmp = (LttvHooks*)*(value.v_pointer);
-  if(tmp == NULL)
-  {
-    g_warning("The viewer(s) did not add any show hook");
-    return;
-  }
-
-  
-  // Call the show, where viewers add hooks to context and fill the
-  // time and number of events requested it the time_requests GArray.
-  lttv_hooks_call(tmp, NULL);
-
- 
+  return tab;
 }
 
 /*