Tom Hacohen [Sun, 30 Jan 2011 10:41:42 +0000 (10:41 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:41:35 +0000 (10:41 +0000)]
Evas font-engine: Fixed a puny memory leak.
SVN revision: 56503
Tom Hacohen [Sun, 30 Jan 2011 10:41:29 +0000 (10:41 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:41:23 +0000 (10:41 +0000)]
Evas textblock: The only thing that should force a 'native recalc' is a change in the text.
SVN revision: 56501
Tom Hacohen [Sun, 30 Jan 2011 10:41:18 +0000 (10:41 +0000)]
Evas textblock: split layout line advance to advance and finalize instead of using the 'new line' flag.
SVN revision: 56500
Tom Hacohen [Sun, 30 Jan 2011 10:41:13 +0000 (10:41 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:41:06 +0000 (10:41 +0000)]
Evas textblock: Fixed a major slowdown caused by a missing content_changed = 0.
SVN revision: 56498
Tom Hacohen [Sun, 30 Jan 2011 10:40:59 +0000 (10:40 +0000)]
Evas textblock: Removed unused functions.
SVN revision: 56497
Tom Hacohen [Sun, 30 Jan 2011 10:40:53 +0000 (10:40 +0000)]
Evas textblock: Fix format usage in the visual layouting.
SVN revision: 56496
Tom Hacohen [Sun, 30 Jan 2011 10:40:47 +0000 (10:40 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:40:42 +0000 (10:40 +0000)]
Evas textblock: Fixed a bug in the last commit causing a seg when cleaning a tb.
SVN revision: 56494
Tom Hacohen [Sun, 30 Jan 2011 10:40:36 +0000 (10:40 +0000)]
Evas textblock: Split between content changes and other changes.
SVN revision: 56493
Tom Hacohen [Sun, 30 Jan 2011 10:40:30 +0000 (10:40 +0000)]
Split logical layouting and visual layouting completely. There are still some bugs, but this includes the major change.
SVN revision: 56492
Tom Hacohen [Sun, 30 Jan 2011 10:40:21 +0000 (10:40 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:40:14 +0000 (10:40 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:40:09 +0000 (10:40 +0000)]
Evas textblock: Fixed line coords to be relative to the paragraphs coords and not standalone like they were.
SVN revision: 56489
Tom Hacohen [Sun, 30 Jan 2011 10:40:04 +0000 (10:40 +0000)]
Evas textblock: Update layout paragraph coordinates and use them to speed some parts up.
SVN revision: 56488
Tom Hacohen [Sun, 30 Jan 2011 10:39:58 +0000 (10:39 +0000)]
Evas textblock: Use layout paragraphs for faster item locating.
SVN revision: 56487
Tom Hacohen [Sun, 30 Jan 2011 10:39:52 +0000 (10:39 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:39:47 +0000 (10:39 +0000)]
Evas textblock: Started using the layout paragraphs. Still not using their coords or using them for optimizations.
SVN revision: 56485
Tom Hacohen [Sun, 30 Jan 2011 10:39:42 +0000 (10:39 +0000)]
Evas font: skip over common script items when getting the font, we should get the font of the actual script items.
SVN revision: 56484
Tom Hacohen [Sun, 30 Jan 2011 10:39:35 +0000 (10:39 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:39:29 +0000 (10:39 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:39:22 +0000 (10:39 +0000)]
Evas textblock: Started using advancement for wrapping.
SVN revision: 56481
Tom Hacohen [Sun, 30 Jan 2011 10:39:16 +0000 (10:39 +0000)]
Evas text object: Hacked a fix to string size get which fixes elipsis and many other stuff.
SVN revision: 56480
Tom Hacohen [Sun, 30 Jan 2011 10:39:09 +0000 (10:39 +0000)]
Evas text: Fixed a bug with the issuing of script end of run get.
SVN revision: 56479
Tom Hacohen [Sun, 30 Jan 2011 10:39:03 +0000 (10:39 +0000)]
Evas language utils: fixed evas_common_language_script_end_of_run_get and adjusted text and textblock object to use it.
SVN revision: 56478
Tom Hacohen [Sun, 30 Jan 2011 10:38:55 +0000 (10:38 +0000)]
Evas text: Fixed object_text last_up_to_pos.
SVN revision: 56477
Tom Hacohen [Sun, 30 Jan 2011 10:38:50 +0000 (10:38 +0000)]
Evas font-engine: Fixed a bug in evas_common_language_script_end_of_run_get
SVN revision: 56476
Tom Hacohen [Sun, 30 Jan 2011 10:38:44 +0000 (10:38 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:38:39 +0000 (10:38 +0000)]
Evas textblock: Migrated part of add and split item to _layout_text_append to improve performance.
SVN revision: 56474
Tom Hacohen [Sun, 30 Jan 2011 10:38:33 +0000 (10:38 +0000)]
Evas font-engine: fixed kerning in the default walker.
SVN revision: 56473
Tom Hacohen [Sun, 30 Jan 2011 10:38:28 +0000 (10:38 +0000)]
Evas font-engine: Also split on script common.
SVN revision: 56472
Tom Hacohen [Sun, 30 Jan 2011 10:38:22 +0000 (10:38 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:38:15 +0000 (10:38 +0000)]
Evas textblock + font engine: add an optimized way of doing a cut-off on the text props.
SVN revision: 56470
Tom Hacohen [Sun, 30 Jan 2011 10:38:08 +0000 (10:38 +0000)]
Evas font-ot: moved typedef to a better location (doesn't change anything but ease of understanding).
SVN revision: 56469
Tom Hacohen [Sun, 30 Jan 2011 10:38:02 +0000 (10:38 +0000)]
Evas textblock: Shape a lot less when splitting to items because of script/bidi direction.
SVN revision: 56468
Tom Hacohen [Sun, 30 Jan 2011 10:37:57 +0000 (10:37 +0000)]
Evas textblock: removed an un-needed shaping that speeds up things a bit.
SVN revision: 56467
Tom Hacohen [Sun, 30 Jan 2011 10:37:52 +0000 (10:37 +0000)]
Evas font-engine: cache harfbuzz's face.
SVN revision: 56466
Tom Hacohen [Sun, 30 Jan 2011 10:37:46 +0000 (10:37 +0000)]
Evas font-engine: Fixed some issues with the git rebase I just did, should now compile correctly.
SVN revision: 56465
Tom Hacohen [Sun, 30 Jan 2011 10:37:40 +0000 (10:37 +0000)]
Evas font-ot: Fixed mistakes that caused ilegal reads.
SVN revision: 56464
Tom Hacohen [Sun, 30 Jan 2011 10:37:34 +0000 (10:37 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:37:29 +0000 (10:37 +0000)]
Evas font-engine: Add cluster support to the font-engine. Cursor handling is now correct for clusters as well.
SVN revision: 56462
Tom Hacohen [Sun, 30 Jan 2011 10:37:18 +0000 (10:37 +0000)]
Evas font-engine: Fixed pen/char query. In RTL first is actually the last.
SVN revision: 56461
Tom Hacohen [Sun, 30 Jan 2011 10:37:12 +0000 (10:37 +0000)]
Evas font-engine: Fixed an issue with cluster handling that broke cursor position in some cases.
SVN revision: 56460
Tom Hacohen [Sun, 30 Jan 2011 10:37:05 +0000 (10:37 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:36:59 +0000 (10:36 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:36:53 +0000 (10:36 +0000)]
Evas font-engine: Fixed an issue with cursor position with RTL text when OT is off.
SVN revision: 56457
Tom Hacohen [Sun, 30 Jan 2011 10:36:47 +0000 (10:36 +0000)]
Evas text: Use the already calculated len.
SVN revision: 56456
Tom Hacohen [Sun, 30 Jan 2011 10:36:39 +0000 (10:36 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:36:24 +0000 (10:36 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:36:20 +0000 (10:36 +0000)]
Evas text: Fixed typo in horiz advance function.
SVN revision: 56453
Tom Hacohen [Sun, 30 Jan 2011 10:36:14 +0000 (10:36 +0000)]
Evas font: Added HARFBUZZ's cflags.
SVN revision: 56452
Tom Hacohen [Sun, 30 Jan 2011 10:36:08 +0000 (10:36 +0000)]
Evas textblock: Start cutting to sections if bidi is not enabled.
SVN revision: 56451
Tom Hacohen [Sun, 30 Jan 2011 10:36:02 +0000 (10:36 +0000)]
Evas text: Wrote item layouting and splitting of items to script runs, this is essential for correct shaping/bidi handling.
SVN revision: 56450
Tom Hacohen [Sun, 30 Jan 2011 10:35:56 +0000 (10:35 +0000)]
Evas textblock: Fixed an issue with range_geometry_get.
SVN revision: 56449
Tom Hacohen [Sun, 30 Jan 2011 10:35:50 +0000 (10:35 +0000)]
Evas textblock: Fixed a small invalid read.
SVN revision: 56448
Tom Hacohen [Sun, 30 Jan 2011 10:35:44 +0000 (10:35 +0000)]
Evas textblock: Fixed misuse of evas_bidi_is_rtl_char.
SVN revision: 56447
Tom Hacohen [Sun, 30 Jan 2011 10:35:37 +0000 (10:35 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:35:30 +0000 (10:35 +0000)]
Evas textblock: It's ok to have an empty item when there are no nodes. - Fixed a seg.
SVN revision: 56445
Tom Hacohen [Sun, 30 Jan 2011 10:35:24 +0000 (10:35 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:35:17 +0000 (10:35 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:35:10 +0000 (10:35 +0000)]
Evas font-engine: suppress warnings when BiDi is disabled.
SVN revision: 56442
Tom Hacohen [Sun, 30 Jan 2011 10:35:04 +0000 (10:35 +0000)]
Evas bidi: Fixed the BiDi functions to accept paragraph props and not bidi props.
SVN revision: 56441
Tom Hacohen [Sun, 30 Jan 2011 10:34:56 +0000 (10:34 +0000)]
Evas: Added harfbuzz detection (it's optional, just like fribidi).
SVN revision: 56440
Tom Hacohen [Sun, 30 Jan 2011 10:34:49 +0000 (10:34 +0000)]
Evas font-engine: Fixed an issue with last_up_to_pos failing sometimes when it shouldn't.
Fixed a documentation error.
SVN revision: 56439
Tom Hacohen [Sun, 30 Jan 2011 10:34:42 +0000 (10:34 +0000)]
Evas font-engine: remove an usued variable in the font drawing functions.
SVN revision: 56438
Tom Hacohen [Sun, 30 Jan 2011 10:34:36 +0000 (10:34 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:34:29 +0000 (10:34 +0000)]
Evas textblock: Fixed docs and naming of vars in the function header.
SVN revision: 56436
Tom Hacohen [Sun, 30 Jan 2011 10:34:23 +0000 (10:34 +0000)]
Evas textblock: Fixed usage of width instead of advance which caused issues in some cases.
SVN revision: 56435
Tom Hacohen [Sun, 30 Jan 2011 10:34:18 +0000 (10:34 +0000)]
Evas textblock: Use pen position for cursors, selections and etc as this is exactly what pen is for.
SVN revision: 56434
Tom Hacohen [Sun, 30 Jan 2011 10:34:13 +0000 (10:34 +0000)]
Evas textblock: Added evas_textblock_cursor_pen_geometry_get.
SVN revision: 56433
Tom Hacohen [Sun, 30 Jan 2011 10:34:07 +0000 (10:34 +0000)]
Evas font engine: Added evas_common_font_query_pen_coords.
SVN revision: 56432
Tom Hacohen [Sun, 30 Jan 2011 10:33:57 +0000 (10:33 +0000)]
Evas font engine: The position of the NULL returned from coords should depend on query_advance, not query_size.
SVN revision: 56431
Tom Hacohen [Sun, 30 Jan 2011 10:33:50 +0000 (10:33 +0000)]
Evas textblock: Advancement within a line should be according to advance size, and not width.
SVN revision: 56430
Tom Hacohen [Sun, 30 Jan 2011 10:33:43 +0000 (10:33 +0000)]
Evas font-engine: handle invisible chars in font query.
SVN revision: 56429
Tom Hacohen [Sun, 30 Jan 2011 10:33:37 +0000 (10:33 +0000)]
Evas textblock: Removed the adjusting according to inset from textblock as it happens in font_draw/query.
SVN revision: 56428
Tom Hacohen [Sun, 30 Jan 2011 10:33:32 +0000 (10:33 +0000)]
Evas font engine: Fixed query_size and query advance.
SVN revision: 56427
Tom Hacohen [Sun, 30 Jan 2011 10:33:24 +0000 (10:33 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:33:19 +0000 (10:33 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:33:14 +0000 (10:33 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:33:06 +0000 (10:33 +0000)]
Evas textblock: Fixed geometry get for formats as well.
SVN revision: 56423
Tom Hacohen [Sun, 30 Jan 2011 10:33:01 +0000 (10:33 +0000)]
Evas textblock: Added bidi properties to the shared info between format and text items because both are bidi-relevant.
SVN revision: 56422
Tom Hacohen [Sun, 30 Jan 2011 10:32:55 +0000 (10:32 +0000)]
Evas textblock: Fixed a typo and explanation in a comment.
SVN revision: 56421
Tom Hacohen [Sun, 30 Jan 2011 10:32:50 +0000 (10:32 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:32:45 +0000 (10:32 +0000)]
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
Tom Hacohen [Sun, 30 Jan 2011 10:32:39 +0000 (10:32 +0000)]
Evas textblock: Fixed selection drawing with multiline mixed ltr/rtl.
SVN revision: 56418
Tom Hacohen [Sun, 30 Jan 2011 10:32:33 +0000 (10:32 +0000)]
Evas textblock: Fixed a couple of issues with range_geometry_get (a seg if the textblock is empty and drawing glitches).
SVN revision: 56417
Tom Hacohen [Sun, 30 Jan 2011 10:32:27 +0000 (10:32 +0000)]
Evas textblock: Fixed range geometry get in some cases involving rtl.
SVN revision: 56416
Tom Hacohen [Sun, 30 Jan 2011 10:32:15 +0000 (10:32 +0000)]
Evas textblock: Made selection rtl friendly. There are still minor issues with rectangle positioning (1px off sometimes) but this is better than before.
SVN revision: 56415
Tom Hacohen [Sun, 30 Jan 2011 10:32:09 +0000 (10:32 +0000)]
Evas textblock: Fixed evas_textblock_cursor_geometry_get with the cursor type: EVAS_TEXTBLOCK_CURSOR_BEFORE.
SVN revision: 56414
Tom Hacohen [Sun, 30 Jan 2011 10:32:03 +0000 (10:32 +0000)]
Evas textblock: Merged drawing backgrounds, strikethroughs and underlines into one shared format.
SVN revision: 56413
Tom Hacohen [Sun, 30 Jan 2011 10:31:58 +0000 (10:31 +0000)]
Evas textblock: Since we now track text pos for format items as well as text items, we can (and did) merge _find_layout_item_line_match and _find_layout_format_item_line_match and obsolete the latter.
SVN revision: 56412
Tom Hacohen [Sun, 30 Jan 2011 10:31:51 +0000 (10:31 +0000)]
Evas textblock: Shape per string and not per item. I.e shaping across wrapping will also work now.
SVN revision: 56411
Tom Hacohen [Sun, 30 Jan 2011 10:31:45 +0000 (10:31 +0000)]
Evas textblock: Added a segfault fix in case (shouldn't happen) it isn't found.
SVN revision: 56410
Tom Hacohen [Sun, 30 Jan 2011 10:31:40 +0000 (10:31 +0000)]
Evas textblock: Adjusted some local macros a bit so they'll enforce our wanted usage of ';'.
SVN revision: 56409
Tom Hacohen [Sun, 30 Jan 2011 10:31:33 +0000 (10:31 +0000)]
Evas textblock: Adjusted text drawing a bit, a fix to the previous commit.
SVN revision: 56408
Tom Hacohen [Sun, 30 Jan 2011 10:31:28 +0000 (10:31 +0000)]
Evas textblock: Fixed text drawing (with all of it's features, including background, underlines and etc.). Also simplified it a bit.
SVN revision: 56407
Tom Hacohen [Sun, 30 Jan 2011 10:31:22 +0000 (10:31 +0000)]
Evas textblock: created _find_layout_item_match that finds the wanted item and line for both texts and formats and with some special case handling.
Essentially combined code that was just copied around.
SVN revision: 56406
Tom Hacohen [Sun, 30 Jan 2011 10:31:16 +0000 (10:31 +0000)]
Evas textblock: format items and text items are now in the same list and share a lot of info.
SVN revision: 56405