X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fcfv.c;h=33bcdd2a8c9df1bf1efff772c9450b6aaf88b10e;hb=f0d243f7b3a3fd1f5fe74f9f272213192dc9cdaa;hp=276e40ae0d0f7d4606f0f1d3d27d684e70f6cc44;hpb=b9a010a28d9625c9d31968aa44f1a553daccb294;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
index 276e40ae..33bcdd2a 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
@@ -16,29 +16,24 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <lttv/lttv.h>
+#include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/lttvwindowtraces.h>
 
 #include "cfv.h"
 #include "drawing.h"
 #include "processlist.h"
 #include "eventhooks.h"
-#include "cfv-private.h"
-#include <lttv/lttv.h>
 
 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));
-  //g_assert(GTK_WIDGET_CAN_FOCUS(widget));
-  //gtk_widget_grab_focus(widget);
-  g_debug("FOCUS GRABBED");
-}
-
-
 static gboolean
 header_size_allocate(GtkWidget *widget,
                         GtkAllocation *allocation,
@@ -53,6 +48,37 @@ header_size_allocate(GtkWidget *widget,
   return 0;
 }
 
+gboolean cfv_scroll_event(GtkWidget *widget, GdkEventScroll *event,
+		gpointer data)
+{
+  ControlFlowData *control_flow_data = (ControlFlowData*)data;
+	unsigned int cell_height =
+		get_cell_height(
+				GTK_TREE_VIEW(control_flow_data->process_list->process_list_widget));
+	gdouble new;
+
+  switch(event->direction) {
+    case GDK_SCROLL_UP:
+			{
+				new = gtk_adjustment_get_value(control_flow_data->v_adjust) 
+																	- cell_height;
+			}
+      break;
+    case GDK_SCROLL_DOWN:
+			{
+				new = gtk_adjustment_get_value(control_flow_data->v_adjust) 
+																	+ cell_height;
+			}
+      break;
+		default:
+			return FALSE;
+  }
+	if(new >= control_flow_data->v_adjust->lower &&
+			new <= control_flow_data->v_adjust->upper 
+					- control_flow_data->v_adjust->page_size)
+		gtk_adjustment_set_value(control_flow_data->v_adjust, new);
+	return TRUE;
+}
 
 
 /*****************************************************************************
@@ -67,12 +93,14 @@ header_size_allocate(GtkWidget *widget,
  * @return The widget created.
  */
 ControlFlowData *
-guicontrolflow(void)
+guicontrolflow(Tab *tab)
 {
   GtkWidget *process_list_widget, *drawing_widget, *drawing_area;
 
   ControlFlowData* control_flow_data = g_new(ControlFlowData,1) ;
 
+  control_flow_data->tab = tab;
+
   control_flow_data->v_adjust = 
     GTK_ADJUSTMENT(gtk_adjustment_new(  0.0,  /* Value */
               0.0,  /* Lower */
@@ -91,6 +119,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();
@@ -102,12 +131,27 @@ guicontrolflow(void)
                                 GTK_ADJUSTMENT(
                                    control_flow_data->v_adjust));
 
+  g_signal_connect (G_OBJECT(process_list_widget),
+        "scroll-event",
+        G_CALLBACK (cfv_scroll_event),
+        (gpointer)control_flow_data);
+	 g_signal_connect (G_OBJECT(drawing_area),
+        "scroll-event",
+        G_CALLBACK (cfv_scroll_event),
+        (gpointer)control_flow_data);
+	
   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();
@@ -119,7 +163,9 @@ guicontrolflow(void)
                   process_list_widget, FALSE, TRUE);
   gtk_paned_pack2(GTK_PANED(control_flow_data->h_paned),
                   drawing_widget, TRUE, TRUE);
- 
+  
+  gtk_container_set_border_width(GTK_CONTAINER(control_flow_data->box), 1);
+  
   /* Set the size of the drawing area */
   //drawing_Resize(drawing, h, w);
 
@@ -150,12 +196,6 @@ guicontrolflow(void)
   //inserted in the main window before the drawing area
   //can be configured (and this must happend bedore sending
   //data)
-
-  //g_signal_connect (G_OBJECT (process_list_widget), "grab-focus",
-  //g_signal_connect (G_OBJECT (control_flow_data->scrolled_window), 
-  //      "button-press-event",
-  //      G_CALLBACK (control_flow_grab_focus),
-  //      control_flow_data);
   
   return control_flow_data;
 
@@ -219,15 +259,4 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
  
 }
 
-GtkWidget *guicontrolflow_get_widget(ControlFlowData *control_flow_data)
-{
-  return control_flow_data->top_widget ;
-}
-
-ProcessList *guicontrolflow_get_process_list
-    (ControlFlowData *control_flow_data)
-{
-    return control_flow_data->process_list ;
-}
-