#include <gdk/gdk.h>
#include <string.h>
+#include <ltt/trace.h>
+
#include <lttv/lttv.h>
#include <lttv/tracecontext.h>
#include <lttvwindow/lttvwindow.h>
//FIXME
#define TRACE_NUMBER 0
+#define EXTRA_ALLOC 1024 // pixels
+
#if 0 /* colors for two lines representation */
GdkColor drawing_colors[NUM_COLORS] =
LttTime start, time_end;
LttTime window_end = time_window.end_time;
- g_debug("req : window start_time : %u, %u", time_window.start_time.tv_sec,
+ g_debug("req : window start_time : %lu, %lu", 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,
+ g_debug("req : window time width : %lu, %lu", time_window.time_width.tv_sec,
time_window.time_width.tv_nsec);
- g_debug("req : window_end : %u, %u", window_end.tv_sec,
+ g_debug("req : window_end : %lu, %lu", window_end.tv_sec,
window_end.tv_nsec);
g_debug("x is : %i, x+width is : %i", x, x+width);
LttvTraceHook hook;
- LttvAttributeValue val;
-
nb_trace = lttv_traceset_number(traceset);
// FIXME : eventually request for more traces
// for(i = 0 ; i < nb_trace ; i++) {
events_request->before_request = before_request_hook;
events_request->after_request = after_request_hook;
- g_debug("req : start : %u, %u", start.tv_sec,
+ g_debug("req : start : %lu, %lu", start.tv_sec,
start.tv_nsec);
- g_debug("req : end : %u, %u", time_end.tv_sec,
+ g_debug("req : end : %lu, %lu", time_end.tv_sec,
time_end.tv_nsec);
lttvwindow_events_request(tab, events_request);
LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
TimeWindow time_window =
lttvwindow_get_time_window(cfd->tab);
- LttTime end_time = time_window.end_time;
guint width = cfd->drawing->width;
guint x=0;
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;
+ //LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
guint num_cpu =
ltt_trace_per_cpu_tracefile_number(tss->parent.traces[TRACE_NUMBER]->t);
gint x, x_end, width;
ControlFlowData *cfd = events_request->viewer_data;
- LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+ LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
Drawing_t *drawing = cfd->drawing;
TimeWindow time_window =
g_debug("request expose");
- LttTime window_end = time_window.end_time;
-
-#if 0
- convert_time_to_pixels(
- time_window,
- cfd->drawing->last_start,
- drawing->width,
- &x);
-
-#endif //0
convert_time_to_pixels(
time_window,
end_time,
drawing->width,
&x_end);
x = drawing->damage_begin;
- // x_end = drawing->damage_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);
+ width, drawing->drawing_area->allocation.height);
}
g_debug("New alloc draw size : %i by %i",widget->allocation.width,
widget->allocation.height);
-
- if (drawing->pixmap)
- gdk_pixmap_unref(drawing->pixmap);
-
drawing->width = widget->allocation.width;
+
+ if(drawing->alloc_width < widget->allocation.width) {
+ if(drawing->pixmap)
+ gdk_pixmap_unref(drawing->pixmap);
+
+ drawing->pixmap = gdk_pixmap_new(widget->window,
+ drawing->width + SAFETY + EXTRA_ALLOC,
+ drawing->height + EXTRA_ALLOC,
+ -1);
+ drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC;
+ drawing->alloc_height = drawing->height + EXTRA_ALLOC;
+ }
//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)),
(ControlFlowData*)g_object_get_data(
G_OBJECT(widget),
"control_flow_data");
- if(drawing->gc == NULL) {
+ 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);
}
event->area.x, event->area.y,
event->area.width, event->area.height);
-
+ /* Erase the dotted lines left.. */
+ if(widget->allocation.height > drawing->height)
+ {
+ gdk_draw_rectangle (widget->window,
+ drawing->drawing_area->style->black_gc,
+ TRUE,
+ event->area.x, drawing->height,
+ event->area.width, // do not overlap
+ widget->allocation.height - drawing->height);
+g_critical("blah : %u, %u", widget->allocation.height, drawing->height);
+ }
+
if(ltt_time_compare(time_window.start_time, current_time) <= 0 &&
ltt_time_compare(window_end, current_time) >= 0)
{
dash_list,
2);
}
-
- drawing_draw_line(NULL, widget->window,
+
+ gdk_draw_line(widget->window,
+ drawing->dotted_gc,
cursor_x, 0,
- cursor_x, drawing->height,
- drawing->dotted_gc);
+ cursor_x, widget->allocation.height);
}
return FALSE;
}
{
LttTime time;
- LttTime window_end = time_window.end_time;
-
-
/* left mouse button click */
g_debug("x click is : %f", event->x);
drawing->height = 1;
drawing->width = 1;
drawing->depth = 0;
+ drawing->alloc_height = 1;
+ drawing->alloc_width = 1;
drawing->damage_begin = 0;
drawing->damage_end = 0;
drawing->height = 1;
/* Allocate a new pixmap with new height */
drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window,
- drawing->width + SAFETY,
- drawing->height,
+ drawing->width + SAFETY + EXTRA_ALLOC,
+ drawing->height + EXTRA_ALLOC,
-1);
+ drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC;
+ drawing->alloc_height = drawing->height + EXTRA_ALLOC;
gtk_widget_set_size_request(drawing->drawing_area,
-1,
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);
+ gtk_widget_queue_draw ( drawing->drawing_area);
}
guint height)
{
//GdkRectangle update_rect;
+ gboolean reallocate = FALSE;
+ GdkPixmap *new_pixmap;
/* Allocate a new pixmap with new height */
- GdkPixmap *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);
+ if(drawing->alloc_height < drawing->height + height) {
+ new_pixmap = gdk_pixmap_new(drawing->drawing_area->window,
+ drawing->width + SAFETY + EXTRA_ALLOC,
+ drawing->height + height + EXTRA_ALLOC,
+ -1);
+ drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC;
+ drawing->alloc_height = drawing->height + height + EXTRA_ALLOC;
+ reallocate = TRUE;
+ /* Copy the high region */
+ gdk_draw_drawable (new_pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, 0,
+ 0, 0,
+ drawing->width + SAFETY, y);
+ } else {
+ new_pixmap = drawing->pixmap;
+ }
+ //GdkPixmap *pixmap = gdk_pixmap_new(drawing->drawing_area->window,
+ // drawing->width + SAFETY,
+ // drawing->height + height,
+ // -1);
+
/* add an empty square */
- gdk_draw_rectangle (pixmap,
+ gdk_draw_rectangle (new_pixmap,
drawing->drawing_area->style->black_gc,
TRUE,
0, y,
drawing->width + SAFETY, // do not overlap
height);
-
-
/* copy the bottom of the region */
- gdk_draw_drawable (pixmap,
+ gdk_draw_drawable (new_pixmap,
drawing->drawing_area->style->black_gc,
drawing->pixmap,
0, y,
drawing->width+SAFETY, drawing->height - y);
- if (drawing->pixmap)
+ if(reallocate && likely(drawing->pixmap)) {
gdk_pixmap_unref(drawing->pixmap);
-
- drawing->pixmap = pixmap;
+ drawing->pixmap = new_pixmap;
+ }
- if(drawing->height==1) drawing->height = height;
+ if(unlikely(drawing->height==1)) drawing->height = height;
else drawing->height += height;
gtk_widget_set_size_request(drawing->drawing_area,
{
GdkPixmap *pixmap;
- if(drawing->height == height) {
- pixmap = gdk_pixmap_new(
- drawing->drawing_area->window,
- drawing->width + SAFETY,
- 1,
- -1);
+ if(unlikely((guint)drawing->height == height)) {
+ //pixmap = gdk_pixmap_new(
+ // drawing->drawing_area->window,
+ // drawing->width + SAFETY,
+ // 1,
+ // -1);
+ pixmap = drawing->pixmap;
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);
+ //pixmap = gdk_pixmap_new(
+ // drawing->drawing_area->window,
+ // drawing->width + SAFETY,
+ // drawing->height - height,
+ // -1);
+ /* Keep the same preallocated pixmap */
+ pixmap = drawing->pixmap;
/* Copy the high region */
gdk_draw_drawable (pixmap,
drawing->height-=height;
}
- if (drawing->pixmap)
- gdk_pixmap_unref(drawing->pixmap);
+ //if(likely(drawing->pixmap))
+ // gdk_pixmap_unref(drawing->pixmap);
- drawing->pixmap = pixmap;
+ //drawing->pixmap = pixmap;
gtk_widget_set_size_request(drawing->drawing_area,
-1,
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];
PangoContext *context;
PangoLayout *layout;
- PangoAttribute *attribute;
PangoFontDescription *FontDesc;
- gint Font_Size;
PangoRectangle ink_rect;
- guint global_width=0;
+ gint global_width=0;
GdkColor foreground = { 0, 0, 0, 0 };
GdkColor background = { 0, 0xffff, 0xffff, 0xffff };
projects / lttv.git / blobdiff