X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=2cd92c2eedafc3d4e36499b9b8310b8912171cc4;hb=34b12b7dae6bd07257749e62ff5166e75cebf8b0;hp=acaf0a4230541954bec6a2ea1008e225718c72bc;hpb=224446ce9bb1b6724122cfdf4e3e716a5526af24;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 acaf0a42..2cd92c2e 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -21,14 +21,14 @@ #include #include -#include +#include #include #include #include "drawing.h" +#include "eventhooks.h" #include "cfv.h" #include "cfv-private.h" -#include "eventhooks.h" #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) @@ -67,7 +67,7 @@ static GdkColor CF_Colors [] = /* Function responsible for updating the exposed area. - * It must call processTrace() to ask for this update. + * It must do an events request to the lttvwindow API to ask for this update. * Note : this function cannot clear the background, because it may * erase drawing already present (SAFETY). */ @@ -80,92 +80,226 @@ void drawing_data_request(Drawing_t *drawing, if(width < 0) return ; if(height < 0) return ; - const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw); + if(drawing->gc == NULL) { + drawing->gc = gdk_gc_new(drawing->drawing_area->window); + gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc); + } - ControlFlowData *control_flow_data = - (ControlFlowData*)g_object_get_data( - G_OBJECT(drawing->drawing_area), "control_flow_data"); - LttTime start, end; - LttTime window_end = ltt_time_add(time_window->time_width, - time_window->start_time); + + TimeWindow time_window = + lttvwindow_get_time_window(drawing->control_flow_data->tab); + + ControlFlowData *control_flow_data = drawing->control_flow_data; + Tab *tab = control_flow_data->tab; + // (ControlFlowData*)g_object_get_data( + // G_OBJECT(drawing->drawing_area), "control_flow_data"); + LttTime start, time_end; + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); + + g_debug("req : window start_time : %u, %u", time_window.start_time.tv_sec, + time_window.start_time.tv_nsec); + + g_debug("req : window time width : %u, %u", time_window.time_width.tv_sec, + time_window.time_width.tv_nsec); + g_debug("req : window_end : %u, %u", window_end.tv_sec, window_end.tv_nsec); - g_debug("req : time width : %u, %u", time_window->time_width.tv_sec, - time_window->time_width.tv_nsec); - g_debug("x is : %i, x+width is : %i", x, x+width); - convert_pixels_to_time(drawing->drawing_area->allocation.width, x, - time_window->start_time, + 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, - time_window->start_time, + convert_pixels_to_time(drawing->width, x+width, + time_window.start_time, window_end, - &end); - - LttvTracesetContext * tsc = - lttvwindow_get_traceset_context(control_flow_data->mw); - LttvTracesetState * tss = - (LttvTracesetState*)tsc; + &time_end); - // Let's call processTrace() !! - EventRequest event_request; // Variable freed at the end of the function. - event_request.control_flow_data = control_flow_data; - event_request.time_begin = start; - event_request.time_end = end; - event_request.x_begin = x; - event_request.x_end = x+width; + EventsRequest *events_request = g_new(EventsRequest, 1); + // Create the hooks + 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_chunk, + events_request, + LTTV_PRIO_DEFAULT); + + lttv_hooks_add(after_chunk_traceset, + 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_before_hook, + events_request, + LTTV_PRIO_STATE-5); + lttv_hooks_add(event, + draw_after_hook, + events_request, + LTTV_PRIO_STATE+5); + + // Fill the events request + events_request->owner = control_flow_data; + events_request->viewer_data = control_flow_data; + events_request->servicing = FALSE; + events_request->start_time = start; + events_request->start_position = NULL; + events_request->stop_flag = FALSE; + events_request->end_time = time_end; + events_request->num_events = G_MAXUINT; + events_request->end_position = NULL; + events_request->before_chunk_traceset = before_chunk_traceset; + events_request->before_chunk_trace = NULL; + events_request->before_chunk_tracefile = NULL; + events_request->event = event; + events_request->event_by_id = NULL; + events_request->after_chunk_tracefile = NULL; + events_request->after_chunk_trace = NULL; + events_request->after_chunk_traceset = after_chunk_traceset; + 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); + + g_debug("req : end : %u, %u", time_end.tv_sec, + time_end.tv_nsec); + + lttvwindow_events_request_remove_all(tab, + 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"); + 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; - g_debug("req : start : %u, %u", event_request.time_begin.tv_sec, - event_request.time_begin.tv_nsec); + cfd->drawing->last_start = events_request->start_time; - g_debug("req : end : %u, %u", event_request.time_end.tv_sec, - event_request.time_end.tv_nsec); + 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_request_expose(EventsRequest *events_request, + LttvTracesetState *tss, + LttTime end_time) +{ + gint x, x_end, width; + + ControlFlowData *cfd = events_request->viewer_data; + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); + Drawing_t *drawing = cfd->drawing; - LttvHooks *event = lttv_hooks_new(); - LttvHooks *after_event = lttv_hooks_new(); - LttvHooks *after_traceset = lttv_hooks_new(); - lttv_hooks_add(after_traceset, after_data_request, &event_request); - lttv_hooks_add(event, draw_event_hook, &event_request); - //Modified by xiangxiu: state update hooks are added by the main window - //lttv_state_add_event_hooks(tsc); - lttv_hooks_add(after_event, draw_after_hook, &event_request); - - //lttv_process_traceset_seek_time(tsc, start); - lttv_state_traceset_seek_time_closest(tss, start); - // FIXME : would like to place the after_traceset hook after the traceset, - // but the traceset context state is not valid anymore. - lttv_traceset_context_add_hooks(tsc, - NULL, after_traceset, NULL, NULL, NULL, NULL, - //NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, event, after_event); - lttv_process_traceset(tsc, end, G_MAXULONG); - //after_data_request((void*)&event_request,(void*)tsc); - lttv_traceset_context_remove_hooks(tsc, - NULL, after_traceset, NULL, NULL, NULL, NULL, - // NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, event, after_event); - //Modified by xiangxiu: state update hooks are removed by the main window - //lttv_state_remove_event_hooks(tsc); - - lttv_hooks_destroy(after_traceset); - lttv_hooks_destroy(event); - lttv_hooks_destroy(after_event); + TimeWindow time_window = + lttvwindow_get_time_window(cfd->tab); + g_debug("request expose"); + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); + + convert_time_to_pixels( + time_window.start_time, + window_end, + cfd->drawing->last_start, + drawing->width, + &x); + + convert_time_to_pixels( + time_window.start_time, + window_end, + end_time, + drawing->width, + &x_end); + + width = x_end - x; + + drawing->damage_begin = x+width; + //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); + } - + + /* Callbacks */ /* Create a new backing pixmap of the appropriate size */ /* As the scaling will always change, it's of no use to copy old * pixmap. + * + * Only change the size if width changes. The height is specified and changed + * when process ID are added or removed from the process list. */ static gboolean configure_event( GtkWidget *widget, GdkEventConfigure *event, @@ -188,25 +322,24 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, // widget->allocation.height + SAFETY, // -1); - g_debug("drawing configure event"); - g_debug("New draw size : %i by %i",widget->allocation.width, widget->allocation.height); + if(widget->allocation.width != drawing->width) { + g_debug("drawing configure event"); + g_debug("New alloc draw size : %i by %i",widget->allocation.width, + widget->allocation.height); - if (drawing->pixmap) - gdk_pixmap_unref(drawing->pixmap); + if (drawing->pixmap) + gdk_pixmap_unref(drawing->pixmap); - /* If no old pixmap present */ - //if(drawing->pixmap == NULL) - { - 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 @@ -214,84 +347,37 @@ 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"); /* Initial data request */ + /* no, do initial data request in the expose event */ // Do not need to ask for data of 1 pixel : not synchronized with // main window time at this moment. - drawing_data_request(drawing, &drawing->pixmap, 0, 0, - widget->allocation.width, - widget->allocation.height); + //drawing_data_request(drawing, &drawing->pixmap, 0, 0, + // widget->allocation.width, + // widget->allocation.height); - drawing->width = widget->allocation.width; - drawing->height = widget->allocation.height; - - return TRUE; - - - + //drawing->width = widget->allocation.width; + //drawing->height = widget->allocation.height; + + drawing->damage_begin = 0; + drawing->damage_end = widget->allocation.width; + + if(drawing->damage_begin < drawing->damage_end) + { + drawing_data_request(drawing, + &drawing->pixmap, + drawing->damage_begin, + 0, + drawing->damage_end - drawing->damage_begin, + drawing->height); + } } -#ifdef NOTUSE -// /* Draw empty background */ -// gdk_draw_rectangle (pixmap, -// widget->style->black_gc, -// TRUE, -// 0, 0, -// widget->allocation.width, -// widget->allocation.height); - - /* Copy old data to new pixmap */ - gdk_draw_drawable (pixmap, - widget->style->black_gc, - drawing->pixmap, - 0, 0, - 0, 0, - -1, -1); - - if (drawing->pixmap) - gdk_pixmap_unref(drawing->pixmap); - - drawing->pixmap = pixmap; - - // Clear the bottom part of the image (SAFETY) - gdk_draw_rectangle (pixmap, - widget->style->black_gc, - TRUE, - 0, drawing->height+SAFETY, - drawing->width+SAFETY, // do not overlap - (widget->allocation.height) - drawing->height); - - // Clear the right part of the image (SAFETY) - gdk_draw_rectangle (pixmap, - widget->style->black_gc, - TRUE, - drawing->width+SAFETY, 0, - (widget->allocation.width) - drawing->width, // do not overlap - drawing->height+SAFETY); - - /* Clear the backgound for data request, but not SAFETY */ - gdk_draw_rectangle (pixmap, - drawing->drawing_area->style->black_gc, - TRUE, - drawing->width + SAFETY, 0, - widget->allocation.width - drawing->width, // do not overlap - widget->allocation.height+SAFETY); - - /* Request data for missing space */ - g_info("missing data request"); - drawing_data_request(drawing, &pixmap, drawing->width, 0, - widget->allocation.width - drawing->width, - widget->allocation.height); - - drawing->width = widget->allocation.width; - drawing->height = widget->allocation.height; - return TRUE; -#endif //NOTUSE } @@ -300,29 +386,24 @@ static gboolean expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { Drawing_t *drawing = (Drawing_t*)user_data; - const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw); - const LttTime* current_time = - lttvwindow_get_current_time(drawing->control_flow_data->mw); ControlFlowData *control_flow_data = (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); - g_debug("drawing expose event"); - - guint x=0; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + LttTime current_time = + lttvwindow_get_current_time(control_flow_data->tab); - LttTime window_end = ltt_time_add(time_window->time_width, - time_window->start_time); + guint cursor_x=0; - convert_time_to_pixels( - time_window->start_time, - window_end, - *current_time, - widget->allocation.width, - &x); - + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); + + + /* update the screen from the pixmap buffer */ gdk_draw_pixmap(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], drawing->pixmap, @@ -330,29 +411,56 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.x, event->area.y, event->area.width, event->area.height); - if(x >= event->area.x && x <= event->area.x+event->area.width) + + if(ltt_time_compare(time_window.start_time, current_time) <= 0 && + ltt_time_compare(window_end, current_time) >= 0) { - gint8 dash_list[] = { 1, 2 }; - GdkGC *gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(gc, widget->style->white_gc); - gdk_gc_set_line_attributes(gc, - 1, - GDK_LINE_ON_OFF_DASH, - GDK_CAP_BUTT, - GDK_JOIN_MITER); - gdk_gc_set_dashes(gc, - 0, - dash_list, - 2); + /* Draw the dotted lines */ + convert_time_to_pixels( + time_window.start_time, + window_end, + current_time, + drawing->width, + &cursor_x); + + + if(drawing->dotted_gc == NULL) { + + drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window); + gdk_gc_copy(drawing->dotted_gc, widget->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_draw_line(NULL, widget->window, - x, event->area.y, - x, event->area.y+event->area.height, - gc); - gdk_gc_unref(gc); + cursor_x, 0, + cursor_x, drawing->height, + drawing->dotted_gc); } return FALSE; } +static gboolean +after_expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) +{ + //g_assert(0); + g_debug("AFTER EXPOSE"); + + return FALSE; + + +} + + /* mouse click */ static gboolean button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data ) @@ -362,34 +470,49 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data G_OBJECT(widget), "control_flow_data"); Drawing_t *drawing = control_flow_data->drawing; - const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); g_debug("click"); if(event->button == 1) { LttTime time; - LttTime window_end = ltt_time_add(time_window->time_width, - time_window->start_time); + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); /* left mouse button click */ g_debug("x click is : %f", event->x); - convert_pixels_to_time(widget->allocation.width, (guint)event->x, - time_window->start_time, + convert_pixels_to_time(drawing->width, (guint)event->x, + time_window.start_time, window_end, &time); - lttvwindow_report_current_time(control_flow_data->mw, &time); + lttvwindow_report_current_time(control_flow_data->tab, &time); } - lttvwindow_report_focus(control_flow_data->mw, gtk_widget_get_parent(control_flow_data->scrolled_window)); - + lttvwindow_report_focus(control_flow_data->tab, + gtk_widget_get_parent(guicontrolflow_get_widget(control_flow_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; +} @@ -400,18 +523,66 @@ 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); + + //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->drawing_area, + gtk_box_pack_end(GTK_BOX(drawing->vbox), drawing->hbox, TRUE, TRUE, 0); 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; + + drawing->damage_begin = 0; + drawing->damage_end = 0; //gtk_widget_set_size_request(drawing->drawing_area->window, 50, 50); g_object_set_data_full( @@ -469,31 +640,54 @@ 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), (gpointer)drawing); + g_signal_connect_after (G_OBJECT(drawing->drawing_area), + "expose_event", + G_CALLBACK (after_expose_event), + (gpointer)drawing); + g_signal_connect (G_OBJECT(drawing->drawing_area), "button-press-event", G_CALLBACK (button_press_event), (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; } 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); + g_info("drawing_destroy end"); } GtkWidget *drawing_get_drawing_area(Drawing_t *drawing) @@ -510,6 +704,7 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing) * * Convert from window pixel and time interval to an absolute time. */ +//FIXME : could need ceil and floor versions of this function void convert_pixels_to_time( gint width, guint x, @@ -525,7 +720,7 @@ void convert_pixels_to_time( *time = ltt_time_add(window_time_begin, *time); } - +//FIXME : could need ceil and floor versions of this function void convert_time_to_pixels( LttTime window_time_begin, @@ -535,44 +730,23 @@ void convert_time_to_pixels( guint *x) { LttTime window_time_interval; - float interval_float, time_float; + double interval_double, time_double; + + g_assert(ltt_time_compare(window_time_begin, time) <= 0 && + ltt_time_compare(window_time_end, time) >= 0); 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); } -void drawing_refresh ( Drawing_t *drawing, - guint x, guint y, - guint width, guint height) -{ - g_info("Drawing.c : drawing_refresh %u, %u, %u, %u", x, y, width, height); - GdkRectangle update_rect; - - gdk_draw_drawable( - drawing->drawing_area->window, - drawing->drawing_area-> - style->fg_gc[GTK_WIDGET_STATE (drawing->drawing_area)], - GDK_DRAWABLE(drawing->pixmap), - x, y, - x, y, - width, height); - - update_rect.x = 0 ; - update_rect.y = 0 ; - update_rect.width = drawing->width; - update_rect.height = drawing->height ; - gtk_widget_draw( drawing->drawing_area, &update_rect); - -} - - void drawing_draw_line( Drawing_t *drawing, GdkPixmap *pixmap, guint x1, guint y1, @@ -584,19 +758,27 @@ 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); - - -void drawing_resize(Drawing_t *drawing, guint h, guint w) -{ - drawing->height = h ; - drawing->width = w ; - - gtk_widget_set_size_request ( drawing->drawing_area, - drawing->width, - drawing->height); - + 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); } @@ -611,7 +793,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 */ @@ -641,9 +823,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) @@ -651,14 +831,18 @@ void drawing_insert_square(Drawing_t *drawing, drawing->pixmap = pixmap; - drawing->height+=height; - - /* Rectangle to update, from new drawing dimensions */ - //update_rect.x = 0 ; - //update_rect.y = y ; - //update_rect.width = drawing->width; - //update_rect.height = drawing->height - y ; - //gtk_widget_draw( drawing->drawing_area, &update_rect); + 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); } @@ -667,47 +851,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; - - /* Rectangle to update, from new drawing dimensions */ - //update_rect.x = 0 ; - //update_rect.y = y ; - //update_rect.width = drawing->width; - //update_rect.height = drawing->height - y ; - //gtk_widget_draw( drawing->drawing_area, &update_rect); + 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, MAX(drawing->height-y, 1)); } void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window) @@ -733,7 +925,7 @@ static gboolean expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { Drawing_t *drawing = (Drawing_t*)user_data; - const TimeWindow *time_window = lttvwindow_get_time_window(drawing->control_flow_data->mw); + TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab); gchar text[255]; PangoContext *context; @@ -747,13 +939,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) GdkColor background = { 0, 0xffff, 0xffff, 0xffff }; LttTime window_end = - ltt_time_add(time_window->time_width, - time_window->start_time); + ltt_time_add(time_window.time_width, + time_window.start_time); LttTime half_width = - ltt_time_div(time_window->time_width,2.0); + ltt_time_div(time_window.time_width,2.0); LttTime window_middle = ltt_time_add(half_width, - time_window->start_time); + time_window.start_time); g_debug("ruler expose event"); gdk_draw_rectangle (drawing->ruler->window, @@ -777,8 +969,8 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) snprintf(text, 255, "%lus\n%luns", - time_window->start_time.tv_sec, - time_window->start_time.tv_nsec); + time_window.start_time.tv_sec, + time_window.start_time.tv_nsec); layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL);