X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawitem.c;h=60cf7706dfb05c2d2c06546c293f16f9a406688c;hb=94fe07f4f00135c1d5fab2e304b620c8be570121;hp=7284a2e8185889605b2d137c16dca31dd8cc2298;hpb=90ef7e4a2c6a41ec36bd2530b187cc1ef2cf0025;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 7284a2e8..60cf7706 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c @@ -104,6 +104,7 @@ #include #include +#include #include "drawitem.h" @@ -111,16 +112,14 @@ #define MAX_PATH_LEN 256 /* drawing hook functions */ -__inline gboolean draw_text( void *hook_data, void *call_data) +gboolean draw_text( void *hook_data, void *call_data) { PropertiesText *properties = (PropertiesText*)hook_data; DrawContext *draw_context = (DrawContext*)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 +159,7 @@ __inline 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 +184,14 @@ __inline 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, @@ -206,7 +205,7 @@ __inline gboolean draw_text( void *hook_data, void *call_data) /* To speed up the process, search in already loaded icons list first. Only * load it if not present. */ -__inline gboolean draw_icon( void *hook_data, void *call_data) +gboolean draw_icon( void *hook_data, void *call_data) { PropertiesIcon *properties = (PropertiesIcon*)hook_data; DrawContext *draw_context = (DrawContext*)call_data; @@ -220,7 +219,7 @@ __inline 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 +257,7 @@ __inline 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 +282,14 @@ __inline 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( @@ -311,14 +310,13 @@ __inline gboolean draw_icon( void *hook_data, void *call_data) return 0; } -__inline gboolean draw_line( void *hook_data, void *call_data) +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, @@ -358,13 +356,13 @@ __inline gboolean draw_line( void *hook_data, void *call_data) return 0; } -__inline gboolean draw_arc( void *hook_data, void *call_data) +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 +390,7 @@ __inline 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 +415,14 @@ __inline 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, @@ -434,13 +432,13 @@ __inline gboolean draw_arc( void *hook_data, void *call_data) return 0; } -__inline gboolean draw_bg( void *hook_data, void *call_data) +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,