X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fprocesslist.c;h=cece72cb18c8364de99cc7ae3d94fe7d0834bf4e;hb=c9b629ae28a1d55249875faad19607874e759724;hp=d3ef83b2bb91aee6b7e4c7ddc49898b4fff94809;hpb=80fdc3cbffc8644a8fb39e1e0c2b65c86cd9439c;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
index d3ef83b2..cece72cb 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
@@ -16,7 +16,12 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
@@ -121,11 +126,11 @@ static gboolean process_list_equ_fct(gconstpointer a, gconstpointer b)
 
   if(likely(pa->pid != pb->pid))
     ret = FALSE;
-  else if(likely((pa->pid == 0 && (pa->cpu != pb->cpu))))
+  if(likely((pa->pid == 0 && (pa->cpu != pb->cpu))))
     ret = FALSE;
-  else if(unlikely(ltt_time_compare(pa->birth, pb->birth) != 0))
+  if(unlikely(ltt_time_compare(pa->birth, pb->birth) != 0))
     ret = FALSE;
-  else if(unlikely(pa->trace_num != pb->trace_num))
+  if(unlikely(pa->trace_num != pb->trace_num))
     ret = FALSE;
 
   return ret;
@@ -136,6 +141,30 @@ void destroy_hash_key(gpointer key);
 void destroy_hash_data(gpointer data);
 
 
+gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+{
+  ControlFlowData *control_flow_data = 
+      (ControlFlowData*)g_object_get_data(
+                G_OBJECT(widget),
+                "control_flow_data");
+  Drawing_t *drawing = control_flow_data->drawing;
+	unsigned int cell_height =
+		get_cell_height(GTK_TREE_VIEW(control_flow_data->process_list->process_list_widget));
+
+  switch(event->direction) {
+    case GDK_SCROLL_UP:
+      gtk_adjustment_set_value(control_flow_data->v_adjust,
+        gtk_adjustment_get_value(control_flow_data->v_adjust) - cell_height);
+      break;
+    case GDK_SCROLL_DOWN:
+      gtk_adjustment_set_value(control_flow_data->v_adjust,
+        gtk_adjustment_get_value(control_flow_data->v_adjust) + cell_height);
+      break;
+  }
+	return TRUE;
+}
+
+
 static void update_index_to_pixmap_each(ProcessInfo *key,
                                         HashedProcessData *value,
                                         ProcessList *process_list)
@@ -273,7 +302,6 @@ void copy_pixmap_to_screen(ProcessList *process_list,
   if(process_list->index_to_pixmap->len == 0) return;
   guint cell_height = process_list->cell_height;
 
-  //cell_height = 24; //FIXME
   /* Get indexes */
   gint begin = floor(y/(double)cell_height);
   gint end = MIN(ceil((y+height)/(double)cell_height),
@@ -284,7 +312,8 @@ void copy_pixmap_to_screen(ProcessList *process_list,
     g_assert(i<process_list->index_to_pixmap->len);
     /* Render the pixmap to the screen */
     GdkPixmap *pixmap = 
-      (GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+      //(GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+      GDK_PIXMAP(g_ptr_array_index(process_list->index_to_pixmap, i));
 
     gdk_draw_drawable (dest,
         gc,
@@ -362,6 +391,10 @@ ProcessList *processlist_construct(void)
   renderer = gtk_cell_renderer_text_new ();
   process_list->renderer = renderer;
 
+	gint vertical_separator;
+	gtk_widget_style_get (GTK_WIDGET (process_list->process_list_widget),
+			"vertical-separator", &vertical_separator,
+			NULL);
   gtk_cell_renderer_get_size(renderer,
       GTK_WIDGET(process_list->process_list_widget),
       NULL,
@@ -369,12 +402,16 @@ ProcessList *processlist_construct(void)
       NULL,
       NULL,
       &process_list->cell_height);
-  
+	
+#if GTK_CHECK_VERSION(2,4,15)
   guint ypad;
   g_object_get(G_OBJECT(renderer), "ypad", &ypad, NULL);
 
   process_list->cell_height += ypad;
-  
+#endif
+  process_list->cell_height += vertical_separator;
+	
+
   column = gtk_tree_view_column_new_with_attributes ( "Process",
                 renderer,
                 "text",
@@ -509,6 +546,26 @@ void destroy_hash_data(gpointer data)
   g_free(data);
 }
 
+
+void processlist_set_name(ProcessList *process_list,
+    GQuark name,
+    HashedProcessData *hashed_process_data)
+{
+  gtk_list_store_set (  process_list->list_store, &hashed_process_data->y_iter,
+        PROCESS_COLUMN, g_quark_to_string(name),
+        -1);
+}
+
+void processlist_set_ppid(ProcessList *process_list,
+    guint ppid,
+    HashedProcessData *hashed_process_data)
+{
+  gtk_list_store_set (  process_list->list_store, &hashed_process_data->y_iter,
+        PPID_COLUMN, ppid,
+        -1);
+}
+
+
 int processlist_add(  ProcessList *process_list,
       Drawing_t *drawing,
       guint pid,
@@ -516,7 +573,7 @@ int processlist_add(  ProcessList *process_list,
       guint ppid,
       LttTime *birth,
       guint trace_num,
-      const gchar *name,
+      GQuark name,
       guint *height,
       ProcessInfo **pm_process_info,
       HashedProcessData **pm_hashed_process_data)
@@ -557,7 +614,7 @@ int processlist_add(  ProcessList *process_list,
                           &hashed_process_data->y_iter);
 
   gtk_list_store_set (  process_list->list_store, &hashed_process_data->y_iter,
-        PROCESS_COLUMN, name,
+        PROCESS_COLUMN, g_quark_to_string(name),
         PID_COLUMN, pid,
         PPID_COLUMN, ppid,
         CPU_COLUMN, cpu,
@@ -577,7 +634,6 @@ int processlist_add(  ProcessList *process_list,
 
   hashed_process_data->height = process_list->cell_height;
 
-  //hashed_process_data->height = 24; // FIXME
   g_assert(hashed_process_data->height != 0);
 
   *height = hashed_process_data->height * process_list->number_of_process;