X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Finclude%2Flttv%2FmainWindow.h;h=dc0254f1259a1b684ad674a872edcd59dd588c0c;hb=2061e03dd5e8aa09fbed5b08ae702fe2eb33be06;hp=ac5e98951ef5aaead5bcb0697f98a13f014778a3;hpb=82c09edfd609f5699880fea68a399c4d8c50f952;p=lttv.git

diff --git a/ltt/branches/poly/include/lttv/mainWindow.h b/ltt/branches/poly/include/lttv/mainWindow.h
index ac5e9895..dc0254f1 100644
--- a/ltt/branches/poly/include/lttv/mainWindow.h
+++ b/ltt/branches/poly/include/lttv/mainWindow.h
@@ -10,11 +10,38 @@
 
 #include <lttv/common.h>
 #include <lttv/gtkcustom.h>
+#include <lttv/hook.h>
+#include <lttv/stats.h>
+
+typedef struct _WindowCreationData {
+	int argc;
+	char ** argv;
+} WindowCreationData;
+
+typedef struct _TimeWindow {
+	LttTime startTime;
+	LttTime Time_Width;
+} TimeWindow;
+
+typedef struct _TracesetInfo {
+	gchar* path;
+	LttvHooks 
+	  *before_traceset,
+	  *after_traceset,
+	  *before_trace,
+	  *after_trace,
+	  *before_tracefile,
+	  *after_tracefile,
+	  *before_event,
+	  *after_event;
+        //FIXME? TracesetContext and stats in same or different variable ?
+	LttvTracesetStats * TracesetContext;
+	LttvTraceset * traceset;
+} TracesetInfo ;
 
 
 struct _mainWindow{
   GtkWidget*      MWindow;            /* Main Window */
-  systemView *    SystemView;         /* System view displayed in this window*/
 
   /* Status bar information */
   //  guint         MainSBarContextID;    /* Context ID of main status bar */
@@ -29,40 +56,47 @@ struct _mainWindow{
   GtkWidget*           HelpContents;/* Window to display help contents */
   GtkWidget*           AboutBox;    /* Window  about information */
  
-  LttvTracesetContext * traceset_context; 
-  LttvTraceset * traceset;  /* trace set associated with the window */
   //  lttv_trace_filter * filter; /* trace filter associated with the window */
-  
 
+  /* Traceset related information */
+  TracesetInfo * Traceset_Info; 
+  /* Attributes for trace reading hooks local to the main window */
+  LttvIAttribute * Attributes;
+  
   tab * Tab;
   tab * CurrentTab;
-  LttvIAttribute * Attributes;
- 
-};
 
+  WindowCreationData * winCreationData; 
 
-struct _systemView{
-  gpointer             EventDB;
-  gpointer           * SystemInfo;
-  gpointer           * Options;
-  mainWindow         * Window;
-  struct _systemView * Next;
+  GHashTable * hash_menu_item;
+  GHashTable * hash_toolbar_item;
 };
 
+
 struct _tab{
   GtkWidget * label;
   GtkCustom * custom;
-
-  LttTime traceStartTime;
-  LttTime traceEndTime;
-  LttTime startTime;
-  LttTime endTime;
+   
+  // startTime is the left of the visible area. Corresponds to the scrollbar
+  // value.
+  // Time_Width is a zoom dependant value (corresponding to page size)
+  TimeWindow Time_Window;
+  
+  // The current time is the time selected in the visible area by the user,
+  // not the scrollbar value.
   LttTime currentTime;
   LttvIAttribute * Attributes;
 
   struct _tab * Next;
+  mainWindow  * mw;
 };
 
+/**
+ * Remove menu and toolbar item when a module unloaded
+ */
+void main_window_remove_menu_item(lttv_constructor view_constructor);
+void main_window_remove_toolbar_item(lttv_constructor view_constructor);
+
 #endif /* _MAIN_WINDOW_ */