Tom Hacohen
36261c8bd5
Evas textblock: Fixed a segfault with regular formats (ones without size explicitly set).
...
SVN revision: 56515
2011-01-30 10:42:56 +00:00
Tom Hacohen
80004f3d0b
Evas textblock: Moved item (of type SIZE) size calculation to actual line finalizing because it depends on the object scale and where it was before will break when scale changes.
...
SVN revision: 56514
2011-01-30 10:42:48 +00:00
Tom Hacohen
fb07723f3d
Evas textblock: Fixed bug with relative sized items not showing.
...
SVN revision: 56513
2011-01-30 10:42:41 +00:00
Tom Hacohen
09b0ae1f42
Evas textblock: Fixed cursor when the cursor is in the end.
...
SVN revision: 56512
2011-01-30 10:42:35 +00:00
Tom Hacohen
ba6f9c99e7
Evas bidi: remove the bidi reverse string, it's old and not needed.
...
SVN revision: 56511
2011-01-30 10:42:28 +00:00
Tom Hacohen
f1749eaaa4
Evas font-engine: simplify 26_6 round to int.
...
SVN revision: 56510
2011-01-30 10:42:20 +00:00
Tom Hacohen
f7dfb4d8fb
Evas font-engine: pen_x is now calculated with fractional pixels (inside each item, not the case with cross-items which still use integral pixels).
...
SVN revision: 56509
2011-01-30 10:42:13 +00:00
Tom Hacohen
99c8c7bb2f
Evas font-engine: Round the fractional coords (instead of floor).
...
SVN revision: 56508
2011-01-30 10:42:07 +00:00
Tom Hacohen
32fd296bde
Evas: Fixed harfbuzz dependency checking. Was broken with harfbuzz that is not compiled with freetype support and always printed 'no' regarding harfbuzz usage.
...
SVN revision: 56507
2011-01-30 10:42:01 +00:00
Tom Hacohen
f63e8256ff
Evas textblock: Fixed async rendering support.
...
SVN revision: 56506
2011-01-30 10:41:57 +00:00
Tom Hacohen
f0a2a3229d
Evas textblock: Fixed a seg and the documentation error that caused it.
...
SVN revision: 56505
2011-01-30 10:41:49 +00:00
Tom Hacohen
b46c83aeac
Evas textblock: split the visual layouting to two stages:
...
1. Split to logical layout units.
2. Order the logical layout units in a visual way.
This lets us cache the results of the first part (unless the text changes), which makes everything a lot faster in the OT case, and quite faster in the regular case.
There are still some issues unresolved in this commit that will be resolved in future commits:
1. No support for async rendering - yes, I forgot I'm supposed to support that.
2. native_size should probably be calculated in another way because the current one is slow and if we already have the logical items it should be a piece of cake...
SVN revision: 56504
2011-01-30 10:41:42 +00:00
Tom Hacohen
a2fc127e8c
Evas font-engine: Fixed a puny memory leak.
...
SVN revision: 56503
2011-01-30 10:41:35 +00:00
Tom Hacohen
f49c3bb8ad
Used evas_textblock_text_node_changed instead of evas_textblock_changed when needed and removed the latter completely because it wasn't needed/used anymore.
...
SVN revision: 56502
2011-01-30 10:41:29 +00:00
Tom Hacohen
1351fcc40c
Evas textblock: The only thing that should force a 'native recalc' is a change in the text.
...
SVN revision: 56501
2011-01-30 10:41:23 +00:00
Tom Hacohen
712ad03e21
Evas textblock: split layout line advance to advance and finalize instead of using the 'new line' flag.
...
SVN revision: 56500
2011-01-30 10:41:18 +00:00
Tom Hacohen
38215930ae
Evas textblock: Added a couple of comments and mark that we already handlede content change after we calc native size, that's because logical layout remains the same.
...
SVN revision: 56499
2011-01-30 10:41:13 +00:00
Tom Hacohen
f8656202f2
Evas textblock: Fixed a major slowdown caused by a missing content_changed = 0.
...
SVN revision: 56498
2011-01-30 10:41:06 +00:00
Tom Hacohen
3d24e2daad
Evas textblock: Removed unused functions.
...
SVN revision: 56497
2011-01-30 10:40:59 +00:00
Tom Hacohen
367e75aa70
Evas textblock: Fix format usage in the visual layouting.
...
SVN revision: 56496
2011-01-30 10:40:53 +00:00
Tom Hacohen
169afc76be
Evas textblock: format is now a property of both text items and format items meaning that formats can finally have their own properties, e.g tabs can have distinct background colors and etc.
...
SVN revision: 56495
2011-01-30 10:40:47 +00:00
Tom Hacohen
e62074b786
Evas textblock: Fixed a bug in the last commit causing a seg when cleaning a tb.
...
SVN revision: 56494
2011-01-30 10:40:42 +00:00
Tom Hacohen
c56c293e96
Evas textblock: Split between content changes and other changes.
...
SVN revision: 56493
2011-01-30 10:40:36 +00:00
Tom Hacohen
d632d526c0
Split logical layouting and visual layouting completely. There are still some bugs, but this includes the major change.
...
SVN revision: 56492
2011-01-30 10:40:30 +00:00
Tom Hacohen
48c9b3781e
Evas font-engine: A couple of major fixes:
...
1. Worked around a fribid behavior that broke some stuff - we should handle it better in the future, this workaround is only temporary.
2. Fixed a bug with textblock's last_up_to_pos.
3. Fixed a bug with ot_shaping not reloading the font and activating the size in the wrong place.
SVN revision: 56491
2011-01-30 10:40:21 +00:00
Tom Hacohen
91456d3198
Evas textblock: Started splitting the layouting to two stages, logical item creating and visual ordering of the items. This will let us to cache the logical items and just relayout the visual items when needed thus making everything a lot faster.
...
SVN revision: 56490
2011-01-30 10:40:14 +00:00
Tom Hacohen
50ed367970
Evas textblock: Fixed line coords to be relative to the paragraphs coords and not standalone like they were.
...
SVN revision: 56489
2011-01-30 10:40:09 +00:00
Tom Hacohen
6f24144e55
Evas textblock: Update layout paragraph coordinates and use them to speed some parts up.
...
SVN revision: 56488
2011-01-30 10:40:04 +00:00
Tom Hacohen
adeabde88e
Evas textblock: Use layout paragraphs for faster item locating.
...
SVN revision: 56487
2011-01-30 10:39:58 +00:00
Tom Hacohen
a3698f39a4
Evas textblock: started using the paragraph layout items a bit more so it's a bit faster now. Fixed a bug in calculating the line number. Paragraph layout items now point to the original paragraphs.
...
SVN revision: 56486
2011-01-30 10:39:52 +00:00
Tom Hacohen
908a6d16b0
Evas textblock: Started using the layout paragraphs. Still not using their coords or using them for optimizations.
...
SVN revision: 56485
2011-01-30 10:39:47 +00:00
Tom Hacohen
58af440aab
Evas font: skip over common script items when getting the font, we should get the font of the actual script items.
...
SVN revision: 56484
2011-01-30 10:39:42 +00:00
Tom Hacohen
f7a4cf52a8
Evas font: fixed calling of bidi_end_of_run_get and exposed a new function to get the script of a single char.
...
SVN revision: 56483
2011-01-30 10:39:35 +00:00
Tom Hacohen
7ce45d8bd4
Revert "Evas font-engine: Also split on script common." - After
...
reviewing the standard again, it's not really wanted.
This reverts commit 26cc8747fda51e95d340ef1a1838817fe495be23.
SVN revision: 56482
2011-01-30 10:39:29 +00:00
Tom Hacohen
b8635d16ea
Evas textblock: Started using advancement for wrapping.
...
SVN revision: 56481
2011-01-30 10:39:22 +00:00
Tom Hacohen
1285647c17
Evas text object: Hacked a fix to string size get which fixes elipsis and many other stuff.
...
SVN revision: 56480
2011-01-30 10:39:16 +00:00
Tom Hacohen
e927217279
Evas text: Fixed a bug with the issuing of script end of run get.
...
SVN revision: 56479
2011-01-30 10:39:09 +00:00
Tom Hacohen
3185db9667
Evas language utils: fixed evas_common_language_script_end_of_run_get and adjusted text and textblock object to use it.
...
SVN revision: 56478
2011-01-30 10:39:03 +00:00
Tom Hacohen
ec59409dea
Evas text: Fixed object_text last_up_to_pos.
...
SVN revision: 56477
2011-01-30 10:38:55 +00:00
Tom Hacohen
32f98dcb7b
Evas font-engine: Fixed a bug in evas_common_language_script_end_of_run_get
...
SVN revision: 56476
2011-01-30 10:38:50 +00:00
Tom Hacohen
400fba721e
Evas text: fixed an issue with last_up_to_pos and char_at_coords that caused them to return the wrong index.
...
SVN revision: 56475
2011-01-30 10:38:44 +00:00
Tom Hacohen
fa49914387
Evas textblock: Migrated part of add and split item to _layout_text_append to improve performance.
...
SVN revision: 56474
2011-01-30 10:38:39 +00:00
Tom Hacohen
0e0ba10a7d
Evas font-engine: fixed kerning in the default walker.
...
SVN revision: 56473
2011-01-30 10:38:33 +00:00
Tom Hacohen
421e1d8ae1
Evas font-engine: Also split on script common.
...
SVN revision: 56472
2011-01-30 10:38:28 +00:00
Tom Hacohen
f1d77279cd
Revert "Evas textblock: Shape a lot less when splitting to items because of script/bidi direction."
...
Was broken.
This reverts commit d2bc8fd8b516a640c3eb098071a80d751494024a.
SVN revision: 56471
2011-01-30 10:38:22 +00:00
Tom Hacohen
9f0ce7a272
Evas textblock + font engine: add an optimized way of doing a cut-off on the text props.
...
SVN revision: 56470
2011-01-30 10:38:15 +00:00
Tom Hacohen
0e44717373
Evas font-ot: moved typedef to a better location (doesn't change anything but ease of understanding).
...
SVN revision: 56469
2011-01-30 10:38:08 +00:00
Tom Hacohen
5125ddb692
Evas textblock: Shape a lot less when splitting to items because of script/bidi direction.
...
SVN revision: 56468
2011-01-30 10:38:02 +00:00
Tom Hacohen
aa830a11ca
Evas textblock: removed an un-needed shaping that speeds up things a bit.
...
SVN revision: 56467
2011-01-30 10:37:57 +00:00
Tom Hacohen
4ee6706770
Evas font-engine: cache harfbuzz's face.
...
SVN revision: 56466
2011-01-30 10:37:52 +00:00
Tom Hacohen
b53ded56ed
Evas font-engine: Fixed some issues with the git rebase I just did, should now compile correctly.
...
SVN revision: 56465
2011-01-30 10:37:46 +00:00
Tom Hacohen
48b3a796a5
Evas font-ot: Fixed mistakes that caused ilegal reads.
...
SVN revision: 56464
2011-01-30 10:37:40 +00:00
Tom Hacohen
63e25655e1
Evas font-ot: renamed internal source_pos to source_cluster and added the forgotten evas_common_font_ot_cluster_size_get to the .h file.
...
SVN revision: 56463
2011-01-30 10:37:34 +00:00
Tom Hacohen
c09000741b
Evas font-engine: Add cluster support to the font-engine. Cursor handling is now correct for clusters as well.
...
SVN revision: 56462
2011-01-30 10:37:29 +00:00
Tom Hacohen
c012ee700c
Evas font-engine: Fixed pen/char query. In RTL first is actually the last.
...
SVN revision: 56461
2011-01-30 10:37:18 +00:00
Tom Hacohen
729a85e872
Evas font-engine: Fixed an issue with cluster handling that broke cursor position in some cases.
...
SVN revision: 56460
2011-01-30 10:37:12 +00:00
Tom Hacohen
34426d8c6e
Evas font engine: Fixed a couple of issues:
...
1. Fixed double-kerning with the DEFAULT walker.
2. Removed unused var with the OT walker.
3. Fixed a bit of the documentation in the walkers.
SVN revision: 56459
2011-01-30 10:37:05 +00:00
Tom Hacohen
3b88692aa7
Evas font-engine: Fixed invisible character handling in the OT walker. Renamed internal var gl in the default walker to _gl, a less common var name.
...
SVN revision: 56458
2011-01-30 10:36:59 +00:00
Tom Hacohen
f4a6807c4d
Evas font-engine: Fixed an issue with cursor position with RTL text when OT is off.
...
SVN revision: 56457
2011-01-30 10:36:53 +00:00
Tom Hacohen
e37ac1d679
Evas text: Use the already calculated len.
...
SVN revision: 56456
2011-01-30 10:36:47 +00:00
Tom Hacohen
ff18fa8399
Evas: Multiple changes that all relate to the Harfbuzz integration:
...
1. Started feeding Evas_Text_Props to the font engine instead of Evas_BiDi_Props because no we have more general text properties as well - i.e, OpenType stuff.
2. Full Harfbuzz integration which gets compiled in by default (if harfbuzz is present) but only works if the environment variable EVAS_USE_OT is set to 1 (because OT is way slower than regular text rendering).
3. Cleaned the font querying/drawing functions.
4. Added font_shaped function to all of the engines, which by default calls teh harfbuzz stuff (default on linux that is).
5. Moved some source files around a bit to make more sense.
SVN revision: 56455
2011-01-30 10:36:39 +00:00
Tom Hacohen
836b16f085
Evas: fine tuned the harfbuzz checks to make sure harfbuzz was compiled with freetype support and just check if it also compiled with glib support. ATM there's no good lib for checking unicode characteristics so until there is one, we optionally use harfbuzz's glib integration - such lib is planned by the guy who wrote Harfbuzz.
...
SVN revision: 56454
2011-01-30 10:36:24 +00:00
Tom Hacohen
d9cdf88a23
Evas text: Fixed typo in horiz advance function.
...
SVN revision: 56453
2011-01-30 10:36:20 +00:00
Tom Hacohen
6ac48e53ed
Evas font: Added HARFBUZZ's cflags.
...
SVN revision: 56452
2011-01-30 10:36:14 +00:00
Tom Hacohen
ea97422d84
Evas textblock: Start cutting to sections if bidi is not enabled.
...
SVN revision: 56451
2011-01-30 10:36:08 +00:00
Tom Hacohen
e7b2a13aa1
Evas text: Wrote item layouting and splitting of items to script runs, this is essential for correct shaping/bidi handling.
...
SVN revision: 56450
2011-01-30 10:36:02 +00:00
Tom Hacohen
de1549fa25
Evas textblock: Fixed an issue with range_geometry_get.
...
SVN revision: 56449
2011-01-30 10:35:56 +00:00
Tom Hacohen
cf083720b6
Evas textblock: Fixed a small invalid read.
...
SVN revision: 56448
2011-01-30 10:35:50 +00:00
Tom Hacohen
e7ca8b9294
Evas textblock: Fixed misuse of evas_bidi_is_rtl_char.
...
SVN revision: 56447
2011-01-30 10:35:44 +00:00
Tom Hacohen
7e376019b7
Evas font-engine: Moved bidi utils (and added script utils) to a subdir language that collects all the language specific adjustments to font handling.
...
SVN revision: 56446
2011-01-30 10:35:37 +00:00
Tom Hacohen
05050572ad
Evas textblock: It's ok to have an empty item when there are no nodes. - Fixed a seg.
...
SVN revision: 56445
2011-01-30 10:35:30 +00:00
Tom Hacohen
01850cf816
Evas font-engine: Fixed kerning handling and fixed a bug in query_char_coords and in query_pen_coords taking the wrong string into account.
...
SVN revision: 56444
2011-01-30 10:35:24 +00:00
Tom Hacohen
99a7eff130
Evas bidi + font-engine + everything affected: Changed Evas_BiDi_Props to only include the direction of the text and reverse when needed. We don't need to do full processing at this stage, because we should have split to bidi runs before.
...
SVN revision: 56443
2011-01-30 10:35:17 +00:00
Tom Hacohen
e4b4cf3344
Evas font-engine: suppress warnings when BiDi is disabled.
...
SVN revision: 56442
2011-01-30 10:35:10 +00:00
Tom Hacohen
b1d9298e81
Evas bidi: Fixed the BiDi functions to accept paragraph props and not bidi props.
...
SVN revision: 56441
2011-01-30 10:35:04 +00:00
Tom Hacohen
f6b1bcd0b6
Evas: Added harfbuzz detection (it's optional, just like fribidi).
...
SVN revision: 56440
2011-01-30 10:34:56 +00:00
Tom Hacohen
109886f436
Evas font-engine: Fixed an issue with last_up_to_pos failing sometimes when it shouldn't.
...
Fixed a documentation error.
SVN revision: 56439
2011-01-30 10:34:49 +00:00
Tom Hacohen
ca2a3eb5a6
Evas font-engine: remove an usued variable in the font drawing functions.
...
SVN revision: 56438
2011-01-30 10:34:42 +00:00
Tom Hacohen
6dba792f46
Evas font-engine: Change EVAS_FONT_WALK_TEXT_* functions to advance pen_x at the end of the loop (so a break won't advance it, but a clean finish will) and removed the checking if a diacritic using and advancement hack (that only worked only with specific fonts anyway) so we'll be able to start working with Harfbuzz.
...
SVN revision: 56437
2011-01-30 10:34:36 +00:00
Tom Hacohen
a089d061b8
Evas textblock: Fixed docs and naming of vars in the function header.
...
SVN revision: 56436
2011-01-30 10:34:29 +00:00
Tom Hacohen
ce97927d9a
Evas textblock: Fixed usage of width instead of advance which caused issues in some cases.
...
SVN revision: 56435
2011-01-30 10:34:23 +00:00
Tom Hacohen
b6363c7657
Evas textblock: Use pen position for cursors, selections and etc as this is exactly what pen is for.
...
SVN revision: 56434
2011-01-30 10:34:18 +00:00
Tom Hacohen
35847d3c88
Evas textblock: Added evas_textblock_cursor_pen_geometry_get.
...
SVN revision: 56433
2011-01-30 10:34:13 +00:00
Tom Hacohen
952ba44f0b
Evas font engine: Added evas_common_font_query_pen_coords.
...
SVN revision: 56432
2011-01-30 10:34:07 +00:00
Tom Hacohen
3d6ca9eca9
Evas font engine: The position of the NULL returned from coords should depend on query_advance, not query_size.
...
SVN revision: 56431
2011-01-30 10:33:57 +00:00
Tom Hacohen
8d56aef16a
Evas textblock: Advancement within a line should be according to advance size, and not width.
...
SVN revision: 56430
2011-01-30 10:33:50 +00:00
Tom Hacohen
509e7bed98
Evas font-engine: handle invisible chars in font query.
...
SVN revision: 56429
2011-01-30 10:33:43 +00:00
Tom Hacohen
74b26fec2e
Evas textblock: Removed the adjusting according to inset from textblock as it happens in font_draw/query.
...
SVN revision: 56428
2011-01-30 10:33:37 +00:00
Tom Hacohen
039fd390a7
Evas font engine: Fixed query_size and query advance.
...
SVN revision: 56427
2011-01-30 10:33:32 +00:00
Tom Hacohen
34d5f9141d
Evas font engine: Merge text walking to a couple of macros, this is more consistent, and the code is smaller and easier to handle.
...
SVN revision: 56426
2011-01-30 10:33:24 +00:00
Tom Hacohen
30c9492e8b
Evas textblock: Added advancement to items. This simplifies the code, fixes issues in selection and may be useful in the future with format items with different advancement and width.
...
SVN revision: 56425
2011-01-30 10:33:19 +00:00
Tom Hacohen
d7c2187c1f
Evas font engine: Added skipping of invisible chars to the font drawing function - this means we can't draw them until we add a specil "draw inivisble" mode.
...
SVN revision: 56424
2011-01-30 10:33:14 +00:00
Tom Hacohen
b9c4dbb744
Evas textblock: Fixed geometry get for formats as well.
...
SVN revision: 56423
2011-01-30 10:33:06 +00:00
Tom Hacohen
82a7ee8ee0
Evas textblock: Added bidi properties to the shared info between format and text items because both are bidi-relevant.
...
SVN revision: 56422
2011-01-30 10:33:01 +00:00
Tom Hacohen
3c6c735b83
Evas textblock: Fixed a typo and explanation in a comment.
...
SVN revision: 56421
2011-01-30 10:32:55 +00:00
Tom Hacohen
4aaa8df5fe
Evas textblock: Fixed a couple of cases where a geometry of a visible format item would have been returned although it shouldn't have.
...
SVN revision: 56420
2011-01-30 10:32:50 +00:00
Tom Hacohen
81616cec5d
Evas textblock and font engine: Fixed cursor position to be at the end of the current item, and not the end of the line, this looks nicer in bidi strings.
...
Fixed querying char coords to return the current position of the NULL according to the text's alignment, not the paragraph's.
SVN revision: 56419
2011-01-30 10:32:45 +00:00
Tom Hacohen
ab1a4f0a77
Evas textblock: Fixed selection drawing with multiline mixed ltr/rtl.
...
SVN revision: 56418
2011-01-30 10:32:39 +00:00
Tom Hacohen
82d4acc36a
Evas textblock: Fixed a couple of issues with range_geometry_get (a seg if the textblock is empty and drawing glitches).
...
SVN revision: 56417
2011-01-30 10:32:33 +00:00
Tom Hacohen
06957098c6
Evas textblock: Fixed range geometry get in some cases involving rtl.
...
SVN revision: 56416
2011-01-30 10:32:27 +00:00