X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FDrawing.h;h=3f6eb210fbffbb6fe9bc5ef221905b20c716f9b6;hb=b6db18f8146b58641bfc639049bc53aaeb658bb9;hp=dda39fb39b08637f0dcd5e02ab1b1d9974221f89;hpb=189a5d08183ffed5caf82d625a3b9a86bda96989;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
index dda39fb3..3f6eb210 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.h
@@ -6,6 +6,10 @@
 #include <gtk/gtk.h>
 #include <ltt/ltt.h>
 #include "CFV.h"
+#include "Draw_Item.h"
+
+
+#define SAFETY 50 // safety pixels at right and bottom of pixmap buffer
 
 /* This part of the viewer does :
  * Draw horizontal lines, getting graphic context as arg.
@@ -31,63 +35,62 @@
 
 typedef struct _Drawing_t Drawing_t;
 
-
-//FIXME : TEMPORARILY PLACED HERE FOR GC !!
 struct _Drawing_t {
-	GtkWidget	*Drawing_Area_V;
-	GdkPixmap	*Pixmap;
-	ControlFlowData	*Control_Flow_Data;
-
-	gint 		height, width, depth;
-
+  GtkWidget *drawing_area;
+  GdkPixmap *pixmap;
+  ControlFlowData *control_flow_data;
+  
+  PangoLayout *pango_layout;
+
+  gint    height, width, depth;
+  
 };
 
-
-Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data);
+Drawing_t *drawing_construct(ControlFlowData *control_flow_data);
 void drawing_destroy(Drawing_t *Drawing);
 
 GtkWidget *drawing_get_widget(Drawing_t *Drawing);
-	
-//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);
 
-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);
 
 //void Drawing_copy( Drawing_t *Drawing,
-//		guint xsrc, guint ysrc,
-//		guint xdest, guint ydest,
-//		guint width, guint height);
+//    guint xsrc, guint ysrc,
+//    guint xdest, guint ydest,
+//    guint width, guint height);
 
 /* Insert a square corresponding to a new process in the list */
 void drawing_insert_square(Drawing_t *Drawing,
-				guint y,
-				guint height);
+        guint y,
+        guint height);
 
 /* Remove a square corresponding to a removed process in the list */
 void drawing_remove_square(Drawing_t *Drawing,
-				guint y,
-				guint height);
+        guint y,
+        guint height);
 
 
 //void Drawing_Resize(Drawing_t *Drawing, guint h, guint w);
 
 void convert_pixels_to_time(
-		Drawing_t *Drawing,
-		guint x,
-		LttTime *window_time_begin,
-		LttTime *window_time_end,
-		LttTime *begin);
+    gint width,
+    guint x,
+    LttTime *window_time_begin,
+    LttTime *window_time_end,
+    LttTime *time);
 
 void convert_time_to_pixels(
-		LttTime window_time_begin,
-		LttTime window_time_end,
-		LttTime time,
-		Drawing_t *Drawing,
-		guint *x);
+    LttTime window_time_begin,
+    LttTime window_time_end,
+    LttTime time,
+    gint width,
+    guint *x);
 
 #endif // _DRAWING_H