X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=7daa30e13ba8de3b6cac67bc0c5be74d74c4d1ef;hb=58de9fc19632252ff4343b86ae07c08e3d8a7eaa;hp=060fcbc7dd64bd633a151699ba7cc152bf0292b6;hpb=5290ec02dda002f243ef98cd018f31ee44e07843;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index 060fcbc7..7daa30e1 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -46,10 +46,9 @@ #include #include #include -#include -#define DEFAULT_TIME_WIDTH_S 1 +static LttTime lttvwindow_default_time_width = { 1, 0 }; #define CLIP_BUF 256 // size of clipboard buffer extern LttvTrace *g_init_trace ; @@ -64,10 +63,13 @@ static char remember_trace_dir[PATH_MAX] = ""; MainWindow * get_window_data_struct(GtkWidget * widget); -char * get_load_module(char ** load_module_name, int nb_module); -char * get_unload_module(char ** loaded_module_name, int nb_module); -char * get_remove_trace(char ** all_trace_name, int nb_trace); -char * get_selection(char ** all_name, int nb, char *title, char * column_title); +char * get_load_module(MainWindow *mw, + char ** load_module_name, int nb_module); +char * get_unload_module(MainWindow *mw, + char ** loaded_module_name, int nb_module); +char * get_remove_trace(MainWindow *mw, char ** all_trace_name, int nb_trace); +char * get_selection(MainWindow *mw, + char ** all_name, int nb, char *title, char * column_title); Tab* create_tab(MainWindow * mw, Tab *copy_tab, GtkNotebook * notebook, char * label); @@ -299,6 +301,53 @@ static gboolean on_MEventBox5b_paste(GtkWidget *widget, GdkEventButton *event, return 0; } +/* Interval */ +static void MEventBox8_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_sec, *ptr_nsec; + + strncpy(buffer, text, CLIP_BUF); + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_sec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + ptr++; + + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_nsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry7), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry8), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* Interval */ +static gboolean on_MEventBox8_paste(GtkWidget *widget, GdkEventButton *event, + gpointer data) +{ + Tab *tab = (Tab*)data; + + GtkClipboard *clip = gtk_clipboard_get_for_display(gdk_display_get_default(), + GDK_SELECTION_PRIMARY); + gtk_clipboard_request_text(clip, + (GtkClipboardTextReceivedFunc)MEventBox8_receive, + (gpointer)tab); + return 0; +} + static gboolean viewer_grab_focus(GtkWidget *widget, GdkEventButton *event, gpointer data) @@ -408,8 +457,8 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; - TimeWindow new_time_window; - LttTime new_current_time; + TimeWindow new_time_window = tab->time_window; + LttTime new_current_time = tab->current_time; /* Set the tab's time window and current time if * out of bounds */ @@ -421,24 +470,23 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) new_current_time = time_span.start_time; LttTime tmp_time; - - if(DEFAULT_TIME_WIDTH_S < time_span.end_time.tv_sec) - tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S; + + if(ltt_time_compare(lttvwindow_default_time_width, + ltt_time_sub(time_span.end_time, time_span.start_time)) < 0 + || + ltt_time_compare(time_span.end_time, time_span.start_time) == 0) + tmp_time = lttvwindow_default_time_width; else - tmp_time.tv_sec = time_span.end_time.tv_sec; - tmp_time.tv_nsec = 0; + tmp_time = time_span.end_time; + new_time_window.time_width = tmp_time ; new_time_window.time_width_double = ltt_time_to_double(tmp_time); new_time_window.end_time = ltt_time_add(new_time_window.start_time, new_time_window.time_width) ; } - time_change_manager(tab, new_time_window); - current_time_change_manager(tab, new_current_time); - //FIXME : we delete the filter tree, when it should be updated. - lttv_filter_destroy(tab->filter); - tab->filter = NULL; - + + #if 0 /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); @@ -501,7 +549,9 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) if(tmp == NULL) retval = 1; else lttv_hooks_call(tmp,traceset); - + time_change_manager(tab, new_time_window); + current_time_change_manager(tab, new_current_time); + return retval; } @@ -514,7 +564,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) * 0 : filters updated * 1 : no filter hooks to update; not an error. */ - +#if 0 int SetFilter(Tab * tab, gpointer filter) { LttvHooks * tmp; @@ -530,7 +580,7 @@ int SetFilter(Tab * tab, gpointer filter) return 0; } - +#endif //0 /** @@ -803,6 +853,9 @@ void open_traceset(GtkWidget * widget, gpointer user_data) gtk_file_selection_hide_fileop_buttons(file_selector); + gtk_window_set_transient_for(GTK_WINDOW(file_selector), + GTK_WINDOW(mw_data->mwindow)); + id = gtk_dialog_run(GTK_DIALOG(file_selector)); switch(id){ case GTK_RESPONSE_ACCEPT: @@ -1084,6 +1137,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } else { LttTime pos_time; + LttvTracefileContext *tfc = + lttv_traceset_context_get_current_tfc(tsc); /* Else, the first request in list_in is a position request */ /* If first req in list_in pos != current pos */ g_assert(events_request->start_position != NULL); @@ -1092,10 +1147,16 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->start_position).tv_sec, lttv_traceset_context_position_get_time( events_request->start_position).tv_nsec); - - g_debug("SEEK POS context time : %lu, %lu", - lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_sec, - lttv_traceset_context_get_current_tfc(tsc)->timestamp.tv_nsec); + + if(tfc) { + g_debug("SEEK POS context time : %lu, %lu", + tfc->timestamp.tv_sec, + tfc->timestamp.tv_nsec); + } else { + g_debug("SEEK POS context time : %lu, %lu", + ltt_time_infinite.tv_sec, + ltt_time_infinite.tv_nsec); + } g_assert(events_request->start_position != NULL); if(lttv_traceset_context_ctx_pos_compare(tsc, events_request->start_position) != 0) { @@ -1697,18 +1758,23 @@ void add_trace(GtkWidget * widget, gpointer user_data) tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace"); - gtk_dir_selection_hide_fileop_buttons(file_selector); + //GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace"); + GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a trace"); + gtk_widget_hide( (file_selector)->file_list->parent) ; + gtk_file_selection_hide_fileop_buttons(file_selector); + gtk_window_set_transient_for(GTK_WINDOW(file_selector), + GTK_WINDOW(mw_data->mwindow)); if(remember_trace_dir[0] != '\0') - gtk_dir_selection_set_filename(file_selector, remember_trace_dir); + gtk_file_selection_set_filename(file_selector, remember_trace_dir); 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); + dir = gtk_file_selection_get_filename (file_selector); strncpy(remember_trace_dir, dir, PATH_MAX); + strncat(remember_trace_dir, "/", PATH_MAX); if(!dir || strlen(dir) == 0){ gtk_widget_destroy((GtkWidget*)file_selector); break; @@ -1719,6 +1785,18 @@ void add_trace(GtkWidget * widget, gpointer user_data) trace = ltt_trace_open(abs_path); if(trace == NULL) { g_warning("cannot open trace %s", abs_path); + + GtkWidget *dialogue = + gtk_message_dialog_new( + GTK_WINDOW(gtk_widget_get_toplevel(widget)), + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "Cannot open trace : maybe you should enter in the trace " + "directory to select it ?"); + gtk_dialog_run(GTK_DIALOG(dialogue)); + gtk_widget_destroy(dialogue); + } else { trace_v = lttv_trace_new(trace); lttvwindowtraces_add_trace(trace_v); @@ -1786,10 +1864,10 @@ void remove_trace(GtkWidget *widget, gpointer user_data) for(i = 0; i < nb_trace; i++){ trace_v = lttv_traceset_get(tab->traceset_info->traceset, i); trace = lttv_trace(trace_v); - name[i] = ltt_trace_name(trace); + name[i] = g_quark_to_string(ltt_trace_name(trace)); } - remove_trace_name = get_remove_trace(name, nb_trace); + remove_trace_name = get_remove_trace(mw_data, name, nb_trace); if(remove_trace_name){ @@ -2140,7 +2218,8 @@ void zoom(GtkWidget * widget, double size) new_time_window.end_time = ltt_time_add(new_time_window.start_time, new_time_window.time_width) ; /* If on borders, don't fall off */ - if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0) + if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0 + || ltt_time_compare(new_time_window.start_time, time_span.end_time) >0) { new_time_window.start_time = time_span.start_time; new_time_window.end_time = ltt_time_add(new_time_window.start_time, @@ -2149,7 +2228,9 @@ void zoom(GtkWidget * widget, double size) else { if(ltt_time_compare(new_time_window.end_time, - time_span.end_time) > 0) + time_span.end_time) > 0 + || ltt_time_compare(new_time_window.end_time, + time_span.start_time) < 0) { new_time_window.start_time = ltt_time_sub(time_span.end_time, new_time_window.time_width); @@ -2476,7 +2557,8 @@ on_load_library_activate (GtkMenuItem *menuitem, g_ptr_array_add(name, path); } - load_module_path = get_selection((char **)(name->pdata), name->len, + load_module_path = get_selection(mw_data, + (char **)(name->pdata), name->len, "Select a library path", "Library paths"); if(load_module_path != NULL) strncpy(load_module_path_alter, load_module_path, PATH_MAX-1); // -1 for / @@ -2509,6 +2591,9 @@ on_load_library_activate (GtkMenuItem *menuitem, gtk_file_selection_set_filename(file_selector, load_module_path_alter); gtk_file_selection_hide_fileop_buttons(file_selector); + gtk_window_set_transient_for(GTK_WINDOW(file_selector), + GTK_WINDOW(mw_data->mwindow)); + str[0] = '\0'; id = gtk_dialog_run(GTK_DIALOG(file_selector)); switch(id){ @@ -2583,7 +2668,7 @@ on_unload_library_activate (GtkMenuItem *menuitem, gchar *path = lib_info[i].name; g_ptr_array_add(name, path); } - lib_name = get_selection((char **)(name->pdata), name->len, + lib_name = get_selection(mw_data, (char **)(name->pdata), name->len, "Select a library", "Libraries"); if(lib_name != NULL) { for(i=0;ipdata), name->len, + lib_name = get_selection(mw_data,(char **)(name->pdata), name->len, "Select a library", "Libraries"); if(lib_name != NULL) { for(i=0;ipdata), name->len, + module_name = get_selection(mw_data, (char **)(name->pdata), name->len, "Select a module", "Modules"); if(module_name != NULL) { for(i=0;ipdata), name->len, + lib_name = get_selection(mw_data, (char **)(name->pdata), name->len, "Select a library", "Libraries"); if(lib_name != NULL) { for(i=0;i 0) g_ptr_array_add(name, path); } - module_name = get_selection((char **)(name->pdata), name->len, + module_name = get_selection(mw_data, (char **)(name->pdata), name->len, "Select a module", "Modules"); if(module_name != NULL) { for(i=0;ifile_list->parent) ; + + gtk_window_set_transient_for(GTK_WINDOW(file_selector), + GTK_WINDOW(mw_data->mwindow)); + const char * dir; gint id; - MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); if(remember_plugins_dir[0] != '\0') - gtk_dir_selection_set_filename(file_selector, remember_plugins_dir); + gtk_file_selection_set_filename(file_selector, remember_plugins_dir); 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); + dir = gtk_file_selection_get_filename (file_selector); strncpy(remember_plugins_dir,dir,PATH_MAX); strncat(remember_plugins_dir,"/",PATH_MAX); lttv_library_path_add(dir); @@ -2890,7 +2981,7 @@ on_remove_library_search_path_activate (GtkMenuItem *menuitem, gchar *path = lttv_library_path_get(i); g_ptr_array_add(name, path); } - lib_path = get_selection((char **)(name->pdata), name->len, + lib_path = get_selection(mw_data, (char **)(name->pdata), name->len, "Select a library path", "Library paths"); g_ptr_array_free(name, TRUE); @@ -2975,10 +3066,11 @@ on_about_activate (GtkMenuItem *menuitem, Contributors :\n\ \n\ Michel Dagenais (New trace format, lttv main)\n\ -Mathieu Desnoyers (Directory structure, build with automake/conf,\n\ +Mathieu Desnoyers (Kernel Tracer, Directory structure, build with automake/conf,\n\ lttv gui, control flow view, gui cooperative trace reading\n\ scheduler with interruptible foreground and background\n\ - computation, detailed event list)\n\ + computation, detailed event list (rewrite), trace reading\n\ + library (rewrite))\n\ Benoit Des Ligneris, Eric Clement (Cluster adaptation, work in progress)\n\ Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\ detailed event list and statistics view)\n\ @@ -3238,6 +3330,8 @@ void time_change_manager (Tab *tab, LttTime start_time = new_time_window.start_time; LttTime end_time = new_time_window.end_time; + g_assert(ltt_time_compare(start_time, end_time) < 0); + /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time); @@ -3537,6 +3631,141 @@ on_MEntry4_value_changed (GtkSpinButton *spinbutton, } +/* value changed for time frame interval s + * + * Check time span : if ns is out of range, clip it the nearest good value. + */ +void +on_MEntry7_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + LttTime current_time, time_delta; + TimeWindow new_time_window = tab->time_window; + current_time = tab->current_time; + + time_delta = ltt_time_sub(time_span.end_time,time_span.start_time); + new_time_window.time_width.tv_sec = value; + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + if(ltt_time_compare(new_time_window.time_width,time_delta) > 0) + { /* Case where zoom out is bigger than trace length */ + new_time_window.start_time = time_span.start_time; + new_time_window.time_width = time_delta; + new_time_window.time_width_double = ltt_time_to_double(time_delta); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + else + { + /* Center the image on the current time */ + new_time_window.start_time = + ltt_time_sub(current_time, + ltt_time_from_double(new_time_window.time_width_double/2.0)); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + /* If on borders, don't fall off */ + if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0 + || ltt_time_compare(new_time_window.start_time, time_span.end_time) >0) + { + new_time_window.start_time = time_span.start_time; + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + else + { + if(ltt_time_compare(new_time_window.end_time, + time_span.end_time) > 0 + || ltt_time_compare(new_time_window.end_time, + time_span.start_time) < 0) + { + new_time_window.start_time = + ltt_time_sub(time_span.end_time, new_time_window.time_width); + + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + } + + } + + if(ltt_time_compare(new_time_window.time_width, ltt_time_zero) == 0) { + g_warning("Zoom more than 1 ns impossible"); + } else { + time_change_manager(tab, new_time_window); + } +} + +void +on_MEntry8_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + Tab *tab =(Tab *)user_data; + LttvTracesetContext * tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + gint value = gtk_spin_button_get_value_as_int(spinbutton); + LttTime current_time, time_delta; + TimeWindow new_time_window = tab->time_window; + current_time = tab->current_time; + + time_delta = ltt_time_sub(time_span.end_time,time_span.start_time); + new_time_window.time_width.tv_nsec = value; + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + if(ltt_time_compare(new_time_window.time_width,time_delta) > 0) + { /* Case where zoom out is bigger than trace length */ + new_time_window.start_time = time_span.start_time; + new_time_window.time_width = time_delta; + new_time_window.time_width_double = ltt_time_to_double(time_delta); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + else + { + /* Center the image on the current time */ + new_time_window.start_time = + ltt_time_sub(current_time, + ltt_time_from_double(new_time_window.time_width_double/2.0)); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + /* If on borders, don't fall off */ + if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0 + || ltt_time_compare(new_time_window.start_time, time_span.end_time) >0) + { + new_time_window.start_time = time_span.start_time; + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + else + { + if(ltt_time_compare(new_time_window.end_time, + time_span.end_time) > 0 + || ltt_time_compare(new_time_window.end_time, + time_span.start_time) < 0) + { + new_time_window.start_time = + ltt_time_sub(time_span.end_time, new_time_window.time_width); + + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; + } + } + + } + + if(ltt_time_compare(new_time_window.time_width, ltt_time_zero) == 0) { + g_warning("Zoom more than 1 ns impossible"); + } else { + time_change_manager(tab, new_time_window); + } +} + + void current_time_change_manager (Tab *tab, LttTime new_current_time) @@ -3597,6 +3826,8 @@ void current_position_change_manager(Tab *tab, g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); LttTime new_time = lttv_traceset_context_position_get_time(pos); + /* Put the context in a state coherent position */ + lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, ltt_time_zero); current_time_change_manager(tab, new_time); @@ -3719,9 +3950,10 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, /* Select a trace which will be removed from traceset */ -char * get_remove_trace(char ** all_trace_name, int nb_trace) +char * get_remove_trace(MainWindow *mw_data, + char ** all_trace_name, int nb_trace) { - return get_selection(all_trace_name, nb_trace, + return get_selection(mw_data, all_trace_name, nb_trace, "Select a trace", "Trace pathname"); } @@ -3729,9 +3961,10 @@ char * get_remove_trace(char ** all_trace_name, int nb_trace) /* Select a module which will be loaded */ -char * get_load_module(char ** load_module_name, int nb_module) +char * get_load_module(MainWindow *mw_data, + char ** load_module_name, int nb_module) { - return get_selection(load_module_name, nb_module, + return get_selection(mw_data, load_module_name, nb_module, "Select a module to load", "Module name"); } @@ -3741,9 +3974,10 @@ char * get_load_module(char ** load_module_name, int nb_module) /* Select a module which will be unloaded */ -char * get_unload_module(char ** loaded_module_name, int nb_module) +char * get_unload_module(MainWindow *mw_data, + char ** loaded_module_name, int nb_module) { - return get_selection(loaded_module_name, nb_module, + return get_selection(mw_data, loaded_module_name, nb_module, "Select a module to unload", "Module name"); } @@ -3752,8 +3986,9 @@ char * get_unload_module(char ** loaded_module_name, int nb_module) * select one of them */ -char * get_selection(char ** loaded_module_name, int nb_module, - char *title, char * column_title) +char * get_selection(MainWindow *mw_data, + char ** loaded_module_name, int nb_module, + char *title, char * column_title) { GtkWidget * dialogue; GtkWidget * scroll_win; @@ -3773,6 +4008,8 @@ char * get_selection(char ** loaded_module_name, int nb_module, GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT, NULL); gtk_window_set_default_size((GtkWindow*)dialogue, 500, 200); + gtk_window_set_transient_for(GTK_WINDOW(dialogue), + GTK_WINDOW(mw_data->mwindow)); scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show ( scroll_win); @@ -3932,7 +4169,7 @@ void add_all_menu_toolbar_constructors(MainWindow * mw, gpointer user_data) /* Create a main window */ -void construct_main_window(MainWindow * parent) +MainWindow *construct_main_window(MainWindow * parent) { g_debug("construct_main_window()"); GtkWidget * new_window; /* New generated main window */ @@ -3972,7 +4209,9 @@ void construct_main_window(MainWindow * parent) notebook = (GtkNotebook *)lookup_widget(new_m_window->mwindow, "MNotebook"); if(notebook == NULL){ g_info("Notebook does not exist\n"); - return; + /* FIXME : destroy partially created widgets */ + g_free(new_m_window); + return NULL; } //gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook)); //for now there is no name field in LttvTraceset structure @@ -3991,61 +4230,54 @@ void construct_main_window(MainWindow * parent) new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset"); } else { new_tab = create_tab(new_m_window, NULL, notebook, "Traceset"); - /* First window, use command line trace */ - if(g_init_trace != NULL){ - lttvwindow_add_trace(new_tab, - g_init_trace); + } + /* Insert default viewers */ + { + LttvAttributeType type; + LttvAttributeName name; + LttvAttributeValue value; + LttvAttribute *attribute; + + LttvIAttribute *attributes_global = + LTTV_IATTRIBUTE(lttv_global_attributes()); + + g_assert(attribute = + LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( + LTTV_IATTRIBUTE(attributes_global), + LTTV_VIEWER_CONSTRUCTORS))); + + name = g_quark_from_string("guievents"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); } - LttvTraceset *traceset = new_tab->traceset_info->traceset; - SetTraceset(new_tab, traceset); - - /* Insert default viewers */ - { - LttvAttributeType type; - LttvAttributeName name; - LttvAttributeValue value; - LttvAttribute *attribute; - - LttvIAttribute *attributes_global = - LTTV_IATTRIBUTE(lttv_global_attributes()); - - g_assert(attribute = - LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( - LTTV_IATTRIBUTE(attributes_global), - LTTV_VIEWER_CONSTRUCTORS))); - - name = g_quark_from_string("guievents"); - type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), - name, &value); - if(type == LTTV_POINTER) { - lttvwindow_viewer_constructor viewer_constructor = - (lttvwindow_viewer_constructor)*value.v_pointer; - insert_viewer(new_window, viewer_constructor); - } - - name = g_quark_from_string("guicontrolflow"); - type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), - name, &value); - if(type == LTTV_POINTER) { - lttvwindow_viewer_constructor viewer_constructor = - (lttvwindow_viewer_constructor)*value.v_pointer; - insert_viewer(new_window, viewer_constructor); - } - name = g_quark_from_string("guistatistics"); - type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), - name, &value); - if(type == LTTV_POINTER) { - lttvwindow_viewer_constructor viewer_constructor = - (lttvwindow_viewer_constructor)*value.v_pointer; - insert_viewer(new_window, viewer_constructor); - } + name = g_quark_from_string("guicontrolflow"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); + } + name = g_quark_from_string("guistatistics"); + type = lttv_iattribute_get_by_name(LTTV_IATTRIBUTE(attribute), + name, &value); + if(type == LTTV_POINTER) { + lttvwindow_viewer_constructor viewer_constructor = + (lttvwindow_viewer_constructor)*value.v_pointer; + insert_viewer(new_window, viewer_constructor); } } g_info("There are now : %d windows\n",g_slist_length(g_main_window_list)); + + return new_m_window; } @@ -4120,12 +4352,10 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, /* We can clone the filter, as we copy the trace set also */ /* The filter must always be in sync with the trace set */ tab->filter = lttv_filter_clone(copy_tab->filter); - } else { tab->traceset_info->traceset = lttv_traceset_new(); tab->filter = NULL; } - #ifdef DEBUG lttv_attribute_write_xml( lttv_traceset_attribute(tab->traceset_info->traceset), @@ -4182,16 +4412,17 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->viewer_container = gtk_vbox_new(TRUE, 2); tab->scrollbar = gtk_hscrollbar_new(NULL); //tab->multivpaned = gtk_multi_vpaned_new(); - tab->time_window.start_time = ltt_time_zero; - tab->time_window.end_time = ltt_time_zero; - tab->time_window.time_width = ltt_time_zero; - tab->current_time = ltt_time_zero; - + gtk_box_pack_start(GTK_BOX(tab->vbox), tab->viewer_container, TRUE, /* expand */ TRUE, /* Give the extra space to the child */ 0); /* No padding */ + +// if(copy_tab) { +// tab->time_window = copy_tab->time_window; +// tab->current_time = copy_tab->current_time; +// } /* Create the timebar */ { @@ -4217,6 +4448,7 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, gtk_widget_show(tab->MText2); tab->MText3a = gtk_label_new("ns"); gtk_widget_show(tab->MText3a); + tab->MEventBox3b = gtk_event_box_new(); gtk_widget_show(tab->MEventBox3b); gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox3b, @@ -4228,6 +4460,19 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, gtk_widget_show(tab->MText4); tab->MText5a = gtk_label_new("ns"); gtk_widget_show(tab->MText5a); + + tab->MEventBox8 = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox8); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox8, + "Paste Time Interval here", ""); + tab->MText8 = gtk_label_new("Time Interval:"); + gtk_widget_show(tab->MText8); + gtk_container_add(GTK_CONTAINER(tab->MEventBox8), tab->MText8); + tab->MText9 = gtk_label_new("s"); + gtk_widget_show(tab->MText9); + tab->MText10 = gtk_label_new("ns"); + gtk_widget_show(tab->MText10); + tab->MEventBox5b = gtk_event_box_new(); gtk_widget_show(tab->MEventBox5b); gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox5b, @@ -4264,7 +4509,14 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry6),0); gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry6),TRUE); gtk_widget_show(tab->MEntry6); - + tab->MEntry7 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry7),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry7),TRUE); + gtk_widget_show(tab->MEntry7); + tab->MEntry8 = gtk_spin_button_new_with_range(0.0, 1.0, 1.0); + gtk_spin_button_set_digits(GTK_SPIN_BUTTON(tab->MEntry8),0); + gtk_spin_button_set_snap_to_ticks(GTK_SPIN_BUTTON(tab->MEntry8),TRUE); + gtk_widget_show(tab->MEntry8); GtkWidget *temp_widget; @@ -4285,6 +4537,13 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText4, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry4, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText5a, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox8, FALSE, + FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry7, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText9, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry8, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText10, FALSE, FALSE, 0); + temp_widget = gtk_vseparator_new(); gtk_widget_show(temp_widget); gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText7, FALSE, FALSE, 0); @@ -4332,6 +4591,10 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, "button-press-event", G_CALLBACK (on_MEventBox5b_paste), (gpointer)tab); + g_signal_connect (G_OBJECT(tab->MEventBox8), + "button-press-event", + G_CALLBACK (on_MEventBox8_paste), + (gpointer)tab); } gtk_box_pack_end(GTK_BOX(tab->vbox), @@ -4421,6 +4684,12 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, g_signal_connect ((gpointer) tab->MEntry6, "value-changed", G_CALLBACK (on_MEntry6_value_changed), tab); + g_signal_connect ((gpointer) tab->MEntry7, "value-changed", + G_CALLBACK (on_MEntry7_value_changed), + tab); + g_signal_connect ((gpointer) tab->MEntry8, "value-changed", + G_CALLBACK (on_MEntry8_value_changed), + tab); //g_signal_connect(G_OBJECT(tab->scrollbar), "changed", // G_CALLBACK(scroll_value_changed_cb), tab); @@ -4435,6 +4704,25 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, // always show : not if(g_list_length(list)>1) gtk_notebook_set_show_tabs(notebook, TRUE); + if(copy_tab) { + lttvwindow_report_time_window(tab, copy_tab->time_window); + lttvwindow_report_current_time(tab, copy_tab->current_time); + } else { + TimeWindow time_window; + + time_window.start_time = ltt_time_zero; + time_window.end_time = ltt_time_add(time_window.start_time, + lttvwindow_default_time_width); + time_window.time_width = lttvwindow_default_time_width; + time_window.time_width_double = ltt_time_to_double(time_window.time_width); + + lttvwindow_report_time_window(tab, time_window); + lttvwindow_report_current_time(tab, ltt_time_zero); + } + + LttvTraceset *traceset = tab->traceset_info->traceset; + SetTraceset(tab, traceset); + return tab; } @@ -4450,3 +4738,60 @@ gboolean execute_events_requests(Tab *tab) return ( lttvwindow_process_pending_requests(tab) ); } + +void create_main_window_with_trace(const gchar *path) +{ + if(path == NULL) return; + + /* Create window */ + MainWindow *mw = construct_main_window(NULL); + GtkWidget *widget = mw->mwindow; + + GtkWidget * notebook = lookup_widget(widget, "MNotebook"); + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); + Tab *tab; + + if(!page) { + tab = create_new_tab(widget, NULL); + } else { + tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); + } + + /* Add trace */ + gchar abs_path[PATH_MAX]; + LttvTrace *trace_v; + LttTrace *trace; + + get_absolute_pathname(path, abs_path); + trace_v = lttvwindowtraces_get_trace_by_name(abs_path); + if(trace_v == NULL) { + trace = ltt_trace_open(abs_path); + if(trace == NULL) { + g_warning("cannot open trace %s", abs_path); + + GtkWidget *dialogue = + gtk_message_dialog_new( + GTK_WINDOW(gtk_widget_get_toplevel(widget)), + GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + "Cannot open trace : maybe you should enter in the directory" + "to select it ?"); + gtk_dialog_run(GTK_DIALOG(dialogue)); + gtk_widget_destroy(dialogue); + } else { + trace_v = lttv_trace_new(trace); + lttvwindowtraces_add_trace(trace_v); + lttvwindow_add_trace(tab, trace_v); + } + } else { + lttvwindow_add_trace(tab, trace_v); + } + + LttvTraceset *traceset; + + traceset = tab->traceset_info->traceset; + SetTraceset(tab, traceset); +} +