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=9dc103a80330c23033f6d373dadfe641fbdbb87e;hpb=189a5d08183ffed5caf82d625a3b9a86bda96989;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 9dc103a8..798d1d2e 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -22,6 +22,52 @@ #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; + + 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 */ @@ -29,10 +75,10 @@ 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; @@ -42,10 +88,13 @@ void send_test_drawing(ProcessList *Process_List, gint Font_Size; //icon - GdkBitmap *mask = g_new(GdkBitmap, 1); - GdkPixmap *icon_pixmap = g_new(GdkPixmap, 1); - GdkGC * gc = gdk_gc_new(Pixmap); + //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); @@ -92,24 +141,10 @@ void send_test_drawing(ProcessList *Process_List, 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_free(gc); - g_info("y : %u, height : %u", y, height); + + birth.tv_sec = 12000; birth.tv_nsec = 55700; @@ -118,13 +153,24 @@ void send_test_drawing(ProcessList *Process_List, &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); + + /* 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++) @@ -164,11 +210,47 @@ void send_test_drawing(ProcessList *Process_List, Drawing->Drawing_Area_V->style->black_gc); 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_free(layout); - //g_free(context); + g_object_unref(layout); + g_free(gc); } void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) @@ -332,12 +414,24 @@ h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * ke 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, - guicontrolflow_get_time_window(Control_Flow_Data)); + time_window); get_current_time(pmParentWindow, - guicontrolflow_get_current_time(Control_Flow_Data)); + current_time); + //g_critical("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor reg_update_time_window(update_time_window_hook, Control_Flow_Data, pmParentWindow); @@ -361,16 +455,15 @@ int event_selected_hook(void *hook_data, void *call_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) { 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; } @@ -399,6 +492,7 @@ int draw_event_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; + return 0; } @@ -410,7 +504,6 @@ int draw_after_hook(void *hook_data, void *call_data) g_free(Event_Request); return 0; } -#endif @@ -434,7 +527,7 @@ void update_time_window_hook(void *hook_data, void *call_data) 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,