X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.c;h=befe16694a596bb54d88b1f9f42e910fdba2c620;hb=962e2228963dbdec5d1b92b8c7d85989b941516e;hp=a0971163bcaa0c772e322b30226ca8e505643c83;hpb=db8bc91756aba1610e896aa1e9eee184843f3970;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 a0971163..befe1669 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c @@ -228,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. @@ -236,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, @@ -249,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)); @@ -281,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; + + } } @@ -324,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;itime_width) / SCROLL_STEP_PER_PAGE - * NANOSECONDS_PER_SECOND, /* step increment */ + , /* step increment */ "page_increment", ltt_time_to_double(time_window->time_width) - * NANOSECONDS_PER_SECOND, /* page increment */ + , /* page increment */ "page_size", ltt_time_to_double(time_window->time_width) - * NANOSECONDS_PER_SECOND, /* page size */ + , /* page size */ NULL); gtk_adjustment_changed(adjustment); //g_object_set(G_OBJECT(adjustment), // "value", // ltt_time_to_double(time_window->start_time) - // * NANOSECONDS_PER_SECOND, /* value */ + // , /* value */ // NULL); /* Note : the set value will call set_time_window if scrollbar value changed */ @@ -744,7 +784,7 @@ void lttvwindow_report_time_window(Tab *tab, ltt_time_to_double( ltt_time_sub(time_window->start_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND); + ); #endif //0 } @@ -785,23 +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) -{ - //FIXME - //gtk_multi_vpaned_set_focus(tab->multivpaned, - // 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 @@ -857,10 +880,10 @@ 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; @@ -872,6 +895,8 @@ void lttvwindow_events_request_remove_all(Tab *tab, //} 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; @@ -880,8 +905,6 @@ void lttvwindow_events_request_remove_all(Tab *tab, } - - /** * Function to get the current time interval shown on the current tab. * It will be called by a viewer's hook function to update the @@ -894,7 +917,6 @@ void lttvwindow_events_request_remove_all(Tab *tab, TimeWindow lttvwindow_get_time_window(Tab *tab) { return tab->time_window; - } @@ -914,18 +936,45 @@ LttTime lttvwindow_get_current_time(Tab *tab) /** * 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, filter); } + /** * Function to get the stats of the traceset * @param tab viewer's tab