Commit Graph

614 Commits

Author SHA1 Message Date
Tom Hacohen bebbe2253a Evas textblock: Only use paragraph bidi props in the layout code.
Next commits will clear them outside of it. I.e paragraph bidi props are only
valid in the layout code.

SVN revision: 59861
2011-06-01 08:35:25 +00:00
Tom Hacohen 2b23129955 Evas textblock: Paragraphs don't need a x coordinate - remove.
SVN revision: 59860
2011-06-01 08:35:21 +00:00
Tom Hacohen 87d196e4bb Evas textblock: Split _layout to _layout and _layout_pre.
This cleans the code a bit and will soon let us do smarter native size
calculation.

SVN revision: 59845
2011-05-31 12:55:57 +00:00
Tom Hacohen 7cdf099d5c Evas textblock: Remove calc_only from layout, not needed anymore.
SVN revision: 59844
2011-05-31 12:55:54 +00:00
Tom Hacohen 71fe0782d9 Evas textblock: Move native size calculation out of the regular layout.
SVN revision: 59843
2011-05-31 12:55:51 +00:00
Tom Hacohen b1d889a1df Evas textblock: There can be only one ellipsis item per textblock.
SVN revision: 59816
2011-05-30 13:19:13 +00:00
Tom Hacohen 5a785e86bf Evas textblock: Use Evas_Coord instead of int for coords.
SVN revision: 59815
2011-05-30 13:19:10 +00:00
Tom Hacohen 6d66a59333 Evas textblock: Removed some fat. Format should be a stringshare.
SVN revision: 59814
2011-05-30 13:19:07 +00:00
Tom Hacohen 943145d125 Evas textblock: Don't try to move text if the length to be moved is 0.
SVN revision: 59813
2011-05-30 13:19:03 +00:00
Tom Hacohen 56b6e2ed28 Evas textblock: Remove a bit of useless fat.
SVN revision: 59812
2011-05-30 13:19:00 +00:00
Tom Hacohen a403ca75c2 Evas text/textblock: init cur_fi to NULL.
SVN revision: 59808
2011-05-30 10:55:31 +00:00
Tom Hacohen 884eaf1c63 Evas textblock: Fix casting of font when calling pipe op.
SVN revision: 59807
2011-05-30 09:03:46 +00:00
Tom Hacohen a3719b21f9 Evas text/textblock: Check we actually found a font instance.
Currently we only check we have a font_set which is not enough.
Having a fontset and not having an fi should never happen, but it can.

SVN revision: 59804
2011-05-30 08:42:26 +00:00
Tom Hacohen 7e01aebd17 Evas textblock: clean up text_append, and possibly solve infinite loop.
I removed the workaround that solved it, for this cleaner, solution that
should work.

SVN revision: 59802
2011-05-30 08:16:35 +00:00
Tom Hacohen 0967176b12 Evas textblock: Removed ununeeded allocation.
SVN revision: 59801
2011-05-30 08:16:32 +00:00
Tom Hacohen 6b894e69fa Evas textblock: Fix an issue with empty textblocks.
SVN revision: 59800
2011-05-30 07:52:44 +00:00
Tom Hacohen 599d9992b6 Evas textblock: Possible workaround for the infinite loop morlenxus is having.
SVN revision: 59791
2011-05-29 21:11:58 +00:00
Tom Hacohen 60aa86a0ef Evas font-engine: Added two font opaque types.
Added Evas_Font_Instance and Evas_Font_Set which correspond to
RGBA_Font_Int and RGBA_Font. This is very important for strict type
checking which we now finally have.

This commit does not include logic changes, only casting and changing
types of pointers to the opaque pointer types.

SVN revision: 59782
2011-05-29 13:00:54 +00:00
Tom Hacohen b7e2277ef0 Evas textblock/font-engine: Fix compiler warnings with -Wshadow.
SVN revision: 59781
2011-05-29 12:03:20 +00:00
Tom Hacohen dbe7a9800e Evas textblock: Added support for numeric escape sequences.
Patch by Raoul Hecky.

SVN revision: 59780
2011-05-29 11:47:53 +00:00
Tom Hacohen 81b217f8c4 Evas font-engine: Fixed font fallback in the same script run.
SVN revision: 59777
2011-05-29 09:20:18 +00:00
Tom Hacohen 359e67f68a Evas textblock: Added an rbtree index for the layout paragraphs.
This can be used with both coordinates and line numbers, this is a
faster way to find layout paragraphs in the textblock which means
we should now be a lot faster with big textblocks.

SVN revision: 59527
2011-05-19 09:54:30 +00:00
Tom Hacohen 3227929fcf Evas textblock: Use the saved paragraph pointer instead of searching.
SVN revision: 59526
2011-05-19 09:54:19 +00:00
Tom Hacohen dd503b47fd Evas textblock: Fix a potential bug in wrapping.
SVN revision: 59464
2011-05-17 07:08:33 +00:00
Tom Hacohen e4dada93e6 Evas textblock: Set cursor position if not already set when inserting text.
This was always the meaning of cur->node=NULL, but here it explicitly
does it, which makes things easier in the long run.

SVN revision: 59406
2011-05-15 15:36:04 +00:00
Tom Hacohen 1e542a0d47 Evas textblock: Fixed a possible bug with wordwrap.
SVN revision: 59405
2011-05-15 13:57:47 +00:00
Tom Hacohen 353ce0f48a Evas textblock: Speed up rendering. Find the start paragraph for all.
Until now all the format/text drawing loops went through all the
paragraphs skipping all the ones that are outside the clipping/object
zone. This changeset find the first paragraph to be renedred first so we
don't walk all the paragraphs for nothing. This speeds up rendering of
the ends of very big textblocks in a very noticable manner.

SVN revision: 59404
2011-05-15 12:00:01 +00:00
Tom Hacohen 8315f9879c Evas textblock: Fix segfault with evas_textblock_cursor_content_get.
Patch by Brian Wang.

SVN revision: 59347
2011-05-12 15:12:10 +00:00
Tom Hacohen 13d032d0b1 Evas textblock: Added _format_list_get for fast retrieval of anchors.
This is very useful in edje_entry that keeps a list of anchors.
Currently only "a" and "item" are supported, and unless something
drastic will happen, it will stay this way.

SVN revision: 59325
2011-05-11 10:18:24 +00:00
Tom Hacohen faba2810b4 Evas textblock: Don't allow overwriting the format stack.
SVN revision: 59320
2011-05-11 08:35:09 +00:00
Tom Hacohen fd25efda3a Evas textblock: Only parse formats that can change the format stack.
No need to parse all the newlines when all we want is just to modify the
format stack.

SVN revision: 59319
2011-05-11 08:34:57 +00:00
Tom Hacohen 730bfce44e Evas textblock: Do a bit of uchar -> Eina_Bool and setting as bitfield.
SVN revision: 59281
2011-05-08 15:33:23 +00:00
Tom Hacohen 1a0fba718f Evas textblock: Remove unused alloca.
SVN revision: 59280
2011-05-08 15:33:20 +00:00
Tom Hacohen edafdf5323 Evas textblock: Clean up clipping and render a bit.
SVN revision: 59279
2011-05-08 14:54:27 +00:00
Tom Hacohen 9f29ea18d3 Evas textblock: Break on mandatory and allowed break options.
SVN revision: 59274
2011-05-08 11:20:19 +00:00
Tom Hacohen 8214888f83 Evas textblock: Moved format text_node invalidation to it's own function.
SVN revision: 59273
2011-05-08 11:20:16 +00:00
Tom Hacohen 47a59417d2 Evas textblock: Move ellipsis handling to a different function.
SVN revision: 59272
2011-05-08 11:20:13 +00:00
Tom Hacohen 6d14277c6d Evas textblock: clean up mixed/word wrap a bit.
SVN revision: 59271
2011-05-08 09:13:59 +00:00
Tom Hacohen 4851a57f92 Evas textblock: Fix possible issues with charwrap not wrapping correctly.
SVN revision: 59270
2011-05-08 09:13:56 +00:00
Tom Hacohen 2d0304019d Evas textblock: Fix seg with empty textblocks that cause wrapping.
Revert "evas: don't assume anymore that text_node is != NULL."
This reverts commit 59231

Thanks to cedric for the report + initial fix.

SVN revision: 59237
2011-05-06 10:00:21 +00:00
Cedric BAIL 139e49792d evas: don't assume anymore that text_node is != NULL.
SVN revision: 59231
2011-05-06 09:00:44 +00:00
Tom Hacohen 53a6bbeb8b Evas textblock: Fix linewrap to only wrap if there's a wrap point.
For example before the fix, "aaa<b>cccc</>aaa" would have 2 possible
wrap points, <b> and </>, after the fix, those are no longer valid.
Also fixed another issue with wrapping not working.

SVN revision: 59219
2011-05-05 16:35:39 +00:00
Tom Hacohen 4c9b729cd3 Evas textblock: Updated a FIXME.
SVN revision: 59218
2011-05-05 16:35:36 +00:00
Tom Hacohen 31c8b4d7f7 Evas textblock: Until we actually use it in charwrap, don't malloc line_breaks.
SVN revision: 59217
2011-05-05 16:35:32 +00:00
Tom Hacohen 9677320259 Evas textblock: Wrapping is now absolute to the paragraph.
This is not yet noticable, still need to use the new info.

SVN revision: 59215
2011-05-05 13:38:09 +00:00
Tom Hacohen c6751884b0 Evas textblock: Use more relevant replacement chars for formats.
For example we use 0x2029 (PS char) for paragraph separator, \n for newline
and \t for tab. This lets us handle their bidi and line break properties
in a more correct manner.

SVN revision: 59214
2011-05-05 13:38:04 +00:00
Tom Hacohen 921067869c Evas textblock: Clean up word/mixed wrap and add liblinebreak support.
SVN revision: 59208
2011-05-05 11:06:06 +00:00
Tom Hacohen e93f10b8aa Evas font-engine: Remove passing of strings to font_draw.
This is not needed anymore because we have working string objects.

SVN revision: 59133
2011-05-02 15:33:46 +00:00
Tom Hacohen 4fafc63d0f Evas textblock: Remove obsolete comment.
SVN revision: 59130
2011-05-02 15:33:31 +00:00
Tom Hacohen 0bf964a221 Evas textblock: We finally cache fi - remove related hacks.
SVN revision: 59129
2011-05-02 15:33:27 +00:00