X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=d9d4a03d48f7c4c490db7102a5256eec83c96776;hb=b9a010a28d9625c9d31968aa44f1a553daccb294;hp=091bcb8a62cf39afbb646803c7519b0303aee6f8;hpb=6395d57c1887bfba11a50d1d1905dc0f01f6a5a5;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 091bcb8a..d9d4a03d 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -80,6 +80,13 @@ void drawing_data_request(Drawing_t *drawing, if(width < 0) return ; if(height < 0) return ; + if(drawing->gc == NULL) { + drawing->gc = gdk_gc_new(drawing->drawing_area->window); + gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc); + } + + + TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab); @@ -103,12 +110,12 @@ void drawing_data_request(Drawing_t *drawing, g_debug("x is : %i, x+width is : %i", x, x+width); - convert_pixels_to_time(drawing->drawing_area->allocation.width, x, + convert_pixels_to_time(drawing->width, x, time_window.start_time, window_end, &start); - convert_pixels_to_time(drawing->drawing_area->allocation.width, x+width, + convert_pixels_to_time(drawing->width, x+width, time_window.start_time, window_end, &time_end); @@ -118,18 +125,32 @@ void drawing_data_request(Drawing_t *drawing, LttvHooks *event = lttv_hooks_new(); LttvHooks *before_chunk_traceset = lttv_hooks_new(); LttvHooks *after_chunk_traceset = lttv_hooks_new(); + LttvHooks *before_request_hook = lttv_hooks_new(); + LttvHooks *after_request_hook = lttv_hooks_new(); lttv_hooks_add(before_chunk_traceset, - before_data_request, + before_chunk, events_request, LTTV_PRIO_DEFAULT); lttv_hooks_add(after_chunk_traceset, - after_data_request, + after_chunk, + events_request, + LTTV_PRIO_DEFAULT); + + lttv_hooks_add(before_request_hook, + before_request, events_request, LTTV_PRIO_DEFAULT); + + lttv_hooks_add(after_request_hook, + after_request, + events_request, + LTTV_PRIO_DEFAULT); + + lttv_hooks_add(event, - draw_event_hook, + draw_before_hook, events_request, LTTV_PRIO_STATE-5); lttv_hooks_add(event, @@ -137,7 +158,6 @@ void drawing_data_request(Drawing_t *drawing, events_request, LTTV_PRIO_STATE+5); - // Fill the events request events_request->owner = control_flow_data; events_request->viewer_data = control_flow_data; @@ -156,8 +176,8 @@ void drawing_data_request(Drawing_t *drawing, events_request->after_chunk_tracefile = NULL; events_request->after_chunk_trace = NULL; events_request->after_chunk_traceset = after_chunk_traceset; - events_request->before_request = NULL; - events_request->after_request = NULL; + events_request->before_request = before_request_hook; + events_request->after_request = after_request_hook; g_debug("req : start : %u, %u", start.tv_sec, start.tv_nsec); @@ -169,21 +189,58 @@ void drawing_data_request(Drawing_t *drawing, control_flow_data); lttvwindow_events_request(tab, events_request); } - + + +static void set_last_start(gpointer key, gpointer value, gpointer user_data) +{ + ProcessInfo *process_info = (ProcessInfo*)key; + HashedProcessData *hashed_process_data = (HashedProcessData*)value; + guint x = (guint)user_data; + hashed_process_data->x = x; + + return; +} void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState *tss) { - g_debug("Begin of data request chunk"); + g_debug("Begin of data request"); ControlFlowData *cfd = events_request->viewer_data; LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); + TimeWindow time_window = + lttvwindow_get_time_window(cfd->tab); + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + guint width = cfd->drawing->width; + guint x=0; + + cfd->drawing->last_start = events_request->start_time; + convert_time_to_pixels( + time_window.start_time, + end_time, + events_request->start_time, + width, + &x); + + g_hash_table_foreach(cfd->process_list->process_hash, set_last_start, + (gpointer)x); +} + +void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss) +{ + g_debug("Begin of chunk"); + ControlFlowData *cfd = events_request->viewer_data; + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp; cfd->drawing->last_start = current_time; } -void drawing_data_request_end(EventsRequest *events_request, LttvTracesetState *tss) + +void drawing_request_expose(EventsRequest *events_request, + LttvTracesetState *tss, + LttTime end_time) { gint x, x_end, width; @@ -194,13 +251,11 @@ void drawing_data_request_end(EventsRequest *events_request, LttvTracesetState * TimeWindow time_window = lttvwindow_get_time_window(cfd->tab); - g_debug("End of data request chunk"); + g_debug("request expose"); LttTime window_end = ltt_time_add(time_window.time_width, time_window.start_time); - LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp; - convert_time_to_pixels( time_window.start_time, window_end, @@ -211,7 +266,7 @@ void drawing_data_request_end(EventsRequest *events_request, LttvTracesetState * convert_time_to_pixels( time_window.start_time, window_end, - current_time, + end_time, drawing->width, &x_end); @@ -221,6 +276,14 @@ void drawing_data_request_end(EventsRequest *events_request, LttvTracesetState * //drawing->damage_end = drawing->width; /* ask for the buffer to be redrawn */ + + //gtk_widget_queue_draw_area ( drawing->drawing_area, + // 0, 0, + // drawing->width, drawing->height); + + /* FIXME + * will need more precise pixel_to_time and time_to_pixel conversion + * functions to redraw only the needed area. */ gtk_widget_queue_draw_area ( drawing->drawing_area, x, 0, width, drawing->height); @@ -261,22 +324,22 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, if(widget->allocation.width != drawing->width) { g_debug("drawing configure event"); - g_debug("New draw size : %i by %i",widget->allocation.width, + g_debug("New alloc draw size : %i by %i",widget->allocation.width, widget->allocation.height); if (drawing->pixmap) gdk_pixmap_unref(drawing->pixmap); - drawing->pixmap = gdk_pixmap_new( - widget->window, - widget->allocation.width + SAFETY, - widget->allocation.height + SAFETY, + drawing->width = widget->allocation.width; + //drawing->height = widget->allocation.height; + + drawing->pixmap = gdk_pixmap_new(widget->window, + drawing->width + SAFETY, + drawing->height, + -1); //ProcessList_get_height // (GuiControlFlow_get_process_list(drawing->control_flow_data)), - -1); - drawing->width = widget->allocation.width; - drawing->height = widget->allocation.height; // Clear the image @@ -284,8 +347,8 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, widget->style->black_gc, TRUE, 0, 0, - widget->allocation.width+SAFETY, - widget->allocation.height+SAFETY); + drawing->width+SAFETY, + drawing->height); //g_info("init data request"); @@ -298,8 +361,8 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, // widget->allocation.width, // widget->allocation.height); - drawing->width = widget->allocation.width; - drawing->height = widget->allocation.height; + //drawing->width = widget->allocation.width; + //drawing->height = widget->allocation.height; drawing->damage_begin = 0; drawing->damage_end = widget->allocation.width; @@ -311,7 +374,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, - widget->allocation.height); + drawing->height); } } return TRUE; @@ -343,7 +406,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) time_window.start_time, window_end, current_time, - widget->allocation.width, + drawing->width, &cursor_x); @@ -373,11 +436,12 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) 0, dash_list, 2); - drawing_draw_line(NULL, widget->window, - cursor_x, 0, - cursor_x, drawing->height, - drawing->dotted_gc); } + + drawing_draw_line(NULL, widget->window, + cursor_x, 0, + cursor_x, drawing->height, + drawing->dotted_gc); return FALSE; } @@ -385,7 +449,7 @@ static gboolean after_expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { //g_assert(0); - g_critical("AFTER EXPOSE"); + g_debug("AFTER EXPOSE"); return FALSE; @@ -417,7 +481,7 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data /* left mouse button click */ g_debug("x click is : %f", event->x); - convert_pixels_to_time(widget->allocation.width, (guint)event->x, + convert_pixels_to_time(drawing->width, (guint)event->x, time_window.start_time, window_end, &time); @@ -432,6 +496,19 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data return FALSE; } +static gboolean +scrollbar_size_allocate(GtkWidget *widget, + GtkAllocation *allocation, + gpointer user_data) +{ + Drawing_t *drawing = (Drawing_t*)user_data; + + gtk_widget_set_size_request(drawing->padding, allocation->width, -1); + //gtk_widget_queue_resize(drawing->padding); + //gtk_widget_queue_resize(drawing->ruler); + gtk_container_check_resize(GTK_CONTAINER(drawing->ruler_hbox)); + return 0; +} @@ -442,14 +519,53 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) drawing->control_flow_data = control_flow_data; drawing->vbox = gtk_vbox_new(FALSE, 1); + + + drawing->ruler_hbox = gtk_hbox_new(FALSE, 1); drawing->ruler = gtk_drawing_area_new (); - gtk_widget_set_size_request(drawing->ruler, -1, 27); + gtk_widget_add_events(drawing->ruler, GDK_BUTTON_PRESS_MASK); + //gtk_widget_set_size_request(drawing->ruler, -1, 27); - drawing->drawing_area = gtk_drawing_area_new (); + drawing->padding = gtk_drawing_area_new (); + gtk_widget_add_events(drawing->padding, GDK_BUTTON_PRESS_MASK); + //gtk_widget_set_size_request(drawing->padding, -1, 27); + gtk_box_pack_start(GTK_BOX(drawing->ruler_hbox), drawing->ruler, + TRUE, TRUE, 0); + gtk_box_pack_end(GTK_BOX(drawing->ruler_hbox), drawing->padding, + FALSE, FALSE, 0); + + - gtk_box_pack_start(GTK_BOX(drawing->vbox), drawing->ruler, + drawing->drawing_area = gtk_drawing_area_new (); + + drawing->gc = NULL; + + drawing->hbox = gtk_hbox_new(FALSE, 1); + drawing->viewport = gtk_viewport_new(NULL, control_flow_data->v_adjust); + drawing->scrollbar = gtk_vscrollbar_new(control_flow_data->v_adjust); + gtk_box_pack_start(GTK_BOX(drawing->hbox), drawing->viewport, + TRUE, TRUE, 0); + gtk_box_pack_end(GTK_BOX(drawing->hbox), drawing->scrollbar, FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(drawing->vbox), drawing->drawing_area, + + //drawing->scrolled_window = + // gtk_scrolled_window_new (NULL, + // control_flow_data->v_adjust); + + //gtk_scrolled_window_set_policy( + // GTK_SCROLLED_WINDOW(drawing->scrolled_window), + // GTK_POLICY_NEVER, + // GTK_POLICY_AUTOMATIC); + + gtk_container_add(GTK_CONTAINER(drawing->viewport), + drawing->drawing_area); + //gtk_scrolled_window_add_with_viewport( + // GTK_SCROLLED_WINDOW(drawing->scrolled_window), + // drawing->drawing_area); + + gtk_box_pack_start(GTK_BOX(drawing->vbox), drawing->ruler_hbox, + FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(drawing->vbox), drawing->hbox, TRUE, TRUE, 0); drawing->pango_layout = @@ -457,8 +573,8 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) drawing->dotted_gc = NULL; - drawing->height = 0; - drawing->width = 0; + drawing->height = 1; + drawing->width = 1; drawing->depth = 0; drawing->damage_begin = 0; @@ -520,6 +636,13 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) (gpointer)drawing); + g_signal_connect (G_OBJECT(drawing->scrollbar), + "size-allocate", + G_CALLBACK(scrollbar_size_allocate), + (gpointer)drawing); + + + g_signal_connect (G_OBJECT(drawing->drawing_area), "expose_event", G_CALLBACK (expose_event), @@ -536,8 +659,15 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) (gpointer)drawing); gtk_widget_show(drawing->ruler); + gtk_widget_show(drawing->padding); + gtk_widget_show(drawing->ruler_hbox); + gtk_widget_show(drawing->drawing_area); - + //gtk_widget_show(drawing->scrolled_window); + gtk_widget_show(drawing->viewport); + gtk_widget_show(drawing->scrollbar); + gtk_widget_show(drawing->hbox); + return drawing; } @@ -547,7 +677,9 @@ void drawing_destroy(Drawing_t *drawing) g_info("drawing_destroy %p", drawing); // Do not unref here, Drawing_t destroyed by it's widget. //g_object_unref( G_OBJECT(drawing->drawing_area)); - + if(drawing->gc != NULL) + gdk_gc_unref(drawing->gc); + g_free(drawing->pango_layout); if(!drawing->dotted_gc) gdk_gc_unref(drawing->dotted_gc); g_free(drawing); @@ -594,16 +726,17 @@ void convert_time_to_pixels( guint *x) { LttTime window_time_interval; - float interval_float, time_float; + double interval_double, time_double; window_time_interval = ltt_time_sub(window_time_end,window_time_begin); time = ltt_time_sub(time, window_time_begin); - interval_float = ltt_time_to_double(window_time_interval); - time_float = ltt_time_to_double(time); + /* LttTime to double conversions here should really be under 4000 hours.. */ + interval_double = ltt_time_to_double(window_time_interval); + time_double = ltt_time_to_double(time); - *x = (guint)(time_float/interval_float * width); + *x = (guint)(time_double/interval_double * width); } @@ -618,7 +751,28 @@ void drawing_draw_line( Drawing_t *drawing, x1, y1, x2, y2); } +void drawing_clear(Drawing_t *drawing) +{ + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); + drawing->height = 1; + /* Allocate a new pixmap with new height */ + drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window, + drawing->width + SAFETY, + drawing->height, + -1); + + gtk_widget_set_size_request(drawing->drawing_area, + -1, + drawing->height); + gtk_widget_queue_resize_no_redraw(drawing->drawing_area); + + /* ask for the buffer to be redrawn */ + gtk_widget_queue_draw_area ( drawing->drawing_area, + 0, 0, + drawing->width, drawing->height); +} /* Insert a square corresponding to a new process in the list */ @@ -632,7 +786,7 @@ void drawing_insert_square(Drawing_t *drawing, /* Allocate a new pixmap with new height */ GdkPixmap *pixmap = gdk_pixmap_new(drawing->drawing_area->window, drawing->width + SAFETY, - drawing->height + height + SAFETY, + drawing->height + height, -1); /* Copy the high region */ @@ -662,9 +816,7 @@ void drawing_insert_square(Drawing_t *drawing, drawing->pixmap, 0, y, 0, y + height, - drawing->width+SAFETY, drawing->height - y + SAFETY); - - + drawing->width+SAFETY, drawing->height - y); if (drawing->pixmap) @@ -672,13 +824,18 @@ void drawing_insert_square(Drawing_t *drawing, drawing->pixmap = pixmap; - drawing->height+=height; - + if(drawing->height==1) drawing->height = height; + else drawing->height += height; + + gtk_widget_set_size_request(drawing->drawing_area, + -1, + drawing->height); + gtk_widget_queue_resize_no_redraw(drawing->drawing_area); + /* ask for the buffer to be redrawn */ gtk_widget_queue_draw_area ( drawing->drawing_area, 0, y, drawing->width, drawing->height-y); - } @@ -687,45 +844,55 @@ void drawing_remove_square(Drawing_t *drawing, guint y, guint height) { - //GdkRectangle update_rect; - - /* Allocate a new pixmap with new height */ - GdkPixmap *pixmap = gdk_pixmap_new( - drawing->drawing_area->window, - drawing->width + SAFETY, - drawing->height - height + SAFETY, - -1); - - /* Copy the high region */ - gdk_draw_drawable (pixmap, - drawing->drawing_area->style->black_gc, - drawing->pixmap, - 0, 0, - 0, 0, - drawing->width + SAFETY, y); - + GdkPixmap *pixmap; + if(drawing->height == height) { + pixmap = gdk_pixmap_new( + drawing->drawing_area->window, + drawing->width + SAFETY, + 1, + -1); + drawing->height=1; + } else { + /* Allocate a new pixmap with new height */ + pixmap = gdk_pixmap_new( + drawing->drawing_area->window, + drawing->width + SAFETY, + drawing->height - height, + -1); + + /* Copy the high region */ + gdk_draw_drawable (pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, + 0, 0, + 0, 0, + drawing->width + SAFETY, y); - /* Copy up the bottom of the region */ - gdk_draw_drawable (pixmap, - drawing->drawing_area->style->black_gc, - drawing->pixmap, - 0, y + height, - 0, y, - drawing->width, drawing->height - y - height + SAFETY); + /* Copy up the bottom of the region */ + gdk_draw_drawable (pixmap, + drawing->drawing_area->style->black_gc, + drawing->pixmap, + 0, y + height, + 0, y, + drawing->width, drawing->height - y - height); + drawing->height-=height; + } if (drawing->pixmap) gdk_pixmap_unref(drawing->pixmap); drawing->pixmap = pixmap; - drawing->height-=height; - + gtk_widget_set_size_request(drawing->drawing_area, + -1, + drawing->height); + gtk_widget_queue_resize_no_redraw(drawing->drawing_area); /* ask for the buffer to be redrawn */ gtk_widget_queue_draw_area ( drawing->drawing_area, 0, y, - drawing->width, drawing->height-y); + drawing->width, MAX(drawing->height-y, 1)); } void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window)