X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=e4c497d401e5e2f27a0ba550f42a54bd1f3b737b;hb=6f26fc3843fad79c22e8dd745eff3d659b8eb550;hp=e8028fd2f9bb1019e7552d25aba97b8252f44c59;hpb=71624cb7f3b985224a9cfa23d2cb08f21b9e1419;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 e8028fd2..e4c497d4 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -22,6 +22,9 @@ #include // for PATH_MAX #include +#include +#include +#include #include @@ -47,6 +50,7 @@ #define DEFAULT_TIME_WIDTH_S 1 +#define CLIP_BUF 256 // size of clipboard buffer extern LttvTrace *g_init_trace ; @@ -149,6 +153,217 @@ LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset) return s; } +/* Pasting routines */ + +static void MEventBox1a_receive(GtkClipboard *clipboard, + const gchar *text, + gpointer data) +{ + if(text == NULL) return; + Tab *tab = (Tab *)data; + gchar buffer[CLIP_BUF]; + gchar *ptr = buffer, *ptr_ssec, *ptr_snsec, *ptr_esec, *ptr_ensec; + + strncpy(buffer, text, CLIP_BUF); + + /* start */ + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_ssec = 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_snsec = ptr; + while(isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* read all the first number */ + *ptr = '\0'; + + /* end */ + while(!isdigit(*ptr) && ptr < buffer+CLIP_BUF-1) ptr++; + /* remove leading junk */ + ptr_esec = 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_ensec = 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->MEntry1), + (double)strtoul(ptr_ssec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2), + (double)strtoul(ptr_snsec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry3), + (double)strtoul(ptr_esec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4), + (double)strtoul(ptr_ensec, NULL, 10)); +} + +static gboolean on_MEventBox1a_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)MEventBox1a_receive, + (gpointer)tab); + return 0; +} + + +/* Start */ +static void MEventBox1b_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->MEntry1), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry2), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* Start */ +static gboolean on_MEventBox1b_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)MEventBox1b_receive, + (gpointer)tab); + return 0; +} + +/* End */ +static void MEventBox3b_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->MEntry3), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry4), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* End */ +static gboolean on_MEventBox3b_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)MEventBox3b_receive, + (gpointer)tab); + return 0; +} + +/* Current */ +static void MEventBox5b_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->MEntry5), + (double)strtoul(ptr_sec, NULL, 10)); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(tab->MEntry6), + (double)strtoul(ptr_nsec, NULL, 10)); +} + +/* Current */ +static gboolean on_MEventBox5b_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)MEventBox5b_receive, + (gpointer)tab); + return 0; +} + + static gboolean viewer_grab_focus(GtkWidget *widget, GdkEventButton *event, gpointer data) { @@ -160,6 +375,7 @@ static gboolean viewer_grab_focus(GtkWidget *widget, GdkEventButton *event, return 0; } + static void connect_focus_recursive(GtkWidget *widget, GtkWidget *viewer) { @@ -167,6 +383,10 @@ static void connect_focus_recursive(GtkWidget *widget, gtk_container_forall(GTK_CONTAINER(widget), (GtkCallback)connect_focus_recursive, viewer); + + } + if(GTK_IS_TREE_VIEW(widget)) { + gtk_tree_view_set_headers_clickable(widget, TRUE); } gtk_widget_add_events(widget, GDK_BUTTON_PRESS_MASK); g_signal_connect (G_OBJECT(widget), @@ -212,7 +432,7 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor) viewer_container = tab->viewer_container; s = construct_traceset_selector(tab->traceset_info->traceset); - viewer = (GtkWidget*)constructor(tab, s, "Traceset_Selector"); + viewer = (GtkWidget*)constructor(tab); if(viewer) { //gtk_multivpaned_widget_add(GTK_MULTIVPANED(multivpaned), viewer); @@ -251,8 +471,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) /* Set the tab's time window and current time if * out of bounds */ if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0 - || ltt_time_compare( ltt_time_add(tab->time_window.start_time, - tab->time_window.time_width), + || ltt_time_compare(tab->time_window.end_time, time_span.end_time) > 0) { new_time_window.start_time = time_span.start_time; @@ -266,6 +485,8 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) tmp_time.tv_sec = time_span.end_time.tv_sec; tmp_time.tv_nsec = 0; new_time_window.time_width = 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); @@ -659,6 +880,8 @@ static void events_request_free(EventsRequest *events_request) lttv_traceset_context_position_destroy(events_request->start_position); if(events_request->end_position != NULL) lttv_traceset_context_position_destroy(events_request->end_position); + if(events_request->hooks != NULL) + g_array_free(events_request->hooks, TRUE); if(events_request->before_chunk_traceset != NULL) lttv_hooks_destroy(events_request->before_chunk_traceset); if(events_request->before_chunk_trace != NULL) @@ -1003,11 +1226,27 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* 1.3.2 call before chunk * 1.3.3 events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } } } } else { @@ -1024,11 +1263,27 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Call before chunk * - events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, events_request->before_chunk_trace, events_request->before_chunk_tracefile, events_request->event, events_request->event_by_id); + } iter = g_slist_next(iter); } @@ -1072,11 +1327,29 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* call before chunk * events hooks added */ - lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + if(events_request->trace == -1) + lttv_process_traceset_begin(tsc, + events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_hooks_call(events_request->before_chunk_traceset, tsc); + + lttv_trace_context_add_hooks(tc, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } + + } /* Go to next */ @@ -1206,11 +1479,31 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + + + } + /* - Call end request for req */ lttv_hooks_call(events_request->after_request, (gpointer)tsc); @@ -1245,12 +1538,29 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - Remove events hooks for req * - Call end chunk for req */ - lttv_process_traceset_end(tsc, events_request->after_chunk_traceset, + if(events_request->trace == -1) + lttv_process_traceset_end(tsc, + events_request->after_chunk_traceset, + events_request->after_chunk_trace, + events_request->after_chunk_tracefile, + events_request->event, + events_request->event_by_id); + + else { + guint nb_trace = lttv_traceset_number(tsc->ts); + g_assert(events_request->trace < nb_trace && + events_request->trace > -1); + LttvTraceContext *tc = tsc->traces[events_request->trace]; + + lttv_trace_context_remove_hooks(tc, events_request->after_chunk_trace, events_request->after_chunk_tracefile, events_request->event, events_request->event_by_id); + lttv_hooks_call(events_request->after_chunk_traceset, tsc); + } + /* - req.num -= count */ g_assert(events_request->num_events >= count); events_request->num_events -= count; @@ -1974,131 +2284,51 @@ void zoom(GtkWidget * widget, double size) if(size == 0){ new_time_window.start_time = time_span.start_time; new_time_window.time_width = time_delta; + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; }else{ new_time_window.time_width = ltt_time_div(new_time_window.time_width, size); 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.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_div(new_time_window.time_width, 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) { 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( - ltt_time_add(new_time_window.start_time, new_time_window.time_width), - time_span.end_time) > 0) + if(ltt_time_compare(new_time_window.end_time, + time_span.end_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) ; } } } - - //time_tmp = ltt_time_div(new_time_window.time_width, 2); - //if(ltt_time_compare(current_time, time_tmp) < 0){ - // time_s = time_span->startTime; - //} else { - // time_s = ltt_time_sub(current_time,time_tmp); - //} - //time_e = ltt_time_add(current_time,time_tmp); - //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,new_time_window.time_width); - //} - //new_time_window.start_time = time_s; } - //lttvwindow_report_time_window(mw_data, &new_time_window); - //call_pending_read_hooks(mw_data); - - //lttvwindow_report_current_time(mw_data,&(tab->current_time)); - //set_time_window(tab, &new_time_window); - // in expose now call_pending_read_hooks(mw_data); - //gtk_multi_vpaned_set_adjust(tab->multi_vpaned, &new_time_window, FALSE); - // - // - - LttTime rel_time = - ltt_time_sub(new_time_window.start_time, time_span.start_time); - if( ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND - / SCROLL_STEP_PER_PAGE/* step increment */ - + - ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */ - == - ltt_time_to_double(rel_time) * NANOSECONDS_PER_SECOND /* page size */ - ) { - g_warning("Can not zoom that far due to scrollbar precision"); - } else if( - ltt_time_compare( - ltt_time_from_double( - ltt_time_to_double(new_time_window.time_width) - /SCROLL_STEP_PER_PAGE ), - ltt_time_zero) - == 0 ) { - g_warning("Can not zoom that far due to time nanosecond precision"); + 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); -#if 0 - /* Set scrollbar */ - GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); - - g_object_set(G_OBJECT(adjustment), - //"value", - //ltt_time_to_double(new_time_window.start_time) - // * NANOSECONDS_PER_SECOND, /* value */ - "lower", - 0.0, /* lower */ - "upper", - ltt_time_to_double( - ltt_time_sub(time_span.end_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND, /* upper */ - "step_increment", - ltt_time_to_double(new_time_window.time_width) - / SCROLL_STEP_PER_PAGE - * NANOSECONDS_PER_SECOND, /* step increment */ - "page_increment", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page increment */ - "page_size", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page size */ - NULL); - gtk_adjustment_changed(adjustment); - //gtk_range_set_adjustment(GTK_RANGE(tab->scrollbar), adjustment); - //gtk_adjustment_value_changed(adjustment); - g_object_set(G_OBJECT(adjustment), - "value", - ltt_time_to_double( - ltt_time_sub(new_time_window.start_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND, /* value */ - NULL); - gtk_adjustment_value_changed(adjustment); - - - //g_object_set(G_OBJECT(adjustment), - // "value", - // ltt_time_to_double(time_window->start_time) - // * NANOSECONDS_PER_SECOND, /* value */ - // NULL); - /* Note : the set value will call set_time_window if scrollbar value changed - */ - //gtk_adjustment_set_value(adjustment, - // ltt_time_to_double(new_time_window.start_time) - // * NANOSECONDS_PER_SECOND); -#endif //0 } } @@ -3213,8 +3443,7 @@ void time_change_manager (Tab *tab, LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; LttTime start_time = new_time_window.start_time; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); @@ -3235,18 +3464,15 @@ void time_change_manager (Tab *tab, "lower", 0.0, /* lower */ "upper", - ltt_time_to_double(upper) - * NANOSECONDS_PER_SECOND, /* upper */ + ltt_time_to_double(upper), /* upper */ "step_increment", ltt_time_to_double(new_time_window.time_width) - / SCROLL_STEP_PER_PAGE - * NANOSECONDS_PER_SECOND, /* step increment */ + / SCROLL_STEP_PER_PAGE, /* step increment */ "page_increment", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page increment */ + ltt_time_to_double(new_time_window.time_width), + /* page increment */ "page_size", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page size */ + ltt_time_to_double(new_time_window.time_width), /* page size */ NULL); gtk_adjustment_changed(adjustment); @@ -3254,13 +3480,12 @@ void time_change_manager (Tab *tab, // "value", // ltt_time_to_double( // ltt_time_sub(start_time, time_span.start_time)) - // * NANOSECONDS_PER_SECOND, /* value */ + // , /* value */ // NULL); //gtk_adjustment_value_changed(adjustment); gtk_range_set_value(GTK_RANGE(tab->scrollbar), ltt_time_to_double( - ltt_time_sub(start_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND /* value */); + ltt_time_sub(start_time, time_span.start_time)) /* value */); /* set the time bar. */ /* start seconds */ @@ -3352,8 +3577,7 @@ on_MEntry1_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; new_time_window.start_time.tv_sec = value; @@ -3374,19 +3598,18 @@ on_MEntry1_value_changed (GtkSpinButton *spinbutton, new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1; } - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push back end time : keep the same time width * if possible, else end traceset time */ - end_time = LTT_TIME_MIN(time_span.end_time, - ltt_time_add(new_time_window.start_time, - new_time_window.time_width) - ); + end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time, + new_time_window.time_width), + time_span.end_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.end_time = end_time; time_change_manager(tab, new_time_window); @@ -3404,25 +3627,24 @@ on_MEntry2_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; new_time_window.start_time.tv_nsec = value; - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push back end time : keep the same time width * if possible, else end traceset time */ - end_time = LTT_TIME_MIN(time_span.end_time, - ltt_time_add(new_time_window.start_time, - new_time_window.time_width) - ); + end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time, + new_time_window.time_width), + time_span.end_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.end_time = end_time; + time_change_manager(tab, new_time_window); } @@ -3439,8 +3661,8 @@ on_MEntry3_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; + end_time.tv_sec = value; /* end nanoseconds */ @@ -3460,20 +3682,21 @@ on_MEntry3_value_changed (GtkSpinButton *spinbutton, end_time.tv_nsec = time_span.end_time.tv_nsec; } - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push front start time : keep the same time width * if possible, else end traceset time */ - new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, - ltt_time_sub(end_time, - new_time_window.time_width) - ); + new_time_window.start_time = LTT_TIME_MAX( + ltt_time_sub(end_time, + new_time_window.time_width), + time_span.start_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.end_time = end_time; + time_change_manager(tab, new_time_window); } @@ -3490,23 +3713,23 @@ on_MEntry4_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; + end_time.tv_nsec = value; - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push front start time : keep the same time width * if possible, else end traceset time */ - new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, - ltt_time_sub(end_time, - new_time_window.time_width) - ); + new_time_window.start_time = LTT_TIME_MAX( + ltt_time_sub(end_time, + new_time_window.time_width), + time_span.start_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.end_time = end_time; time_change_manager(tab, new_time_window); @@ -3622,7 +3845,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; - time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); new_time_window.start_time = time; @@ -3630,7 +3853,10 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; new_time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); + + 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); @@ -3645,7 +3871,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, //time = ltt_time_sub(time_span->end_time, time_span->start_time); //time = ltt_time_mul(time, (float)ratio); //time = ltt_time_add(time_span->start_time, time); - time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); time_window.start_time = time; @@ -3653,7 +3879,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); //time = ltt_time_sub(time_span.end_time, time); //if(ltt_time_compare(time,time_window.time_width) < 0){ // time_window.time_width = time; @@ -4178,6 +4404,50 @@ void construct_main_window(MainWindow * parent) } 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); + } + + } } g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list)); @@ -4188,44 +4458,46 @@ void construct_main_window(MainWindow * parent) * destroy the tab */ -void tab_destructor(Tab * tab_instance) +void tab_destructor(Tab * tab) { int i, nb, ref_count; LttvTrace * trace; - if(tab_instance->attributes) - g_object_unref(tab_instance->attributes); + gtk_object_destroy(GTK_OBJECT(tab->tooltips)); + + if(tab->attributes) + g_object_unref(tab->attributes); - if(tab_instance->interrupted_state) - g_object_unref(tab_instance->interrupted_state); + if(tab->interrupted_state) + g_object_unref(tab->interrupted_state); - if(tab_instance->traceset_info->traceset_context != NULL){ + if(tab->traceset_info->traceset_context != NULL){ //remove state update hooks lttv_state_remove_event_hooks( - (LttvTracesetState*)tab_instance->traceset_info-> + (LttvTracesetState*)tab->traceset_info-> traceset_context); - lttv_context_fini(LTTV_TRACESET_CONTEXT(tab_instance->traceset_info-> + lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info-> traceset_context)); - g_object_unref(tab_instance->traceset_info->traceset_context); + g_object_unref(tab->traceset_info->traceset_context); } - if(tab_instance->traceset_info->traceset != NULL) { - nb = lttv_traceset_number(tab_instance->traceset_info->traceset); + if(tab->traceset_info->traceset != NULL) { + nb = lttv_traceset_number(tab->traceset_info->traceset); for(i = 0 ; i < nb ; i++) { - trace = lttv_traceset_get(tab_instance->traceset_info->traceset, i); + trace = lttv_traceset_get(tab->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); + lttv_traceset_destroy(tab->traceset_info->traceset); /* Remove the idle events requests processing function of the tab */ - g_idle_remove_by_data(tab_instance); + g_idle_remove_by_data(tab); - g_slist_free(tab_instance->events_requests); - g_free(tab_instance->traceset_info); - g_free(tab_instance); + g_slist_free(tab->events_requests); + g_free(tab->traceset_info); + g_free(tab); } @@ -4319,21 +4591,44 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, { tab->MTimebar = gtk_hbox_new(FALSE, 2); gtk_widget_show(tab->MTimebar); - - tab->MText1 = gtk_label_new("Time Frame start: "); - gtk_widget_show(tab->MText1); + tab->tooltips = gtk_tooltips_new(); + + tab->MEventBox1a = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox1a); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox1a, + "Paste Start and End Times Here", ""); + tab->MText1a = gtk_label_new("Time Frame "); + gtk_widget_show(tab->MText1a); + gtk_container_add(GTK_CONTAINER(tab->MEventBox1a), tab->MText1a); + tab->MEventBox1b = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox1b); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox1b, + "Paste Start Time Here", ""); + tab->MText1b = gtk_label_new("start: "); + gtk_widget_show(tab->MText1b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox1b), tab->MText1b); tab->MText2 = gtk_label_new("s"); 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, + "Paste End Time Here", ""); tab->MText3b = gtk_label_new("end:"); gtk_widget_show(tab->MText3b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox3b), tab->MText3b); tab->MText4 = gtk_label_new("s"); gtk_widget_show(tab->MText4); tab->MText5a = gtk_label_new("ns"); gtk_widget_show(tab->MText5a); + tab->MEventBox5b = gtk_event_box_new(); + gtk_widget_show(tab->MEventBox5b); + gtk_tooltips_set_tip(tab->tooltips, tab->MEventBox5b, + "Paste Current Time Here", ""); tab->MText5b = gtk_label_new("Current Time:"); gtk_widget_show(tab->MText5b); + gtk_container_add(GTK_CONTAINER(tab->MEventBox5b), tab->MText5b); tab->MText6 = gtk_label_new("s"); gtk_widget_show(tab->MText6); tab->MText7 = gtk_label_new("ns"); @@ -4367,7 +4662,10 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, GtkWidget *temp_widget; - gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText1, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox1a, FALSE, + FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox1b, FALSE, + FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry1, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText2, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry2, FALSE, FALSE, 0); @@ -4375,7 +4673,8 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, temp_widget = gtk_vseparator_new(); gtk_widget_show(temp_widget); gtk_box_pack_start (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MText3b, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEventBox3b, FALSE, + FALSE, 0); gtk_box_pack_start (GTK_BOX (tab->MTimebar), tab->MEntry3, FALSE, FALSE, 0); 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); @@ -4386,8 +4685,47 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry6, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText6, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEntry5, FALSE, FALSE, 0); - gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MText5b, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (tab->MTimebar), tab->MEventBox5b, FALSE, + FALSE, 0); gtk_box_pack_end (GTK_BOX (tab->MTimebar), temp_widget, FALSE, FALSE, 0); + + + //GtkWidget *test = gtk_button_new_with_label("drop"); + //gtk_button_set_relief(GTK_BUTTON(test), GTK_RELIEF_NONE); + //gtk_widget_show(test); + //gtk_box_pack_end(GTK_BOX (tab->MTimebar), test, FALSE, FALSE, 0); + //gtk_widget_add_events(tab->MText1, GDK_ALL_EVENTS_MASK);//GDK_BUTTON_PRESS_MASK); + /*GtkWidget *event_box = gtk_event_box_new(); + gtk_widget_show(event_box); + gtk_tooltips_set_tip(tooltips, event_box, + "Paste Current Time Here", ""); + gtk_box_pack_end(GTK_BOX (tab->MTimebar), event_box, FALSE, FALSE, 0); + GtkWidget *test = gtk_label_new("drop"); + gtk_container_add(GTK_CONTAINER(event_box), test); + gtk_widget_show(test); + g_signal_connect (G_OBJECT(event_box), + "button-press-event", + G_CALLBACK (on_MText1_paste), + (gpointer)tab); +*/ + + g_signal_connect (G_OBJECT(tab->MEventBox1a), + "button-press-event", + G_CALLBACK (on_MEventBox1a_paste), + (gpointer)tab); + + g_signal_connect (G_OBJECT(tab->MEventBox1b), + "button-press-event", + G_CALLBACK (on_MEventBox1b_paste), + (gpointer)tab); + g_signal_connect (G_OBJECT(tab->MEventBox3b), + "button-press-event", + G_CALLBACK (on_MEventBox3b_paste), + (gpointer)tab); + g_signal_connect (G_OBJECT(tab->MEventBox5b), + "button-press-event", + G_CALLBACK (on_MEventBox5b_paste), + (gpointer)tab); } gtk_box_pack_end(GTK_BOX(tab->vbox),