kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,646 Commits 487 Branches 154 Tags 426 MiB
Commit Graph

311 Commits

Author SHA1 Message Date
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 &nbsp)


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
Carsten Haitzler 429a7ed4d9 ned textblock code finally formats and displays.. SOMETHING. this code now 
needs cleaning up as it's got a bit of copy & paste work.


SVN revision: 16065
 2005-08-08 09:01:07 +00:00
Carsten Haitzler 8ad2ab73de doing more work on tb 
SVN revision: 16037
 2005-08-05 10:08:05 +00:00
Carsten Haitzler 19ee9c1e0d i have started work on new textblock api/code - it is (for now) known as 
textblock2 (the old textblock code is still there in textblock_old and the
api is still there until we swtich over).

...

important right nwo is COMMENTs on the api. do u like it. i am tryng to
keepit simple. right nwo i am writing JUSt enought to implement the markup
set api and styles - not a lot for editing and detailed queries yet. i will
work on that once the basic markup parse, style stuff and layout is done.


SVN revision: 16017
 2005-08-03 13:07:00 +00:00
Dan Sinclair b474b11ac2 - evas_object_textblock_line_get was returning the geometry of the current 
cursor position instead of the passed in line.


SVN revision: 15871
 2005-07-23 02:10:24 +00:00
Carsten Haitzler a17aa10222 tb fix! 
SVN revision: 15778
 2005-07-14 15:23:45 +00:00
Dan Sinclair b1510056a4 - get the layout node for the position requested, not the current textblock 
position


SVN revision: 15644
 2005-07-06 01:00:41 +00:00
sebastid 3f776d358a Cleanup some headers. 
Remove duplicate typedefs and declerations.


SVN revision: 15407
 2005-06-18 01:00:32 +00:00
Carsten Haitzler 46e02cf8bb whitespace 
SVN revision: 14889
 2005-05-22 02:49:50 +00:00
Carsten Haitzler cb54bb2e60 optimisipoos. (e17's menus should be more responsive now) 
SVN revision: 14084
 2005-04-03 14:22:17 +00:00
Carsten Haitzler f047113949 dont realod ye demons of evil slowness! FIX FIX! cache you biotch! cache! 
SVN revision: 14055
 2005-04-01 07:14:16 +00:00
rbdpngn 6b21e1b171 Don't re-declare this variable in the loop. 
SVN revision: 14009
 2005-03-30 16:55:10 +00:00
rbdpngn 78939419b3 When there is formatting but no text, retrieve the height of the font. 
SVN revision: 13983
 2005-03-30 02:51:58 +00:00
Carsten Haitzler 24cb66cd71 fix! textblokc word wrap and spec.in 
SVN revision: 13686
 2005-03-11 04:54:35 +00:00
Dan Sinclair 520506a7b3 - rename function for consistency 
SVN revision: 13659
 2005-03-08 03:33:09 +00:00
rbdpngn 84c148adf6 Handle the case of querying the format when cursor position equals the length 
of the text.


SVN revision: 13599
 2005-03-04 04:54:03 +00:00
Carsten Haitzler 476e750039 off by 1 native size fixed 
SVN revision: 13558
 2005-03-02 05:22:20 +00:00
sebastid 1b051e05bc Fix format data parsing. 
Fix format merge.
font_source -> source


SVN revision: 13494
 2005-02-24 10:29:04 +00:00
tsauerbeck f8b835ea0c got rid of data subdirectory in pkgdatadir. fixed a bunch of warnings 
SVN revision: 13483
 2005-02-23 20:32:07 +00:00
Carsten Haitzler 7dbcc92602 fix some valgrind nasties - margins work... 
SVN revision: 13440
 2005-02-20 08:02:41 +00:00
Carsten Haitzler 2741c26ada fix newline with a font (size) change. add tabstop formatting... start on 
margins. not complete.


SVN revision: 13437
 2005-02-19 16:05:12 +00:00
Carsten Haitzler bd399b7aaa fix some native size stuff... 
SVN revision: 13434
 2005-02-19 05:07:11 +00:00
Carsten Haitzler 76d51ef015 tabs work... 
added align to position todo.
then margins...
then anchors...
damn... and thats like... usable and shit...


SVN revision: 13421
 2005-02-18 09:44:27 +00:00
Carsten Haitzler 24799a4270 more things taken off the list of things to do. styles seem to work.. :) 
SVN revision: 13420
 2005-02-18 06:37:24 +00:00
Carsten Haitzler 57e965aa61 working on styles - found bugs! :( 
SVN revision: 13409
 2005-02-17 13:53:19 +00:00
Carsten Haitzler c562850750 remove api that isnt functioning and wont for a while. 
SVN revision: 13404
 2005-02-16 15:38:44 +00:00
Carsten Haitzler 7b9264ecd2 and dont segv. :) 
SVN revision: 13403
 2005-02-16 14:07:39 +00:00
Carsten Haitzler 8d73bc7292 more work on textblock. the api as it stands is now complete enough for all 
things you might need textblock for for now - need to handle in-text anchors,
tabs, margins and styles.


SVN revision: 13402
 2005-02-16 13:57:41 +00:00
Carsten Haitzler 1b696a9abb complete more of textblock 
SVN revision: 13389
 2005-02-16 10:04:32 +00:00
Carsten Haitzler bcad2a82c3 working more on it... 
SVN revision: 13353
 2005-02-13 11:38:38 +00:00
Carsten Haitzler 5ff290ec01 minus some printfs' 
SVN revision: 13339
 2005-02-13 07:11:50 +00:00
Carsten Haitzler 1b5ec03990 fix segv in textblock. 
format inserts should work right... now
test inserts should work correctly now too
text delets works right in terms that they delet text. they do not handle
deleting formattign nodes correctly yet.
errr. other stuff still to do/test too


SVN revision: 13338
 2005-02-13 06:27:32 +00:00
Carsten Haitzler 0e91fa62e3 a note for moi 
SVN revision: 13328
 2005-02-12 04:33:32 +00:00
Carsten Haitzler 1947e16b36 a possible smart bug?.... and some textblock notes 
SVN revision: 13327
 2005-02-12 04:09:21 +00:00
Carsten Haitzler 111aa2936a fix shaped output (rgba dest rendering) 
SVN revision: 13308
 2005-02-11 05:33:44 +00:00
Carsten Haitzler faf319ed5e next.prev char works.. a lot works. now i have to test text insertion at any 
point, text deletion at any point... most querying seems good. also text
format insertion at any pont... but need to do format deletion and format
querying stuff... but then its back to the todo list (this wraps up current
incomplete api)...


SVN revision: 13279
 2005-02-10 09:48:45 +00:00
Carsten Haitzler 897e45fbbc fix some more stuff 
SVN revision: 13276
 2005-02-10 01:07:36 +00:00
Carsten Haitzler 69ff192055 fix format size calc - missed last line. 
SVN revision: 13275
 2005-02-10 01:02:55 +00:00
Carsten Haitzler ee21eb81ca more work on textblocks! :) 
SVN revision: 13263
 2005-02-09 16:10:56 +00:00
Carsten Haitzler fdae56474e see diff. :) 
SVN revision: 13211
 2005-02-07 02:12:36 +00:00
Carsten Haitzler 35fc57b42b underline, double underline, strikethrough and backging color support. 
query calls i think i'll do next as this will make it acrually usable.


SVN revision: 13198
 2005-02-05 15:53:58 +00:00
Carsten Haitzler e79e53e35b i worked on a regionbuf set of code (exact rectangles). i THINK it has some 
bugs... but its disabled right now and it didnt speed anything up :( but it's
there for perusal and later work anyway...


SVN revision: 13193
 2005-02-05 02:30:13 +00:00
Carsten Haitzler 34afa1d5c4 update TODO for TB. 
SVN revision: 13178
 2005-02-02 15:30:53 +00:00
Carsten Haitzler 6e881db788 werd wrap is better. it remvoes the whitepsace OVER the wrap... 
SVN revision: 13172
 2005-02-01 15:34:37 +00:00
Carsten Haitzler d4d3ee146e avoid infinite loop more aggressively? 
and some more optimising...


SVN revision: 13170
 2005-02-01 13:53:40 +00:00
Carsten Haitzler e9f525ece0 and get ourselves another 10% speedup with textblock... :) (and in fact pave 
the way for overflow objects)


SVN revision: 13169
 2005-02-01 08:23:53 +00:00
Dan Sinclair 2eded160da - fill in evas_object_textblock_text_del 
SVN revision: 13168
 2005-02-01 07:58:02 +00:00
Carsten Haitzler abdeedf082 wherd wap! 
SVN revision: 13166
 2005-02-01 07:17:00 +00:00
Carsten Haitzler 49924ef327 some more comments... 
SVN revision: 13154
 2005-01-31 16:49:13 +00:00
Carsten Haitzler 8bb90a7d47 more todo items for textblock 
SVN revision: 13153
 2005-01-31 16:16:12 +00:00
Carsten Haitzler ed98ed1746 and in one foul swoop i merged font loading code betwene text block and text 
objects... wherd!


SVN revision: 13152
 2005-01-31 15:03:38 +00:00
Carsten Haitzler 100c9a3479 massive speedup in textblock... maaaaaaaaaaasive. 
SVN revision: 13151
 2005-01-31 09:32:31 +00:00
Dan Sinclair 1eac84f967 - fill in the evas_object_textblock_text_get function 
SVN revision: 13150
 2005-01-31 04:58:41 +00:00
Carsten Haitzler c9749c97ab some extra comments for me to work on... 
SVN revision: 13149
 2005-01-31 04:10:22 +00:00
Carsten Haitzler a018fe73bf some notes as to what to do next 
SVN revision: 13139
 2005-01-30 14:48:30 +00:00
Carsten Haitzler 170a5cd97d fixing up textblock. does horiozntal and vertical (line) alignment 
SVN revision: 13138
 2005-01-30 14:19:06 +00:00
Carsten Haitzler 6a4061ae7c 1. found leak in event code - fix. 
2. fix leak in textblock - much better now


SVN revision: 13137
 2005-01-30 11:41:01 +00:00
Carsten Haitzler 010a29867e the textblock actually works. 
so far the following works:

   o = evas_object_textblock_add(evas);
   evas_object_move(o, 10, 40);
   evas_object_resize(o, win_w - 20, win_h - 50);
   evas_object_textblock_format_insert(o, "color=#000000ff");
   evas_object_textblock_format_insert(o, "font=/usr/local/share/expedite/data/Vera.ttf size=10");
   evas_object_textblock_text_insert(o, "This is 1 line. ");
   evas_object_textblock_text_insert(o, "And some more text. ");
   evas_object_textblock_format_insert(o, "size=20");
   evas_object_textblock_format_insert(o, "color=#f80");
   evas_object_textblock_text_insert(o, "Bigger orange text.");
   evas_object_textblock_format_insert(o, "size=8");
   evas_object_textblock_format_insert(o, "color=#0000ff88");
   evas_object_textblock_format_insert(o, "\n");
   evas_object_textblock_text_insert(o, "A second line of transparent blue.");
   evas_object_show(o);

i need to implement alignment handling next...


SVN revision: 13135
 2005-01-30 10:22:47 +00:00
Carsten Haitzler 0329745fd0 been working textblock... 
SVN revision: 13129
 2005-01-29 16:28:18 +00:00
Carsten Haitzler 342f0b1ee2 oooh... i found a nasty mouse grab/count/accoutning/hold etc. issue with 
events. fixed (thanks bart!) :)


SVN revision: 13023
 2005-01-20 06:54:45 +00:00
Carsten Haitzler b14fe9b889 fix oops 
SVN revision: 12830
 2005-01-08 15:25:50 +00:00
Carsten Haitzler a5e71dacbd some stubs.. thinking about how to do this... 
SVN revision: 12827
 2005-01-08 12:47:36 +00:00
Carsten Haitzler ee2346b2c8 1. move font dir to its own 
2. textblokc object stub. this is for an etxo-style text object. nothing much
there yet.


SVN revision: 12825
 2005-01-08 10:02:18 +00:00