X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Finit_module.c;h=1fe80b546f9525cdd467a441cceeaf7da76a2c14;hb=49bf71b500f112cc90b790eb3975cceac351d021;hp=8ab4f5a30f56bae05ec00314188bbd7f16e8ccbf;hpb=37d0eca6ca06648a9330f31d5b632e65da90d646;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 8ab4f5a3..1fe80b54 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 @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #include #include @@ -23,11 +26,27 @@ #include "callbacks.h" /* global variable */ -systemView * gSysView; +static WindowCreationData win_creation_data; -static LttvHooks - *main_hooks; +/** Array containing instanced objects. */ +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) +{ + LttTrace *trace; + + trace = ltt_trace_open(a_trace); + if(trace == NULL) g_critical("cannot open trace %s", a_trace); + g_init_trace = lttv_trace_new(trace); +} /***************************************************************************** * Functions for module loading/unloading * @@ -38,31 +57,11 @@ static LttvHooks * 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; - - g_critical("GUI init()"); + WindowCreationData* window_creation_data = (WindowCreationData*)hook_data; + + g_critical("GUI window_creation_hook()"); #ifdef ENABLE_NLS bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -70,111 +69,76 @@ 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_attributes_new(); - - //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; + return FALSE; } - - - G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) { - LttvAttributeValue value; - WindowCreationData *Window_Creation_Data = g_new(WindowCreationData, 1); - - LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + LttvAttributeValue value; + + // Global attributes only used for interaction with main() here. + LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + + g_critical("GUI init()"); + + lttv_option_add("trace", 't', + "add a trace to the trace set to analyse", + "pathname of the directory containing the trace", + LTTV_OPT_STRING, &a_trace, lttv_trace_option, NULL); + + g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/before", + LTTV_POINTER, &value)); + g_assert((main_hooks = *(value.v_pointer)) != NULL); + + win_creation_data.argc = argc; + win_creation_data.argv = argv; + + lttv_hooks_add(main_hooks, window_creation_hook, &win_creation_data); - Window_Creation_Data->argc = argc; - Window_Creation_Data->argv = argv; - - g_assert(lttv_iattribute_find_by_path( - attributes, - "hooks/main/before", LTTV_POINTER, &value)); - - g_assert((main_hooks = *(value.v_pointer)) != NULL); +} - lttv_hooks_add(main_hooks, Window_Creation_Hook, Window_Creation_Data); +void +main_window_free(MainWindow * mw) +{ + if(mw){ + 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 +main_window_destructor(MainWindow * mw) +{ + 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 destroy_walk(gpointer data, gpointer user_data) + +void main_window_destroy_walk(gpointer data, gpointer user_data) { - //GuiControlFlow_Destructor((ControlFlowData*)data); + main_window_destructor((MainWindow*)data); } @@ -187,25 +151,20 @@ void destroy_walk(gpointer data, gpointer user_data) */ G_MODULE_EXPORT void destroy() { - WindowCreationData *Window_Creation_Data; - LttvAttributeValue value; - - g_critical("GUI destroy()"); - //int i; + LttvAttributeValue value; + LttvTrace *trace; - //ControlFlowData *Control_Flow_Data; - + lttv_option_remove("trace"); - //g_slist_foreach(sControl_Flow_Data_List, destroy_walk, NULL ); - - lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(lttv_global_attributes()), - "/hooks/main/before", LTTV_POINTER, &value); - - // Window_Creation_Data = lttv_hooks_remove(*(value.v_pointer), Window_Creation_Hook); - - g_free(Window_Creation_Data); + lttv_hooks_remove_data(main_hooks, window_creation_hook, &win_creation_data); + g_critical("GUI destroy()"); + if(g_main_window_list){ + g_slist_foreach(g_main_window_list, main_window_destroy_walk, NULL ); + g_slist_free(g_main_window_list); + } + }