* process_traceset, then display all viewers of
* the current tab
* It will then remove all entries from the time_requests array.
+ * CHECK : we give more events than requested to the viewers. They
+ * Have to filter them by themselves.
*/
gint compare_time_request(TimeRequest *a, TimeRequest *b)
LttTime end_time = ltt_time_add( time_request->time_window.start_time,
time_request->time_window.time_width);
- if(i == 0 || !(ltt_time_compare(time_request->time_window.start_time, ltt_event_time(tsc->e))<0) )//FIXME This comparison makes no sense (the author) :)
+ if(i == 0 || !(ltt_time_compare(time_request->time_window.start_time, ltt_event_time(tsc->e))<0) )
{
/* do it if first request or start_time >= last event's time */
lttv_process_traceset_seek_time(tsc, time_request->time_window.start_time);
lttv_process_traceset(tsc, end_time, time_request->num_events);
}
+ else
+ {
+ if(ltt_time_compare(time_request->time_window.start_time, ltt_event_time(tsc->e))<0
+ && !(ltt_time_compare(end_time, ltt_event_time(tsc->e))<0))
+ {
+ /* Continue reading from current event */
+ lttv_process_traceset(tsc, end_time, time_request->num_events);
+
+ }
+ else
+ {
+ if(ltt_time_compare(time_request->time_window.start_time, end_time) > 0)
+ {
+ /* This is a request for a minimum number of events, give
+ * more events than necessary */
+ lttv_process_traceset(tsc, end_time, time_request->num_events);
+ }
+ }
+ }
/* Call the end of process_traceset hook */
lttv_hooks_add(tmp_hooks,
str1++;
}
lttv_module_require(str1, NULL);
- g_slist_foreach(g_main_window_list, (gpointer)insert_menu_toolbar_item,
- NULL);
g_strfreev(dir);
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
library = lttv_library_get(i);
lttv_library_info(library, &library_info);
if(strcmp(unload_module_name, library_info.name) == 0){
- lttv_library_unload(library);
+ lttv_library_unload(library);
break;
}
}
on_MWindow_destroy (GtkObject *object,
gpointer user_data)
{
- MainWindow *Main_Window = get_window_data_struct((GtkWidget*)object);
+ MainWindow *main_window = get_window_data_struct((GtkWidget*)object);
GtkWidget *widget;
- Tab *tab = Main_Window->tab;
+ Tab *tab = main_window->tab;
+ LttvIAttribute *attributes = main_window->attributes;
+ LttvAttributeValue value;
- g_printf("There are : %d windows\n",g_slist_length(g_main_window_list));
+ //This is unnecessary, since widgets will be destroyed
+ //by the main window widget anyway.
+ //remove_all_menu_toolbar_constructors(main_window, NULL);
+
+ g_assert(lttv_iattribute_find_by_path(attributes,
+ "viewers/menu", LTTV_POINTER, &value));
+ lttv_menus_destroy((LttvMenus*)*(value.v_pointer));
+
+ g_assert(lttv_iattribute_find_by_path(attributes_global,
+ "viewers/toolbar", LTTV_POINTER, &value));
+ lttv_toolbars_destroy((LttvToolbars*)*(value.v_pointer));
+
+ while(main_window->tab){
+ lttv_state_remove_event_hooks(
+ (LttvTracesetState*)main_window->tab->traceset_info->traceset_context);
+ main_window->tab = main_window->tab->next;
+ }
+ g_object_unref(main_window->attributes);
+ g_main_window_list = g_slist_remove(g_main_window_list, main_window);
g_win_count--;
+ g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
if(g_win_count == 0)
gtk_main_quit ();
}
}
-/* hash funtions
- */
-
-void main_window_destroy_hash_key(gpointer key)
-{
- g_free(key);
-}
-
-void main_window_destroy_hash_data(gpointer data)
-{
-}
-
-
-/* Insert menu entry and tool button into all main windows for modules
- * It checks whether the menu entry or tool button exists or not,
- * if they do not exist, then construct the widget and insert them
- * into all main windows
+/* Insert all menu entry and tool buttons into this main window
+ * for modules.
+ *
*/
-void insert_menu_toolbar_item(MainWindow * mw, gpointer user_data)
+void add_all_menu_toolbar_constructors(MainWindow * mw, gpointer user_data)
{
int i;
GdkPixbuf *pixbuf;
lttvwindow_viewer_constructor constructor;
- LttvMenus * menu;
- LttvToolbars * toolbar;
- lttv_menu_closure *menu_item;
- lttv_toolbar_closure *toolbar_item;
+ LttvMenus * global_menu, * instance_menu;
+ LttvToolbars * global_toolbar, * instance_toolbar;
+ LttvMenuClosure *menu_item;
+ LttvToolbarClosure *toolbar_item;
LttvAttributeValue value;
- LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
- GtkWidget * tool_menu_title_menu, *insert_view, *pixmap, *tmp;
+ LttvIAttribute *global_attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
+ LttvIAttribute *attributes = LTTV_IATTRIBUTES(mw->attributes);
+ GtkWidget * tool_menu_title_menu, *new_widget, *pixmap;
+
+ g_assert(lttv_iattribute_find_by_path(global_attributes,
+ "viewers/menu", LTTV_POINTER, &value));
+ if(*(value.v_pointer) == NULL)
+ (LttvMenus*)*(value.v_pointer) = lttv_menus_new();
+ global_menu = (LttvMenus*)*(value.v_pointer);
g_assert(lttv_iattribute_find_by_path(attributes,
"viewers/menu", LTTV_POINTER, &value));
- menu = (LttvMenus*)*(value.v_pointer);
-
- if(menu){
- for(i=0;i<menu->len;i++){
- 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 (tool_menu_title_menu), insert_view);
- g_signal_connect ((gpointer) insert_view, "activate",
- G_CALLBACK (insert_viewer_wrap),
- constructor);
- g_hash_table_insert(mw->hash_menu_item, g_strdup(menu_item->menuText),
- insert_view);
- }
- }
+ if(*(value.v_pointer) == NULL)
+ (LttvMenus*)*(value.v_pointer) = lttv_menus_new();
+ instance_menu = (LttvMenus*)*(value.v_pointer);
+
+
+
+ g_assert(lttv_iattribute_find_by_path(global_attributes,
+ "viewers/toolbar", LTTV_POINTER, &value));
+ if(*(value.v_pointer) == NULL)
+ (LttvToolbars*)*(value.v_pointer) = lttv_toolbars_new();
+ global_toolbar = (LttvToolbars*)*(value.v_pointer);
g_assert(lttv_iattribute_find_by_path(attributes,
"viewers/toolbar", LTTV_POINTER, &value));
- toolbar = (LttvToolbars*)*(value.v_pointer);
-
- if(toolbar){
- for(i=0;i<toolbar->len;i++){
- 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,"MToolbar1");
- 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 (tool_menu_title_menu),
- GTK_TOOLBAR_CHILD_BUTTON,
- NULL,
- "",
- toolbar_item->tooltip, NULL,
- pixmap, NULL, NULL);
- 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 (insert_viewer_wrap),constructor);
- g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip),
- insert_view);
- }
+ if(*(value.v_pointer) == NULL)
+ (LttvToolbars*)*(value.v_pointer) = lttv_toolbars_new();
+ instance_toolbar = (LttvToolbars*)*(value.v_pointer);
+
+ /* Add missing menu entries to window instance */
+ for(i=0;i<global_menu->len;i++) {
+ menu_item = &g_array_index(global_menu, LttvMenuClosure, i);
+
+ //add menu_item to window instance;
+ constructor = menu_item->con;
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu");
+ new_widget =
+ gtk_menu_item_new_with_mnemonic (menu_item->menuText);
+ gtk_container_add (GTK_CONTAINER (tool_menu_title_menu),
+ new_widget);
+ g_signal_connect ((gpointer) new_widget, "activate",
+ G_CALLBACK (insert_viewer_wrap),
+ constructor);
+ gtk_widget_show (new_widget);
+ lttv_menus_add(instance_menu, menu_item->con,
+ menu_item->menu_path,
+ menu_item->menu_text,
+ new_widget);
+
}
+
+ /* Add missing toolbar entries to window instance */
+ for(i=0;i<global_toolbar->len;i++) {
+ toolbar_item = &g_array_index(global_toolbar, LttvToolbarClosure, i);
+
+ //add toolbar_item to window instance;
+ constructor = toolbar_item->con;
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar1");
+ pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)toolbar_item->pixmap);
+ pixmap = gtk_image_new_from_pixbuf(pixbuf);
+ new_widget =
+ gtk_toolbar_append_element (GTK_TOOLBAR (tool_menu_title_menu),
+ GTK_TOOLBAR_CHILD_BUTTON,
+ NULL,
+ "",
+ toolbar_item->tooltip, NULL,
+ pixmap, NULL, NULL);
+ gtk_label_set_use_underline(
+ GTK_LABEL (((GtkToolbarChild*) (
+ g_list_last (GTK_TOOLBAR
+ (tool_menu_title_menu)->children)->data))->label),
+ TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (new_widget), 1);
+ g_signal_connect ((gpointer) new_widget,
+ "clicked",
+ G_CALLBACK (insert_viewer_wrap),
+ constructor);
+ gtk_widget_show (new_widget);
+
+ lttv_toolbars_add(instance_toolbar, toolbar_item->con,
+ toolbar_item->tooltip,
+ toolbar_item->pixmap,
+ new_widget);
+
+ }
+
}
new_m_window->current_tab = NULL;
new_m_window->attributes = attributes;
- 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);
+ g_assert(lttv_iattribute_find_by_path(attributes,
+ "viewers/menu", LTTV_POINTER, &value));
+ (LttvMenus*)*(value.v_pointer) = lttv_menus_new();
- insert_menu_toolbar_item(new_m_window, NULL);
+ g_assert(lttv_iattribute_find_by_path(attributes_global,
+ "viewers/toolbar", LTTV_POINTER, &value));
+ (LttvToolbars*)*(value.v_pointer) = lttv_toolbars_new();
+
+ add_all_menu_toolbar_constructors(new_m_window, NULL);
g_object_set_data(G_OBJECT(new_window), "mainWindow", (gpointer)new_m_window);
//create a default tab
G_OBJECT(new_m_window->mwindow),
"Main_Window_Data",
new_m_window,
- (GDestroyNotify)main_window_free);
+ NULL);
g_win_count++;
+ g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list));
}
}
-
-/* Remove menu entry and tool button from main window for the
- * unloaded module
- */
-
-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,"MToolbar1");
- 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 from all
- * main windows
- */
-
-void main_window_remove_menu_item(lttvwindow_viewer_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;i<menu->len;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(lttvwindow_viewer_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;i<toolbar->len;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;
- }
- }
-}
-
/**
* Function to show each viewer in the current tab.
* It will be called by main window, call show on each registered viewer,
projects / lttv.git / blobdiff