X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=510965f75ad57f8ebd14378039e79af1e540d587;hb=dc5e526626e33c0cc08b74c6a78dc8192e2bce36;hp=cac8e12600c09d3156cafa8ee0c6717f5cd26bab;hpb=9878c8a4ce727f8a542a836ed289f5eb365d3292;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c index cac8e126..510965f7 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c @@ -41,110 +41,60 @@ #include // for execute_events_requests #include - /** * Internal function parts */ extern GSList * g_main_window_list; -/** - * Function to set/update traceset for the viewers - * @param tab viewer's tab - * @param traceset traceset of the main window. - * return value : - * -1 : error - * 0 : traceset updated - * 1 : no traceset hooks to update; not an error. +/* set_time_window + * + * It updates the time window of the tab, then calls the updatetimewindow + * hooks of each viewer. + * + * This is called whenever the scrollbar value changes. */ -int SetTraceset(Tab * tab, LttvTraceset *traceset) +void set_time_window(Tab *tab, const TimeWindow *time_window) { - LttvHooks * tmp; LttvAttributeValue value; - - if( lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatetraceset", LTTV_POINTER, &value) != 0) - return -1; - - tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return 1; - - - lttv_hooks_call(tmp,traceset); - - return 0; -} - - -/** - * Function to set/update filter for the viewers - * @param tab viewer's tab - * @param filter filter of the main window. - * return value : - * -1 : error - * 0 : filters updated - * 1 : no filter hooks to update; not an error. - */ - -int SetFilter(Tab * tab, gpointer filter) -{ LttvHooks * tmp; - LttvAttributeValue value; - if(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatefilter", LTTV_POINTER, &value) != 0) - return -1; + TimeWindowNotifyData time_window_notify_data; + TimeWindow old_time_window = tab->time_window; + time_window_notify_data.old_time_window = &old_time_window; + tab->time_window = *time_window; + time_window_notify_data.new_time_window = + &(tab->time_window); + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatetimewindow", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); + if(tmp != NULL) lttv_hooks_call(tmp, &time_window_notify_data); - if(tmp == NULL) return 1; - lttv_hooks_call(tmp,filter); + //gtk_multi_vpaned_set_adjust(tab->multi_vpaned, new_time_window, FALSE); - return 0; } -/** - * Function to redraw each viewer belonging to the current tab - * @param tab viewer's tab +/* set_current_time + * + * It updates the current time of the tab, then calls the updatetimewindow + * hooks of each viewer. + * + * This is called whenever the current time value changes. */ -void update_traceset(Tab *tab) -{ - LttvAttributeValue value; - LttvHooks * tmp; - g_assert(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatetraceset", LTTV_POINTER, &value)); - tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return; - lttv_hooks_call(tmp, NULL); -} - -void set_time_window_adjustment(Tab *tab, const TimeWindow* new_time_window) -{ - gtk_multi_vpaned_set_adjust(tab->multi_vpaned, new_time_window, FALSE); -} - - -void set_time_window(Tab *tab, const TimeWindow *time_window) +void set_current_time(Tab *tab, const LttTime *current_time) { LttvAttributeValue value; LttvHooks * tmp; - TimeWindowNotifyData time_window_notify_data; - TimeWindow old_time_window = tab->time_window; - time_window_notify_data.old_time_window = &old_time_window; - tab->time_window = *time_window; - time_window_notify_data.new_time_window = - &(tab->time_window); + tab->current_time = *current_time; g_assert(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatetimewindow", LTTV_POINTER, &value)); + "hooks/updatecurrenttime", LTTV_POINTER, &value)); tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) return; - lttv_hooks_call(tmp, &time_window_notify_data); - - + if(tmp != NULL) lttv_hooks_call(tmp, &tab->current_time); } void add_toolbar_constructor(MainWindow *mw, LttvToolbarClosure *toolbar_c) @@ -278,6 +228,7 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe * * It should be called by init function of the module. * + * @param name name of the viewer * @param menu_path path of the menu item. * @param menu_text text of the menu item. * @param pixmap Image shown on the toolbar item. @@ -286,7 +237,8 @@ void remove_menu_constructor(MainWindow *mw, lttvwindow_viewer_constructor viewe */ void lttvwindow_register_constructor - (char * menu_path, + (char * name, + char * menu_path, char * menu_text, char ** pixmap, char * tooltip, @@ -299,6 +251,8 @@ void lttvwindow_register_constructor LttvMenuClosure menu_c; LttvAttributeValue value; + if(view_constructor == NULL) return; + if(pixmap != NULL) { g_assert(lttv_iattribute_find_by_path(attributes_global, "viewers/toolbar", LTTV_POINTER, &value)); @@ -331,6 +285,19 @@ void lttvwindow_register_constructor (gpointer)add_menu_constructor, &menu_c); } + { + LttvAttribute *attribute; + g_assert(attribute = + LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( + LTTV_IATTRIBUTE(attributes_global), + LTTV_VIEWER_CONSTRUCTORS))); + + g_assert(lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute), + name, LTTV_POINTER, &value)); + + *(value.v_pointer) = view_constructor; + + } } @@ -374,6 +341,29 @@ void lttvwindow_unregister_constructor view_constructor); lttv_menus_remove(menu, view_constructor); } + + { + LttvAttribute *attribute; + g_assert(attribute = + LTTV_ATTRIBUTE(lttv_iattribute_find_subdir( + LTTV_IATTRIBUTE(attributes_global), + LTTV_VIEWER_CONSTRUCTORS))); + + guint num = lttv_iattribute_get_number(LTTV_IATTRIBUTE(attribute)); + guint i; + LttvAttributeName name; + LttvAttributeValue value; + LttvAttributeType type; + + for(i=0;imw for status -} - /** * Function to set the time interval of the current tab. * It will be called by a viewer's signal handle associated with @@ -762,10 +739,53 @@ void lttvwindow_report_status(Tab *tab, const char *info) */ void lttvwindow_report_time_window(Tab *tab, - const TimeWindow *time_window) + TimeWindow time_window) { - set_time_window(tab, time_window); - set_time_window_adjustment(tab, time_window); + //set_time_window(tab, time_window); + //set_time_window_adjustment(tab, time_window); + + time_change_manager(tab, time_window); + + +#if 0 + /* Set scrollbar */ + LttvTracesetContext *tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); + g_object_set(G_OBJECT(adjustment), + "lower", + 0.0, /* lower */ + "upper", + ltt_time_to_double( + ltt_time_sub(time_span.end_time, time_span.start_time)) + , /* upper */ + "step_increment", + ltt_time_to_double(time_window->time_width) + / SCROLL_STEP_PER_PAGE + , /* step increment */ + "page_increment", + ltt_time_to_double(time_window->time_width) + , /* page increment */ + "page_size", + ltt_time_to_double(time_window->time_width) + , /* page size */ + NULL); + gtk_adjustment_changed(adjustment); + + //g_object_set(G_OBJECT(adjustment), + // "value", + // ltt_time_to_double(time_window->start_time) + // , /* value */ + // NULL); + /* Note : the set value will call set_time_window if scrollbar value changed + */ + gtk_adjustment_set_value(adjustment, + ltt_time_to_double( + ltt_time_sub(time_window->start_time, + time_span.start_time)) + ); +#endif //0 } @@ -778,17 +798,12 @@ void lttvwindow_report_time_window(Tab *tab, */ void lttvwindow_report_current_time(Tab *tab, - const LttTime *time) + LttTime time) { LttvAttributeValue value; LttvHooks * tmp; - tab->current_time = *time; - g_assert(lttv_iattribute_find_by_path(tab->attributes, - "hooks/updatecurrenttime", LTTV_POINTER, &value)); - tmp = (LttvHooks*)*(value.v_pointer); - - if(tmp == NULL)return; - lttv_hooks_call(tmp, &tab->current_time); + + current_time_change_manager(tab, time); } /** @@ -810,22 +825,6 @@ void lttvwindow_report_dividor(Tab *tab, gint position) lttv_hooks_call(tmp, &position); } -/** - * Function to set the focused pane (viewer). - * It will be called by a viewer's signal handle associated with - * the grab_focus signal - * @param tab viewer's tab - * @param top_widget the top widget containing all the other widgets of the - * viewer. - */ - -void lttvwindow_report_focus(Tab *tab, GtkWidget *top_widget) -{ - gtk_multi_vpaned_set_focus((GtkWidget*)tab->multi_vpaned, - GTK_PANED(gtk_widget_get_parent(top_widget))); -} - - /** * Function to request data in a specific time interval to the main window. The * event request servicing is differed until the glib idle functions are @@ -851,8 +850,9 @@ void lttvwindow_events_request(Tab *tab, if(!tab->events_request_pending) { - /* Redraw has +20 priority. We want a prio higher than that, so +19 */ - g_idle_add_full((G_PRIORITY_HIGH_IDLE + 19), + /* Redraw has +20 priority. We want to let the redraw be done while we do + * our job. */ + g_idle_add_full((G_PRIORITY_HIGH_IDLE + 21), (GSourceFunc)execute_events_requests, tab, NULL); @@ -880,23 +880,30 @@ gint find_viewer (const EventsRequest *a, gconstpointer b) void lttvwindow_events_request_remove_all(Tab *tab, gconstpointer viewer) { - GSList *element; + GSList *element = tab->events_requests; while((element = - g_slist_find_custom(tab->events_requests, viewer, + g_slist_find_custom(element, viewer, (GCompareFunc)find_viewer)) != NULL) { EventsRequest *events_request = (EventsRequest *)element->data; - if(events_request->servicing == TRUE) { - lttv_hooks_call(events_request->after_request, NULL); - } + // Modified so a viewer being destroyed won't have its after_request + // called. Not so important anyway. Note that a viewer that call this + // remove_all function will not get its after_request called. + //if(events_request->servicing == TRUE) { + // lttv_hooks_call(events_request->after_request, NULL); + //} g_free(events_request); tab->events_requests = g_slist_remove_link(tab->events_requests, element); - + element = g_slist_next(element); + if(element == NULL) break; /* end of list */ + } + if(g_slist_length(tab->events_requests) == 0) { + tab->events_request_pending = FALSE; + g_idle_remove_by_data(tab); } -} - +} /** * Function to get the current time interval shown on the current tab. @@ -904,13 +911,12 @@ void lttvwindow_events_request_remove_all(Tab *tab, * shown time interval of the viewer and also be called by the constructor * of the viewer. * @param tab viewer's tab - * @param time_interval a pointer where time interval will be stored. + * @return time window. */ -const TimeWindow *lttvwindow_get_time_window(Tab *tab) +TimeWindow lttvwindow_get_time_window(Tab *tab) { - return &(tab->time_window); - + return tab->time_window; } @@ -919,29 +925,56 @@ const TimeWindow *lttvwindow_get_time_window(Tab *tab) * It will be called by a viewer's hook function to update the * current time/event of the viewer. * @param tab viewer's tab - * @param time a pointer where time will be stored. + * @return time */ -const LttTime *lttvwindow_get_current_time(Tab *tab) +LttTime lttvwindow_get_current_time(Tab *tab) { - return &(tab->current_time); + return tab->current_time; } /** * Function to get the filter of the current tab. - * It will be called by the constructor of the viewer and also be - * called by a hook funtion of the viewer to update its filter. - * @param tab viewer's tab + * @param main_win, the main window the viewer belongs to. + * @param filter, a pointer to a filter. + */ + +LttvFilter *lttvwindow_get_filter(Tab *tab) +{ + return tab->filter; +} + +/** + * Function to set the filter of the current tab. + * It should be called by the filter GUI to tell the + * main window to update the filter tab's lttv_filter. + * + * This function does change the current filter, removing the + * old one when necessary, and call the updatefilter hooks + * of the registered viewers. + * + * @param main_win, the main window the viewer belongs to. * @param filter, a pointer to a filter. */ -const lttv_filter *lttvwindow_get_filter(Tab *tab) + +void lttvwindow_report_filter(Tab *tab, LttvFilter *filter) { - //FIXME - g_warning("lttvwindow_get_filter not implemented in viewer.c"); + LttvAttributeValue value; + LttvHooks * tmp; + + lttv_filter_destroy(tab->filter); + tab->filter = filter; + + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/updatefilter", LTTV_POINTER, &value)); + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp == NULL) return; + lttv_hooks_call(tmp, &position); } + /** * Function to get the stats of the traceset * @param tab viewer's tab