{
EINA_INLIST;
Evas_Object_Textblock_Line *lines;
- int x, y, w, h;
- int par_no;
+// int x, y, w, h;
+ int line_no;
};
struct _Evas_Object_Textblock_Line
{
EINA_INLIST;
Evas_Object_Textblock_Item *items;
+ Evas_Object_Textblock_Paragraph *par;
int x, y, w, h;
int baseline;
int line_no;
c->x = 0;
c->maxascent = c->maxdescent = 0;
c->ln->line_no = -1;
+ c->ln->par = c->par;
_layout_format_ascent_descent_adjust(c, fmt);
}
c->par = calloc(1, sizeof(Evas_Object_Textblock_Paragraph));
c->paragraphs = (Evas_Object_Textblock_Paragraph *)eina_inlist_append(EINA_INLIST_GET(c->paragraphs), EINA_INLIST_GET(c->par));
c->x = 0;
- c->par->par_no= -1;
+ c->ln = NULL;
+ c->par->line_no = -1;
}
/**
{
if (c->maxdescent < 2) c->underline_extend = 2 - c->maxdescent;
}
- c->ln->line_no = c->line_no;
+ /* Update the paragraphs line number. */
+ if (c->par->line_no == -1)
+ {
+ c->par->line_no = c->line_no;
+ }
+ c->ln->line_no = c->ln->par->line_no - c->line_no;
c->line_no++;
c->y += c->maxascent + c->maxdescent;
if (c->w >= 0)
size_t start;
int off;
- /*FIXME-tom: A hack, so we'll only have one paragraph
- * until full support is implemented */
- if (!c->par)
- {
- _layout_paragraph_new(c); /* Each node is a paragraph */
- }
- if (!c->ln) _layout_line_new(c, fmt);
+ _layout_paragraph_new(c); /* Each node is a paragraph */
+ _layout_line_new(c, fmt);
/* For each text node to thorugh all of it's format nodes
* append text from the start to the offset of the next format
static void
_find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node_Text *n, int pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
{
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock *o;
o = (Evas_Object_Textblock *)(obj->object_data);
if (!o->formatted.valid) _relayout(obj);
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln)
+ EINA_INLIST_FOREACH(o->paragraphs, par)
{
- Evas_Object_Textblock_Item *it;
-
- EINA_INLIST_FOREACH(ln->items, it)
+ EINA_INLIST_FOREACH(par->lines, ln)
{
- if (it->text_node == n)
- {
- /* FIXME: p should be size_t, same goes for pos */
- int p = (int) it->text_pos;
+ Evas_Object_Textblock_Item *it;
+ Evas_Object_Textblock_Line *lnn;
- if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ lnn = (Evas_Object_Textblock_Line *)(((Eina_Inlist *)ln)->next);
+ EINA_INLIST_FOREACH(ln->items, it)
+ {
+ if (it->text_node == n)
{
- Evas_Object_Textblock_Text_Item *ti =
- _ITEM_TEXT(it);
+ /* FIXME: p should be size_t, same goes for pos */
+ int p = (int) it->text_pos;
- p += (int) eina_unicode_strlen(ti->text);
- }
- else
- {
- p++;
- }
+ if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ {
+ Evas_Object_Textblock_Text_Item *ti =
+ _ITEM_TEXT(it);
- if (((pos >= (int) it->text_pos) && (pos < p)))
- {
- *lnr = ln;
- *itr = it;
- return;
- }
- else if (p == pos)
- {
- *lnr = ln;
- *itr = it;
+ p += (int) eina_unicode_strlen(ti->text);
+ }
+ else
+ {
+ p++;
+ }
+
+ if (((pos >= (int) it->text_pos) && (pos < p)))
+ {
+ *lnr = ln;
+ *itr = it;
+ return;
+ }
+ else if (p == pos)
+ {
+ *lnr = ln;
+ *itr = it;
+ }
}
}
}
static Evas_Object_Textblock_Line *
_find_layout_line_num(const Evas_Object *obj, int line)
{
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock *o;
o = (Evas_Object_Textblock *)(obj->object_data);
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln)
+ EINA_INLIST_FOREACH(o->paragraphs, par)
{
- if (ln->line_no == line) return ln;
+ EINA_INLIST_FOREACH(par->lines, ln)
+ {
+ if (ln->par->line_no + ln->line_no == line) return ln;
+ }
}
return NULL;
}
if (cy) *cy = ln->y;
if (cw) *cw = ln->w;
if (ch) *ch = ln->h;
- return ln->line_no;
+ return ln->par->line_no + ln->line_no;
}
else
return -1;
if (cy) *cy = y;
if (cw) *cw = w;
if (ch) *ch = h;
- return ln->line_no;
+ return ln->par->line_no + ln->line_no;
}
/**
if (cy) *cy = y;
if (cw) *cw = w;
if (ch) *ch = h;
- return ln->line_no;
+ return ln->par->line_no + ln->line_no;
}
/**
evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Textblock *o;
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock_Item *it = NULL, *it_break = NULL;
if (!o->formatted.valid) _relayout(cur->obj);
x += o->style_pad.l;
y += o->style_pad.t;
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln)
+ EINA_INLIST_FOREACH(o->paragraphs, par)
{
- if (ln->y > y) break;
- if ((ln->y <= y) && ((ln->y + ln->h) > y))
- {
- EINA_INLIST_FOREACH(ln->items, it)
- {
- if ((it->x + ln->x) > x)
- {
- it_break = it;
- break;
- }
- if (((it->x + ln->x) <= x) && (((it->x + ln->x) + it->adv) > x))
- {
- if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ EINA_INLIST_FOREACH(par->lines, ln)
+ {
+ if (ln->y > y) break;
+ if ((ln->y <= y) && ((ln->y + ln->h) > y))
+ {
+ EINA_INLIST_FOREACH(ln->items, it)
+ {
+ if ((it->x + ln->x) > x)
{
- int pos;
- int cx, cy, cw, ch;
- Evas_Object_Textblock_Text_Item *ti;
- ti = _ITEM_TEXT(it);
-
- pos = -1;
- if (ti->format->font.font)
- pos = cur->ENFN->font_char_at_coords_get(
- cur->ENDT,
- ti->format->font.font,
- ti->text, &ti->parent.text_props,
- x - it->x - ln->x, 0,
- &cx, &cy, &cw, &ch);
- if (pos < 0)
- return EINA_FALSE;
- cur->pos = pos + it->text_pos;
- cur->node = it->text_node;
- return EINA_TRUE;
+ it_break = it;
+ break;
}
- else
+ if (((it->x + ln->x) <= x) && (((it->x + ln->x) + it->adv) > x))
{
- Evas_Object_Textblock_Format_Item *fi;
- fi = _ITEM_FORMAT(it);
- cur->pos = fi->parent.text_pos;
- cur->node = fi->source_node->text_node;
- return EINA_TRUE;
+ if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ {
+ int pos;
+ int cx, cy, cw, ch;
+ Evas_Object_Textblock_Text_Item *ti;
+ ti = _ITEM_TEXT(it);
+
+ pos = -1;
+ if (ti->format->font.font)
+ pos = cur->ENFN->font_char_at_coords_get(
+ cur->ENDT,
+ ti->format->font.font,
+ ti->text, &ti->parent.text_props,
+ x - it->x - ln->x, 0,
+ &cx, &cy, &cw, &ch);
+ if (pos < 0)
+ return EINA_FALSE;
+ cur->pos = pos + it->text_pos;
+ cur->node = it->text_node;
+ return EINA_TRUE;
+ }
+ else
+ {
+ Evas_Object_Textblock_Format_Item *fi;
+ fi = _ITEM_FORMAT(it);
+ cur->pos = fi->parent.text_pos;
+ cur->node = fi->source_node->text_node;
+ return EINA_TRUE;
+ }
}
- }
- }
- if (it_break)
- {
- it = it_break;
- cur->node = it->text_node;
- cur->pos = it->text_pos;
-
- /*FIXME: needs smarter handling, ATM just check, if it's
- * the first item, then go to the end of the line, helps
- * with rtl langs, doesn't affect ltr langs that much. */
- if (!EINA_INLIST_GET(it)->prev)
- {
- evas_textblock_cursor_line_char_last(cur);
}
+ if (it_break)
+ {
+ it = it_break;
+ cur->node = it->text_node;
+ cur->pos = it->text_pos;
+
+ /*FIXME: needs smarter handling, ATM just check, if it's
+ * the first item, then go to the end of the line, helps
+ * with rtl langs, doesn't affect ltr langs that much. */
+ if (!EINA_INLIST_GET(it)->prev)
+ {
+ evas_textblock_cursor_line_char_last(cur);
+ }
- return EINA_TRUE;
- }
- }
+ return EINA_TRUE;
+ }
+ }
+ }
}
return EINA_FALSE;
}
evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
{
Evas_Object_Textblock *o;
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
if (!cur) return -1;
o = (Evas_Object_Textblock *)(cur->obj->object_data);
if (!o->formatted.valid) _relayout(cur->obj);
y += o->style_pad.t;
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln)
+ EINA_INLIST_FOREACH(o->paragraphs, par)
{
- if (ln->y > y) break;
- if ((ln->y <= y) && ((ln->y + ln->h) > y))
- {
- evas_textblock_cursor_line_set(cur, ln->line_no);
- return ln->line_no;
- }
+ EINA_INLIST_FOREACH(par->lines, ln)
+ {
+ if (ln->y > y) break;
+ if ((ln->y <= y) && ((ln->y + ln->h) > y))
+ {
+ evas_textblock_cursor_line_set(cur, ln->par->line_no +
+ ln->line_no);
+ return ln->par->line_no + ln->line_no;
+ }
+ }
}
return -1;
}
static void
evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
{
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock *o;
int i, j;
if (!o->paragraphs) return;
#define ITEM_WALK() \
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln) \
+ EINA_INLIST_FOREACH(o->paragraphs, par) \
{ \
- Evas_Object_Textblock_Item *itr; \
- \
- backingx = underlinex = underline2x = strikethroughx = 0; \
- pbacking = punderline = punderline2 = pstrikethrough = 0; \
- if (clip) \
+ EINA_INLIST_FOREACH(par->lines, ln) \
{ \
- if ((obj->cur.geometry.y + y + ln->y + ln->h) < (cy - 20)) \
- continue; \
- if ((obj->cur.geometry.y + y + ln->y) > (cy + ch + 20)) \
- break; \
- } \
- EINA_INLIST_FOREACH(ln->items, itr) \
- { \
- int yoff; \
- Evas_Object_Textblock_Text_Item *ti; \
- ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; \
+ Evas_Object_Textblock_Item *itr; \
\
- if (ti) \
+ backingx = underlinex = underline2x = strikethroughx = 0; \
+ pbacking = punderline = punderline2 = pstrikethrough = 0; \
+ if (clip) \
{ \
- yoff = ln->baseline; \
- if (ti->format->valign != -1.0) \
- yoff = (ti->format->valign * (double)(ln->h - ti->parent.h)) + ti->baseline; \
- if (clip) \
+ if ((obj->cur.geometry.y + y + ln->y + ln->h) < (cy - 20)) \
+ continue; \
+ if ((obj->cur.geometry.y + y + ln->y) > (cy + ch + 20)) \
+ break; \
+ } \
+ EINA_INLIST_FOREACH(ln->items, itr) \
+ { \
+ int yoff; \
+ Evas_Object_Textblock_Text_Item *ti; \
+ ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL; \
+ \
+ if (ti) \
{ \
- if ((obj->cur.geometry.x + x + ln->x + ti->parent.x + ti->parent.w) < (cx - 20)) \
- continue; \
- if ((obj->cur.geometry.x + x + ln->x + ti->parent.x) > (cx + cw + 20)) \
- break; \
+ yoff = ln->baseline; \
+ if (ti->format->valign != -1.0) \
+ yoff = (ti->format->valign * (double)(ln->h - ti->parent.h)) + ti->baseline; \
+ if (clip) \
+ { \
+ if ((obj->cur.geometry.x + x + ln->x + ti->parent.x + ti->parent.w) < (cx - 20)) \
+ continue; \
+ if ((obj->cur.geometry.x + x + ln->x + ti->parent.x) > (cx + cw + 20)) \
+ break; \
+ } \
} \
- } \
- do
+ do
#define ITEM_WALK_END() \
- while (0); \
+ while (0); \
+ } \
} \
} \
do {} while(0)
_evas_object_textblock_rehint(Evas_Object *obj)
{
Evas_Object_Textblock *o;
+ Evas_Object_Textblock_Paragraph *par;
Evas_Object_Textblock_Line *ln;
o = (Evas_Object_Textblock *)(obj->object_data);
- EINA_INLIST_FOREACH(o->paragraphs->lines, ln)
+ EINA_INLIST_FOREACH(o->paragraphs, par)
{
- Evas_Object_Textblock_Item *it;
+ EINA_INLIST_FOREACH(par->lines, ln)
+ {
+ Evas_Object_Textblock_Item *it;
- EINA_INLIST_FOREACH(ln->items, it)
- {
- if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ EINA_INLIST_FOREACH(ln->items, it)
{
- Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
- if (ti->format->font.font)
- {
+ if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
+ {
+ Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
+ if (ti->format->font.font)
+ {
#ifdef EVAS_FRAME_QUEUING
- evas_common_pipe_op_text_flush(ti->format->font.font);
+ evas_common_pipe_op_text_flush(ti->format->font.font);
#endif
- evas_font_load_hinting_set(obj->layer->evas,
- ti->format->font.font,
- obj->layer->evas->hinting);
+ evas_font_load_hinting_set(obj->layer->evas,
+ ti->format->font.font,
+ obj->layer->evas->hinting);
+ }
}
}
- }
+ }
}
o->formatted.valid = 0;
o->native.valid = 0;
projects / profile / ivi / evas.git / commitdiff