summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-12-11 13:04:21 +0900
committerHermet Park <hermetpark@gmail.com>2019-12-11 13:04:21 +0900
commit421836c1166dbc2c5c54fe9497766bab2cb979bc (patch)
treef9809f606fa9a7e1341781cdf5042016c4db895e
parent6fa91c71d8c63573883f57e397e788606029ba43 (diff)
parent3359e03500d63eb7b0384e6cf10e92e0f3a736ef (diff)
Merge branch 'master' into devs/hermet/lottie
-rw-r--r--.mailmap68
-rw-r--r--doc/ecore_examples.dox10
-rwxr-xr-xdoc/efl_copy.sh1
-rw-r--r--doc/meson.build11
-rw-r--r--src/bin/elementary/test.c6
-rw-r--r--src/bin/elementary/test_efl_gfx_vg_value_provider.c22
-rw-r--r--src/bin/elementary/test_efl_ui_animation_view.c6
-rw-r--r--src/bin/elementary/test_efl_ui_text.c22
-rw-r--r--src/bin/elementary/test_gfx_filters.c10
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_photocam.c4
-rw-r--r--src/bin/elementary/test_ui_clock.c4
-rw-r--r--src/bin/elementary/test_ui_frame.c6
-rw-r--r--src/bin/elementary/test_ui_image.c12
-rw-r--r--src/bin/elementary/test_ui_relative_container.c12
-rw-r--r--src/bin/elementary/test_ui_slider.c14
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c12
-rw-r--r--src/bin/elementary/test_win_dialog.c8
-rw-r--r--src/bin/eolian_mono/eolian/mono/events.hh12
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_annotation.hh16
-rw-r--r--src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh5
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_impl.hh20
-rw-r--r--src/bin/eolian_mono/eolian/mono/type_match.hh46
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c10
-rw-r--r--src/examples/elementary/efl_ui_unit_converter.cs10
-rw-r--r--src/examples/elementary/table_cxx_example_01.cc8
-rw-r--r--src/lib/ecore_con/Ecore_Con.h6
-rw-r--r--src/lib/ector/software/ector_software_buffer.c2
-rw-r--r--src/lib/eina/eina_hash.h4
-rw-r--r--src/lib/eina/eina_inline_value.x6
-rw-r--r--src/lib/eina/eina_inlist.h8
-rw-r--r--src/lib/eina/eina_list.h40
-rw-r--r--src/lib/elementary/Efl_Ui.h4
-rw-r--r--src/lib/elementary/efl_ui_clock.c4
-rw-r--r--src/lib/elementary/efl_ui_tags.c4
-rw-r--r--src/lib/elementary/efl_ui_text_async.eo9
-rw-r--r--src/lib/elementary/efl_ui_textbox.c (renamed from src/lib/elementary/efl_ui_text.c)344
-rw-r--r--src/lib/elementary/efl_ui_textbox.eo (renamed from src/lib/elementary/efl_ui_text.eo)2
-rw-r--r--src/lib/elementary/efl_ui_textbox_async.eo9
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c12
-rw-r--r--src/lib/elementary/elm_entry.c8
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/elementary/meson.build6
-rw-r--r--src/lib/evas/Evas_Common.h10
44 files changed, 454 insertions, 389 deletions
diff --git a/.mailmap b/.mailmap
index e684e0b..354eab2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,9 +16,11 @@ Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
16Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr> 16Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
17Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent dot torri at gmail dot com> 17Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent dot torri at gmail dot com>
18Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent.torri@univ-evry.fr> 18Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent.torri@univ-evry.fr>
19Vincent Torri <vincent.torri@gmail.com> Vincent 'vtorri' Torri <vincent.torri@gmail.com>
19Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com> 20Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
20Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com> 21Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
21Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi> 22Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
23Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com>
22Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net> 24Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
23Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com> 25Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
24Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net> 26Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
@@ -28,6 +30,7 @@ Christopher Michael <devilhorns@comcast.net> Christopher <devilhorns@comcast.net
28Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com> 30Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
29Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com> 31Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
30Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com> 32Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com>
33Christopher Michael <devilhorns@comcast.net> Chris Micheal <cp.michael@samsung.com>
31Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no> 34Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
32Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid> 35Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
33Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com> 36Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>
@@ -35,13 +38,21 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com> discomfitor <michael.blumenkr
35Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com> 38Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com>
36Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com> 39Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com>
37Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com> 40Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com>
41Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Michael Blumenkrantz <mike@zentific.com>
42Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@enlightenment.org>
38ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com> 43ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com>
39ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermet@hermet.pe.kr> 44ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermet@hermet.pe.kr>
45ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermetpark@gmail.com>
46ChunEon Park <hermet@hermet.pe.kr> hermet <hermet@neoni.(none)>
47ChunEon Park <hermet@hermet.pe.kr> Hermet <hermet@hermet.pe.kr>
48ChunEon Park <hermet@hermet.pe.kr> chuneon.park <chuneon.park@samsung.com>
40David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au> 49David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au>
41Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com> 50Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com>
42Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@linux.intel.com> 51Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@linux.intel.com>
43Iván Briano <sachieru@gmail.com> Ivan Briano <ivan.briano@intel.com> 52Iván Briano <sachieru@gmail.com> Ivan Briano <ivan.briano@intel.com>
44Iván Briano <sachieru@gmail.com> Ivan Briano <sachieru@gmail.com> 53Iván Briano <sachieru@gmail.com> Ivan Briano <sachieru@gmail.com>
54Iván Briano <sachieru@gmail.com> Iván Briano <ivan.briano@intel.com>
55Iván Briano <sachieru@gmail.com> Ivan Briano <ivan@profusion.mobi>
45Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.de.marchi@gmail.com> 56Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.de.marchi@gmail.com>
46Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.demarchi@intel.com> 57Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.demarchi@intel.com>
47Jihoon Kim <imfine98@gmail.com> Jihoon Kim <jihoon48.kim@samsung.com> 58Jihoon Kim <imfine98@gmail.com> Jihoon Kim <jihoon48.kim@samsung.com>
@@ -60,21 +71,29 @@ Mike McCormack <mike@atratus.org> Mike McCormack <mj.mccormack@samsung.com>
60Mike McCormack <mike@atratus.org> Mike McCormack <mikem@ring3k.org> 71Mike McCormack <mike@atratus.org> Mike McCormack <mikem@ring3k.org>
61Mike McCormack <mike@atratus.org> Mike McCormack <mikem@atratus.org> 72Mike McCormack <mike@atratus.org> Mike McCormack <mikem@atratus.org>
62Boris Faure <billiob@gmail.com> Boris 'billiob' Faure <billiob@gmail.com> 73Boris Faure <billiob@gmail.com> Boris 'billiob' Faure <billiob@gmail.com>
74Boris Faure <billiob@gmail.com> Boris Faure <boris@fau.re>
63Eduardo Lima <eduardo.lima@intel.com> Eduardo Lima (Etrunko) <eduardo.lima@intel.com> 75Eduardo Lima <eduardo.lima@intel.com> Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
64Panagiotis Galatsanos <galatsanosp@gmail.com> Godfath3r <galatsanosp@gmail.com> 76Panagiotis Galatsanos <galatsanosp@gmail.com> Godfath3r <galatsanosp@gmail.com>
65Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis@gmail.com> 77Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis@gmail.com>
66Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive@gmail.com> 78Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive@gmail.com>
67Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com> 79Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
68Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com> 80Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@gmail.com>
69Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de> 81Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
82Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@openwide.fr>
83Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean@guyomarch.bzh>
84Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
85Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel-hollerbach@t-online.de>
86Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel@osg.samsung.com>
70Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com> 87Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
71Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org> 88Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
72Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org> 89Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
90Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe André <jpeg@videolan.org>
73Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com> 91Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
74Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com> 92Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
75Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com> 93Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
76Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com> 94Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
77Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com> 95Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
96Tae-Hwan Kim <the81.kim@samsung.com> bluezery <the81.kim@samsung.com>
78Daniel Kolesa <daniel@octaforge.org> q66 <quaker66@gmail.com> 97Daniel Kolesa <daniel@octaforge.org> q66 <quaker66@gmail.com>
79Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@samsung.com> 98Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@samsung.com>
80Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@osg.samsung.com> 99Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@osg.samsung.com>
@@ -91,7 +110,52 @@ Daniel Zaoui <daniel.zaoui@samsung.com> Daniel Zaoui <daniel.zaoui@yahoo.com>
91Daniel Zaoui <daniel.zaoui@samsung.com> daniel.zaoui@samsung.com <daniel.zaoui@samsung.com> 110Daniel Zaoui <daniel.zaoui@samsung.com> daniel.zaoui@samsung.com <daniel.zaoui@samsung.com>
92Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com> 111Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com>
93Andy Williams <andy@andywilliams.me> handyande <handyande> 112Andy Williams <andy@andywilliams.me> handyande <handyande>
113Andy Williams <andy@andywilliams.me> Andy Williams <andy@andywillias.me>
94Davide Andreoli <dave@gurumeditation.it> Dave Andreoli <dave@gurumeditation.it> 114Davide Andreoli <dave@gurumeditation.it> Dave Andreoli <dave@gurumeditation.it>
95Davide Andreoli <dave@gurumeditation.it> davemds <dave@gurumeditation.it> 115Davide Andreoli <dave@gurumeditation.it> davemds <dave@gurumeditation.it>
96Simon Lees <simon@simotek.net> Simon <simon@simotek.net> 116Simon Lees <simon@simotek.net> Simon <simon@simotek.net>
97Simon Lees <simon@simotek.net> Simon Lees (SUSE) <sflees@suse.de> 117Simon Lees <simon@simotek.net> Simon Lees (SUSE) <sflees@suse.de>
118Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
119Subhransu Mohanty <sub.mohanty@samsung.com> Subhransu Sekhar Mohanty <sub.mohanty@samsung.com>
120Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
121Subhransu Mohanty <sub.mohanty@samsung.com> sub.mohanty@samsung.com <sub.mohanty@samsung.com>
122Subhransu Mohanty <sub.mohanty@samsung.com> subhransu <subhransu@subhransu-System.(none)>
123Subhransu Mohanty <sub.mohanty@samsung.com> subhransu mohanty <sub.mohanty@samsung.com>
124Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@samsung.com>
125Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@gmail.com>
126Thiep Ha <thiepha@gmail.com> thiepha (Thiep Ha) <thiepha@gmail.com>
127Derek Foreman <derekf@osg.samsung.com> Derek Foreman <derek.foreman.samsung@gmail.com>
128Daniel Hirt <hirt.danny@gmail.com> Daniel Hirt <daniel.hirt@samsung.com>
129Jiyoun Park <jijibe99@gmail.com> Ji-Youn Park <jy0703.park@samsung.com>
130Jiyoun Park <jijibe99@gmail.com> Jiyoun Park <jy0703.park@samsung.com>
131Bruno da Silva Belo <brunodasilvabelo@gmail.com> Bruno da Silva Belo <bruno.belo@expertisesolutions.com.br>
132Rafael Fonseca <rfonseca@profusion.mobi> Rafael Fonseca <r4f4rfs@gmail.com>
133Lauro Moura <lauromoura@expertisesolutions.com.br> Lauro Moura <lauromoura@gmail.com>
134Jaehyun Cho <jae_hyun.cho@samsung.com> Jaehyun Cho <jae_hyun_cho@naver.com>
135Jérémy Zurcher <jeremy@asynk.ch> Jeremy Zurcher <jeremy@asynk.ch>
136Youngbok Shin <youngb.shin@samsung.com> Youngbok Shin <youngb.shin@samsung.net>
137Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen okra Houston <smhouston88@gmail.com>
138Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <smhouston88@gmail.com>
139Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@localhost.localdomain>
140Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@lenovo.fedora>
141Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@stephen.laptop>
142WooHyun Jung <wh0705.jung@samsung.com> WooHyun Jung <woohyun0705@gmail.com>
143Jaeun Choi <jaeun12.choi@samsung.com> Jaeun Choi <jaeun_choi@naver.com>
144Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud (yoz) <yoz@efl.so>
145Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud <yoz@efl.so>
146Michael BOUCHAUD <michael.bouchaud@gmail.com> michael bouchaud <michael.bouchaud@gmail.com>
147Michael Jennings <mej@kainx.org> Michael Jennings <mej@lbl.gov>
148Taehyub Kim <taehyub.kim@samsung.com> taehyub <taehyub.kim@samsung.com>
149Yury Usishchev <y.usishchev@samsung.com> Yury Usischev <y.usishchev@samsung.com>
150Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <l.stanislaws@AMDC2785.digital.local>
151Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <lukasz.stanislawski@gmail.com>
152Ryuan Choi <ryuan.choi@gmail.com> Ryuan Choi <ryuan.choi@samsung.com>
153Bryce Harrington <bryce@osg.samsung.com> Bryce Harrington <bryce@bryceharrington.org>
154Jonathan Atton <jonathan.atton@gmail.com> Atton Jonathan <jonathan.atton@gmail.com>
155Yeongjong Lee <yj34.lee@samsung.com> YeongJong Lee <yj34.lee@samsung.com>
156Jaehwan Kim <jae.hwan.kim@samsung.com> Jaehwan Kim <jae.hwan.kim.neo@gmail.com>
157Jaehwan Kim <jae.hwan.kim@samsung.com> Jae Hwan Kim <jae.hwan.kim@samsung.com>
158Jaehwan Kim <jae.hwan.kim@samsung.com> 김재환 <jae.hwan.kim@samsung.com>
159Jee-Yong Um <jc9.um@samsung.com> Jeeyong Um <jc9.um@samsung.com>
160Savio Sena <savio@expertisesolutions.com.br> Savio S. Machado <savio.sena@acm.org>
161Savio Sena <savio@expertisesolutions.com.br> Savio Sena <savio.sena@acm.org>
diff --git a/doc/ecore_examples.dox b/doc/ecore_examples.dox
index 6454277..c02de6f 100644
--- a/doc/ecore_examples.dox
+++ b/doc/ecore_examples.dox
@@ -813,12 +813,9 @@
813 * 813 *
814 * This example will start a server and start accepting connections from clients, as 814 * This example will start a server and start accepting connections from clients, as
815 * demonstrated in the following diagram: 815 * demonstrated in the following diagram:
816 * @htmlonly
817 * <img src="ecore_con-client-server-example.png" style="max-width: 400px"/>
818 * <a href="ecore_con-client-server-example.png">Full size</a>
819 * @endhtmlonly
820 * 816 *
821 * @image rtf ecore_con-client-server-example.png 817 * @image rtf ecore_con-client-server-example.png
818 * @image html ecore_con-client-server-example.png
822 * @image latex ecore_con-client-server-example.eps width=\textwidth 819 * @image latex ecore_con-client-server-example.eps width=\textwidth
823 * 820 *
824 * @note This example contains a serious security flaw: it doesn't check for the 821 * @note This example contains a serious security flaw: it doesn't check for the
@@ -877,12 +874,9 @@
877 * 874 *
878 * This example will connect to the server and start comunicating with it, as 875 * This example will connect to the server and start comunicating with it, as
879 * demonstrated in the following diagram: 876 * demonstrated in the following diagram:
880 * @htmlonly
881 * <img src="ecore_con-client-server-example2.png" style="max-width: 400px"/>
882 * <a href="ecore_con-client-server-example2.png">Full size</a>
883 * @endhtmlonly
884 * 877 *
885 * @image rtf ecore_con-client-server-example2.png 878 * @image rtf ecore_con-client-server-example2.png
879 * @image html ecore_con-client-server-example2.png
886 * @image latex ecore_con-client-server-example2.eps width=\textwidth 880 * @image latex ecore_con-client-server-example2.eps width=\textwidth
887 * 881 *
888 * @note This example contains a serious security flaw: it doesn't check for the 882 * @note This example contains a serious security flaw: it doesn't check for the
diff --git a/doc/efl_copy.sh b/doc/efl_copy.sh
deleted file mode 100755
index af975fb..0000000
--- a/doc/efl_copy.sh
+++ /dev/null
@@ -1 +0,0 @@
1cp $@
diff --git a/doc/meson.build b/doc/meson.build
index 18b9aee..5ad3898 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -104,8 +104,6 @@ widget_preview_eps = custom_target('widget_preview_prefs_epc',
104 104
105shot_sh = find_program('shot.sh') 105shot_sh = find_program('shot.sh')
106tar = find_program('tar') 106tar = find_program('tar')
107efl_copy = find_program('efl_copy.sh')
108
109foreach text_filter_property : text_filter_properties 107foreach text_filter_property : text_filter_properties
110 text = text_filter_property[0] 108 text = text_filter_property[0]
111 font = text_filter_property[1] 109 font = text_filter_property[1]
@@ -182,17 +180,10 @@ doc_target += custom_target('doxygen',
182 build_by_default: false 180 build_by_default: false
183) 181)
184 182
185# This is not pretty but meson does not seem to allow wildcards in plain cp commands
186copy_images = custom_target('documentation images',
187 command: [efl_copy, '-rf', join_paths(meson.current_source_dir(), 'img', '*.png'), 'html'],
188 output: ['empty_img_copy'],
189 build_by_default: false
190)
191
192compress_target = custom_target('package_doc_tar', 183compress_target = custom_target('package_doc_tar',
193 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'], 184 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
194 output: 'efl-'+meson.project_version()+'-doc.tar.xz', 185 output: 'efl-'+meson.project_version()+'-doc.tar.xz',
195 depends: [doc_target, copy_images], 186 depends: [doc_target],
196 build_by_default: false 187 build_by_default: false
197) 188)
198 189
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 1d91bf5..355a5cc 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -937,9 +937,9 @@ add_tests:
937 ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2); 937 ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
938 ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon); 938 ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon);
939 ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password); 939 ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password);
940 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text", test_efl_ui_text); 940 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox", test_efl_ui_text);
941 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Input Field", test_efl_ui_text_inputfield); 941 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Input Field", test_efl_ui_text_inputfield);
942 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Label", test_efl_ui_text_label); 942 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Label", test_efl_ui_text_label);
943 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags); 943 ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags);
944 944
945 //------------------------------// 945 //------------------------------//
diff --git a/src/bin/elementary/test_efl_gfx_vg_value_provider.c b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
index 7f5add0..9a800e7 100644
--- a/src/bin/elementary/test_efl_gfx_vg_value_provider.c
+++ b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
@@ -258,7 +258,7 @@ void values_input(Eo* box, const char* type)
258 char color_text[4][2] = { "R", "G", "B", "A" }; 258 char color_text[4][2] = { "R", "G", "B", "A" };
259 for (int i = 0; i < 4; i++) 259 for (int i = 0; i < 4; i++)
260 { 260 {
261 values[i] = efl_add(EFL_UI_TEXT_CLASS, box, 261 values[i] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
262 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 262 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
263 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 263 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
264 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 264 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -270,7 +270,7 @@ void values_input(Eo* box, const char* type)
270 } 270 }
271 else if (!strcmp(type, "StrokeWidth")) 271 else if (!strcmp(type, "StrokeWidth"))
272 { 272 {
273 values[0] = efl_add(EFL_UI_TEXT_CLASS, box, 273 values[0] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
274 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 274 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
275 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 275 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
276 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 276 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -310,7 +310,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
310 efl_content_set(win, efl_added)); 310 efl_content_set(win, efl_added));
311 311
312 //Create a label to show state of animation 312 //Create a label to show state of animation
313 label = efl_add(EFL_UI_TEXT_CLASS, win, 313 label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
314 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 314 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
315 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 315 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
316 efl_pack(box, efl_added)); 316 efl_pack(box, efl_added));
@@ -329,7 +329,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
329 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 329 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
330 efl_pack(box, efl_added)); 330 efl_pack(box, efl_added));
331 //Path 331 //Path
332 efl_add(EFL_UI_TEXT_CLASS, box_sub, 332 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
333 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 333 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
334 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 334 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
335 efl_text_set(efl_added, "Path examples : three_box.json\n" 335 efl_text_set(efl_added, "Path examples : three_box.json\n"
@@ -346,7 +346,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
346 efl_text_multiline_set(efl_added, EINA_TRUE), 346 efl_text_multiline_set(efl_added, EINA_TRUE),
347 efl_pack(box_sub, efl_added)); 347 efl_pack(box_sub, efl_added));
348 348
349 efl_add(EFL_UI_TEXT_CLASS, box_sub, 349 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
350 efl_gfx_hint_weight_set(efl_added, 0, 0), 350 efl_gfx_hint_weight_set(efl_added, 0, 0),
351 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 351 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
352 efl_text_set(efl_added, "[Value Provider]"), 352 efl_text_set(efl_added, "[Value Provider]"),
@@ -361,7 +361,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
361 efl_pack(box, efl_added)); 361 efl_pack(box, efl_added));
362 362
363 //Path 363 //Path
364 efl_add(EFL_UI_TEXT_CLASS, box_sub, 364 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
365 efl_gfx_hint_weight_set(efl_added, 0, 0), 365 efl_gfx_hint_weight_set(efl_added, 0, 0),
366 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 366 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
367 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 367 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -369,7 +369,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
369 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 369 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
370 efl_pack(box_sub, efl_added)); 370 efl_pack(box_sub, efl_added));
371 371
372 path_entry = efl_add(EFL_UI_TEXT_CLASS, box_sub, 372 path_entry = efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
373 efl_gfx_hint_weight_set(efl_added, 0.1, 0), 373 efl_gfx_hint_weight_set(efl_added, 0.1, 0),
374 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 374 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
375 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 375 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -378,7 +378,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
378 efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10)); 378 efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10));
379 efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) "); 379 efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) ");
380 380
381 efl_add(EFL_UI_TEXT_CLASS, box_sub, 381 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
382 efl_gfx_hint_weight_set(efl_added, 0, 0), 382 efl_gfx_hint_weight_set(efl_added, 0, 0),
383 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 383 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
384 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 384 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -398,7 +398,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
398 elm_object_focus_set(type_hoversel, EINA_TRUE); 398 elm_object_focus_set(type_hoversel, EINA_TRUE);
399 efl_pack(box_sub, type_hoversel); 399 efl_pack(box_sub, type_hoversel);
400 400
401 efl_add(EFL_UI_TEXT_CLASS, box_sub, 401 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
402 efl_gfx_hint_weight_set(efl_added, 0, 0), 402 efl_gfx_hint_weight_set(efl_added, 0, 0),
403 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 403 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
404 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 404 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -479,7 +479,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
479 479
480 //Duration Text 480 //Duration Text
481 snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view)); 481 snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
482 efl_add(EFL_UI_TEXT_CLASS, box_sub, 482 efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
483 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 483 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
484 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 484 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
485 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 485 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -583,7 +583,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
583 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), 583 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
584 efl_content_set(win, efl_added)); 584 efl_content_set(win, efl_added));
585 585
586 efl_add(EFL_UI_TEXT_CLASS, win, 586 efl_add(EFL_UI_TEXTBOX_CLASS, win,
587 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 587 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
588 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 588 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
589 efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"), 589 efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),
diff --git a/src/bin/elementary/test_efl_ui_animation_view.c b/src/bin/elementary/test_efl_ui_animation_view.c
index b4a12a4..9dc2352 100644
--- a/src/bin/elementary/test_efl_ui_animation_view.c
+++ b/src/bin/elementary/test_efl_ui_animation_view.c
@@ -151,7 +151,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
151 efl_content_set(win, efl_added)); 151 efl_content_set(win, efl_added));
152 152
153 //Create a label to show state of animation 153 //Create a label to show state of animation
154 label = efl_add(EFL_UI_TEXT_CLASS, win, 154 label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
155 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 155 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
156 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 156 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
157 efl_pack(box, efl_added)); 157 efl_pack(box, efl_added));
@@ -201,7 +201,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
201 201
202 //Duration Text 202 //Duration Text
203 snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view)); 203 snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
204 efl_add(EFL_UI_TEXT_CLASS, box2, 204 efl_add(EFL_UI_TEXTBOX_CLASS, box2,
205 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0), 205 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
206 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 206 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
207 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), 207 efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@@ -304,7 +304,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
304 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), 304 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
305 efl_content_set(win, efl_added)); 305 efl_content_set(win, efl_added));
306 306
307 efl_add(EFL_UI_TEXT_CLASS, win, 307 efl_add(EFL_UI_TEXTBOX_CLASS, win,
308 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1), 308 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
309 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE), 309 efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
310 efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"), 310 efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 24870b5..40b88bf 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -11,8 +11,8 @@ _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
11{ 11{
12 Efl_Text_Cursor *start, *end; 12 Efl_Text_Cursor *start, *end;
13 13
14 start = efl_ui_text_cursor_create(obj); 14 start = efl_ui_textbox_cursor_create(obj);
15 end = efl_ui_text_cursor_create(obj); 15 end = efl_ui_textbox_cursor_create(obj);
16 16
17 efl_text_cursor_position_set(start, start_pos); 17 efl_text_cursor_position_set(start, start_pos);
18 efl_text_cursor_position_set(end, end_pos); 18 efl_text_cursor_position_set(end, end_pos);
@@ -27,8 +27,8 @@ static Eo *
27_create_label(Eo *win, Eo *bx) 27_create_label(Eo *win, Eo *bx)
28{ 28{
29 Eo *en; 29 Eo *en;
30 en = efl_add(EFL_UI_TEXT_CLASS, win); 30 en = efl_add(EFL_UI_TEXTBOX_CLASS, win);
31 printf("Added Efl.Ui.Text object\n"); 31 printf("Added Efl.Ui.Textbox object\n");
32 efl_text_interactive_editable_set(en, EINA_FALSE); 32 efl_text_interactive_editable_set(en, EINA_FALSE);
33 efl_pack(bx, en); 33 efl_pack(bx, en);
34 return en; 34 return en;
@@ -156,13 +156,13 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
156 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 156 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
157 efl_content_set(win, bx); 157 efl_content_set(win, bx);
158 158
159 en = efl_add(EFL_UI_TEXT_CLASS, bx, 159 en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
160 efl_text_multiline_set(efl_added, EINA_TRUE)); 160 efl_text_multiline_set(efl_added, EINA_TRUE));
161 161
162 printf("Added Efl.Ui.Text object\n"); 162 printf("Added Efl.Ui.Textbox object\n");
163 163
164 efl_text_interactive_editable_set(en, EINA_TRUE); 164 efl_text_interactive_editable_set(en, EINA_TRUE);
165 efl_ui_text_scrollable_set(en, EINA_TRUE); 165 efl_ui_textbox_scrollable_set(en, EINA_TRUE);
166 166
167 efl_text_font_family_set(en, "Sans"); 167 efl_text_font_family_set(en, "Sans");
168 efl_text_font_size_set(en, 12); 168 efl_text_font_size_set(en, 12);
@@ -215,13 +215,13 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
215 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 215 efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
216 efl_content_set(win, bx); 216 efl_content_set(win, bx);
217 217
218 en = efl_add(EFL_UI_TEXT_CLASS, bx, 218 en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
219 efl_text_multiline_set(efl_added, EINA_FALSE)); 219 efl_text_multiline_set(efl_added, EINA_FALSE));
220 220
221 efl_text_interactive_editable_set(en, EINA_TRUE); 221 efl_text_interactive_editable_set(en, EINA_TRUE);
222 efl_ui_text_scrollable_set(en, EINA_TRUE); 222 efl_ui_textbox_scrollable_set(en, EINA_TRUE);
223 223
224 printf("Added Efl.Ui.Text object\n"); 224 printf("Added Efl.Ui.Textbox object\n");
225 efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED); 225 efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
226 efl_text_set(efl_part(en, "efl.text_guide"), "Enter you name here"); 226 efl_text_set(efl_part(en, "efl.text_guide"), "Enter you name here");
227 227
@@ -233,7 +233,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
233 efl_text_interactive_editable_set(en, EINA_TRUE); 233 efl_text_interactive_editable_set(en, EINA_TRUE);
234 efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD); 234 efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD);
235 efl_text_multiline_set(en, EINA_TRUE); 235 efl_text_multiline_set(en, EINA_TRUE);
236 efl_ui_text_scrollable_set(en, EINA_TRUE); 236 efl_ui_textbox_scrollable_set(en, EINA_TRUE);
237 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.5); 237 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.5);
238 efl_pack(bx, en); 238 efl_pack(bx, en);
239 239
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index eee77af..a890aba 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include <Efl_Ui.h> 6#include <Efl_Ui.h>
7#include "elm_spinner_eo.h" 7#include "elm_spinner_eo.h"
8#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 8#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
9static const int default_font_size = 48; 9static const int default_font_size = 48;
10 10
11typedef struct _Filter_Image 11typedef struct _Filter_Image
@@ -349,8 +349,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
349 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); 349 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE));
350 efl_pack(box, box2); 350 efl_pack(box, box2);
351 351
352 /* FIXME: Efl.Ui.Text doesn't work as expected. */ 352 /* FIXME: Efl.Ui.Textbox doesn't work as expected. */
353 o = efl_add(EFL_UI_TEXT_CLASS, win, 353 o = efl_add(EFL_UI_TEXTBOX_CLASS, win,
354 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), 354 efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
355 efl_gfx_hint_align_set(efl_added, 1.0, 0.5)); 355 efl_gfx_hint_align_set(efl_added, 1.0, 0.5));
356 efl_text_set(o, "Filter:"); 356 efl_text_set(o, "Filter:");
@@ -514,8 +514,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
514 "blur { 3, ox = 1, oy = 1, color = 'black' }" 514 "blur { 3, ox = 1, oy = 1, color = 'black' }"
515 "blend { color = 'lime' }"; 515 "blend { color = 'lime' }";
516 516
517 o = code = efl_add(EFL_UI_TEXT_CLASS, win, 517 o = code = efl_add(EFL_UI_TEXTBOX_CLASS, win,
518 efl_ui_text_scrollable_set(efl_added, EINA_TRUE), 518 efl_ui_textbox_scrollable_set(efl_added, EINA_TRUE),
519 efl_text_interactive_editable_set(efl_added, EINA_TRUE), 519 efl_text_interactive_editable_set(efl_added, EINA_TRUE),
520 efl_text_multiline_set(efl_added, EINA_TRUE)); 520 efl_text_multiline_set(efl_added, EINA_TRUE));
521 efl_event_callback_add(o, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, _code_changed_hack, win); 521 efl_event_callback_add(o, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, _code_changed_hack, win);
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index d375f2d..04aa723 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7#define MAX_NUM_OF_CONTENT 17 7#define MAX_NUM_OF_CONTENT 17
8 8
9const Efl_Class *content_class[MAX_NUM_OF_CONTENT]; 9const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
@@ -80,7 +80,7 @@ _create_box_contents(Evas_Object *box)
80 efl_pack_end(hbox, efl_added)); 80 efl_pack_end(hbox, efl_added));
81 evas_object_data_set(radio, "data", content); 81 evas_object_data_set(radio, "data", content);
82 82
83 content = efl_add(EFL_UI_TEXT_CLASS, content, 83 content = efl_add(EFL_UI_TEXTBOX_CLASS, content,
84 efl_text_set(efl_added, "box"), 84 efl_text_set(efl_added, "box"),
85 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 85 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
86 efl_pack_end(content, efl_added)); 86 efl_pack_end(content, efl_added));
@@ -136,7 +136,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
136 content_class[5] = EFL_UI_BUTTON_CLASS; 136 content_class[5] = EFL_UI_BUTTON_CLASS;
137 content_class[6] = EFL_UI_CHECK_CLASS; 137 content_class[6] = EFL_UI_CHECK_CLASS;
138 content_class[7] = EFL_UI_RADIO_CLASS; 138 content_class[7] = EFL_UI_RADIO_CLASS;
139 content_class[8] = EFL_UI_TEXT_CLASS; 139 content_class[8] = EFL_UI_TEXTBOX_CLASS;
140 content_class[9] = EFL_UI_FLIP_CLASS; 140 content_class[9] = EFL_UI_FLIP_CLASS;
141 content_class[10] = EFL_UI_PANES_CLASS; 141 content_class[10] = EFL_UI_PANES_CLASS;
142 content_class[11] = EFL_UI_VIDEO_CLASS; 142 content_class[11] = EFL_UI_VIDEO_CLASS;
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 72d9b2f..5f3e30b 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7static const struct { 7static const struct {
8 Evas_Image_Orient orient; 8 Evas_Image_Orient orient;
9 const char *name; 9 const char *name;
@@ -813,7 +813,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
813 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 813 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
814 efl_content_set(win, efl_added)); 814 efl_content_set(win, efl_added));
815 815
816 efl_add(EFL_UI_TEXT_CLASS, bx, 816 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
817 efl_text_set(efl_added, "Clicking the image will play/pause animation."), 817 efl_text_set(efl_added, "Clicking the image will play/pause animation."),
818 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 818 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
819 efl_gfx_hint_weight_set(efl_added, 1, 0), 819 efl_gfx_hint_weight_set(efl_added, 1, 0),
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index 14660dc..2ded458 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7/* A simple test, just displaying clock in its default format */ 7/* A simple test, just displaying clock in its default format */
8 8
9Evas_Object *dt1, *dt2, *dt3, *dt4; 9Evas_Object *dt1, *dt2, *dt3, *dt4;
@@ -84,7 +84,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
84 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 84 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
85 efl_pack(bx, efl_added)); 85 efl_pack(bx, efl_added));
86 86
87 efl_add(EFL_UI_TEXT_CLASS, bx, 87 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
88 efl_text_set(efl_added, "Editable Clock:"), 88 efl_text_set(efl_added, "Editable Clock:"),
89 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 89 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
90 efl_gfx_hint_align_set(efl_added, 0, 0.5), 90 efl_gfx_hint_align_set(efl_added, 0, 0.5),
diff --git a/src/bin/elementary/test_ui_frame.c b/src/bin/elementary/test_ui_frame.c
index d0dba5c..d5d496d 100644
--- a/src/bin/elementary/test_ui_frame.c
+++ b/src/bin/elementary/test_ui_frame.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7static void 7static void
8_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 8_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
9{ 9{
@@ -28,7 +28,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
28 efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE)); 28 efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
29 efl_text_set(f, "Test 1"); 29 efl_text_set(f, "Test 1");
30 30
31 txt = efl_add(EFL_UI_TEXT_CLASS, f); 31 txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
32 efl_text_set(txt, "Not collapseable"); 32 efl_text_set(txt, "Not collapseable");
33 efl_content_set(f, txt); 33 efl_content_set(f, txt);
34 34
@@ -37,7 +37,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
37 efl_ui_frame_autocollapse_set(efl_added, EINA_TRUE)); 37 efl_ui_frame_autocollapse_set(efl_added, EINA_TRUE));
38 efl_text_set(f, "Test2"); 38 efl_text_set(f, "Test2");
39 39
40 txt = efl_add(EFL_UI_TEXT_CLASS, f); 40 txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
41 efl_text_set(txt, "Collapseable"); 41 efl_text_set(txt, "Collapseable");
42 efl_content_set(f, txt); 42 efl_content_set(f, txt);
43 43
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index bb4cea8..1608605 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Elementary.h> 4#include <Elementary.h>
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7static const struct { 7static const struct {
8 Efl_Gfx_Image_Orientation orient; 8 Efl_Gfx_Image_Orientation orient;
9 const char *name; 9 const char *name;
@@ -302,7 +302,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
302 efl_gfx_hint_weight_set(box, 1.0, 1.0); 302 efl_gfx_hint_weight_set(box, 1.0, 1.0);
303 efl_content_set(win, box); 303 efl_content_set(win, box);
304 304
305 o = efl_add(EFL_UI_TEXT_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE)); 305 o = efl_add(EFL_UI_TEXTBOX_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
306 efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_MIXED); 306 efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_MIXED);
307 efl_gfx_hint_weight_set(o, 1.0, 1.0); 307 efl_gfx_hint_weight_set(o, 1.0, 1.0);
308 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); 308 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
@@ -340,7 +340,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
340 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); 340 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
341 efl_pack(box, box2); 341 efl_pack(box, box2);
342 342
343 o = efl_add(EFL_UI_TEXT_CLASS, box2, 343 o = efl_add(EFL_UI_TEXTBOX_CLASS, box2,
344 efl_text_interactive_editable_set(efl_added, EINA_FALSE) 344 efl_text_interactive_editable_set(efl_added, EINA_FALSE)
345 ); 345 );
346 efl_text_set(o, "URL:"); 346 efl_text_set(o, "URL:");
@@ -388,7 +388,7 @@ test_click_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_in
388 efl_pack(box, im); 388 efl_pack(box, im);
389 elm_object_focus_set(im, EINA_TRUE); 389 elm_object_focus_set(im, EINA_TRUE);
390 390
391 label = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE)); 391 label = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
392 efl_text_set(label, "<b>Press Return/Space/KP_Return key on image to transit.</b>"); 392 efl_text_set(label, "<b>Press Return/Space/KP_Return key on image to transit.</b>");
393 efl_gfx_hint_weight_set(label, 0.0, 0.0); 393 efl_gfx_hint_weight_set(label, 0.0, 0.0);
394 efl_gfx_hint_fill_set(label, EINA_TRUE, EINA_TRUE); 394 efl_gfx_hint_fill_set(label, EINA_TRUE, EINA_TRUE);
@@ -451,7 +451,7 @@ _create_image(Eo *data, Eina_Bool async, Eina_Bool preload, Eina_Bool logo)
451 status_text = efl_key_data_get(win, "phld"); 451 status_text = efl_key_data_get(win, "phld");
452 if (!status_text) 452 if (!status_text)
453 { 453 {
454 status_text = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE)); 454 status_text = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
455 efl_gfx_hint_weight_set(status_text, 1.0, 0); 455 efl_gfx_hint_weight_set(status_text, 1.0, 0);
456 efl_gfx_hint_fill_set(status_text, EINA_TRUE, EINA_TRUE); 456 efl_gfx_hint_fill_set(status_text, EINA_TRUE, EINA_TRUE);
457 efl_key_data_set(win, "phld", status_text); 457 efl_key_data_set(win, "phld", status_text);
@@ -541,7 +541,7 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
541 efl_gfx_hint_weight_set(hbox, 1.0, 0.0); 541 efl_gfx_hint_weight_set(hbox, 1.0, 0.0);
542 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE); 542 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE);
543 { 543 {
544 label = efl_add(EFL_UI_TEXT_CLASS, win, 544 label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
545 efl_text_set(efl_added, "Async load options:"), 545 efl_text_set(efl_added, "Async load options:"),
546 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), 546 efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
547 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 547 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
diff --git a/src/bin/elementary/test_ui_relative_container.c b/src/bin/elementary/test_ui_relative_container.c
index 4b5ca73..5ed7a84 100644
--- a/src/bin/elementary/test_ui_relative_container.c
+++ b/src/bin/elementary/test_ui_relative_container.c
@@ -4,7 +4,7 @@
4 4
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 7#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
8#include "test.h" 8#include "test.h"
9static Eo *layout, *btn1, *btn2, *btn3; 9static Eo *layout, *btn1, *btn2, *btn3;
10 10
@@ -153,7 +153,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
153 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2), 153 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
154 efl_pack(vbox, efl_added)); 154 efl_pack(vbox, efl_added));
155 155
156 efl_add(EFL_UI_TEXT_CLASS, hbox, 156 efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
157 efl_text_set(efl_added, text), 157 efl_text_set(efl_added, text),
158 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 158 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
159 efl_text_vertical_align_set(efl_added, 0.5), 159 efl_text_vertical_align_set(efl_added, 0.5),
@@ -207,7 +207,7 @@ _button_frame_add(Eo *box, Eo *btn)
207 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND), 207 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
208 efl_pack(hbox, efl_added)); 208 efl_pack(hbox, efl_added));
209 209
210 efl_add(EFL_UI_TEXT_CLASS, hbox, 210 efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
211 efl_text_set(efl_added, "to"), 211 efl_text_set(efl_added, "to"),
212 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 212 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
213 efl_text_horizontal_align_set(efl_added, 0.5), 213 efl_text_horizontal_align_set(efl_added, 0.5),
@@ -215,7 +215,7 @@ _button_frame_add(Eo *box, Eo *btn)
215 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND), 215 efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
216 efl_pack(hbox, efl_added)); 216 efl_pack(hbox, efl_added));
217 217
218 efl_add(EFL_UI_TEXT_CLASS, hbox, 218 efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
219 efl_text_set(efl_added, "relative"), 219 efl_text_set(efl_added, "relative"),
220 efl_text_horizontal_align_set(efl_added, 0.5), 220 efl_text_horizontal_align_set(efl_added, 0.5),
221 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 221 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
@@ -234,7 +234,7 @@ _button_frame_add(Eo *box, Eo *btn)
234 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2), 234 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
235 efl_pack(vbox, efl_added)); 235 efl_pack(vbox, efl_added));
236 236
237 efl_add(EFL_UI_TEXT_CLASS, hbox, 237 efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
238 efl_text_set(efl_added, "align_x"), 238 efl_text_set(efl_added, "align_x"),
239 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 239 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
240 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)), 240 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
@@ -254,7 +254,7 @@ _button_frame_add(Eo *box, Eo *btn)
254 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2), 254 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
255 efl_pack(vbox, efl_added)); 255 efl_pack(vbox, efl_added));
256 256
257 efl_add(EFL_UI_TEXT_CLASS, hbox, 257 efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
258 efl_text_set(efl_added, "align_y"), 258 efl_text_set(efl_added, "align_y"),
259 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 259 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
260 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)), 260 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 13ecfa6..5b901a2 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7static void 7static void
8_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev) 8_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
9{ 9{
@@ -59,7 +59,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
59 bx = efl_add(EFL_UI_BOX_CLASS, win, 59 bx = efl_add(EFL_UI_BOX_CLASS, win,
60 efl_content_set(win, efl_added)); 60 efl_content_set(win, efl_added));
61 61
62 efl_add(EFL_UI_TEXT_CLASS, bx, 62 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
63 efl_text_set(efl_added, "Horizontal"), 63 efl_text_set(efl_added, "Horizontal"),
64 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 64 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
65 efl_pack(bx, efl_added)); 65 efl_pack(bx, efl_added));
@@ -72,7 +72,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
72 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL), 72 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL),
73 efl_pack(bx, efl_added)); 73 efl_pack(bx, efl_added));
74 74
75 efl_add(EFL_UI_TEXT_CLASS, bx, 75 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
76 efl_text_set(efl_added, "Horizontal Inverted"), 76 efl_text_set(efl_added, "Horizontal Inverted"),
77 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 77 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
78 efl_pack(bx, efl_added)); 78 efl_pack(bx, efl_added));
@@ -83,7 +83,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
83 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED), 83 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
84 efl_pack(bx, efl_added)); 84 efl_pack(bx, efl_added));
85 85
86 efl_add(EFL_UI_TEXT_CLASS, bx, 86 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
87 efl_text_set(efl_added, "Manual step"), 87 efl_text_set(efl_added, "Manual step"),
88 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 88 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
89 efl_pack(bx, efl_added)); 89 efl_pack(bx, efl_added));
@@ -94,7 +94,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
94 efl_ui_range_step_set(efl_added, 0.1), 94 efl_ui_range_step_set(efl_added, 0.1),
95 efl_pack(bx, efl_added)); 95 efl_pack(bx, efl_added));
96 96
97 efl_add(EFL_UI_TEXT_CLASS, bx, 97 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
98 efl_text_set(efl_added, "Disabled"), 98 efl_text_set(efl_added, "Disabled"),
99 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 99 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
100 efl_pack(bx, efl_added)); 100 efl_pack(bx, efl_added));
@@ -106,7 +106,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
106 elm_object_disabled_set(efl_added, EINA_TRUE), 106 elm_object_disabled_set(efl_added, EINA_TRUE),
107 efl_pack(bx, efl_added)); 107 efl_pack(bx, efl_added));
108 108
109 efl_add(EFL_UI_TEXT_CLASS, bx, 109 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
110 efl_text_set(efl_added, "Vertical"), 110 efl_text_set(efl_added, "Vertical"),
111 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 111 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
112 efl_pack(bx, efl_added)); 112 efl_pack(bx, efl_added));
@@ -139,7 +139,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
139 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED), 139 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
140 efl_pack(hbx, efl_added)); 140 efl_pack(hbx, efl_added));
141 141
142 efl_add(EFL_UI_TEXT_CLASS, bx, 142 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
143 efl_text_set(efl_added, "Limit"), 143 efl_text_set(efl_added, "Limit"),
144 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 144 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
145 efl_pack(bx, efl_added)); 145 efl_pack(bx, efl_added));
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index 5107f82..de4d983 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 6#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
7static double 7static double
8_step_size_calculate(double min, double max) 8_step_size_calculate(double min, double max)
9{ 9{
@@ -40,7 +40,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
40 bx = efl_add(EFL_UI_BOX_CLASS, win, 40 bx = efl_add(EFL_UI_BOX_CLASS, win,
41 efl_content_set(win, efl_added)); 41 efl_content_set(win, efl_added));
42 42
43 efl_add(EFL_UI_TEXT_CLASS, bx, 43 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
44 efl_text_set(efl_added, "Horizontal"), 44 efl_text_set(efl_added, "Horizontal"),
45 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 45 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
46 efl_pack(bx, efl_added)); 46 efl_pack(bx, efl_added));
@@ -50,7 +50,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
50 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), 50 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
51 efl_pack(bx, efl_added)); 51 efl_pack(bx, efl_added));
52 52
53 efl_add(EFL_UI_TEXT_CLASS, bx, 53 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
54 efl_text_set(efl_added, "Manual step"), 54 efl_text_set(efl_added, "Manual step"),
55 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 55 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
56 efl_pack(bx, efl_added)); 56 efl_pack(bx, efl_added));
@@ -62,7 +62,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
62 efl_ui_range_step_set(efl_added, step), 62 efl_ui_range_step_set(efl_added, step),
63 efl_pack(bx, efl_added)); 63 efl_pack(bx, efl_added));
64 64
65 efl_add(EFL_UI_TEXT_CLASS, bx, 65 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
66 efl_text_set(efl_added, "Disabled"), 66 efl_text_set(efl_added, "Disabled"),
67 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 67 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
68 efl_pack(bx, efl_added)); 68 efl_pack(bx, efl_added));
@@ -75,7 +75,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
75 elm_object_disabled_set(efl_added, EINA_TRUE), 75 elm_object_disabled_set(efl_added, EINA_TRUE),
76 efl_pack(bx, efl_added)); 76 efl_pack(bx, efl_added));
77 77
78 efl_add(EFL_UI_TEXT_CLASS, bx, 78 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
79 efl_text_set(efl_added, "Vertical"), 79 efl_text_set(efl_added, "Vertical"),
80 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 80 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
81 efl_pack(bx, efl_added)); 81 efl_pack(bx, efl_added));
@@ -101,7 +101,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
101 elm_object_disabled_set(efl_added, EINA_TRUE), 101 elm_object_disabled_set(efl_added, EINA_TRUE),
102 efl_pack(hbx, efl_added)); 102 efl_pack(hbx, efl_added));
103 103
104 efl_add(EFL_UI_TEXT_CLASS, bx, 104 efl_add(EFL_UI_TEXTBOX_CLASS, bx,
105 efl_text_set(efl_added, "Limited (100-500)"), 105 efl_text_set(efl_added, "Limited (100-500)"),
106 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 106 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
107 efl_pack(bx, efl_added)); 107 efl_pack(bx, efl_added));
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 11b59da..e3b4698 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -4,7 +4,7 @@
4#include <Efl_Ui.h> 4#include <Efl_Ui.h>
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h 7#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
8 8
9static void 9static void
10_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 10_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
@@ -42,7 +42,7 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
42 // - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will 42 // - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will
43 // only set the restricted min size (and combine them for calculation). 43 // only set the restricted min size (and combine them for calculation).
44 44
45 lb = efl_add(EFL_UI_TEXT_CLASS, dia, 45 lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia,
46 efl_text_set(efl_added, "This is a non-resizable dialog."), 46 efl_text_set(efl_added, "This is a non-resizable dialog."),
47 efl_gfx_hint_size_min_set(efl_added, size), 47 efl_gfx_hint_size_min_set(efl_added, size),
48 efl_gfx_hint_size_max_set(efl_added, size), 48 efl_gfx_hint_size_max_set(efl_added, size),
@@ -84,7 +84,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
84 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 84 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
85 efl_text_set(efl_added, "Min/Max Size Dialog")); 85 efl_text_set(efl_added, "Min/Max Size Dialog"));
86 86
87 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 87 //lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
88 lb = elm_label_add(dia); 88 lb = elm_label_add(dia);
89 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb); 89 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
90 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb); 90 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
@@ -111,7 +111,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
111 efl_text_set(efl_added, "Min/Max Size Dialog") 111 efl_text_set(efl_added, "Min/Max Size Dialog")
112 ); 112 );
113 113
114 //lb = efl_add(EFL_UI_TEXT_CLASS, dia);, 114 //lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
115 lb = elm_label_add(dia); 115 lb = elm_label_add(dia);
116 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb); 116 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
117 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb); 117 efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
diff --git a/src/bin/eolian_mono/eolian/mono/events.hh b/src/bin/eolian_mono/eolian/mono/events.hh
index a4289af..f0367c3 100644
--- a/src/bin/eolian_mono/eolian/mono/events.hh
+++ b/src/bin/eolian_mono/eolian/mono/events.hh
@@ -18,14 +18,18 @@
18 18
19#include <iterator> 19#include <iterator>
20 20
21#include <Eina.hh>
22
21#include "grammar/generator.hpp" 23#include "grammar/generator.hpp"
22#include "grammar/klass_def.hpp" 24#include "grammar/klass_def.hpp"
23#include "type_impl.hh" // For call_match 25#include "type_match.hh"
24#include "name_helpers.hh" 26#include "name_helpers.hh"
25#include "using_decl.hh" 27#include "using_decl.hh"
26 28
27namespace eolian_mono { 29namespace eolian_mono {
28 30
31namespace eina = efl::eina;
32
29template<typename OutputIterator, typename Context> 33template<typename OutputIterator, typename Context>
30struct unpack_event_args_visitor 34struct unpack_event_args_visitor
31{ 35{
@@ -114,7 +118,7 @@ struct unpack_event_args_visitor
114 return as_generator(conversion).generate(sink, attributes::unused, *context); 118 return as_generator(conversion).generate(sink, attributes::unused, *context);
115 }; 119 };
116 120
117 if (eina::optional<bool> b = call_match(match_table, filter_func, accept_func)) 121 if (eina::optional<bool> b = type_match::get_match(match_table, filter_func, accept_func))
118 return *b; 122 return *b;
119 else 123 else
120 { 124 {
@@ -188,7 +192,7 @@ struct pack_event_info_and_call_visitor
188 ).generate(sink, attributes::unused, *context); 192 ).generate(sink, attributes::unused, *context);
189 }; 193 };
190 194
191 if (eina::optional<bool> b = call_match(str_table, filter_func, str_accept_func)) 195 if (eina::optional<bool> b = type_match::get_match(str_table, filter_func, str_accept_func))
192 return *b; 196 return *b;
193 197
194 match const value_table [] = 198 match const value_table [] =
@@ -206,7 +210,7 @@ struct pack_event_info_and_call_visitor
206 ).generate(sink, attributes::unused, *context); 210 ).generate(sink, attributes::unused, *context);
207 }; 211 };
208 212
209 if (eina::optional<bool> b = call_match(value_table, filter_func, value_accept_func)) 213 if (eina::optional<bool> b = type_match::get_match(value_table, filter_func, value_accept_func))
210 return *b; 214 return *b;
211 215
212 return value_accept_func("e.args"); 216 return value_accept_func("e.args");
diff --git a/src/bin/eolian_mono/eolian/mono/marshall_annotation.hh b/src/bin/eolian_mono/eolian/mono/marshall_annotation.hh
index 90da376..a9fc45d 100644
--- a/src/bin/eolian_mono/eolian/mono/marshall_annotation.hh
+++ b/src/bin/eolian_mono/eolian/mono/marshall_annotation.hh
@@ -21,25 +21,13 @@
21#include "grammar/case.hpp" 21#include "grammar/case.hpp"
22#include "name_helpers.hh" 22#include "name_helpers.hh"
23#include "type_impl.hh" 23#include "type_impl.hh"
24#include "type_match.hh"
24 25
25namespace eolian_mono { 26namespace eolian_mono {
26 27
27namespace eina = efl::eina; 28namespace eina = efl::eina;
28 29
29namespace detail { 30namespace detail {
30
31template <typename Array, typename SelectionPredicate, int N, typename AcceptFunc>
32eina::optional<bool> call_annotation_match(Array const (&array)[N], SelectionPredicate predicate, AcceptFunc acceptFunc)
33{
34 typedef Array const* iterator_type;
35 iterator_type match_iterator = &array[0], match_last = match_iterator + N;
36 match_iterator = std::find_if(match_iterator, match_last, predicate);
37 if(match_iterator != match_last)
38 {
39 return acceptFunc(match_iterator->function());
40 }
41 return {nullptr};
42}
43 31
44template <typename OutputIterator, typename Context> 32template <typename OutputIterator, typename Context>
45struct marshall_annotation_visitor_generate 33struct marshall_annotation_visitor_generate
@@ -157,7 +145,7 @@ struct marshall_annotation_visitor_generate
157 145
158 const auto& match_table = is_return ? return_match_table : parameter_match_table; 146 const auto& match_table = is_return ? return_match_table : parameter_match_table;
159 147
160 if(eina::optional<bool> b = call_annotation_match(match_table, predicate, acceptCb)) 148 if(eina::optional<bool> b = type_match::get_match(match_table, predicate, acceptCb))
161 { 149 {
162 return *b; 150 return *b;
163 } 151 }
diff --git a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
index 69b4a9a..4d1e188 100644
--- a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
+++ b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
@@ -21,6 +21,7 @@
21#include "grammar/case.hpp" 21#include "grammar/case.hpp"
22#include "helpers.hh" 22#include "helpers.hh"
23#include "name_helpers.hh" 23#include "name_helpers.hh"
24#include "type_match.hh"
24#include "type_impl.hh" 25#include "type_impl.hh"
25#include "generation_contexts.hh" 26#include "generation_contexts.hh"
26#include "blacklist.hh" 27#include "blacklist.hh"
@@ -192,7 +193,7 @@ struct marshall_type_visitor_generate
192 return as_generator(string << ".NativeStruct") 193 return as_generator(string << ".NativeStruct")
193 .generate(sink, name_helpers::type_full_managed_name(regular), *context); 194 .generate(sink, name_helpers::type_full_managed_name(regular), *context);
194 } 195 }
195 else if (eina::optional<bool> b = call_match 196 else if (eina::optional<bool> b = type_match::get_match
196 (match_table 197 (match_table
197 , [&] (match const& m) 198 , [&] (match const& m)
198 { 199 {
@@ -296,7 +297,7 @@ struct marshall_type_visitor_generate
296 && as_generator("<" << (type(false, false, true) % ", ") << ">").generate(sink, complex.subtypes, *context); 297 && as_generator("<" << (type(false, false, true) % ", ") << ">").generate(sink, complex.subtypes, *context);
297 }; 298 };
298 299
299 if(eina::optional<bool> b = call_match 300 if(eina::optional<bool> b = type_match::get_match
300 (matches 301 (matches
301 , [&] (match const& m) 302 , [&] (match const& m)
302 { 303 {
diff --git a/src/bin/eolian_mono/eolian/mono/type_impl.hh b/src/bin/eolian_mono/eolian/mono/type_impl.hh
index 2dd2c34..fb521f2 100644
--- a/src/bin/eolian_mono/eolian/mono/type_impl.hh
+++ b/src/bin/eolian_mono/eolian/mono/type_impl.hh
@@ -20,6 +20,7 @@
20#include "grammar/klass_def.hpp" 20#include "grammar/klass_def.hpp"
21#include "grammar/case.hpp" 21#include "grammar/case.hpp"
22#include "name_helpers.hh" 22#include "name_helpers.hh"
23#include "type_match.hh"
23 24
24namespace eolian_mono { 25namespace eolian_mono {
25 26
@@ -69,19 +70,6 @@ attributes::complex_type_def replace_outer(attributes::complex_type_def v, attri
69 v.outer = regular; 70 v.outer = regular;
70 return v; 71 return v;
71} 72}
72
73template <typename Array, typename F, int N, typename A>
74eina::optional<bool> call_match(Array const (&array)[N], F f, A a)
75{
76 typedef Array const* iterator_type;
77 iterator_type match_iterator = &array[0], match_last = match_iterator + N;
78 match_iterator = std::find_if(match_iterator, match_last, f);
79 if(match_iterator != match_last)
80 {
81 return a(match_iterator->function());
82 }
83 return {nullptr};
84}
85 73
86template <typename OutputIterator, typename Context> 74template <typename OutputIterator, typename Context>
87struct visitor_regular_type_def_printer 75struct visitor_regular_type_def_printer
@@ -248,7 +236,7 @@ struct visitor_generate
248 }} // FIXME add proper support for any_value_ref 236 }} // FIXME add proper support for any_value_ref
249 }; 237 };
250 std::string full_type_name = name_helpers::type_full_eolian_name(regular); 238 std::string full_type_name = name_helpers::type_full_eolian_name(regular);
251 if(eina::optional<bool> b = call_match 239 if(eina::optional<bool> b = type_match::get_match
252 (optional_match_table 240 (optional_match_table
253 , [&] (match const& m) 241 , [&] (match const& m)
254 { 242 {
@@ -271,7 +259,7 @@ struct visitor_generate
271 is_optional = false; 259 is_optional = false;
272 return (*this)(r); 260 return (*this)(r);
273 } 261 }
274 else if(eina::optional<bool> b = call_match 262 else if(eina::optional<bool> b = type_match::get_match
275 (match_table 263 (match_table
276 , [&] (match const& m) 264 , [&] (match const& m)
277 { 265 {
@@ -441,7 +429,7 @@ struct visitor_generate
441 // && detail::generate_pointers(sink, pointers, *context, false); 429 // && detail::generate_pointers(sink, pointers, *context, false);
442 }; 430 };
443 431
444 if(eina::optional<bool> b = call_match 432 if(eina::optional<bool> b = type_match::get_match
445 (matches 433 (matches
446 , [&] (match const& m) 434 , [&] (match const& m)
447 { 435 {
diff --git a/src/bin/eolian_mono/eolian/mono/type_match.hh b/src/bin/eolian_mono/eolian/mono/type_match.hh
new file mode 100644
index 0000000..b42fb43
--- /dev/null
+++ b/src/bin/eolian_mono/eolian/mono/type_match.hh
@@ -0,0 +1,46 @@
1/*
2 * Copyright 2019 by its authors. See AUTHORS.
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16#ifndef EOLIAN_MONO_TYPE_MATCH_HH
17#define EOLIAN_MONO_TYPE_MATCH_HH
18
19#include <Eina.hh>
20
21namespace eolian_mono {
22
23namespace type_match {
24
25namespace eina = efl::eina;
26
27/**
28 * Apply the given AcceptFunction to the first element that matches the SelectionPredicate.
29 */
30template <typename Array, typename SelectionPredicate, int N, typename AcceptFunc>
31eina::optional<bool> get_match(Array const (&array)[N], SelectionPredicate predicate, AcceptFunc acceptFunc)
32{
33 typedef Array const* iterator_type;
34 iterator_type match_iterator = &array[0], match_last = match_iterator + N;
35 match_iterator = std::find_if(match_iterator, match_last, predicate);
36 if(match_iterator != match_last)
37 {
38 return acceptFunc(match_iterator->function());
39 }
40 return {nullptr};
41}
42
43} // type_match
44
45} // eolian_mono
46#endif
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index f8f5c5b..7a010fb 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -16,8 +16,8 @@
16//FIXME this can go away when efl_ui_text doesn't need elm_general 16//FIXME this can go away when efl_ui_text doesn't need elm_general
17# include <elm_general.h> 17# include <elm_general.h>
18# include <efl_text_interactive.eo.h> 18# include <efl_text_interactive.eo.h>
19# include <efl_ui_text.eo.h> 19# include <efl_ui_textbox.eo.h>
20# include <efl_ui_text_async.eo.h> 20# include <efl_ui_textbox_async.eo.h>
21 21
22#define NUM_ITEMS 400 22#define NUM_ITEMS 400
23 23
@@ -151,7 +151,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
151 ibox = efl_add(EFL_UI_BOX_CLASS, item); 151 ibox = efl_add(EFL_UI_BOX_CLASS, item);
152 efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL); 152 efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
153 153
154 txt = efl_add(EFL_UI_TEXT_CLASS, ibox); 154 txt = efl_add(EFL_UI_TEXTBOX_CLASS, ibox);
155 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND); 155 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND);
156 efl_text_horizontal_align_set(txt, 0.2); 156 efl_text_horizontal_align_set(txt, 0.2);
157 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 157 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@@ -229,7 +229,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
229 efl_pack_end(wbox, list); 229 efl_pack_end(wbox, list);
230 230
231 /*select mode */ 231 /*select mode */
232 txt = efl_add(EFL_UI_TEXT_CLASS, wbox); 232 txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
233 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); 233 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
234 efl_text_horizontal_align_set(txt, 0.02); 234 efl_text_horizontal_align_set(txt, 0.02);
235 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 235 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@@ -256,7 +256,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
256 efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list); 256 efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list);
257 257
258 /* scroll mode */ 258 /* scroll mode */
259 txt = efl_add(EFL_UI_TEXT_CLASS, wbox); 259 txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
260 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); 260 efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
261 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 261 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
262 efl_text_horizontal_align_set(txt, 0.02); 262 efl_text_horizontal_align_set(txt, 0.02);
diff --git a/src/examples/elementary/efl_ui_unit_converter.cs b/src/examples/elementary/efl_ui_unit_converter.cs
index 96481f5..6d7f200 100644
--- a/src/examples/elementary/efl_ui_unit_converter.cs
+++ b/src/examples/elementary/efl_ui_unit_converter.cs
@@ -32,7 +32,7 @@ public class Example
32 private static void ShowErrorPopup(Efl.Ui.Win win, string message) 32 private static void ShowErrorPopup(Efl.Ui.Win win, string message)
33 { 33 {
34 Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win); 34 Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win);
35 Efl.Ui.Text popup_text = new Efl.Ui.Text(popup); 35 Efl.Ui.Textbox popup_text = new Efl.Ui.Textbox(popup);
36 popup_text.SetText($"Error: {message}"); 36 popup_text.SetText($"Error: {message}");
37 popup.SetContent(popup_text); 37 popup.SetContent(popup_text);
38 popup.SetVisible(true); 38 popup.SetVisible(true);
@@ -68,12 +68,12 @@ public class Example
68 68
69 box.DoPack(miles_box); 69 box.DoPack(miles_box);
70 70
71 Efl.Ui.Text miles_label = new Efl.Ui.Text(miles_box); 71 Efl.Ui.Textbox miles_label = new Efl.Ui.Textbox(miles_box);
72 miles_label.SetText("Miles:"); 72 miles_label.SetText("Miles:");
73 miles_label.SetSize(size); 73 miles_label.SetSize(size);
74 miles_label.SetVisible(true); 74 miles_label.SetVisible(true);
75 75
76 Efl.Ui.Text miles_input = new Efl.Ui.Text(miles_box); 76 Efl.Ui.Textbox miles_input = new Efl.Ui.Textbox(miles_box);
77 miles_input.SetText(""); 77 miles_input.SetText("");
78 miles_input.SetScrollable(true); 78 miles_input.SetScrollable(true);
79 miles_input.SetEditable(true); 79 miles_input.SetEditable(true);
@@ -95,12 +95,12 @@ public class Example
95 95
96 box.DoPack(kms_box); 96 box.DoPack(kms_box);
97 97
98 Efl.Ui.Text kms_label = new Efl.Ui.Text(kms_box); 98 Efl.Ui.Textbox kms_label = new Efl.Ui.Textbox(kms_box);
99 kms_label.SetText("Kilometers:"); 99 kms_label.SetText("Kilometers:");
100 kms_label.SetSize(size); 100 kms_label.SetSize(size);
101 kms_label.SetVisible(true); 101 kms_label.SetVisible(true);
102 102
103 Efl.Ui.TextEditable kms_input = new Efl.Ui.TextEditable(kms_box); 103 Efl.Ui.TextboxEditable kms_input = new Efl.Ui.TextboxEditable(kms_box);
104 kms_input.SetText(""); 104 kms_input.SetText("");
105 kms_input.SetScrollable(true); 105 kms_input.SetScrollable(true);
106 kms_input.SetSize(size); 106 kms_input.SetSize(size);
diff --git a/src/examples/elementary/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc
index 8028b75..962fc5d 100644
--- a/src/examples/elementary/table_cxx_example_01.cc
+++ b/src/examples/elementary/table_cxx_example_01.cc
@@ -34,19 +34,19 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
34// FIXME 34// FIXME
35// table.homogeneous_set(true); 35// table.homogeneous_set(true);
36 36
37 efl::ui::Text label(instantiate, win); 37 efl::ui::Textbox label(instantiate, win);
38 label.text_set("label 0"); 38 label.text_set("label 0");
39 table.pack_table(label, 0, 0, 1, 1); 39 table.pack_table(label, 0, 0, 1, 1);
40 40
41 efl::ui::Text label1(instantiate, win); 41 efl::ui::Textbox label1(instantiate, win);
42 label1.text_set("label 1"); 42 label1.text_set("label 1");
43 table.pack_table(label1, 1, 0, 1, 1); 43 table.pack_table(label1, 1, 0, 1, 1);
44 44
45 efl::ui::Text label2(instantiate, win); 45 efl::ui::Textbox label2(instantiate, win);
46 label2.text_set("label 2"); 46 label2.text_set("label 2");
47 table.pack_table(label2, 0, 1, 1, 1); 47 table.pack_table(label2, 0, 1, 1, 1);
48 48
49 efl::ui::Text label3(instantiate, win); 49 efl::ui::Textbox label3(instantiate, win);
50 label3.text_set("label 3"); 50 label3.text_set("label 3");
51 table.pack_table(label3, 1, 1, 1, 1); 51 table.pack_table(label3, 1, 1, 1, 1);
52} 52}
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index f919158..d8b9583 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -1126,12 +1126,8 @@ EAPI void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs);
1126 * server to client and client to server, can be represented in the following 1126 * server to client and client to server, can be represented in the following
1127 * sequence diagram: 1127 * sequence diagram:
1128 * 1128 *
1129 * @htmlonly
1130 * <img src="ecore_con-client-server.png" style="max-width: 400px"/>
1131 * <a href="ecore_con-client-server.png">Full size</a>
1132 * @endhtmlonly
1133 *
1134 * @image rtf ecore_con-client-server.png 1129 * @image rtf ecore_con-client-server.png
1130 * @image html ecore_con-client-server.png
1135 * @image latex ecore_con-client-server.eps width=\\textwidth 1131 * @image latex ecore_con-client-server.eps width=\\textwidth
1136 * 1132 *
1137 * Please notice the important difference between these two codes: the first is 1133 * Please notice the important difference between these two codes: the first is
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index d6de02f..62dae2c 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -64,7 +64,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj EINA_UNUSED, Ector_Software_Buf
64} 64}
65 65
66EOLIAN static Eina_Bool 66EOLIAN static Eina_Bool
67_ector_software_buffer_base_ector_buffer_pixels_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd, 67_ector_software_buffer_base_ector_buffer_pixels_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
68 void **pixels, int* width, int* height, int* stride) 68 void **pixels, int* width, int* height, int* stride)
69{ 69{
70 if (*pixels) *pixels = pd->pixels.u8; 70 if (*pixels) *pixels = pd->pixels.u8;
diff --git a/src/lib/eina/eina_hash.h b/src/lib/eina/eina_hash.h
index cda625b..e7a1229 100644
--- a/src/lib/eina/eina_hash.h
+++ b/src/lib/eina/eina_hash.h
@@ -184,10 +184,8 @@
184 * (argument of @ref eina_hash_new too). The following picture illustrates the 184 * (argument of @ref eina_hash_new too). The following picture illustrates the
185 * basic idea: 185 * basic idea:
186 * 186 *
187 * @htmlonly
188 * <img src="01_hash-table.png" width="500" />
189 * @endhtmlonly
190 * @image latex 01_hash-table.eps 187 * @image latex 01_hash-table.eps
188 * @image html 01_hash-table.png
191 * 189 *
192 * Adding an element to the hash table involves the following steps: 190 * Adding an element to the hash table involves the following steps:
193 * @li calculate the hash for that key (using the specified hash function); 191 * @li calculate the hash for that key (using the specified hash function);
diff --git a/src/lib/eina/eina_inline_value.x b/src/lib/eina/eina_inline_value.x
index a1a6314..8d3457c 100644
--- a/src/lib/eina/eina_inline_value.x
+++ b/src/lib/eina/eina_inline_value.x
@@ -150,7 +150,11 @@ eina_value_flush(Eina_Value *value)
150 } 150 }
151 else if (type == EINA_VALUE_TYPE_STRING) 151 else if (type == EINA_VALUE_TYPE_STRING)
152 { 152 {
153 if (value->value.ptr) free(value->value.ptr); 153 if (value->value.ptr)
154 {
155 free(value->value.ptr);
156 value->value.ptr = NULL;
157 }
154 } 158 }
155 else if (type->value_size > 8) 159 else if (type->value_size > 8)
156 eina_value_inner_free(type->value_size, mem); 160 eina_value_inner_free(type->value_size, mem);
diff --git a/src/lib/eina/eina_inlist.h b/src/lib/eina/eina_inlist.h
index 0d20286..5adc310 100644
--- a/src/lib/eina/eina_inlist.h
+++ b/src/lib/eina/eina_inlist.h
@@ -153,10 +153,8 @@
153 * The two lists, sharing some elements, can be represented by the following 153 * The two lists, sharing some elements, can be represented by the following
154 * picture: 154 * picture:
155 * 155 *
156 * @htmlonly
157 * <img src="eina_inlist-node_eg2-list-inlist.png" style="max-width: 100%;"/>
158 * @endhtmlonly
159 * @image rtf eina_inlist-node_eg2-list-inlist.png 156 * @image rtf eina_inlist-node_eg2-list-inlist.png
157 * @image html eina_inlist-node_eg2-list-inlist.png
160 * @image latex eina_inlist-node_eg2-list-inlist.eps "" width=\textwidth 158 * @image latex eina_inlist-node_eg2-list-inlist.eps "" width=\textwidth
161 * 159 *
162 * Accessing both lists is done normally, as if they didn't have any elements in 160 * Accessing both lists is done normally, as if they didn't have any elements in
@@ -229,10 +227,8 @@
229 * 227 *
230 * And the resulting lists will be as follow: 228 * And the resulting lists will be as follow:
231 * 229 *
232 * @htmlonly
233 * <img src="eina_inlist-node_eg3-two-inlists.png" style="max-width: 100%;"/>
234 * @endhtmlonly
235 * @image rtf eina_inlist-node_eg3-two-inlists.png 230 * @image rtf eina_inlist-node_eg3-two-inlists.png
231 * @image html eina_inlist-node_eg3-two-inlists.png
236 * @image latex eina_inlist-node_eg3-two-inlists.eps "" width=\textwidth 232 * @image latex eina_inlist-node_eg3-two-inlists.eps "" width=\textwidth
237 * 233 *
238 * For the first list, we can use the macro @ref EINA_INLIST_FOREACH to iterate 234 * For the first list, we can use the macro @ref EINA_INLIST_FOREACH to iterate
diff --git a/src/lib/eina/eina_list.h b/src/lib/eina/eina_list.h
index 86892d1..569f84d 100644
--- a/src/lib/eina/eina_list.h
+++ b/src/lib/eina/eina_list.h
@@ -49,11 +49,8 @@
49 * @until eina_init 49 * @until eina_init
50 * Here we add a sequence of elements to our list. By using append we add 50 * Here we add a sequence of elements to our list. By using append we add
51 * elements to the end of the list, so the list will look like this:@n 51 * elements to the end of the list, so the list will look like this:@n
52 * @htmlonly
53 * <img src="eina_list_example_01_a.png" style="max-width: 100%;" />
54 * <a href="eina_list_example_01_a.png">Full-size</a>
55 * @endhtmlonly
56 * @image rtf eina_list_example_01_a.png 52 * @image rtf eina_list_example_01_a.png
53 * @image html eina_list_example_01_a.png
57 * @image latex eina_list_example_01_a.eps "" width=\textwidth 54 * @image latex eina_list_example_01_a.eps "" width=\textwidth
58 * @until roslin 55 * @until roslin
59 * There are a couple of interesting things happening here, first is that we are 56 * There are a couple of interesting things happening here, first is that we are
@@ -82,11 +79,8 @@
82 * far: 79 * far:
83 * @until lampkin 80 * @until lampkin
84 * With this additions our list now looks like this:@n 81 * With this additions our list now looks like this:@n
85 * @htmlonly
86 * <img src="eina_list_example_01_b.png" style="max-width: 100%;" />
87 * <a href="eina_list_example_01_b.png">Full-size</a>
88 * @endhtmlonly
89 * @image rtf eina_list_example_01_b.png 82 * @image rtf eina_list_example_01_b.png
83 * @image html eina_list_example_01_b.png
90 * @image latex eina_list_example_01_b.eps "" width=\textwidth 84 * @image latex eina_list_example_01_b.eps "" width=\textwidth
91 * 85 *
92 * Once done using the list it needs to be freed, and since we are done with 86 * Once done using the list it needs to be freed, and since we are done with
@@ -255,11 +249,8 @@
255 * @ref Eina_List nodes keep references to the previous node, the next node, its 249 * @ref Eina_List nodes keep references to the previous node, the next node, its
256 * data and to an accounting structure. 250 * data and to an accounting structure.
257 * 251 *
258 * @htmlonly
259 * <img src="eina_list.png" style="max-width: 100%;" />
260 * <a href="eina_list.png">Full-size</a>
261 * @endhtmlonly
262 * @image rtf eina_list.png 252 * @image rtf eina_list.png
253 * @image html eina_list.png
263 * @image latex eina_list.eps width=5cm 254 * @image latex eina_list.eps width=5cm
264 * 255 *
265 * @ref Eina_List_Accounting is used to improve the performance of some 256 * @ref Eina_List_Accounting is used to improve the performance of some
@@ -1388,11 +1379,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
1388 * 1379 *
1389 * The following diagram illustrates this macro iterating over a list of four 1380 * The following diagram illustrates this macro iterating over a list of four
1390 * elements("one", "two", "three" and "four"): 1381 * elements("one", "two", "three" and "four"):
1391 * @htmlonly
1392 * <img src="eina-list-foreach.png" style="max-width: 100%;" />
1393 * <a href="eina-list-foreach.png">Full-size</a>
1394 * @endhtmlonly
1395 * @image latex eina-list-foreach.eps "" width=\textwidth 1382 * @image latex eina-list-foreach.eps "" width=\textwidth
1383 * @image html eina-list-foreach.png
1396 * 1384 *
1397 * It can be used to free list data, as in the following example: 1385 * It can be used to free list data, as in the following example:
1398 * 1386 *
@@ -1450,11 +1438,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
1450 * 1438 *
1451 * The following diagram illustrates this macro iterating over a list of four 1439 * The following diagram illustrates this macro iterating over a list of four
1452 * elements("one", "two", "three" and "four"): 1440 * elements("one", "two", "three" and "four"):
1453 * @htmlonly
1454 * <img src="eina-list-reverse-foreach.png" style="max-width: 100%;" />
1455 * <a href="eina-list-reverse-foreach.png">Full-size</a>
1456 * @endhtmlonly
1457 * @image latex eina-list-reverse-foreach.eps "" width=\textwidth 1441 * @image latex eina-list-reverse-foreach.eps "" width=\textwidth
1442 * @image html eina-list-reverse-foreach.png
1458 * 1443 *
1459 * It can be used to free list data, as in the following example: 1444 * It can be used to free list data, as in the following example:
1460 * 1445 *
@@ -1513,11 +1498,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
1513 * 1498 *
1514 * The following diagram illustrates this macro iterating over a list of four 1499 * The following diagram illustrates this macro iterating over a list of four
1515 * elements ("one", "two", "three" and "four"): 1500 * elements ("one", "two", "three" and "four"):
1516 * @htmlonly
1517 * <img src="eina-list-foreach-safe.png" style="max-width: 100%;" />
1518 * <a href="eina-list-foreach-safe.png">Full-size</a>
1519 * @endhtmlonly
1520 * @image latex eina-list-foreach-safe.eps "" width=\textwidth 1501 * @image latex eina-list-foreach-safe.eps "" width=\textwidth
1502 * @image html eina-list-foreach-safe.png
1521 * 1503 *
1522 * This macro can be used to free list nodes, as in the following example: 1504 * This macro can be used to free list nodes, as in the following example:
1523 * 1505 *
@@ -1574,11 +1556,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
1574 * 1556 *
1575 * The following diagram illustrates this macro iterating over a list of four 1557 * The following diagram illustrates this macro iterating over a list of four
1576 * elements ("one", "two", "three" and "four"): 1558 * elements ("one", "two", "three" and "four"):
1577 * @htmlonly
1578 * <img src="eina-list-reverse-foreach-safe.png" style="max-width: 100%;" />
1579 * <a href="eina-list-reverse-foreach-safe.png">Full-size</a>
1580 * @endhtmlonly
1581 * @image latex eina-list-reverse-foreach-safe.eps "" width=\textwidth 1559 * @image latex eina-list-reverse-foreach-safe.eps "" width=\textwidth
1560 * @image html eina-list-reverse-foreach-safe.png
1582 * 1561 *
1583 * This macro can be used to free list nodes, as in the following example: 1562 * This macro can be used to free list nodes, as in the following example:
1584 * 1563 *
@@ -1627,11 +1606,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
1627 * 1606 *
1628 * The following diagram illustrates this macro iterating over a list of four 1607 * The following diagram illustrates this macro iterating over a list of four
1629 * elements ("one", "two", "three" and "four"): 1608 * elements ("one", "two", "three" and "four"):
1630 * @htmlonly
1631 * <img src="eina-list-free.png" style="max-width: 100%;" />
1632 * <a href="eina-list-free.png">Full-size</a>
1633 * @endhtmlonly
1634 * @image latex eina-list-free.eps "" width=\textwidth 1609 * @image latex eina-list-free.eps "" width=\textwidth
1610 * @image html eina-list-free.png
1635 * 1611 *
1636 * If you do not need to release node data, it is easier to call #eina_list_free(). 1612 * If you do not need to release node data, it is easier to call #eina_list_free().
1637 * 1613 *
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index c1678c4..209fa44 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -226,8 +226,8 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj);
226typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info); 226typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info);
227 227
228# include <efl_text_interactive.eo.h> 228# include <efl_text_interactive.eo.h>
229# include <efl_ui_text.eo.h> 229# include <efl_ui_textbox.eo.h>
230# include <efl_ui_text_async.eo.h> 230# include <efl_ui_textbox_async.eo.h>
231 231
232# include <efl_ui_animation_view.eo.h> 232# include <efl_ui_animation_view.eo.h>
233# include <efl_ui_clock.eo.h> 233# include <efl_ui_clock.eo.h>
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 38d9fc9..1e6ae63 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -197,11 +197,11 @@ field_create(Eo *obj, Efl_Ui_Clock_Type field_type)
197 } 197 }
198 else 198 else
199 { 199 {
200 field_obj = efl_add(EFL_UI_TEXT_CLASS,obj, 200 field_obj = efl_add(EFL_UI_TEXTBOX_CLASS,obj,
201 efl_text_multiline_set(efl_added, EINA_FALSE), 201 efl_text_multiline_set(efl_added, EINA_FALSE),
202 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 202 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
203 efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE), 203 efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
204 efl_ui_text_context_menu_disabled_set(efl_added, EINA_TRUE)); 204 efl_ui_textbox_context_menu_disabled_set(efl_added, EINA_TRUE));
205 } 205 }
206 evas_object_data_set(field_obj, "_field_type", (void *)field_type); 206 evas_object_data_set(field_obj, "_field_type", (void *)field_type);
207 207
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 9ce1f01..95c5ce5 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -754,10 +754,10 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
754 if (!sd->label) return; 754 if (!sd->label) return;
755 elm_widget_element_update(obj, sd->label, PART_NAME_LABEL); 755 elm_widget_element_update(obj, sd->label, PART_NAME_LABEL);
756 756
757 sd->entry = efl_add(EFL_UI_TEXT_CLASS, sd->box, 757 sd->entry = efl_add(EFL_UI_TEXTBOX_CLASS, sd->box,
758 efl_text_multiline_set(efl_added, EINA_FALSE), 758 efl_text_multiline_set(efl_added, EINA_FALSE),
759 efl_text_set(efl_added, ""), 759 efl_text_set(efl_added, ""),
760 efl_ui_text_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP), 760 efl_ui_textbox_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
761 efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE), 761 efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
762 efl_text_interactive_editable_set(efl_added, EINA_TRUE), 762 efl_text_interactive_editable_set(efl_added, EINA_TRUE),
763 efl_composite_attach(obj, efl_added)); 763 efl_composite_attach(obj, efl_added));
diff --git a/src/lib/elementary/efl_ui_text_async.eo b/src/lib/elementary/efl_ui_text_async.eo
deleted file mode 100644
index 1863948..0000000
--- a/src/lib/elementary/efl_ui_text_async.eo
+++ /dev/null
@@ -1,9 +0,0 @@
1class @beta Efl.Ui.Text_Async extends Efl.Ui.Text
2{
3 [[Efl UI text async class
4 ]]
5 data: null;
6 implements {
7 Efl.Object.constructor;
8 }
9}
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_textbox.c
index c65d590..456f9f8 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -20,7 +20,7 @@
20#include "elm_part_helper.h" 20#include "elm_part_helper.h"
21#include "efl_canvas_textblock_internal.h" 21#include "efl_canvas_textblock_internal.h"
22 22
23typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data; 23typedef struct _Efl_Ui_Textbox_Data Efl_Ui_Textbox_Data;
24typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle; 24typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle;
25typedef struct _Anchor Anchor; 25typedef struct _Anchor Anchor;
26typedef struct _Selection_Loss_Data Selection_Loss_Data; 26typedef struct _Selection_Loss_Data Selection_Loss_Data;
@@ -28,7 +28,7 @@ typedef struct _Selection_Loss_Data Selection_Loss_Data;
28/** 28/**
29 * Base widget smart data extended with entry instance data. 29 * Base widget smart data extended with entry instance data.
30 */ 30 */
31struct _Efl_Ui_Text_Data 31struct _Efl_Ui_Textbox_Data
32{ 32{
33 Evas_Object *hit_rect, *entry_edje, *scr_edje; 33 Evas_Object *hit_rect, *entry_edje, *scr_edje;
34 34
@@ -135,7 +135,7 @@ struct _Anchor
135}; 135};
136 136
137#define EFL_UI_TEXT_DATA_GET(o, sd) \ 137#define EFL_UI_TEXT_DATA_GET(o, sd) \
138 Efl_Ui_Text_Data * sd = efl_data_scope_get(o, EFL_UI_TEXT_CLASS) 138 Efl_Ui_Textbox_Data * sd = efl_data_scope_get(o, EFL_UI_TEXTBOX_CLASS)
139 139
140#define EFL_UI_TEXT_DATA_GET_OR_RETURN(o, ptr) \ 140#define EFL_UI_TEXT_DATA_GET_OR_RETURN(o, ptr) \
141 EFL_UI_TEXT_DATA_GET(o, ptr); \ 141 EFL_UI_TEXT_DATA_GET(o, ptr); \
@@ -156,7 +156,7 @@ struct _Anchor
156 } 156 }
157 157
158#define EFL_UI_TEXT_CHECK(obj) \ 158#define EFL_UI_TEXT_CHECK(obj) \
159 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_TEXT_CLASS))) \ 159 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_TEXTBOX_CLASS))) \
160 return 160 return
161 161
162struct _Efl_Ui_Text_Rectangle 162struct _Efl_Ui_Text_Rectangle
@@ -170,9 +170,9 @@ struct _Selection_Loss_Data
170 Efl_Ui_Selection_Type stype; 170 Efl_Ui_Selection_Type stype;
171}; 171};
172 172
173#define MY_CLASS EFL_UI_TEXT_CLASS 173#define MY_CLASS EFL_UI_TEXTBOX_CLASS
174#define MY_CLASS_PFX efl_ui_text 174#define MY_CLASS_PFX efl_ui_textbox
175#define MY_CLASS_NAME "Efl.Ui.Text" 175#define MY_CLASS_NAME "Efl.Ui.Textbox"
176#define MY_CLASS_NAME_LEGACY "elm_entry" 176#define MY_CLASS_NAME_LEGACY "elm_entry"
177 177
178#include "efl_ui_internal_text_interactive.h" 178#include "efl_ui_internal_text_interactive.h"
@@ -203,28 +203,28 @@ static const char PART_NAME_CURSOR[] = "cursor";
203static const char PART_NAME_SELECTION[] = "selection"; 203static const char PART_NAME_SELECTION[] = "selection";
204static const char PART_NAME_ANCHOR[] = "anchor"; 204static const char PART_NAME_ANCHOR[] = "anchor";
205 205
206static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd); 206static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Textbox_Data *sd);
207static void _update_decorations(Eo *obj); 207static void _update_decorations(Eo *obj);
208static void _create_text_cursors(Eo *obj, Efl_Ui_Text_Data *sd); 208static void _create_text_cursors(Eo *obj, Efl_Ui_Textbox_Data *sd);
209static void _efl_ui_text_changed_cb(void *data, const Efl_Event *event); 209static void _efl_ui_textbox_changed_cb(void *data, const Efl_Event *event);
210static void _efl_ui_text_changed_user_cb(void *data, const Efl_Event *event); 210static void _efl_ui_textbox_changed_user_cb(void *data, const Efl_Event *event);
211static void _efl_ui_text_selection_start_clear_cb(void *data, const Efl_Event *event); 211static void _efl_ui_textbox_selection_start_clear_cb(void *data, const Efl_Event *event);
212static void _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event); 212static void _efl_ui_textbox_selection_changed_cb(void *data, const Efl_Event *event);
213static void _efl_ui_text_cursor_changed_cb(void *data, const Efl_Event *event); 213static void _efl_ui_textbox_cursor_changed_cb(void *data, const Efl_Event *event);
214static void _text_size_changed_cb(void *data, const Efl_Event *event EINA_UNUSED); 214static void _text_size_changed_cb(void *data, const Efl_Event *event EINA_UNUSED);
215static void _scroller_size_changed_cb(void *data, const Efl_Event *event EINA_UNUSED); 215static void _scroller_size_changed_cb(void *data, const Efl_Event *event EINA_UNUSED);
216static void _text_position_changed_cb(void *data, const Efl_Event *event EINA_UNUSED); 216static void _text_position_changed_cb(void *data, const Efl_Event *event EINA_UNUSED);
217static void _efl_ui_text_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); 217static void _efl_ui_textbox_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
218static const char* _efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd); 218static const char* _efl_ui_textbox_selection_get(const Eo *obj, Efl_Ui_Textbox_Data *sd);
219static void _edje_signal_emit(Efl_Ui_Text_Data *obj, const char *sig, const char *src); 219static void _edje_signal_emit(Efl_Ui_Textbox_Data *obj, const char *sig, const char *src);
220static void _decoration_defer_all(Eo *obj); 220static void _decoration_defer_all(Eo *obj);
221static inline Eo * _decoration_create(Eo *obj, Efl_Ui_Text_Data *sd, const char *source, Eina_Bool above); 221static inline Eo * _decoration_create(Eo *obj, Efl_Ui_Textbox_Data *sd, const char *source, Eina_Bool above);
222static void _decoration_defer(Eo *obj); 222static void _decoration_defer(Eo *obj);
223static void _clear_text_selection(Efl_Ui_Text_Data *sd); 223static void _clear_text_selection(Efl_Ui_Textbox_Data *sd);
224static void _anchors_free(Efl_Ui_Text_Data *sd); 224static void _anchors_free(Efl_Ui_Textbox_Data *sd);
225static void _selection_defer(Eo *obj, Efl_Ui_Text_Data *sd); 225static void _selection_defer(Eo *obj, Efl_Ui_Textbox_Data *sd);
226static Eina_Position2D _decoration_calc_offset(Efl_Ui_Text_Data *sd); 226static Eina_Position2D _decoration_calc_offset(Efl_Ui_Textbox_Data *sd);
227static void _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd); 227static void _update_text_theme(Eo *obj, Efl_Ui_Textbox_Data *sd);
228 228
229static char * 229static char *
230_file_load(Eo *obj) 230_file_load(Eo *obj)
@@ -347,7 +347,7 @@ _save_do(Evas_Object *obj)
347} 347}
348 348
349static void 349static void
350_efl_ui_text_guide_update(Evas_Object *obj, 350_efl_ui_textbox_guide_update(Evas_Object *obj,
351 Eina_Bool has_text) 351 Eina_Bool has_text)
352{ 352{
353 EFL_UI_TEXT_DATA_GET(obj, sd); 353 EFL_UI_TEXT_DATA_GET(obj, sd);
@@ -658,7 +658,7 @@ _get_drop_format(Evas_Object *obj)
658 658
659/* we can't reuse layout's here, because it's on entry_edje only */ 659/* we can't reuse layout's here, because it's on entry_edje only */
660EOLIAN static void 660EOLIAN static void
661_efl_ui_text_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled) 661_efl_ui_textbox_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Bool disabled)
662{ 662{
663 const char *emission; 663 const char *emission;
664 664
@@ -693,7 +693,7 @@ _efl_ui_text_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool
693/* we can't issue the layout's theming code here, cause it assumes an 693/* we can't issue the layout's theming code here, cause it assumes an
694 * unique edje object, always */ 694 * unique edje object, always */
695EOLIAN static Eina_Error 695EOLIAN static Eina_Error
696_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) 696_efl_ui_textbox_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textbox_Data *sd)
697{ 697{
698 Eina_Error theme_apply; 698 Eina_Error theme_apply;
699 699
@@ -742,7 +742,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
742 } 742 }
743 743
744 sd->has_text = !sd->has_text; 744 sd->has_text = !sd->has_text;
745 _efl_ui_text_guide_update(obj, !sd->has_text); 745 _efl_ui_textbox_guide_update(obj, !sd->has_text);
746 efl_event_thaw(obj); 746 efl_event_thaw(obj);
747 747
748 efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL); 748 efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
@@ -793,7 +793,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
793#define SIZE2D_EQ(X, Y) (((X).w == (Y).w) && ((X).h == (Y).h)) 793#define SIZE2D_EQ(X, Y) (((X).w == (Y).w) && ((X).h == (Y).h))
794 794
795EOLIAN static void 795EOLIAN static void
796_efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd) 796_efl_ui_textbox_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Textbox_Data *sd)
797{ 797{
798 Eina_Size2D min = EINA_SIZE2D(0, 0); 798 Eina_Size2D min = EINA_SIZE2D(0, 0);
799 Eina_Size2D edmin = EINA_SIZE2D(0, 0); 799 Eina_Size2D edmin = EINA_SIZE2D(0, 0);
@@ -863,7 +863,7 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
863} 863}
864 864
865EOLIAN static Eina_Bool 865EOLIAN static Eina_Bool
866_efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd) 866_efl_ui_textbox_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
867{ 867{
868 Evas_Object *top; 868 Evas_Object *top;
869 Eina_Bool top_is_win = EINA_FALSE; 869 Eina_Bool top_is_win = EINA_FALSE;
@@ -919,7 +919,7 @@ _efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
919} 919}
920 920
921EOLIAN static Eina_Rect 921EOLIAN static Eina_Rect
922_efl_ui_text_efl_ui_widget_interest_region_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 922_efl_ui_textbox_efl_ui_widget_interest_region_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
923{ 923{
924 Evas_Coord edje_x, edje_y, elm_x, elm_y; 924 Evas_Coord edje_x, edje_y, elm_x, elm_y;
925 Eina_Rect r = {}; 925 Eina_Rect r = {};
@@ -1032,7 +1032,7 @@ _hoversel_item_paste_cb(void *data,
1032 Evas_Object *obj EINA_UNUSED, 1032 Evas_Object *obj EINA_UNUSED,
1033 void *event_info EINA_UNUSED) 1033 void *event_info EINA_UNUSED)
1034{ 1034{
1035 efl_ui_text_selection_paste(data); 1035 efl_ui_textbox_selection_paste(data);
1036} 1036}
1037 1037
1038static Eina_Value 1038static Eina_Value
@@ -1120,7 +1120,7 @@ _hoversel_item_cut_cb(void *data,
1120 Evas_Object *obj EINA_UNUSED, 1120 Evas_Object *obj EINA_UNUSED,
1121 void *event_info EINA_UNUSED) 1121 void *event_info EINA_UNUSED)
1122{ 1122{
1123 efl_ui_text_selection_cut(data); 1123 efl_ui_textbox_selection_cut(data);
1124} 1124}
1125 1125
1126static void 1126static void
@@ -1128,7 +1128,7 @@ _hoversel_item_copy_cb(void *data,
1128 Evas_Object *obj EINA_UNUSED, 1128 Evas_Object *obj EINA_UNUSED,
1129 void *event_info EINA_UNUSED) 1129 void *event_info EINA_UNUSED)
1130{ 1130{
1131 efl_ui_text_selection_copy(data); 1131 efl_ui_textbox_selection_copy(data);
1132} 1132}
1133 1133
1134static void 1134static void
@@ -1170,7 +1170,7 @@ _menu_call(Evas_Object *obj)
1170 1170
1171 if (sd->anchor_hover.hover) return; 1171 if (sd->anchor_hover.hover) return;
1172 1172
1173 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_CONTEXT_OPEN, NULL); 1173 efl_event_callback_call(obj, EFL_UI_TEXTBOX_EVENT_CONTEXT_OPEN, NULL);
1174 1174
1175 if ((sd->api) && (sd->api->obj_longpress)) 1175 if ((sd->api) && (sd->api->obj_longpress))
1176 { 1176 {
@@ -1319,17 +1319,17 @@ _key_down_cb(void *data,
1319 { 1319 {
1320 if (!strncmp(ev->key, "c", 1)) 1320 if (!strncmp(ev->key, "c", 1))
1321 { 1321 {
1322 efl_ui_text_selection_copy(data); 1322 efl_ui_textbox_selection_copy(data);
1323 on_hold = EINA_TRUE; 1323 on_hold = EINA_TRUE;
1324 } 1324 }
1325 else if (!strncmp(ev->key, "x", 1)) 1325 else if (!strncmp(ev->key, "x", 1))
1326 { 1326 {
1327 efl_ui_text_selection_cut(data); 1327 efl_ui_textbox_selection_cut(data);
1328 on_hold = EINA_TRUE; 1328 on_hold = EINA_TRUE;
1329 } 1329 }
1330 else if (!strncmp(ev->key, "v", 1)) 1330 else if (!strncmp(ev->key, "v", 1))
1331 { 1331 {
1332 efl_ui_text_selection_paste(data); 1332 efl_ui_textbox_selection_paste(data);
1333 on_hold = EINA_TRUE; 1333 on_hold = EINA_TRUE;
1334 } 1334 }
1335 } 1335 }
@@ -1357,7 +1357,7 @@ _mouse_down_cb(void *data,
1357 1357
1358 if (ev->button == 2) 1358 if (ev->button == 2)
1359 { 1359 {
1360 efl_ui_text_selection_paste(data); 1360 efl_ui_textbox_selection_paste(data);
1361 } 1361 }
1362 1362
1363 /* If right button is pressed and context menu disabled is true, 1363 /* If right button is pressed and context menu disabled is true,
@@ -1497,7 +1497,7 @@ _item_get(void *data, const char *item)
1497} 1497}
1498 1498
1499EOLIAN static void 1499EOLIAN static void
1500_efl_ui_text_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *emission, const char *source) 1500_efl_ui_textbox_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, const char *emission, const char *source)
1501{ 1501{
1502 /* always pass to both edje objs */ 1502 /* always pass to both edje objs */
1503 efl_layout_signal_emit(sd->entry_edje, emission, source); 1503 efl_layout_signal_emit(sd->entry_edje, emission, source);
@@ -1513,7 +1513,7 @@ _efl_ui_text_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data
1513} 1513}
1514 1514
1515static Eina_Bool 1515static Eina_Bool
1516_efl_ui_text_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) 1516_efl_ui_textbox_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb)
1517{ 1517{
1518 Eina_Bool ok; 1518 Eina_Bool ok;
1519 1519
@@ -1525,7 +1525,7 @@ _efl_ui_text_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_T
1525} 1525}
1526 1526
1527static Eina_Bool 1527static Eina_Bool
1528_efl_ui_text_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) 1528_efl_ui_textbox_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb)
1529{ 1529{
1530 Eina_Bool ok; 1530 Eina_Bool ok;
1531 1531
@@ -1734,7 +1734,7 @@ _end_handler_mouse_move_cb(void *data,
1734} 1734}
1735 1735
1736static void 1736static void
1737_create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd) 1737_create_selection_handlers(Evas_Object *obj, Efl_Ui_Textbox_Data *sd)
1738{ 1738{
1739 Evas_Object *handle; 1739 Evas_Object *handle;
1740 1740
@@ -1762,7 +1762,7 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
1762} 1762}
1763 1763
1764EOLIAN static void 1764EOLIAN static void
1765_efl_ui_text_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Position2D pos) 1765_efl_ui_textbox_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Position2D pos)
1766{ 1766{
1767 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 1767 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
1768 return; 1768 return;
@@ -1774,7 +1774,7 @@ _efl_ui_text_efl_gfx_entity_position_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Pos
1774} 1774}
1775 1775
1776EOLIAN static void 1776EOLIAN static void
1777_efl_ui_text_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D sz) 1777_efl_ui_textbox_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Size2D sz)
1778{ 1778{
1779 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 1779 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
1780 return; 1780 return;
@@ -1786,7 +1786,7 @@ _efl_ui_text_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Size2D
1786} 1786}
1787 1787
1788EOLIAN static void 1788EOLIAN static void
1789_efl_ui_text_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, Eina_Bool vis) 1789_efl_ui_textbox_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, Eina_Bool vis)
1790{ 1790{
1791 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 1791 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
1792 return; 1792 return;
@@ -1796,7 +1796,7 @@ _efl_ui_text_efl_gfx_entity_visible_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSE
1796} 1796}
1797 1797
1798EOLIAN static void 1798EOLIAN static void
1799_efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member) 1799_efl_ui_textbox_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Textbox_Data *sd, Evas_Object *member)
1800{ 1800{
1801 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member); 1801 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
1802 1802
@@ -1805,7 +1805,7 @@ _efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Ev
1805} 1805}
1806 1806
1807static void 1807static void
1808_update_guide_text(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 1808_update_guide_text(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
1809{ 1809{
1810 const char *txt; 1810 const char *txt;
1811 Eina_Bool show_guide; 1811 Eina_Bool show_guide;
@@ -1897,7 +1897,7 @@ _format_color_parse(const char *str, int slen,
1897 * to allow users to override the theme during the construction of the widget. 1897 * to allow users to override the theme during the construction of the widget.
1898 */ 1898 */
1899static void 1899static void
1900_update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd) 1900_update_text_theme(Eo *obj, Efl_Ui_Textbox_Data *sd)
1901{ 1901{
1902 const char *font_name; 1902 const char *font_name;
1903 const char *font_size; 1903 const char *font_size;
@@ -1948,7 +1948,7 @@ _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd)
1948} 1948}
1949 1949
1950EOLIAN static Eo * 1950EOLIAN static Eo *
1951_efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) 1951_efl_ui_textbox_efl_object_constructor(Eo *obj, Efl_Ui_Textbox_Data *sd)
1952{ 1952{
1953 Eo *text_obj; 1953 Eo *text_obj;
1954 1954
@@ -1986,8 +1986,8 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
1986} 1986}
1987 1987
1988EOLIAN static Eo * 1988EOLIAN static Eo *
1989_efl_ui_text_efl_object_finalize(Eo *obj, 1989_efl_ui_textbox_efl_object_finalize(Eo *obj,
1990 Efl_Ui_Text_Data *sd) 1990 Efl_Ui_Textbox_Data *sd)
1991{ 1991{
1992 obj = efl_finalize(efl_super(obj, MY_CLASS)); 1992 obj = efl_finalize(efl_super(obj, MY_CLASS));
1993 1993
@@ -2027,19 +2027,19 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2027 evas_object_size_hint_align_set 2027 evas_object_size_hint_align_set
2028 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL); 2028 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
2029 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, 2029 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
2030 _efl_ui_text_changed_user_cb, obj); 2030 _efl_ui_textbox_changed_user_cb, obj);
2031 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, 2031 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED,
2032 _efl_ui_text_changed_cb, obj); 2032 _efl_ui_textbox_changed_cb, obj);
2033 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED, 2033 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED,
2034 _efl_ui_text_selection_start_clear_cb, obj); 2034 _efl_ui_textbox_selection_start_clear_cb, obj);
2035 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, 2035 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
2036 _efl_ui_text_selection_changed_cb, obj); 2036 _efl_ui_textbox_selection_changed_cb, obj);
2037 efl_event_callback_add(efl_text_interactive_main_cursor_get(sd->text_obj), EFL_TEXT_CURSOR_EVENT_CHANGED, 2037 efl_event_callback_add(efl_text_interactive_main_cursor_get(sd->text_obj), EFL_TEXT_CURSOR_EVENT_CHANGED,
2038 _efl_ui_text_cursor_changed_cb, obj); 2038 _efl_ui_textbox_cursor_changed_cb, obj);
2039 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, 2039 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
2040 _text_position_changed_cb, obj); 2040 _text_position_changed_cb, obj);
2041 evas_object_event_callback_add(sd->entry_edje, EVAS_CALLBACK_MOVE, 2041 evas_object_event_callback_add(sd->entry_edje, EVAS_CALLBACK_MOVE,
2042 _efl_ui_text_move_cb, obj); 2042 _efl_ui_textbox_move_cb, obj);
2043 2043
2044 evas_object_event_callback_add 2044 evas_object_event_callback_add
2045 (sd->entry_edje, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, obj); 2045 (sd->entry_edje, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, obj);
@@ -2072,7 +2072,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2072} 2072}
2073 2073
2074EOLIAN static void 2074EOLIAN static void
2075_efl_ui_text_efl_object_destructor(Eo *obj, Efl_Ui_Text_Data *sd) 2075_efl_ui_textbox_efl_object_destructor(Eo *obj, Efl_Ui_Textbox_Data *sd)
2076{ 2076{
2077 Elm_Entry_Context_Menu_Item *it; 2077 Elm_Entry_Context_Menu_Item *it;
2078 Elm_Entry_Markup_Filter *tf; 2078 Elm_Entry_Markup_Filter *tf;
@@ -2140,7 +2140,7 @@ _efl_ui_text_efl_object_destructor(Eo *obj, Efl_Ui_Text_Data *sd)
2140} 2140}
2141 2141
2142EOLIAN static void 2142EOLIAN static void
2143_efl_ui_text_efl_text_format_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password) 2143_efl_ui_textbox_efl_text_format_password_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Bool password)
2144{ 2144{
2145 password = !!password; 2145 password = !!password;
2146 2146
@@ -2178,7 +2178,7 @@ _efl_ui_text_efl_text_format_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bo
2178} 2178}
2179 2179
2180static void 2180static void
2181_efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd) 2181_efl_ui_textbox_calc_force(Eo *obj, Efl_Ui_Textbox_Data *sd)
2182{ 2182{
2183 sd->calc_force = EINA_TRUE; 2183 sd->calc_force = EINA_TRUE;
2184 edje_object_calc_force(sd->entry_edje); 2184 edje_object_calc_force(sd->entry_edje);
@@ -2186,7 +2186,7 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
2186} 2186}
2187 2187
2188static const char* 2188static const char*
2189_efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED) 2189_efl_ui_textbox_selection_get(const Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED)
2190{ 2190{
2191 Efl_Text_Cursor *start_obj, *end_obj; 2191 Efl_Text_Cursor *start_obj, *end_obj;
2192 2192
@@ -2197,20 +2197,20 @@ _efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
2197} 2197}
2198 2198
2199EOLIAN static void 2199EOLIAN static void
2200_efl_ui_text_selection_handler_disabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool disabled) 2200_efl_ui_textbox_selection_handler_disabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool disabled)
2201{ 2201{
2202 if (sd->sel_handler_disabled == disabled) return; 2202 if (sd->sel_handler_disabled == disabled) return;
2203 sd->sel_handler_disabled = disabled; 2203 sd->sel_handler_disabled = disabled;
2204} 2204}
2205 2205
2206EOLIAN static Eina_Bool 2206EOLIAN static Eina_Bool
2207_efl_ui_text_selection_handler_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 2207_efl_ui_textbox_selection_handler_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
2208{ 2208{
2209 return sd->sel_handler_disabled; 2209 return sd->sel_handler_disabled;
2210} 2210}
2211 2211
2212static void 2212static void
2213_efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry) 2213_efl_ui_textbox_entry_insert(Eo *obj, Efl_Ui_Textbox_Data *sd, const char *entry)
2214{ 2214{
2215 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 2215 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj);
2216 efl_text_cursor_text_insert(cur_obj, entry); 2216 efl_text_cursor_text_insert(cur_obj, entry);
@@ -2219,13 +2219,13 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
2219} 2219}
2220 2220
2221EOLIAN static void 2221EOLIAN static void
2222_efl_ui_text_cursor_add(Eo *obj, Efl_Ui_Text_Data *pd, Efl_Text_Cursor *cursor) 2222_efl_ui_textbox_cursor_add(Eo *obj, Efl_Ui_Textbox_Data *pd, Efl_Text_Cursor *cursor)
2223{ 2223{
2224 efl_text_cursor_text_object_set(cursor, pd->text_obj, obj); 2224 efl_text_cursor_text_object_set(cursor, pd->text_obj, obj);
2225} 2225}
2226 2226
2227EOLIAN static Efl_Text_Cursor * 2227EOLIAN static Efl_Text_Cursor *
2228_efl_ui_text_cursor_create(Eo *obj, Efl_Ui_Text_Data *pd) 2228_efl_ui_textbox_cursor_create(Eo *obj, Efl_Ui_Textbox_Data *pd)
2229{ 2229{
2230 Eo* cursor = efl_add(EFL_TEXT_CURSOR_CLASS, pd->text_obj); 2230 Eo* cursor = efl_add(EFL_TEXT_CURSOR_CLASS, pd->text_obj);
2231 efl_text_cursor_text_object_set(cursor, pd->text_obj, obj); 2231 efl_text_cursor_text_object_set(cursor, pd->text_obj, obj);
@@ -2233,7 +2233,7 @@ _efl_ui_text_cursor_create(Eo *obj, Efl_Ui_Text_Data *pd)
2233} 2233}
2234 2234
2235EOLIAN static void 2235EOLIAN static void
2236_efl_ui_text_efl_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool editable) 2236_efl_ui_textbox_efl_text_interactive_editable_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Eina_Bool editable)
2237{ 2237{
2238 if (efl_text_interactive_editable_get(obj) == editable) return; 2238 if (efl_text_interactive_editable_get(obj) == editable) return;
2239 2239
@@ -2269,7 +2269,7 @@ _efl_ui_text_efl_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Ei
2269} 2269}
2270 2270
2271static void 2271static void
2272_efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, int start, int end) 2272_efl_ui_textbox_select_region_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, int start, int end)
2273{ 2273{
2274 Efl_Text_Cursor *sel_start, *sel_end; 2274 Efl_Text_Cursor *sel_start, *sel_end;
2275 2275
@@ -2282,7 +2282,7 @@ _efl_ui_text_select_region_set(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED, int st
2282} 2282}
2283 2283
2284EOLIAN static void 2284EOLIAN static void
2285_efl_ui_text_selection_cut(Eo *obj, Efl_Ui_Text_Data *sd) 2285_efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd)
2286{ 2286{
2287 Efl_Text_Cursor *start, *end; 2287 Efl_Text_Cursor *start, *end;
2288 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; 2288 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
@@ -2317,11 +2317,11 @@ _efl_ui_text_selection_cut(Eo *obj, Efl_Ui_Text_Data *sd)
2317 tmp = NULL; 2317 tmp = NULL;
2318 efl_text_interactive_all_unselect(obj); 2318 efl_text_interactive_all_unselect(obj);
2319 2319
2320 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_SELECTION_CUT, NULL); 2320 efl_event_callback_call(obj, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT, NULL);
2321} 2321}
2322 2322
2323EOLIAN static void 2323EOLIAN static void
2324_efl_ui_text_selection_copy(Eo *obj, Efl_Ui_Text_Data *sd) 2324_efl_ui_textbox_selection_copy(Eo *obj, Efl_Ui_Textbox_Data *sd)
2325{ 2325{
2326 if (efl_text_password_get(obj)) return; 2326 if (efl_text_password_get(obj)) return;
2327 2327
@@ -2334,42 +2334,42 @@ _efl_ui_text_selection_copy(Eo *obj, Efl_Ui_Text_Data *sd)
2334 elm_widget_scroll_hold_pop(obj); 2334 elm_widget_scroll_hold_pop(obj);
2335 } 2335 }
2336 _selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj); 2336 _selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
2337 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_SELECTION_COPY, NULL); 2337 efl_event_callback_call(obj, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY, NULL);
2338} 2338}
2339 2339
2340EOLIAN static void 2340EOLIAN static void
2341_efl_ui_text_selection_paste(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED) 2341_efl_ui_textbox_selection_paste(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED)
2342{ 2342{
2343 Efl_Ui_Selection_Format formats = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP; 2343 Efl_Ui_Selection_Format formats = EFL_UI_SELECTION_FORMAT_TEXT | EFL_UI_SELECTION_FORMAT_MARKUP;
2344 2344
2345 efl_ui_selection_get(obj, EFL_UI_SELECTION_TYPE_CLIPBOARD, formats, 2345 efl_ui_selection_get(obj, EFL_UI_SELECTION_TYPE_CLIPBOARD, formats,
2346 NULL, _selection_data_cb, NULL, 1); 2346 NULL, _selection_data_cb, NULL, 1);
2347 2347
2348 efl_event_callback_call(obj, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL); 2348 efl_event_callback_call(obj, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
2349} 2349}
2350 2350
2351EOLIAN static void 2351EOLIAN static void
2352_efl_ui_text_context_menu_disabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool disabled) 2352_efl_ui_textbox_context_menu_disabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool disabled)
2353{ 2353{
2354 if (sd->context_menu == !disabled) return; 2354 if (sd->context_menu == !disabled) return;
2355 sd->context_menu = !disabled; 2355 sd->context_menu = !disabled;
2356} 2356}
2357 2357
2358EOLIAN static Eina_Bool 2358EOLIAN static Eina_Bool
2359_efl_ui_text_context_menu_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 2359_efl_ui_textbox_context_menu_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
2360{ 2360{
2361 return !sd->context_menu; 2361 return !sd->context_menu;
2362} 2362}
2363 2363
2364EOLIAN static Eina_Error 2364EOLIAN static Eina_Error
2365_efl_ui_text_efl_file_file_set(Eo *obj, Efl_Ui_Text_Data *sd, const char *file) 2365_efl_ui_textbox_efl_file_file_set(Eo *obj, Efl_Ui_Textbox_Data *sd, const char *file)
2366{ 2366{
2367 eina_stringshare_replace(&sd->file, file); 2367 eina_stringshare_replace(&sd->file, file);
2368 return efl_file_set(efl_super(obj, MY_CLASS), file); 2368 return efl_file_set(efl_super(obj, MY_CLASS), file);
2369} 2369}
2370 2370
2371EOLIAN static void 2371EOLIAN static void
2372_efl_ui_text_efl_file_unload(Eo *obj, Efl_Ui_Text_Data *sd) 2372_efl_ui_textbox_efl_file_unload(Eo *obj, Efl_Ui_Textbox_Data *sd)
2373{ 2373{
2374 efl_file_unload(efl_super(obj, MY_CLASS)); 2374 efl_file_unload(efl_super(obj, MY_CLASS));
2375 ELM_SAFE_FREE(sd->delay_write, ecore_timer_del); 2375 ELM_SAFE_FREE(sd->delay_write, ecore_timer_del);
@@ -2377,7 +2377,7 @@ _efl_ui_text_efl_file_unload(Eo *obj, Efl_Ui_Text_Data *sd)
2377} 2377}
2378 2378
2379EOLIAN static Eina_Error 2379EOLIAN static Eina_Error
2380_efl_ui_text_efl_file_load(Eo *obj, Efl_Ui_Text_Data *sd) 2380_efl_ui_textbox_efl_file_load(Eo *obj, Efl_Ui_Textbox_Data *sd)
2381{ 2381{
2382 Eina_Error err; 2382 Eina_Error err;
2383 2383
@@ -2390,7 +2390,7 @@ _efl_ui_text_efl_file_load(Eo *obj, Efl_Ui_Text_Data *sd)
2390} 2390}
2391 2391
2392EOLIAN static void 2392EOLIAN static void
2393_efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Ui_Selection_Format cnp_mode) 2393_efl_ui_textbox_cnp_mode_set(Eo *obj, Efl_Ui_Textbox_Data *sd, Efl_Ui_Selection_Format cnp_mode)
2394{ 2394{
2395 Elm_Sel_Format dnd_format = EFL_UI_SELECTION_FORMAT_MARKUP; 2395 Elm_Sel_Format dnd_format = EFL_UI_SELECTION_FORMAT_MARKUP;
2396 2396
@@ -2425,13 +2425,13 @@ _efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Ui_Selection_Format
2425} 2425}
2426 2426
2427EOLIAN static Efl_Ui_Selection_Format 2427EOLIAN static Efl_Ui_Selection_Format
2428_efl_ui_text_cnp_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 2428_efl_ui_textbox_cnp_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
2429{ 2429{
2430 return sd->cnp_mode; 2430 return sd->cnp_mode;
2431} 2431}
2432 2432
2433EOLIAN static void 2433EOLIAN static void
2434_efl_ui_text_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool scroll) 2434_efl_ui_textbox_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, Eina_Bool scroll)
2435{ 2435{
2436 if (sd->scroll == scroll) return; 2436 if (sd->scroll == scroll) return;
2437 sd->scroll = scroll; 2437 sd->scroll = scroll;
@@ -2460,13 +2460,13 @@ _efl_ui_text_scrollable_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool
2460} 2460}
2461 2461
2462EOLIAN static Eina_Bool 2462EOLIAN static Eina_Bool
2463_efl_ui_text_scrollable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 2463_efl_ui_textbox_scrollable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd)
2464{ 2464{
2465 return sd->scroll; 2465 return sd->scroll;
2466} 2466}
2467 2467
2468EOLIAN static Eina_Bool 2468EOLIAN static Eina_Bool
2469_efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) 2469_efl_ui_textbox_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
2470{ 2470{
2471 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 2471 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
2472 2472
@@ -2485,7 +2485,7 @@ _efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EIN
2485// ATSPI Accessibility 2485// ATSPI Accessibility
2486 2486
2487EOLIAN static Eina_Unicode 2487EOLIAN static Eina_Unicode
2488_efl_ui_text_efl_access_text_character_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) 2488_efl_ui_textbox_efl_access_text_character_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int offset)
2489{ 2489{
2490 const char *txt; 2490 const char *txt;
2491 int idx = 0; 2491 int idx = 0;
@@ -2504,7 +2504,7 @@ _efl_ui_text_efl_access_text_character_get(const Eo *obj, Efl_Ui_Text_Data *_pd
2504} 2504}
2505 2505
2506EOLIAN static int 2506EOLIAN static int
2507_efl_ui_text_efl_access_text_character_count_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 2507_efl_ui_textbox_efl_access_text_character_count_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
2508{ 2508{
2509 const char *txt; 2509 const char *txt;
2510 2510
@@ -2514,7 +2514,7 @@ _efl_ui_text_efl_access_text_character_count_get(const Eo *obj, Efl_Ui_Text_Data
2514} 2514}
2515 2515
2516EOLIAN static char* 2516EOLIAN static char*
2517_efl_ui_text_efl_access_text_string_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset) 2517_efl_ui_textbox_efl_access_text_string_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset)
2518{ 2518{
2519 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 2519 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
2520 char *ret = NULL; 2520 char *ret = NULL;
@@ -2595,7 +2595,7 @@ fail:
2595} 2595}
2596 2596
2597EOLIAN static char* 2597EOLIAN static char*
2598_efl_ui_text_efl_access_text_access_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset) 2598_efl_ui_textbox_efl_access_text_access_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int start_offset, int end_offset)
2599{ 2599{
2600 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 2600 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
2601 char *ret = NULL; 2601 char *ret = NULL;
@@ -2632,26 +2632,26 @@ fail:
2632} 2632}
2633 2633
2634EOLIAN static int 2634EOLIAN static int
2635_efl_ui_text_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 2635_efl_ui_textbox_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
2636{ 2636{
2637 return efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj)); 2637 return efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj));
2638} 2638}
2639 2639
2640EOLIAN static Eina_Bool 2640EOLIAN static Eina_Bool
2641_efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) 2641_efl_ui_textbox_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int offset)
2642{ 2642{
2643 efl_text_cursor_position_set(efl_text_interactive_main_cursor_get(obj), offset); 2643 efl_text_cursor_position_set(efl_text_interactive_main_cursor_get(obj), offset);
2644 return EINA_TRUE; 2644 return EINA_TRUE;
2645} 2645}
2646 2646
2647EOLIAN static int 2647EOLIAN static int
2648_efl_ui_text_efl_access_text_selections_count_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 2648_efl_ui_textbox_efl_access_text_selections_count_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
2649{ 2649{
2650 return _efl_ui_text_selection_get(obj, _pd) ? 1 : 0; 2650 return _efl_ui_textbox_selection_get(obj, _pd) ? 1 : 0;
2651} 2651}
2652 2652
2653EOLIAN static void 2653EOLIAN static void
2654_efl_ui_text_efl_access_text_access_selection_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset) 2654_efl_ui_textbox_efl_access_text_access_selection_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
2655{ 2655{
2656 if (selection_number != 0) return; 2656 if (selection_number != 0) return;
2657 2657
@@ -2659,17 +2659,17 @@ _efl_ui_text_efl_access_text_access_selection_get(const Eo *obj, Efl_Ui_Text_Dat
2659} 2659}
2660 2660
2661EOLIAN static Eina_Bool 2661EOLIAN static Eina_Bool
2662_efl_ui_text_efl_access_text_access_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset) 2662_efl_ui_textbox_efl_access_text_access_selection_set(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
2663{ 2663{
2664 if (selection_number != 0) return EINA_FALSE; 2664 if (selection_number != 0) return EINA_FALSE;
2665 2665
2666 _efl_ui_text_select_region_set(obj, _pd, start_offset, end_offset); 2666 _efl_ui_textbox_select_region_set(obj, _pd, start_offset, end_offset);
2667 2667
2668 return EINA_TRUE; 2668 return EINA_TRUE;
2669} 2669}
2670 2670
2671EOLIAN static Eina_Bool 2671EOLIAN static Eina_Bool
2672_efl_ui_text_efl_access_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number) 2672_efl_ui_textbox_efl_access_text_selection_remove(Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int selection_number)
2673{ 2673{
2674 if (selection_number != 0) return EINA_FALSE; 2674 if (selection_number != 0) return EINA_FALSE;
2675 efl_text_interactive_all_unselect(obj); 2675 efl_text_interactive_all_unselect(obj);
@@ -2677,21 +2677,21 @@ _efl_ui_text_efl_access_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA
2677} 2677}
2678 2678
2679EOLIAN static Eina_Bool 2679EOLIAN static Eina_Bool
2680_efl_ui_text_efl_access_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset) 2680_efl_ui_textbox_efl_access_text_selection_add(Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int start_offset, int end_offset)
2681{ 2681{
2682 _efl_ui_text_select_region_set(obj, pd, start_offset, end_offset); 2682 _efl_ui_textbox_select_region_set(obj, pd, start_offset, end_offset);
2683 2683
2684 return EINA_TRUE; 2684 return EINA_TRUE;
2685} 2685}
2686 2686
2687EOLIAN static Eina_List* 2687EOLIAN static Eina_List*
2688_efl_ui_text_efl_access_text_bounded_ranges_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED) 2688_efl_ui_textbox_efl_access_text_bounded_ranges_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED)
2689{ 2689{
2690 return NULL; 2690 return NULL;
2691} 2691}
2692 2692
2693EOLIAN static int 2693EOLIAN static int
2694_efl_ui_text_efl_access_text_offset_at_point_get(const Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y) 2694_efl_ui_textbox_efl_access_text_offset_at_point_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
2695{ 2695{
2696 Evas_Textblock_Cursor *cur; 2696 Evas_Textblock_Cursor *cur;
2697 int ret; 2697 int ret;
@@ -2724,7 +2724,7 @@ _efl_ui_text_efl_access_text_offset_at_point_get(const Eo *obj, Efl_Ui_Text_Data
2724} 2724}
2725 2725
2726EOLIAN static Eina_Bool 2726EOLIAN static Eina_Bool
2727_efl_ui_text_efl_access_text_character_extents_get(const Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect) 2727_efl_ui_textbox_efl_access_text_character_extents_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
2728{ 2728{
2729 Evas_Textblock_Cursor *cur; 2729 Evas_Textblock_Cursor *cur;
2730 int ret; 2730 int ret;
@@ -2755,7 +2755,7 @@ _efl_ui_text_efl_access_text_character_extents_get(const Eo *obj, Efl_Ui_Text_Da
2755} 2755}
2756 2756
2757EOLIAN static Eina_Bool 2757EOLIAN static Eina_Bool
2758_efl_ui_text_efl_access_text_range_extents_get(const Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect) 2758_efl_ui_textbox_efl_access_text_range_extents_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
2759{ 2759{
2760 Evas_Textblock_Cursor *cur1, *cur2; 2760 Evas_Textblock_Cursor *cur1, *cur2;
2761 int ret; 2761 int ret;
@@ -2822,7 +2822,7 @@ _textblock_node_format_to_atspi_text_attr(Efl_Text_Attribute_Handle *annotation)
2822} 2822}
2823 2823
2824EOLIAN static Eina_Bool 2824EOLIAN static Eina_Bool
2825_efl_ui_text_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value) 2825_efl_ui_textbox_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
2826{ 2826{
2827 Efl_Text_Cursor *cur1, *cur2; 2827 Efl_Text_Cursor *cur1, *cur2;
2828 Efl_Access_Text_Attribute *attr; 2828 Efl_Access_Text_Attribute *attr;
@@ -2830,10 +2830,10 @@ _efl_ui_text_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Text_Data *_pd
2830 Efl_Text_Attribute_Handle *an; 2830 Efl_Text_Attribute_Handle *an;
2831 2831
2832 Eo *mobj = (Eo *)obj; 2832 Eo *mobj = (Eo *)obj;
2833 cur1 = efl_ui_text_cursor_create(mobj); 2833 cur1 = efl_ui_textbox_cursor_create(mobj);
2834 if (!cur1) return EINA_FALSE; 2834 if (!cur1) return EINA_FALSE;
2835 2835
2836 cur2 = efl_ui_text_cursor_create(mobj); 2836 cur2 = efl_ui_textbox_cursor_create(mobj);
2837 if (!cur2) 2837 if (!cur2)
2838 { 2838 {
2839 efl_del(cur1); 2839 efl_del(cur1);
@@ -2868,7 +2868,7 @@ _efl_ui_text_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Text_Data *_pd
2868} 2868}
2869 2869
2870EOLIAN static Eina_List* 2870EOLIAN static Eina_List*
2871_efl_ui_text_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset) 2871_efl_ui_textbox_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
2872{ 2872{
2873 Efl_Text_Cursor *cur1, *cur2; 2873 Efl_Text_Cursor *cur1, *cur2;
2874 Eina_List *ret = NULL; 2874 Eina_List *ret = NULL;
@@ -2876,10 +2876,10 @@ _efl_ui_text_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Text_Data
2876 Eina_Iterator *annotations; 2876 Eina_Iterator *annotations;
2877 Efl_Text_Attribute_Handle *an; 2877 Efl_Text_Attribute_Handle *an;
2878 Eo *mobj = (Eo *)obj; 2878 Eo *mobj = (Eo *)obj;
2879 cur1 = efl_ui_text_cursor_create(mobj); 2879 cur1 = efl_ui_textbox_cursor_create(mobj);
2880 if (!cur1) return NULL; 2880 if (!cur1) return NULL;
2881 2881
2882 cur2 = efl_ui_text_cursor_create(mobj); 2882 cur2 = efl_ui_textbox_cursor_create(mobj);
2883 if (!cur2) 2883 if (!cur2)
2884 { 2884 {
2885 efl_del(cur1); 2885 efl_del(cur1);
@@ -2908,7 +2908,7 @@ _efl_ui_text_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Text_Data
2908} 2908}
2909 2909
2910EOLIAN static Eina_List* 2910EOLIAN static Eina_List*
2911_efl_ui_text_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 2911_efl_ui_textbox_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
2912{ 2912{
2913 Eina_List *ret = NULL; 2913 Eina_List *ret = NULL;
2914 Efl_Access_Text_Attribute *attr; 2914 Efl_Access_Text_Attribute *attr;
@@ -2918,8 +2918,8 @@ _efl_ui_text_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Text_D
2918 2918
2919 /* Retrieve all annotations in the text. */ 2919 /* Retrieve all annotations in the text. */
2920 Eo *mobj = (Eo *)obj; /* XXX const */ 2920 Eo *mobj = (Eo *)obj; /* XXX const */
2921 start = efl_ui_text_cursor_create(mobj); 2921 start = efl_ui_textbox_cursor_create(mobj);
2922 end = efl_ui_text_cursor_create(mobj); 2922 end = efl_ui_textbox_cursor_create(mobj);
2923 2923
2924 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 2924 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
2925 efl_text_cursor_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 2925 efl_text_cursor_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
@@ -2938,33 +2938,33 @@ _efl_ui_text_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Text_D
2938} 2938}
2939 2939
2940EOLIAN static Eina_Bool 2940EOLIAN static Eina_Bool
2941_efl_ui_text_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content) 2941_efl_ui_textbox_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, const char *content)
2942{ 2942{
2943 efl_text_set(obj, content); 2943 efl_text_set(obj, content);
2944 return EINA_TRUE; 2944 return EINA_TRUE;
2945} 2945}
2946 2946
2947EOLIAN static Eina_Bool 2947EOLIAN static Eina_Bool
2948_efl_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position) 2948_efl_ui_textbox_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Textbox_Data *pd, const char *string, int position)
2949{ 2949{
2950 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 2950 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj);
2951 efl_text_cursor_position_set(cur_obj, position); 2951 efl_text_cursor_position_set(cur_obj, position);
2952 _efl_ui_text_entry_insert(obj, pd, string); 2952 _efl_ui_textbox_entry_insert(obj, pd, string);
2953 2953
2954 return EINA_TRUE; 2954 return EINA_TRUE;
2955} 2955}
2956 2956
2957EOLIAN static Eina_Bool 2957EOLIAN static Eina_Bool
2958_efl_ui_text_efl_access_editable_text_copy(Eo *obj, Efl_Ui_Text_Data *pd, int start, int end) 2958_efl_ui_textbox_efl_access_editable_text_copy(Eo *obj, Efl_Ui_Textbox_Data *pd, int start, int end)
2959{ 2959{
2960 _efl_ui_text_select_region_set(obj, pd, start, end); 2960 _efl_ui_textbox_select_region_set(obj, pd, start, end);
2961 efl_ui_text_selection_copy(obj); 2961 efl_ui_textbox_selection_copy(obj);
2962 2962
2963 return EINA_TRUE; 2963 return EINA_TRUE;
2964} 2964}
2965 2965
2966EOLIAN static Eina_Bool 2966EOLIAN static Eina_Bool
2967_efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset) 2967_efl_ui_textbox_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Textbox_Data *pd, int start_offset, int end_offset)
2968{ 2968{
2969 Evas_Textblock_Cursor *cur1, *cur2; 2969 Evas_Textblock_Cursor *cur1, *cur2;
2970 Eo *text_obj = pd->text_obj; 2970 Eo *text_obj = pd->text_obj;
@@ -2989,33 +2989,33 @@ _efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int
2989 evas_textblock_cursor_free(cur1); 2989 evas_textblock_cursor_free(cur1);
2990 evas_textblock_cursor_free(cur2); 2990 evas_textblock_cursor_free(cur2);
2991 2991
2992 _efl_ui_text_calc_force(obj, pd); 2992 _efl_ui_textbox_calc_force(obj, pd);
2993 2993
2994 return EINA_TRUE; 2994 return EINA_TRUE;
2995} 2995}
2996 2996
2997EOLIAN static Eina_Bool 2997EOLIAN static Eina_Bool
2998_efl_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position) 2998_efl_ui_textbox_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int position)
2999{ 2999{
3000 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 3000 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj);
3001 efl_text_cursor_position_set(cur_obj, position); 3001 efl_text_cursor_position_set(cur_obj, position);
3002 efl_ui_text_selection_paste(obj); 3002 efl_ui_textbox_selection_paste(obj);
3003 return EINA_TRUE; 3003 return EINA_TRUE;
3004} 3004}
3005 3005
3006EOLIAN static Eina_Bool 3006EOLIAN static Eina_Bool
3007_efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start, int end) 3007_efl_ui_textbox_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int start, int end)
3008{ 3008{
3009 _efl_ui_text_select_region_set(obj, pd, start, end); 3009 _efl_ui_textbox_select_region_set(obj, pd, start, end);
3010 efl_ui_text_selection_cut(obj); 3010 efl_ui_textbox_selection_cut(obj);
3011 return EINA_TRUE; 3011 return EINA_TRUE;
3012} 3012}
3013 3013
3014EOLIAN static Efl_Access_State_Set 3014EOLIAN static Efl_Access_State_Set
3015_efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 3015_efl_ui_textbox_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
3016{ 3016{
3017 Efl_Access_State_Set ret; 3017 Efl_Access_State_Set ret;
3018 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 3018 ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXTBOX_CLASS));
3019 3019
3020 if (efl_text_interactive_editable_get(obj)) 3020 if (efl_text_interactive_editable_get(obj))
3021 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EDITABLE); 3021 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_EDITABLE);
@@ -3024,17 +3024,17 @@ _efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_p
3024} 3024}
3025 3025
3026EOLIAN static const char* 3026EOLIAN static const char*
3027_efl_ui_text_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd) 3027_efl_ui_textbox_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Textbox_Data *pd)
3028{ 3028{
3029 const char *name; 3029 const char *name;
3030 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 3030 name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_TEXTBOX_CLASS));
3031 if (name && strncmp("", name, 1)) return name; 3031 if (name && strncmp("", name, 1)) return name;
3032 const char *ret = edje_object_part_text_get(pd->entry_edje, "efl.guide"); 3032 const char *ret = edje_object_part_text_get(pd->entry_edje, "efl.guide");
3033 return ret; 3033 return ret;
3034} 3034}
3035 3035
3036static void 3036static void
3037_edje_signal_emit(Efl_Ui_Text_Data *sd, const char *sig, const char *src) 3037_edje_signal_emit(Efl_Ui_Textbox_Data *sd, const char *sig, const char *src)
3038{ 3038{
3039 edje_object_signal_emit(sd->entry_edje, sig, src); 3039 edje_object_signal_emit(sd->entry_edje, sig, src);
3040 edje_object_signal_emit(sd->cursor, sig, src); 3040 edje_object_signal_emit(sd->cursor, sig, src);
@@ -3042,7 +3042,7 @@ _edje_signal_emit(Efl_Ui_Text_Data *sd, const char *sig, const char *src)
3042} 3042}
3043 3043
3044static inline Eo * 3044static inline Eo *
3045_decoration_create(Eo *obj, Efl_Ui_Text_Data *sd, 3045_decoration_create(Eo *obj, Efl_Ui_Textbox_Data *sd,
3046 const char *group_name, Eina_Bool above) 3046 const char *group_name, Eina_Bool above)
3047{ 3047{
3048 Eo *ret = NULL; 3048 Eo *ret = NULL;
@@ -3065,7 +3065,7 @@ _decoration_create(Eo *obj, Efl_Ui_Text_Data *sd,
3065} 3065}
3066 3066
3067static void 3067static void
3068_create_text_cursors(Eo *obj, Efl_Ui_Text_Data *sd) 3068_create_text_cursors(Eo *obj, Efl_Ui_Textbox_Data *sd)
3069{ 3069{
3070 sd->cursor = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE); 3070 sd->cursor = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE);
3071 sd->cursor_bidi = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE); 3071 sd->cursor_bidi = _decoration_create(obj, sd, PART_NAME_CURSOR, EINA_TRUE);
@@ -3078,7 +3078,7 @@ _create_text_cursors(Eo *obj, Efl_Ui_Text_Data *sd)
3078} 3078}
3079 3079
3080static Eina_Position2D 3080static Eina_Position2D
3081_decoration_calc_offset(Efl_Ui_Text_Data *sd) 3081_decoration_calc_offset(Efl_Ui_Textbox_Data *sd)
3082{ 3082{
3083 Eina_Position2D ret; 3083 Eina_Position2D ret;
3084 Eina_Position2D text; 3084 Eina_Position2D text;
@@ -3146,7 +3146,7 @@ _update_text_cursors(Eo *obj)
3146} 3146}
3147 3147
3148static void 3148static void
3149_clear_text_selection(Efl_Ui_Text_Data *sd) 3149_clear_text_selection(Efl_Ui_Textbox_Data *sd)
3150{ 3150{
3151 Efl_Ui_Text_Rectangle *r; 3151 Efl_Ui_Text_Rectangle *r;
3152 3152
@@ -3224,7 +3224,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
3224} 3224}
3225 3225
3226static void 3226static void
3227_anchors_free(Efl_Ui_Text_Data *sd) 3227_anchors_free(Efl_Ui_Textbox_Data *sd)
3228{ 3228{
3229 Anchor *an; 3229 Anchor *an;
3230 3230
@@ -3282,7 +3282,7 @@ _anchor_format_parse(const char *item)
3282} 3282}
3283 3283
3284static Anchor * 3284static Anchor *
3285_anchor_get(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Text_Attribute_Handle *an) 3285_anchor_get(Eo *obj, Efl_Ui_Textbox_Data *sd, Efl_Text_Attribute_Handle *an)
3286{ 3286{
3287 Anchor *anc; 3287 Anchor *anc;
3288 Eina_List *i; 3288 Eina_List *i;
@@ -3322,7 +3322,7 @@ _anchor_get(Eo *obj, Efl_Ui_Text_Data *sd, Efl_Text_Attribute_Handle *an)
3322 * Recreates and updates the anchors in the text. 3322 * Recreates and updates the anchors in the text.
3323 */ 3323 */
3324static void 3324static void
3325_anchors_update(Eo *obj, Efl_Ui_Text_Data *sd) 3325_anchors_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
3326{ 3326{
3327 Evas_Object *smart, *clip; 3327 Evas_Object *smart, *clip;
3328 Eina_Iterator *it; 3328 Eina_Iterator *it;
@@ -3398,8 +3398,8 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
3398 Eina_List *l; 3398 Eina_List *l;
3399 Eina_Rectangle *r; 3399 Eina_Rectangle *r;
3400 size_t count; 3400 size_t count;
3401 start = efl_ui_text_cursor_create(obj); 3401 start = efl_ui_textbox_cursor_create(obj);
3402 end = efl_ui_text_cursor_create(obj); 3402 end = efl_ui_textbox_cursor_create(obj);
3403 efl_text_attribute_factory_attribute_cursors_get(anc->annotation, start, end); 3403 efl_text_attribute_factory_attribute_cursors_get(anc->annotation, start, end);
3404 3404
3405 range = efl_text_cursor_range_geometry_get(start, end); 3405 range = efl_text_cursor_range_geometry_get(start, end);
@@ -3528,7 +3528,7 @@ _decoration_defer(Eo *obj)
3528} 3528}
3529 3529
3530static void 3530static void
3531_selection_defer(Eo *obj, Efl_Ui_Text_Data *sd) 3531_selection_defer(Eo *obj, Efl_Ui_Textbox_Data *sd)
3532{ 3532{
3533 sd->deferred_decoration_selection = EINA_TRUE; 3533 sd->deferred_decoration_selection = EINA_TRUE;
3534 _decoration_defer(obj); 3534 _decoration_defer(obj);
@@ -3545,20 +3545,20 @@ _decoration_defer_all(Eo *obj)
3545} 3545}
3546 3546
3547static void 3547static void
3548_efl_ui_text_changed_cb(void *data, const Efl_Event *event) 3548_efl_ui_textbox_changed_cb(void *data, const Efl_Event *event)
3549{ 3549{
3550 if (efl_invalidated_get(event->object)) return; 3550 if (efl_invalidated_get(event->object)) return;
3551 EFL_UI_TEXT_DATA_GET(data, sd); 3551 EFL_UI_TEXT_DATA_GET(data, sd);
3552 sd->text_changed = EINA_TRUE; 3552 sd->text_changed = EINA_TRUE;
3553 sd->cursor_update = EINA_TRUE; 3553 sd->cursor_update = EINA_TRUE;
3554 _update_guide_text(data, sd); 3554 _update_guide_text(data, sd);
3555 efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CHANGED, NULL); 3555 efl_event_callback_call(data, EFL_UI_TEXTBOX_EVENT_CHANGED, NULL);
3556 efl_canvas_group_change(data); 3556 efl_canvas_group_change(data);
3557 _decoration_defer(data); 3557 _decoration_defer(data);
3558} 3558}
3559 3559
3560static void 3560static void
3561_efl_ui_text_changed_user_cb(void *data, const Efl_Event *event) 3561_efl_ui_textbox_changed_user_cb(void *data, const Efl_Event *event)
3562{ 3562{
3563 Eo *obj = data; 3563 Eo *obj = data;
3564 3564
@@ -3571,7 +3571,7 @@ _efl_ui_text_changed_user_cb(void *data, const Efl_Event *event)
3571} 3571}
3572 3572
3573static void 3573static void
3574_efl_ui_text_cursor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) 3574_efl_ui_textbox_cursor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
3575{ 3575{
3576 if (efl_invalidated_get(event->object)) return; 3576 if (efl_invalidated_get(event->object)) return;
3577 EFL_UI_TEXT_DATA_GET(data, sd); 3577 EFL_UI_TEXT_DATA_GET(data, sd);
@@ -3605,7 +3605,7 @@ _text_position_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
3605} 3605}
3606 3606
3607static void 3607static void
3608_efl_ui_text_selection_start_clear_cb(void *data, const Efl_Event *event EINA_UNUSED) 3608_efl_ui_textbox_selection_start_clear_cb(void *data, const Efl_Event *event EINA_UNUSED)
3609{ 3609{
3610 if (efl_invalidated_get(event->object)) return; 3610 if (efl_invalidated_get(event->object)) return;
3611 Eo *obj = data; 3611 Eo *obj = data;
@@ -3626,7 +3626,7 @@ _efl_ui_text_selection_start_clear_cb(void *data, const Efl_Event *event EINA_UN
3626} 3626}
3627 3627
3628static void 3628static void
3629_efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED) 3629_efl_ui_textbox_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
3630{ 3630{
3631 if (efl_invalidated_get(event->object)) return; 3631 if (efl_invalidated_get(event->object)) return;
3632 Eo *obj = data; 3632 Eo *obj = data;
@@ -3637,14 +3637,14 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED
3637} 3637}
3638 3638
3639static void 3639static void
3640_efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, 3640_efl_ui_textbox_move_cb(void *data, Evas *e EINA_UNUSED,
3641 Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 3641 Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
3642{ 3642{
3643 _decoration_defer_all(data); 3643 _decoration_defer_all(data);
3644} 3644}
3645 3645
3646static void 3646static void
3647_efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, 3647_efl_ui_textbox_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd,
3648 Efl_Canvas_Textblock_Factory *item_factory) 3648 Efl_Canvas_Textblock_Factory *item_factory)
3649{ 3649{
3650 if (pd->item_factory) efl_unref(pd->item_factory); 3650 if (pd->item_factory) efl_unref(pd->item_factory);
@@ -3652,7 +3652,7 @@ _efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd,
3652} 3652}
3653 3653
3654static Eo * 3654static Eo *
3655_efl_ui_text_item_factory_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd) 3655_efl_ui_textbox_item_factory_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd)
3656{ 3656{
3657 return pd->item_factory; 3657 return pd->item_factory;
3658} 3658}
@@ -3661,8 +3661,8 @@ _efl_ui_text_item_factory_get(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd)
3661 3661
3662#define STRCMP(X, Y) strncmp((X), (Y), strlen(X)) 3662#define STRCMP(X, Y) strncmp((X), (Y), strlen(X))
3663 3663
3664EOLIAN static Eina_Bool 3664static Eina_Bool
3665_efl_ui_text_text_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, 3665_efl_ui_textbox_text_set(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd,
3666 const char *part, const char *text) 3666 const char *part, const char *text)
3667{ 3667{
3668 if (!STRCMP("efl.text_guide", part)) 3668 if (!STRCMP("efl.text_guide", part))
@@ -3679,8 +3679,8 @@ _efl_ui_text_text_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd,
3679 return EINA_FALSE; 3679 return EINA_FALSE;
3680} 3680}
3681 3681
3682EOLIAN static const char * 3682static const char *
3683_efl_ui_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, 3683_efl_ui_textbox_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd,
3684 const char *part) 3684 const char *part)
3685{ 3685{
3686 if (!STRCMP("efl.text_guide", part)) 3686 if (!STRCMP("efl.text_guide", part))
@@ -3707,9 +3707,35 @@ _part_is_efl_ui_text_part(const Eo *obj EINA_UNUSED, const char *part)
3707 return EINA_TRUE; 3707 return EINA_TRUE;
3708} 3708}
3709 3709
3710ELM_PART_OVERRIDE_PARTIAL(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data, _part_is_efl_ui_text_part) 3710//FIXME
3711ELM_PART_OVERRIDE_TEXT_SET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data) 3711//ELM_PART_OVERRIDE_PARTIAL(efl_ui_text, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data, _part_is_efl_ui_text_part)
3712ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data) 3712EOLIAN static Efl_Object *
3713_efl_ui_textbox_efl_part_part_get(const Eo *obj, Efl_Ui_Textbox_Data *priv EINA_UNUSED, const char *part)
3714{
3715 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
3716 if (_part_is_efl_ui_text_part(obj, part)) return ELM_PART_IMPLEMENT(EFL_UI_TEXT_PART_CLASS, obj, part);
3717 return efl_part_get(efl_super(obj, EFL_UI_TEXTBOX_CLASS), part);
3718}
3719
3720//FIXME
3721//ELM_PART_OVERRIDE_TEXT_SET(efl_ui_text, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data)
3722EOLIAN static void
3723_efl_ui_text_part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text)
3724{
3725 Elm_Part_Data *pd = efl_data_scope_get(obj, efl_ui_widget_part_class_get());
3726 Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS);
3727 _efl_ui_textbox_text_set(pd->obj, sd, pd->part, text);
3728}
3729
3730//FIXME
3731//ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data)
3732EOLIAN static const char *
3733_efl_ui_text_part_efl_text_text_get(const Eo *obj, void *_pd EINA_UNUSED)
3734{
3735 Elm_Part_Data *pd = efl_data_scope_get(obj, efl_ui_widget_part_class_get());
3736 Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS);
3737 return _efl_ui_textbox_text_get(pd->obj, sd, pd->part);
3738}
3713#include "efl_ui_text_part.eo.c" 3739#include "efl_ui_text_part.eo.c"
3714 3740
3715/* Efl.Part end */ 3741/* Efl.Part end */
@@ -3718,10 +3744,10 @@ ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data)
3718 3744
3719//EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 3745//EFL_UI_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
3720 3746
3721#include "efl_ui_text.eo.c" 3747#include "efl_ui_textbox.eo.c"
3722 3748
3723EOLIAN static Eo * 3749EOLIAN static Eo *
3724_efl_ui_text_async_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) 3750_efl_ui_textbox_async_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
3725{ 3751{
3726 EFL_UI_TEXT_DATA_GET(obj, sd); 3752 EFL_UI_TEXT_DATA_GET(obj, sd);
3727 3753
@@ -3731,10 +3757,10 @@ _efl_ui_text_async_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
3731 // Then, going to make new theme for these classes? ex) efl/text_async? 3757 // Then, going to make new theme for these classes? ex) efl/text_async?
3732 if (!elm_widget_theme_klass_get(obj)) 3758 if (!elm_widget_theme_klass_get(obj))
3733 elm_widget_theme_klass_set(obj, "text"); 3759 elm_widget_theme_klass_set(obj, "text");
3734 obj = efl_constructor(efl_super(obj, EFL_UI_TEXT_ASYNC_CLASS)); 3760 obj = efl_constructor(efl_super(obj, EFL_UI_TEXTBOX_ASYNC_CLASS));
3735 3761
3736 _update_text_theme(obj, sd); 3762 _update_text_theme(obj, sd);
3737 return obj; 3763 return obj;
3738} 3764}
3739 3765
3740#include "efl_ui_text_async.eo.c" 3766#include "efl_ui_textbox_async.eo.c"
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_textbox.eo
index 935c7f5..11007ff 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_textbox.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, 1class @beta Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
2 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Input_Text 2 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Input_Text
3 composites 3 composites
4 Efl.Text_Interactive, Efl.Text_Markup 4 Efl.Text_Interactive, Efl.Text_Markup
diff --git a/src/lib/elementary/efl_ui_textbox_async.eo b/src/lib/elementary/efl_ui_textbox_async.eo
new file mode 100644
index 0000000..6fee4ce
--- /dev/null
+++ b/src/lib/elementary/efl_ui_textbox_async.eo
@@ -0,0 +1,9 @@
1class @beta Efl.Ui.Textbox_Async extends Efl.Ui.Textbox
2{
3 [[Efl UI textbox async class
4 ]]
5 data: null;
6 implements {
7 Efl.Object.constructor;
8 }
9}
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 68c17c1..52d901b 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -58,9 +58,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
58 } 58 }
59SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) 59SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
60SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) 60SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
61SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE) 61SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE)
62SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY) 62SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY)
63SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT) 63SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT)
64#undef SIG_FWD 64#undef SIG_FWD
65 65
66#define SIG_FWD(name, event) \ 66#define SIG_FWD(name, event) \
@@ -249,9 +249,9 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
249 SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED); 249 SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
250 SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED); 250 SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
251 SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS); 251 SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
252 SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE); 252 SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE);
253 SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY); 253 SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY);
254 SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT); 254 SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT);
255#undef SIG_FWD 255#undef SIG_FWD
256#define SIG_FWD(name, event) \ 256#define SIG_FWD(name, event) \
257 evas_object_smart_callback_add(priv->entry, event, _##name##_fwd, obj) 257 evas_object_smart_callback_add(priv->entry, event, _##name##_fwd, obj)
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index f8079ea..826e2e0 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1588,7 +1588,7 @@ _paste_cb(void *data,
1588 1588
1589 if (!sd) return; 1589 if (!sd) return;
1590 efl_event_callback_legacy_call 1590 efl_event_callback_legacy_call
1591 (data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL); 1591 (data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
1592 1592
1593 sd->selection_asked = EINA_TRUE; 1593 sd->selection_asked = EINA_TRUE;
1594 1594
@@ -1643,7 +1643,7 @@ _cut_cb(void *data,
1643 1643
1644 if (!sd) return; 1644 if (!sd) return;
1645 efl_event_callback_legacy_call 1645 efl_event_callback_legacy_call
1646 (data, EFL_UI_TEXT_EVENT_SELECTION_CUT, NULL); 1646 (data, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT, NULL);
1647 /* Store it */ 1647 /* Store it */
1648 sd->sel_mode = EINA_FALSE; 1648 sd->sel_mode = EINA_FALSE;
1649 if (!_elm_config->desktop_entry) 1649 if (!_elm_config->desktop_entry)
@@ -1667,7 +1667,7 @@ _copy_cb(void *data,
1667 1667
1668 if (!sd) return; 1668 if (!sd) return;
1669 efl_event_callback_legacy_call 1669 efl_event_callback_legacy_call
1670 (data, EFL_UI_TEXT_EVENT_SELECTION_COPY, NULL); 1670 (data, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY, NULL);
1671 sd->sel_mode = EINA_FALSE; 1671 sd->sel_mode = EINA_FALSE;
1672 if (!_elm_config->desktop_entry) 1672 if (!_elm_config->desktop_entry)
1673 { 1673 {
@@ -2454,7 +2454,7 @@ _entry_paste_request_signal_cb(void *data,
2454 // supported 2454 // supported
2455// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return; 2455// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return;
2456 efl_event_callback_legacy_call 2456 efl_event_callback_legacy_call
2457 (data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL); 2457 (data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
2458 2458
2459 top = _entry_win_get(data); 2459 top = _entry_win_get(data);
2460 if (top) 2460 if (top)
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 14edb8f..c1f936c 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -170,8 +170,8 @@
170//FIXME this needs to not use elm_general.h and go to Efl_Ui.h 170//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
171# include <elm_general.h> 171# include <elm_general.h>
172# include <efl_text_interactive.eo.h> 172# include <efl_text_interactive.eo.h>
173# include <efl_ui_text.eo.h> 173# include <efl_ui_textbox.eo.h>
174# include <efl_ui_text_async.eo.h> 174# include <efl_ui_textbox_async.eo.h>
175 175
176extern const char *_efl_model_property_itemw; 176extern const char *_efl_model_property_itemw;
177extern const char *_efl_model_property_itemh; 177extern const char *_efl_model_property_itemh;
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index d5960c9..e584644 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -80,12 +80,12 @@ pub_eo_files = [
80 'efl_ui_table.eo', 80 'efl_ui_table.eo',
81 'efl_ui_table_static.eo', 81 'efl_ui_table_static.eo',
82 'efl_text_interactive.eo', 82 'efl_text_interactive.eo',
83 'efl_ui_text.eo', 83 'efl_ui_textbox.eo',
84 'efl_ui_popup.eo', 84 'efl_ui_popup.eo',
85 'efl_ui_popup_part_backwall.eo', 85 'efl_ui_popup_part_backwall.eo',
86 'efl_ui_alert_popup.eo', 86 'efl_ui_alert_popup.eo',
87 'efl_ui_alert_popup_part_title.eo', 87 'efl_ui_alert_popup_part_title.eo',
88 'efl_ui_text_async.eo', 88 'efl_ui_textbox_async.eo',
89 'efl_ui_text_factory_images.eo', 89 'efl_ui_text_factory_images.eo',
90 'efl_ui_text_factory_emoticons.eo', 90 'efl_ui_text_factory_emoticons.eo',
91 'efl_ui_text_factory_fallback.eo', 91 'efl_ui_text_factory_fallback.eo',
@@ -874,7 +874,7 @@ elementary_src = [
874 'efl_ui_table_static.c', 874 'efl_ui_table_static.c',
875 'efl_ui_table_layout.c', 875 'efl_ui_table_layout.c',
876 'efl_ui_table_private.h', 876 'efl_ui_table_private.h',
877 'efl_ui_text.c', 877 'efl_ui_textbox.c',
878 'efl_ui_text_factory_images.c', 878 'efl_ui_text_factory_images.c',
879 'efl_ui_text_factory_emoticons.c', 879 'efl_ui_text_factory_emoticons.c',
880 'efl_ui_text_factory_fallback.c', 880 'efl_ui_text_factory_fallback.c',
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index d75cc1a..7c5efc3 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -1629,17 +1629,11 @@ EAPI const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev)
1629 * treated specially on resizing scales, by keeping their aspect. This 1629 * treated specially on resizing scales, by keeping their aspect. This
1630 * makes setting frames around other objects on UIs easy. 1630 * makes setting frames around other objects on UIs easy.
1631 * See the following figures for a visual explanation:\n 1631 * See the following figures for a visual explanation:\n
1632 * @htmlonly
1633 * <img src="image-borders.png" style="max-width: 100%;" />
1634 * <a href="image-borders.png">Full-size</a>
1635 * @endhtmlonly
1636 * @image rtf image-borders.png 1632 * @image rtf image-borders.png
1633 * @image html image-borders.png
1637 * @image latex image-borders.eps width=\textwidth 1634 * @image latex image-borders.eps width=\textwidth
1638 * @htmlonly
1639 * <img src="border-effect.png" style="max-width: 100%;" />
1640 * <a href="border-effect.png">Full-size</a>
1641 * @endhtmlonly
1642 * @image rtf border-effect.png 1635 * @image rtf border-effect.png
1636 * @image html border-effect.png
1643 * @image latex border-effect.eps width=\textwidth 1637 * @image latex border-effect.eps width=\textwidth
1644 * 1638 *
1645 * @section Evas_Object_Image_Manipulation Manipulating pixels 1639 * @section Evas_Object_Image_Manipulation Manipulating pixels