7cdf099d5c
Evas textblock: Remove calc_only from layout, not needed anymore.
...
SVN revision: 59844
2011-05-31 12:55:54 +00:00
71fe0782d9
Evas textblock: Move native size calculation out of the regular layout.
...
SVN revision: 59843
2011-05-31 12:55:51 +00:00
b1d889a1df
Evas textblock: There can be only one ellipsis item per textblock.
...
SVN revision: 59816
2011-05-30 13:19:13 +00:00
5a785e86bf
Evas textblock: Use Evas_Coord instead of int for coords.
...
SVN revision: 59815
2011-05-30 13:19:10 +00:00
6d66a59333
Evas textblock: Removed some fat. Format should be a stringshare.
...
SVN revision: 59814
2011-05-30 13:19:07 +00:00
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
56b6e2ed28
Evas textblock: Remove a bit of useless fat.
...
SVN revision: 59812
2011-05-30 13:19:00 +00:00
a403ca75c2
Evas text/textblock: init cur_fi to NULL.
...
SVN revision: 59808
2011-05-30 10:55:31 +00:00
884eaf1c63
Evas textblock: Fix casting of font when calling pipe op.
...
SVN revision: 59807
2011-05-30 09:03:46 +00:00
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
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
0967176b12
Evas textblock: Removed ununeeded allocation.
...
SVN revision: 59801
2011-05-30 08:16:32 +00:00
6b894e69fa
Evas textblock: Fix an issue with empty textblocks.
...
SVN revision: 59800
2011-05-30 07:52:44 +00:00
599d9992b6
Evas textblock: Possible workaround for the infinite loop morlenxus is having.
...
SVN revision: 59791
2011-05-29 21:11:58 +00:00
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
b7e2277ef0
Evas textblock/font-engine: Fix compiler warnings with -Wshadow.
...
SVN revision: 59781
2011-05-29 12:03:20 +00:00
dbe7a9800e
Evas textblock: Added support for numeric escape sequences.
...
Patch by Raoul Hecky.
SVN revision: 59780
2011-05-29 11:47:53 +00:00
81b217f8c4
Evas font-engine: Fixed font fallback in the same script run.
...
SVN revision: 59777
2011-05-29 09:20:18 +00:00
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
3227929fcf
Evas textblock: Use the saved paragraph pointer instead of searching.
...
SVN revision: 59526
2011-05-19 09:54:19 +00:00
dd503b47fd
Evas textblock: Fix a potential bug in wrapping.
...
SVN revision: 59464
2011-05-17 07:08:33 +00:00
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
1e542a0d47
Evas textblock: Fixed a possible bug with wordwrap.
...
SVN revision: 59405
2011-05-15 13:57:47 +00:00
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
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
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
faba2810b4
Evas textblock: Don't allow overwriting the format stack.
...
SVN revision: 59320
2011-05-11 08:35:09 +00:00
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
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
1a0fba718f
Evas textblock: Remove unused alloca.
...
SVN revision: 59280
2011-05-08 15:33:20 +00:00
edafdf5323
Evas textblock: Clean up clipping and render a bit.
...
SVN revision: 59279
2011-05-08 14:54:27 +00:00
9f29ea18d3
Evas textblock: Break on mandatory and allowed break options.
...
SVN revision: 59274
2011-05-08 11:20:19 +00:00
8214888f83
Evas textblock: Moved format text_node invalidation to it's own function.
...
SVN revision: 59273
2011-05-08 11:20:16 +00:00
47a59417d2
Evas textblock: Move ellipsis handling to a different function.
...
SVN revision: 59272
2011-05-08 11:20:13 +00:00
6d14277c6d
Evas textblock: clean up mixed/word wrap a bit.
...
SVN revision: 59271
2011-05-08 09:13:59 +00:00
4851a57f92
Evas textblock: Fix possible issues with charwrap not wrapping correctly.
...
SVN revision: 59270
2011-05-08 09:13:56 +00:00
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
139e49792d
evas: don't assume anymore that text_node is != NULL.
...
SVN revision: 59231
2011-05-06 09:00:44 +00:00
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
4c9b729cd3
Evas textblock: Updated a FIXME.
...
SVN revision: 59218
2011-05-05 16:35:36 +00:00
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
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
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
921067869c
Evas textblock: Clean up word/mixed wrap and add liblinebreak support.
...
SVN revision: 59208
2011-05-05 11:06:06 +00:00
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
4fafc63d0f
Evas textblock: Remove obsolete comment.
...
SVN revision: 59130
2011-05-02 15:33:31 +00:00
0bf964a221
Evas textblock: We finally cache fi - remove related hacks.
...
SVN revision: 59129
2011-05-02 15:33:27 +00:00
1ce96a62e0
Evas textblock: Unified the wmax calculation into one place.
...
SVN revision: 59097
2011-05-02 07:27:48 +00:00
8991e90293
Evas textblock: Fixed a bug with drawing formats when clipped.
...
SVN revision: 59001
2011-04-28 12:12:57 +00:00
ff0bcef2db
Evas textblock: Added "password" tag - toggle password mode.
...
This lets you toggle the password mode inside the text. Especially
useful for implementing "show last char" in password entries.
Patch by Shilpaonkar Singh
SVN revision: 59000
2011-04-28 11:08:20 +00:00
368a77aea0
Evas textblock: Fixed *_format_remove_pair to invalidate the text nodes.
...
SVN revision: 58991
2011-04-28 08:18:44 +00:00
3e5cb0ac98
Evas textblock: Use strncmp instead of strncpy and strcmp.
...
SVN revision: 58963
2011-04-27 14:59:22 +00:00
722707547a
Evas textblock: Implement format invalidation points support.
...
This lets us only relayout what's needed also when inserting formats.
This means inserting <b> </> for example is now as fast as inserting any
other char and doesn't cause a complete relayout.
SVN revision: 58958
2011-04-27 12:41:26 +00:00
902d94afb9
Evas textblock: Added a temp fix for repch until implemented nicely.
...
This fix is just until we finally split to scripts and cache fi all
the time, i.e in all the possible paths (regular, fribidi and harfbuzz).
SVN revision: 58806
2011-04-21 15:34:44 +00:00
3f86ed9349
Evas textblock: Clean repch code a bit. No logic changes.
...
SVN revision: 58801
2011-04-21 14:04:46 +00:00
cb19804054
Evas bidi: Fixed spelling errors: NATURAL -> NEUTRAL (Macro name).
...
SVN revision: 58760
2011-04-20 14:35:37 +00:00
b59156c788
Evas text/textblock: Change item size calculation to use advance again.
...
We don't need to do any tricks anymore because size calculation is now
very fast, as fast as the tricks we did, so it's best to just do what
we really want to do.
SVN revision: 58757
2011-04-20 14:20:54 +00:00
e6be4f7deb
Evas textblock: Fixed an invalid read.
...
In some cases an invalid read would occur. This was because we didn't
handle node merging appropriately.
SVN revision: 58701
2011-04-17 08:38:29 +00:00
f5e7165a65
Evas text/textblock: Add setting bidi_delimiter API.
...
SVN revision: 58669
2011-04-14 15:34:01 +00:00
d0e889fbe7
Evas textblock: Clean up a bit.
...
SVN revision: 58663
2011-04-14 12:34:29 +00:00
2a7b919cd7
Evas textblock: Move bidi props to the layout paragraphs.
...
This will let us do cool overrides more control via higher level protocol
when we'll want to.
SVN revision: 58662
2011-04-14 12:13:20 +00:00
86fd95e80e
Evas textblock: Fixed invalid reads with ellipsis in some cases.
...
SVN revision: 58659
2011-04-14 11:37:09 +00:00
e6edd2ce7f
Evas textblock: Fixed ellipsis.
...
It's actually just a workaround until we finally fix draw to not need
the text.
SVN revision: 58658
2011-04-14 11:37:06 +00:00
46beed0916
Evas bidi: Added a way to ask for bidi segmentation indexes.
...
This lets you pass the bidi engine a list of indexes in the paragraph,
that will segment it bidi-wise. I.e the bidi algorithm will be applied to
each segment individually. This implements HL4 of the bidi algorithm.
SVN revision: 58652
2011-04-14 07:40:42 +00:00
9de9eca278
Evas textblock: Reformat if not valid in some cases we forgot.
...
SVN revision: 58651
2011-04-14 07:34:06 +00:00
90ad3ed743
Evas textblock Fixed a "may be used uninit" compiler warning.
...
SVN revision: 58646
2011-04-13 22:40:25 +00:00
b5d014dcb7
Evas textblock: Removed unneeded casting.
...
SVN revision: 58635
2011-04-13 13:29:24 +00:00
d53aa0f7d6
Evas textblock: Fix error messages about bad cutoff positions.
...
This was caused because we failed to check text item's text boundaries
and we tried splitting beyond them.
SVN revision: 58634
2011-04-13 13:28:08 +00:00
0243ddf34b
Evas textblock: Clean up getting bidi props (unify to a function).
...
SVN revision: 58632
2011-04-13 12:21:58 +00:00
f9936b341f
Evas bidi: Add len parameter to evas_bidi_paragraph_props_get
...
SVN revision: 58631
2011-04-13 12:21:54 +00:00
90982f71bc
Evas textblock: Make sure we only test with positive indexes.
...
SVN revision: 58625
2011-04-13 10:24:54 +00:00
829b48aebd
Evas textblock: Fixed a wrong test for end of string.
...
SVN revision: 58624
2011-04-13 10:22:55 +00:00
Carsten Haitzler
1d58c36340
fix slowdown - drew empty shadow when didnt need to.
...
SVN revision: 58623
2011-04-13 09:29:45 +00:00
7220fe7bf3
Evas textblock: Don't keep a copy of the string per text item.
...
We don't need to copy it around because we have string objects now. This
lets us remove a lot of unneeded allocations and unwanted strcpys.
SVN revision: 58619
2011-04-13 08:36:57 +00:00
ffbe4ed971
Evas font-engine: *text_props_script_set add parameter len.
...
SVN revision: 58616
2011-04-13 08:36:46 +00:00
892994005b
Evas textblock: Fix formatted size calculation with ellipsis.
...
SVN revision: 58580
2011-04-12 07:13:33 +00:00
eb99563451
Evas textblock: Removed obsolete comments.
...
SVN revision: 58579
2011-04-12 07:13:07 +00:00
15d09d72f8
Evas textblock: Fix a possible leak with calc_only layouting.
...
Style padding changes would have triggered a code-path that skips cleaning
up the temporary layout created.
SVN revision: 58578
2011-04-12 06:52:27 +00:00
4a557812e1
Evas textblock: Fixed double-drawing bug (visible in efm).
...
Moved the place we merge back items at. It's currently cleaner, more
correct and as mentioned, fixes a double-drawing bug.
SVN revision: 58555
2011-04-11 15:37:06 +00:00
8e68291273
Evas textblock: Fixed not drawing cut paragraphs when doing ellipsis.
...
SVN revision: 58553
2011-04-11 13:44:01 +00:00
Carsten Haitzler
5bc7805b28
many more shadow options (8 shadow directions now)
...
SVN revision: 58546
2011-04-11 12:05:59 +00:00
733cfc629b
Evas textblock: *_markup_prepend should use the passed cursor.
...
This fixes a bug that caused evas_object_textblock_text_markup_prepend
to use the object's cursor, instead of the passed cursor when prepending
text.
Thanks to WooHyun for the catch.
SVN revision: 58531
2011-04-10 07:27:07 +00:00
Carsten Haitzler
09069b6172
doxy move to header.
...
SVN revision: 58477
2011-04-08 07:26:20 +00:00
5d4f6d3cbe
Evas font-engine: Remove most of the passing of strings.
...
We have string objects, we don't really need them. Draw still uses strings
for metric cache, but that will be removed soon as well.
SVN revision: 58460
2011-04-07 16:25:56 +00:00
c9290ef41d
Evas textblock: Fix handling of newline in compatiblity mode.
...
This fixes an issue with newlines that were shoved in the middle of
other format parts like <font_size=46 \n>.
SVN revision: 58457
2011-04-07 15:25:19 +00:00
87bba22028
Evas textblock: Fixed a major bug - don't recreate format items.
...
I added a mode to format parsing that doesn't create new format items.
The bug was that format items were created all the time although they were
not needed.
SVN revision: 58456
2011-04-07 14:25:48 +00:00
0ced548b40
Revert "Evas textblock: Fixed a major bug. Forgot recreating a layout paragraph."
...
Apparently it was a mistake and I did handle everything correctly.
This reverts commit 58454.
SVN revision: 58455
2011-04-07 14:01:31 +00:00
a855dd9ac0
Evas textblock: Fixed a major bug. Forgot recreating a layout paragraph.
...
We should create a layout paragraph when it's a new paragraph and when
we removed the previous one that was there because we wanted to
remake it. Forgot adding a paragraph in the second case.
SVN revision: 58454
2011-04-07 13:40:42 +00:00
af1bdf3525
Evas textblock: Fixed a bug in newline compatible mode.
...
SVN revision: 58447
2011-04-07 13:13:41 +00:00
0f964640ae
Evas textblock: Don't mark nodes as clean when in 'calc_only'.
...
SVN revision: 58446
2011-04-07 13:13:38 +00:00
776aa8b507
Evas textblock: Add saftey check.
...
SVN revision: 58431
2011-04-07 12:27:35 +00:00
eed9c92ee6
Evas textblock: Adding visible formats - only invalidate current node.
...
No need to invalidate all the nodes when adding visible formats because
they are "like regular text".
SVN revision: 58428
2011-04-07 12:22:16 +00:00
80905b3802
Evas textblock: Only relayout paragraphs that have changed.
...
Remove deleted paragraphs, add new paragraphs and generally relayout
only when really needed. Also, don't relayout when width hasn't changed
and the paragraph haven't changed.
SVN revision: 58418
2011-04-07 11:24:15 +00:00
8ea0800b21
Evas textblock: Clean the code a bit (remove node-invalidation func).
...
No need for that, just specifically mark where needed that a node has
changed. This is cleaner and nicer.
SVN revision: 58417
2011-04-07 11:24:11 +00:00
2702074e76
Evas textblock: Cleaned code up a bit.
...
SVN revision: 58395
2011-04-06 15:51:14 +00:00
86ca6e9ccf
Evas textblock: Removed deprecated code.
...
This logic is already done elsewhere, no need for this function (which is
broken anyway).
SVN revision: 58349
2011-04-05 10:39:24 +00:00
32b352dde9
Evas textblock: clean up render_pre a bit.
...
* _relayout is the way to go when we want to relayout.
* no need to mark content_changed=0 all over the place, it's already
set in the first if.
* no need to call evas_object_render_pre_prev_cur_add more than once.
SVN revision: 58319
2011-04-04 11:14:38 +00:00
d4e2a42dff
Evas textblock: Fixed native size calculation.
...
There was a bug (visible in elementary_test's Entry for example) that
made native size calculation of the textblock wrong in some cases.
SVN revision: 58289
2011-04-03 09:14:03 +00:00
Carsten Haitzler
cc151e55cf
actually can just mark as changed. let layout happen later when
...
requested.
SVN revision: 58227
2011-03-31 11:25:39 +00:00
Carsten Haitzler
b1c3fa8a88
ummm... tasn.. you broke scaling of tb's! fix.,
...
SVN revision: 58226
2011-03-31 11:19:17 +00:00
Tom Hacohen
Cedric BAIL
Carsten Haitzler