X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=94f810899a61c0c34b987b8efa0925df6455f004;hb=6cec4cd266bde25f87dad0a059fd98c7381eb8c2;hp=8bad3e96edf5a59a908b5ec99979170f001efff5;hpb=2c82c4dc9a5a322013842e0bf23008d164f369b6;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 8bad3e96..94f81089 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -122,6 +122,7 @@ void drawing_data_request(Drawing_t *drawing, if(width < 0) return ; if(height < 0) return ; + Tab *tab = drawing->control_flow_data->tab; TimeWindow time_window = lttvwindow_get_time_window(tab); @@ -218,7 +219,7 @@ void drawing_data_request(Drawing_t *drawing, associated by id hooks. */ hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook)); - hooks = g_array_set_size(hooks, 12); + hooks = g_array_set_size(hooks, 13); /* before hooks */ @@ -368,6 +369,14 @@ void drawing_data_request(Drawing_t *drawing, &g_array_index(hooks, LttvTraceHook, 11)); g_assert(!ret); + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_FS, LTT_EVENT_EXEC, + 0, 0, 0, + after_fs_exec_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 12)); + g_assert(!ret); + #if 0 @@ -394,7 +403,7 @@ void drawing_data_request(Drawing_t *drawing, } /* add after */ - for(k = 9 ; k < 12 ; k++) { + for(k = 9 ; k < 13 ; k++) { hook = &g_array_index(hooks, LttvTraceHook, k); for(l=0;lfac_list->len;l++) { thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l); @@ -404,7 +413,7 @@ void drawing_data_request(Drawing_t *drawing, LTTV_PRIO_STATE+5); } } - + events_request->hooks = hooks; // Fill the events request @@ -563,6 +572,9 @@ void drawing_request_expose(EventsRequest *events_request, x, 0, width, drawing->drawing_area->allocation.height); + /* Update directly when scrolling */ + gdk_window_process_updates(drawing->drawing_area->window, + TRUE); } @@ -616,6 +628,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, drawing->alloc_height = drawing->height + EXTRA_ALLOC; update_pixmap_size(drawing->control_flow_data->process_list, drawing->alloc_width); + update_index_to_pixmap(drawing->control_flow_data->process_list); } //drawing->height = widget->allocation.height; @@ -682,11 +695,12 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); +#if 0 if(unlikely(drawing->gc == NULL)) { drawing->gc = gdk_gc_new(drawing->drawing_area->window); gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc); } - +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); LttTime current_time = @@ -706,11 +720,18 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.width, event->area.height); #endif //0 drawing->height = processlist_get_height(control_flow_data->process_list); +#if 0 copy_pixmap_to_screen(control_flow_data->process_list, widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], event->area.x, event->area.y, event->area.width, event->area.height); +#endif //0 + copy_pixmap_to_screen(control_flow_data->process_list, + widget->window, + drawing->gc, + event->area.x, event->area.y, + event->area.width, event->area.height); /* Erase the dotted lines left.. */ @@ -733,7 +754,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) drawing->width, &cursor_x); - +#if 0 if(drawing->dotted_gc == NULL) { drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window); @@ -750,6 +771,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) dash_list, 2); } +#endif //0 gint height_tot = MAX(widget->allocation.height, drawing->height); gdk_draw_line(widget->window, drawing->dotted_gc, @@ -896,8 +918,6 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) drawing->pango_layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL); - drawing->dotted_gc = NULL; - drawing->height = 1; drawing->width = 1; drawing->depth = 0; @@ -1000,6 +1020,50 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) gdk_colormap_alloc_colors(colormap, drawing_colors, NUM_COLORS, FALSE, TRUE, success); + drawing->gc = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + drawing->dotted_gc = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + + gdk_gc_copy(drawing->gc, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + gdk_gc_copy(drawing->dotted_gc, + main_window_get_widget(control_flow_data->tab)->style->white_gc); + + gint8 dash_list[] = { 1, 2 }; + gdk_gc_set_line_attributes(drawing->dotted_gc, + 1, + GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, + GDK_JOIN_MITER); + gdk_gc_set_dashes(drawing->dotted_gc, + 0, + dash_list, + 2); + + drawing->ruler_gc_butt = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + gdk_gc_copy(drawing->ruler_gc_butt, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + drawing->ruler_gc_round = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + gdk_gc_copy(drawing->ruler_gc_round, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + + + gdk_gc_set_line_attributes(drawing->ruler_gc_butt, + 2, + GDK_LINE_SOLID, + GDK_CAP_BUTT, + GDK_JOIN_MITER); + + gdk_gc_set_line_attributes(drawing->ruler_gc_round, + 2, + GDK_LINE_SOLID, + GDK_CAP_ROUND, + GDK_JOIN_ROUND); + + return drawing; } @@ -1021,6 +1085,9 @@ void drawing_destroy(Drawing_t *drawing) g_free(drawing->pango_layout); if(drawing->dotted_gc != NULL) gdk_gc_unref(drawing->dotted_gc); + if(drawing->ruler_gc_butt != NULL) gdk_gc_unref(drawing->ruler_gc_butt); + if(drawing->ruler_gc_round != NULL) gdk_gc_unref(drawing->ruler_gc_round); + g_free(drawing); g_info("drawing_destroy end"); } @@ -1236,8 +1303,6 @@ void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window) static gboolean expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { - /* ruler desactivated */ - return 0; Drawing_t *drawing = (Drawing_t*)user_data; TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab); gchar text[255]; @@ -1265,15 +1330,8 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.width, event->area.height); - GdkGC *gc = gdk_gc_new(drawing->ruler->window); - gdk_gc_copy(gc, drawing->ruler->style->black_gc); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_BUTT, - GDK_JOIN_MITER); gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, event->area.x, 1, event->area.x + event->area.width, 1); @@ -1295,19 +1353,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) global_width += ink_rect.width; gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, 0, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_round, 1, 1, 1, 7); @@ -1322,19 +1374,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) if(global_width <= drawing->ruler->allocation.width) { gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width - ink_rect.width, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width-1, 1, drawing->ruler->allocation.width-1, 7); } @@ -1350,19 +1396,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) if(global_width <= drawing->ruler->allocation.width) { gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, (drawing->ruler->allocation.width - ink_rect.width)/2, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width/2, 1, drawing->ruler->allocation.width/2, 7); @@ -1371,7 +1411,6 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) } - gdk_gc_unref(gc); g_object_unref(layout); return FALSE;