X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawitem.h;h=28fdc1832f1b7fdc2a804e86c08aa4c1a043f133;hb=fc5000a1b014e55f5f9cb0b9f185f77e931b0dd0;hp=fe46c0629e10512f089fa2aca824513362248646;hpb=c8bba5fa123e79c25c3ed0f6355f511ed84b88b2;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
index fe46c062..28fdc183 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
@@ -42,10 +42,13 @@ enum _DrawableItems {
     ITEM_TEXT, ITEM_ICON, ITEM_LINE, ITEM_POINT, ITEM_BACKGROUND
 };
 
+typedef enum _RelPosX {
+  POS_START, POS_END
+} RelPosX;
 
-typedef enum _RelPos {
+typedef enum _RelPosY {
   OVER, MIDDLE, UNDER
-} RelPos;
+} RelPosY;
 
 
 /* The DrawContext keeps information about the current drawing position and
@@ -70,16 +73,30 @@ struct _DrawContext {
   PangoLayout *pango_layout;
 
   struct {
-    gint x_start;
-    gint x_end;
+    struct {
+      gint x;
+      struct {
+        gint over;
+        gint middle;
+        gint under;
+      } offset;
+    } start;
+
+    struct {
+      gint x;
+      struct {
+        gint over;
+        gint middle;
+        gint under;
+      } offset;
+    } end;
+
+    struct {
+      gint over;
+      gint middle;
+      gint under;
+    } y;
 
-    gint y_over;
-    gint y_middle;
-    gint y_under;
-
-    gint x_modify_over;
-    gint x_modify_middle;
-    gint x_modify_under;
   } drawinfo;
 };
 
@@ -103,7 +120,7 @@ struct _DrawOperation {
   DrawableItems item;
   LttvHooks *hook;
 };
-
+#if 0
 /*
  * We define here each items that can be drawn, together with their
  * associated priority. Many item types can have the same priority,
@@ -121,6 +138,7 @@ static int Items_Priorities[] = {
   30, /* ITEM_POINT */
   10  /* ITEM_BACKGROUND */
 };
+#endif //0
 
 /*
  * Here are the different structures describing each item type that can be
@@ -132,9 +150,12 @@ static int Items_Priorities[] = {
 struct _PropertiesText {
   GdkColor  *foreground;
   GdkColor  *background;
-  gint    size;
-  gchar   *text;
-  RelPos    position;
+  gint       size;
+  gchar     *text;
+  struct {
+    RelPosX    x;
+    RelPosY    y;
+  } position;
 };
 
 
@@ -142,21 +163,27 @@ struct _PropertiesIcon {
   gchar   *icon_name;
   gint    width;
   gint    height;
-  RelPos    position;
+  struct {
+    RelPosX    x;
+    RelPosY    y;
+  } position;
 };
 
 struct _PropertiesLine {
   GdkColor  color;
   gint    line_width;
   GdkLineStyle  style;
-  RelPos    position;
+  RelPosY    y;
 };
 
 struct _PropertiesArc {
   GdkColor  *color;
   gint    size; /* We force circle by width = height */
   gboolean  filled;
-  RelPos    position;
+  struct {
+    RelPosX    x;
+    RelPosY    y;
+  } position;
 };
 
 struct _PropertiesBG {
@@ -192,6 +219,8 @@ void draw_item( GdkDrawable *drawable,
  * process_states/ "name associated with LTTV_STATE_SYSCALL"
  */
 
+
+#if 0
 /* 
  * The add_operation has to do a quick sort by priority to keep the operations
  * in the right order.
@@ -233,42 +262,7 @@ void list_operations( LttvIAttribute *attributes,
  */
 void exec_operations( LttvIAttribute *attributes,
       gchar *pathname);
-
-
-/*
- * Functions to create Properties structures.
- */
-
-PropertiesText *properties_text_create(
-  GdkColor  *foreground,
-  GdkColor  *background,
-  gint    size,
-  gchar   *text,
-  RelPos    position);
-
-PropertiesIcon *properties_icon_create(
-  gchar   *icon_name,
-  gint    width,
-  gint    height,
-  RelPos    position);
-
-PropertiesLine *properties_line_create(
-  GdkColor  *color,
-  gint    line_width,
-  GdkLineStyle  style,
-  RelPos    position);
-
-PropertiesArc *properties_arc_create(
-  GdkColor  *color,
-  gint    size,
-  gboolean  filled,
-  RelPos    position);
-
-PropertiesBG *properties_bg_create(
-  GdkColor  *color);
-
-
-
+#endif //0
 
 /*
  * Here follow the prototypes of the hook functions used to draw the