Commit Graph

449 Commits

Author SHA1 Message Date
Tom Hacohen ae1325aec0 Evas textblock: Added wrap=mixed to the style options.
SVN revision: 56525
2011-01-30 10:44:03 +00:00
Tom Hacohen 6b8aa0e419 Evas textblock: Fixed a bug with wordwrapping causing an infinite loop in some cases.
SVN revision: 56524
2011-01-30 10:43:55 +00:00
Tom Hacohen 07004f537a Evas textblock: Implemented support for size_native_get which was partially broken because calc_only was not implemented.
SVN revision: 56520
2011-01-30 10:43:26 +00:00
Tom Hacohen 03e32ec5c4 Evas textblock: Added mixedwrap code - the code is there but nothing is really using it at the moment, will add that in the future.
SVN revision: 56519
2011-01-30 10:43:21 +00:00
Tom Hacohen 546ceb4151 Evas textblock: Remove unused function: _evas_textblock_cursor_node_format_before_pos_get.
SVN revision: 56518
2011-01-30 10:43:15 +00:00
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 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 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 b8635d16ea Evas textblock: Started using advancement for wrapping.
SVN revision: 56481
2011-01-30 10:39:22 +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 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 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 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 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 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 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 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 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