#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)
-
/*****************************************************************************
* Drawing functions *
*****************************************************************************/
/* Function responsible for updating the exposed area.
* It must call processTrace() to ask for this update.
+ * Note : this function cannot clear the background, because it may
+ * erase drawing already present (SAFETY).
*/
void drawing_data_request(Drawing_t *Drawing,
GdkPixmap **Pixmap,
g_critical("x is : %i, x+width is : %i", x, x+width);
- convert_pixels_to_time(width, x,
+ convert_pixels_to_time(Drawing->Drawing_Area_V->allocation.width, x,
&control_flow_data->Time_Window.start_time,
&window_end,
&start);
- convert_pixels_to_time(width, x + width,
+ convert_pixels_to_time(Drawing->Drawing_Area_V->allocation.width, x + width,
&control_flow_data->Time_Window.start_time,
&window_end,
&end);
LttvTracesetContext * tsc =
get_traceset_context(control_flow_data->Parent_Window);
- gdk_draw_rectangle (*Pixmap,
- Drawing->Drawing_Area_V->style->white_gc,
- TRUE,
- x, y,
- width, // do not overlap
- height);
-
- //send_test_process(
+ //send_test_process(
//guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
//Drawing);
//send_test_drawing(
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;
g_critical("req : start : %u, %u", event_request.time_begin.tv_sec,
event_request.time_begin.tv_nsec);
event_request.time_end.tv_nsec);
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
+ //state_add_event_hooks_api(control_flow_data->Parent_Window);
+ lttv_hooks_add(after_event, draw_after_hook, &event_request);
lttv_process_traceset_seek_time(tsc, 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, NULL);
+ NULL, after_traceset, NULL, event, after_event);
lttv_process_traceset(tsc, end, G_MAXULONG);
- lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, event, NULL);
+ //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, after_traceset, NULL, event, after_event);
+ //Modified by xiangxiu: state update hooks are removed by the main window
+ //state_remove_event_hooks_api(control_flow_data->Parent_Window);
+ lttv_hooks_destroy(after_traceset);
lttv_hooks_destroy(event);
+ lttv_hooks_destroy(after_event);
+
+
}
/* 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.
+ */
static gboolean
configure_event( GtkWidget *widget, GdkEventConfigure *event,
gpointer user_data)
{
Drawing_t *Drawing = (Drawing_t*)user_data;
+
+ /* First, get the new time interval of the main window */
+ /* we assume (see documentation) that the main window
+ * has updated the time interval before this configure gets
+ * executed.
+ */
+ get_time_window(Drawing->Control_Flow_Data->Parent_Window,
+ &Drawing->Control_Flow_Data->Time_Window);
+
/* New Pixmap, size of the configure event */
- GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
- widget->allocation.width,
- widget->allocation.height,
- -1);
+ //GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
+ // widget->allocation.width + SAFETY,
+ // widget->allocation.height + SAFETY,
+ // -1);
g_critical("drawing configure event");
-
+ g_critical("New draw size : %i by %i",widget->allocation.width, widget->allocation.height);
+
+
+ if (Drawing->Pixmap)
+ gdk_pixmap_unref(Drawing->Pixmap);
+
/* If no old Pixmap present */
- if(Drawing->Pixmap == NULL)
+ //if(Drawing->Pixmap == NULL)
{
Drawing->Pixmap = gdk_pixmap_new(
widget->window,
- widget->allocation.width,
- widget->allocation.height,
+ widget->allocation.width + SAFETY,
+ widget->allocation.height + SAFETY,
//ProcessList_get_height
// (GuiControlFlow_get_Process_List(Drawing->Control_Flow_Data)),
-1);
- Drawing->width = widget->allocation.width;
- Drawing->height = widget->allocation.height;
-g_critical("init data");
- /* Initial data request */
- drawing_data_request(Drawing, &Drawing->Pixmap, 0, 0,
+ Drawing->width = widget->allocation.width;
+ Drawing->height = widget->allocation.height;
+
+
+ // Clear the image
+ gdk_draw_rectangle (Drawing->Pixmap,
+ widget->style->white_gc,
+ TRUE,
+ 0, 0,
+ widget->allocation.width+SAFETY,
+ widget->allocation.height+SAFETY);
+
+ //g_info("init data request");
+
+
+ /* Initial data request */
+ // 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);
+ widget->allocation.height);
+
+ Drawing->width = widget->allocation.width;
+ Drawing->height = widget->allocation.height;
+
+ return TRUE;
+
+
}
+#ifdef NOTUSE
// /* Draw empty background */
// gdk_draw_rectangle (Pixmap,
// widget->style->black_gc,
// widget->allocation.width,
// widget->allocation.height);
- /* Copy old data to new pixmap */
- gdk_draw_drawable (Pixmap,
- widget->style->white_gc,
- Drawing->Pixmap,
- 0, 0,
- 0, 0,
- -1, -1);
-
- /* Request data for missing space */
-g_critical("missing data");
- drawing_data_request(Drawing, &Pixmap, Drawing->width, 0,
- widget->allocation.width - Drawing->width,
- widget->allocation.height);
- drawing_data_request(Drawing, &Pixmap, 0, Drawing->height,
- Drawing->width,
- widget->allocation.height - Drawing->height);
-
-// gdk_draw_rectangle (Pixmap,
-// widget->style->white_gc,
-// TRUE,
-// Drawing->width, 0,
-// widget->allocation.width -
-// Drawing->width,
-// widget->allocation.height);
-
-// gdk_draw_rectangle (Pixmap,
-// widget->style->white_gc,
-// TRUE,
-// 0, Drawing->height,
-// Drawing->width, // do not overlap
-// widget->allocation.height -
-// Drawing->height);
-
-
-
+ /* Copy old data to new pixmap */
+ gdk_draw_drawable (Pixmap,
+ widget->style->white_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->white_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->white_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_V->style->white_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
}
expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
Drawing_t *Drawing = (Drawing_t*)user_data;
+ ControlFlowData *control_flow_data =
+ (ControlFlowData*)g_object_get_data(
+ G_OBJECT(widget),
+ "Control_Flow_Data");
+
g_critical("drawing expose event");
+
+ guint x=0;
+ LttTime* Current_Time =
+ guicontrolflow_get_current_time(control_flow_data);
+ LttTime window_end = ltt_time_add(control_flow_data->Time_Window.time_width,
+ control_flow_data->Time_Window.start_time);
+
+ convert_time_to_pixels(
+ control_flow_data->Time_Window.start_time,
+ window_end,
+ *Current_Time,
+ widget->allocation.width,
+ &x);
+
gdk_draw_pixmap(widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
Drawing->Pixmap,
event->area.x, event->area.y,
event->area.width, event->area.height);
+ if(x >= event->area.x && x <= event->area.x+event->area.width)
+ {
+ GdkGC *gc = gdk_gc_new(control_flow_data->Drawing->Pixmap);
+ gdk_gc_copy(gc, widget->style->black_gc);
+
+ drawing_draw_line(NULL, widget->window,
+ x, event->area.y,
+ x, event->area.y+event->area.height,
+ gc);
+ gdk_gc_unref(gc);
+ }
return FALSE;
}
+/* mouse click */
+static gboolean
+button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data )
+{
+ ControlFlowData *control_flow_data =
+ (ControlFlowData*)g_object_get_data(
+ G_OBJECT(widget),
+ "Control_Flow_Data");
+ Drawing_t *Drawing = control_flow_data->Drawing;
+
+
+ g_critical("click");
+ if(event->button == 1)
+ {
+ LttTime time;
+
+ LttTime window_end = ltt_time_add(control_flow_data->Time_Window.time_width,
+ control_flow_data->Time_Window.start_time);
+
+
+ /* left mouse button click */
+ g_critical("x click is : %f", event->x);
+
+ convert_pixels_to_time(widget->allocation.width, (guint)event->x,
+ &control_flow_data->Time_Window.start_time,
+ &window_end,
+ &time);
+
+ set_current_time(control_flow_data->Parent_Window, &time);
+
+ }
+
+ return FALSE;
+}
+
+
+
+
Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data)
{
Drawing_t *Drawing = g_new(Drawing_t, 1);
Drawing->Drawing_Area_V = gtk_drawing_area_new ();
Drawing->Control_Flow_Data = Control_Flow_Data;
+ Drawing->pango_layout =
+ gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, NULL);
+
//gtk_widget_set_size_request(Drawing->Drawing_Area_V->window, 50, 50);
g_object_set_data_full(
G_OBJECT(Drawing->Drawing_Area_V),
// Drawing->Drawing_Area_V->allocation.height,
// -1);
+ gtk_widget_add_events(Drawing->Drawing_Area_V, GDK_BUTTON_PRESS_MASK);
+
g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
"configure_event",
G_CALLBACK (configure_event),
G_CALLBACK (expose_event),
(gpointer)Drawing);
+ g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
+ "button-press-event",
+ G_CALLBACK (button_press_event),
+ (gpointer)Drawing);
+
+
return Drawing;
}
// Do not unref here, Drawing_t destroyed by it's widget.
//g_object_unref( G_OBJECT(Drawing->Drawing_Area_V));
+ g_free(Drawing->pango_layout);
g_free(Drawing);
}
guint y,
guint height)
{
- GdkRectangle update_rect;
+ //GdkRectangle update_rect;
/* Allocate a new pixmap with new height */
GdkPixmap *Pixmap = gdk_pixmap_new(Drawing->Drawing_Area_V->window,
- Drawing->width,
- Drawing->height + height,
+ Drawing->width + SAFETY,
+ Drawing->height + height + SAFETY,
-1);
/* Copy the high region */
Drawing->Pixmap,
0, 0,
0, 0,
- Drawing->width, y);
+ Drawing->width + SAFETY, y);
/* add an empty square */
gdk_draw_rectangle (Pixmap,
- Drawing->Drawing_Area_V->style->black_gc,
+ Drawing->Drawing_Area_V->style->white_gc,
TRUE,
0, y,
- Drawing->width, // do not overlap
+ Drawing->width + SAFETY, // do not overlap
height);
Drawing->Pixmap,
0, y,
0, y + height,
- Drawing->width, Drawing->height - y);
+ Drawing->width+SAFETY, Drawing->height - y + SAFETY);
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_V, &update_rect);
+ //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_V, &update_rect);
}
guint y,
guint height)
{
- GdkRectangle update_rect;
+ //GdkRectangle update_rect;
/* Allocate a new pixmap with new height */
GdkPixmap *Pixmap = gdk_pixmap_new(
Drawing->Drawing_Area_V->window,
- Drawing->width,
- Drawing->height - height,
+ Drawing->width + SAFETY,
+ Drawing->height - height + SAFETY,
-1);
/* Copy the high region */
Drawing->Pixmap,
0, 0,
0, 0,
- Drawing->width, y);
+ Drawing->width + SAFETY, y);
Drawing->Pixmap,
0, y + height,
0, y,
- Drawing->width, Drawing->height - y - height);
+ Drawing->width, Drawing->height - y - height + SAFETY);
if (Drawing->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_V, &update_rect);
+ //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_V, &update_rect);
}
projects / lttv.git / blobdiff