X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FDrawing.c;h=cb2d049d440e828579c7bb97c7ce00b5062cc054;hb=b782dd11ec8e363e135b32a563687a8e4f70bedb;hp=53873b7011cc4fbec3e780f745225fd0db9298bd;hpb=558aa01322f1af8be09fcfc086864da0373823c5;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
index 53873b70..cb2d049d 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c
@@ -1,9 +1,16 @@
+
 #include "Drawing.h"
+#include "CFV.h"
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+
+#include <lttv/processTrace.h>
 
 /*****************************************************************************
  *                              Drawing functions                            *
  *****************************************************************************/
 
+//FIXME Colors will need to be dynamic. Graphic context part not done so far.
 typedef enum 
 {
 	RED,
@@ -25,31 +32,198 @@ static GdkColor CF_Colors [] =
 };
 
 
-typedef struct _Drawing_t {
-	GtkWidget *Drawing_Area_V
+//struct _Drawing_t {
+//	GtkWidget	*Drawing_Area_V;
+//	GdkPixmap	*Pixmap;
+//	ControlFlowData	*Control_Flow_Data;
+
+//	gint 		height, width, depth;
+
+//};
+
+/* Function responsible for updating the exposed area.
+ * It must call processTrace() to ask for this update.
+ */
+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 ;
+
+  gdk_draw_rectangle (*Pixmap,
+		      Drawing->Drawing_Area_V->style->white_gc,
+		      TRUE,
+		      x, y,
+		      width,	// do not overlap
+		      height);
+
+  send_test_process(
+	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);
+  
+}
+		      
+/* Callbacks */
+
+
+/* Create a new backing pixmap of the appropriate size */
+static gboolean
+configure_event( GtkWidget *widget, GdkEventConfigure *event, 
+		gpointer user_data)
+{
+  Drawing_t *Drawing = (Drawing_t*)user_data;
+
+  /* New Pixmap, size of the configure event */
+  GdkPixmap *Pixmap = gdk_pixmap_new(widget->window,
+			  widget->allocation.width,
+			  widget->allocation.height,
+			  -1);
+	
+  g_critical("drawing configure event");
+
+  /* If no old Pixmap present */
+  if(Drawing->Pixmap == NULL)
+  {
+  	Drawing->Pixmap = gdk_pixmap_new(
+		widget->window,
+		widget->allocation.width,
+		widget->allocation.height,
+		//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,
+		   	widget->allocation.width,
+			widget->allocation.height);
+
+  }
+//  /* 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);
 
-	guint height, width;
+   /* 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);
 
-} Drawing_t;
+//    gdk_draw_rectangle (Pixmap,
+//		      widget->style->white_gc,
+//		      TRUE,
+//		      0, Drawing->height,
+//		      Drawing->width,	// do not overlap
+//		      widget->allocation.height -
+//		      			Drawing->height);
+ 
 
+  
+  
+  if (Drawing->Pixmap)
+    gdk_pixmap_unref(Drawing->Pixmap);
 
-Drawing_t *Drawing(void)
+  Drawing->Pixmap = Pixmap;
+  Drawing->width = widget->allocation.width;
+  Drawing->height = widget->allocation.height;
+
+  return TRUE;
+}
+
+
+/* Redraw the screen from the backing pixmap */
+static gboolean
+expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 {
+  Drawing_t *Drawing = (Drawing_t*)user_data;
+  g_critical("drawing expose event");
+
+  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);
 
-	Drawing_t Drawing = g_new(Drawing_t, 1);
+  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;
 
+	//gtk_widget_set_size_request(Drawing->Drawing_Area_V->window, 50, 50);
 	g_object_set_data_full(
 			G_OBJECT(Drawing->Drawing_Area_V),
-			"Drawing_Data",
+			"Link_Drawing_Data",
 			Drawing,
-			Drawing_destroy);
+			(GDestroyNotify)Drawing_destroy);
 
-	gtk_widget_modify_bg(	Control_Flow_Data->Drawing_Area_V,
-				GTK_STATE_NORMAL,
-				&CF_Colors[BLACK]);
+	//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;
 }
@@ -57,52 +231,223 @@ Drawing_t *Drawing(void)
 void Drawing_destroy(Drawing_t *Drawing)
 {
 
-	g_object_unref( G_OBJECT(Drawing->Drawing_Area_V));
+	// Do not unref here, Drawing_t destroyed by it's widget.
+	//g_object_unref( G_OBJECT(Drawing->Drawing_Area_V));
 		
 	g_free(Drawing);
 }
 
+GtkWidget *Drawing_getWidget(Drawing_t *Drawing)
+{
+	return Drawing->Drawing_Area_V;
+}
+
 /* get_time_from_pixels
  *
  * Get the time interval from window time and pixels, and pixels requested. This
  * function uses TimeMul, which should only be used if the float value is lower
  * that 4, and here it's always lower than 1, so it's ok.
  */
-void get_time_from_pixels(
-		guint area_x,
-		guint area_width,
-		guint window_width,
-		ltt_time *window_time_begin,
-		ltt_time *window_time_end,
-		ltt_time *time_begin,
-		ltt_time *time_end)
+void convert_pixels_to_time(
+		Drawing_t *Drawing,
+		guint x,
+		LttTime *window_time_begin,
+		LttTime *window_time_end,
+		LttTime *time)
 {
-	ltt_time window_time_interval;
+	LttTime window_time_interval;
 	
-	TimeSub(window_time_interval, window_time_end, window_time_begin);
+	TimeSub(window_time_interval, *window_time_end, *window_time_begin);
 
 	
-	TimeMul(time_begin, window_time_interval, (area_x/(float)window_width));
-	TimeAdd(time_begin, window_time_begin, time_begin);
+	TimeMul(*time, window_time_interval,
+			(x/(float)Drawing->width));
+	TimeAdd(*time, *window_time_begin, *time);
 	
-	TimeMul(time_end, window_time_interval, (area_width/(float)window_width));
-	TimeAdd(time_end, time_begin, time_end);
+}
+
+
+
+void convert_time_to_pixels(
+		LttTime window_time_begin,
+		LttTime window_time_end,
+		LttTime time,
+		Drawing_t *Drawing,
+		guint *x)
+{
+	LttTime window_time_interval;
+	float interval_float, time_float;
+	
+	TimeSub(window_time_interval, window_time_end, window_time_begin);
+	
+	TimeSub(time, time, window_time_begin);
+	
+	interval_float = (window_time_interval.tv_sec * NANSECOND_CONST)
+			+ window_time_interval.tv_nsec;
+	time_float = (time.tv_sec * NANSECOND_CONST)
+			+ time.tv_nsec;
+
+	*x = (guint)(time_float/interval_float * Drawing->width);
 	
 }
 
-void Drawing_Resize(Drawing_t *Drawing, guint h, guint, w)
+void Drawing_Refresh (	Drawing_t *Drawing,
+			guint x, guint y,
+			guint width, guint height)
 {
-	guint w;
+	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);
+
+}
+
+
+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);
+}
+
+
+
+
+void Drawing_Resize(Drawing_t *Drawing, guint h, guint w)
+{
 	Drawing->height = h ;
-	Drawing->weight = w ;
+	Drawing->width = w ;
 
-	gtk_widget_set_size_request (	Control_Flow_Data->Drawing_Area_V,
-					Drawing->weight,
+	gtk_widget_set_size_request (	Drawing->Drawing_Area_V,
+					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)
+{
+	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,
+			  -1);
+	
+	/* Copy the high region */
+	gdk_draw_drawable (Pixmap,
+		Drawing->Drawing_Area_V->style->black_gc,
+		Drawing->Pixmap,
+		0, 0,
+		0, 0,
+		Drawing->width, y);
+
+
+
+
+	/* add an empty square */
+	gdk_draw_rectangle (Pixmap,
+		Drawing->Drawing_Area_V->style->black_gc,
+		TRUE,
+		0, y,
+		Drawing->width,	// 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, Drawing->height - y);
 
+
+
+
+	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);
+}
+
+
+/* Remove a square corresponding to a removed process in the list */
+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,
+			Drawing->height - height,
+			-1);
+	
+	/* Copy the high region */
+	gdk_draw_drawable (Pixmap,
+		Drawing->Drawing_Area_V->style->black_gc,
+		Drawing->Pixmap,
+		0, 0,
+		0, 0,
+		Drawing->width, 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);
+
+
+	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);
+}