X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=785c73e42f36b84f2c48c4b67445574433a089a6;hb=6d5ed1c359c02708e7256dc6c61888eb60a70fd7;hp=43b8fcbb15e18b4f5ee45b30922394e91925b104;hpb=96cfe486b3d3bb3e42f7738cd0764a0838e00cba;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 43b8fcbb..785c73e4 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -3,10 +3,16 @@ *****************************************************************************/ +#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 #include +//#include + #include #include @@ -14,90 +20,298 @@ #include "CFV.h" #include "Process_List.h" #include "Drawing.h" +#include "CFV-private.h" -/* NOTE : no draing 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_data(ProcessList *Process_List, Drawing_t *Drawing) +void send_test_drawing(ProcessList *Process_List, + Drawing_t *Drawing, + GdkPixmap *Pixmap, + gint x, gint y, // y not used here? + gint width, + gint height) // height won't be used here ? { - guint height, size; int i; ProcessInfo Process_Info = {10000, 12000, 55600}; //ProcessInfo Process_Info = {156, 14000, 55500}; GtkTreeRowReference *got_RowRef; + PangoContext *context; + PangoLayout *layout; + 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); + + // rectangle + GdkColor color = { 0, 0xffff, 0x0000, 0x0000 }; + + /* Sent text data */ + layout = gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, + NULL); + context = pango_layout_get_context(layout); + FontDesc = pango_context_get_font_description(context); + Font_Size = pango_font_description_get_size(FontDesc); + pango_font_description_set_size(FontDesc, Font_Size-3*PANGO_SCALE); + + + LttTime birth; birth.tv_sec = 12000; birth.tv_nsec = 55500; + 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_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); + + pango_layout_set_text(layout, "Test", -1); + gdk_draw_layout(Pixmap, Drawing->Drawing_Area_V->style->black_gc, + 0, y+height, layout); + + birth.tv_sec = 14000; + birth.tv_nsec = 55500; + + processlist_get_process_pixels(Process_List, + 156, + &birth, + &y, + &height); + + + drawing_draw_line( + Drawing, Pixmap, x, + y+(height/2), x + width, y+(height/2), + Drawing->Drawing_Area_V->style->black_gc); + + + /* 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_info("y : %u, height : %u", y, height); + + + + birth.tv_sec = 12000; + birth.tv_nsec = 55700; + + processlist_get_process_pixels(Process_List, + 10, + &birth, + &y, + &height); + + /* Draw rectangle (background color) */ + gdk_gc_copy(gc, Drawing->Drawing_Area_V->style->black_gc); + gdk_gc_set_rgb_fg_color(gc, &color); + gdk_draw_rectangle(Pixmap, gc, + TRUE, + 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); - ProcessList_add(Process_List, + + /* Draw arc */ + gdk_draw_arc(Pixmap, Drawing->Drawing_Area_V->style->black_gc, + TRUE, 100, y, 5, 5, 0, 360*64); + + 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, + i, + &birth, + &y, + &height); + + + 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); + + } + + birth.tv_sec = 12000; + birth.tv_nsec = 55600; + + processlist_get_process_pixels(Process_List, + 10, + &birth, + &y, + &height); + + + drawing_draw_line( + Drawing, Pixmap, x, + y+(height/2), x + width, y+(height/2), + Drawing->Drawing_Area_V->style->black_gc); + + g_info("y : %u, height : %u", y, height); + + + pango_font_description_set_size(FontDesc, Font_Size); + g_free(gc); + g_free(layout); + //g_free(context); +} + +void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) +{ + guint height, y; + int i; + ProcessInfo Process_Info = {10000, 12000, 55600}; + //ProcessInfo Process_Info = {156, 14000, 55500}; + GtkTreeRowReference *got_RowRef; + + LttTime birth; + + if(Process_List->Test_Process_Sent) return; + + birth.tv_sec = 12000; + birth.tv_nsec = 55500; + + processlist_add(Process_List, 1, &birth, - &height); - //Drawing_Insert_Square( Drawing, height, 5); + &y); + processlist_get_process_pixels(Process_List, + 1, + &birth, + &y, + &height); + drawing_insert_square( Drawing, y, height); - g_critical("height : %u", 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, - &height); - //Drawing_Insert_Square( Drawing, height, 5); - - g_critical("height : %u", height); - + &y); + processlist_get_process_pixels(Process_List, + 156, + &birth, + &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); - //Drawing_Insert_Square( Drawing, height, 5); + processlist_get_process_pixels(Process_List, + 10, + &birth, + &y, + &height); + drawing_insert_square( Drawing, y, height); + + //g_critical("y : %u, height : %u", y, height); + + //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); - //Drawing_Insert_Square( Drawing, height, 5); - + processlist_get_process_pixels(Process_List, + i, + &birth, + &y, + &height); + drawing_insert_square( Drawing, y, height); + + // g_critical("y : %u, height : %u", y, height); + } - g_critical("height : %u", height); + //g_critical("height : %u", height); birth.tv_sec = 12000; birth.tv_nsec = 55600; - ProcessList_add(Process_List, + processlist_add(Process_List, 10, &birth, - &height); - //Drawing_Insert_Square( Drawing, height, 5); - g_critical("height : %u", height); - - ProcessList_add(Process_List, + &y); + processlist_get_process_pixels(Process_List, + 10, + &birth, + &y, + &height); + drawing_insert_square( Drawing, y, height); + + //g_critical("y : %u, height : %u", y, height); + + processlist_add(Process_List, 10000, &birth, &height); - //Drawing_Insert_Square( Drawing, height, 5); - g_critical("height : %u", height); + processlist_get_process_pixels(Process_List, + 10000, + &birth, + &y, + &height); + drawing_insert_square( Drawing, y, height); + + //g_critical("y : %u, height : %u", y, height); + + //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, - &height, &size); - ProcessList_remove( Process_List, + &y, &height); + processlist_remove( Process_List, 10000, &birth); - //Drawing_Remove_Square( Drawing, height, 5); + drawing_remove_square( Drawing, y, height); if(got_RowRef = (GtkTreeRowReference*)g_hash_table_lookup( @@ -113,6 +327,8 @@ void send_test_data(ProcessList *Process_List, Drawing_t *Drawing) } + Process_List->Test_Process_Sent = TRUE; + } @@ -126,16 +342,28 @@ void send_test_data(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() ; - - return GuiControlFlow_get_Widget(Control_Flow_Data) ; + 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)); + get_current_time(pmParentWindow, + guicontrolflow_get_current_time(Control_Flow_Data)); + + // Unreg done in the GuiControlFlow_Destructor + reg_update_time_window(update_time_window_hook, Control_Flow_Data, + pmParentWindow); + reg_update_current_time(update_current_time_hook, Control_Flow_Data, + pmParentWindow); + 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; @@ -145,7 +373,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); } @@ -153,7 +381,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; @@ -183,7 +411,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; @@ -191,7 +419,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; @@ -199,3 +427,58 @@ int Draw_After_Hook(void *hook_data, void *call_data) return 0; } #endif + + + + +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); + TimeWindow *New_Time_Window = ((TimeWindow*)call_data); + + // As the time interval change will mostly be used for + // zoom in and out, it's not useful to keep old drawing + // sections, as scale will be changed. + + + *Time_Window = *New_Time_Window; + 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, + &Control_Flow_Data->Drawing->Pixmap, + 0, 0, + Control_Flow_Data->Drawing->width, + Control_Flow_Data->Drawing->height); + + 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) +{ + ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; + LttTime* Current_Time = + guicontrolflow_get_current_time(Control_Flow_Data); + *Current_Time = *((LttTime*)call_data); + 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 + * bar */ + + /* Else, we have to change the time interval. We have to tell it + * to the main window. */ + /* The time interval change will take care of placing the current + * time at the center of the visible area */ + +} +