Add per list filter
[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c
index 4cea582a8f9922ca5695a2975eebc2b91bf0c84a..2e123ad6ea4b0388bad64df41fa46a268e59bc64 100644 (file)
@@ -1,5 +1,6 @@
 /* This file is part of the Linux Trace Toolkit viewer
  * Copyright (C) 2003-2004 Mathieu Desnoyers and XangXiu Yang
+ *               2005 Mathieu Desnoyers
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -35,6 +36,8 @@
  *
  * Authors : Mathieu Desnoyers and XangXiu Yang, June to December 2003
  *           Inspired from original LTT, made by Karim Yaghmour
+ *
+ *           Mostly rewritten by Mathieu Desnoyers, August 2005.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,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>
 #include <lttv/filter.h>
 #include <lttv/print.h>
 #include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/lttvwindowtraces.h>
+#include <lttvwindow/lttv_plugin_tab.h>
+#include <lttvwindow/support.h>
+#include "lttv_plugin_evd.h"
 
+#include "events.h"
 #include "hGuiEventsInsert.xpm"
 
 #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
@@ -70,7 +79,8 @@
 #endif
 
 #define abs(a) (((a)<0)?(-a):(a))
-
+#define max(a,b) ((a)>(b)?(a):(b))
+#define min(a,b) ((a)<(b)?(a):(b))
 
 /** Array containing instanced objects. Used when module is unloaded */
 static GSList *g_event_viewer_data_list = NULL ;
@@ -84,57 +94,22 @@ typedef enum _ScrollDirection{
   SCROLL_NONE
 } ScrollDirection;
 
-typedef struct _EventViewerData {
-
-  Tab * tab;
-  LttvHooks  * event_hooks;
-
-  /* previous value is used to determine if it is a page up/down or
-   * step up/down, in which case we move of a certain amount of events (one or
-   * the number of events shown on the screen) instead of changing begin time.
-   */
-  double       previous_value;
-
-  //scroll window containing Tree View
-  GtkWidget * scroll_win;
-
-  /* Model containing list data */
-  GtkListStore *store_m;
-
-  GPtrArray *pos; /* Array of LttvTracesetContextPosition * */
-  
-  GtkWidget *hbox_v;
-  /* Widget to display the data in a columned list */
-  GtkWidget *tree_v;
-  GtkAdjustment *vtree_adjust_c ;
-  GtkWidget *button; /* a button of the header, used to get the header_height */
-  gint header_height;
-  
-  /* Vertical scrollbar and its adjustment */
-  GtkWidget *vscroll_vc;
-  GtkAdjustment *vadjust_c;
-  
-  /* Selection handler */
-  GtkTreeSelection *select_c;
-  
-  gint num_visible_events;
-  
-  gint currently_selected_event;
-
-} EventViewerData ;
-
 /** hook functions for update time interval, current time ... */
 gboolean update_current_time(void * hook_data, void * call_data);
+gboolean update_current_position(void * hook_data, void * call_data);
 //gboolean show_event_detail(void * hook_data, void * call_data);
 gboolean traceset_changed(void * hook_data, void * call_data);
+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);
+void gui_events_destructor(gpointer data);
+void gui_events_free(gpointer data);
 
 static gboolean
 header_size_allocate(GtkWidget *widget,
@@ -155,7 +130,11 @@ 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 void        filter_button      (GtkToolButton *toolbutton,
+                                          gpointer       user_data);
+static gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+static gboolean key_handler(GtkWidget *widget, GdkEventKey *event,
+    gpointer user_data);
 
 static void get_events(double time, EventViewerData *event_viewer_data);
 
@@ -186,11 +165,12 @@ 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->hbox_v;
+    return event_viewer_data->top_widget;
   else return NULL;
   
 }
@@ -202,14 +182,22 @@ 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) ;
-
+  EventViewerData* event_viewer_data = g_new(EventViewerData,1);
+  LttvPluginEVD *plugin_evd = g_object_new(LTTV_TYPE_PLUGIN_EVD, NULL);
+  plugin_evd->evd = event_viewer_data;
+  Tab *tab = ptab->tab;
   event_viewer_data->tab = tab;
+  event_viewer_data->ptab = ptab;
+  GtkWidget *tmp_toolbar_icon;
+
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+
   
   event_viewer_data->event_hooks = lttv_hooks_new();
   lttv_hooks_add(event_viewer_data->event_hooks,
@@ -219,8 +207,15 @@ gui_events(Tab *tab)
 
   lttvwindow_register_current_time_notify(tab, 
                 update_current_time,event_viewer_data);
+  lttvwindow_register_current_position_notify(tab, 
+                update_current_position,event_viewer_data);
   lttvwindow_register_traceset_notify(tab, 
                 traceset_changed,event_viewer_data);
+  lttvwindow_register_filter_notify(tab,
+                filter_changed, event_viewer_data);
+  lttvwindow_register_redraw_notify(tab,
+                evd_redraw_notify, event_viewer_data);
+  
 
   event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_show (event_viewer_data->scroll_win);
@@ -228,7 +223,19 @@ gui_events(Tab *tab)
       GTK_SCROLLED_WINDOW(event_viewer_data->scroll_win), 
       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
-  event_viewer_data->currently_selected_event = -1;
+  event_viewer_data->currently_selected_position =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->first_event =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->last_event =
+    lttv_traceset_context_position_new(tsc);
+
+  event_viewer_data->main_win_filter = lttvwindow_get_filter(tab);
+
+  event_viewer_data->update_cursor = TRUE;
+  event_viewer_data->report_position = TRUE;
+
+  event_viewer_data->last_tree_update_time = 0;
 
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
@@ -265,6 +272,16 @@ gui_events(Tab *tab)
         G_CALLBACK (tree_v_move_cursor_cb),
         event_viewer_data);
 
+  g_signal_connect (G_OBJECT(event_viewer_data->tree_v), "key-press-event",
+      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);
@@ -391,9 +408,36 @@ gui_events(Tab *tab)
       event_viewer_data->tree_v);
 
   event_viewer_data->hbox_v = gtk_hbox_new(0, 0);
+  event_viewer_data->top_widget = event_viewer_data->hbox_v;
+  plugin_evd->parent.top_widget = event_viewer_data->hbox_v;
+
+  event_viewer_data->toolbar = gtk_toolbar_new();
+  gtk_toolbar_set_orientation(GTK_TOOLBAR(event_viewer_data->toolbar),
+                              GTK_ORIENTATION_VERTICAL);
+
+  tmp_toolbar_icon = create_pixmap (main_window_get_widget(tab),
+      "guifilter16x16.png");
+  gtk_widget_show(tmp_toolbar_icon);
+  event_viewer_data->button_filter = gtk_tool_button_new(tmp_toolbar_icon,
+      "Filter");
+  g_signal_connect (G_OBJECT(event_viewer_data->button_filter),
+        "clicked",
+        G_CALLBACK (filter_button),
+        (gpointer)plugin_evd);
+  gtk_toolbar_insert(GTK_TOOLBAR(event_viewer_data->toolbar),
+      event_viewer_data->button_filter,
+      0);
+  gtk_toolbar_set_style(GTK_TOOLBAR(event_viewer_data->toolbar),
+      GTK_TOOLBAR_ICONS);
+  gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v),
+      event_viewer_data->toolbar, FALSE, FALSE, 0);
+  event_viewer_data->filter = NULL;
+
   gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v),
       event_viewer_data->scroll_win, TRUE, TRUE, 0);
 
+  gtk_container_set_border_width(GTK_CONTAINER(event_viewer_data->hbox_v), 1);
+
   /* Create vertical scrollbar and pack it */
   event_viewer_data->vscroll_vc = gtk_vscrollbar_new(NULL);
   gtk_range_set_update_policy (GTK_RANGE(event_viewer_data->vscroll_vc),
@@ -423,20 +467,20 @@ gui_events(Tab *tab)
   event_viewer_data->vadjust_c->page_size = 2.0;
   //    event_viewer_data->vtree_adjust_c->upper;
   /*  Raw event trace */
+  gtk_widget_show(GTK_WIDGET(event_viewer_data->button_filter));
+  gtk_widget_show(event_viewer_data->toolbar);
   gtk_widget_show(event_viewer_data->hbox_v);
   gtk_widget_show(event_viewer_data->tree_v);
   gtk_widget_show(event_viewer_data->vscroll_vc);
 
   /* Add the object's information to the module's array */
   g_event_viewer_data_list = g_slist_append(g_event_viewer_data_list,
-      event_viewer_data);
+      plugin_evd);
 
   event_viewer_data->num_visible_events = 1;
 
   //get the life span of the traceset and set the upper of the scroll bar
   
-  LttvTracesetContext * tsc =
-        lttvwindow_get_traceset_context(event_viewer_data->tab);
   TimeInterval time_span = tsc->time_span;
   end = ltt_time_sub(time_span.end_time, time_span.start_time);
 
@@ -450,9 +494,18 @@ gui_events(Tab *tab)
  //
   g_object_set_data_full(
       G_OBJECT(event_viewer_data->hbox_v),
-      "event_viewer_data",
-      event_viewer_data,
+      "plugin_data",
+      plugin_evd,
       (GDestroyNotify)gui_events_free);
+
+  g_object_set_data(
+      G_OBJECT(event_viewer_data->hbox_v),
+      "event_viewer_data",
+      event_viewer_data);
+  
+  event_viewer_data->background_info_waiting = 0;
+
+  request_background_data(event_viewer_data);
   
 
   return event_viewer_data;
@@ -460,6 +513,82 @@ gui_events(Tab *tab)
 
 
 
+static gint background_ready(void *hook_data, void *call_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData *)hook_data;
+  LttvTrace *trace = (LttvTrace*)call_data;
+
+  event_viewer_data->background_info_waiting--;
+
+  if(event_viewer_data->background_info_waiting == 0) {
+    g_message("event viewer : background computation data ready.");
+
+    evd_redraw_notify(event_viewer_data, NULL);
+  }
+
+  return 0;
+}
+
+
+static void request_background_data(EventViewerData *event_viewer_data)
+{
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  gint num_traces = lttv_traceset_number(tsc->ts);
+  gint i;
+  LttvTrace *trace;
+  LttvTraceState *tstate;
+
+  LttvHooks *background_ready_hook = 
+    lttv_hooks_new();
+  lttv_hooks_add(background_ready_hook, background_ready, event_viewer_data,
+      LTTV_PRIO_DEFAULT);
+  event_viewer_data->background_info_waiting = 0;
+  
+  for(i=0;i<num_traces;i++) {
+    trace = lttv_traceset_get(tsc->ts, i);
+    tstate = LTTV_TRACE_STATE(tsc->traces[i]);
+
+    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE
+        && !tstate->has_precomputed_states) {
+
+      if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
+                                          trace) == FALSE) {
+        /* We first remove requests that could have been done for the same
+         * information. Happens when two viewers ask for it before servicing
+         * starts.
+         */
+        if(!lttvwindowtraces_background_request_find(trace, "state"))
+          lttvwindowtraces_background_request_queue(
+              main_window_get_widget(event_viewer_data->tab), trace, "state");
+        lttvwindowtraces_background_notify_queue(event_viewer_data,
+                                                 trace,
+                                                 ltt_time_infinite,
+                                                 NULL,
+                                                 background_ready_hook);
+        event_viewer_data->background_info_waiting++;
+      } else { /* in progress */
+      
+        lttvwindowtraces_background_notify_current(event_viewer_data,
+                                                   trace,
+                                                   ltt_time_infinite,
+                                                   NULL,
+                                                   background_ready_hook);
+        event_viewer_data->background_info_waiting++;
+      }
+    } else {
+      /* Data ready. By its nature, this viewer doesn't need to have
+       * its data ready hook called htere, because a background
+       * request is always linked with a redraw.
+       */
+    }
+    
+  }
+
+  lttv_hooks_destroy(background_ready_hook);
+
+}
+
 static gboolean
 header_size_allocate(GtkWidget *widget,
                         GtkAllocation *allocation,
@@ -477,6 +606,9 @@ void tree_v_set_cursor(EventViewerData *event_viewer_data)
 {
   GtkTreePath *path;
   
+  g_debug("set cursor cb");
+
+#if 0
   if(event_viewer_data->currently_selected_event != -1)
     {
       path = gtk_tree_path_new_from_indices(
@@ -487,6 +619,7 @@ void tree_v_set_cursor(EventViewerData *event_viewer_data)
           path, NULL, FALSE);
       gtk_tree_path_free(path);
     }
+#endif //0
 }
 
 void tree_v_get_cursor(EventViewerData *event_viewer_data)
@@ -494,6 +627,10 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data)
   GtkTreePath *path;
   gint *indices;
   
+  g_debug("get cursor cb");
+  
+
+#if 0
   gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
       &path, NULL);
   indices = gtk_tree_path_get_indices(path);
@@ -504,10 +641,23 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data)
       event_viewer_data->currently_selected_event = -1;
   
   gtk_tree_path_free(path);
-
+#endif //0
 }
 
-
+/* Filter out the key repeats that come too fast */
+static gboolean key_handler(GtkWidget *widget, GdkEventKey *event,
+    gpointer user_data)
+{
+  EventViewerData *evd = (EventViewerData *)user_data;
+  g_debug("event time : %u , last time : %u", event->time,
+      evd->last_tree_update_time);
+  
+  if(guint32_before(event->time, evd->last_tree_update_time))
+    return TRUE;
+  else
+    return FALSE;
+}
 
 void tree_v_move_cursor_cb (GtkWidget *widget,
                             GtkMovementStep arg1,
@@ -519,23 +669,234 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
   gdouble value;
   EventViewerData *event_viewer_data = (EventViewerData*)data;
   
-  gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                            &path, NULL);
-  if(path == NULL)
-  {
+  g_debug("move cursor cb");
+  //gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+  //                          &path, NULL);
+  //if(path == NULL)
+  //{
     /* No prior cursor, put it at beginning of page
      * and let the execution do */
+  //  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);
+  //}
+
+  //indices = gtk_tree_path_get_indices(path);
+  
+  //value = gtk_adjustment_get_value(event_viewer_data->vadjust_c);
+  /* If events request pending, do nothing*/
+  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),
+        ltt_time_infinite) == 0) {
+    
     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);
-  }
 
-  indices = gtk_tree_path_get_indices(path);
-  
-  value = gtk_adjustment_get_value(event_viewer_data->vadjust_c);
+    gtk_tree_path_free(path);
+    return;
+
+  }
+#endif //0
   
   g_debug("tree view move cursor : arg1 is %u and arg2 is %d",
       (guint)arg1, arg2);
+
+  switch(arg1) {
+  case GTK_MOVEMENT_DISPLAY_LINES:
+    if(arg2 == 1) {
+      /* Move one line down */
+      if(event_viewer_data->pos->len > 0) {
+        LttvTracesetContextPosition *end_pos = 
+          (LttvTracesetContextPosition*)g_ptr_array_index(
+                                             event_viewer_data->pos,
+                                             event_viewer_data->pos->len-1);
+        if(lttv_traceset_context_pos_pos_compare(end_pos, 
+              event_viewer_data->currently_selected_position) == 0) {
+          /* 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 {
+                               /* 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) {
+        /* Move one line up */
+        LttvTracesetContextPosition *begin_pos = 
+          (LttvTracesetContextPosition*)g_ptr_array_index(
+                                             event_viewer_data->pos,
+                                             0);
+        if(lttv_traceset_context_pos_pos_compare(begin_pos, 
+              event_viewer_data->currently_selected_position) == 0) {
+          /* 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);
+                                               }
+                                       }
+                               }
+                       } 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:
+    if(arg2 == 1) {
+      /* Move one page down */
+      if(event_viewer_data->pos->len > 0) {
+        LttvTracesetContextPosition *end_pos = 
+          (LttvTracesetContextPosition*)g_ptr_array_index(
+                                             event_viewer_data->pos,
+                                             event_viewer_data->pos->len-1);
+        if(lttv_traceset_context_pos_pos_compare(end_pos, 
+              event_viewer_data->currently_selected_position) == 0) {
+          /* 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 {
+                       /* 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) {
+        LttvTracesetContextPosition *begin_pos = 
+          (LttvTracesetContextPosition*)g_ptr_array_index(
+                                             event_viewer_data->pos,
+                                             0);
+        if(lttv_traceset_context_pos_pos_compare(begin_pos, 
+              event_viewer_data->currently_selected_position) == 0) {
+          /* 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);
+                                               }
+                                       }
+                               }
+                       }       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:
+    break;
+  }
+
+  //gtk_tree_path_free(path);
   
 #if 0
   if(arg1 == GTK_MOVEMENT_DISPLAY_LINES)
@@ -654,7 +1015,51 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
     }
   }
 #endif //0
-  gtk_tree_path_free(path);
+}
+
+static void        filter_button      (GtkToolButton *toolbutton,
+                                          gpointer       user_data)
+{
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)user_data;
+  LttvAttribute *attribute;
+  LttvAttributeValue value;
+  gboolean ret;
+  g_printf("Filter button clicked\n");
+
+  attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+        LTTV_IATTRIBUTE(lttv_global_attributes()),
+        LTTV_VIEWER_CONSTRUCTORS));
+  g_assert(attribute);
+
+  ret = lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute),
+      "guifilter", LTTV_POINTER, &value);
+  g_assert(ret);
+  lttvwindow_viewer_constructor constructor =
+    (lttvwindow_viewer_constructor)*(value.v_pointer);
+  if(constructor) constructor(&plugin_evd->parent);
+  else g_warning("Filter module not loaded.");
+
+  //FIXME : viewer returned.
+}
+
+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)
@@ -666,30 +1071,112 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
   GtkTreePath *path;
   LttvTracesetContextPosition *pos;
 
-  
+  g_debug("cursor changed cb");
+
   /* On cursor change, modify the currently selected event by calling
    * the right API function */
-  tree_v_get_cursor(event_viewer_data);
-  
-  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);
-    lttvwindow_report_current_position(tab, pos);
-  }else{
-    g_warning("Can not get iter\n");
+  if(event_viewer_data->report_position) {
+    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);
+                       }
+               }
+       }
+}
+
+
+static void tree_selection_changed_cb (GtkTreeSelection *selection,
+    gpointer data)
+{
+  g_debug("tree sel changed cb");
+  EventViewerData *event_viewer_data = (EventViewerData*) data;
+#if 0
+    /* Set the cursor to currently selected event */
+  GtkTreeModel* model = GTK_TREE_MODEL(event_viewer_data->store_m);
+  GtkTreeIter iter;
+  LttvTracesetContextPosition *pos;
+  guint i;
+  GtkTreePath *tree_path;
+
+  for(i=0;i<event_viewer_data->num_visible_events;i++) {
+    tree_path = gtk_tree_path_new_from_indices(
+                i,
+               -1);
+    if(gtk_tree_model_get_iter(model,&iter,tree_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) {
+        /* Match! */
+            gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+                tree_path, NULL, FALSE);
+        break;
+      }
+      
+    }else{
+      g_warning("Can not get iter\n");
+    }
+   gtk_tree_path_free(tree_path);
   }
+#endif //0
+}
 
+#if 0
+static gint key_snooper(GtkWidget *grab_widget, GdkEventKey *event,
+    gpointer func_data)
+{
+  return TRUE;
 }
+#endif //0
 
+/* This callback may be recalled after a step up/down, but we don't want to lose
+ * the exact position : what we do is that we only set the value if it has
+ * changed : a step up/down that doesn't change the time value of the first
+ * event won't trigger a scrollbar change. */
 
 void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*)data;
-  GtkTreePath *tree_path;
+  LttvTracesetStats *tss =
+    lttvwindow_get_traceset_stats(event_viewer_data->tab);
+  LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
+  g_debug("SCROLL begin");
+  g_debug("SCROLL values : %g , %g, %g",
+      adjustment->value, event_viewer_data->previous_value,
+      (adjustment->value - event_viewer_data->previous_value));
+
+  LttTime new_time_off = ltt_time_from_double(adjustment->value);
+  LttTime old_time_off = ltt_time_from_double(event_viewer_data->previous_value);
+  g_debug("SCROLL time values %lu.%lu, %lu.%lu", new_time_off.tv_sec,
+      new_time_off.tv_nsec, old_time_off.tv_sec, old_time_off.tv_nsec);
+  /* If same value : nothing to update */
+  if(ltt_time_compare(new_time_off, old_time_off) == 0)
+    return;
+  
+  //LttTime old_time = event_viewer_data->first_event;
+  
 
+  //gint snoop = gtk_key_snooper_install(key_snooper, NULL);
+  
   get_events(adjustment->value, event_viewer_data);
+
+  //gtk_key_snooper_remove(snoop);
+#if 0 
+  LttTime time = ltt_time_sub(event_viewer_data->first_event,
+                              tsc->time_span.start_time);
+  double value = ltt_time_to_double(time);
+  gtk_adjustment_set_value(event_viewer_data->vadjust_c, value);
   
   if(event_viewer_data->currently_selected_event != -1) {
       
@@ -701,6 +1188,8 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
       //             NULL, FALSE);
       gtk_tree_path_free(tree_path);
   }
+#endif //0
+  g_debug("SCROLL end");
 }
 
 static __inline gint get_cell_height(GtkTreeView *TreeView)
@@ -710,6 +1199,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;
 }
 
@@ -784,33 +1280,45 @@ gboolean show_event_detail(void * hook_data, void * call_data)
 }
 #endif //0
 
-
-
-
-
-
+static gboolean events_check_handler(guint count, gboolean *stop_flag)
+{
+  if(count % CHECK_GDK_INTERVAL == 0) {
+    gtk_main_iteration_do(FALSE);
+    if(*stop_flag)
+      return TRUE;
+    else
+      return FALSE;
+  } else return FALSE;
+}
 
 static void get_events(double new_value, EventViewerData *event_viewer_data)
 {
+  GtkTreePath *tree_path;
   LttvTracesetStats *tss =
     lttvwindow_get_traceset_stats(event_viewer_data->tab);
   LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
   guint i;
+  gboolean seek_by_time;
   
+  if(lttvwindow_preempt_count > 0) return;
+
   double value = new_value - event_viewer_data->previous_value;
-  event_viewer_data->previous_value = new_value;
 
+  /* Set stop button status for foreground processing */
+  event_viewer_data->tab->stop_foreground = FALSE;
+  lttvwindow_events_request_disable();
+  
   /* See where we have to scroll... */
   ScrollDirection direction;
   gint relative_position;
   
-  if(value < 0.0) {
+  if(value < -0.8) {
     if(value >= -1.0) direction = SCROLL_STEP_UP;
     else {
       if(value >= -2.0) direction = SCROLL_PAGE_UP;
       else direction = SCROLL_JUMP;
     }
-  } else if(value > 0.0) {
+  } else if(value > 0.8) {
     if(value <= 1.0) direction = SCROLL_STEP_DOWN;
     else {
       if(value <= 2.0) direction = SCROLL_PAGE_DOWN;
@@ -823,60 +1331,71 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   case SCROLL_STEP_UP:
     g_debug("get_events : SCROLL_STEP_UP");
     relative_position = -1;
+    seek_by_time = 0;
     break;
   case SCROLL_STEP_DOWN:
     g_debug("get_events : SCROLL_STEP_DOWN");
     relative_position = 1;
+    seek_by_time = 0;
     break;
   case SCROLL_PAGE_UP:
     g_debug("get_events : SCROLL_PAGE_UP");
     relative_position = -(event_viewer_data->num_visible_events);
+    seek_by_time = 0;
     break;
   case SCROLL_PAGE_DOWN:
     g_debug("get_events : SCROLL_PAGE_DOWN");
     relative_position = event_viewer_data->num_visible_events;
+    seek_by_time = 0;
     break;
   case SCROLL_JUMP:
     g_debug("get_events : SCROLL_JUMP");
-    relative_position = 0;
+    seek_by_time = 1;
     break;
   case SCROLL_NONE:
     g_debug("get_events : SCROLL_NONE");
-    goto end;
+    relative_position = 0;
+    seek_by_time = 0;
     break;
   }
 
   LttTime time = ltt_time_from_double(new_value);
   time = ltt_time_add(tsc->time_span.start_time, time);
 
-  if(relative_position) {
+  if(!seek_by_time) {
   
     LttvTracesetContextPosition *pos =
         lttv_traceset_context_position_new(tsc);
     
-  /* Remember the beginning position */
+    /* Remember the beginning position */
     if(event_viewer_data->pos->len > 0) {
       LttvTracesetContextPosition *first_pos = 
-        (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
-                                                        0);
+        (LttvTracesetContextPosition*)g_ptr_array_index(
+                                                    event_viewer_data->pos,
+                                                    0);
       lttv_traceset_context_position_copy(pos, first_pos);
-      g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); 
+
+      if(relative_position >= 0) {
+        LttTime first_event_time = 
+            lttv_traceset_context_position_get_time(
+                              pos);
+        lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+          first_event_time);
+        lttv_process_traceset_middle(tsc, ltt_time_infinite,
+                                   G_MAXUINT,
+                                   pos);
+       
+      } else if(relative_position < 0) {
+        g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); 
+      }
     } else {
       /* There is nothing in the list : simply seek to the time value. */
       lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
           time);
+      lttv_process_traceset_middle(tsc, time, G_MAXUINT,
+                                   NULL);
     }
     
-  /* Clear the model (don't forget to free the TCS positions!) */
-    gtk_list_store_clear(event_viewer_data->store_m);
-    for(i=0;i<event_viewer_data->pos->len;i++) {
-      LttvTracesetContextPosition *cur_pos = 
-        (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
-                                                        i);
-      lttv_traceset_context_position_destroy(cur_pos);
-    }
-    g_ptr_array_set_size(event_viewer_data->pos, 0);
-
   /* Note that, as we mess with the tsc position, this function CANNOT be called
    * from a hook inside the lttv_process_traceset_middle. */
   /* As the lttvwindow API keeps a sync_position inside the tsc to go back at
@@ -887,62 +1406,149 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
    */
     if(relative_position > 0) {
       guint count;
-      count = lttv_process_traceset_seek_n_forward(tsc, relative_position,
-          lttvwindow_get_filter(event_viewer_data->tab));
-    } else {  /* < 0 */
+      count += lttv_process_traceset_seek_n_forward(tsc, relative_position,
+          events_check_handler,
+          &event_viewer_data->tab->stop_foreground,
+          event_viewer_data->main_win_filter,
+          event_viewer_data->filter, NULL);
+    } else if(relative_position < 0) {
       guint count;
-      count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position),
-          seek_back_default_offset, lttv_process_traceset_seek_time,
-          lttvwindow_get_filter(event_viewer_data->tab));
-    }
+      
+      /* Get an idea of currently shown event dispersion */
+      LttTime first_event_time =
+        lttv_traceset_context_position_get_time(event_viewer_data->first_event);
+      LttTime last_event_time =
+        lttv_traceset_context_position_get_time(event_viewer_data->last_event);
+      LttTime time_diff = ltt_time_sub(last_event_time, first_event_time);
+      if(ltt_time_compare(time_diff, ltt_time_zero) == 0)
+        time_diff = seek_back_default_offset;
+
+      count = lttv_process_traceset_seek_n_backward(tsc,
+          abs(relative_position),
+          time_diff,
+          (seek_time_fct)lttv_state_traceset_seek_time_closest,
+         events_check_handler,
+         &event_viewer_data->tab->stop_foreground,
+          event_viewer_data->main_win_filter,
+          event_viewer_data->filter, NULL);
+    } /* else 0 : do nothing : we are already at the beginning position */
 
     lttv_traceset_context_position_destroy(pos);
+
+    /* Save the first event position */
+    lttv_traceset_context_position_save(tsc, event_viewer_data->first_event);
+    
+    time = lttv_traceset_context_position_get_time(
+                                            event_viewer_data->first_event);
+    //if(ltt_time_compare(time, tsc->time_span.end_time) > 0)
+    //  time = tsc->time_span.end_time;
+
+    LttTime time_val = ltt_time_sub(time,
+                        tsc->time_span.start_time);
+    event_viewer_data->previous_value = ltt_time_to_double(time_val);
+    
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, time);
+    lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT,
+                                 event_viewer_data->first_event);
+
   } else {
     /* Seek by time */
     lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
           time);
+    lttv_process_traceset_middle(tsc, time, G_MAXUINT,
+                                 NULL);
+    LttTime time_val = ltt_time_sub(time,
+                        tsc->time_span.start_time);
+    event_viewer_data->previous_value = ltt_time_to_double(time_val);
+    lttv_traceset_context_position_save(tsc, event_viewer_data->first_event);
   }
  
+  /* Clear the model (don't forget to free the TCS positions!) */
+  gtk_list_store_clear(event_viewer_data->store_m);
+  for(i=0;i<event_viewer_data->pos->len;i++) {
+    LttvTracesetContextPosition *cur_pos = 
+      (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
+                                                      i);
+    lttv_traceset_context_position_destroy(cur_pos);
+  }
+  g_ptr_array_set_size(event_viewer_data->pos, 0);
+  
+
   /* Mathieu :
-   * I make the choice not to use the mainwindow lttvwindow API here : it will
-   * be faster to read the events ourself from lttv_process_traceset_middle, as
-   * we are already at the right read position. It would be costier to use the
-   * seek time closest for nothing, as we only have few events to read. 
+   * I make the choice not to use the mainwindow lttvwindow API here : the idle
+   * loop might have a too low priority, and we want good update while
+   * scrolling. However, we call the gdk loop to get events periodically so the
+   * processing can be stopped.
    */
-  /* FIXME : use seek time closest and middle to have a good state. */
-
+  
   lttv_process_traceset_begin(tsc,
       NULL, NULL, NULL, event_viewer_data->event_hooks, NULL);
+
+  event_viewer_data->num_events = 0;
   
   lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL);
   
   lttv_process_traceset_end(tsc,
       NULL, NULL, NULL, event_viewer_data->event_hooks, NULL);
   
-end:
+  /* Get the end position */
+  if(event_viewer_data->pos->len > 0) {
+    LttvTracesetContextPosition *cur_pos = 
+      (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
+                                               event_viewer_data->pos->len - 1);
+    lttv_traceset_context_position_copy(event_viewer_data->last_event,
+        cur_pos);
+  } else
+    lttv_traceset_context_position_save(tsc, event_viewer_data->last_event);
+
+  gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+      event_viewer_data->previous_value);
+  
+  //g_signal_emit_by_name(G_OBJECT (event_viewer_data->select_c),
+  //    "changed");
+  
+  event_viewer_data->last_tree_update_time = 
+    gdk_x11_get_server_time(
+        gtk_widget_get_parent_window(event_viewer_data->tree_v));
+
+  lttvwindow_events_request_enable();
+
   return;
 }
 
 
-
 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 = lttvwindow_get_filter(event_viewer_data->tab);
+  if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) {
+    gtk_main_iteration_do(FALSE);
+    if(event_viewer_data->tab->stop_foreground)
+      return TRUE;
+  }
+  event_viewer_data->num_events++;
+  
+  LttvFilter *filter = event_viewer_data->main_win_filter;
   if(filter != NULL && filter->head != NULL)
     if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
           tfc->t_context->t,tfc))
       return FALSE;
 
+  filter = event_viewer_data->filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc))
+      return FALSE;
+
+
   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];
   
@@ -955,10 +1561,9 @@ int event_hook(void *hook_data, void *call_data)
 
   lttv_traceset_context_position_save(tfc->t_context->ts_context, pos);
 
-  if(field)
-    lttv_print_field(e, field, desc, TRUE);
+  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,
@@ -978,7 +1583,20 @@ int event_hook(void *hook_data, void *call_data)
   
   g_string_free(desc, TRUE);
 
-  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events)
+  if(event_viewer_data->update_cursor) {
+    if(lttv_traceset_context_pos_pos_compare(pos, 
+          event_viewer_data->currently_selected_position) == 0) {
+      GtkTreePath *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);
+                       }
+    }
+  }
+  
+  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events )
     return TRUE;
   else
     return FALSE;
@@ -986,32 +1604,160 @@ int event_hook(void *hook_data, void *call_data)
 
 
 
+static void event_update_selection(EventViewerData *event_viewer_data)
+{
+  guint i;
+  GPtrArray *positions = event_viewer_data->pos;
+  g_info("event_update_selection");
+
+  for(i=0;i<positions->len;i++) {
+    LttvTracesetContextPosition *cur_pos = 
+      (LttvTracesetContextPosition*)g_ptr_array_index(positions, i);
+    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);
+                       if(path) {
+             gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+                                    path, NULL, FALSE);
+             gtk_tree_path_free(path);
+                       }
+    }
+  }
+}
+
+static int current_time_get_first_event_hook(void *hook_data, void *call_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData*)hook_data;
+  LttvTracefileContext *tfc = (LttvTracefileContext*)call_data;
+  LttEvent *e = ltt_tracefile_get_event(tfc->tf);
+
+  LttvFilter *filter = event_viewer_data->main_win_filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc))
+      return FALSE;
+
+  filter = event_viewer_data->filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc))
+      return FALSE;
+
+  lttv_traceset_context_position_save(tfc->t_context->ts_context, 
+      event_viewer_data->current_time_get_first);
+  return TRUE;
+}
+
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
+  g_info("update_current_time");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttTime * current_time = (LttTime*)call_data;
   LttvTracesetContext * tsc =
         lttvwindow_get_traceset_context(event_viewer_data->tab);
-  
-  LttTime time = ltt_time_sub(*current_time, tsc->time_span.start_time);
-  double new_value = ltt_time_to_double(time);
   GtkTreePath *path;
+  
+  /* If the currently selected event time != current time, set the first event
+   * with this time as currently selected. */
+  LttTime pos_time = lttv_traceset_context_position_get_time(
+      event_viewer_data->currently_selected_position);
+  if(ltt_time_compare(pos_time, *current_time) != 0) {
+    
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+        *current_time);
+    lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT,
+                                   NULL);
+
+    /* Get the first event that passes in the filter */
+    event_viewer_data->current_time_get_first =
+                lttv_traceset_context_position_new(tsc);
+    LttvHooks *hooks = lttv_hooks_new();
+    lttv_hooks_add(hooks,
+                   current_time_get_first_event_hook,
+                   event_viewer_data,
+                   LTTV_PRIO_DEFAULT);
+
+    lttv_process_traceset_begin(tsc,
+        NULL, NULL, NULL, hooks, NULL);
+    
+    lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL);
+    
+    lttv_process_traceset_end(tsc,
+        NULL, NULL, NULL, hooks, NULL);
+   
+    lttv_hooks_destroy(hooks);
+
+    lttv_traceset_context_position_copy(
+        event_viewer_data->currently_selected_position,
+        event_viewer_data->current_time_get_first);
+    lttv_traceset_context_position_destroy(
+        event_viewer_data->current_time_get_first);
+    pos_time = lttv_traceset_context_position_get_time(
+        event_viewer_data->currently_selected_position);
+  }
 
-  gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value);
+  LttTime time = ltt_time_sub(pos_time, tsc->time_span.start_time);
+  double new_value = ltt_time_to_double(time);
  
-  event_viewer_data->currently_selected_event = 0;
+  event_viewer_data->report_position = FALSE;
+  /* Change the viewed area if does not match */
+  if(lttv_traceset_context_pos_pos_compare(
+        event_viewer_data->currently_selected_position,
+        event_viewer_data->first_event) < 0
+    ||
+     lttv_traceset_context_pos_pos_compare(
+        event_viewer_data->currently_selected_position,
+        event_viewer_data->last_event) > 0) {
+    gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value);
+  } else {
+    /* Simply update the current time : it is in the list */
+    event_update_selection(event_viewer_data);
+  }
+  event_viewer_data->report_position = TRUE;
+  
+  return FALSE;
+}
+
+gboolean update_current_position(void * hook_data, void * call_data)
+{
+  g_info("update_current_position");
+  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
+  const LttvTracesetContextPosition *current_pos =
+    (LttvTracesetContextPosition*)call_data;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  
+  if(lttv_traceset_context_pos_pos_compare(
+        event_viewer_data->currently_selected_position, current_pos) != 0) {
+    lttv_traceset_context_position_copy(
+        event_viewer_data->currently_selected_position, current_pos);
+
+    /* Change the viewed area if does not match */
+    if(lttv_traceset_context_pos_pos_compare(
+          event_viewer_data->currently_selected_position,
+          event_viewer_data->first_event) < 0
+      ||
+       lttv_traceset_context_pos_pos_compare(
+          event_viewer_data->currently_selected_position,
+          event_viewer_data->last_event) > 0) {
+      LttTime time = lttv_traceset_context_position_get_time(current_pos);
+      time = ltt_time_sub(time, tsc->time_span.start_time);
+      double new_value = ltt_time_to_double(time);
+      gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value);
+    } else {
+      /* Simply update the current time : it is in the list */
+      event_update_selection(event_viewer_data);
+    }
+
+  }
 
-  path = gtk_tree_path_new_from_indices(
-             event_viewer_data->currently_selected_event,
-             -1);
-  gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-  //g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->tree_v), "cursor-changed");
-  gtk_tree_path_free(path);  
 
   return FALSE;
 }
 
+
+
 gboolean traceset_changed(void * hook_data, void * call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
@@ -1025,22 +1771,62 @@ gboolean traceset_changed(void * hook_data, void * call_data)
 
   end = ltt_time_sub(time_span.end_time, time_span.start_time);
   event_viewer_data->vadjust_c->upper = ltt_time_to_double(end);
-  g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed");
+
+  /* Reset the positions */
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->currently_selected_position);
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->first_event);
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->last_event);
+  event_viewer_data->currently_selected_position =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->first_event =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->last_event =
+    lttv_traceset_context_position_new(tsc);
+
+  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;
 }
 
+gboolean filter_changed(void * hook_data, void * call_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
 
+  event_viewer_data->main_win_filter = 
+    (LttvFilter*)call_data;
+  get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
 
+  return FALSE;
+}
 
 
-void gui_events_free(EventViewerData *event_viewer_data)
+gint evd_redraw_notify(void *hook_data, void *call_data)
 {
-  Tab *tab = event_viewer_data->tab;
+  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
+
+  get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
+  return 0;
+}
+
+void gui_events_free(gpointer data)
+{
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data;
+  Tab *tab = plugin_evd->evd->tab;
+  EventViewerData *event_viewer_data = plugin_evd->evd;
   guint i;
  
-  if(event_viewer_data){
+  lttv_filter_destroy(plugin_evd->evd->filter);
+
+  if(tab != NULL){
     lttv_hooks_remove(event_viewer_data->event_hooks,event_hook);
     lttv_hooks_destroy(event_viewer_data->event_hooks);
     
@@ -1050,28 +1836,44 @@ void gui_events_free(EventViewerData *event_viewer_data)
                                                         i);
       lttv_traceset_context_position_destroy(cur_pos);
     }
+    lttv_traceset_context_position_destroy(
+        event_viewer_data->currently_selected_position);
+    lttv_traceset_context_position_destroy(
+        event_viewer_data->first_event);
+    lttv_traceset_context_position_destroy(
+        event_viewer_data->last_event);
     g_ptr_array_free(event_viewer_data->pos, TRUE);
     
     lttvwindow_unregister_current_time_notify(tab,
                         update_current_time, event_viewer_data);
+    lttvwindow_unregister_current_position_notify(tab,
+                        update_current_position, event_viewer_data);
     //lttvwindow_unregister_show_notify(tab,
     //                    show_event_detail, event_viewer_data);
     lttvwindow_unregister_traceset_notify(tab,
                         traceset_changed, event_viewer_data);
+    lttvwindow_unregister_filter_notify(tab,
+                        filter_changed, event_viewer_data);
+    lttvwindow_unregister_redraw_notify(tab,
+                evd_redraw_notify, event_viewer_data);
 
-    g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list,
-        event_viewer_data);
-    g_free(event_viewer_data);
   }
+  lttvwindowtraces_background_notify_remove(event_viewer_data);
+
+  g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list,
+      event_viewer_data);
+  //g_free(event_viewer_data);
+  g_object_unref(plugin_evd);
 }
 
 
 
-void gui_events_destructor(EventViewerData *event_viewer_data)
+void gui_events_destructor(gpointer data)
 {
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data;
   /* May already been done by GTK window closing */
-  if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
-    gtk_widget_destroy(event_viewer_data->hbox_v);
+  if(GTK_IS_WIDGET(plugin_evd->parent.top_widget)){
+    gtk_widget_destroy(plugin_evd->parent.top_widget);
   }
 }
 
@@ -1095,7 +1897,7 @@ static void init() {
 
 void event_destroy_walk(gpointer data, gpointer user_data)
 {
-  gui_events_destructor((EventViewerData*)data);
+  gui_events_destructor((LttvPluginEVD*)data);
 }
 
 /**
This page took 0.039436 seconds and 4 git commands to generate.