[EGIT] [tools/erigo] master 01/01: Update size property fields on win resize.

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=0ba8ace6547e0f623cc8fa2d5e0339a27d67e44d

commit 0ba8ace6547e0f623cc8fa2d5e0339a27d67e44d
Author: Yakov Goldberg 
Date:   Wed Sep 2 19:49:06 2015 +0300

Update size property fields on win resize.

This is need when e.g. edje layout is applied to window.
Edje will define window's min size, so size property should be updated,
because it is used for DnD resize.
---
 src/bin/gui/editor.c | 20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index dbfe0ba..1599317 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -1366,10 +1366,11 @@ _has_part(const Gui_Widget *wdg, const char 
*new_part_name, Object_Container_Ite
 }
 
 static Eina_Bool
-_win_resize(void *data EINA_UNUSED, Eo *o, const Eo_Event_Description *desc 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_win_resize(void *data, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, 
void *event_info EINA_UNUSED)
 {
Evas_Coord ow = 0, oh = 0, minw = 0, minh = 0;
Eo *fr = NULL;
+   Gui_Widget *wdg = data;
 
eo_do(o, evas_obj_size_hint_min_get(, ));
eo_do(o, efl_gfx_size_get(, ));
@@ -1390,6 +1391,19 @@ _win_resize(void *data EINA_UNUSED, Eo *o, const 
Eo_Event_Description *desc EINA
 eo_do(optional_win, efl_gfx_size_set(ow, oh));
 eo_do(inwin_img, efl_gfx_size_set(ow, oh));
  }
+
+   /* Update numbers in property on win resize according to min. */
+   Gui_Widget_Property *prop;
+   Gui_Value *val;
+   prop = wdg_prop_get(wdg, DB_DEF_EFL_GFX_BASE_CLASS, SIZE_SET);
+   if (prop)
+ {
+val = prop_value_nth_get(prop, 0);
+gui_value_int_set(val, ow);
+val = prop_value_nth_get(prop, 1);
+gui_value_int_set(val, oh);
+ }
+
eo_do(o, fr = eo_key_data_get("__editor_frame"));
 
intptr_t dw, dh;
@@ -2856,13 +2870,13 @@ _widget_add(Gui_Session *session, const Gui_Widget 
*wdg, void *data)
 eo_do(win, eo_key_data_set("__editor_frame", fr));
 eo_do(fr, elm_obj_container_content_set(NULL, iwin));
 
-eo_do(win, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, 
_win_resize, NULL));
+eo_do(win, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, 
_win_resize, wdg));
 /* If main object is not a win, add callback on resize event.
  * So when size will be changed in propview, win will be resized. */
 if (!IS_WIN(wdg))
   {
  Eo *o = session_eo_get(session, wdg);
- eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, 
_win_resize, NULL));
+ eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, 
_win_resize, wdg));
   }
 /* Get size from properties of window. */
 Evas_Coord ox = 150, oy = 50;

-- 

[EGIT] [core/efl] master 01/01: evas canvas: some doc conversions

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=62d6ab54a4fd8fb1ed212fc4125a0db42e0b63a6

commit 62d6ab54a4fd8fb1ed212fc4125a0db42e0b63a6
Author: Daniel Kolesa 
Date:   Wed Sep 2 16:21:43 2015 +0100

evas canvas: some doc conversions
---
 src/lib/evas/canvas/evas_canvas.eo | 274 ++---
 1 file changed, 130 insertions(+), 144 deletions(-)

diff --git a/src/lib/evas/canvas/evas_canvas.eo 
b/src/lib/evas/canvas/evas_canvas.eo
index 410039d..fcd5917 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -237,29 +237,26 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
   }
   @property focus {
  get {
-/*@
-Retrieve the object that currently has focus.
-
-@return The object that has focus or $null if there is not one.
+[[Retrieve the object that currently has focus.
 
-Evas can have (at most) one of its objects focused at a time.
-Focused objects will be the ones having key events delivered
-to, which the programmer can act upon by means of
-evas_object_event_callback_add() usage.
+  Evas can have (at most) one of its objects focused at a time.
+  Focused objects will be the ones having key events delivered
+  to, which the programmer can act upon by means of
+  \@ref evas_object_event_callback_add usage.
 
-@note Most users wouldn't be dealing directly with Evas' focused
-objects. Instead, they would be using a higher level library for
-that (like a toolkit, as Elementary) to handle focus and who's
-receiving input for them.
+  Note: Most users wouldn't be dealing directly with Evas'
+  focused objects. Instead, they would be using a higher level
+  library for that (like a toolkit, as Elementary) to handle
+  focus and who's receiving input for them.
 
-This call returns the object that currently has focus on the canvas
-$e or $null, if none.
-
-@see evas_object_focus_set
-@see evas_object_focus_get
-@see evas_object_key_grab
-@see evas_object_key_ungrab
+  This call returns the object that currently has focus on the
+  canvas $e or $null, if none.
 
+  See also \@ref evas_object_focus_set,
+  \@ref evas_object_focus_get, \@ref evas_object_key_grab,
+  \@ref evas_object_key_ungrab.
+]]
+/* FIXME-doc
 Example:
 @dontinclude evas-events.c
 @skip evas_event_callback_add(d.canvas, 
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
@@ -270,62 +267,56 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
 
 In this example the $event_info is exactly a pointer to that
 focused rectangle. See the full @ref Example_Evas_Events "example".
-
-@ingroup Evas_Object_Group_Find */
-return: Evas.Object * @warn_unused;
+*/
+return: Evas.Object * @warn_unused; [[The object that has focus
+  or $null if there is not 
one.]]
  }
   }
   @property object_top {
  get {
-/*@
-Get the highest (stacked) Evas object on the canvas $e.
+[[Get the highest (stacked) Evas object on the canvas $e.
 
-@return a pointer to the highest object on it, if any, or $null,
-otherwise
+  This function will take all populated layers in the canvas
+  into account, getting the highest object for the highest
+  layer, naturally.
 
-This function will take all populated layers in the canvas into
-account, getting the highest object for the highest layer,
-naturally.
+  Warning: This function will skip objects parented by smart
+  objects, acting only on the ones at the "top level", with
+  regard to object parenting.
 
-@see evas_object_layer_get()
-@see evas_object_layer_set()
-@see evas_object_below_get()
-@see evas_object_above_get()
-
-@warning This function will @b skip objects parented by smart
-objects, acting only on the ones at the "top level", with regard to
-object parenting. */
-return: Evas.Object * @warn_unused;
+  See also \@ref evas_object_layer_get,
+  \@ref evas_object_layer_set, \@ref evas_object_below_get,
+  \@ref evas_object_above_get.
+]]
+return: Evas.Object * @warn_unused; [[A pointer to the highest 
object
+  on it (if any) or $null 
otherwise.]]
 

[EGIT] [apps/terminology] master 01/01: cleanup window callbacks

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=4c00bec4d6495b90a266a7786d5290d54294919a

commit 4c00bec4d6495b90a266a7786d5290d54294919a
Author: Boris Faure 
Date:   Wed Sep 2 21:39:01 2015 +0200

cleanup window callbacks
---
 src/bin/win.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/win.c b/src/bin/win.c
index 57fc55b..bb2b17b 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -666,6 +666,8 @@ win_free(Win *wn)
  }
if (wn->win)
  {
+evas_object_smart_callback_del_full(wn->win, "focus,in", 
_cb_win_focus_in, wn);
+evas_object_smart_callback_del_full(wn->win, "focus,out", 
_cb_win_focus_out, wn);
 evas_object_event_callback_del_full(wn->win, EVAS_CALLBACK_DEL, 
_cb_del, wn);
 evas_object_del(wn->win);
  }

-- 

[EGIT] [core/efl] master 01/01: ecore-con-url- split out the curl dleopener and resolver and headers

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=7eba161414c518cc62ccb952fc3c382ab4be92ee

commit 7eba161414c518cc62ccb952fc3c382ab4be92ee
Author: Carsten Haitzler (Rasterman) 
Date:   Thu Sep 3 12:22:01 2015 +0900

ecore-con-url- split out the curl dleopener and resolver and headers

this splits out out "manual" dlopen (eina_module_load) of curl into
its own .c file and special header out of ecore_con_url.c to tidy up
that code a bit and isolate our curl magic loading/handling
---
 src/Makefile_Ecore_Con.am  |   2 +
 src/lib/ecore_con/ecore_con_url.c  | 296 +
 src/lib/ecore_con/ecore_con_url_curl.c | 122 ++
 src/lib/ecore_con/ecore_con_url_curl.h | 206 +++
 4 files changed, 338 insertions(+), 288 deletions(-)

diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 4fedd8a..d5badfc 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -51,6 +51,8 @@ lib/ecore_con/ecore_con_eet.c \
 lib/ecore_con/ecore_con_socks.c \
 lib/ecore_con/ecore_con_ssl.c \
 lib/ecore_con/ecore_con_url.c \
+lib/ecore_con/ecore_con_url_curl.c \
+lib/ecore_con/ecore_con_url_curl.h \
 lib/ecore_con/ecore_con_private.h
 
 EXTRA_DIST += lib/ecore_con/ecore_con_legacy.c
diff --git a/src/lib/ecore_con/ecore_con_url.c 
b/src/lib/ecore_con/ecore_con_url.c
index 82eaf21..d40fdc5 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -29,160 +29,10 @@
 #include "ecore_private.h"
 #include "Ecore_Con.h"
 #include "ecore_con_private.h"
+#include "ecore_con_url_curl.h"
 
 #define MY_CLASS EFL_NETWORK_URL_CLASS
 
-// all the types, defines, enums etc. from curl that we actually USE.
-// we have to add to this if we use more things from curl not already
-// defined here. see curl headers to get them from
-typedef enum
-{
-   CURLM_CALL_MULTI_PERFORM = -1,
-   CURLM_OK = 0
-} CURLMcode;
-typedef enum
-{
-   CURLE_OK = 0,
-   CURLE_OPERATION_TIMEDOUT = 28
-} CURLcode;
-#define CURLOPTTYPE_LONG  0
-#define CURLOPTTYPE_OBJECTPOINT   1
-#define CURLOPTTYPE_FUNCTIONPOINT 2
-#define CURLOPTTYPE_OFF_T 3
-#define CINIT(na, t, nu) CURLOPT_ ## na = CURLOPTTYPE_ ## t + nu
-typedef enum
-{
-   CINIT(FILE, OBJECTPOINT, 1),
-   CINIT(URL, OBJECTPOINT, 2),
-   CINIT(PROXY, OBJECTPOINT, 4),
-   CINIT(USERPWD, OBJECTPOINT, 5),
-   CINIT(INFILE, OBJECTPOINT, 9),
-   CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
-   CINIT(READFUNCTION, FUNCTIONPOINT, 12),
-   CINIT(POSTFIELDS, OBJECTPOINT, 15),
-   CINIT(HTTPHEADER, OBJECTPOINT, 23),
-   CINIT(WRITEHEADER, OBJECTPOINT, 29),
-   CINIT(COOKIEFILE, OBJECTPOINT, 31),
-   CINIT(TIMECONDITION, LONG, 33),
-   CINIT(TIMEVALUE, LONG, 34),
-   CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
-   CINIT(VERBOSE, LONG, 41),
-   CINIT(NOPROGRESS, LONG, 43),
-   CINIT(NOBODY, LONG, 44),
-   CINIT(UPLOAD, LONG, 46),
-   CINIT(POST, LONG, 47),
-   CINIT(FOLLOWLOCATION, LONG, 52),
-   CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
-   CINIT(PROGRESSDATA, OBJECTPOINT, 57),
-   CINIT(POSTFIELDSIZE, LONG, 60),
-   CINIT(SSL_VERIFYPEER, LONG, 64),
-   CINIT(CAINFO, OBJECTPOINT, 65),
-   CINIT(CONNECTTIMEOUT, LONG, 78),
-   CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
-   CINIT(COOKIEJAR, OBJECTPOINT, 82),
-   CINIT(HTTP_VERSION, LONG, 84),
-   CINIT(FTP_USE_EPSV, LONG, 85),
-   CINIT(COOKIESESSION, LONG, 96),
-   CINIT(PROXYTYPE, LONG, 101),
-   CINIT(ACCEPT_ENCODING, OBJECTPOINT, 102),
-   CINIT(HTTPAUTH, LONG, 107),
-   CINIT(INFILESIZE_LARGE, OFF_T, 115),
-   CINIT(COOKIELIST, OBJECTPOINT, 135),
-   CINIT(USERNAME, OBJECTPOINT, 173),
-   CINIT(PASSWORD, OBJECTPOINT, 174)
-} CURLoption;
-#define CURLINFO_STRING   0x10
-#define CURLINFO_LONG 0x20
-#define CURLINFO_DOUBLE   0x30
-#define CURLINFO_SLIST0x40
-#define CURLINFO_MASK 0x0f
-#define CURLINFO_TYPEMASK 0xf0
-typedef enum
-{
-   CURLINFO_RESPONSE_CODE = CURLINFO_LONG + 2,
-} CURLINFO;
-typedef enum
-{
-   CURLVERSION_FOURTH = 3
-} CURLversion;
-typedef enum
-{
-   CURLMSG_DONE = 1
-} CURLMSG;
-#undef CINIT
-#define CINIT(name, type, num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
-typedef enum
-{
-   CINIT(PIPELINING, LONG, 3)
-} CURLMoption;
-typedef enum
-{
-   CURL_TIMECOND_NONE = 0,
-   CURL_TIMECOND_IFMODSINCE = 1,
-   CURL_TIMECOND_IFUNMODSINCE = 2
-} curl_TimeCond;
-enum
-{
-   CURL_HTTP_VERSION_1_0 = 1,
-   CURL_HTTP_VERSION_1_1 = 2,
-};
-typedef enum
-{
-   CURLPROXY_HTTP = 0,
-   CURLPROXY_SOCKS4 = 4,
-   CURLPROXY_SOCKS5 = 5,
-   CURLPROXY_SOCKS4A = 6,
-   CURLPROXY_SOCKS5_HOSTNAME = 7
-} curl_proxytype;
-
-#define CURL_GLOBAL_SSL (1 << 0)
-#define CURL_GLOBAL_WIN32   (1 << 1)
-#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL | CURL_GLOBAL_WIN32)
-#define CURLOPT_ENCODINGCURLOPT_ACCEPT_ENCODING
-#define CURLOPT_WRITEDATA   CURLOPT_FILE
-#define CURLOPT_READDATACURLOPT_INFILE

[EGIT] [admin/devs] master 01/01: developers hermet: updated

[ChunEon Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=734572581bc39053a6c35a65d42725d1731e6e2c

commit 734572581bc39053a6c35a65d42725d1731e6e2c
Author: ChunEon Park 
Date:   Thu Sep 3 11:19:33 2015 +0900

developers hermet: updated

update info
remove unused photo icons
add ed25519 publick key
---
 developers/hermet/icon-big.png   | Bin 60042 -> 0 bytes
 developers/hermet/icon-map.png   | Bin 4232 -> 0 bytes
 developers/hermet/icon-med.png   | Bin 19268 -> 0 bytes
 developers/hermet/icon-sml.png   | Bin 7279 -> 0 bytes
 developers/hermet/id_ed25519.pub |   1 +
 developers/hermet/info.txt   |   3 +--
 6 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/developers/hermet/icon-big.png b/developers/hermet/icon-big.png
deleted file mode 100644
index 0817d70..000
Binary files a/developers/hermet/icon-big.png and /dev/null differ
diff --git a/developers/hermet/icon-map.png b/developers/hermet/icon-map.png
deleted file mode 100644
index bcf4099..000
Binary files a/developers/hermet/icon-map.png and /dev/null differ
diff --git a/developers/hermet/icon-med.png b/developers/hermet/icon-med.png
deleted file mode 100644
index e0f7584..000
Binary files a/developers/hermet/icon-med.png and /dev/null differ
diff --git a/developers/hermet/icon-sml.png b/developers/hermet/icon-sml.png
deleted file mode 100644
index 6c6f3d8..000
Binary files a/developers/hermet/icon-sml.png and /dev/null differ
diff --git a/developers/hermet/id_ed25519.pub b/developers/hermet/id_ed25519.pub
new file mode 100644
index 000..1318d51
--- /dev/null
+++ b/developers/hermet/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 
C3NzaC1lZDI1NTE5IDGu+sHwOUdPX2oG1AXkTInFNlNBKPc6zlS3FgYS9+Un 
hermet@hermet-pc
diff --git a/developers/hermet/info.txt b/developers/hermet/info.txt
index 58c0792..fb04b3d 100644
--- a/developers/hermet/info.txt
+++ b/developers/hermet/info.txt
@@ -1,11 +1,10 @@
 Login:hermet
 IRC Nick: Hermet
 Name: ChunEon Park
-Location: HwaSeong, Korea
+Location: Seongnam, Korea
 E-Mail:   her...@hermet.pe.kr
 WWW:  http://www.hermet.pe.kr
 Managing: evas, elementary, enventor
 Contributing: eina, ecore, edje, expedite
 Group:Core, Applications, Libraries
 Platform: Ubuntu, Tizen, Windows
-GeoData:  37.20225 127.07137

-- 

[EGIT] [core/elementary] master 01/01: Label: add support for all the fancy tags already provided for entry

[Dave Andreoli]

davemds pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=bc357d8015c2f80b5f45427f9aa454691a058d0b

commit bc357d8015c2f80b5f45427f9aa454691a058d0b
Author: Dave Andreoli 
Date:   Wed Sep 2 20:35:22 2015 +0200

Label: add support for all the fancy tags already provided for entry

Comes with a simple test

@feature

NOTE FOR THEMERS: you must update your theme to support this!
---
 data/themes/edc/elm/label.edc |  2 +-
 src/bin/test_label.c  | 12 
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/data/themes/edc/elm/label.edc b/data/themes/edc/elm/label.edc
index 214aa12..7abb815 100644
--- a/data/themes/edc/elm/label.edc
+++ b/data/themes/edc/elm/label.edc
@@ -3,8 +3,8 @@ group { name: "elm/label/base/default";
   style { name: "label_style";
  base: "font="FN" font_size=10 text_class=tb_plain align=center 
color=# style=shadow,bottom shadow_color=#0080";
  tag: "br" "\n";
- tag: "hilight" "+ font="FNBD" text_class=tb_light";
  tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
   }
}
parts {
diff --git a/src/bin/test_label.c b/src/bin/test_label.c
index 02b1508..14707b2 100644
--- a/src/bin/test_label.c
+++ b/src/bin/test_label.c
@@ -68,6 +68,18 @@ test_label(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_inf
elm_box_pack_end(bx, lb);
evas_object_show(lb);
 
+   lb = elm_label_add(win);
+   elm_object_text_set(lb,
+   "You can also use all the default entry style tags, like "
+   "hilight, success, "
+   "bigger, smaller, 
etc..."
+   );
+   elm_label_line_wrap_set(lb, ELM_WRAP_WORD);
+   evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, lb);
+   evas_object_show(lb);
+
evas_object_resize(win, 320, 300);
 
evas_object_show(bx);

-- 

[EGIT] [core/elementary] master 01/01: Label test: split Slide and Ellipsis in two separate tests

[Dave Andreoli]

davemds pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=d7a2f549b8a830c2eefd539191c4eceb696c12df

commit d7a2f549b8a830c2eefd539191c4eceb696c12df
Author: Dave Andreoli 
Date:   Wed Sep 2 21:51:46 2015 +0200

Label test: split Slide and Ellipsis in two separate tests

this reveal the ellipsis + markup bug as explained in T2709
---
 src/bin/test.c   |  2 ++
 src/bin/test_label.c | 99 +---
 2 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/src/bin/test.c b/src/bin/test.c
index a1bb386..e6479ff 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -185,6 +185,7 @@ void test_flip_page(void *data, Evas_Object *obj, void 
*event_info);
 void test_label(void *data, Evas_Object *obj, void *event_info);
 void test_label_slide(void *data, Evas_Object *obj, void *event_info);
 void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
+void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
 void test_conformant(void *data, Evas_Object *obj, void *event_info);
 void test_conformant2(void *data, Evas_Object *obj, void *event_info);
 void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@@ -799,6 +800,7 @@ add_tests:
ADD_TEST(NULL, "Text", "Label", test_label);
ADD_TEST(NULL, "Text", "Label Slide", test_label_slide);
ADD_TEST(NULL, "Text", "Label Wrap", test_label_wrap);
+   ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
 
//--//
ADD_TEST(NULL, "Stored Surface Buffer", "Launcher", test_launcher);
diff --git a/src/bin/test_label.c b/src/bin/test_label.c
index 14707b2..537360a 100644
--- a/src/bin/test_label.c
+++ b/src/bin/test_label.c
@@ -11,6 +11,7 @@ enum _slide_style
SLIDE_STYLE_LAST
 };
 
+/*** Label ***/
 void
 test_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED)
 {
@@ -87,6 +88,7 @@ test_label(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_inf
elm_win_resize_object_add(win, bx);
 }
 
+/*** Label Slide */
 static void
 _cb_size_radio_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED)
 {
@@ -162,9 +164,9 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
elm_win_resize_object_add(win, gd);
evas_object_show(gd);
 
-   /* Test Label Ellipsis */
+   /* Test Label Slide */
lb = elm_label_add(win);
-   elm_object_text_set(lb, "Test Label Ellipsis:");
+   elm_object_text_set(lb, "Test Label Slide:");
elm_grid_pack(gd, lb, 5, 0, 90, 10);
evas_object_show(lb);
 
@@ -174,28 +176,6 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
evas_object_show(rect);
 
lb = elm_label_add(win);
-   elm_object_text_set(lb,
-   "This is a label set to ellipsis. "
-   "If set ellipsis to true and the text doesn't fit "
-   "in the label an ellipsis(\"...\") will be shown "
-   "at the end of the widget."
-   );
-   elm_label_ellipsis_set(lb, EINA_TRUE);
-   elm_grid_pack(gd, lb, 5, 10, 90, 10);
-   evas_object_show(lb);
-
-   /* Test Label Slide */
-   lb = elm_label_add(win);
-   elm_object_text_set(lb, "Test Label Slide:");
-   elm_grid_pack(gd, lb, 5, 20, 90, 10);
-   evas_object_show(lb);
-
-   rect = evas_object_rectangle_add(evas_object_evas_get(win));
-   elm_grid_pack(gd, rect, 5, 30, 90, 10);
-   evas_object_color_set(rect, 255, 125, 125, 255);
-   evas_object_show(rect);
-
-   lb = elm_label_add(win);
elm_object_style_set(lb, "slide_short");
elm_object_text_set(lb,
"This is a label set to slide. "
@@ -207,7 +187,7 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
elm_label_slide_mode_set(lb, ELM_LABEL_SLIDE_MODE_AUTO);
elm_label_slide_speed_set(lb, 40.0);
elm_label_slide_go(lb);
-   elm_grid_pack(gd, lb, 5, 30, 90, 10);
+   elm_grid_pack(gd, lb, 5, 10, 90, 10);
evas_object_show(lb);
 
/* The speed or the duration of the slide animation will change when the
@@ -219,7 +199,7 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
elm_object_text_set(rd, "slide_short");
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
evas_object_smart_callback_add(rd, "changed", _cb_size_radio_changed, lb);
-   elm_grid_pack(gd, rd, 5, 40, 30, 10);
+   elm_grid_pack(gd, rd, 5, 20, 30, 10);
evas_object_show(rd);
rdg = rd;
 
@@ -229,7 +209,7 @@ test_label_slide(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *eve
elm_object_text_set(rd, "slide_long");
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 

[EGIT] [core/elementary] elementary-1.15 01/02: elm map - fix module load craziness loading all elm modules

[Carsten Haitzler]

ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=7e00a3da1092a4798cfabe2ef0b4f19346d8cd4c

commit 7e00a3da1092a4798cfabe2ef0b4f19346d8cd4c
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Sep 2 19:20:04 2015 +0900

elm map - fix module load craziness loading all elm modules

so elm map loads every module it can find in a recursive dir walk of
all elm modules. this si nuts. this can accidentallly load OLD modules
and thats a recipe for disaster. so check module arch dir aagainst
module arch string to load the right version and be quiet if module
doesn thave the right symbols - it's the wrong module type.

@fix
---
 src/lib/elm_map.c | 23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index b799c7e..8a31018 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -3451,6 +3451,8 @@ _source_mod_cb(Eina_Module *m,
 {
const char *file;
Elm_Map_Data *sd = data;
+   char *dir;
+   const char *subfile;
 
Elm_Map_Module_Source_Name_Func name_cb;
Elm_Map_Module_Tile_Url_Func tile_url_cb;
@@ -3465,17 +3467,28 @@ _source_mod_cb(Eina_Module *m,
EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
 
file = eina_module_file_get(m);
-   if (!eina_module_load(m))
+   if (!file) return EINA_FALSE;
+
+   dir = ecore_file_dir_get(file);
+   if (!dir) return EINA_FALSE;
+   subfile = ecore_file_file_get(dir);
+   if (!subfile)
+ {
+free(dir);
+return EINA_FALSE;
+ }
+   if (strcmp(subfile, MODULE_ARCH))
  {
-ERR("Could not load module \"%s\": %s", file,
-eina_error_msg_get(eina_error_get()));
+free(dir);
 return EINA_FALSE;
  }
+   free(dir);
+
+   if (!eina_module_load(m)) return EINA_FALSE;
+
name_cb = eina_module_symbol_get(m, "map_module_source_name_get");
if ((!name_cb))
  {
-WRN("Could not find map module name from module \"%s\": %s",
-file, eina_error_msg_get(eina_error_get()));
 eina_module_unload(m);
 return EINA_FALSE;
  }

-- 

[EGIT] [core/efl] master 01/01: evas object: more doc conversion

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d381b79e95aca383d2d72d4e4711bd321ab8b3be

commit d381b79e95aca383d2d72d4e4711bd321ab8b3be
Author: Daniel Kolesa 
Date:   Wed Sep 2 12:51:15 2015 +0100

evas object: more doc conversion
---
 src/lib/evas/canvas/evas_object.eo | 462 +
 1 file changed, 209 insertions(+), 253 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object.eo 
b/src/lib/evas/canvas/evas_object.eo
index b540685..630db49 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -285,35 +285,37 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
   }
   @property size_hint_aspect {
  set {
-/*@
-Sets the hints for an object's aspect ratio.
-
-This is not a size enforcement in any way, it's just a hint that 
should
-be used whenever appropriate.
+[[Sets the hints for an object's aspect ratio.
 
-If any of the given aspect ratio terms are @c 0,
-the object's container will ignore the aspect and scale @p obj to
-occupy the whole available area, for any given policy.
+  This is not a size enforcement in any way, it's just a hint
+  that should be used whenever appropriate.
 
-@note Smart objects(such as elementary) can have their own size 
hint
-policy. So calling this API may or may not affect the size of 
smart objects.
+  If any of the given aspect ratio terms are 0, the object's
+  container will ignore the aspect and scale $obj to occupy
+  the whole available area, for any given policy.
 
-@see evas_object_size_hint_aspect_get() for more information. */
+  Note: Smart objects(such as elementary) can have their own
+  size hint policy. So calling this API may or may not affect
+  the size of smart objects.
+]]
  }
  get {
-/*@
-Retrieves the hints for an object's aspect ratio.
+[[Retrieves the hints for an object's aspect ratio.
 
-The different aspect ratio policies are documented in the
-#Evas_Aspect_Control type. A container respecting these size hints
-would @b resize its children accordingly to those policies.
+  The different aspect ratio policies are documented in the
+  #Evas_Aspect_Control type. A container respecting these size
+  hints would resize its children accordingly to those policies.
 
-For any policy, if any of the given aspect ratio terms are @c 0,
-the object's container should ignore the aspect and scale @p obj to
-occupy the whole available area. If they are both positive
-integers, that proportion will be respected, under each scaling
-policy.
+  For any policy, if any of the given aspect ratio terms are 0,
+  the object's container should ignore the aspect and scale $obj
+  to occupy the whole available area. If they are both positive
+  integers, that proportion will be respected, under each
+  scaling policy.
 
+  Note: Use $null pointers on the hint components you're not
+  interested in: they'll be ignored by the function.
+]]
+/* FIXME-doc
 These images illustrate some of the #Evas_Aspect_Control policies:
 
 @image html any-policy.png
@@ -334,132 +336,130 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
 
 This is not a size enforcement in any way, it's just a hint that
 should be used whenever appropriate.
-
-@note Use $null pointers on the hint components you're not
-interested in: they'll be ignored by the function.
-
+---
 Example:
 @dontinclude evas-aspect-hints.c
 @skip if (strcmp(ev->key, "c") == 0)
 @until }
 
 See the full @ref Example_Evas_Aspect_Hints "example".
-
-@see evas_object_size_hint_aspect_set() */
+*/
  }
  values {
-aspect: Evas.Aspect_Control; /*@ The policy/type of aspect ratio 
to apply to @p obj. */
-w: Evas.Coord; /*@ Integer to use as aspect width ratio term. */
-h: Evas.Coord; /*@ Integer to use as aspect height ratio term. */
+aspect: Evas.Aspect_Control; [[The policy/type of aspect ratio to 
apply to $obj.]]
+w: Evas.Coord; [[Integer to use as aspect width ratio term.]]
+h: Evas.Coord; [[Integer to use as aspect height ratio term.]]
  }
   }
   @property clip {
  set {
-/*@
-Clip 

[EGIT] [core/elementary] elementary-1.15 02/02: elm map - fix crash on badly handled zoom timeout callback

[Carsten Haitzler]

ami pushed a commit to branch elementary-1.15.

http://git.enlightenment.org/core/elementary.git/commit/?id=9fde98ead28d6493e77a6b9b858e37d63c328a69

commit 9fde98ead28d6493e77a6b9b858e37d63c328a69
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Sep 2 19:34:06 2015 +0900

elm map - fix crash on badly handled zoom timeout callback

if sd->obj is null then the a zoom timeout has a null data param and
that means we cant get sd data... so dont set up a zoom timeout unless
sd->obj is valid.

@fix
---
 src/lib/elm_map.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 8a31018..1017270 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1122,12 +1122,17 @@ _zoom_do(Elm_Map_Data *sd,
   (x, y, vw, vh));
  }
 
-   if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer);
+   if (sd->zoom_timer)
+ {
+ecore_timer_del(sd->zoom_timer);
+sd->zoom_timer = NULL;
+ }
else
   eo_do(sd->obj, eo_event_callback_call
 (EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL));
 
-   sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
+   if (sd->obj)
+ sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
eo_do(sd->obj, eo_event_callback_call
  (ELM_MAP_EVENT_ZOOM_CHANGE, NULL));
 

-- 

[EGIT] [core/enlightenment] master 01/01: e mixer - fix up saving to save everything

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=04496541c4e2817a6b1b98c8899f60defbea7fde

commit 04496541c4e2817a6b1b98c8899f60defbea7fde
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Sep 2 18:31:44 2015 +0900

e mixer - fix up saving to save everything

as pointed out by jackdanielsz and bu5hm4n - this doesnt save
everything. like all the outputs and ports and... so now it does.
everything is saved and restored is "remember" is enabled. now
everything should be fine.
---
 src/modules/mixer/e_mod_config.c | 280 ++-
 src/modules/mixer/e_mod_config.h |   9 +-
 src/modules/mixer/e_mod_main.c   |  49 ---
 3 files changed, 285 insertions(+), 53 deletions(-)

diff --git a/src/modules/mixer/e_mod_config.c b/src/modules/mixer/e_mod_config.c
index bd8be04..7206e0a 100644
--- a/src/modules/mixer/e_mod_config.c
+++ b/src/modules/mixer/e_mod_config.c
@@ -10,36 +10,76 @@ typedef struct _Emix_Config
int mute;
 
int save;
-   int save_mute;
-   int save_volume;
+   const char *save_sink;
+
+   Eina_List *sinks;
+   Eina_List *sources;
 
emix_config_backend_changed cb;
const void *userdata;
 } Emix_Config;
 
+typedef struct _Emix_Config_Sink
+{
+   const char *name;
+   Eina_List *ports;
+   int mute;
+   int volume;
+} Emix_Config_Sink;
+
+typedef struct _Emix_Config_Source
+{
+   const char *name;
+   int mute;
+   int volume;
+} Emix_Config_Source;
+
+typedef struct _Emix_Config_Port
+{
+   const char *name;
+   int active;
+} Emix_Config_Port;
+
+
 struct _E_Config_Dialog_Data
 {
Emix_Config config;
Evas_Object *list;
+   Evas_Object *sources;
 };
 
-static E_Config_DD *cd;
-static Emix_Config *_config;
+static E_Config_DD *cd, *c_portd, *c_sinkd, *c_sourced;
+static Emix_Config *_config = NULL;
 
-static E_Config_DD*
+static void
 _emix_config_dd_new(void)
 {
-   E_Config_DD *result = E_CONFIG_DD_NEW("Emix_Config", Emix_Config);
+   c_portd = E_CONFIG_DD_NEW("Emix_Config_Port", Emix_Config_Port);
+   E_CONFIG_VAL(c_portd, Emix_Config_Port, name, STR);
+   E_CONFIG_VAL(c_portd, Emix_Config_Port, active, INT);
+
+   c_sinkd = E_CONFIG_DD_NEW("Emix_Config_Sink", Emix_Config_Sink);
+   E_CONFIG_VAL(c_sinkd, Emix_Config_Sink, name, STR);
+   E_CONFIG_LIST(c_sinkd, Emix_Config_Sink, ports, c_portd);
+   E_CONFIG_VAL(c_sinkd, Emix_Config_Sink, mute, INT);
+   E_CONFIG_VAL(c_sinkd, Emix_Config_Sink, volume, INT);
 
-   E_CONFIG_VAL(result, Emix_Config, backend, STR);
-   E_CONFIG_VAL(result, Emix_Config, notify, INT);
-   E_CONFIG_VAL(result, Emix_Config, mute, INT);
+   c_sourced = E_CONFIG_DD_NEW("Emix_Config_Source", Emix_Config_Source);
+   E_CONFIG_VAL(c_sourced, Emix_Config_Source, name, STR);
+   E_CONFIG_VAL(c_sourced, Emix_Config_Source, mute, INT);
+   E_CONFIG_VAL(c_sourced, Emix_Config_Source, volume, INT);
 
-   E_CONFIG_VAL(result, Emix_Config, save, INT);
-   E_CONFIG_VAL(result, Emix_Config, save_mute, INT);
-   E_CONFIG_VAL(result, Emix_Config, save_volume, INT);
+   cd = E_CONFIG_DD_NEW("Emix_Config", Emix_Config);
 
-   return result;
+   E_CONFIG_VAL(cd, Emix_Config, backend, STR);
+   E_CONFIG_VAL(cd, Emix_Config, notify, INT);
+   E_CONFIG_VAL(cd, Emix_Config, mute, INT);
+
+   E_CONFIG_VAL(cd, Emix_Config, save, INT);
+   E_CONFIG_VAL(cd, Emix_Config, save_sink, STR);
+
+   E_CONFIG_LIST(cd, Emix_Config, sinks, c_sinkd);
+   E_CONFIG_LIST(cd, Emix_Config, sources, c_sourced);
 }
 
 const char *
@@ -90,7 +130,7 @@ emix_config_init(emix_config_backend_changed cb, const void 
*userdata)
const Eina_List *l;
 
EINA_SAFETY_ON_FALSE_RETURN(emix_init());
-   cd = _emix_config_dd_new();
+   _emix_config_dd_new();
_config = e_config_domain_load("module.emix", cd);
if (!_config)
  {
@@ -100,12 +140,7 @@ emix_config_init(emix_config_backend_changed cb, const 
void *userdata)
   _config->backend = eina_stringshare_add(l->data);
  }
 
-   if (_config->save == 0)
- {
-_config->save = 1;
-_config->save_mute = 0;
-_config->save_volume = 100;
- }
+   if (_config->save == 0) _config->save = 1;
 
_config->cb = cb;
_config->userdata = userdata;
@@ -115,9 +150,31 @@ emix_config_init(emix_config_backend_changed cb, const 
void *userdata)
 void
 emix_config_shutdown(void)
 {
+   Emix_Config_Sink *sink;
+   Emix_Config_Port *port;
+   Emix_Config_Source *source;
+
E_CONFIG_DD_FREE(cd);
-   if (_config->backend)
- eina_stringshare_del(_config->backend);
+   E_CONFIG_DD_FREE(c_sourced);
+   E_CONFIG_DD_FREE(c_sinkd);
+   E_CONFIG_DD_FREE(c_portd);
+   if (_config->backend) eina_stringshare_del(_config->backend);
+   if (_config->save_sink) eina_stringshare_del(_config->save_sink);
+   EINA_LIST_FREE(_config->sinks, sink)
+ {
+if (sink->name) eina_stringshare_del(sink->name);
+EINA_LIST_FREE(sink->ports, port)
+  {
+ if (port->name) 

[EGIT] [admin/devs] master 01/01: remove dsa key

[q66]

q66 pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=c50f6edce1b09f010b49145055ca3e50e8bb423e

commit c50f6edce1b09f010b49145055ca3e50e8bb423e
Author: q66 
Date:   Wed Sep 2 11:57:38 2015 +0100

remove dsa key
---
 developers/q66/id_dsa.pub | 1 -
 1 file changed, 1 deletion(-)

diff --git a/developers/q66/id_dsa.pub b/developers/q66/id_dsa.pub
deleted file mode 100644
index 02d3712..000
--- a/developers/q66/id_dsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-dss 
B3NzaC1kc3MAAACBAPhkUKeUDpd6DG7agzd8eEucK3f98TlPFbCsvKcz97TXeDPo2RqrLLbBK7Rd8I87oiP7hiRdQGvvTj3kUXSoZ2utu10tuVC/L98cmcIMP+PQgDnZFFtzAMfGtdX0ZIO8J9mPPwsTEICOX1XrwFrCVeXGtcoEPD8bTO5WS9FaagOLFQDEurDhSpxrMvAXh5l96XUS7W+RqQAAAIBee2OZHbkQ3kGm6iq7sYfLVm6zA0bN5xbdtYI2IJZbkikkOmsY5wGOyLvskJ9zp2Odajhm4FAOcmLrNxfivQK3eUJBf4Ul6tDOV3E9lXaSCZSp+5BY1fYPsBL7Bxkqttslnno9WUuksYCGMSt+sCsrCgcvCeAlLn8+N5ILI3gvJwAAAIEA5OWHQbBPyT0Q34bCWanGY8sa9jOvCGoYQ5q9L8k/eTVxVhwYKMebOGj2wr0FTEnAF/yFN+a8L9SW
 [...]

-- 

[EGIT] [core/elementary] master 01/01: elm map - fix crash on badly handled zoom timeout callback

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=0b810218746f4f1cf6dbdfb57fdd209ebf682f0c

commit 0b810218746f4f1cf6dbdfb57fdd209ebf682f0c
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Sep 2 19:34:06 2015 +0900

elm map - fix crash on badly handled zoom timeout callback

if sd->obj is null then the a zoom timeout has a null data param and
that means we cant get sd data... so dont set up a zoom timeout unless
sd->obj is valid.

@fix
---
 src/lib/elm_map.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 8a31018..1017270 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1122,12 +1122,17 @@ _zoom_do(Elm_Map_Data *sd,
   (x, y, vw, vh));
  }
 
-   if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer);
+   if (sd->zoom_timer)
+ {
+ecore_timer_del(sd->zoom_timer);
+sd->zoom_timer = NULL;
+ }
else
   eo_do(sd->obj, eo_event_callback_call
 (EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_START, NULL));
 
-   sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
+   if (sd->obj)
+ sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
eo_do(sd->obj, eo_event_callback_call
  (ELM_MAP_EVENT_ZOOM_CHANGE, NULL));
 

-- 

[EGIT] [core/efl] master 01/01: evas - fix texture context bind reset in gl common using wrong texture

[Subhransu Mohanty]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8fe5e277e5bea32b8547385963a1664d46279ecd

commit 8fe5e277e5bea32b8547385963a1664d46279ecd
Author: Subhransu Mohanty 
Date:   Wed Sep 2 18:55:43 2015 +0900

evas - fix texture context bind reset in gl common using wrong texture

evas gl common was simply resetting to the wrong texture id in the gl
context struct - it was using pipe[0] not state.current. why i don't
know. i know i wrote the pipe[0] code many years ago - really don';t
know. it may have been a transitional piece of code that just happened
t6o work 99% of the time that never got fixe when i added pipes.

@fix
---
 .../evas/engines/gl_common/evas_gl_texture.c   | 42 +++---
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c 
b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 7e54283..f2451c3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -392,7 +392,7 @@ _pool_tex_new(Evas_Engine_GL_Context *gc, int w, int h, 
GLenum intformat, GLenum
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
ok = _tex_2d(gc, pt->intformat, w, h, pt->format, pt->dataformat);
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
+   glBindTexture(GL_TEXTURE_2D, gc->state.current.cur_tex);
if (!ok)
  {
 glDeleteTextures(1, &(pt->texture));
@@ -624,7 +624,7 @@ _pool_tex_render_new(Evas_Engine_GL_Context *gc, int w, int 
h, int intformat, in
  }
 
glsym_glBindFramebuffer(GL_FRAMEBUFFER, fnum);
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
+   glBindTexture(GL_TEXTURE_2D, gc->state.current.cur_tex);
 
if (!ok)
  {
@@ -692,7 +692,7 @@ _pool_tex_native_new(Evas_Engine_GL_Context *gc, int w, int 
h, int intformat, in
glTexParameteri(im->native.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(im->native.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glBindTexture(im->native.target, 0);
-   glBindTexture(im->native.target, gc->pipe[0].shader.cur_tex);
+   glBindTexture(im->native.target, gc->state.current.cur_tex);
 
texinfo.n.num++;
texinfo.n.pix += pt->w * pt->h;
@@ -840,7 +840,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, 
int h, int intformat, i
 goto error;
  }
 
-   glBindTexture(GL_TEXTURE_2D, gc->pipe[0].shader.cur_tex);
+   glBindTexture(GL_TEXTURE_2D, gc->state.current.cur_tex);
 #else
if (gc + w + h + intformat + format) return pt;
 #endif
@@ -927,8 +927,8 @@ evas_gl_texture_pool_empty(Evas_GL_Texture_Pool *pt)
 #endif
 
glDeleteTextures(1, &(pt->texture));
-   if (pt->gc->pipe[0].shader.cur_tex == pt->texture)
- pt->gc->pipe[0].shader.cur_tex = 0;
+   if (pt->gc->state.current.cur_tex == pt->texture)
+ pt->gc->state.current.cur_tex = 0;
if (pt->fb)
  {
 glsym_glDeleteFramebuffers(1, &(pt->fb));
@@ -1163,8 +1163,8 @@ evas_gl_common_texture_upload(Evas_GL_Texture *tex, 
RGBA_Image *im, unsigned int
 tpix);
  }
//glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
- glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
+   if (tex->pt->texture != tex->gc->state.current.cur_tex)
+ glBindTexture(GL_TEXTURE_2D, tex->gc->state.current.cur_tex);
 }
 
 void
@@ -1262,9 +1262,9 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, 
RGBA_Image *im)
im->image.data);
  }
 
-   if (tex->pt->texture != tex->gc->pipe[0].shader.cur_tex)
+   if (tex->pt->texture != tex->gc->state.current.cur_tex)
  {
-glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
+glBindTexture(GL_TEXTURE_2D, tex->gc->state.current.cur_tex);
  }
return;
 }
@@ -1383,8 +1383,8 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, 
RGBA_Image *im)
 _tex_sub_2d(tex->gc, u, tex->ty, EVAS_GL_TILE_SIZE, EVAS_GL_TILE_SIZE, 
fmt, tex->ptt->dataformat, out);
 
 // Switch back to current texture
-if (tex->ptt->texture != tex->gc->pipe[0].shader.cur_tex)
-  glBindTexture(GL_TEXTURE_2D, tex->gc->pipe[0].shader.cur_tex);
+if (tex->ptt->texture != tex->gc->state.current.cur_tex)
+  glBindTexture(GL_TEXTURE_2D, tex->gc->state.current.cur_tex);
 
 // Now prepare uploading the main texture before returning;
 async = malloc(sizeof (Evas_GL_Texture_Async_Preload));
@@ -1521,8 +1521,8 @@ evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, 
DATA8 *pixels,
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
_tex_sub_2d(tex->gc, tex->x, tex->y, w, h, 

[EGIT] [core/elementary] master 01/01: elm map - fix module load craziness loading all elm modules

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=9238f87e05ec891d87fb0080922df0f9e7e7e11f

commit 9238f87e05ec891d87fb0080922df0f9e7e7e11f
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Sep 2 19:20:04 2015 +0900

elm map - fix module load craziness loading all elm modules

so elm map loads every module it can find in a recursive dir walk of
all elm modules. this si nuts. this can accidentallly load OLD modules
and thats a recipe for disaster. so check module arch dir aagainst
module arch string to load the right version and be quiet if module
doesn thave the right symbols - it's the wrong module type.

@fix
---
 src/lib/elm_map.c | 23 ++-
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index b799c7e..8a31018 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -3451,6 +3451,8 @@ _source_mod_cb(Eina_Module *m,
 {
const char *file;
Elm_Map_Data *sd = data;
+   char *dir;
+   const char *subfile;
 
Elm_Map_Module_Source_Name_Func name_cb;
Elm_Map_Module_Tile_Url_Func tile_url_cb;
@@ -3465,17 +3467,28 @@ _source_mod_cb(Eina_Module *m,
EINA_SAFETY_ON_NULL_RETURN_VAL(data, EINA_FALSE);
 
file = eina_module_file_get(m);
-   if (!eina_module_load(m))
+   if (!file) return EINA_FALSE;
+
+   dir = ecore_file_dir_get(file);
+   if (!dir) return EINA_FALSE;
+   subfile = ecore_file_file_get(dir);
+   if (!subfile)
+ {
+free(dir);
+return EINA_FALSE;
+ }
+   if (strcmp(subfile, MODULE_ARCH))
  {
-ERR("Could not load module \"%s\": %s", file,
-eina_error_msg_get(eina_error_get()));
+free(dir);
 return EINA_FALSE;
  }
+   free(dir);
+
+   if (!eina_module_load(m)) return EINA_FALSE;
+
name_cb = eina_module_symbol_get(m, "map_module_source_name_get");
if ((!name_cb))
  {
-WRN("Could not find map module name from module \"%s\": %s",
-file, eina_error_msg_get(eina_error_get()));
 eina_module_unload(m);
 return EINA_FALSE;
  }

-- 

[EGIT] [tools/erigo] master 02/02: Remove item dragstart callback

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=e810375b379d9b0a06f977754b0ad0346221d843

commit e810375b379d9b0a06f977754b0ad0346221d843
Author: Yakov Goldberg 
Date:   Wed Sep 2 14:55:21 2015 +0300

Remove item dragstart callback

THis callback was cancelling dragging in case of idle after drag start.
This is not useful when you are dragging an object around a canvas
while looking for place to drop.
---
 src/bin/gui/editor.c | 15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 9e84de1..dbfe0ba 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -2328,19 +2328,6 @@ _objtree_drop_cb(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED, Elm_Objec
return EINA_TRUE;
 }
 
-static Eina_Bool
-_3s_timeout_gone(void *data)
-{
-   elm_drag_cancel(data);
-   return ECORE_CALLBACK_CANCEL;
-}
-
-static void
-_gl_dragstart(void *data EINA_UNUSED, Evas_Object *obj)
-{
-   ecore_timer_add(3.0, _3s_timeout_gone, obj);
-}
-
 static Evas_Object *
 _gl_createicon(void *data, Evas_Object *win, Evas_Coord *xoff, Evas_Coord 
*yoff)
 {
@@ -2378,7 +2365,7 @@ _objtree_data_getcb(Evas_Object *obj EINA_UNUSED,  /* The 
genlist object */
info->format = ELM_SEL_FORMAT_TEXT;
info->createicon = _gl_createicon;
info->createdata = it;
-   info->dragstart = _gl_dragstart;
+   info->dragstart = NULL;
info->icons = NULL;
info->dragdone = NULL;
 

-- 

[EGIT] [tools/erigo] master 01/02: Start adding DRAG from objtree

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=ee2cce27069ab0998e57fa55e9772aa09d8204de

commit ee2cce27069ab0998e57fa55e9772aa09d8204de
Author: Yakov Goldberg 
Date:   Tue Aug 25 19:22:04 2015 +0300

Start adding DRAG from objtree
---
 src/bin/gui/dnd.c|  36 +++---
 src/bin/gui/dnd.h|   9 +
 src/bin/gui/editor.c | 101 +++
 3 files changed, 124 insertions(+), 22 deletions(-)

diff --git a/src/bin/gui/dnd.c b/src/bin/gui/dnd.c
index 01cbe9f..ac005c6 100644
--- a/src/bin/gui/dnd.c
+++ b/src/bin/gui/dnd.c
@@ -19,7 +19,7 @@ typedef struct
Eo *drag_window_obj_wref;
const Gui_Widget *wdg; /* let's think about it as about DnD data. */
 
-   void (*_drag_start_cb)(const Gui_Widget *wdg, const Eo *obj);
+   void (*_drag_start_post_cb)(const Gui_Widget *wdg, const Eo *obj);
 } Drag_Info;
 
 static Ecore_Timer *_drag_factory_timer = NULL;
@@ -461,9 +461,9 @@ _drag_start(void *data)
   _dragaccept, NULL,
   _dragstate, NULL);
 
-   if (di->_drag_start_cb)
+   if (di->_drag_start_post_cb)
  {
-di->_drag_start_cb(di->wdg, di->obj);
+di->_drag_start_post_cb(di->wdg, di->obj);
  }
return ECORE_CALLBACK_CANCEL;
 }
@@ -537,7 +537,7 @@ drag_add(Eo *obj, const char *image_path, const char *data)
 }
 
 /* Function to start dragging, when mouse down/up are handled outside.
- * Dragging widgets. */
+ * Dragging widgets on canvas */
 void
 drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const 
Gui_Widget *, const Eo *))
 {
@@ -546,12 +546,24 @@ drag_start(Eo *obj, const char *data, const Gui_Widget 
*wdg, void (*cb)(const Gu
di->data = data;
di->obj = obj;
di->wdg = wdg;
-   di->_drag_start_cb = cb;
+   di->_drag_start_post_cb = cb;
_dnd_info.drag_info = di;
 
_drag_start(di);
 }
 
+/* Function to start dragging, when mouse down/up are handled outside.
+ * Dragging widgets on canvas */
+void
+drag_item_start(const char *data, const Gui_Widget *wdg)
+{
+   Drag_Info *di = calloc(1, sizeof(Drag_Info));
+   di->image_path = NULL;
+   di->data = data;
+   di->wdg = wdg;
+   _dnd_info.drag_info = di;
+}
+
 /* Function to stop dragging, when mouse down/up are handled outside.
  * Dragging widgets. */
 void
@@ -640,17 +652,29 @@ drop_target_main_wdg_set(Gui_Widget *wdg, Eo *obj,
 void
 drop_item_container_set(Eo *obj, Elm_Xy_Item_Get_Cb itemgetcb, 
Elm_Drop_Item_Container_Cb dropcb, void *dropdata)
 {
-   elm_drop_item_container_add(obj, ELM_SEL_FORMAT_TARGETS, itemgetcb,
+   elm_drop_item_container_add(obj, ELM_SEL_FORMAT_TEXT, itemgetcb,
_dropenter, NULL, _dropleave, NULL, NULL, NULL, 
dropcb, dropdata);
 }
 
 void
+drag_item_container_set(Eo *obj, double anim_tm, double tm_to_drag, 
Elm_Xy_Item_Get_Cb itemgetcb, Elm_Item_Container_Data_Get_Cb data_get)
+{
+   elm_drag_item_container_add(obj, anim_tm, tm_to_drag, itemgetcb, data_get);
+}
+
+void
 drop_item_container_del(Eo *obj)
 {
elm_drop_item_container_del(obj);
 }
 
 void
+drag_item_container_del(Eo *obj)
+{
+   elm_drag_item_container_del(obj);
+}
+
+void
 drop_target_wdg_del(Gui_Widget *wdg, Eo *obj)
 {
Target_Info *ti = NULL;
diff --git a/src/bin/gui/dnd.h b/src/bin/gui/dnd.h
index 79470a7..804d62e 100644
--- a/src/bin/gui/dnd.h
+++ b/src/bin/gui/dnd.h
@@ -9,6 +9,9 @@ void
 drag_start(Eo *obj, const char *data, const Gui_Widget *wdg, void (*cb)(const 
Gui_Widget *, const Eo *));
 
 void
+drag_item_start(const char *data, const Gui_Widget *wdg);
+
+void
 drag_stop();
 
 void
@@ -34,6 +37,12 @@ drop_item_container_set(Eo *obj, Elm_Xy_Item_Get_Cb 
itemgetcb, Elm_Drop_Item_Con
 void
 drop_item_container_del(Eo *obj);
 
+void
+drag_item_container_set(Eo *obj, double anim_tm, double tm_to_drag, 
Elm_Xy_Item_Get_Cb itemgetcb, Elm_Item_Container_Data_Get_Cb data_get);
+
+void
+drag_item_container_del(Eo *obj);
+
 const char*
 dnd_drag_data_get();
 
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 884c088..9e84de1 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -57,7 +57,7 @@ typedef struct
int pointer_x;
int pointer_y;
 }
-DnD_Info;
+DnD_Main_Obj_Info;
 
 /* Function to call in the end of undo/redo in order to update view.
  * Update is made according to head memento. */
@@ -579,7 +579,7 @@ _drag_widget_iterate(Gui_Widget **drag_candidate, const 
Gui_Session *session, Ev
 }
 
 void
-_drag_start_cb(const Gui_Widget *wdg, const Eo *_wdg_eo);
+_drag_start_post_cb(const Gui_Widget *wdg, const Eo *_wdg_eo);
 
 static Ecore_Timer *_drag_timer_start = NULL;
 static Eina_Bool drag_started = EINA_FALSE;
@@ -609,7 +609,7 @@ _drag_widget_start(void *data)
const Gui_Session *session = 
gui_context_editor_session_get(wdg_context_get(wdg));
Eo *wdg_eo = session_eo_get(session, wdg);
 
-   drag_start(wdg_eo, EDITOR_DRAG_DATA, wdg, _drag_start_cb);
+   

[EGIT] [core/efl] master 01/01: evas object: finish doc conversion

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3752e0aa34cc51688b32545a9ab9cb3e1e0f1d59

commit 3752e0aa34cc51688b32545a9ab9cb3e1e0f1d59
Author: Daniel Kolesa 
Date:   Wed Sep 2 14:09:04 2015 +0100

evas object: finish doc conversion
---
 src/lib/evas/canvas/evas_object.eo | 532 +
 1 file changed, 240 insertions(+), 292 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object.eo 
b/src/lib/evas/canvas/evas_object.eo
index 630db49..0639af2 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -690,104 +690,96 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
   }
   @property map_enable {
  set {
-/*@
-Enable or disable the map that is set.
+[[Enable or disable the map that is set.
 
-Enable or disable the use of map for the object @p obj.
-On enable, the object geometry will be saved, and the new geometry 
will
-change (position and size) to reflect the map geometry set.
+  Enable or disable the use of map for the object $obj. On
+  enable, the object geometry will be saved, and the new
+  geometry will change (position and size) to reflect the
+  map geometry set.
 
-If the object doesn't have a map set (with evas_object_map_set()), 
the
-initial geometry will be undefined. It is advised to always set a 
map
-to the object first, and then call this function to enable its 
use. */
+  If the object doesn't have a map set (with
+  \@ref evas_object_map_set), the initial geometry will be
+  undefined. It is advised to always set a map to the object
+  first, and then call this function to enable its use.
+]]
  }
  get {
-/*@
-Get the map enabled state
-
-This returns the currently enabled state of the map on the object 
indicated.
-The default map enable state is off. You can enable and disable it 
with
-evas_object_map_enable_set().
+[[Get the map enabled state
 
-@return the map enabled state */
+  This returns the currently enabled state of the map on the
+  object indicated. The default map enable state is off. You
+  can enable and disable it with @.map_enable.set.
+]]
  }
  values {
-enabled: bool; /*@ enabled state */
+enabled: bool; [[Enabled state.]]
  }
   }
   @property precise_is_inside {
  set {
-/*@
-Set whether to use precise (usually expensive) point collision
-detection for a given Evas object.
+[[Set whether to use precise (usually expensive) point collision
+  detection for a given Evas object.
 
-Use this function to make Evas treat objects' transparent areas as
-@b not belonging to it with regard to mouse pointer events. By
-default, all of the object's boundary rectangle will be taken in
-account for them.
-
-@warning By using precise point collision detection you'll be
-making Evas more resource intensive.
+  Use this function to make Evas treat objects' transparent
+  areas as not belonging to it with regard to mouse pointer
+  events. By default, all of the object's boundary rectangle
+  will be taken in account for them.
 
+  Warning: By using precise point collision detection you'll be
+  making Evas more resource intensive.
+]]
+/* FIXME-doc
 Example code follows.
 @dontinclude evas-events.c
 @skip if (strcmp(ev->key, "p") == 0)
 @until }
 
 See the full example @ref Example_Evas_Events "here".
-
-@see evas_object_precise_is_inside_get()
-@ingroup Evas_Object_Group_Extras */
+*/
  }
  get {
-/*@
-Determine whether an object is set to use precise point collision
-detection.
-
-@return whether @p obj is set to use precise point collision
-detection or not The default value is false.
-
-@see evas_object_precise_is_inside_set() for an example
-
-@ingroup Evas_Object_Group_Extras */
+[[Determine whether an object is set to use precise point
+  collision detection.
+]]
  }
  values {
-precise: bool; /*@ Whether to use precise point collision 
detection or
-not. The default value is false. */
+precise: bool; [[Whether to use precise point collision
+   

[EGIT] [core/efl] master 01/01: efl_vg_base: fix wrong @since (was pushed after 1.15)

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=03bbe8a4a712141b43469ee5acb34a5382a13dfc

commit 03bbe8a4a712141b43469ee5acb34a5382a13dfc
Author: Daniel Kolesa 
Date:   Wed Sep 2 14:16:25 2015 +0100

efl_vg_base: fix wrong @since (was pushed after 1.15)
---
 src/lib/evas/canvas/efl_vg_base.eo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/canvas/efl_vg_base.eo 
b/src/lib/evas/canvas/efl_vg_base.eo
index ba7ef1c..3476bab 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -8,7 +8,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
 [[Set an unique name from the parent point of view. $null means
   no name.
 
-  @since 1.15
+  @since 1.16
 ]]
  }
  get {
@@ -18,7 +18,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
   defined, it might be forced back to $null if the parent
   already has a node of that name.
 
-  @since 1.15
+  @since 1.16
 ]]
  }
  values {

-- 

[EGIT] [core/efl] master 01/01: efl_vg_base: convert docs

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=791de84f5b80978d22ba8d223a383d35abb80c47

commit 791de84f5b80978d22ba8d223a383d35abb80c47
Author: Daniel Kolesa 
Date:   Wed Sep 2 14:13:15 2015 +0100

efl_vg_base: convert docs
---
 src/lib/evas/canvas/efl_vg_base.eo | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/lib/evas/canvas/efl_vg_base.eo 
b/src/lib/evas/canvas/efl_vg_base.eo
index 15a8913..ba7ef1c 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -5,20 +5,21 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
methods {
   @property name {
  set {
-/*@
-  Set an unique name from the parent point of view. @c NULL means
+[[Set an unique name from the parent point of view. $null means
   no name.
+
   @since 1.15
- */
+]]
  }
  get {
-/*@
-  Get an unique name from the parent point of view . @c NULL means
-  no name. When set a parent after the name what defined, it might
-  be forced back to NULL if the parent already has a node of that
-  name.
+[[Get an unique name from the parent point of view.
+
+  $null means no name. When set a parent after the name what
+  defined, it might be forced back to $null if the parent
+  already has a node of that name.
+
   @since 1.15
- */
+]]
  }
  values {
 name: const(char) *;

-- 

[EGIT] [core/efl] master 01/01: evas_canvas: prepare for doc conversion + partial conversion

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=00678aea1b00062cb19b58a52219568f88ae892b

commit 00678aea1b00062cb19b58a52219568f88ae892b
Author: Daniel Kolesa 
Date:   Wed Sep 2 15:13:36 2015 +0100

evas_canvas: prepare for doc conversion + partial conversion
---
 src/lib/evas/canvas/evas_canvas.eo | 410 +
 1 file changed, 190 insertions(+), 220 deletions(-)

diff --git a/src/lib/evas/canvas/evas_canvas.eo 
b/src/lib/evas/canvas/evas_canvas.eo
index 442e493..410039d 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -5,264 +5,234 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
methods {
   @property output_framespace {
  set {
-/*@
-Sets the output framespace size of the render engine of the given 
evas.
+[[Sets the output framespace size of the render engine of the
+  given evas.
 
-The framespace size is used in the Wayland engines to denote space 
where
-the output is not drawn. This is mainly used in ecore_evas to draw 
borders
+  The framespace size is used in the Wayland engines to denote
+  space where the output is not drawn. This is mainly used in
+  ecore_evas to draw borders.
 
-The units used for @p w and @p h depend on the engine used by the
-evas.
+  The units used for $w and $h depend on the engine used by the
+  evas.
 
-@ingroup Evas_Output_Size
-@since 1.1 */
+  @since 1.1
+]]
  }
  get {
-/*@
-Get the render engine's output framespace co-ordinates in canvas 
units.
+[[Get the render engine's output framespace co-ordinates in
+  canvas units.
 
-@ingroup Evas_Output_Size
-@since 1.1 */
+  @since 1.1
+]]
  }
  values {
-x: Evas.Coord; /*@ The left coordinate in output units, usually 
pixels. */
-y: Evas.Coord; /*@ The top coordinate in output units, usually 
pixels. */
-w: Evas.Coord; /*@ The width in output units, usually pixels. */
-h: Evas.Coord; /*@ The height in output units, usually pixels. */
+x: Evas.Coord; [[The left coordinate in output units, usually 
pixels.]]
+y: Evas.Coord; [[The top coordinate in output units, usually 
pixels.]]
+w: Evas.Coord; [[The width in output units, usually pixels.]]
+h: Evas.Coord; [[The height in output units, usually pixels.]]
  }
   }
   @property output_viewport {
  set {
-/*@
-Sets the output viewport of the given evas in evas units.
-
-The output viewport is the area of the evas that will be visible to
-the viewer.  The viewport will be stretched to fit the output
-target of the evas when rendering is performed.
+[[Sets the output viewport of the given evas in evas units.
 
-@note The coordinate values do not have to map 1-to-1 with the 
output
-target.  However, it is generally advised that it is done for ease
-of use.
+  The output viewport is the area of the evas that will be
+  visible to the viewer.  The viewport will be stretched to
+  fit the output target of the evas when rendering is performed.
 
-@ingroup Evas_Output_Size */
+  Note: The coordinate values do not have to map 1-to-1 with
+  the output target. However, it is generally advised that it
+  is done for ease of use.
+]]
  }
  get {
-/*@
-Get the render engine's output viewport co-ordinates in canvas 
units.
-Calling this function writes the current canvas output viewport
-size and location values into the variables pointed to by @p x, @p
-y, @p w and @p h.  On success the variables have the output
-location and size values written to them in canvas units. Any of @p
-x, @p y, @p w or @p h that are @c NULL will not be written to. If 
@p e
-is invalid, the results are undefined.
-
+[[Get the render engine's output viewport co-ordinates in
+  canvas units.
+
+  Calling this function writes the current canvas output
+  viewport size and location values into the variables pointed
+  to by $x, $y, $w and $h.  On success the variables have the
+  output location and size values written to them in canvas
+  units. Any of $x, $y, $w or $h that are $null will not be
+  written to. If $e is invalid, the results are undefined.
+]]
+/* FIXME-doc