X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=db39fcbc5ec43084b2fbfd580bdf8313edc3187a;hb=e433e6d6da2cc572a3d14257abe18bc3afd5c7e6;hp=fa31717386ae3c75675343d4178f339b9448689a;hpb=adff96cc8d870f44e8c10ae7b1e32e0e4c2f6859;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index fa317173..db39fcbc 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -49,6 +49,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <string.h>
 
 #include <ltt/ltt.h>
@@ -64,6 +65,7 @@
 #include <lttv/print.h>
 #include <lttvwindow/lttvwindow.h>
 #include <lttvwindow/lttvwindowtraces.h>
+#include <lttvwindow/lttv_plugin_tab.h>
 
 #include "hGuiEventsInsert.xpm"
 
@@ -74,7 +76,7 @@
 #endif
 
 #define abs(a) (((a)<0)?(-a):(a))
-
+#define max(a,b) ((a)>(b)?(a):(b))
 
 /** Array containing instanced objects. Used when module is unloaded */
 static GSList *g_event_viewer_data_list = NULL ;
@@ -91,6 +93,7 @@ typedef enum _ScrollDirection{
 typedef struct _EventViewerData {
 
   Tab * tab;
+  LttvPluginTab *ptab;
   LttvHooks  * event_hooks;
 
   /* previous value is used to determine if it is a page up/down or
@@ -153,9 +156,9 @@ gboolean filter_changed(void * hook_data, void * call_data);
 static void request_background_data(EventViewerData *event_viewer_data);
 
 //! Event Viewer's constructor hook
-GtkWidget *h_gui_events(Tab *tab);
+GtkWidget *h_gui_events(LttvPlugin *plugin);
 //! Event Viewer's constructor
-EventViewerData *gui_events(Tab *tab);
+EventViewerData *gui_events(LttvPluginTab *ptab);
 //! Event Viewer's destructor
 void gui_events_destructor(EventViewerData *event_viewer_data);
 void gui_events_free(EventViewerData *event_viewer_data);
@@ -179,6 +182,7 @@ static void tree_v_size_request_cb (GtkWidget *widget,
 static void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data);
 static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1,
     gint arg2, gpointer data);
+static gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data);
 static gboolean key_handler(GtkWidget *widget, GdkEventKey *event,
     gpointer user_data);
 
@@ -213,9 +217,10 @@ enum
  * @return The widget created.
  */
 GtkWidget *
-h_gui_events(Tab * tab)
+h_gui_events(LttvPlugin *plugin)
 {
-  EventViewerData* event_viewer_data = gui_events(tab) ;
+  LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin);
+  EventViewerData* event_viewer_data = gui_events(ptab) ;
   if(event_viewer_data)
     return event_viewer_data->top_widget;
   else return NULL;
@@ -229,14 +234,15 @@ h_gui_events(Tab * tab)
  * @return The Event viewer data created.
  */
 EventViewerData *
-gui_events(Tab *tab)
+gui_events(LttvPluginTab *ptab)
 {
   LttTime end;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   EventViewerData* event_viewer_data = g_new(EventViewerData,1) ;
-
+  Tab *tab = ptab->tab;
   event_viewer_data->tab = tab;
+  event_viewer_data->ptab = ptab;
 
   LttvTracesetContext * tsc =
         lttvwindow_get_traceset_context(event_viewer_data->tab);
@@ -319,6 +325,10 @@ gui_events(Tab *tab)
       G_CALLBACK(key_handler),
       event_viewer_data);
 
+  g_signal_connect (G_OBJECT(event_viewer_data->tree_v), "scroll-event",
+      G_CALLBACK(tree_v_scroll_handler),
+      event_viewer_data);
+
   // Use on each column!
   //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v,
   //GTK_TREE_VIEW_COLUMN_FIXED);
@@ -692,6 +702,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
   if(lttvwindow_events_request_pending(event_viewer_data->tab)) return;
   
   /* If no prior position... */
+#if 0
   if(ltt_time_compare(
         lttv_traceset_context_position_get_time(
           event_viewer_data->currently_selected_position),
@@ -705,7 +716,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
     return;
 
   }
-
+#endif //0
   
   g_debug("tree view move cursor : arg1 is %u and arg2 is %d",
       (guint)arg1, arg2);
@@ -724,17 +735,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
           /* Must get down one event and select the last one */
           gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
                 GTK_TREE_VIEW(event_viewer_data->tree_v)));
-          event_viewer_data->update_cursor = FALSE;
-          gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-              gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1);
-          event_viewer_data->update_cursor = TRUE;
-          path = gtk_tree_path_new_from_indices(
-              event_viewer_data->pos->len - 1, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                   path, NULL, FALSE);
-          gtk_tree_path_free(path);
-        }
-      }
+					event_viewer_data->update_cursor = FALSE;
+					gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+							gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1);
+					event_viewer_data->update_cursor = TRUE;
+					if(event_viewer_data->pos->len > 0) {
+						path = gtk_tree_path_new_from_indices(
+								max(0, event_viewer_data->pos->len - 1), -1);
+						if(path) {
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																			 path, NULL, FALSE);
+							gtk_tree_path_free(path);
+						}
+					}
+				}
+			} else {
+				/* Must get down one event and select the last one */
+				gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
+							GTK_TREE_VIEW(event_viewer_data->tree_v)));
+				event_viewer_data->update_cursor = FALSE;
+				gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+						gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1);
+				event_viewer_data->update_cursor = TRUE;
+				if(event_viewer_data->pos->len > 0) {
+					path = gtk_tree_path_new_from_indices(
+							max(0, event_viewer_data->pos->len - 1), -1);
+					if(path) {
+						gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																		 path, NULL, FALSE);
+						gtk_tree_path_free(path);
+					}
+				}
+			}
 
     } else {
       if(event_viewer_data->pos->len > 0) {
@@ -748,17 +780,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
           /* Must get up one event and select the first one */
           gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
                 GTK_TREE_VIEW(event_viewer_data->tree_v)));
-          event_viewer_data->update_cursor = FALSE;
-          gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-              gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1);
-          event_viewer_data->update_cursor = TRUE;
-          path = gtk_tree_path_new_from_indices(
-              0, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                   path, NULL, FALSE);
-          gtk_tree_path_free(path);
-        }
-      }
+					event_viewer_data->update_cursor = FALSE;
+					gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+							gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1);
+					event_viewer_data->update_cursor = TRUE;
+					if(event_viewer_data->pos->len > 0) {
+						path = gtk_tree_path_new_from_indices(
+								0, -1);
+						if(path) {
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																			 path, NULL, FALSE);
+							gtk_tree_path_free(path);
+						}
+					}
+				}
+			} else {
+				/* Must get up one event and select the first one */
+				gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
+							GTK_TREE_VIEW(event_viewer_data->tree_v)));
+				event_viewer_data->update_cursor = FALSE;
+				gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+						gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1);
+				event_viewer_data->update_cursor = TRUE;
+				if(event_viewer_data->pos->len > 0) {
+					path = gtk_tree_path_new_from_indices(
+							0, -1);
+					if(path) {
+						gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																		 path, NULL, FALSE);
+						gtk_tree_path_free(path);
+					}
+				}
+			}
     }
     break;
   case GTK_MOVEMENT_PAGES:
@@ -774,21 +827,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
           /* Must get down one page and select the last one */
           gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
                 GTK_TREE_VIEW(event_viewer_data->tree_v)));
-          
-          event_viewer_data->update_cursor = FALSE;
-          gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-              gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2);
-          event_viewer_data->update_cursor = TRUE;
-
-          path = gtk_tree_path_new_from_indices(
-              event_viewer_data->pos->len - 1, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                   path, NULL, FALSE);
-          gtk_tree_path_free(path);
-
-        }
-      }
-
+					event_viewer_data->update_cursor = FALSE;
+					gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+							gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2);
+					event_viewer_data->update_cursor = TRUE;
+					if(event_viewer_data->pos->len > 0) {
+						path = gtk_tree_path_new_from_indices(
+								event_viewer_data->pos->len - 1, -1);
+						if(path) {
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																			 path, NULL, FALSE);
+							gtk_tree_path_free(path);
+						}
+					}
+				}
+			} else {
+			/* Must get down one page and select the last one */
+				gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
+							GTK_TREE_VIEW(event_viewer_data->tree_v)));
+				event_viewer_data->update_cursor = FALSE;
+				gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+						gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 2);
+				event_viewer_data->update_cursor = TRUE;
+				if(event_viewer_data->pos->len > 0) {
+					path = gtk_tree_path_new_from_indices(
+							event_viewer_data->pos->len - 1, -1);
+					if(path) {
+						gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																		 path, NULL, FALSE);
+						gtk_tree_path_free(path);
+					}
+				}
+			}
     } else {
       /* Move one page up */
       if(event_viewer_data->pos->len > 0) {
@@ -801,20 +871,38 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
           /* Must get up one page and select the first one */
           gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
                 GTK_TREE_VIEW(event_viewer_data->tree_v)));
-          
-          event_viewer_data->update_cursor = FALSE;
-          gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-              gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2);
-          event_viewer_data->update_cursor = TRUE;
-
-          path = gtk_tree_path_new_from_indices(
-              0, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                   path, NULL, FALSE);
-          gtk_tree_path_free(path);
-        }
-      }
-
+					event_viewer_data->update_cursor = FALSE;
+					gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+							gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2);
+					event_viewer_data->update_cursor = TRUE;
+					if(event_viewer_data->pos->len > 0) {
+						path = gtk_tree_path_new_from_indices(
+								0, -1);
+						if(path) {
+							gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																			 path, NULL, FALSE);
+							gtk_tree_path_free(path);
+						}
+					}
+				}
+			}	else {
+				/* Must get up one page and select the first one */
+				gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(
+							GTK_TREE_VIEW(event_viewer_data->tree_v)));
+				event_viewer_data->update_cursor = FALSE;
+				gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+						gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 2);
+				event_viewer_data->update_cursor = TRUE;
+				if(event_viewer_data->pos->len > 0) {
+					path = gtk_tree_path_new_from_indices(
+							0, -1);
+					if(path) {
+						gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+																		 path, NULL, FALSE);
+						gtk_tree_path_free(path);
+					}
+				}
+			}
     }
     break;
   default:
@@ -942,6 +1030,27 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
 #endif //0
 }
 
+
+gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+{
+	EventViewerData *event_viewer_data = (EventViewerData*) data;
+	Tab *tab = event_viewer_data->tab;
+
+	switch(event->direction) {
+		case GDK_SCROLL_UP:
+			gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+				gtk_adjustment_get_value(event_viewer_data->vadjust_c) - 1);
+			break;
+		case GDK_SCROLL_DOWN:
+			gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+				gtk_adjustment_get_value(event_viewer_data->vadjust_c) + 1);
+			break;
+		default:
+			g_error("Only scroll up and down expected");
+	}
+	return TRUE;
+}
+
 void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) data;
@@ -955,22 +1064,24 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
 
   /* On cursor change, modify the currently selected event by calling
    * the right API function */
-  
-  
   if(event_viewer_data->report_position) {
-    gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-        &path, NULL);
-    if(gtk_tree_model_get_iter(model,&iter,path)){
-      gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
-      
-      if(lttv_traceset_context_pos_pos_compare(pos, 
-            event_viewer_data->currently_selected_position) != 0)
-        lttvwindow_report_current_position(tab, pos);
-    }else{
-      g_warning("Can not get iter\n");
-    }
-    gtk_tree_path_free(path);
-  }
+    if(event_viewer_data->pos->len > 0) {
+			gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+					&path, NULL);
+			if(path) {
+				if(gtk_tree_model_get_iter(model,&iter,path)){
+					gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
+					
+					if(lttv_traceset_context_pos_pos_compare(pos, 
+								event_viewer_data->currently_selected_position) != 0)
+						lttvwindow_report_current_position(tab, pos);
+				}else{
+					g_warning("Can not get iter\n");
+				}
+				gtk_tree_path_free(path);
+			}
+		}
+	}
 }
 
 
@@ -1077,6 +1188,13 @@ static __inline gint get_cell_height(GtkTreeView *TreeView)
   
   gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height);
   
+  gint vertical_separator;
+  gtk_widget_style_get (GTK_WIDGET (TreeView),
+      "vertical-separator", &vertical_separator,
+      NULL);
+	
+	height += vertical_separator;
+
   return height;
 }
 
@@ -1369,6 +1487,7 @@ int event_hook(void *hook_data, void *call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*)hook_data;
   LttvTracefileContext *tfc = (LttvTracefileContext*)call_data;
+  LttvTracefileState *tfs = (LttvTracefileState*)call_data;
   LttEvent *e = ltt_tracefile_get_event(tfc->tf);
 
   LttvFilter *filter = event_viewer_data->main_win_filter;
@@ -1379,10 +1498,9 @@ int event_hook(void *hook_data, void *call_data)
 
   LttFacility *facility = ltt_event_facility(e);
   LttEventType *event_type = ltt_event_eventtype(e);
-  LttField *field = ltt_event_field(e);
   LttTime time = ltt_event_time(e);
 
-  guint cpu = ltt_tracefile_num(tfc->tf);
+  guint cpu = tfs->cpu;
   LttvTraceState *ts = (LttvTraceState*)tfc->t_context;
   LttvProcessState *process = ts->running_process[cpu];
   
@@ -1397,7 +1515,7 @@ int event_hook(void *hook_data, void *call_data)
 
   lttv_event_to_string(e, desc, TRUE, TRUE, (LttvTracefileState*)tfc);
 
-  g_info("field : %s", desc->str);
+  g_info("detail : %s", desc->str);
   
   gtk_list_store_append (event_viewer_data->store_m, &iter);
   gtk_list_store_set (event_viewer_data->store_m, &iter,
@@ -1422,9 +1540,11 @@ int event_hook(void *hook_data, void *call_data)
           event_viewer_data->currently_selected_position) == 0) {
       GtkTreePath *path = gtk_tree_path_new_from_indices(
                           event_viewer_data->pos->len - 1, -1);
-      gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                             path, NULL, FALSE);
-      gtk_tree_path_free(path);
+			if(path) {
+	      gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+  	                           path, NULL, FALSE);
+    	  gtk_tree_path_free(path);
+			}
     }
   }
   
@@ -1448,9 +1568,11 @@ static void event_update_selection(EventViewerData *event_viewer_data)
     if(lttv_traceset_context_pos_pos_compare(cur_pos, 
           event_viewer_data->currently_selected_position) == 0) {
       GtkTreePath *path = gtk_tree_path_new_from_indices(i, -1);
-      gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                             path, NULL, FALSE);
-      gtk_tree_path_free(path);
+			if(path) {
+	      gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+	                             path, NULL, FALSE);
+	      gtk_tree_path_free(path);
+			}
     }
   }
 }
@@ -1614,6 +1736,8 @@ gboolean traceset_changed(void * hook_data, void * call_data)
   get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
   //  event_viewer_data->vadjust_c->value = 0;
 
+	request_background_data(event_viewer_data);
+	
   return FALSE;
 }
 
@@ -1636,6 +1760,7 @@ gint redraw_notify(void *hook_data, void *call_data)
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
 
   get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
+  return 0;
 }
 
 void gui_events_free(EventViewerData *event_viewer_data)