X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2FmainWin%2Fsrc%2Fcallbacks.c;h=12ead7a5e01d6759ef8b582cf1f3d95e54022d03;hb=716e4367df9c21316d326ee18b703cd0d25ace74;hp=44f5e61c3b866ec297a83f51bfdff27a4e1a4a82;hpb=f7afe191fd58f0bf4bab9c9514c261535b99d32b;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c index 44f5e61c..12ead7a5 100644 --- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/callbacks.c @@ -19,21 +19,22 @@ #define PATH_LENGTH 256 #define DEFAULT_TIME_WIDTH_S 1 -//extern LttvTracesetContext * gTracesetContext; -extern LttTrace *gInit_Trace ; +extern LttTrace *g_init_trace ; /** Array containing instanced objects. */ -extern GSList * Main_Window_List; +extern GSList * g_main_window_list; -static int gWinCount = 0; +static int g_win_count = 0; -mainWindow * get_window_data_struct(GtkWidget * widget); +MainWindow * get_window_data_struct(GtkWidget * widget); char * get_unload_module(char ** loaded_module_name, int nb_module); -void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label); +char * get_remove_trace(char ** all_trace_name, int nb_trace); +char * get_selection(char ** all_name, int nb, char *title, char * column_title); +void * create_tab(MainWindow * parent, MainWindow * current_window, + GtkNotebook * notebook, char * label); -/* test part */ -void insertView(GtkWidget* widget, view_constructor constructor); +void insert_viewer(GtkWidget* widget, view_constructor constructor); enum { @@ -41,75 +42,44 @@ enum N_COLUMNS }; -void -on_textview1_grab_focus (GtkTextView *text_view, - gpointer user_data) -{ - GtkWidget * widget; - GtkCustom * custom = (GtkCustom*)user_data; - widget = gtk_widget_get_parent((GtkWidget*)text_view); - widget = gtk_widget_get_parent(widget); - gtk_custom_set_focus((GtkWidget*)custom, (gpointer)widget); -} void -insertViewTest(GtkMenuItem *menuitem, gpointer user_data) +insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data) { + GdkWindow * win; + GdkCursor * new; guint val = 20; - insertView((GtkWidget*)menuitem, (view_constructor)user_data); - // selected_hook(&val); -} + GtkWidget* widget = menuitem; -void -on_insert_viewer_test_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - GtkWidget *scrolledwindow1, *textview1, *label; - static int count = 0; - char str[64]; - GtkCustom * custom; - GtkTextBuffer* buf; - - mainWindow * mwData; - mwData = get_window_data_struct((GtkWidget*)menuitem); - if(!mwData->CurrentTab) return; - custom = mwData->CurrentTab->custom; - - sprintf(str,"label : %d",++count); - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow1); - label = gtk_label_new(str); - gtk_widget_show(label); + new = gdk_cursor_new(GDK_X_CURSOR); + if(GTK_IS_MENU_ITEM(menuitem)){ + widget = lookup_widget(menuitem, "MToolbar2"); + } + win = gtk_widget_get_parent_window(widget); + gdk_window_set_cursor(win, new); + gdk_cursor_unref(new); + gdk_window_stick(win); + gdk_window_unstick(win); + + insert_viewer((GtkWidget*)menuitem, (view_constructor)user_data); + // selected_hook(&val); - gtk_custom_widget_add(custom, scrolledwindow1); - gtk_widget_set_size_request ((GtkWidget*)scrolledwindow1, 800, 100); - - textview1 = gtk_text_view_new (); - gtk_widget_show (textview1); - gtk_container_add (GTK_CONTAINER (scrolledwindow1), textview1); - buf = gtk_text_view_get_buffer((GtkTextView*)textview1); - sprintf(str,"text view : %d",count); - gtk_text_buffer_set_text(buf,str, -1); - - g_signal_connect ((gpointer) textview1, "grab_focus", - G_CALLBACK (on_textview1_grab_focus), custom); + gdk_window_set_cursor(win, NULL); } -/* end of test part */ - /* internal functions */ -void insertView(GtkWidget* widget, view_constructor constructor) +void insert_viewer(GtkWidget* widget, view_constructor constructor) { GtkCustom * custom; - mainWindow * mwData; + MainWindow * mw_data; GtkWidget * viewer; - mwData = get_window_data_struct(widget); - if(!mwData->CurrentTab) return; - custom = mwData->CurrentTab->custom; + mw_data = get_window_data_struct(widget); + if(!mw_data->current_tab) return; + custom = mw_data->current_tab->custom; - viewer = (GtkWidget*)constructor(mwData); + viewer = (GtkWidget*)constructor(mw_data); if(viewer) { gtk_custom_widget_add(custom, viewer); @@ -125,7 +95,7 @@ void get_label_string (GtkWidget * text, gchar * label) strcpy(label,gtk_entry_get_text(entry)); } -void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label_str) +void get_label(MainWindow * mw, gchar * str, gchar* dialogue_title, gchar * label_str) { GtkWidget * dialogue; GtkWidget * text; @@ -160,10 +130,10 @@ void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label } } -mainWindow * get_window_data_struct(GtkWidget * widget) +MainWindow * get_window_data_struct(GtkWidget * widget) { GtkWidget * mw; - mainWindow * mwData; + MainWindow * mw_data; mw = lookup_widget(widget, "MWindow"); if(mw == NULL){ @@ -171,60 +141,158 @@ mainWindow * get_window_data_struct(GtkWidget * widget) return; } - mwData = (mainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow"); - if(mwData == NULL){ + mw_data = (MainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow"); + if(mw_data == NULL){ g_printf("Main window data does not exist\n"); return; } - return mwData; + return mw_data; } -void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone) +void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone) { - mainWindow * parent = get_window_data_struct(widget); - - constructMainWin(parent, NULL); + MainWindow * parent = get_window_data_struct(widget); if(clone){ g_printf("Clone : use the same traceset\n"); + construct_main_window(parent, NULL); }else{ g_printf("Empty : traceset is set to NULL\n"); + construct_main_window(NULL, parent->win_creation_data); } } void move_up_viewer(GtkWidget * widget, gpointer user_data) { - mainWindow * mw = get_window_data_struct(widget); - if(!mw->CurrentTab) return; - gtk_custom_widget_move_up(mw->CurrentTab->custom); + MainWindow * mw = get_window_data_struct(widget); + if(!mw->current_tab) return; + gtk_custom_widget_move_up(mw->current_tab->custom); } void move_down_viewer(GtkWidget * widget, gpointer user_data) { - mainWindow * mw = get_window_data_struct(widget); - if(!mw->CurrentTab) return; - gtk_custom_widget_move_down(mw->CurrentTab->custom); + MainWindow * mw = get_window_data_struct(widget); + if(!mw->current_tab) return; + gtk_custom_widget_move_down(mw->current_tab->custom); } void delete_viewer(GtkWidget * widget, gpointer user_data) { - mainWindow * mw = get_window_data_struct(widget); - if(!mw->CurrentTab) return; - gtk_custom_widget_delete(mw->CurrentTab->custom); + MainWindow * mw = get_window_data_struct(widget); + if(!mw->current_tab) return; + gtk_custom_widget_delete(mw->current_tab->custom); } void open_traceset(GtkWidget * widget, gpointer user_data) { - g_printf("Open a trace set\n"); + char ** dir; + gint id; + LttvTraceset * traceset; + MainWindow * mw_data = get_window_data_struct(widget); + GtkFileSelection * file_selector = + (GtkFileSelection *)gtk_file_selection_new("Select a traceset"); + + gtk_file_selection_hide_fileop_buttons(file_selector); + + id = gtk_dialog_run(GTK_DIALOG(file_selector)); + switch(id){ + case GTK_RESPONSE_ACCEPT: + case GTK_RESPONSE_OK: + dir = gtk_file_selection_get_selections (file_selector); + traceset = lttv_traceset_load(dir[0]); + g_printf("Open a trace set %s\n", dir[0]); + //Not finished yet + g_strfreev(dir); + case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_CANCEL: + default: + gtk_widget_destroy((GtkWidget*)file_selector); + break; + } + } void add_trace(GtkWidget * widget, gpointer user_data) { + LttTrace *trace; + LttvTrace * trace_v; + LttvTraceset * traceset; + char * dir; + gint id; + MainWindow * mw_data = get_window_data_struct(widget); + GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace"); + gtk_dir_selection_hide_fileop_buttons(file_selector); + + id = gtk_dialog_run(GTK_DIALOG(file_selector)); + switch(id){ + case GTK_RESPONSE_ACCEPT: + case GTK_RESPONSE_OK: + dir = gtk_dir_selection_get_dir (file_selector); + trace = ltt_trace_open(dir); + if(trace == NULL) g_critical("cannot open trace %s", dir); + trace_v = lttv_trace_new(trace); + traceset = mw_data->current_tab->traceset_info->traceset; + if(mw_data->current_tab->traceset_info->traceset_context != NULL){ + lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->current_tab-> + traceset_info->traceset_context)); + g_object_unref(mw_data->current_tab->traceset_info->traceset_context); + } + lttv_traceset_add(traceset, trace_v); + mw_data->current_tab->traceset_info->traceset_context = + g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); + lttv_context_init( + LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info-> + traceset_context),traceset); + case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_CANCEL: + default: + gtk_widget_destroy((GtkWidget*)file_selector); + break; + } g_printf("add a trace to a trace set\n"); } void remove_trace(GtkWidget * widget, gpointer user_data) { + LttTrace *trace; + LttvTrace * trace_v; + LttvTraceset * traceset; + gint i, nb_trace; + char ** name, *remove_trace_name; + MainWindow * mw_data = get_window_data_struct(widget); + + nb_trace =lttv_traceset_number(mw_data->current_tab->traceset_info->traceset); + name = g_new(char*,nb_trace); + for(i = 0; i < nb_trace; i++){ + trace_v = lttv_traceset_get(mw_data->current_tab-> + traceset_info->traceset, i); + trace = lttv_trace(trace_v); + name[i] = trace->pathname; + } + + remove_trace_name = get_remove_trace(name, nb_trace); + + if(remove_trace_name){ + for(i=0; icurrent_tab->traceset_info->traceset; + if(mw_data->current_tab->traceset_info->traceset_context != NULL){ + lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->current_tab-> + traceset_info->traceset_context)); + g_object_unref(mw_data->current_tab->traceset_info->traceset_context); + } + lttv_traceset_remove(traceset, i); + mw_data->current_tab->traceset_info->traceset_context = + g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); + lttv_context_init( + LTTV_TRACESET_CONTEXT(mw_data->current_tab-> + traceset_info->traceset_context),traceset); + break; + } + } + } + + g_free(name); g_printf("remove a trace from a trace set\n"); } @@ -238,19 +306,54 @@ void save_as(GtkWidget * widget, gpointer user_data) g_printf("Save as\n"); } +void zoom(GtkWidget * widget, double size) +{ + TimeInterval *time_span; + TimeWindow time_window; + LttTime current_time, time_delta, time_s, time_e; + MainWindow * mw_data = get_window_data_struct(widget); + + time_span = LTTV_TRACESET_CONTEXT(mw_data->current_tab-> + traceset_info->traceset_context)->Time_Span; + time_window = mw_data->current_tab->time_window; + current_time = mw_data->current_tab->current_time; + + time_delta = ltt_time_sub(time_span->endTime,time_span->startTime); + if(size == 0){ + time_window.start_time = time_span->startTime; + time_window.time_width = time_delta; + }else{ + time_window.time_width = ltt_time_div(time_window.time_width, size); + if(ltt_time_compare(time_window.time_width,time_delta) > 0) + time_window.time_width = time_delta; + + time_s = ltt_time_sub(current_time,ltt_time_div(time_window.time_width, 2)); + time_e = ltt_time_add(current_time,ltt_time_div(time_window.time_width, 2)); + if(ltt_time_compare(time_span->startTime, time_s) > 0){ + time_s = time_span->startTime; + }else if(ltt_time_compare(time_span->endTime, time_e) < 0){ + time_e = time_span->endTime; + time_s = ltt_time_sub(time_e,time_window.time_width); + } + time_window.start_time = time_s; + } + set_time_window(mw_data, &time_window); + gtk_custom_set_adjust(mw_data->current_tab->custom, FALSE); +} + void zoom_in(GtkWidget * widget, gpointer user_data) { - g_printf("Zoom in\n"); + zoom(widget, 2); } void zoom_out(GtkWidget * widget, gpointer user_data) { - g_printf("Zoom out\n"); + zoom(widget, 0.5); } void zoom_extended(GtkWidget * widget, gpointer user_data) { - g_printf("Zoom extended\n"); + zoom(widget, 0); } void go_to_time(GtkWidget * widget, gpointer user_data) @@ -270,7 +373,7 @@ void on_empty_traceset_activate (GtkMenuItem *menuitem, gpointer user_data) { - createNewWindow((GtkWidget*)menuitem, user_data, FALSE); + create_new_window((GtkWidget*)menuitem, user_data, FALSE); } @@ -278,7 +381,7 @@ void on_clone_traceset_activate (GtkMenuItem *menuitem, gpointer user_data) { - createNewWindow((GtkWidget*)menuitem, user_data, TRUE); + create_new_window((GtkWidget*)menuitem, user_data, TRUE); } @@ -287,6 +390,7 @@ on_tab_activate (GtkMenuItem *menuitem, gpointer user_data) { gchar label[PATH_LENGTH]; + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); GtkNotebook * notebook = (GtkNotebook *)lookup_widget((GtkWidget*)menuitem, "MNotebook"); if(notebook == NULL){ g_printf("Notebook does not exist\n"); @@ -294,9 +398,9 @@ on_tab_activate (GtkMenuItem *menuitem, } strcpy(label,"Page"); - get_label(NULL, label,"Get the name of the tab","Please input tab's name"); + get_label(mw_data, label,"Get the name of the tab","Please input tab's name"); - create_tab ((GtkWidget*)menuitem, notebook, label); + create_tab (mw_data, mw_data, notebook, label); } @@ -312,7 +416,8 @@ void on_close_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Close\n"); + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); + main_window_destructor(mw_data); } @@ -320,7 +425,30 @@ void on_close_tab_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Close tab\n"); + int count = 0; + GtkWidget * notebook; + Tab * tmp; + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); + notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook"); + if(notebook == NULL){ + g_printf("Notebook does not exist\n"); + return; + } + + if(mw_data->tab == mw_data->current_tab){ + // tmp = mw_data->current_tb; + // mw_data->tab = mw_data->current_tab->next; + g_printf("The default TAB can not be deleted\n"); + return; + }else{ + tmp = mw_data->tab; + while(tmp != mw_data->current_tab){ + tmp = tmp->next; + count++; + } + } + + gtk_notebook_remove_page((GtkNotebook*)notebook, count); } @@ -360,8 +488,7 @@ void on_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { - mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem); - mainWindow_Destructor(mwData); + gtk_main_quit (); } @@ -467,27 +594,34 @@ on_load_module_activate (GtkMenuItem *menuitem, { char ** dir; gint id; - char str[PATH_LENGTH]; - mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem); - GtkFileSelection * fileSelector = (GtkFileSelection *)gtk_file_selection_new("Select a module"); - gtk_file_selection_hide_fileop_buttons(fileSelector); + char str[PATH_LENGTH], *str1; + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); + GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module"); + gtk_file_selection_hide_fileop_buttons(file_selector); str[0] = '\0'; - id = gtk_dialog_run(GTK_DIALOG(fileSelector)); + id = gtk_dialog_run(GTK_DIALOG(file_selector)); switch(id){ case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_OK: - dir = gtk_file_selection_get_selections (fileSelector); + dir = gtk_file_selection_get_selections (file_selector); sprintf(str,dir[0]); - if(mwData->winCreationData) - lttv_module_load(str, mwData->winCreationData->argc,mwData->winCreationData->argv); + str1 = strrchr(str,'/'); + if(str1)str1++; + else{ + str1 = strrchr(str,'\\'); + str1++; + } + if(mw_data->win_creation_data) + lttv_module_load(str1, mw_data->win_creation_data->argc,mw_data->win_creation_data->argv); else - lttv_module_load(str, 0,NULL); + lttv_module_load(str1, 0,NULL); + g_slist_foreach(g_main_window_list, insert_menu_toolbar_item, NULL); g_strfreev(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: default: - gtk_widget_destroy((GtkWidget*)fileSelector); + gtk_widget_destroy((GtkWidget*)file_selector); break; } g_printf("Load module: %s\n", str); @@ -502,7 +636,7 @@ on_unload_module_activate (GtkMenuItem *menuitem, char **name, *unload_module_name; guint nb; LttvModule ** modules, *module; - mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem); + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); modules = lttv_module_list(&nb); name = g_new(char*, nb); @@ -530,22 +664,22 @@ void on_add_module_search_path_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkDirSelection * fileSelector = (GtkDirSelection *)gtk_dir_selection_new("Select module path"); + GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select module path"); char * dir; gint id; - mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem); + MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); - id = gtk_dialog_run(GTK_DIALOG(fileSelector)); + id = gtk_dialog_run(GTK_DIALOG(file_selector)); switch(id){ case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_OK: - dir = gtk_dir_selection_get_dir (fileSelector); + dir = gtk_dir_selection_get_dir (file_selector); lttv_module_path_add(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: default: - gtk_widget_destroy((GtkWidget*)fileSelector); + gtk_widget_destroy((GtkWidget*)file_selector); break; } } @@ -595,7 +729,7 @@ void on_button_new_clicked (GtkButton *button, gpointer user_data) { - createNewWindow((GtkWidget*)button, user_data, FALSE); + create_new_window((GtkWidget*)button, user_data, FALSE); } @@ -706,12 +840,12 @@ void on_MWindow_destroy (GtkObject *object, gpointer user_data) { - mainWindow *Main_Window = (mainWindow*)user_data; + MainWindow *Main_Window = (MainWindow*)user_data; - g_printf("There are : %d windows\n",g_slist_length(Main_Window_List)); + g_printf("There are : %d windows\n",g_slist_length(g_main_window_list)); - gWinCount--; - if(gWinCount == 0) + g_win_count--; + if(g_win_count == 0) gtk_main_quit (); } @@ -722,17 +856,29 @@ on_MNotebook_switch_page (GtkNotebook *notebook, guint page_num, gpointer user_data) { - mainWindow * mw = get_window_data_struct((GtkWidget*)notebook); - tab * Tab = mw->Tab; + MainWindow * mw = get_window_data_struct((GtkWidget*)notebook); + Tab * tab = mw->tab; while(page_num){ - Tab = Tab->Next; + tab = tab->next; page_num--; } - mw->CurrentTab = Tab; + mw->current_tab = tab; } +char * get_remove_trace(char ** all_trace_name, int nb_trace) +{ + return get_selection(all_trace_name, nb_trace, + "Select a trace", "Trace pathname"); +} char * get_unload_module(char ** loaded_module_name, int nb_module) +{ + return get_selection(loaded_module_name, nb_module, + "Select an unload module", "Module pathname"); +} + +char * get_selection(char ** loaded_module_name, int nb_module, + char *title, char * column_title) { GtkWidget * dialogue; GtkWidget * scroll_win; @@ -745,7 +891,7 @@ char * get_unload_module(char ** loaded_module_name, int nb_module) gint id, i; char * unload_module_name = NULL; - dialogue = gtk_dialog_new_with_buttons("Select an unload module", + dialogue = gtk_dialog_new_with_buttons(title, NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK,GTK_RESPONSE_ACCEPT, @@ -764,7 +910,7 @@ char * get_unload_module(char ** loaded_module_name, int nb_module) g_object_unref (G_OBJECT (store)); renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("MODULE NAME", + column = gtk_tree_view_column_new_with_attributes (column_title, renderer, "text", MODULE_COLUMN, NULL); @@ -801,18 +947,28 @@ char * get_unload_module(char ** loaded_module_name, int nb_module) return unload_module_name; } -void insertMenuToolbarItem(mainWindow * mw) +void main_window_destroy_hash_key(gpointer key) +{ + g_free(key); +} + +void main_window_destroy_hash_data(gpointer data) +{ +} + + +void insert_menu_toolbar_item(MainWindow * mw, gpointer user_data) { int i; GdkPixbuf *pixbuf; view_constructor constructor; LttvMenus * menu; LttvToolbars * toolbar; - lttv_menu_closure *menuItem; - lttv_toolbar_closure *toolbarItem; + lttv_menu_closure *menu_item; + lttv_toolbar_closure *toolbar_item; LttvAttributeValue value; LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); - GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap; + GtkWidget * tool_menu_title_menu, *insert_view, *pixmap, *tmp; g_assert(lttv_iattribute_find_by_path(attributes, "viewers/menu", LTTV_POINTER, &value)); @@ -820,15 +976,19 @@ void insertMenuToolbarItem(mainWindow * mw) 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); + menu_item = &g_array_index(menu, lttv_menu_closure, i); + tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menu_item->menuText)); + if(tmp)continue; + constructor = menu_item->con; + tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu"); + insert_view = gtk_menu_item_new_with_mnemonic (menu_item->menuText); gtk_widget_show (insert_view); - gtk_container_add (GTK_CONTAINER (ToolMenuTitle_menu), insert_view); + gtk_container_add (GTK_CONTAINER (tool_menu_title_menu), insert_view); g_signal_connect ((gpointer) insert_view, "activate", - G_CALLBACK (insertViewTest), + G_CALLBACK (insert_viewer_wrap), constructor); + g_hash_table_insert(mw->hash_menu_item, g_strdup(menu_item->menuText), + insert_view); } } @@ -838,225 +998,294 @@ void insertMenuToolbarItem(mainWindow * mw) 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); + toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i); + tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip)); + if(tmp)continue; + constructor = toolbar_item->con; + tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2"); + pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbar_item->pixmap); pixmap = gtk_image_new_from_pixbuf(pixbuf); - insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (ToolMenuTitle_menu), + insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (tool_menu_title_menu), GTK_TOOLBAR_CHILD_BUTTON, NULL, "", - toolbarItem->tooltip, NULL, + toolbar_item->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_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (tool_menu_title_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); + g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insert_viewer_wrap),constructor); + g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip), + insert_view); } } } -void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_data) +void construct_main_window(MainWindow * parent, WindowCreationData * win_creation_data) { - g_critical("constructMainWin()"); - // systemView * sv = NULL; /* System view */ - //systemView * newSv; /* New system view displayed in the new window */ - GtkWidget * newWindow; /* New generated main window */ - mainWindow * newMWindow;/* New main window structure */ + g_critical("construct_main_window()"); + GtkWidget * new_window; /* New generated main window */ + MainWindow * new_m_window;/* New main window structure */ GtkNotebook * notebook; LttvIAttribute *attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); LttvAttributeValue value; - - // if(parent) sv = parent->SystemView; - - newMWindow = g_new(mainWindow, 1); + + new_m_window = g_new(MainWindow, 1); // Add the object's information to the module's array - Main_Window_List = g_slist_append(Main_Window_List, newMWindow); + g_main_window_list = g_slist_append(g_main_window_list, new_m_window); - newWindow = create_MWindow(); - gtk_widget_show (newWindow); + new_window = create_MWindow(); + gtk_widget_show (new_window); - //newSv = g_new(systemView, 1); - // if(sv){ - // while(sv->Next) sv = sv->Next; - // sv->Next = newSv; - // } - - //newSv->EventDB = NULL; - //newSv->SystemInfo = NULL; - //newSv->Options = NULL; - //newSv->Next = NULL; - //newSv->Window = newMWindow; - - newMWindow->Attributes = attributes; + new_m_window->attributes = attributes; - newMWindow->Traceset_Info = g_new(TracesetInfo,1); - newMWindow->Traceset_Info->path = NULL ; - - - newMWindow->Traceset_Info->before_traceset = lttv_hooks_new(); - newMWindow->Traceset_Info->after_traceset = lttv_hooks_new(); - newMWindow->Traceset_Info->before_trace = lttv_hooks_new(); - newMWindow->Traceset_Info->after_trace = lttv_hooks_new(); - newMWindow->Traceset_Info->before_tracefile = lttv_hooks_new(); - newMWindow->Traceset_Info->after_tracefile = lttv_hooks_new(); - newMWindow->Traceset_Info->before_event = lttv_hooks_new(); - newMWindow->Traceset_Info->after_event = lttv_hooks_new(); - - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->before_traceset; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->after_traceset; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->before_trace; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->after_trace; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->before_tracefile; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->after_tracefile; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->before_event; - g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/after", - LTTV_POINTER, &value)); - *(value.v_pointer) = newMWindow->Traceset_Info->after_event; - - - newMWindow->MWindow = newWindow; - newMWindow->Tab = NULL; - newMWindow->CurrentTab = NULL; - //newMWindow->SystemView = newSv; - newMWindow->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); + new_m_window->mwindow = new_window; + new_m_window->tab = NULL; + new_m_window->current_tab = NULL; + new_m_window->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); if(parent){ - newMWindow->Traceset_Info->traceset = - lttv_traceset_copy(parent->Traceset_Info->traceset); - -//FIXME copy not implemented in lower level - newMWindow->Traceset_Info->TracesetContext = - g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); - lttv_context_init( - LTTV_TRACESET_CONTEXT(newMWindow->Traceset_Info->TracesetContext), - newMWindow->Traceset_Info->traceset); - //newMWindow->traceset_context = parent->traceset_context; - newMWindow->winCreationData = parent->winCreationData; + new_m_window->win_creation_data = parent->win_creation_data; }else{ - newMWindow->Traceset_Info->traceset = lttv_traceset_new(); - - /* Add the command line trace */ - if(gInit_Trace != NULL) - lttv_traceset_add(newMWindow->Traceset_Info->traceset, gInit_Trace); - /* NOTE : the context must be recreated if we change the traceset, - * ie : adding/removing traces */ - newMWindow->Traceset_Info->TracesetContext = - g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); - lttv_context_init( - LTTV_TRACESET_CONTEXT(newMWindow->Traceset_Info->TracesetContext), - newMWindow->Traceset_Info->traceset); - - newMWindow->winCreationData = win_creation_data; + new_m_window->win_creation_data = win_creation_data; } - insertMenuToolbarItem(newMWindow); + new_m_window->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal, + main_window_destroy_hash_key, + main_window_destroy_hash_data); + new_m_window->hash_toolbar_item = g_hash_table_new_full (g_str_hash, g_str_equal, + main_window_destroy_hash_key, + main_window_destroy_hash_data); + + insert_menu_toolbar_item(new_m_window, NULL); - //g_object_set_data(G_OBJECT(newWindow), "systemView", (gpointer)newSv); - g_object_set_data(G_OBJECT(newWindow), "mainWindow", (gpointer)newMWindow); + g_object_set_data(G_OBJECT(new_window), "mainWindow", (gpointer)new_m_window); //create a default tab - notebook = (GtkNotebook *)lookup_widget(newMWindow->MWindow, "MNotebook"); + notebook = (GtkNotebook *)lookup_widget(new_m_window->mwindow, "MNotebook"); if(notebook == NULL){ g_printf("Notebook does not exist\n"); return; } //for now there is no name field in LttvTraceset structure //Use "Traceset" as the label for the default tab - create_tab(newMWindow->MWindow, notebook,"Traceset"); + create_tab(NULL, new_m_window, notebook,"Traceset"); g_object_set_data_full( - G_OBJECT(newMWindow->MWindow), + G_OBJECT(new_m_window->mwindow), "Main_Window_Data", - newMWindow, - (GDestroyNotify)mainWindow_free); + new_m_window, + (GDestroyNotify)main_window_free); - gWinCount++; + g_win_count++; } -void Tab_Destructor(tab *Tab) +void tab_destructor(Tab * tab_instance) { - if(Tab->Attributes) - g_object_unref(Tab->Attributes); - g_free(Tab); + int i, nb, ref_count; + LttvTrace * trace; + + if(tab_instance->attributes) + g_object_unref(tab_instance->attributes); + + if(tab_instance->mw->tab == tab_instance){ + tab_instance->mw->tab = tab_instance->next; + }else{ + Tab * tmp1, *tmp = tab_instance->mw->tab; + while(tmp != tab_instance){ + tmp1 = tmp; + tmp = tmp->next; + } + tmp1->next = tab_instance->next; + } + + if(tab_instance->traceset_info->traceset_context != NULL){ + lttv_context_fini(LTTV_TRACESET_CONTEXT(tab_instance->traceset_info-> + traceset_context)); + g_object_unref(tab_instance->traceset_info->traceset_context); + } + if(tab_instance->traceset_info->traceset != NULL) { + nb = lttv_traceset_number(tab_instance->traceset_info->traceset); + for(i = 0 ; i < nb ; i++) { + trace = lttv_traceset_get(tab_instance->traceset_info->traceset, i); + ref_count = lttv_trace_get_ref_number(trace); + if(ref_count <= 1) + ltt_trace_close(lttv_trace(trace)); + } + } + lttv_traceset_destroy(tab_instance->traceset_info->traceset); + g_free(tab_instance->traceset_info); + g_free(tab_instance); } -void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label) +void * create_tab(MainWindow * parent, MainWindow* current_window, + GtkNotebook * notebook, char * label) { GList * list; - tab * tmpTab; - mainWindow * mwData; - LttTime TmpTime; - - mwData = get_window_data_struct(parent); - tmpTab = mwData->Tab; - while(tmpTab && tmpTab->Next) tmpTab = tmpTab->Next; - if(!tmpTab){ - mwData->CurrentTab = NULL; - tmpTab = g_new(tab,1); - mwData->Tab = tmpTab; + Tab * tmp_tab; + MainWindow * mw_data = current_window; + LttTime tmp_time; + + tmp_tab = mw_data->tab; + while(tmp_tab && tmp_tab->next) tmp_tab = tmp_tab->next; + if(!tmp_tab){ + mw_data->current_tab = NULL; + tmp_tab = g_new(Tab,1); + mw_data->tab = tmp_tab; + }else{ + tmp_tab->next = g_new(Tab,1); + tmp_tab = tmp_tab->next; + } + + tmp_tab->traceset_info = g_new(TracesetInfo,1); + if(parent){ + tmp_tab->traceset_info->traceset = + lttv_traceset_copy(parent->current_tab->traceset_info->traceset); }else{ - tmpTab->Next = g_new(tab,1); - tmpTab = tmpTab->Next; + if(mw_data->current_tab){ + tmp_tab->traceset_info->traceset = + lttv_traceset_copy(mw_data->current_tab->traceset_info->traceset); + }else{ + tmp_tab->traceset_info->traceset = lttv_traceset_new(); + } + + /* Add the command line trace */ + if(g_init_trace != NULL && parent == NULL) + lttv_traceset_add(tmp_tab->traceset_info->traceset, g_init_trace); } - if(mwData->CurrentTab){ - // Will have to read directly at the main window level, as we want - // to be able to modify a traceset on the fly. - // tmpTab->traceStartTime = mwData->CurrentTab->traceStartTime; - // tmpTab->traceEndTime = mwData->CurrentTab->traceEndTime; - tmpTab->Time_Window = mwData->CurrentTab->Time_Window; - tmpTab->currentTime = mwData->CurrentTab->currentTime; + //FIXME copy not implemented in lower level + tmp_tab->traceset_info->traceset_context = + g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); + lttv_context_init( + LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context), + tmp_tab->traceset_info->traceset); + + if(mw_data->current_tab){ + // Will have to read directly at the main window level, as we want + // to be able to modify a traceset on the fly. + tmp_tab->time_window = mw_data->current_tab->time_window; + tmp_tab->current_time = mw_data->current_tab->current_time; }else{ - // Will have to read directly at the main window level, as we want - // to be able to modify a traceset on the fly. - // getTracesetTimeSpan(mwData,&tmpTab->traceStartTime, &tmpTab->traceEndTime); - tmpTab->Time_Window.startTime = - LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->startTime; + // Will have to read directly at the main window level, as we want + // to be able to modify a traceset on the fly. + // get_traceset_time_span(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime); + tmp_tab->time_window.start_time = + LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->startTime; if(DEFAULT_TIME_WIDTH_S < - LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec) - TmpTime.tv_sec = DEFAULT_TIME_WIDTH_S; + LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->endTime.tv_sec) + tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S; else - TmpTime.tv_sec = - LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec; - TmpTime.tv_nsec = 0; - tmpTab->Time_Window.Time_Width = TmpTime ; - tmpTab->currentTime.tv_sec = TmpTime.tv_sec / 2; - tmpTab->currentTime.tv_nsec = 0 ; + tmp_time.tv_sec = + LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->endTime.tv_sec; + tmp_time.tv_nsec = 0; + tmp_tab->time_window.time_width = tmp_time ; + tmp_tab->current_time.tv_sec = tmp_time.tv_sec / 2; + tmp_tab->current_time.tv_nsec = 0 ; } - tmpTab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); - // mwData->CurrentTab = tmpTab; - tmpTab->custom = (GtkCustom*)gtk_custom_new(); - tmpTab->custom->mw = mwData; - gtk_widget_show((GtkWidget*)tmpTab->custom); - tmpTab->Next = NULL; + tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); + // mw_data->current_tab = tmp_tab; + tmp_tab->custom = (GtkCustom*)gtk_custom_new(); + tmp_tab->custom->mw = mw_data; + gtk_widget_show((GtkWidget*)tmp_tab->custom); + tmp_tab->next = NULL; + tmp_tab->mw = mw_data; - tmpTab->label = gtk_label_new (label); - gtk_widget_show (tmpTab->label); + tmp_tab->label = gtk_label_new (label); + gtk_widget_show (tmp_tab->label); g_object_set_data_full( - G_OBJECT(tmpTab->custom), + G_OBJECT(tmp_tab->custom), "Tab_Info", - tmpTab, - (GDestroyNotify)Tab_Destructor); + tmp_tab, + (GDestroyNotify)tab_destructor); - gtk_notebook_append_page(notebook, (GtkWidget*)tmpTab->custom, tmpTab->label); + gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->custom, tmp_tab->label); list = gtk_container_get_children(GTK_CONTAINER(notebook)); gtk_notebook_set_current_page(notebook,g_list_length(list)-1); } + +void remove_menu_item(gpointer main_win, gpointer user_data) +{ + MainWindow * mw = (MainWindow *) main_win; + lttv_menu_closure *menu_item = (lttv_menu_closure *)user_data; + GtkWidget * tool_menu_title_menu, *insert_view; + + tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu"); + insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_menu_item, + menu_item->menuText); + if(insert_view){ + g_hash_table_remove(mw->hash_menu_item, menu_item->menuText); + gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view); + } +} + +void remove_toolbar_item(gpointer main_win, gpointer user_data) +{ + MainWindow * mw = (MainWindow *) main_win; + lttv_toolbar_closure *toolbar_item = (lttv_toolbar_closure *)user_data; + GtkWidget * tool_menu_title_menu, *insert_view; + + + tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2"); + insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_toolbar_item, + toolbar_item->tooltip); + if(insert_view){ + g_hash_table_remove(mw->hash_toolbar_item, toolbar_item->tooltip); + gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view); + } +} + +/** + * Remove menu and toolbar item when a module unloaded + */ + +void main_window_remove_menu_item(lttv_constructor constructor) +{ + int i; + LttvMenus * menu; + lttv_menu_closure *menu_item; + LttvAttributeValue value; + LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + + 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++){ + menu_item = &g_array_index(menu, lttv_menu_closure, i); + if(menu_item->con != constructor) continue; + if(g_main_window_list){ + g_slist_foreach(g_main_window_list, remove_menu_item, menu_item); + } + break; + } + } + +} + +void main_window_remove_toolbar_item(lttv_constructor constructor) +{ + int i; + LttvToolbars * toolbar; + lttv_toolbar_closure *toolbar_item; + LttvAttributeValue value; + LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes()); + + 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++){ + toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i); + if(toolbar_item->con != constructor) continue; + if(g_main_window_list){ + g_slist_foreach(g_main_window_list, remove_toolbar_item, toolbar_item); + } + break; + } + } +}