X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=798d1d2e0ba4693609b0a39b432da484263f6f60;hb=f66eba62898bf525692d55ef95935266aee56096;hp=12cf5c4d9dcb9d724ecb270c58ec3e19b03c8af2;hpb=f7afe191fd58f0bf4bab9c9514c261535b99d32b;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 12cf5c4d..798d1d2e 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 @@ -16,84 +22,170 @@ #include "Drawing.h" #include "CFV-private.h" +#define MAX_PATH_LEN 256 + +//FIXME : remove this include when tests finished. +#include + +void test_draw_item(Drawing_t *Drawing, + GdkPixmap *Pixmap) +{ + PropertiesIcon properties_icon; + DrawContext draw_context; + + DrawInfo current, previous; + ItemInfo over, middle, under, modify_over, modify_middle, modify_under; -/* NOTE : no drawing data should be sent there, as the drawing widget + int i,j; + + for(i=0; i<1024;i=i+15) + { + for(j=0;j<768;j=j+15) + { + over.x = i; + over.y = j; + over.ts = NULL; + over.tfs = NULL; + + current.modify_over = &over; + + draw_context.drawable = Pixmap; + draw_context.gc = Drawing->Drawing_Area_V->style->black_gc; + + draw_context.Current = ¤t; + draw_context.Previous = NULL; + + properties_icon.icon_name = g_new(char, MAX_PATH_LEN); + strncpy(properties_icon.icon_name, + "/home/compudj/local/share/LinuxTraceToolkit/pixmaps/mini-display.xpm", + MAX_PATH_LEN); + properties_icon.width = -1; + properties_icon.height = -1; + properties_icon.position = OVER; + draw_icon(&properties_icon, &draw_context); + g_free(properties_icon.icon_name); + } + } + +} + +/* 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, GdkPixmap *Pixmap, gint x, gint y, // y not used here? - gint width, + gint width, gint height) // height won't be used here ? { - int i; + int i,j; 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; + // rectangle + GdkColor color = { 0, 0xffff, 0x0000, 0x0000 }; + gc = gdk_gc_new(Pixmap); + /* 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_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); + 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, + 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); + 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( + /* 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); - g_critical("y : %u, height : %u", y, height); + + /* Draw arc */ + gdk_draw_arc(Pixmap, Drawing->Drawing_Area_V->style->black_gc, + TRUE, 100, y, height/2, height/2, 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, + 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); @@ -105,20 +197,60 @@ 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); + + + /* IMPORTANT : This action uses the cpu heavily! */ + //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_set_clip_mask(Drawing->Drawing_Area_V->style->black_gc, mask); + +// for(i=x;iDrawing_Area_V->style->black_gc); +// gdk_gc_set_clip_origin(Drawing->Drawing_Area_V->style->black_gc, i, j); +// gdk_draw_drawable(Pixmap, +// Drawing->Drawing_Area_V->style->black_gc, +// icon_pixmap, +// 0, 0, i, j, -1, -1); + +// } +// } + + test_draw_item(Drawing,Pixmap); + //gdk_gc_set_clip_origin(Drawing->Drawing_Area_V->style->black_gc, 0, 0); + //gdk_gc_set_clip_mask(Drawing->Drawing_Area_V->style->black_gc, NULL); + + //g_free(icon_pixmap); + //g_free(mask); + + + + + + + pango_font_description_set_size(FontDesc, Font_Size); + g_object_unref(layout); + g_free(gc); } void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) @@ -136,68 +268,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); @@ -207,45 +339,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( @@ -276,26 +408,40 @@ 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() ; - - GetTimeWindow(pmParentWindow, - GuiControlFlow_get_Time_Window(Control_Flow_Data)); - GetCurrentTime(pmParentWindow, - GuiControlFlow_get_Current_Time(Control_Flow_Data)); + g_info("h_guicontrolflow, %p, %p, %s", pmParentWindow, s, key); + ControlFlowData *Control_Flow_Data = guicontrolflow() ; + + Control_Flow_Data->Parent_Window = pmParentWindow; + TimeWindow *time_window = guicontrolflow_get_time_window(Control_Flow_Data); + time_window->start_time.tv_sec = 0; + time_window->start_time.tv_nsec = 0; + time_window->time_width.tv_sec = 0; + time_window->time_width.tv_nsec = 0; + + LttTime *current_time = guicontrolflow_get_current_time(Control_Flow_Data); + current_time->tv_sec = 0; + current_time->tv_nsec = 0; + + //g_critical("time width1 : %u",time_window->time_width); + + get_time_window(pmParentWindow, + time_window); + get_current_time(pmParentWindow, + current_time); + //g_critical("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor - RegUpdateTimeWindow(Update_Time_Window_Hook, Control_Flow_Data, + reg_update_time_window(update_time_window_hook, Control_Flow_Data, pmParentWindow); - RegUpdateCurrentTime(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; @@ -305,20 +451,19 @@ 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); } -#ifdef DEBUG /* 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; + //EventsContext Events_Context = (EventsContext*)call_data; - Event_Request->Events_Context = Events_Context; + //Event_Request->Events_Context = Events_Context; return 0; } @@ -343,31 +488,31 @@ 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; + return 0; } -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; g_free(Event_Request); return 0; } -#endif -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 @@ -376,32 +521,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", - Time_Window->startTime.tv_sec, - Time_Window->startTime.tv_nsec, - Time_Window->Time_Width.tv_sec, - Time_Window->Time_Width.tv_nsec); + 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