X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Ffilter%2Ffilter.c;h=8d1232b0016fe4fbf3d797b75dc0d5fcf646903e;hb=294a2716158ad1d821b3e47b55950d40fd752d14;hp=c21239e5eb74852c7c9831853d1f4c153a4035a5;hpb=0fc64e11d52a1c0022d3c8d45afc17819db4db15;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/filter/filter.c b/ltt/branches/poly/lttv/modules/gui/filter/filter.c index c21239e5..8d1232b0 100644 --- a/ltt/branches/poly/lttv/modules/gui/filter/filter.c +++ b/ltt/branches/poly/lttv/modules/gui/filter/filter.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -72,6 +73,9 @@ void filter_destroy_walk(gpointer data, gpointer user_data); * Callback functions */ void callback_process_button(GtkWidget *widget, gpointer data); +gboolean callback_enter_check(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); void callback_add_button(GtkWidget *widget, gpointer data); void callback_logical_op_box(GtkWidget *widget, gpointer data); void callback_expression_field(GtkWidget *widget, gpointer data); @@ -103,6 +107,8 @@ struct _FilterViewerDataLine { struct _FilterViewerData { Tab *tab; /**< current tab of module */ + GtkWidget *f_window; /**< filter window */ + GtkWidget *f_main_box; /**< main container */ GtkWidget *f_expression_field; /**< entire expression (GtkEntry) */ @@ -119,7 +125,7 @@ struct _FilterViewerData { GPtrArray *f_math_op_options; /**< array of operators types for math_op box */ GtkWidget *f_add_button; /**< add expression to current expression (GtkButton) */ - + }; /** @@ -133,7 +139,7 @@ struct _FilterViewerData { GtkWidget* guifilter_get_widget(FilterViewerData *fvd) { - return fvd->f_main_box; + return fvd->f_window; } /** @@ -146,7 +152,7 @@ guifilter_get_widget(FilterViewerData *fvd) FilterViewerData* gui_filter(Tab *tab) { - g_print("filter::gui_filter()"); + g_debug("filter::gui_filter()"); unsigned i; GtkCellRenderer *renderer; @@ -179,6 +185,7 @@ gui_filter(Tab *tab) fvd->f_field_options = g_ptr_array_new(); //g_array_new(FALSE,FALSE,16); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.name")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.facility")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.category")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.time")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("event.tsc")); @@ -187,6 +194,7 @@ gui_filter(Tab *tab) */ g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("tracefile.name")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("trace.name")); + g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.process_name")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.pid")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.ppid")); g_ptr_array_add(fvd->f_field_options,(gpointer) g_string_new("state.creation_time")); @@ -206,6 +214,12 @@ gui_filter(Tab *tab) g_ptr_array_add(fvd->f_math_op_options,(gpointer) g_string_new(">=")); + fvd->f_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(fvd->f_window), "LTTV Filter"); + gtk_window_set_transient_for(GTK_WINDOW(fvd->f_window), + GTK_WINDOW(main_window_get_widget(tab))); + gtk_window_set_destroy_with_parent(GTK_WINDOW(fvd->f_window), TRUE); + /* * Initiating GtkTable layout * starts with 2 rows and 5 columns and @@ -215,12 +229,16 @@ gui_filter(Tab *tab) gtk_table_set_row_spacings(GTK_TABLE(fvd->f_main_box),5); gtk_table_set_col_spacings(GTK_TABLE(fvd->f_main_box),5); + gtk_container_add(GTK_CONTAINER(fvd->f_window), GTK_WIDGET(fvd->f_main_box)); + /* * First half of the filter window * - textual entry of filter expression * - processing button */ fvd->f_expression_field = gtk_entry_new(); //gtk_scrolled_window_new (NULL, NULL); + g_signal_connect (G_OBJECT(fvd->f_expression_field), + "key-press-event", G_CALLBACK (callback_enter_check), (gpointer)fvd); // gtk_entry_set_text(GTK_ENTRY(fvd->f_expression_field),"state.cpu>0"); gtk_widget_show (fvd->f_expression_field); @@ -273,6 +291,7 @@ gui_filter(Tab *tab) * show main container */ gtk_widget_show(fvd->f_main_box); + gtk_widget_show(fvd->f_window); g_object_set_data_full( @@ -417,7 +436,7 @@ gui_filter_destructor(FilterViewerData *fvd) lttvwindowtraces_background_notify_remove(fvd); g_filter_list = g_slist_remove(g_filter_list, fvd); - + g_free(fvd); } @@ -437,10 +456,7 @@ h_guifilter(Tab *tab) { FilterViewerData* f = gui_filter(tab) ; - if(f) - return guifilter_get_widget(f); - else return NULL; - + return NULL; } /** @@ -505,15 +521,36 @@ callback_process_button(GtkWidget *widget, gpointer data) { g_debug("callback_process_button(): Processing expression"); FilterViewerData *fvd = (FilterViewerData*)data; + LttvFilter* filter; if(strlen(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))) !=0) { - LttvFilter* filter = lttv_filter_new(); + filter = lttv_filter_new(); GString* s = g_string_new(gtk_entry_get_text(GTK_ENTRY(fvd->f_expression_field))); lttv_filter_append_expression(filter,s->str); g_string_free(s,TRUE); //SetFilter(fvd->tab,filter); - lttvwindow_report_filter(fvd->tab, filter); + } else { + filter = NULL; } + lttvwindow_report_filter(fvd->tab, filter); +} + +gboolean callback_enter_check(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) +{ + g_debug("typed : %x", event->keyval); + switch(event->keyval) { + case GDK_Return: + case GDK_KP_Enter: + case GDK_ISO_Enter: + case GDK_3270_Enter: + callback_process_button(widget, user_data); + break; + default: + break; + } + return FALSE; } /**