X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Finit_module.c;h=2201eadc1f6d5167055fab578fdebcb5a2d4783b;hb=540edb40ef20c2ce40132b3189e183d055dbe711;hp=4ed046f9bb156c3f3d37ff5312a3752029913f79;hpb=558aa01322f1af8be09fcfc086864da0373823c5;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c index 4ed046f9..2201eadc 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/init_module.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -23,27 +24,21 @@ #include "support.h" #include #include "callbacks.h" +#include -/* global variable */ -systemView * gSysView; -LttvTracesetState * gTracesetContext = NULL; -static LttvTraceset * traceset; +/* global variable */ +static WindowCreationData win_creation_data; /** Array containing instanced objects. */ -GSList * Main_Window_List = NULL ; - -static LttvHooks - *before_traceset, - *after_traceset, - *before_trace, - *after_trace, - *before_tracefile, - *after_tracefile, - *before_event, - *after_event, +GSList * g_main_window_list = NULL ; + +LttvHooks *main_hooks; +/* Initial trace from command line */ +LttvTrace *g_init_trace = NULL; + static char *a_trace; void lttv_trace_option(void *hook_data) @@ -52,7 +47,7 @@ void lttv_trace_option(void *hook_data) trace = ltt_trace_open(a_trace); if(trace == NULL) g_critical("cannot open trace %s", a_trace); - lttv_traceset_add(traceset, trace); + g_init_trace = lttv_trace_new(trace); } /***************************************************************************** @@ -64,33 +59,11 @@ void lttv_trace_option(void *hook_data) * This function initializes the GUI. */ -typedef struct _WindowCreationData { - int argc; - char ** argv; -} WindowCreationData; - -static gboolean Window_Creation_Hook(void *hook_data, void *call_data) +static gboolean window_creation_hook(void *hook_data, void *call_data) { - int i; - GdkPixbuf *pixbuf; - view_constructor constructor; - LttvMenus * menu; - LttvToolbars * toolbar; - lttv_menu_closure *menuItem; - lttv_toolbar_closure *toolbarItem; - LttvAttributeValue value; - LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); - GModule *gm; - GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap; - GtkWidget *window1; - mainWindow * mw = g_new(mainWindow, 1); - gSysView = g_new(systemView, 1); - WindowCreationData *Window_Creation_Data = (WindowCreationData*)call_data; + WindowCreationData* window_creation_data = (WindowCreationData*)hook_data; - /* Add the object's information to the module's array */ - Main_Window_List = g_slist_append(Main_Window_List, mw); - - g_critical("GUI Window_Creation_Hook()"); + g_critical("GUI window_creation_hook()"); #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -98,101 +71,24 @@ static gboolean Window_Creation_Hook(void *hook_data, void *call_data) #endif gtk_set_locale (); - gtk_init (&(Window_Creation_Data->argc), &(Window_Creation_Data->argv)); + gtk_init (&(window_creation_data->argc), &(window_creation_data->argv)); add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); add_pixmap_directory ("pixmaps"); add_pixmap_directory ("modules/gui/mainWin/pixmaps"); - /* - * The following code was added by Glade to create one of each component - * (except popup menus), just so that you see something after building - * the project. Delete any components that you don't want shown initially. - */ - window1 = create_MWindow (); - gtk_widget_show (window1); - - mw->MWindow = window1; - mw->SystemView = gSysView; - mw->Tab = NULL; - mw->CurrentTab = NULL; - mw->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); - if(!gTracesetContext){ - gTracesetContext = g_object_new(LTTV_TRACESET_STATE_TYPE, NULL); - //FIXME: lttv_context_fini should be called some where. - lttv_context_init(LTTV_TRACESET_CONTEXT(gTracesetContext), traceset); - } - mw->traceset_context = LTTV_TRACESET_CONTEXT(gTracesetContext); - mw->traceset = (LTTV_TRACESET_CONTEXT(gTracesetContext))->ts; - g_object_ref(gTracesetContext); - - //test - g_assert(lttv_iattribute_find_by_path(attributes, - "viewers/menu", LTTV_POINTER, &value)); - menu = (LttvMenus*)*(value.v_pointer); - - if(menu){ - for(i=0;ilen;i++){ - menuItem = &g_array_index(menu, lttv_menu_closure, i); - constructor = menuItem->con; - ToolMenuTitle_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu"); - insert_view = gtk_menu_item_new_with_mnemonic (menuItem->menuText); - gtk_widget_show (insert_view); - gtk_container_add (GTK_CONTAINER (ToolMenuTitle_menu), insert_view); - g_signal_connect ((gpointer) insert_view, "activate", - G_CALLBACK (insertViewTest), - constructor); - } - } - - g_assert(lttv_iattribute_find_by_path(attributes, - "viewers/toolbar", LTTV_POINTER, &value)); - toolbar = (LttvToolbars*)*(value.v_pointer); - - if(toolbar){ - for(i=0;ilen;i++){ - toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i); - constructor = toolbarItem->con; - ToolMenuTitle_menu = lookup_widget(mw->MWindow,"MToolbar2"); - pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbarItem->pixmap); - pixmap = gtk_image_new_from_pixbuf(pixbuf); - insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (ToolMenuTitle_menu), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - "", - toolbarItem->tooltip, NULL, - pixmap, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (ToolMenuTitle_menu)->children)->data))->label), TRUE); - gtk_widget_show (insert_view); - gtk_container_set_border_width (GTK_CONTAINER (insert_view), 1); - g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insertViewTest),constructor); - } - } - - //end - - gSysView->EventDB = NULL; - gSysView->SystemInfo = NULL; - gSysView->Options = NULL; - gSysView->Window = mw; - gSysView->Next = NULL; - - g_object_set_data(G_OBJECT(window1), "systemView", (gpointer)gSysView); - g_object_set_data(G_OBJECT(window1), "mainWindow", (gpointer)mw); + construct_main_window(NULL, window_creation_data); gtk_main (); return FALSE; } - - - G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { LttvAttributeValue value; - WindowCreationData *Window_Creation_Data = g_new(WindowCreationData, 1); - + + // Global attributes only used for interaction with main() here. LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); g_critical("GUI init()"); @@ -202,56 +98,54 @@ G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { "pathname of the directory containing the trace", LTTV_OPT_STRING, &a_trace, lttv_trace_option, NULL); - traceset = lttv_traceset_new(); - - before_traceset = lttv_hooks_new(); - after_traceset = lttv_hooks_new(); - before_trace = lttv_hooks_new(); - after_trace = lttv_hooks_new(); - before_tracefile = lttv_hooks_new(); - after_tracefile = lttv_hooks_new(); - before_event = lttv_hooks_new(); - after_event = lttv_hooks_new(); - - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = before_traceset; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = after_traceset; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = before_trace; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = after_trace; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = before_tracefile; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = after_tracefile; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = before_event; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = after_event; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/before", LTTV_POINTER, &value)); g_assert((main_hooks = *(value.v_pointer)) != NULL); - Window_Creation_Data->argc = argc; - Window_Creation_Data->argv = argv; + win_creation_data.argc = argc; + win_creation_data.argv = argv; - lttv_hooks_add(main_hooks, Window_Creation_Hook, Window_Creation_Data); + lttv_hooks_add(main_hooks, window_creation_hook, &win_creation_data); + +} +void +main_window_free(MainWindow * mw) +{ + if(mw){ + while(mw->tab){ + lttv_state_remove_event_hooks( + (LttvTracesetState*)mw->tab->traceset_info->traceset_context); + mw->tab = mw->tab->next; + } + g_object_unref(mw->attributes); + g_main_window_list = g_slist_remove(g_main_window_list, mw); + + g_hash_table_destroy(mw->hash_menu_item); + g_hash_table_destroy(mw->hash_toolbar_item); + + g_free(mw); + mw = NULL; + } } -void destroy_walk(gpointer data, gpointer user_data) +void +main_window_destructor(MainWindow * mw) { - //GuiControlFlow_Destructor((ControlFlowData*)data); + if(GTK_IS_WIDGET(mw->mwindow)){ + gtk_widget_destroy(mw->mwindow); + // gtk_widget_destroy(mw->HelpContents); + // gtk_widget_destroy(mw->AboutBox); + mw = NULL; + } + //main_window_free called when the object mw in the widget is unref. + //main_window_free(mw); +} + + +void main_window_destroy_walk(gpointer data, gpointer user_data) +{ + main_window_destructor((MainWindow*)data); } @@ -264,46 +158,20 @@ void destroy_walk(gpointer data, gpointer user_data) */ G_MODULE_EXPORT void destroy() { - WindowCreationData *Window_Creation_Data; - LttvAttributeValue value; - - guint i, nb; + LttvAttributeValue value; + LttvTrace *trace; lttv_option_remove("trace"); - lttv_hooks_destroy(before_traceset); - lttv_hooks_destroy(after_traceset); - lttv_hooks_destroy(before_trace); - lttv_hooks_destroy(after_trace); - lttv_hooks_destroy(before_tracefile); - lttv_hooks_destroy(after_tracefile); - lttv_hooks_destroy(before_event); - lttv_hooks_destroy(after_event); - lttv_hooks_remove_data(main_hooks, Window_Creation_Hook, NULL); - - nb = lttv_traceset_number(traceset); - for(i = 0 ; i < nb ; i++) { - ltt_trace_close(lttv_traceset_get(traceset, i)); - } - - lttv_traceset_destroy(traceset); + lttv_hooks_remove_data(main_hooks, window_creation_hook, &win_creation_data); g_critical("GUI destroy()"); - - - //ControlFlowData *Control_Flow_Data; - - - g_slist_foreach(Main_Window_List, destroy_walk, NULL ); - + if(g_main_window_list){ + g_slist_foreach(g_main_window_list, main_window_destroy_walk, NULL ); + g_slist_free(g_main_window_list); + } - //lttv_hooks_remove_data(main_hooks,Window_Creation_Hook, NULL); - //lttv_hooks_remove_data(before_traceset, get_traceset_context, NULL); - - // g_free(Window_Creation_Data); - - g_object_unref(gTracesetContext); }