[EGIT] [website/www-content] master 01/01: Wiki page fedora-start changed with summary [] by Philippe Jean Guillaumie
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=23ecd66b88776fe2862e598656785bb1a043d8b8 commit 23ecd66b88776fe2862e598656785bb1a043d8b8 Author: Philippe Jean Guillaumie Date: Fri Nov 24 08:43:47 2017 -0800 Wiki page fedora-start changed with summary [] by Philippe Jean Guillaumie --- pages/docs/distros/fedora-start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/docs/distros/fedora-start.txt b/pages/docs/distros/fedora-start.txt index 0fb33cf5e..9b9a0c9b0 100644 --- a/pages/docs/distros/fedora-start.txt +++ b/pages/docs/distros/fedora-start.txt @@ -8,7 +8,7 @@ sudo dnf install automake bluez-libs-devel bullet-devel ccache check-devel curl- dbus-devel doxygen fontconfig-devel freetype-devel fribidi-devel gcc gcc-c++ \ gettext-devel giflib-devel glib2-devel gstreamer1-devel gstreamer1-plugins-base-devel \ harfbuzz-devel ibus-devel ImageMagick kernel-devel libdrm-devel libinput-devel \ -libjpeg-turbo-devel libpng-devel mesa-libGL-devel mesa-libGLES-devel \ +libjpeg-turbo-devel libpng-devel mesa-libEGL-devel mesa-libGL-devel mesa-libGLES-devel \ libmount-devel libproxy-devel LibRaw-devel librsvg2-devel libsndfile-devel \ libspectre-devel libtiff-devel libtool libunwind-devel libwebp-devel libX11-devel \ libxkbcommon-devel libxkbfile-devel libXcursor-devel libXdamage-devel libXext-devel \ --
[EGIT] [website/www-content] master 01/01: Wiki page start.md changed with summary [] by Gareth Halfacree
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e3eff8eb48282087573b25768a52b32ff189b17d commit e3eff8eb48282087573b25768a52b32ff189b17d Author: Gareth Halfacree Date: Fri Nov 24 08:40:46 2017 -0800 Wiki page start.md changed with summary [] by Gareth Halfacree --- pages/develop/guides/start.md.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/develop/guides/start.md.txt b/pages/develop/guides/start.md.txt index c2c99a4a9..84b06c3a2 100644 --- a/pages/develop/guides/start.md.txt +++ b/pages/develop/guides/start.md.txt @@ -3,15 +3,15 @@ ~~NOCACHE~~ --- -# Developer Guides # +# Programming Guides # -This section of the Enlightenment Wiki offers reference guides for the most commonly-used features of the Enlightenment Foundation Libraries (EFL) and associated infrastructure. These guides are designed to supplement and support the step-by-step tutorials, which are designed as a starting point for beginners who have not previously programmed using EFL. +This section of the Enlightenment Wiki offers reference guides for the most commonly-used features of the Enlightenment Foundation Libraries (EFL) and associated infrastructure. These guides are designed to supplement and support the step-by-step tutorials, which are written as a starting point for beginners who have not previously programmed using EFL. The documentation in this section is split by language. At present, only C documentation is included; this will be expanded in the future to provide guides for other languages. -## Legacy Guides ## +## Current Guides ## -The documentation of EFL and its infrastructure is an ongoing effort, taking place alongside the roll-out of a new version of the application programming interface (API). The documentation in this section is verified as applicable to the new API; for guidance on the old API, known as the *legacy API*, consult the [Legacy Programming Guide](https://www.enlightenment.org/develop/legacy/program_guide/start). +The documentation of EFL and its infrastructure is an ongoing effort, taking place alongside the roll-out of a new version of the application programming interface (API). The documentation in this section is verified as applicable to the new API, currently in beta; for guidance on the current API release consult the [Legacy Programming Guide](https://www.enlightenment.org/develop/legacy/program_guide/start). ## Eina Programming Guide ## --
[EGIT] [core/efl] master 02/02: elm ifrace scrollable - fix uninitialized values on scroll asjust
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=01ec011f8e1346ef8e8b6d269d3a2722076e2ebf
commit 01ec011f8e1346ef8e8b6d269d3a2722076e2ebf
Author: Carsten Haitzler (Rasterman)
Date: Fri Nov 24 23:52:08 2017 +0900
elm ifrace scrollable - fix uninitialized values on scroll asjust
dragable values were invalid (not fetched) so vx/y were junk and this
was making decisions based on that. guarantee it to be 0.
@fix
---
src/lib/elementary/elm_interface_scrollable.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/elm_interface_scrollable.c
b/src/lib/elementary/elm_interface_scrollable.c
index 522deba236..66aaf1867b 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -794,9 +794,9 @@
_elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
sid->size_adjust_recurse++;
if ((sid->content) || (sid->extern_pan))
{
-Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0, px, py,
- minx = 0, miny = 0;
-double vx, vy, size;
+Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0,
+ px = 0, py = 0, minx = 0, miny = 0;
+double vx = 0.0, vy = 0.0, size;
edje_object_calc_force(sid->edje_obj);
edje_object_part_geometry_get
--
[EGIT] [core/efl] master 01/02: efl ui slider - fix crashes with fmt callback data and class data
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=be6f4a870a667974280332ba6693e1223ec51dc5
commit be6f4a870a667974280332ba6693e1223ec51dc5
Author: Carsten Haitzler (Rasterman)
Date: Fri Nov 24 23:45:14 2017 +0900
efl ui slider - fix crashes with fmt callback data and class data
the format free cb was passed the class data (sd) as the callback data
but this was freed by the time _indi_default_format_free_cb was called
causing an invalid access. fix this by looking it up from the obj
which is probably invalid at this point...
---
src/lib/elementary/efl_ui_slider.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_slider.c
b/src/lib/elementary/efl_ui_slider.c
index 1bc9ec9290..b5da71ef2a 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1421,7 +1421,7 @@ static void
_indi_default_format_cb(void *data, Eina_Strbuf *str, const Eina_Value value)
{
const Eina_Value_Type *type = eina_value_type_get(&value);
- Efl_Ui_Slider_Data *sd = data;
+ Efl_Ui_Slider_Data *sd = efl_data_scope_get(data, EFL_UI_SLIDER_CLASS);
double v;
if (type != EINA_VALUE_TYPE_DOUBLE) return;
@@ -1433,7 +1433,7 @@ _indi_default_format_cb(void *data, Eina_Strbuf *str,
const Eina_Value value)
static void
_indi_default_format_free_cb(void *data)
{
- Efl_Ui_Slider_Data *sd = data;
+ Efl_Ui_Slider_Data *sd = efl_data_scope_get(data, EFL_UI_SLIDER_CLASS);
if (sd && sd->indi_template)
{
@@ -1451,7 +1451,7 @@ _efl_ui_slider_part_efl_ui_format_format_string_set(Eo
*obj, void *_pd EINA_UNUS
if (!template) return;
eina_stringshare_replace(&sd->indi_template, template);
- efl_ui_format_cb_set(efl_part(pd->obj, "indicator"), sd,
_indi_default_format_cb, _indi_default_format_free_cb);
+ efl_ui_format_cb_set(efl_part(pd->obj, "indicator"), pd->obj,
_indi_default_format_cb, _indi_default_format_free_cb);
}
EOLIAN static const char *
--
[EGIT] [tools/examples] master 01/01: ui: Add a new sizing example - much nicer using the new pack capabilities
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=597ba6d98c6648b0b06ec0df041124b496ea29fa
commit 597ba6d98c6648b0b06ec0df041124b496ea29fa
Author: Andy Williams
Date: Fri Nov 24 14:18:20 2017 +
ui: Add a new sizing example - much nicer using the new pack capabilities
---
reference/c/ui/src/meson.build | 8 +++
reference/c/ui/src/ui_sizing.c | 48 ++
2 files changed, 56 insertions(+)
diff --git a/reference/c/ui/src/meson.build b/reference/c/ui/src/meson.build
new file mode 100644
index 000..45f812f
--- /dev/null
+++ b/reference/c/ui/src/meson.build
@@ -0,0 +1,8 @@
+deps = [eina, efl]
+
+executable('efl_reference_ui_sizing',
+ files(['ui_sizing.c']),
+ dependencies : deps,
+ include_directories : inc,
+ install : true
+)
diff --git a/reference/c/ui/src/ui_sizing.c b/reference/c/ui/src/ui_sizing.c
new file mode 100644
index 000..254b619
--- /dev/null
+++ b/reference/c/ui/src/ui_sizing.c
@@ -0,0 +1,48 @@
+#define EFL_EO_API_SUPPORT 1
+#define EFL_BETA_API_SUPPORT 1
+
+#include
+
+#include
+#include
+#include
+
+/*
+ * Efl.UI sizing exmaples.
+ *
+ * Demonstrate how to use the sizing api from Efl.Gfx.
+ * We load a box with 3 buttons, one with default sizing, one that has a max
+ * and the last has a min size. Try resizing the window to see how this
changes.
+ */
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
+{
+ Efl_Ui_Win *win, *box;
+
+ win = efl_add(EFL_UI_WIN_CLASS, NULL,
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
+ efl_text_set(efl_added, "Size Control"),
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+
+ box = efl_add(EFL_UI_BOX_CLASS, win,
+ efl_content_set(win, efl_added));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_text_set(efl_added, "Button"),
+ efl_pack_end(box, efl_added));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_text_set(efl_added, "Small"),
+ efl_pack_end(box, efl_added),
+ efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(50, 50)));
+
+ efl_add(EFL_UI_BUTTON_CLASS, win,
+ efl_text_set(efl_added, "Big Button"),
+ efl_pack_end(box, efl_added),
+ efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 100)));
+
+ efl_gfx_size_set(win, EINA_SIZE2D(320, 320));
+}
+EFL_MAIN()
+
--
[EGIT] [website/www-content] master 01/01: Wiki page label changed with summary [] by Pierre Couderc
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2a1e0aa2a1ed81b8ae9419fe4f3fc22346586b8d commit 2a1e0aa2a1ed81b8ae9419fe4f3fc22346586b8d Author: Pierre Couderc Date: Fri Nov 24 06:14:40 2017 -0800 Wiki page label changed with summary [] by Pierre Couderc --- pages/develop/legacy/tutorial/basic/label.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/develop/legacy/tutorial/basic/label.txt b/pages/develop/legacy/tutorial/basic/label.txt index 73a1cb3c6..8f37badec 100644 --- a/pages/develop/legacy/tutorial/basic/label.txt +++ b/pages/develop/legacy/tutorial/basic/label.txt @@ -1,6 +1,6 @@ Simple Text -//**__Basic text__**// +**Basic text** Creating a label object, a widget to display text, with simple html-like markup: @@ -16,7 +16,7 @@ markup: evas_object_show(label_text); -//**__Sliding text__**// +**Sliding text** If your text is too long, you can have it set to slide. The duration of the slide is to be set: it is set to five seconds in the following example. You @@ -49,7 +49,7 @@ can also have several styles: If needed, you can respond to end of a slide thanks to the slide,end event. -//**__Marker text__**// +**Marker text** A marker is a text that is centered and bold by default. As the default color is white, we will also set a color, blue in this example. @@ -59,7 +59,7 @@ elm_object_style_set(label, "marker"); evas_object_color_set(label, 0, 0, 255, 255); -//**__Styling the text__**// +**Styling the text** You can apply basic styles to the text. If, for instance, you would like to have a bold text, you can do as follows. --
[EGIT] [tools/enventor] master 01/01: updated AUTHORS
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=76f437e8bab70370cf15fe18b191b4c2eed8d301 commit 76f437e8bab70370cf15fe18b191b4c2eed8d301 Author: Hermet Park Date: Fri Nov 24 20:51:47 2017 +0800 updated AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index f88bd41..932982f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -31,3 +31,4 @@ Jean Guyomarc'h Thiep Ha YeongJong Lee Massimo Maiurana +Amitesh Singh --
[EGIT] [website/www-content] master 01/01: Wiki page button changed with summary [] by Pierre Couderc
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=15f2b7e616f9ecae3280a46b1de352be5cb0d175
commit 15f2b7e616f9ecae3280a46b1de352be5cb0d175
Author: Pierre Couderc
Date: Fri Nov 24 02:09:52 2017 -0800
Wiki page button changed with summary [] by Pierre Couderc
---
pages/develop/legacy/tutorial/basic/button.txt | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pages/develop/legacy/tutorial/basic/button.txt
b/pages/develop/legacy/tutorial/basic/button.txt
index a12c90c66..af4fbf8b8 100644
--- a/pages/develop/legacy/tutorial/basic/button.txt
+++ b/pages/develop/legacy/tutorial/basic/button.txt
@@ -2,7 +2,7 @@
=== Button styles ===
-//**__Basic text button__**//
+**Basic text button**
As seen in [[develop/efl/start|Get started with EFL]] tutorial, a text-only
button is created as follows:
@@ -24,7 +24,7 @@ button is created as follows:
evas_object_show(button_text);
-//**__Basic icon button__**//
+**Basic icon button**
Instead of a button having only some text, you can also opt to having an
icon-only button.
@@ -54,7 +54,7 @@ deriving from the Elementary Container Class may match. This
sets new content
to a given part. If any object was already set as a content object, it will be
deleted.
-//**__Icon and text button__**//
+**Icon and text button**
You can also have buttons holding both an icon and a label.
@@ -75,7 +75,7 @@ You can also have buttons holding both an icon and a label.
evas_object_show(button_icon_text);
-//**__Disabled button__**//
+**Disabled button**
If you want to disable your button but still visible:
@@ -87,7 +87,7 @@ elm_object_disabled_set(button, EINA_TRUE);
Elementary buttons respond to user interactions thanks to several events.
-//**__Click event__**//
+**Click event**
The “click” event is the most basic and well-known one. The following code
snippet will change the text of a button upon a click event: a press followed
@@ -103,7 +103,7 @@ _button_click_cb(void *data, Evas_Object *button, void
*event_info){
evas_object_smart_callback_add(button_text, "clicked", button_click_cb, NULL);
-//**__Press/unpress events __**//
+**Press/unpress events **
The button can also respond to the press and unpress events instead of the
whole click.
@@ -125,7 +125,7 @@ evas_object_smart_callback_add(button_icon, "pressed",
_button_press_cb, NULL);
evas_object_smart_callback_add(button_icon, "unpressed", _button_unpress_cb,
NULL);
-//**__Repeated events__**//
+**Repeated events**
The button can also receive several events in case it is being held by the
user. Timings such as the initial timeout and the repeat interval can be set.
@@ -154,7 +154,7 @@ _button_repeat_cb(void *data, Evas_Object *button, void
*event_info){
evas_object_smart_callback_add(button_icon_text, "repeated",
_button_repeat_cb, NULL);
-//**__Focused/unfocused events__**//
+**Focused/unfocused events**
The event Focused is equivalent to click indeed callback is called when you
are "focused" on the button. So, you are unfocused when you are not focused on
@@ -187,7 +187,7 @@ _button_unfocused_cb(void * data, Evas_Object *button, void
*event_info){
evas_object_smart_callback_add(button, "unfocused", _button_unfocused_cb,
NULL);
\\
-**//The whole code://** {{code_c/tutorial/basic/button.c}}
+**The whole code:** {{code_c/tutorial/basic/button.c}}
Next Part
--
[EGIT] [core/efl] master 01/01: elua: correctly wrap gettext funcs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=40214e16c72fb26e7dbdde0344dc771acc2aaa6b
commit 40214e16c72fb26e7dbdde0344dc771acc2aaa6b
Author: Daniel Kolesa
Date: Fri Nov 24 10:53:27 2017 +0100
elua: correctly wrap gettext funcs
Now, we cannot directly register funcs defined by a different
signature than the lua standard (int (*)(lua_State *)) so we
have to correctly wrap those with proper conversions etc.
---
src/lib/elua/elua.c | 33 +++--
src/scripts/elua/core/gettext.lua | 26 +++---
2 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c
index 44b5c32c59..3f3654e678 100644
--- a/src/lib/elua/elua.c
+++ b/src/lib/elua/elua.c
@@ -360,14 +360,43 @@ _elua_get_localeconv(lua_State *L)
return 1;
};
+#ifdef ENABLE_NLS
+static int
+_elua_dgettext(lua_State *L)
+{
+ const char *domain = luaL_checkstring(L, 1);
+ const char *msgid = luaL_checkstring(L, 2);
+ char *ret = dgettext(domain, msgid);
+ if (!ret)
+ lua_pushnil(L);
+ else
+ lua_pushstring(L, ret);
+ return 1;
+}
+
+static int
+_elua_dngettext(lua_State *L)
+{
+ const char *domain = luaL_checkstring(L, 1);
+ const char *msgid = luaL_checkstring(L, 2);
+ const char *plmsgid = luaL_checkstring(L, 3);
+ char *ret = dngettext(domain, msgid, plmsgid, luaL_checklong(L, 4));
+ if (!ret)
+ lua_pushnil(L);
+ else
+ lua_pushstring(L, ret);
+ return 1;
+}
+#endif
+
const luaL_Reg gettextlib[] =
{
{ "bind_textdomain", _elua_gettext_bind_textdomain },
{ "get_message_language", _elua_get_message_language },
{ "get_localeconv", _elua_get_localeconv },
#ifdef ENABLE_NLS
- { "dgettext", dgettext },
- { "dgettext", dngettext },
+ { "dgettext", _elua_dgettext },
+ { "dngettext", _elua_dngettext },
#endif
{ NULL, NULL }
};
diff --git a/src/scripts/elua/core/gettext.lua
b/src/scripts/elua/core/gettext.lua
index 96af7d3941..3659b4e043 100644
--- a/src/scripts/elua/core/gettext.lua
+++ b/src/scripts/elua/core/gettext.lua
@@ -1,7 +1,5 @@
-- elua gettext module
-local ffi = require("ffi")
-
local M = {}
local gettext = ...
@@ -10,12 +8,6 @@ local bind_textdomain = gettext.bind_textdomain
local dgettext= gettext.dgettext
local dngettext = gettext.dngettext
-if dgettext then
-dgettext = ffi.cast("char *(*)(const char*, const char*)", dgettext)
-dngettext = ffi.cast("char *(*)(const char*, const char*, const char*, "
-.. "unsigned long)", dngettext)
-end
-
local domains = {}
local default_domain
@@ -39,7 +31,6 @@ M.set_default_domain = function(dom)
return true
end
-local cast, ffistr = ffi.cast, ffi.string
local floor = math.floor
local type = type
@@ -50,12 +41,11 @@ if dgettext then
dom = default_domain
end
if not domains[dom] or not msgid then return msgid end
-local cmsgid = cast("const char*", msgid)
-local lmsgid = dgettext(dom, cmsgid)
-if cmsgid == lmsgid then
+local lmsgid = dgettext(dom, msgid)
+if msgid == lmsgid then
return msgid
end
-return ffistr(lmsgid)
+return lmsgid
end
M.dgettext = M.gettext
M.ngettext = function(dom, msgid, plmsgid, n)
@@ -69,15 +59,13 @@ if dgettext then
if not msgid or n == 1 then return msgid end
return plmsgid
end
-local cmsgid = cast("const char*", msgid)
-local cplmsgid = cast("const char*", plmsgid)
-local lmsgid = dngettext(dom, cmsgid, cplmsgid, n)
+local lmsgid = dngettext(dom, msgid, plmsgid, n)
if n == 1 then
-if cmsgid == lmsgid then return msgid end
+if msgid == lmsgid then return msgid end
else
-if cplmsgid == lmsgid then return plmsgid end
+if plmsgid == lmsgid then return plmsgid end
end
-return ffistr(lmsgid)
+return lmsgid
end
M.dngettext = M.ngettext
else
--
[EGIT] [website/www-content] master 01/01: Wiki page documentation-guide.md changed with summary [] by Gareth Halfacree
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=823fedfcf7d95c435df198b30c17ee9445136843 commit 823fedfcf7d95c435df198b30c17ee9445136843 Author: Gareth Halfacree Date: Fri Nov 24 01:43:49 2017 -0800 Wiki page documentation-guide.md changed with summary [] by Gareth Halfacree --- pages/contrib/docs/documentation-guide.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contrib/docs/documentation-guide.md.txt b/pages/contrib/docs/documentation-guide.md.txt index c237f96eb..3e28436e1 100644 --- a/pages/contrib/docs/documentation-guide.md.txt +++ b/pages/contrib/docs/documentation-guide.md.txt @@ -137,7 +137,7 @@ Where referencing code within a paragraph of documentation, use paired double-ba When referencing a method in a document always include the parentheses that go with it: ``efl_add()`` rather than ``efl_add``, for example. -For information on the formatting of the code itself, please consult the [Coding Convention Guide](https://phab.enlightenment.org/w/coding_convention/). +For information on the formatting of the code itself, please consult the [Coding Conventions Guide](https://www.enlightenment.org/contrib/devs/coding-conventions.md). ### Table Formatting ### --
[EGIT] [website/www-content] master 01/01: Wiki page documentation-guide.md changed with summary [] by Gareth Halfacree
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=d43474e3168b7948349e3400ce5113d55659a815 commit d43474e3168b7948349e3400ce5113d55659a815 Author: Gareth Halfacree Date: Fri Nov 24 01:39:44 2017 -0800 Wiki page documentation-guide.md changed with summary [] by Gareth Halfacree --- pages/contrib/docs/documentation-guide.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contrib/docs/documentation-guide.md.txt b/pages/contrib/docs/documentation-guide.md.txt index fde4cd08b..c237f96eb 100644 --- a/pages/contrib/docs/documentation-guide.md.txt +++ b/pages/contrib/docs/documentation-guide.md.txt @@ -3,7 +3,7 @@ ~~NOCACHE~~ --- -# Documentation Contribution Guide # +# Documentation Contribution Guide # Good documentation is at the heart of a good project. The *Enlightenment Documentation Contribution Guide* is designed to offer advice on how to write and format documentation pertaining to the Enlightenment Project, including the use of languages, layout, and terminology. --
[EGIT] [core/efl] master 01/03: eo - by default on 64bit only use 47 bits because of luajit
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=74327ddbc8405b4be0fddd2455bd73383596b1d6 commit 74327ddbc8405b4be0fddd2455bd73383596b1d6 Author: Carsten Haitzler (Rasterman) Date: Thu Nov 23 13:27:52 2017 +0900 eo - by default on 64bit only use 47 bits because of luajit luajit wants to check the upper 17 bits of pointers and assume they are all 0 if on a 64bit architecture. it will panic and barf if they are used. we have been using them in our eoid's for a long time. my take on this is that this is unportable. assuming how many bits are or are not valid in an opaque pointer (void *) that is simply passed to you and you cannot dereference or use (no size information even for what amount of data it points to etc.), is just wrong. it's not portable and it's trying to be too smart and creating such issues. my take is that luajit needs a fix for this in the longer term. but for now let's have a 47 bit mode and go with that. it does mean i have to drop our generation counter to 10 bits on 64bit (from 27 bits) which increases likelihood of eoid re-use being falsely detected as valid (before on 64bit it was 1 in 130 million or so chance, with this 47 bit change it's 1 in 1000. but to be fair on 32bit it's 7 bits for gen count so 1 in 127 ... so still more than 10x "safer" than on 32bit... but still...). the relevant check in luajit is: (((uint64_t)(p) >> 47) ? (lj_err_msg(L, LJ_ERR_BADLU), NULL) : (p)) it ONLY does this on 64bit. on 32bit pointers are not checked for validity at all. as an aside, armv8.2 seemingly will bring 52bit addresses so luajit is going to fall over flat on a newer rev of armv8. it may be x86 also uses more bits. last i knew it was 48bits so the 47 bit check luajit does i think is even wrong for x86-64. to be detailed i read: amd64 arch == 48 bits (so luajit is wrong). even better In addition, the AMD specification requires that the most significant 16 bits of any virtual address, bits 48 through 63, must be copies of bit 47 (in a manner akin to sign extension). so if the upper bit of 48 is set THEN all the 16 upper bits must be 1... breaking luajit, even if it were 47bit and this rule applied. I read the architecture allows for up to 52bits of actual addresses so architecture-wise this is even wrong... So I smell a core bug here in luajit. Certainly in the number of bits it insists must be 0 (the upper 17 bits where on amd64/x86-64 it should be the upper 16 bits... and even then these may NOT be 0 if bit 47 (the upper bit of the lower 48 is 1) so the whole check is invalid... :( at least the above is at a theoretical level. i believe that the addresses divide the 48 bits into 2 chunks (thus 47)... but at the PHYSICAL level with no mmu and virtual memory. arm64 has this: https://www.kernel.org/doc/Documentation/arm64/memory.txt note in all cases the 2nd chunk of memory has at leats some upper bits of physical addresses beign 1 ... which makes luajit invalid tyo use without virtual memory remapping these away from high bits. @fix --- src/lib/eo/eo_ptr_indirection.x | 39 ++- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x index d9bd863cc7..f4311e1c3a 100644 --- a/src/lib/eo/eo_ptr_indirection.x +++ b/src/lib/eo/eo_ptr_indirection.x @@ -57,6 +57,12 @@ * it to the fifo. */ +// enable this to test and use all 64bits of a pointer, otherwise limit to +// 47 bits because of luajit. it wants to check if any bits in the upper 17 are +// set for a sanity check for lightuserdata ... basically it does this: +// #define checklightudptr(L, p) (((uint64_t)(p) >> 47) ? (lj_err_msg(L, LJ_ERR_BADLU), NULL) : (p)) +//#define EO_FULL64BIT 1 + #if SIZEOF_UINTPTR_T == 4 /* 32 bits */ # define BITS_MID_TABLE_ID5 @@ -71,18 +77,33 @@ typedef int16_t Table_Index; typedef uint16_t Generation_Counter; #else +# ifndef EO_FULL64BIT +/* 47 bits */ +# define BITS_MID_TABLE_ID 11 +# define BITS_TABLE_ID 11 +# define BITS_ENTRY_ID 11 +# define BITS_GENERATION_COUNTER 10 +# define BITS_DOMAIN 2 +# define BITS_CLASS 1 +# define REF_TAG_SHIFT 46 +# define DROPPED_TABLES 2 +# define DROPPED_ENTRIES 3 +typedef int16_t Table_Index; +typedef uint16_t Generation_Counter; +# else /* 64 bits */ -# define BITS_MID_TABLE_ID 11 -# define BITS_TABLE_ID 11 -# define BITS_ENTRY_ID 11 -# define BITS_GENERATION_COUNTER 27 -# define BITS_DOMAIN 2 -# define BITS_CLASS 1 -# define REF_TAG_SHIFT 63 -# define DROPPED_TABLES 2 -# define DROPPED_ENTRIES
[EGIT] [core/efl] master 03/03: elua - use safeptr with lightuserdata to work around luajit 64bit issue
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6587613a5810188378d52191fbc12ba44394b607
commit 6587613a5810188378d52191fbc12ba44394b607
Author: Carsten Haitzler (Rasterman)
Date: Thu Nov 23 18:07:01 2017 +0900
elua - use safeptr with lightuserdata to work around luajit 64bit issue
luajit only supports 47bits on 64bit for lightuser data (bad! don't
mess with opaque pointers... really unexpected and bad and probably
should be fixed in luajit by doing things like on 32bit where
pointers are not messed with etc.)
---
src/lib/elua/elua.c | 26 --
src/lib/elua/elua_private.h | 1 +
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c
index 2d9eebe3c3..44b5c32c59 100644
--- a/src/lib/elua/elua.c
+++ b/src/lib/elua/elua.c
@@ -70,6 +70,7 @@ EAPI Elua_State *
elua_state_new(const char *progname)
{
Elua_State *ret = NULL;
+ Eina_Safepointer *sp;
lua_State *L = luaL_newstate();
if (!L)
return NULL;
@@ -77,7 +78,9 @@ elua_state_new(const char *progname)
ret->luastate = L;
if (progname) ret->progname = eina_stringshare_add(progname);
luaL_openlibs(L);
- lua_pushlightuserdata(L, ret);
+ sp = (Eina_Safepointer *)eina_safepointer_register(ret);
+ ret->sp = sp;
+ lua_pushlightuserdata(L, sp);
lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr");
return ret;
}
@@ -106,6 +109,7 @@ elua_state_free(Elua_State *es)
eina_stringshare_del(es->coredir);
eina_stringshare_del(es->moddir);
eina_stringshare_del(es->appsdir);
+ eina_safepointer_unregister(es->sp);
free(es);
}
@@ -260,7 +264,8 @@ elua_state_from_lua_state_get(lua_State *L)
lua_getfield(L, LUA_REGISTRYINDEX, "elua_ptr");
if (!lua_isnil(L, -1))
{
-void *st = lua_touserdata(L, -1);
+Eina_Safepointer *sp = lua_touserdata(L, -1);
+void *st = eina_safepointer_get(sp);
lua_pop(L, 1);
return (Elua_State *)st;
}
@@ -360,17 +365,16 @@ const luaL_Reg gettextlib[] =
{ "bind_textdomain", _elua_gettext_bind_textdomain },
{ "get_message_language", _elua_get_message_language },
{ "get_localeconv", _elua_get_localeconv },
+#ifdef ENABLE_NLS
+ { "dgettext", dgettext },
+ { "dgettext", dngettext },
+#endif
{ NULL, NULL }
};
static Eina_Bool
-_elua_state_i18n_setup(const Elua_State *es)
+_elua_state_i18n_setup(Elua_State *es)
{
-#ifdef ENABLE_NLS
- char *(*dgettextp)(const char*, const char*) = dgettext;
- char *(*dngettextp)(const char*, const char*, const char*, unsigned long)
- = dngettext;
-#endif
char buf[PATH_MAX];
EINA_SAFETY_ON_NULL_RETURN_VAL(es, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(es->coredir, EINA_FALSE);
@@ -380,12 +384,6 @@ _elua_state_i18n_setup(const Elua_State *es)
return EINA_FALSE;
lua_createtable(es->luastate, 0, 0);
luaL_register(es->luastate, NULL, gettextlib);
-#ifdef ENABLE_NLS
- lua_pushlightuserdata(es->luastate, *((void**)&dgettextp));
- lua_setfield(es->luastate, -2, "dgettext");
- lua_pushlightuserdata(es->luastate, *((void**)&dngettextp));
- lua_setfield(es->luastate, -2, "dngettext");
-#endif
lua_call(es->luastate, 1, 0);
return EINA_TRUE;
}
diff --git a/src/lib/elua/elua_private.h b/src/lib/elua/elua_private.h
index f4392f604b..1fd955c3ea 100644
--- a/src/lib/elua/elua_private.h
+++ b/src/lib/elua/elua_private.h
@@ -40,6 +40,7 @@ struct _Elua_State
Eina_List *lmods;
Eina_List *cmods;
Eina_List *lincs;
+ Eina_Safepointer *sp;
int requireref, apploadref;
};
--
[EGIT] [core/efl] master 02/03: eina safepointer - mimic 47 bit eoid patch
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e0f4455eaac5947306144afca9c54f7d145fd140 commit e0f4455eaac5947306144afca9c54f7d145fd140 Author: Carsten Haitzler (Rasterman) Date: Thu Nov 23 18:06:12 2017 +0900 eina safepointer - mimic 47 bit eoid patch same thing as b209b9a92286209281c12e81fd9dd72dc28c7495 but for safeptr --- src/lib/eina/eina_inline_safepointer.x | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/src/lib/eina/eina_inline_safepointer.x b/src/lib/eina/eina_inline_safepointer.x index 7c4cd5505c..1652e84947 100644 --- a/src/lib/eina/eina_inline_safepointer.x +++ b/src/lib/eina/eina_inline_safepointer.x @@ -38,16 +38,29 @@ typedef uintptr_t Eina_Sp_Id; typedef int16_t Eina_Table_Index; typedef uint16_t Eina_Generation_Counter; #else +# ifndef EINA_FULL64BIT +/* 47 bits */ +# define EINA_BITS_MID_TABLE_ID 11 +# define EINA_BITS_TABLE_ID 11 +# define EINA_BITS_ENTRY_ID 12 +# define EINA_BITS_GENERATION_COUNTER 11 +# define EINA_BITS_FREE_COUNTER2 +# define EINA_DROPPED_TABLES 2 +# define EINA_DROPPED_ENTRIES 2 +typedef int16_t Eina_Table_Index; +typedef uint16_t Eina_Generation_Counter; +# else /* 64 bits */ -# define EINA_BITS_MID_TABLE_ID 11 -# define EINA_BITS_TABLE_ID 11 -# define EINA_BITS_ENTRY_ID 12 -# define EINA_BITS_GENERATION_COUNTER 28 -# define EINA_BITS_FREE_COUNTER2 -# define EINA_DROPPED_TABLES 2 -# define EINA_DROPPED_ENTRIES 2 +# define EINA_BITS_MID_TABLE_ID 11 +# define EINA_BITS_TABLE_ID 11 +# define EINA_BITS_ENTRY_ID 12 +# define EINA_BITS_GENERATION_COUNTER 28 +# define EINA_BITS_FREE_COUNTER2 +# define EINA_DROPPED_TABLES 2 +# define EINA_DROPPED_ENTRIES 2 typedef int16_t Eina_Table_Index; typedef uint32_t Eina_Generation_Counter; +# endif #endif /* Shifts macros to manipulate the SP id */ --
[EGIT] [website/www-content] master 01/01: Wiki page eo-intro.md changed with summary [Update name of next tutorial] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=48ee25a40419d3fe75cd3a8de2ffc821e08893ad commit 48ee25a40419d3fe75cd3a8de2ffc821e08893ad Author: Xavi Artigas Date: Fri Nov 24 01:11:02 2017 -0800 Wiki page eo-intro.md changed with summary [Update name of next tutorial] by Xavi Artigas --- pages/develop/tutorial/c/eo-intro.md.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/develop/tutorial/c/eo-intro.md.txt b/pages/develop/tutorial/c/eo-intro.md.txt index c6d0705fe..0d3767676 100644 --- a/pages/develop/tutorial/c/eo-intro.md.txt +++ b/pages/develop/tutorial/c/eo-intro.md.txt @@ -288,8 +288,8 @@ At the end of this tutorial you have learned: The following tutorial builds on top of this one, adding instrumentation calls to display the actual values of the different reference counters. ## Further Reading ## -[Introduction to Eo 2](eo-refcount.md) -:Part two of this tutorial +[Reference Counting in Eo](eo-refcount.md) +:Next tutorial in this series [Setting up the Development Environment](/develop/setup/c/) :Read this before trying to develop with the EFL --
[EGIT] [core/efl] master 03/03: mbe: Fix invalid part handling
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7e76b1e7ef17b8f7169f8e1ff550144e3ea432a7
commit 7e76b1e7ef17b8f7169f8e1ff550144e3ea432a7
Author: Jean-Philippe Andre
Date: Fri Nov 24 17:22:31 2017 +0900
mbe: Fix invalid part handling
Only the text parts need special handling.
Ping @CHAN :)
---
src/lib/elementary/efl_ui_multibuttonentry.c | 41 ++
src/lib/elementary/efl_ui_multibuttonentry_part.eo | 4 +--
2 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c
b/src/lib/elementary/efl_ui_multibuttonentry.c
index e15b4de90c..0ff7c5e555 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -57,6 +57,14 @@ static void _entry_changed_cb(void *data, const Efl_Event
*event);
static void _entry_focus_changed_cb(void *data, const Efl_Event *event);
static void _entry_clicked_cb(void *data, const Efl_Event *event);
+static const Elm_Layout_Part_Alias_Description _text_aliases[] =
+{
+ {"default", "elm.text"},
+ {"guide", "guide"},
+ {NULL, NULL}
+};
+
+
EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
{ ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
{ EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb },
@@ -1480,46 +1488,22 @@ _view_init(Evas_Object *obj,
Efl_Ui_Multibuttonentry_Data *sd)
}
}
-static Eina_Bool
-_efl_ui_multibuttonentry_content_set(Eo *obj, Efl_Ui_Multibuttonentry_Data
*_pd EINA_UNUSED, const char *part, Evas_Object *content)
-{
- return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
-}
-
-static Eo*
-_efl_ui_multibuttonentry_content_get(Eo *obj, Efl_Ui_Multibuttonentry_Data
*_pd EINA_UNUSED, const char *part)
-{
- return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
-}
-
-static Eo*
-_efl_ui_multibuttonentry_content_unset(Eo *obj, Efl_Ui_Multibuttonentry_Data
*_pd EINA_UNUSED, const char *part)
-{
- return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
-}
-
-EOLIAN static Eina_Bool
+static void
_efl_ui_multibuttonentry_text_set(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd
EINA_UNUSED, const char *part, const char *label)
{
- Eina_Bool int_ret = EINA_TRUE;
-
if (!part || !strcmp(part, "default") || !strcmp(part, "elm.text"))
{
if (label) _label_set(obj, label);
-int_ret = EINA_TRUE;
}
else if (!strcmp(part, "guide"))
{
if (label) _guide_text_set(obj, label);
-int_ret = EINA_TRUE;
}
else
efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label);
-
- return int_ret;
}
-EOLIAN static const char*
+static const char*
_efl_ui_multibuttonentry_text_get(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd,
const char *part)
{
const char *text = NULL;
@@ -2088,10 +2072,7 @@
_elm_multibuttonentry_item_efl_access_widget_action_elm_actions_get(Eo *obj EINA
/* Efl.Part begin */
-ELM_PART_OVERRIDE(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY,
Efl_Ui_Multibuttonentry_Data)
-ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_multibuttonentry,
EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
-ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_multibuttonentry,
EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
-ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_multibuttonentry,
EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data)
+ELM_PART_OVERRIDE_ONLY_ALIASES(efl_ui_multibuttonentry,
EFL_UI_MULTIBUTTONENTRY, Efl_Ui_Multibuttonentry_Data, _text_aliases)
ELM_PART_OVERRIDE_TEXT_SET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY,
Efl_Ui_Multibuttonentry_Data)
ELM_PART_OVERRIDE_TEXT_GET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY,
Efl_Ui_Multibuttonentry_Data)
#include "efl_ui_multibuttonentry_part.eo.c"
diff --git a/src/lib/elementary/efl_ui_multibuttonentry_part.eo
b/src/lib/elementary/efl_ui_multibuttonentry_part.eo
index 7326df1773..111cf18da4 100644
--- a/src/lib/elementary/efl_ui_multibuttonentry_part.eo
+++ b/src/lib/elementary/efl_ui_multibuttonentry_part.eo
@@ -1,10 +1,8 @@
-class Efl.Ui.Multibuttonentry.Part (Efl.Ui.Layout.Part_Content, Efl.Text)
+class Efl.Ui.Multibuttonentry.Part (Efl.Ui.Layout.Part_Text)
{
[[Elementary multibuttonentry internal part class]]
data: null;
implements {
- Efl.Content.content { set; get; }
- Efl.Content.content_unset;
Efl.Text.text { set; get; }
}
}
--
[EGIT] [core/efl] master 01/03: elm: add custom access state for Elm.Hover
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2016bacd177b3d8787b5e829155c9eb9cbb24875
commit 2016bacd177b3d8787b5e829155c9eb9cbb24875
Author: Lukasz Stanislawski
Date: Fri Nov 24 16:50:01 2017 +0900
elm: add custom access state for Elm.Hover
Reviewers: jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D5523
---
src/lib/elementary/elm_hover.c | 10 ++
src/lib/elementary/elm_hover.eo | 1 +
2 files changed, 11 insertions(+)
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 5bbbc570dd..b92b2ea1a3 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -865,6 +865,16 @@ _elm_hover_efl_access_widget_action_elm_actions_get(Eo
*obj EINA_UNUSED, Elm_Hov
return &atspi_actions[0];
}
+EOLIAN static Efl_Access_State_Set
+_elm_hover_efl_access_state_set_get(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
+{
+ Efl_Access_State_Set states;
+ states = efl_access_state_set_get(efl_super(obj, MY_CLASS));
+
+ STATE_TYPE_SET(states, EFL_ACCESS_STATE_MODAL);
+ return states;
+}
+
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, Elm_Hover_Data)
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index a1c33f0b4b..c517b9c0a8 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -69,6 +69,7 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer,
Efl.Ui.Clickable, Efl.Access
Elm.Widget.widget_parent { get; set; }
Elm.Widget.widget_sub_object_del;
Efl.Access.Widget.Action.elm_actions { get; }
+ Efl.Access.state_set { get; }
Efl.Part.part;
}
events {
--
[EGIT] [core/efl] master 02/03: win: Fix window background EO APIs
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1aedcdaf7a6550881db258ac0fb9fcba4a5d2cc7
commit 1aedcdaf7a6550881db258ac0fb9fcba4a5d2cc7
Author: Jean-Philippe Andre
Date: Fri Nov 24 17:10:30 2017 +0900
win: Fix window background EO APIs
Broken in a previous commit
---
src/lib/elementary/elm_part_helper.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/elementary/elm_part_helper.h
b/src/lib/elementary/elm_part_helper.h
index fd07059e60..f451437a38 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -104,8 +104,6 @@ EOLIAN static Efl_Object * \
_ ## type ## _efl_part_part(const Eo *obj, typedata *priv EINA_UNUSED, const
char *part) \
{ \
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); \
- if (eina_streq(part, "background")) \
- return efl_part(efl_super(obj, MY_CLASS), part); \
return ELM_PART_IMPLEMENT(TYPE ## _PART_CLASS, obj, part); \
}
--
[EGIT] [core/enlightenment] master 01/01: meson: make it possible to set the path for eet
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c1afa0a05bf095bf6f9bebab4968202b20f308e8
commit c1afa0a05bf095bf6f9bebab4968202b20f308e8
Author: Stefan Schmidt
Date: Thu Nov 23 16:12:12 2017 +0100
meson: make it possible to set the path for eet
Follow the approach of edje_cc and eldbus-codegen which detecting the
eet binary.
---
config/default/meson.build | 2 +-
config/meson.build | 11 ++-
config/mobile/meson.build | 2 +-
config/standard/meson.build | 2 +-
config/tiling/meson.build | 2 +-
meson_options.txt | 4
6 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/config/default/meson.build b/config/default/meson.build
index 8f85344d9..f993a4393 100644
--- a/config/default/meson.build
+++ b/config/default/meson.build
@@ -10,7 +10,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command: [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install: true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/meson.build b/config/meson.build
index 221b21997..3cc83881a 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -1,13 +1,14 @@
dir_config = join_paths(dir_data, 'enlightenment/data/config')
-eet = find_program('eet')
-gen_eet = generator(eet,
-output : '@BASENAME@.cfg',
-arguments: ['-e', '@OUTPUT@', 'config', '@INPUT@', '1'])
+eet_cmd = get_option('eet')
+if eet_cmd == ''
+ eet_cmd = join_paths(dep_eet.get_pkgconfig_variable('prefix'),
+'bin', 'eet')
+endif
custom_target('profile.src',
input : 'profile.src',
- command: [eet, '-i', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command: [eet_cmd, '-i', '@OUTPUT@', 'config', '@INPUT@',
'1'],
output : ['profile.cfg'],
install: true,
install_dir: dir_config
diff --git a/config/mobile/meson.build b/config/mobile/meson.build
index 655bfb357..64be2ad4e 100644
--- a/config/mobile/meson.build
+++ b/config/mobile/meson.build
@@ -12,7 +12,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command: [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install: true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/standard/meson.build b/config/standard/meson.build
index bb430da27..dfaacd8cd 100644
--- a/config/standard/meson.build
+++ b/config/standard/meson.build
@@ -18,7 +18,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command: [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install: true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/config/tiling/meson.build b/config/tiling/meson.build
index 806396579..50f074ccb 100644
--- a/config/tiling/meson.build
+++ b/config/tiling/meson.build
@@ -19,7 +19,7 @@ foreach cd: src
custom_target(' '.join(['config_dist', dir, cd]),
input : cd + '.src',
output : cd + '.cfg',
- command: [eet, '-e', '@OUTPUT@', 'config', '@INPUT@', '1'],
+ command: [eet_cmd, '-e', '@OUTPUT@', 'config', '@INPUT@',
'1'],
install: true,
install_dir: join_paths(dir_config, dir)
)
diff --git a/meson_options.txt b/meson_options.txt
index cfa140e0f..234802766 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,6 +23,10 @@ option('eldbus-codegen',
type : 'string',
description: 'A path to a eldbus-codegen. Defaults to system
eldbus-codegen')
+option('eet',
+ type : 'string',
+ description: 'A path to a eet. Defaults to system eet')
+
option('pam',
type: 'boolean',
value: true,
--
