X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=9dc103a80330c23033f6d373dadfe641fbdbb87e;hb=189a5d08183ffed5caf82d625a3b9a86bda96989;hp=ba123f415cc97ca988d0380aac1b0af4082a1e0b;hpb=41a769851adc36c024821e859ed6569409f71d8f;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c index ba123f41..9dc103a8 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -3,6 +3,9 @@ *****************************************************************************/ +#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) +#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) + //#define PANGO_ENABLE_BACKEND #include #include @@ -20,7 +23,7 @@ #include "CFV-private.h" -/* NOTE : no drawing data should be sent there, as the drawing widget +/* NOTE : no drawing data should be sent there, since the drawing widget * has not been initialized */ void send_test_drawing(ProcessList *Process_List, Drawing_t *Drawing, @@ -38,6 +41,11 @@ void send_test_drawing(ProcessList *Process_List, PangoFontDescription *FontDesc;// = pango_font_description_new(); gint Font_Size; + //icon + GdkBitmap *mask = g_new(GdkBitmap, 1); + GdkPixmap *icon_pixmap = g_new(GdkPixmap, 1); + GdkGC * gc = gdk_gc_new(Pixmap); + /* Sent text data */ layout = gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, NULL); @@ -52,15 +60,15 @@ void send_test_drawing(ProcessList *Process_List, LttTime birth; birth.tv_sec = 12000; birth.tv_nsec = 55500; - g_critical("we have : x : %u, y : %u, width : %u, height : %u", x, y, width, height); - ProcessList_get_process_pixels(Process_List, + g_info("we have : x : %u, y : %u, width : %u, height : %u", x, y, width, height); + processlist_get_process_pixels(Process_List, 1, &birth, &y, &height); - g_critical("we draw : x : %u, y : %u, width : %u, height : %u", x, y, width, height); - Drawing_draw_line( + g_info("we draw : x : %u, y : %u, width : %u, height : %u", x, y, width, height); + drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), Drawing->Drawing_Area_V->style->black_gc); @@ -72,50 +80,66 @@ void send_test_drawing(ProcessList *Process_List, birth.tv_sec = 14000; birth.tv_nsec = 55500; - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 156, &birth, &y, &height); - Drawing_draw_line( + drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), Drawing->Drawing_Area_V->style->black_gc); - g_critical("y : %u, height : %u", y, height); + + /* Draw icon */ + icon_pixmap = gdk_pixmap_create_from_xpm(Pixmap, &mask, NULL, +// "/home/compudj/local/share/LinuxTraceToolkit/pixmaps/move_message.xpm"); + "/home/compudj/local/share/LinuxTraceToolkit/pixmaps/mini-display.xpm"); + gdk_gc_copy(gc, Drawing->Drawing_Area_V->style->black_gc); + gdk_gc_set_clip_mask(gc, mask); + gdk_draw_drawable(Pixmap, + gc, + icon_pixmap, + 0, 0, 0, 0, -1, -1); + + g_free(icon_pixmap); + g_free(mask); + g_free(gc); + + g_info("y : %u, height : %u", y, height); birth.tv_sec = 12000; birth.tv_nsec = 55700; - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10, &birth, &y, &height); - Drawing_draw_line( + drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), Drawing->Drawing_Area_V->style->black_gc); - g_critical("y : %u, height : %u", y, height); + g_info("y : %u, height : %u", y, height); for(i=0; i<10; i++) { birth.tv_sec = i*12000; birth.tv_nsec = i*55700; - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, i, &birth, &y, &height); - Drawing_draw_line( + drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), Drawing->Drawing_Area_V->style->black_gc); @@ -127,19 +151,19 @@ void send_test_drawing(ProcessList *Process_List, birth.tv_sec = 12000; birth.tv_nsec = 55600; - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10, &birth, &y, &height); - Drawing_draw_line( + drawing_draw_line( Drawing, Pixmap, x, y+(height/2), x + width, y+(height/2), Drawing->Drawing_Area_V->style->black_gc); - g_critical("y : %u, height : %u", y, height); + g_info("y : %u, height : %u", y, height); pango_font_description_set_size(FontDesc, Font_Size); @@ -162,68 +186,68 @@ void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) birth.tv_sec = 12000; birth.tv_nsec = 55500; - ProcessList_add(Process_List, + processlist_add(Process_List, 1, &birth, &y); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 1, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); //g_critical("y : %u, height : %u", y, height); birth.tv_sec = 14000; birth.tv_nsec = 55500; - ProcessList_add(Process_List, + processlist_add(Process_List, 156, &birth, &y); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 156, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); //g_critical("y : %u, height : %u", y, height); birth.tv_sec = 12000; birth.tv_nsec = 55700; - ProcessList_add(Process_List, + processlist_add(Process_List, 10, &birth, &height); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); //g_critical("y : %u, height : %u", y, height); - //Drawing_Insert_Square( Drawing, height, 5); + //drawing_insert_square( Drawing, height, 5); for(i=0; i<10; i++) { birth.tv_sec = i*12000; birth.tv_nsec = i*55700; - ProcessList_add(Process_List, + processlist_add(Process_List, i, &birth, &height); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, i, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); // g_critical("y : %u, height : %u", y, height); @@ -233,45 +257,45 @@ void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) birth.tv_sec = 12000; birth.tv_nsec = 55600; - ProcessList_add(Process_List, + processlist_add(Process_List, 10, &birth, &y); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); //g_critical("y : %u, height : %u", y, height); - ProcessList_add(Process_List, + processlist_add(Process_List, 10000, &birth, &height); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10000, &birth, &y, &height); - Drawing_Insert_Square( Drawing, y, height); + drawing_insert_square( Drawing, y, height); //g_critical("y : %u, height : %u", y, height); - //Drawing_Insert_Square( Drawing, height, 5); + //drawing_insert_square( Drawing, height, 5); //g_critical("height : %u", height); - ProcessList_get_process_pixels(Process_List, + processlist_get_process_pixels(Process_List, 10000, &birth, &y, &height); - ProcessList_remove( Process_List, + processlist_remove( Process_List, 10000, &birth); - Drawing_Remove_Square( Drawing, y, height); + drawing_remove_square( Drawing, y, height); if(got_RowRef = (GtkTreeRowReference*)g_hash_table_lookup( @@ -302,26 +326,28 @@ void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) * @return The widget created. */ GtkWidget * -hGuiControlFlow(MainWindow *pmParentWindow) +h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * key) { - g_critical("hGuiControlFlow"); - ControlFlowData *Control_Flow_Data = GuiControlFlow() ; + g_info("h_guicontrolflow, %p, %p, %s", pmParentWindow, s, key); + ControlFlowData *Control_Flow_Data = guicontrolflow() ; + + Control_Flow_Data->Parent_Window = pmParentWindow; get_time_window(pmParentWindow, - GuiControlFlow_get_Time_Window(Control_Flow_Data)); + guicontrolflow_get_time_window(Control_Flow_Data)); get_current_time(pmParentWindow, - GuiControlFlow_get_Current_Time(Control_Flow_Data)); + guicontrolflow_get_current_time(Control_Flow_Data)); // Unreg done in the GuiControlFlow_Destructor - reg_update_time_window(Update_Time_Window_Hook, Control_Flow_Data, + reg_update_time_window(update_time_window_hook, Control_Flow_Data, pmParentWindow); - reg_update_current_time(Update_Current_Time_Hook, Control_Flow_Data, + reg_update_current_time(update_current_time_hook, Control_Flow_Data, pmParentWindow); - return GuiControlFlow_get_Widget(Control_Flow_Data) ; + return guicontrolflow_get_widget(Control_Flow_Data) ; } -int Event_Selected_Hook(void *hook_data, void *call_data) +int event_selected_hook(void *hook_data, void *call_data) { ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; guint *Event_Number = (guint*) call_data; @@ -331,7 +357,7 @@ int Event_Selected_Hook(void *hook_data, void *call_data) // Control_Flow_Data->Currently_Selected_Event = *Event_Number; // Control_Flow_Data->Selected_Event = TRUE ; -// Tree_V_set_cursor(Control_Flow_Data); +// tree_v_set_cursor(Control_Flow_Data); } @@ -339,7 +365,7 @@ int Event_Selected_Hook(void *hook_data, void *call_data) /* Hook called before drawing. Gets the initial context at the beginning of the * drawing interval and copy it to the context in Event_Request. */ -int Draw_Before_Hook(void *hook_data, void *call_data) +int draw_before_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; EventsContext Events_Context = (EventsContext*)call_data; @@ -369,7 +395,7 @@ int Draw_Before_Hook(void *hook_data, void *call_data) * The choice of lines'color is defined by the context of the last event for this * process. */ -int Draw_Event_Hook(void *hook_data, void *call_data) +int draw_event_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; @@ -377,7 +403,7 @@ int Draw_Event_Hook(void *hook_data, void *call_data) } -int Draw_After_Hook(void *hook_data, void *call_data) +int draw_after_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; @@ -389,11 +415,11 @@ int Draw_After_Hook(void *hook_data, void *call_data) -void Update_Time_Window_Hook(void *hook_data, void *call_data) +void update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; TimeWindow* Time_Window = - GuiControlFlow_get_Time_Window(Control_Flow_Data); + guicontrolflow_get_time_window(Control_Flow_Data); TimeWindow *New_Time_Window = ((TimeWindow*)call_data); // As the time interval change will mostly be used for @@ -402,32 +428,32 @@ void Update_Time_Window_Hook(void *hook_data, void *call_data) *Time_Window = *New_Time_Window; - g_critical("New time window HOOK : %u, %u to %u, %u", + g_info("New time window HOOK : %u, %u to %u, %u", Time_Window->start_time.tv_sec, Time_Window->start_time.tv_nsec, Time_Window->time_width.tv_sec, Time_Window->time_width.tv_nsec); - Drawing_Data_Request(Control_Flow_Data->Drawing, + drawing_data_request(Control_Flow_Data->Drawing, &Control_Flow_Data->Drawing->Pixmap, 0, 0, Control_Flow_Data->Drawing->width, Control_Flow_Data->Drawing->height); - Drawing_Refresh(Control_Flow_Data->Drawing, + drawing_refresh(Control_Flow_Data->Drawing, 0, 0, Control_Flow_Data->Drawing->width, Control_Flow_Data->Drawing->height); } -void Update_Current_Time_Hook(void *hook_data, void *call_data) +void update_current_time_hook(void *hook_data, void *call_data) { ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; LttTime* Current_Time = - GuiControlFlow_get_Current_Time(Control_Flow_Data); + guicontrolflow_get_current_time(Control_Flow_Data); *Current_Time = *((LttTime*)call_data); - g_critical("New Current time HOOK : %u, %u", Current_Time->tv_sec, + g_info("New Current time HOOK : %u, %u", Current_Time->tv_sec, Current_Time->tv_nsec); /* If current time is inside time interval, just move the highlight