projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove cfv debug
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
modules
/
gui
/
controlflow
/
drawitem.c
diff --git
a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
index c71aeebeacce9924b9768b2b40d8e9a30c52da07..60cf7706dfb05c2d2c06546c293f16f9a406688c 100644
(file)
--- 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 <lttv/tracecontext.h>
#include <lttv/state.h>
#include <lttv/tracecontext.h>
#include <lttv/state.h>
+#include <lttv/lttv.h>
#include "drawitem.h"
#include "drawitem.h"
@@
-111,16
+112,14
@@
#define MAX_PATH_LEN 256
/* drawing hook functions */
#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;
{
PropertiesText *properties = (PropertiesText*)hook_data;
DrawContext *draw_context = (DrawContext*)call_data;
PangoContext *context;
PangoLayout *layout;
- PangoAttribute *attribute;
PangoFontDescription *font_desc;// = pango_font_description_new();
PangoFontDescription *font_desc;// = pango_font_description_new();
- gint font_size;
PangoRectangle ink_rect;
layout = draw_context->pango_layout;
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 */
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;
}
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 */
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;
}
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,
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.
*/
/* 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;
{
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));
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);
{
*(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 */
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;
}
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 */
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;
}
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(
gdk_gc_set_clip_mask(draw_context->gc, icon_info->mask);
gdk_gc_set_clip_origin(
@@
-311,7
+310,7
@@
__inline__ gboolean draw_icon( void *hook_data, void *call_data)
return 0;
}
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;
{
PropertiesLine *properties = (PropertiesLine*)hook_data;
DrawContext *draw_context = (DrawContext*)call_data;
@@
-357,7
+356,7
@@
__inline__ gboolean draw_line( void *hook_data, void *call_data)
return 0;
}
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;
{
PropertiesArc *properties = (PropertiesArc*)hook_data;
DrawContext *draw_context = (DrawContext*)call_data;
@@
-391,7
+390,7
@@
__inline__ gboolean draw_arc( void *hook_data, void *call_data)
break;
}
/* verify if there is enough space to draw */
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;
}
enough_space = TRUE;
*offset += width;
}
@@
-416,14
+415,14
@@
__inline__ gboolean draw_arc( void *hook_data, void *call_data)
break;
}
/* verify if there is enough space to draw */
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;
}
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,
gdk_draw_arc(draw_context->drawable, draw_context->gc,
properties->filled,
x,
@@
-433,7
+432,7
@@
__inline__ gboolean draw_arc( void *hook_data, void *call_data)
return 0;
}
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;
{
PropertiesBG *properties = (PropertiesBG*)hook_data;
DrawContext *draw_context = (DrawContext*)call_data;
This page took
0.025072 seconds
and
4
git commands to generate.