Carsten Haitzler
59d9e81427
more textblock work/additions for entry support.
...
SVN revision: 36708
2008-10-16 09:17:37 +00:00
Cedric BAIL
1cec65e922
Switch evas internal use of evas_stringshare to eina_stringshare.
...
SVN revision: 36674
2008-10-15 14:38:34 +00:00
Carsten Haitzler
8cd80ffc56
more fixed to textblock plus an addition - reverse the markup.
...
SVN revision: 36664
2008-10-15 09:58:17 +00:00
Carsten Haitzler
8cac2fe220
fix some minor bugs in textblock with cursor pos's, text insertion etc.
...
SVN revision: 36645
2008-10-14 02:45:55 +00:00
Carsten Haitzler
0cf0cd8e15
ensure scaling multiplies are promoted to fp.
...
SVN revision: 35924
2008-09-10 06:40:54 +00:00
Carsten Haitzler
c1d838efa7
promote scale to fp.
...
SVN revision: 35920
2008-09-10 05:43:25 +00:00
Carsten Haitzler
d06c5e9efb
and add a scale factor per object. right now text and textblock use it.
...
that's about it. a bit hacky - but works and frankly.. the idea is that u'd
set a scale factor once really and not change it per obj... most likely.
SVN revision: 35896
2008-09-09 14:14:26 +00:00
Carsten Haitzler
d73b8c5d7b
updated patches from jose!
...
SVN revision: 35756
2008-08-31 02:04:31 +00:00
Carsten Haitzler
c1fe72d7e4
jose has some new gradient work - these are his patches. nice work joseg! yes
...
- some enignes break as they dont have the stubbed out functions, and
xrender/gl engines dont even implement the drawing and need to (but are
stubbed out).
SVN revision: 35677
2008-08-26 05:45:04 +00:00
Cedric BAIL
53a094e414
Correctly use the string without escaped charactere.
...
SVN revision: 35179
2008-07-21 11:20:19 +00:00
Carsten Haitzler
3242217c16
cedric rect + arrays patch for reducing allocs
...
SVN revision: 35024
2008-07-07 21:29:29 +00:00
Peter Wehrfritz
254d60b8a4
add documentation stubs for the textblock
...
SVN revision: 34935
2008-06-28 10:55:58 +00:00
Carsten Haitzler
f2aeab1bd6
fix some escaping :)
...
SVN revision: 34066
2008-03-20 21:15:16 +00:00
Gustavo Sverzut Barbieri
79a5be8ec3
Fix missing null terminator in textblock.
...
Although I used 3 lines comments to state it was not required, it is
required because none of the values accounted includes the '\0'.
SVN revision: 33940
2008-03-06 01:06:58 +00:00
Gustavo Sverzut Barbieri
23c566bb07
Cleanup textblock's strbuf implementation.
...
This should provide correct code in a simpler way by sharing some of
the common code among functions.
Tested with E17 basics, require some applications with extensive usage
of textblock manipulation to do validate results.
SVN revision: 33939
2008-03-06 00:41:47 +00:00
Gustavo Sverzut Barbieri
4bd8fdaeeb
Fix evas_object_textblock's strbuf implementation.
...
Code was not tracking the real size of the allocated memory and was
increasing the string size by one, so the '\0' was being accounted and
the string was being truncated visually.
Patch will remember the exact allocated size and just increment the
string size by the added string, not including it's null-byte
terminator.
This is based on Cedric's BAIL patch set 'evas_object_textblock more
character fix', but doing the minimum to fix the problem.
PS: this code will be rewritten to share some implementation in next commit.
SVN revision: 33937
2008-03-05 21:30:22 +00:00
Gustavo Sverzut Barbieri
4d5430d438
Add room for '\0' in textblock calculations.
...
In evas_object_textblock, the length forgot the '\0', this create a
buffer overrun.
Author: Cedric BAIL
SVN revision: 33747
2008-02-15 14:45:31 +00:00
Gustavo Sverzut Barbieri
5d571051b9
Add const to Evas api: objects and remaining bits.
...
SVN revision: 33716
2008-02-08 22:35:19 +00:00
Christopher Michael
f665bd40d6
Comment out unused function...was giving a "defined but not used" warning
...
during compile. Left function intact, just commented out, in case it was
meant for use later.
SVN revision: 33658
2008-02-01 01:45:46 +00:00
Carsten Haitzler
819e078f4d
fix infinite loop!
...
SVN revision: 31710
2007-09-13 23:16:11 +00:00
Carsten Haitzler
be1ba8873b
no need for extra nul byte check - while terminated IF its null. so known
...
condition. formatting too.
SVN revision: 30923
2007-07-21 03:06:08 +00:00
Gustavo Sverzut Barbieri
b4ab277e21
Fix bug introduced with r1.138, removed incorrect offset table.
...
I changed evas_object_textblock_text_markup_get() to just return
previously known contents, not try to recreate them set with other
means, this was not used (at least in our CVS) and was slow and
incorrect.
SVN revision: 30919
2007-07-20 22:30:12 +00:00
Carsten Haitzler
0c4af24a33
save a few bytes by packing structures better... simple savings :)
...
SVN revision: 30486
2007-06-28 23:22:20 +00:00
kiwi
a001af9e23
fix some warnings, mostly missing "void" when a function has no parameters
...
SVN revision: 30474
2007-06-27 10:57:54 +00:00
tilman
07ff938e34
rework how the html entity escape arrays are stored. this saves a few hundred bytes on the data section of the library, kills off ~300 locations, and makes the so 77K smaller.
...
SVN revision: 30012
2007-05-17 22:48:48 +00:00
tilman
840acd78a4
missing commas in important places ftl
...
SVN revision: 30001
2007-05-15 19:19:00 +00:00
tilman
936b791547
a bunch of constness fixes
...
SVN revision: 29871
2007-05-06 11:29:37 +00:00
Sebastian Dransfeld
6849defebf
Use cpp to remove code.
...
SVN revision: 27584
2006-12-28 12:23:13 +00:00
ningerso
b8416d9646
Reduce additional layout parsing overhead by using the format string without
...
copying the contents to temporary buffers. This cuts the time spent during
the layout phase in half.
SVN revision: 27270
2006-11-28 20:30:48 +00:00
ningerso
0a734352bd
Improve format parsing performance by using preloaded stringshares to do pointer
...
comparisons rather than strcmp and avoid extra malloc/free overhead. May be a
slight slow down on short simple text, but a significant improvement on longer
and more complex formatting.
SVN revision: 27268
2006-11-28 16:14:11 +00:00
Carsten Haitzler
f80a02f999
a few things.
...
1. disable viewports other than 1:1 at 0,0
2. remove output space coorsds for pointer.
3. remove geom caching
4. make threaded pipelined engine a runtime detect if u have > 1 cpu.
5. pthread build default if u have pthread.h and sched.h
SVN revision: 27131
2006-11-16 03:20:24 +00:00
Carsten Haitzler
8c93e825a8
same as previous commit.
...
SVN revision: 26236
2006-09-30 10:18:37 +00:00
Carsten Haitzler
7f41aeb177
fix some warnings!
...
SVN revision: 24599
2006-08-12 14:46:15 +00:00
sebastid
a17c875ddc
Add const.
...
Remove unused variables.
SVN revision: 23027
2006-05-31 18:33:46 +00:00
Carsten Haitzler
c9738a1395
illogict patch for more escapes :)
...
SVN revision: 22541
2006-05-11 23:46:54 +00:00
moom
d2dbafa095
* The textblock object now gets its color multiplied by the color of its
...
clip object.
SVN revision: 22530
2006-05-11 12:55:04 +00:00
Carsten Haitzler
f51753a4b8
rehinting works on the fly now
...
SVN revision: 20858
2006-03-01 03:48:03 +00:00
Christopher Michael
e70d9a0a03
Check that the Textblock_Line exists first before trying to free or else segv
...
SVN revision: 19903
2006-01-19 14:16:47 +00:00
sebastid
3e41ec2fbd
Remove EAPI warnings.
...
Remove duplicate defines.
SVN revision: 19579
2006-01-06 23:05:17 +00:00
Carsten Haitzler
1d9ef01856
oops - textblock badness with alloca
...
SVN revision: 18778
2005-12-02 03:20:56 +00:00
Dan Sinclair
470cf87824
- this fixes a problem in ewl where you couldn't click to put the cursor on
...
the end of the first line
SVN revision: 18747
2005-12-01 06:18:43 +00:00
Carsten Haitzler
3621124677
stringshare works! :)
...
SVN revision: 18724
2005-11-30 08:45:20 +00:00
Carsten Haitzler
7ea7bdf610
disable stringshare... something fishy.
...
SVN revision: 18698
2005-11-29 09:02:51 +00:00
Carsten Haitzler
96015f59ab
use stringshare too
...
SVN revision: 18680
2005-11-28 15:30:07 +00:00
rbdpngn
74dc468be3
Create a shared style type enum and padding mapping function.
...
Implement styles for the text object.
Add soft outline text style to text and textblock.
SVN revision: 18644
2005-11-26 08:04:20 +00:00
Carsten Haitzler
59bbe6cf2d
move pow lut table to read only shared memory
...
SVN revision: 18628
2005-11-24 04:40:14 +00:00
Carsten Haitzler
83f010591d
no more old textblock - gone. completely. tb2 renamed (as threatened) to
...
textblock. updated edje and e17.
SVN revision: 18054
2005-10-28 02:56:27 +00:00
Carsten Haitzler
d4db65df1f
empty string SHOULD work now if the node is non exiustant to start with
...
SVN revision: 18053
2005-10-28 02:46:16 +00:00
Dan Sinclair
ef2fcdc4c1
- make sure we have a name before trying to look it up
...
- strip off an + or - in _format_fill so we don't end up with things like
+font=fonts/Vera which then won't match when we try to recognize it as a
keyword
SVN revision: 17580
2005-10-15 22:02:59 +00:00
sebastid
ed1aa8117a
Simpler check for 0 stringlength.
...
SVN revision: 17564
2005-10-15 06:54:42 +00:00
Dan Sinclair
051b5f6fc7
- make sure the string isn't blank before appending it
...
SVN revision: 17560
2005-10-15 05:19:11 +00:00
Carsten Haitzler
5f828e6fdb
dont allow non-defaulted formats
...
SVN revision: 17558
2005-10-15 04:42:46 +00:00
tsauerbeck
72883bc3de
more warning fixes
...
SVN revision: 17314
2005-10-08 10:43:14 +00:00
Carsten Haitzler
2d9ae536fb
fix fallback handling! :)
...
SVN revision: 16837
2005-09-22 03:00:48 +00:00
sebastid
bd8aaeeeab
Use right HEAD
...
SVN revision: 16804
2005-09-20 16:59:39 +00:00
Carsten Haitzler
0e90a7998e
fix spaces at start of nodes and lines
...
SVN revision: 16753
2005-09-18 12:42:34 +00:00
Carsten Haitzler
b515892939
fix tb2 move redraws
...
SVN revision: 16751
2005-09-18 11:55:51 +00:00
Carsten Haitzler
a50a655192
handle null string
...
SVN revision: 16743
2005-09-18 05:36:28 +00:00
Carsten Haitzler
6691ae8d14
unneeded var
...
SVN revision: 16718
2005-09-14 14:09:45 +00:00
Carsten Haitzler
09d13ac450
actualyl don't need that. it's already de-escaped
...
SVN revision: 16717
2005-09-14 14:08:02 +00:00
Carsten Haitzler
f4337d5358
more escape handling
...
SVN revision: 16716
2005-09-14 13:45:12 +00:00
Carsten Haitzler
7141435c0d
um cleanups.
...
SVN revision: 16715
2005-09-14 13:13:55 +00:00
Carsten Haitzler
e7a8b5f8f7
printf--
...
SVN revision: 16714
2005-09-14 12:55:02 +00:00
Carsten Haitzler
7de686b25d
dont need quote games there. we have escapes
...
SVN revision: 16713
2005-09-14 12:44:33 +00:00
Carsten Haitzler
39cbd8d7de
accept escapes (\\, \", \', \ , etc.)
...
SVN revision: 16712
2005-09-14 12:37:42 +00:00
Carsten Haitzler
7fa72f80e0
handle unfound fonts
...
SVN revision: 16710
2005-09-14 09:01:26 +00:00
Carsten Haitzler
65db7141f8
hmm thats better - cursor to STARt when settign markyp
...
SVN revision: 16697
2005-09-12 08:57:38 +00:00
Carsten Haitzler
37d8934a0e
text range get works. u can gety it INLCUDING \n's and \t's (simple
...
formatting) as plain text - for u dj2! :)
SVN revision: 16684
2005-09-11 03:23:11 +00:00
Carsten Haitzler
79127a2267
more tb2 work! :)
...
SVN revision: 16675
2005-09-10 11:51:52 +00:00
Carsten Haitzler
b672283702
tb2 work! :)
...
SVN revision: 16671
2005-09-09 14:19:06 +00:00
Carsten Haitzler
ef551b1126
fix some whitespace wrapping mojo
...
SVN revision: 16544
2005-09-05 09:03:01 +00:00
Carsten Haitzler
3c0b9cc34d
ok ok - they look ugly, but handle bitmap fonts! :(
...
SVN revision: 16542
2005-09-05 08:01:15 +00:00
Carsten Haitzler
904063a099
tb2 work
...
SVN revision: 16521
2005-09-04 11:34:03 +00:00
Carsten Haitzler
e62fcac4f3
more tb2 work!
...
SVN revision: 16467
2005-09-02 15:27:09 +00:00
Carsten Haitzler
5fc8d291e1
fix some leaks, bugs and add api calls that work! :)
...
SVN revision: 16432
2005-08-30 15:19:39 +00:00
Carsten Haitzler
5236734f1d
remove debugging rect
...
SVN revision: 16393
2005-08-29 05:21:07 +00:00
Carsten Haitzler
edde2b8cdb
and fix format prepend
...
SVN revision: 16391
2005-08-28 14:01:02 +00:00
Carsten Haitzler
741bd8b53f
fix tab line wrapping and make format append/prepend work properly with
...
cursor pos
SVN revision: 16390
2005-08-28 13:56:37 +00:00
Carsten Haitzler
f2501ae4f1
tb2 work
...
SVN revision: 16389
2005-08-28 06:41:54 +00:00
Carsten Haitzler
44e0a11a43
fix parse error when there are no tags... :)
...
SVN revision: 16345
2005-08-25 15:23:16 +00:00
Carsten Haitzler
e8973254f1
you can query certain format nodes - like \n and \t... :)
...
SVN revision: 16252
2005-08-21 05:13:49 +00:00
Carsten Haitzler
c50dc66ff5
more tb2!
...
SVN revision: 16241
2005-08-20 08:01:59 +00:00
Carsten Haitzler
52f8f3be64
some more work on tb2
...
SVN revision: 16234
2005-08-18 15:59:42 +00:00
Carsten Haitzler
a1824f418a
remove debug rect
...
SVN revision: 16206
2005-08-16 09:42:15 +00:00
Carsten Haitzler
9d59f70dc9
ok - fix up stikethrough over linewraps
...
SVN revision: 16205
2005-08-16 09:40:15 +00:00
Carsten Haitzler
d6cf617743
fix valgrind errors
...
SVN revision: 16204
2005-08-16 09:25:48 +00:00
Carsten Haitzler
0f46654c51
and well.. now tb2 handles all the most important formattign tb1 did. that's
...
about it here for formatting. time to fix up 2 nigglies (no working  )
SVN revision: 16200
2005-08-16 08:12:14 +00:00
Carsten Haitzler
73c48f5030
handle tabs.. (jump to next tabstop)
...
SVN revision: 16187
2005-08-15 15:39:31 +00:00
Carsten Haitzler
e349816cf4
valign and parse styles, underline etc. no rendering ... yet
...
SVN revision: 16186
2005-08-15 15:30:30 +00:00
Carsten Haitzler
da99126da6
and double tb2's layout speed...
...
SVN revision: 16184
2005-08-15 12:46:16 +00:00
Carsten Haitzler
68e0498c7d
margins... werdibubble
...
SVN revision: 16176
2005-08-15 09:43:53 +00:00
Carsten Haitzler
6c4f7aa449
tb2 is now mostly behaving with formatting. excellent.
...
SVN revision: 16173
2005-08-15 07:39:03 +00:00
Carsten Haitzler
490ac9c666
aaargh! dealing with lots of little niggly things - and i havent' even
...
addressed the main issue of a word spanning over mutliple format nodes. i
have printf's where they should be handled now (and should later do a return
from). but i have yet to unwind the format list back to the word start, split
there, adjust now split line item, generate new start line item - new line
and then re-append all format items on the next line...
SVN revision: 16150
2005-08-14 15:48:07 +00:00
Carsten Haitzler
bd0afc6a61
textblock work
...
SVN revision: 16130
2005-08-13 13:43:20 +00:00
Carsten Haitzler
ed7b439c3c
printf--
...
SVN revision: 16106
2005-08-11 14:39:15 +00:00
Carsten Haitzler
1e7b430dfd
working on tb2
...
SVN revision: 16105
2005-08-11 13:50:37 +00:00
Carsten Haitzler
64f2e98808
get rid of most whitespace. still need to handle end conditions
...
SVN revision: 16073
2005-08-08 15:41:38 +00:00
Carsten Haitzler
88f6f9e7a1
printf--
...
SVN revision: 16072
2005-08-08 14:36:12 +00:00
Carsten Haitzler
f6bd182cee
wrap correctly
...
SVN revision: 16069
2005-08-08 12:43:59 +00:00
Carsten Haitzler
49c10b4a6a
word wrap works (mostly)
...
SVN revision: 16066
2005-08-08 10:55:35 +00:00