#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
/*****************************************************************************
- * Drawing functions *
+ * drawing functions *
*****************************************************************************/
//FIXME Colors will need to be dynamic. Graphic context part not done so far.
typedef enum
{
- RED,
- GREEN,
- BLUE,
- WHITE,
- BLACK
+ RED,
+ GREEN,
+ BLUE,
+ WHITE,
+ BLACK
} ControlFlowColors;
/* Vector of unallocated colors */
static GdkColor CF_Colors [] =
{
- { 0, 0xffff, 0x0000, 0x0000 }, // RED
- { 0, 0x0000, 0xffff, 0x0000 }, // GREEN
- { 0, 0x0000, 0x0000, 0xffff }, // BLUE
- { 0, 0xffff, 0xffff, 0xffff }, // WHITE
- { 0, 0x0000, 0x0000, 0x0000 } // BLACK
+ { 0, 0xffff, 0x0000, 0x0000 }, // RED
+ { 0, 0x0000, 0xffff, 0x0000 }, // GREEN
+ { 0, 0x0000, 0x0000, 0xffff }, // BLUE
+ { 0, 0xffff, 0xffff, 0xffff }, // WHITE
+ { 0, 0x0000, 0x0000, 0x0000 } // BLACK
};
* Note : this function cannot clear the background, because it may
* erase drawing already present (SAFETY).
*/
-void drawing_data_request(Drawing_t *Drawing,
- GdkPixmap **Pixmap,
- gint x, gint y,
- gint width,
- gint height)
+void drawing_data_request(Drawing_t *drawing,
+ GdkPixmap **pixmap,
+ gint x, gint y,
+ gint width,
+ gint height)
{
if(width < 0) return ;
if(height < 0) return ;
- ControlFlowData *control_flow_data =
- (ControlFlowData*)g_object_get_data(
- G_OBJECT(
- Drawing->Drawing_Area_V),
- "Control_Flow_Data");
-
- LttTime start, end;
- LttTime window_end = ltt_time_add(control_flow_data->Time_Window.time_width,
- control_flow_data->Time_Window.start_time);
-
- g_critical("req : window_end : %u, %u", window_end.tv_sec,
- window_end.tv_nsec);
-
- g_critical("req : time width : %u, %u", control_flow_data->Time_Window.time_width.tv_sec,
- control_flow_data->Time_Window.time_width.tv_nsec);
-
- g_critical("x is : %i, x+width is : %i", x, x+width);
-
- 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(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);
-
+ 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(control_flow_data->time_window.time_width,
+ control_flow_data->time_window.start_time);
+
+ g_critical("req : window_end : %u, %u", window_end.tv_sec,
+ window_end.tv_nsec);
+
+ g_critical("req : time width : %u, %u", control_flow_data->time_window.time_width.tv_sec,
+ control_flow_data->time_window.time_width.tv_nsec);
+
+ g_critical("x is : %i, x+width is : %i", x, x+width);
+
+ convert_pixels_to_time(drawing->drawing_area->allocation.width, x,
+ &control_flow_data->time_window.start_time,
+ &window_end,
+ &start);
+
+ convert_pixels_to_time(drawing->drawing_area->allocation.width, x + width,
+ &control_flow_data->time_window.start_time,
+ &window_end,
+ &end);
+
+ LttvTracesetContext * tsc =
+ get_traceset_context(control_flow_data->mw);
+
//send_test_process(
- //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
- //Drawing);
+ //guicontrolflow_get_process_list(drawing->control_flow_data),
+ //drawing);
//send_test_drawing(
- //guicontrolflow_get_process_list(Drawing->Control_Flow_Data),
- //Drawing, *Pixmap, x, y, width, height);
-
- // 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;
-
- g_critical("req : start : %u, %u", event_request.time_begin.tv_sec,
- event_request.time_begin.tv_nsec);
-
- g_critical("req : end : %u, %u", event_request.time_end.tv_sec,
- event_request.time_end.tv_nsec);
-
- LttvHooks *event = lttv_hooks_new();
- state_add_event_hooks_api(control_flow_data->Parent_Window);
- lttv_hooks_add(event, draw_event_hook, &event_request);
-
- lttv_process_traceset_seek_time(tsc, start);
- lttv_traceset_context_add_hooks(tsc,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, event, NULL);
- lttv_process_traceset(tsc, end, G_MAXULONG);
- lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, event, NULL);
-
- state_remove_event_hooks_api(control_flow_data->Parent_Window);
- lttv_hooks_destroy(event);
+ //guicontrolflow_get_process_list(drawing->control_flow_data),
+ //drawing, *pixmap, x, y, width, height);
+
+ // 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;
+
+ g_critical("req : start : %u, %u", event_request.time_begin.tv_sec,
+ event_request.time_begin.tv_nsec);
+
+ g_critical("req : end : %u, %u", event_request.time_end.tv_sec,
+ 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->mw);
+ 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, after_traceset, 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, 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->mw);
+
+ lttv_hooks_destroy(after_traceset);
+ lttv_hooks_destroy(event);
+ lttv_hooks_destroy(after_event);
+
+
}
-
+
/* Callbacks */
*/
static gboolean
configure_event( GtkWidget *widget, GdkEventConfigure *event,
- gpointer user_data)
+ 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 + SAFETY,
- // widget->allocation.height + SAFETY,
- // -1);
-
+ 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->mw,
+ &drawing->control_flow_data->time_window);
+
+ /* New pixmap, size of the configure event */
+ //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)
+ 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)
{
- Drawing->Pixmap = gdk_pixmap_new(
- widget->window,
- 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;
-
-
- // 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);
-
- Drawing->width = widget->allocation.width;
- Drawing->height = widget->allocation.height;
-
- return TRUE;
+ drawing->pixmap = gdk_pixmap_new(
+ widget->window,
+ 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;
+
+
+ // 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);
+
+ 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,
-// TRUE,
-// 0, 0,
-// 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);
-
- 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);
+// 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->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->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;
+ 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
static gboolean
expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
{
- Drawing_t *Drawing = (Drawing_t*)user_data;
- g_critical("drawing expose event");
+ 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.x, event->area.y,
- event->area.width, event->area.height);
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ drawing->pixmap,
+ event->area.x, event->area.y,
+ 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->mw, &time);
+ }
+
return FALSE;
}
-Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data)
+
+
+
+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),
- "Link_Drawing_Data",
- Drawing,
- (GDestroyNotify)drawing_destroy);
-
- //gtk_widget_modify_bg( Drawing->Drawing_Area_V,
- // GTK_STATE_NORMAL,
- // &CF_Colors[BLACK]);
-
- //gdk_window_get_geometry(Drawing->Drawing_Area_V->window,
- // NULL, NULL,
- // &(Drawing->width),
- // &(Drawing->height),
- // -1);
-
- //Drawing->Pixmap = gdk_pixmap_new(
- // Drawing->Drawing_Area_V->window,
- // Drawing->width,
- // Drawing->height,
- // Drawing->depth);
-
- Drawing->Pixmap = NULL;
-
-// Drawing->Pixmap = gdk_pixmap_new(Drawing->Drawing_Area_V->window,
-// Drawing->Drawing_Area_V->allocation.width,
-// Drawing->Drawing_Area_V->allocation.height,
-// -1);
-
- g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
- "configure_event",
- G_CALLBACK (configure_event),
- (gpointer)Drawing);
-
- g_signal_connect (G_OBJECT(Drawing->Drawing_Area_V),
- "expose_event",
- G_CALLBACK (expose_event),
- (gpointer)Drawing);
-
- return Drawing;
+ Drawing_t *drawing = g_new(Drawing_t, 1);
+
+ drawing->drawing_area = gtk_drawing_area_new ();
+ drawing->control_flow_data = control_flow_data;
+
+ drawing->pango_layout =
+ gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
+
+ //gtk_widget_set_size_request(drawing->drawing_area->window, 50, 50);
+ g_object_set_data_full(
+ G_OBJECT(drawing->drawing_area),
+ "Link_drawing_Data",
+ drawing,
+ (GDestroyNotify)drawing_destroy);
+
+ //gtk_widget_modify_bg( drawing->drawing_area,
+ // GTK_STATE_NORMAL,
+ // &CF_Colors[BLACK]);
+
+ //gdk_window_get_geometry(drawing->drawing_area->window,
+ // NULL, NULL,
+ // &(drawing->width),
+ // &(drawing->height),
+ // -1);
+
+ //drawing->pixmap = gdk_pixmap_new(
+ // drawing->drawing_area->window,
+ // drawing->width,
+ // drawing->height,
+ // drawing->depth);
+
+ drawing->pixmap = NULL;
+
+// drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window,
+// drawing->drawing_area->allocation.width,
+// drawing->drawing_area->allocation.height,
+// -1);
+
+ gtk_widget_add_events(drawing->drawing_area, GDK_BUTTON_PRESS_MASK);
+
+ g_signal_connect (G_OBJECT(drawing->drawing_area),
+ "configure_event",
+ G_CALLBACK (configure_event),
+ (gpointer)drawing);
+
+ g_signal_connect (G_OBJECT(drawing->drawing_area),
+ "expose_event",
+ G_CALLBACK (expose_event),
+ (gpointer)drawing);
+
+ g_signal_connect (G_OBJECT(drawing->drawing_area),
+ "button-press-event",
+ G_CALLBACK (button_press_event),
+ (gpointer)drawing);
+
+
+ return drawing;
}
-void drawing_destroy(Drawing_t *Drawing)
+void drawing_destroy(Drawing_t *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);
+ // Do not unref here, Drawing_t destroyed by it's widget.
+ //g_object_unref( G_OBJECT(drawing->drawing_area));
+
+ g_free(drawing->pango_layout);
+ g_free(drawing);
}
-GtkWidget *drawing_get_widget(Drawing_t *Drawing)
+GtkWidget *drawing_get_widget(Drawing_t *drawing)
{
- return Drawing->Drawing_Area_V;
+ return drawing->drawing_area;
}
/* convert_pixels_to_time
* Convert from window pixel and time interval to an absolute time.
*/
void convert_pixels_to_time(
- gint width,
- guint x,
- LttTime *window_time_begin,
- LttTime *window_time_end,
- LttTime *time)
+ gint width,
+ guint x,
+ LttTime *window_time_begin,
+ LttTime *window_time_end,
+ LttTime *time)
{
- LttTime window_time_interval;
-
- window_time_interval = ltt_time_sub(*window_time_end,
+ LttTime window_time_interval;
+
+ window_time_interval = ltt_time_sub(*window_time_end,
*window_time_begin);
- *time = ltt_time_mul(window_time_interval, (x/(float)width));
- *time = ltt_time_add(*window_time_begin, *time);
+ *time = ltt_time_mul(window_time_interval, (x/(float)width));
+ *time = ltt_time_add(*window_time_begin, *time);
}
void convert_time_to_pixels(
- LttTime window_time_begin,
- LttTime window_time_end,
- LttTime time,
- int width,
- guint *x)
+ LttTime window_time_begin,
+ LttTime window_time_end,
+ LttTime time,
+ int width,
+ guint *x)
{
- LttTime window_time_interval;
- float interval_float, time_float;
-
- 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);
-
- *x = (guint)(time_float/interval_float * width);
-
+ LttTime window_time_interval;
+ float interval_float, time_float;
+
+ 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);
+
+ *x = (guint)(time_float/interval_float * width);
+
}
-void drawing_refresh ( Drawing_t *Drawing,
- guint x, guint y,
- guint width, guint height)
+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_V->window,
- Drawing->Drawing_Area_V->
- style->fg_gc[GTK_WIDGET_STATE (Drawing->Drawing_Area_V)],
- 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_V, &update_rect);
+ 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,
- guint x2, guint y2,
- GdkGC *GC)
+void drawing_draw_line( Drawing_t *drawing,
+ GdkPixmap *pixmap,
+ guint x1, guint y1,
+ guint x2, guint y2,
+ GdkGC *GC)
{
- gdk_draw_line (Pixmap,
- GC,
- x1, y1, x2, y2);
+ gdk_draw_line (pixmap,
+ GC,
+ x1, y1, x2, y2);
}
-void drawing_resize(Drawing_t *Drawing, guint h, guint w)
+void drawing_resize(Drawing_t *drawing, guint h, guint w)
{
- Drawing->height = h ;
- Drawing->width = w ;
-
- gtk_widget_set_size_request ( Drawing->Drawing_Area_V,
- Drawing->width,
- Drawing->height);
-
-
+ drawing->height = h ;
+ drawing->width = w ;
+
+ gtk_widget_set_size_request ( drawing->drawing_area,
+ drawing->width,
+ drawing->height);
+
+
}
/* Insert a square corresponding to a new process in the list */
-/* Applies to whole Drawing->width */
-void drawing_insert_square(Drawing_t *Drawing,
- guint y,
- guint height)
+/* Applies to whole drawing->width */
+void drawing_insert_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_V->window,
- Drawing->width + SAFETY,
- Drawing->height + height + SAFETY,
- -1);
-
- /* Copy the high region */
- gdk_draw_drawable (Pixmap,
- Drawing->Drawing_Area_V->style->black_gc,
- Drawing->Pixmap,
- 0, 0,
- 0, 0,
- Drawing->width + SAFETY, y);
+ //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);
- /* add an empty square */
- gdk_draw_rectangle (Pixmap,
- Drawing->Drawing_Area_V->style->black_gc,
- TRUE,
- 0, y,
- Drawing->width + SAFETY, // do not overlap
- height);
+ /* add an empty square */
+ gdk_draw_rectangle (pixmap,
+ drawing->drawing_area->style->white_gc,
+ TRUE,
+ 0, y,
+ drawing->width + SAFETY, // do not overlap
+ height);
- /* copy the bottom of the region */
- gdk_draw_drawable (Pixmap,
- Drawing->Drawing_Area_V->style->black_gc,
- Drawing->Pixmap,
- 0, y,
- 0, y + height,
- Drawing->width+SAFETY, Drawing->height - y + SAFETY);
+ /* copy the bottom of the region */
+ gdk_draw_drawable (pixmap,
+ drawing->drawing_area->style->black_gc,
+ drawing->pixmap,
+ 0, y,
+ 0, y + height,
+ drawing->width+SAFETY, drawing->height - y + SAFETY);
- if (Drawing->Pixmap)
- gdk_pixmap_unref(Drawing->Pixmap);
- Drawing->Pixmap = Pixmap;
-
- Drawing->height+=height;
+ if (drawing->pixmap)
+ gdk_pixmap_unref(drawing->pixmap);
- /* 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);
+ 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);
}
/* Remove a square corresponding to a removed process in the list */
-void drawing_remove_square(Drawing_t *Drawing,
- guint y,
- guint height)
+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_V->window,
- Drawing->width + SAFETY,
- Drawing->height - height + SAFETY,
- -1);
-
- /* Copy the high region */
- gdk_draw_drawable (Pixmap,
- Drawing->Drawing_Area_V->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_V->style->black_gc,
- Drawing->Pixmap,
- 0, y + height,
- 0, y,
- Drawing->width, Drawing->height - y - height + SAFETY);
-
-
- 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_V, &update_rect);
+ //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);
+
+
+
+ /* 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);
+
+
+ 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);
}