Commit Graph

494 Commits

Author SHA1 Message Date
Carsten Haitzler 3b9219748d warnings--
SVN revision: 57877
2011-03-19 03:56:35 +00:00
Tom Hacohen 1078e941fa Evas textblock: Added a workaround for a segfault.
The problem is that we currently do try to split even if we can't.
We should overview things and fix it in a more proper way, but this is
a good enough solution in the meanwhile, because this part will be fixed
soon.

SVN revision: 57301
2011-02-24 15:18:10 +00:00
Tom Hacohen a8f52f4378 Evas textblock: Don't set style if it's the same.
SVN revision: 57296
2011-02-24 08:43:38 +00:00
Tom Hacohen 38bf6ec94c Evas textblock: Stringshare the style text of each style.
SVN revision: 57295
2011-02-24 08:43:34 +00:00
Tom Hacohen 28ee865391 Evas textblock: Fix wrong behavior when updating style.
When updating style we should not clear the utf8 text but we should relayout.
And definitely not reset it.

SVN revision: 57294
2011-02-24 08:43:30 +00:00
Tom Hacohen b890c5397b Evas textblock: Remove a redundant cast.
SVN revision: 57268
2011-02-23 16:50:59 +00:00
Tom Hacohen ef3b7a72f2 Evas textblock: Fix the false-positive strict-aliasing issue with gcc.
Only happens with some versions of gcc. I think it's a false positive
because both of the items are compatible.

SVN revision: 57267
2011-02-23 16:49:31 +00:00
Tom Hacohen 7420939ddb Evas textblock: Fixed setting cursor in evas_textblock_cursor_paragraph_char_last.
On empty paragraphs the cursor position was set to values < 0 which
is bad and caused issues in other places as well.

SVN revision: 57229
2011-02-22 09:31:19 +00:00
Tom Hacohen bd0695d1b5 Evas encoding: Removed Evas_Encoding and moved to eina_unicode_utf8* instead.
SVN revision: 57096
2011-02-16 16:00:17 +00:00
Tom Hacohen 52807e1550 Evas textblock: Fixed possible issue with word/mixed wrapping.
SVN revision: 57089
2011-02-16 13:00:41 +00:00
Tom Hacohen 4f597bf730 Evas textblock: Fixed an issue with item size calculation.
This caused some issues in some cases. Just switch continue with a goto to the end of the loop so we'll be able to calculate the sizes even when we don't need to format the format item.

SVN revision: 57081
2011-02-16 09:43:57 +00:00
Tom Hacohen 24f943fa3d Evas textblock: Fixed a small calculation in format item's size calculation. Was correct, but too complex, simplified it.
SVN revision: 57056
2011-02-15 16:50:14 +00:00
Tom Hacohen d09431f2a1 Evas textblock: Fixed a bug that caused format item positions to be wrong in some cases.
Just sanitized some of the item coordinates calculation.

SVN revision: 57055
2011-02-15 16:50:07 +00:00
Tom Hacohen 0229e71b48 Evas textblock: Fixed evas_textblock_cursor_range_geometry_get which didn't work when across multiple paragraphs.
SVN revision: 57027
2011-02-14 16:14:26 +00:00
Tom Hacohen b2bf107e38 Evas textblock: strcpy->strncpy in a place we use a cached len, to be on the safe side.
SVN revision: 57025
2011-02-14 15:02:58 +00:00
Tom Hacohen 5991e80d35 Evas textblock: Fixed compilation error, I don't understand what went wrong in my last two commits, sorry for the spam.
SVN revision: 57023
2011-02-14 14:44:47 +00:00
Tom Hacohen 38dc347fcf Evas textblock: Fix compilation warning, for some reason this wasn't included in the previous patch.
SVN revision: 57022
2011-02-14 14:42:22 +00:00
Tom Hacohen 56f8891073 Evas textblock: Added a mode for setting newline behavior.
Can either be normal, or PS mode which means newline character behaves as a PS.

SVN revision: 57019
2011-02-14 14:17:12 +00:00
Tom Hacohen 7cd80bfc23 Evas textblock: Fixed it so there's an Evas_Text_Props field only for text objects.
Saves some memory.

SVN revision: 57016
2011-02-14 13:09:41 +00:00
Tom Hacohen 5b477a6454 Evas textblock: Wrapping - used a less correct approach that appears to be 3 times faster.
SVN revision: 57015
2011-02-14 12:44:38 +00:00
Tom Hacohen 8cadb71e4b Evas textblock: don't force calc utf8 string in evas_textblock_style_set. Only calc it when used.
SVN revision: 57014
2011-02-14 12:44:31 +00:00
Tom Hacohen 11dbc52d0e Evas textblock: Fixed issue with incorrect sizes in textblock, _text_item_update_sizes should be called after merging.
SVN revision: 57012
2011-02-14 10:49:14 +00:00
Tom Hacohen 62f763217e Evas textblock: Use eina_unicode_strndup instead of eina_unicode_strdup beacuse we already have the lentgth.
SVN revision: 57011
2011-02-14 10:49:09 +00:00
Tom Hacohen 3c18adad9c Evas textblock: Replaced all the calls to eina_unicode_strlen with the cached text_len.
This also fixes an issue with ellip_char text pos.

SVN revision: 57010
2011-02-14 10:49:05 +00:00
Tom Hacohen 862b468165 Evas textblock: speeded things up by using the cached text_len
instead of calling eina_unicode_strlen all the time.
Also fixed an issue with size calculation.

SVN revision: 57009
2011-02-14 10:09:27 +00:00
Tom Hacohen 4a3493030c Evas textblock: Used eina_list_append_relative_list instead of eina_list_append_relative
in some places, which obviously made things way faster.

SVN revision: 57008
2011-02-14 09:37:49 +00:00
Tom Hacohen 6e68ec8b42 Evas font-engine: Fixed inset to use the string objects instead of strings.
SVN revision: 56895
2011-02-10 09:03:14 +00:00
Tom Hacohen cb2587c8f6 Evas textblock: started using the new eina_unicode_strndup.
SVN revision: 56808
2011-02-08 13:44:41 +00:00
Tom Hacohen 9ad7690524 Evas textblock: #if 0 a couple of debugging functions.
SVN revision: 56797
2011-02-08 08:13:35 +00:00
Tom Hacohen d124b1e2a9 Evas textblock: Use the ellipsis char instead of 3 dots for textblock ellipsis.
SVN revision: 56651
2011-02-02 16:24:02 +00:00
Tom Hacohen 94b5a536f0 Evas font/textblock/text: Started using string objects instead of
strings in most of the font engine (everywhere except draw).
Haven't removed the paramteres yet, but did mark them as UNUSED.
Removing them will be part of a future change.
Removed run-time OT toggling support, OT is now fast, no need for that.
Renamed all of the intl_props->text_props (because it really changed purpose now)
Fixed spliting/merging of text_props to be fast and good, not hacky and
complex like before.
Note to reviewers: Most of the changes are indentation related, sorry
for the mess, but I had to do it all in one commit, splitting was not
trivial (at least not in retrospect). The important parts are
evas_font_default_walk.x and text_utils.c. query and draw were just
adjusted a bit and the rest were only adjusted to conform to renaming or
were renaming on their own.

SVN revision: 56629
2011-02-01 12:17:52 +00:00
Tom Hacohen 22b440ff2a Evas textblock: Fixed a couple of invalid reads in split and remove
whites

SVN revision: 56628
2011-02-01 12:17:38 +00:00
Tom Hacohen 517756c0cc Evas textblock: Fixed paragraph line number. It got corrupted in some cases.
SVN revision: 56609
2011-01-31 14:43:48 +00:00
Tom Hacohen 3999767698 Evas textblock: Eliminate the use of cutoff, we don't really want/need that.
SVN revision: 56545
2011-01-30 10:46:02 +00:00
Tom Hacohen f247b0d480 Evas textblock: Did a bit of code clean-up.
SVN revision: 56543
2011-01-30 10:45:51 +00:00
Tom Hacohen 5a5ebae319 Evas textblock: Added ellipsis support (actually only for the 1.0 case) to textblock.
SVN revision: 56542
2011-01-30 10:45:45 +00:00
Tom Hacohen 604f4d5549 Evas textblock: Fixed a memory leak and comment.
SVN revision: 56541
2011-01-30 10:45:40 +00:00
Tom Hacohen 00a48c01ea Evas textblock: Updated a comment.
SVN revision: 56540
2011-01-30 10:45:34 +00:00
Tom Hacohen 620c9f1cb7 Evas textblock: Fixed issue with charwrap causing an infinite loop.
SVN revision: 56539
2011-01-30 10:45:28 +00:00
Tom Hacohen df727d6772 Revert "Evas textblock: Use the last item's width, not advance, when calculating line's width and wrapping."
There were issues introduced with this commit, should fix it in the
future.

This reverts commit 53cf2da5684871c77b7efc6406de98d5fb681914.

SVN revision: 56536
2011-01-30 10:45:11 +00:00
Tom Hacohen ed75dc7082 Evas textblock: Fixed paragraph width to also take in-paragraph line indentation into account.
SVN revision: 56535
2011-01-30 10:45:06 +00:00
Tom Hacohen 0cdb64e00e Evas textblock: Fixed cursor position in BEFORE mode. Fixed a reference to a memory location (on the stack) we don't own anymore.
SVN revision: 56533
2011-01-30 10:44:55 +00:00
Tom Hacohen 2f8968f4f8 Evas textblock: Fixed cursor position with a cleared textblock.
SVN revision: 56532
2011-01-30 10:44:48 +00:00
Tom Hacohen e4bcb7f90f Evas textblock: Use the last item's width, not advance, when calculating line's width and wrapping.
SVN revision: 56531
2011-01-30 10:44:42 +00:00
Tom Hacohen 8871470af7 Evas textblock: Fixed a typo in the wordwrap code.
SVN revision: 56526
2011-01-30 10:44:11 +00:00
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