make inline correct

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / cfv.c

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
index 64254f24f87361324e941e5bfdfbf6f220328364..8d4a339ec2b47ff25bc3fd2045f0fb3ac6cada1b 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
@@ -29,13 +29,22 @@
 
 extern GSList *g_control_flow_data_list;
 
-static void control_flow_grab_focus(GtkWidget *widget, gpointer data){
-  ControlFlowData * control_flow_data = (ControlFlowData *)data;
-  Tab * tab = control_flow_data->tab;
-  lttvwindow_report_focus(tab, guicontrolflow_get_widget(control_flow_data));
+static gboolean
+header_size_allocate(GtkWidget *widget,
+                        GtkAllocation *allocation,
+                        gpointer user_data)
+{
+  Drawing_t *drawing = (Drawing_t*)user_data;
+
+  gtk_widget_set_size_request(drawing->ruler, -1, allocation->height);
+  //gtk_widget_queue_resize(drawing->padding);
+  //gtk_widget_queue_resize(drawing->ruler);
+  gtk_container_check_resize(GTK_CONTAINER(drawing->ruler_hbox));
+  return 0;
 }
 
 
+
 /*****************************************************************************
  *                     Control Flow Viewer class implementation              *
  *****************************************************************************/
@@ -54,6 +63,14 @@ guicontrolflow(void)
 
   ControlFlowData* control_flow_data = g_new(ControlFlowData,1) ;
 
+  control_flow_data->v_adjust = 
+    GTK_ADJUSTMENT(gtk_adjustment_new(  0.0,  /* Value */
+              0.0,  /* Lower */
+              0.0,  /* Upper */
+              0.0,  /* Step inc. */
+              0.0,  /* Page inc. */
+              0.0));  /* page size */
+
   /* Create the drawing */
   control_flow_data->drawing = drawing_construct(control_flow_data);
   
@@ -64,6 +81,7 @@ guicontrolflow(void)
     drawing_get_drawing_area(control_flow_data->drawing);
 
   control_flow_data->number_of_process = 0;
+  control_flow_data->background_info_waiting = 0;
 
   /* Create the Process list */
   control_flow_data->process_list = processlist_construct();
@@ -71,33 +89,34 @@ guicontrolflow(void)
   process_list_widget = 
     processlist_get_widget(control_flow_data->process_list);
   
-  //control_flow_data->Inside_HBox_V = gtk_hbox_new(0, 0);
-  control_flow_data->h_paned = gtk_hpaned_new();
-    
-  gtk_paned_pack1(GTK_PANED(control_flow_data->h_paned), process_list_widget, FALSE, TRUE);
-  gtk_paned_pack2(GTK_PANED(control_flow_data->h_paned), drawing_widget, TRUE, TRUE);
-
-  control_flow_data->v_adjust = 
-    GTK_ADJUSTMENT(gtk_adjustment_new(  0.0,  /* Value */
-              0.0,  /* Lower */
-              0.0,  /* Upper */
-              0.0,  /* Step inc. */
-              0.0,  /* Page inc. */
-              0.0));  /* page size */
-  
-  control_flow_data->scrolled_window =
-      gtk_scrolled_window_new (NULL,
-      control_flow_data->v_adjust);
-  
-  gtk_scrolled_window_set_policy(
-    GTK_SCROLLED_WINDOW(control_flow_data->scrolled_window) ,
-    GTK_POLICY_NEVER,
-    GTK_POLICY_AUTOMATIC);
-
-  gtk_scrolled_window_add_with_viewport(
-    GTK_SCROLLED_WINDOW(control_flow_data->scrolled_window),
-    control_flow_data->h_paned);
+  gtk_tree_view_set_vadjustment(GTK_TREE_VIEW(process_list_widget),
+                                GTK_ADJUSTMENT(
+                                   control_flow_data->v_adjust));
+
+  g_signal_connect (G_OBJECT(control_flow_data->process_list->button),
+        "size-allocate",
+        G_CALLBACK(header_size_allocate),
+        (gpointer)control_flow_data->drawing);
+#if 0  /* not ready */
+  g_signal_connect (
+       // G_OBJECT(control_flow_data->process_list->process_list_widget),
+        G_OBJECT(control_flow_data->process_list->list_store),
+        "row-changed",
+        G_CALLBACK (tree_row_activated),
+        (gpointer)control_flow_data);
+#endif //0
   
+  control_flow_data->h_paned = gtk_hpaned_new();
+  control_flow_data->box = gtk_event_box_new();
+  control_flow_data->top_widget = control_flow_data->box;
+  gtk_container_add(GTK_CONTAINER(control_flow_data->box),
+                    control_flow_data->h_paned);
+      
+  gtk_paned_pack1(GTK_PANED(control_flow_data->h_paned),
+                  process_list_widget, FALSE, TRUE);
+  gtk_paned_pack2(GTK_PANED(control_flow_data->h_paned),
+                  drawing_widget, TRUE, TRUE);
+ 
   /* Set the size of the drawing area */
   //drawing_Resize(drawing, h, w);
 
@@ -107,10 +126,10 @@ guicontrolflow(void)
   gtk_widget_show(drawing_widget);
   gtk_widget_show(process_list_widget);
   gtk_widget_show(control_flow_data->h_paned);
-  gtk_widget_show(control_flow_data->scrolled_window);
+  gtk_widget_show(control_flow_data->box);
   
   g_object_set_data_full(
-      G_OBJECT(control_flow_data->scrolled_window),
+      G_OBJECT(control_flow_data->top_widget),
       "control_flow_data",
       control_flow_data,
       (GDestroyNotify)guicontrolflow_destructor);
@@ -129,10 +148,6 @@ guicontrolflow(void)
   //can be configured (and this must happend bedore sending
   //data)
 
-  g_signal_connect (G_OBJECT (process_list_widget), "grab-focus",
-        G_CALLBACK (control_flow_grab_focus),
-        control_flow_data);
-  
   
   return control_flow_data;
 
@@ -154,7 +169,6 @@ guicontrolflow_destructor_full(ControlFlowData *control_flow_data)
 void
 guicontrolflow_destructor(ControlFlowData *control_flow_data)
 {
-  guint index;
   Tab *tab = control_flow_data->tab;
   
   g_info("CFV.c : guicontrolflow_destructor, %p", control_flow_data);
@@ -167,6 +181,10 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
   if(tab != NULL)
   {
       /* Delete reading hooks */
+    lttvwindow_unregister_traceset_notify(tab,
+        traceset_notify,
+        control_flow_data);
+    
     lttvwindow_unregister_time_window_notify(tab,
         update_time_window_hook,
         control_flow_data);
@@ -182,7 +200,9 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
     
     lttvwindow_events_request_remove_all(control_flow_data->tab,
                                          control_flow_data);
+
   }
+  lttvwindowtraces_background_notify_remove(control_flow_data);
   g_control_flow_data_list = 
          g_slist_remove(g_control_flow_data_list,control_flow_data);
 
@@ -191,15 +211,4 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
  
 }
 
-GtkWidget *guicontrolflow_get_widget(ControlFlowData *control_flow_data)
-{
-  return control_flow_data->scrolled_window ;
-}
-
-ProcessList *guicontrolflow_get_process_list
-    (ControlFlowData *control_flow_data)
-{
-    return control_flow_data->process_list ;
-}
-