X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawitem.c;h=7e1980e24589f791a2a2c78a3c65d50849cb914f;hb=b3fd4c02566c71add135fbc715fddafc9b03b141;hp=a73df51a38b16fbf9688ec00efeb7889cf4af0f9;hpb=e800cf849a08893a7325441a9614f018a00b129a;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
index a73df51a..7e1980e2 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
@@ -94,6 +94,10 @@
  * Author : Mathieu Desnoyers, October 2003
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -104,6 +108,7 @@
 
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
+#include <lttv/lttv.h>
 
 #include "drawitem.h"
 
@@ -118,9 +123,7 @@ gboolean draw_text( void *hook_data, void *call_data)
 
   PangoContext *context;
   PangoLayout *layout;
-  PangoAttribute *attribute;
   PangoFontDescription *font_desc;// = pango_font_description_new();
-  gint font_size;
   PangoRectangle ink_rect;
     
   layout = draw_context->pango_layout;
@@ -160,7 +163,7 @@ gboolean draw_text( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -185,14 +188,14 @@ gboolean draw_text( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space)
+  if(unlikely(enough_space))
     gdk_draw_layout_with_colors(draw_context->drawable,
               draw_context->gc,
               x,
@@ -220,7 +223,7 @@ gboolean draw_icon( void *hook_data, void *call_data)
   
   g_assert(lttv_iattribute_find_by_path(attributes, icon_name,
       LTTV_POINTER, &value));
-  if(*(value.v_pointer) == NULL)
+  if(unlikely(*(value.v_pointer) == NULL))
   {
     *(value.v_pointer) = icon_info = g_new(IconStruct,1);
     
@@ -258,7 +261,7 @@ gboolean draw_icon( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -283,14 +286,14 @@ gboolean draw_icon( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space) {
+  if(unlikely(enough_space)) {
     gdk_gc_set_clip_mask(draw_context->gc, icon_info->mask);
 
     gdk_gc_set_clip_origin(
@@ -316,9 +319,8 @@ gboolean draw_line( void *hook_data, void *call_data)
   PropertiesLine *properties = (PropertiesLine*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
   
-  //gdk_gc_set_foreground(draw_context->gc, properties->color);
-  gdk_gc_set_rgb_fg_color(draw_context->gc, &properties->color);
-  //gdk_gc_set_foreground(gc, properties->color);
+  gdk_gc_set_foreground(draw_context->gc, &properties->color);
+  //gdk_gc_set_rgb_fg_color(draw_context->gc, &properties->color);
   gdk_gc_set_line_attributes( draw_context->gc,
                               properties->line_width,
                               properties->style,
@@ -363,8 +365,8 @@ gboolean draw_arc( void *hook_data, void *call_data)
   PropertiesArc *properties = (PropertiesArc*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
 
-  //gdk_gc_set_foreground(draw_context->gc, properties->color);
-  gdk_gc_set_rgb_fg_color(draw_context->gc, properties->color);
+  gdk_gc_set_foreground(draw_context->gc, properties->color);
+  //gdk_gc_set_rgb_fg_color(draw_context->gc, properties->color);
 
   gint x=0, y=0;
   gint *offset=NULL;
@@ -392,7 +394,7 @@ gboolean draw_arc( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -417,14 +419,14 @@ gboolean draw_arc( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space)
+  if(unlikely(enough_space))
     gdk_draw_arc(draw_context->drawable, draw_context->gc,
           properties->filled,
           x,
@@ -439,8 +441,8 @@ gboolean draw_bg( void *hook_data, void *call_data)
   PropertiesBG *properties = (PropertiesBG*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
 
-  //gdk_gc_set_foreground(draw_context->gc, properties->color);
-  gdk_gc_set_rgb_fg_color(draw_context->gc, properties->color);
+  gdk_gc_set_foreground(draw_context->gc, properties->color);
+  //gdk_gc_set_rgb_fg_color(draw_context->gc, properties->color);
 
   //g_critical("DRAWING RECT : x: %i, y: %i, w:%i, h:%i, val1 :%i, val2:%i ", 
   //    draw_context->previous->over->x,