Re: [E-devel] You won at ruining my work.
Stripping quotes as it gets big. On 14/05/28, Carsten Haitzler wrote: also ask stefan how much easier it is to do releases of efl now - having it merged means we can release more often because its far less work. the problem is you are ignoring all the upsides to what we did because it's different to your previous build setup and you need to adapt. My problem is not with auto select. auto select also had an impact here for me at the begin when i started to package debian/centos/fedora/archlinux. we will merge libs. that's my plan for efl 2.0 - likely it'll be merged into 2 libs (maybe 3) libefl-core.so libefl-gfx.so and maybe libefl-etc.so. guess which does what? This is the kind of things that would ease my work. When i decided to use EFL, one of its major point was its modularity, it was all cool for me because i could just build what i needed, and everyone by that time was happy about that, and claiming it would stay like that. and that modularity cost us a lot in terms of support from distributions and in complexity to build along with complaints. it was a nice theory, but in practice it fell over badly. do a survey of efl devs and ask them which is better. they will almost all say that a unified tree is better, and we likely want to merge even more. Maybe i have to clear it up : My problem is not the unified tree, but my problem started at the same time. make DESTDIR=/tmp/myefl you can ALSO just keep a list of files you DO want (files and dirs) and use that list to copy/tar just those and the subdirs, nuke the rest, then untar or move back in place. so you have 2 ways to do it. Indeed, it is a simple thing that is way easier to do for me, and i didnt though about it. if you do it right, it's no different to keeping up with efl if we kept it as it was - as it was we'd add new things that would be on by default that you have to --disable and thus keep up somehow. Having a --disable-gui is the only thing i would need. so you know we can't do what you want us to do... but you complain bitterly anyway? dude! chill! :) nah, my real problem isnt that 1.7 wont get fixes anymore, its only the final stage that got me in an embarrassing situation. so we keep making things worse for 90%+ of our users to keep 10% from having to adapt? you can adapt and have exactly what you want. see above. We can put many things in 'adapt'. this is actually true - especially of gnentoo and all its USE flags. idiots who think they are cool enable xcb use flags because someone told them xcb is faster and then they find certain features not working in e or efl because xcb support isnt there or it's iffy (xcb with opengl is impossible so we have a hack to keep xlib and then drop to xcb behind xlibs back - but some drivers are far from happy with this). the CONTINUAL questions of what is the build order from people REGARDLESS that we documented it on the website - they still keep asking. it is was a problem. now its gone. To solve your problems under the GUI world, you disabled me from disabling the GUI world. pgpYpN_pslxTu.pgp Description: PGP signature -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: Eolian: fix issue for Windows.
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=70f530e2d65d7bcdacfa84cea55a6293f95f7ea4 commit 70f530e2d65d7bcdacfa84cea55a6293f95f7ea4 Author: Daniel Zaoui daniel.za...@samsung.com Date: Wed May 28 09:32:56 2014 +0300 Eolian: fix issue for Windows. On Windows, '\' are used to separate the names of a path. It was not supported. This patch fixes that. Thanks to Vincent Torri for catching it (and good luck in Windows ;-)) --- src/lib/eolian/eolian_database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index 4390c9a..6f16d67 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -1371,7 +1371,7 @@ eolian_directory_scan(const char *dir) { int len = strlen(file); int idx = len - 1; - while (idx = 0 file[idx] != '/') idx--; + while (idx = 0 file[idx] != '/' file[idx] != '\\') idx--; eina_hash_add(_filenames, eina_stringshare_add_length(file+idx+1, len - idx - sizeof(EO_SUFFIX)), strdup(file)); } } --
[EGIT] [core/efl] efl-1.10 01/01: Eolian: fix issue for Windows.
jackdanielz pushed a commit to branch efl-1.10. http://git.enlightenment.org/core/efl.git/commit/?id=2281b506711685465c5dd50d32c1ddcfa9735ee8 commit 2281b506711685465c5dd50d32c1ddcfa9735ee8 Author: Daniel Zaoui daniel.za...@samsung.com Date: Wed May 28 09:32:56 2014 +0300 Eolian: fix issue for Windows. On Windows, '\' are used to separate the names of a path. It was not supported. This patch fixes that. Thanks to Vincent Torri for catching it (and good luck in Windows ;-)) @fix --- src/lib/eolian/eolian_database.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index 9bd7c61..83f34a8 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -1273,7 +1273,7 @@ eolian_directory_scan(const char *dir) { int len = strlen(file); int idx = len - 1; - while (idx = 0 file[idx] != '/') idx--; + while (idx = 0 file[idx] != '/' file[idx] != '\\') idx--; eina_hash_add(_filenames, eina_stringshare_add_length(file+idx+1, len - idx - sizeof(EO_SUFFIX)), strdup(file)); } } --
[EGIT] [core/elementary] master 01/01: Entry: add the changed, changed,user signals in the events section of entry.eo.
yakov pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=16da42a144686d1b35e8b5317f12dc675426e7ed commit 16da42a144686d1b35e8b5317f12dc675426e7ed Author: Yakov Goldberg yako...@samsung.com Date: Wed May 28 10:09:39 2014 +0300 Entry: add the changed, changed,user signals in the events section of entry.eo. --- src/lib/elm_entry.eo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo index e0eeefa..d445022 100644 --- a/src/lib/elm_entry.eo +++ b/src/lib/elm_entry.eo @@ -1190,6 +1190,8 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface) language,changed; access,changed; activated; + changed; + changed,user; } } --
Re: [E-devel] You won at ruining my work.
On Wed, 28 May 2014 08:34:35 +0200 Guillaume Friloux guilla...@friloux.me said: Stripping quotes as it gets big. On 14/05/28, Carsten Haitzler wrote: also ask stefan how much easier it is to do releases of efl now - having it merged means we can release more often because its far less work. the problem is you are ignoring all the upsides to what we did because it's different to your previous build setup and you need to adapt. My problem is not with auto select. auto select also had an impact here for me at the begin when i started to package debian/centos/fedora/archlinux. we will merge libs. that's my plan for efl 2.0 - likely it'll be merged into 2 libs (maybe 3) libefl-core.so libefl-gfx.so and maybe libefl-etc.so. guess which does what? This is the kind of things that would ease my work. it'll still be a single tree build. When i decided to use EFL, one of its major point was its modularity, it was all cool for me because i could just build what i needed, and everyone by that time was happy about that, and claiming it would stay like that. and that modularity cost us a lot in terms of support from distributions and in complexity to build along with complaints. it was a nice theory, but in practice it fell over badly. do a survey of efl devs and ask them which is better. they will almost all say that a unified tree is better, and we likely want to merge even more. Maybe i have to clear it up : My problem is not the unified tree, but my problem started at the same time. make DESTDIR=/tmp/myefl you can ALSO just keep a list of files you DO want (files and dirs) and use that list to copy/tar just those and the subdirs, nuke the rest, then untar or move back in place. so you have 2 ways to do it. Indeed, it is a simple thing that is way easier to do for me, and i didnt though about it. :) i guess this is why i scratch my head a bit and wonder why you are so upset. i see a very easy solution in front of me. :) if you do it right, it's no different to keeping up with efl if we kept it as it was - as it was we'd add new things that would be on by default that you have to --disable and thus keep up somehow. Having a --disable-gui is the only thing i would need. we are open to patches having this as a way of building a server profile - but yes, it may break if someone forgets to do the right thing when a new gui thing is added and then doesn't disable on build. breaks happen. that's life when we move forward. testing and bringing up the issues you see is a way of fixing it. :) so you know we can't do what you want us to do... but you complain bitterly anyway? dude! chill! :) nah, my real problem isnt that 1.7 wont get fixes anymore, its only the final stage that got me in an embarrassing situation. so we keep making things worse for 90%+ of our users to keep 10% from having to adapt? you can adapt and have exactly what you want. see above. We can put many things in 'adapt'. sure. yoou have to adapt to 2 years of development - we move forward fast. :) this is actually true - especially of gnentoo and all its USE flags. idiots who think they are cool enable xcb use flags because someone told them xcb is faster and then they find certain features not working in e or efl because xcb support isnt there or it's iffy (xcb with opengl is impossible so we have a hack to keep xlib and then drop to xcb behind xlibs back - but some drivers are far from happy with this). the CONTINUAL questions of what is the build order from people REGARDLESS that we documented it on the website - they still keep asking. it is was a problem. now its gone. To solve your problems under the GUI world, you disabled me from disabling the GUI world. nah - i just see it as you packaging only the bits you need and ignoring the bits you don't :) -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eina-tiler:add union, subtract, intersection, equal apis for tilers
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=61cecf1f3f68f5850c58c3abdb4a37a1c158cc10 commit 61cecf1f3f68f5850c58c3abdb4a37a1c158cc10 Author: MinJeong Kim minjjj@samsung.com Date: Wed May 28 16:34:05 2014 +0900 eina-tiler:add union, subtract, intersection, equal apis for tilers Summary: Support union, subtract, intersection, equal(comparison) between tilers. @feature Test Plan: Test with added test case(src/tests/eina/eina_test_tiler.c) and the example(src/examples/eina/eina_tiler_02.c) Reviewers: gwanglim, devilhorns, raster, zmike, cedric CC: cedric Differential Revision: https://phab.enlightenment.org/D880 --- src/examples/eina/eina_tiler_02.c | 354 ++ src/lib/eina/eina_tiler.c | 206 ++ src/lib/eina/eina_tiler.h | 49 ++ src/tests/eina/eina_test_tiler.c | 107 4 files changed, 716 insertions(+) diff --git a/src/examples/eina/eina_tiler_02.c b/src/examples/eina/eina_tiler_02.c new file mode 100644 index 000..2e80aaa --- /dev/null +++ b/src/examples/eina/eina_tiler_02.c @@ -0,0 +1,354 @@ +//Compile with: +//gcc eina_tiler_02.c -o eina_tiler_02 `pkg-config --cflags --libs ecore-evas ecore evas eina` + +#include Ecore_Evas.h +#include Ecore.h +#include Evas.h +#include Eina.h + +#define WIN_W(810) +#define WIN_H(280) + +#define TILER1_X (30) +#define TILER1_Y (30) +#define TILER2_X (530) +#define TILER2_Y (30) +#define TILER_W (250) +#define TILER_H (250) +#define RESULT_X (280) +#define RESULT_Y (30) + +static Eina_Tiler *tiler1, *tiler2; +static Eina_List *t1_objs, *t2_objs, *tiler_objs; +static Evas *evas; +static Evas_Object *bg; + +static unsigned int cur_method; +typedef enum { + METHOD_UNION = 0, + METHOD_SUBTRACT, + METHOD_INTERSECTION, +}Current_Method; + +static unsigned int rect_idx =0, rect_count = 4; +static const Eina_Rectangle + rects[4][2][2] = { + {{{40, 0, 80, 250}}, +{{0, 150, 250, 70}, {0, 20, 250, 70}}}, + +{{{20, 20, 65, 150}, {135, 80, 65, 150}}, + {{20, 80, 65, 150}, {135, 20, 65, 150}}}, + +{{{20, 20, 210, 210}}, + {{80, 80, 90, 90}}}, + +{{{0, 0, 150, 90}, {180, 180, 70, 70}}, + {{70, 70, 120, 120}}} +}; + +static const char* + Methods[3] = { + UNION 1+2, + SUBTRACT 1-2, + INTERSECTION 12 +}; + +static unsigned int tile_idx =0, tile_count = 5; +static const unsigned int + tilesize[5] = { +32, +16, +8, +4, +1 +}; + +static const char commands[] = \ + commands are:\n + \tn - next arrangement \n + \tu - get union\n + \ts - get subtract\n + \ti - get intersection\n + \tt - chage tile size ([32], 16, 8, 4) \n + \tEsc - Exit\n; + + +static Evas_Object * +add_text(const char *text, int x, int y, int w) +{ + Evas_Object *o = evas_object_text_add(evas); + evas_object_color_set(o, 0, 0, 0, 255); + evas_object_move(o, x, y); + evas_object_text_font_set(o, Sans, 20); + evas_object_text_text_set(o, text); + evas_object_show(o); + + return o; +} + +void tiler_calc() +{ + Eina_Tiler *tiler; + Eina_Iterator *itr; + Evas_Object *o; + Eina_Rectangle *rect; + int i = 0; + + /* clear evas rectangles */ + if (tiler_objs) + { +EINA_LIST_FREE(tiler_objs, o) + { + evas_object_hide(o); + evas_object_del(o); + } + } + + tiler = eina_tiler_new(TILER_W, TILER_H); + eina_tiler_tile_size_set(tiler, tilesize[tile_idx], tilesize[tile_idx]); + + /* calculate with tiler1 and tiler2 */ + switch(cur_method) + { + case METHOD_UNION: + eina_tiler_union(tiler, tiler1); + eina_tiler_union(tiler, tiler2); + break; + case METHOD_SUBTRACT: + eina_tiler_union(tiler, tiler1); + eina_tiler_subtract(tiler, tiler2); + break; + case METHOD_INTERSECTION: + tiler = eina_tiler_intersection(tiler1, tiler2); + break; + } + + if (tiler) + { +/* draw rects of result tiler */ +itr = eina_tiler_iterator_new(tiler); +EINA_ITERATOR_FOREACH(itr, rect) + { + fprintf(stdout, Result Rect [%d] (%d, %d) (%d x %d)\n, i++, rect-x, rect-y, rect-w, rect-h); + + o = evas_object_rectangle_add(evas); + evas_object_color_set(o, 0, 255, 0, 255); + evas_object_resize(o, rect-w, rect-h); + evas_object_move(o, RESULT_X + rect-x, RESULT_Y + rect-y); + evas_object_show(o); + tiler_objs = eina_list_append(tiler_objs, o); + } +eina_iterator_free(itr); + +o = add_text(Methods[cur_method], RESULT_X, 0, TILER_W); +tiler_objs = eina_list_append(tiler_objs, o); +eina_tiler_free(tiler); + } +} + +void rect_update() +{ + Evas_Object *o; + Eina_Rectangle *rect; + Eina_Iterator *itr; + int i = 0; +
[EGIT] [core/enlightenment] master 01/01: e log: Use a EINA_LOG_LEVELS environment variable for setting log level instead of a E_LOG_LEVEL macro
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9a85338d9c933a163637196503a34e4f38dc6011 commit 9a85338d9c933a163637196503a34e4f38dc6011 Author: Gwanglim Lee gl77@samsung.com Date: Wed May 28 17:01:16 2014 +0900 e log: Use a EINA_LOG_LEVELS environment variable for setting log level instead of a E_LOG_LEVEL macro Summary: Use a EINA_LOG_LEVELS environment variable for setting log level instead of a E_LOG_LEVEL macro Test Plan: run e with EINA_LOG_LEVELS=e:4 environment variable. we can see log messages using EINA_LOG_DOM_DBG. Reviewers: zmike, raster, devilhorns Reviewed By: raster CC: cedric Differential Revision: https://phab.enlightenment.org/D885 --- src/bin/e_log.c | 5 - 1 file changed, 5 deletions(-) diff --git a/src/bin/e_log.c b/src/bin/e_log.c index 9f03a8d..56e5500 100644 --- a/src/bin/e_log.c +++ b/src/bin/e_log.c @@ -1,9 +1,5 @@ #include e.h -#ifndef E_LOG_LEVEL -# define E_LOG_LEVEL EINA_LOG_LEVEL_INFO -#endif - EINTERN int e_log_dom = -1; static const char *_names[] = { @@ -32,7 +28,6 @@ EINTERN int e_log_init(void) { e_log_dom = eina_log_domain_register(e, EINA_COLOR_WHITE); - eina_log_domain_level_set(e, E_LOG_LEVEL); eina_log_print_cb_set(_e_log_cb, NULL); return e_log_dom != -1; } --
[EGIT] [core/elementary] master 01/01: elm_map: Add new elm_map_region_zoom_bring_in() API
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=84c2351bc339eca22acb79c86acbee7a1322f8c0 commit 84c2351bc339eca22acb79c86acbee7a1322f8c0 Author: bluezery ohpo...@gmail.com Date: Wed May 28 17:08:00 2014 +0900 elm_map: Add new elm_map_region_zoom_bring_in() API Summary: By using this API, we can do region show bring in concurrently. This needs some tuning more because some main layouting logic in map needs to be modified to support more smooth animation. I will spare my time to do that later. @feature Reviewers: Hermet, raster, stefan_schmidt Reviewed By: raster CC: Jaehyun Differential Revision: https://phab.enlightenment.org/D887 --- src/bin/test_map.c | 7 src/lib/elm_map.c| 88 +--- src/lib/elm_map.eo | 20 +++ src/lib/elm_widget_map.h | 7 ++-- 4 files changed, 115 insertions(+), 7 deletions(-) diff --git a/src/bin/test_map.c b/src/bin/test_map.c index 07da09a..108eb7a 100644 --- a/src/bin/test_map.c +++ b/src/bin/test_map.c @@ -488,6 +488,12 @@ _bring_seoul(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU } static void +_bring_zoom_suwon(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + elm_map_region_zoom_bring_in(data, 16, 126.977969, 37.566535); +} + +static void _paused_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { elm_map_paused_set(data, EINA_TRUE); @@ -770,6 +776,7 @@ _submenu_move_add(void *data, Elm_Object_Item *parent) if ((!data) || (!parent)) return; elm_menu_item_add(menu, parent, NULL, Show Urmatt, _show_urmatt, data); elm_menu_item_add(menu, parent, NULL, Bring Seoul, _bring_seoul, data); + elm_menu_item_add(menu, parent, NULL, Zoom Bring Suwon, _bring_zoom_suwon, data); } diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 393ba8d..d660874 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -26,6 +26,8 @@ #define DEFAULT_TILE_SIZE 256 #define MARER_MAX_NUMBER 30 #define OVERLAY_GROUPING_SCALE 2 +#define ZOOM_ANIM_CNT 75 +#define ZOOM_BRING_CNT 80 #define CACHE_ROOT /elm_map #define CACHE_TILE_ROOTCACHE_ROOT /%d/%d/%d @@ -1135,7 +1137,7 @@ _zoom_anim_cb(void *data) { ELM_MAP_DATA_GET(data, sd); - if (sd-ani.cnt = 0) + if (sd-ani.zoom_cnt = 0) { sd-zoom_animator = NULL; evas_object_smart_changed(sd-pan_obj); @@ -1145,8 +1147,8 @@ _zoom_anim_cb(void *data) } else { -sd-ani.zoom += sd-ani.diff; -sd-ani.cnt--; +sd-ani.zoom += sd-ani.zoom_diff; +sd-ani.zoom_cnt--; _zoom_do(sd, sd-ani.zoom); return ECORE_CALLBACK_RENEW; @@ -1160,13 +1162,83 @@ _zoom_with_animation(Elm_Map_Data *sd, { if (cnt == 0) return; - sd-ani.cnt = cnt; + sd-ani.zoom_cnt = cnt; sd-ani.zoom = sd-zoom; - sd-ani.diff = (double)(zoom - sd-zoom) / cnt; + sd-ani.zoom_diff = (double)(zoom - sd-zoom) / cnt; ecore_animator_del(sd-zoom_animator); sd-zoom_animator = ecore_animator_add(_zoom_anim_cb, sd-obj); } +static Eina_Bool +_zoom_bring_anim_cb(void *data) +{ + ELM_MAP_DATA_GET(data, sd); + + if ((sd-ani.zoom_cnt = 0) (sd-ani.region_cnt = 0)) + { +sd-zoom_animator = NULL; + +evas_object_smart_changed(sd-pan_obj); +_calc_job(sd); + +return ECORE_CALLBACK_CANCEL; + } + else + { +Evas_Coord x, y, w, h; +if (sd-ani.zoom_cnt 0) + { + sd-ani.zoom += sd-ani.zoom_diff; + _zoom_do(sd, sd-ani.zoom); + sd-ani.zoom_cnt--; + } +if (sd-ani.region_cnt 0) + { + sd-ani.lon += sd-ani.lon_diff; + sd-ani.lat += sd-ani.lat_diff; + + _region_to_coord_convert +(sd, sd-ani.lon, sd-ani.lat, sd-size.w, x, y); + _viewport_coord_get(sd, NULL, NULL, w, h); + x = x - (w / 2); + y = y - (h / 2); + eo_do(sd-obj, elm_interface_scrollable_content_region_show(x, y, w, h)); + sd-ani.region_cnt--; + } + +return ECORE_CALLBACK_RENEW; + } +} + +static void +_zoom_bring_with_animation(Elm_Map_Data *sd, + double zoom, + double lon, + double lat, + int zoom_cnt, + int region_cnt) +{ + double tlon, tlat; + Evas_Coord vx, vy, vw, vh; + if ((zoom_cnt == 0) (region_cnt == 0)) return; + + sd-ani.zoom_cnt = zoom_cnt; + sd-ani.zoom = sd-zoom; + sd-ani.zoom_diff = (double)(zoom - sd-zoom) / zoom_cnt; + + sd-ani.region_cnt = region_cnt; + _viewport_coord_get(sd, vx, vy, vw, vh); + _coord_to_region_convert + (sd, vx + vw / 2, vy + vh / 2,
[EGIT] [core/elementary] master 01/01: atspi: add accessible default relations and attributes
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ab9dfa4e04c094a9b0da6092fe9d549f59783cb3 commit ab9dfa4e04c094a9b0da6092fe9d549f59783cb3 Author: Lukasz Stanislawski l.stanisl...@samsung.com Date: Wed May 28 17:12:34 2014 +0900 atspi: add accessible default relations and attributes Summary: Tests added for accessibile interface Differential Revision: https://phab.enlightenment.org/D900 --- src/lib/elm_atspi_app_object.c| 29 ++- src/lib/elm_atspi_app_object.eo | 4 +- src/lib/elm_atspi_bridge.c| 29 ++- src/lib/elm_interface_atspi_accessible.c | 21 +- src/lib/elm_interface_atspi_accessible.eo | 16 +- src/lib/elm_interface_atspi_accessible.h | 46 src/lib/elm_interface_atspi_component.c | 4 +- src/lib/elm_interface_atspi_widget.c | 50 src/lib/elm_interface_atspi_widget.eo | 2 + src/tests/Makefile.am | 1 + src/tests/elm_suite.c | 1 + src/tests/elm_suite.h | 1 + src/tests/elm_test_atspi.c| 419 ++ 13 files changed, 607 insertions(+), 16 deletions(-) diff --git a/src/lib/elm_atspi_app_object.c b/src/lib/elm_atspi_app_object.c index 0f9d5e7..60a4485 100644 --- a/src/lib/elm_atspi_app_object.c +++ b/src/lib/elm_atspi_app_object.c @@ -16,8 +16,21 @@ extern Eina_List *_elm_win_list; static Eo *_atspi_root; static int _init; +typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data; + +struct _Elm_Atspi_App_Object_Data +{ + const char *descr; +}; + +EOLIAN static void +_elm_atspi_app_object_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) +{ + if (_pd-descr) eina_stringshare_del(_pd-descr); +} + EOLIAN static Eina_List* -_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { Eina_List *l, *accs = NULL; Evas_Object *win; @@ -33,19 +46,25 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U } EOLIAN static const char* -_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { return elm_app_name_get(); } EOLIAN static const char* -_elm_atspi_app_object_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) +{ + return _pd-descr; +} + +EOLIAN static void +_elm_atspi_app_object_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) { - return NULL; + eina_stringshare_replace(_pd-descr, descr); } EOLIAN static Elm_Atspi_Role -_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { return ELM_ATSPI_ROLE_APPLICATION; } diff --git a/src/lib/elm_atspi_app_object.eo b/src/lib/elm_atspi_app_object.eo index 0cdfccd..8a9b122 100644 --- a/src/lib/elm_atspi_app_object.eo +++ b/src/lib/elm_atspi_app_object.eo @@ -1,9 +1,11 @@ class Elm_Atspi_App_Object (Eo_Base, Elm_Interface_Atspi_Accessible) { - data: null; + data: Elm_Atspi_App_Object_Data; implements { + Eo_Base::destructor; Elm_Interface_Atspi_Accessible::name::get; Elm_Interface_Atspi_Accessible::description::get; + Elm_Interface_Atspi_Accessible::description::set; Elm_Interface_Atspi_Accessible::role::get; Elm_Interface_Atspi_Accessible::children::get; } diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c index a488c62..157041a 100644 --- a/src/lib/elm_atspi_bridge.c +++ b/src/lib/elm_atspi_bridge.c @@ -435,6 +435,33 @@ _accessible_get_application(const Eldbus_Service_Interface *iface EINA_UNUSED, c return ret; } +static Eldbus_Message * +_accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg) +{ + Eina_List *attrs, *l; + Elm_Atspi_Attribute *attr; + Eldbus_Message_Iter *iter, *iter_array; + + Eldbus_Message *ret = eldbus_message_method_return_new(msg); + EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); + + const char *obj_path = eldbus_service_object_path_get(iface); + Eo *obj = _access_object_from_path(obj_path); + + eo_do(obj, attrs = elm_interface_atspi_accessible_attributes_get()); + + iter = eldbus_message_iter_get(ret); + iter_array = eldbus_message_iter_container_new(iter, 'a', ss);
[EGIT] [core/efl] master 01/01: Fixed rbegin/rend implementation on the Eina C++ ranges.
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a9f58d0d13f4177fb306ddc0831d77a5dc07d01d commit a9f58d0d13f4177fb306ddc0831d77a5dc07d01d Author: Vitor Sousa vitorsousa@vitorsousa-ws.(none) Date: Wed May 28 17:49:06 2014 +0900 Fixed rbegin/rend implementation on the Eina C++ ranges. Summary: Fixed the rbegin/rend functions returning switched reverse iterators. Added code to some unit tests for comparing elements in reverse order, in interest of checking the correctness of the rbegin/rend functions. Reviewers: felipealmeida, cedric, woohyun, smohanty, raster Reviewed By: felipealmeida CC: savio, cedric Differential Revision: https://phab.enlightenment.org/D901 --- src/bindings/eina_cxx/eina_inarray.hh | 8 src/bindings/eina_cxx/eina_inlist.hh| 12 ++-- src/bindings/eina_cxx/eina_ptrarray.hh | 8 src/bindings/eina_cxx/eina_ptrlist.hh | 4 ++-- src/bindings/eina_cxx/eina_range_types.hh | 2 +- src/bindings/eina_cxx/eina_stringshare.hh | 4 ++-- src/tests/eina_cxx/eina_cxx_test_inarray.cc | 16 src/tests/eina_cxx/eina_cxx_test_inlist.cc | 13 + src/tests/eina_cxx/eina_cxx_test_ptrarray.cc| 13 + src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 13 + src/tests/eina_cxx/eina_cxx_test_stringshare.cc | 19 +++ 11 files changed, 93 insertions(+), 19 deletions(-) diff --git a/src/bindings/eina_cxx/eina_inarray.hh b/src/bindings/eina_cxx/eina_inarray.hh index 645e89e..4b10735 100644 --- a/src/bindings/eina_cxx/eina_inarray.hh +++ b/src/bindings/eina_cxx/eina_inarray.hh @@ -85,22 +85,22 @@ static T const* end(Eina_Inarray const* raw) template typename T static std::reverse_iteratorT const* rbegin(Eina_Inarray const* raw) { - return std::reverse_iteratorT const*(_inarray_access_traits::beginT(raw)); + return std::reverse_iteratorT const*(_inarray_access_traits::endT(raw)); } template typename T static std::reverse_iteratorT const* rend(Eina_Inarray const* raw) { - return std::reverse_iteratorT const*(_inarray_access_traits::endT(raw)); + return std::reverse_iteratorT const*(_inarray_access_traits::beginT(raw)); } template typename T static std::reverse_iteratorT* rbegin(Eina_Inarray* raw) { - return std::reverse_iteratorT*(_inarray_access_traits::beginT(raw)); + return std::reverse_iteratorT*(_inarray_access_traits::endT(raw)); } template typename T static std::reverse_iteratorT* rend(Eina_Inarray* raw) { - return std::reverse_iteratorT*(_inarray_access_traits::endT(raw)); + return std::reverse_iteratorT*(_inarray_access_traits::beginT(raw)); } template typename T static T const* cbegin(Eina_Inarray const* raw) diff --git a/src/bindings/eina_cxx/eina_inlist.hh b/src/bindings/eina_cxx/eina_inlist.hh index 1a014d1..7fdf166 100644 --- a/src/bindings/eina_cxx/eina_inlist.hh +++ b/src/bindings/eina_cxx/eina_inlist.hh @@ -200,12 +200,12 @@ struct _inlist_access_traits { template typename T static std::reverse_iterator_inlist_iteratorT rbegin(Eina_Inlist* list) { -return std::reverse_iterator_inlist_iteratorT (_inlist_access_traits::beginT(list)); +return std::reverse_iterator_inlist_iteratorT (_inlist_access_traits::endT(list)); } template typename T static std::reverse_iterator_inlist_iteratorT rend(Eina_Inlist* list) { -return std::reverse_iterator_inlist_iteratorT (_inlist_access_traits::endT(list)); +return std::reverse_iterator_inlist_iteratorT (_inlist_access_traits::beginT(list)); } template typename T static std::reverse_iterator_inlist_iteratorT const rbegin(Eina_Inlist const* list) @@ -540,19 +540,19 @@ public: } const_reverse_iterator rbegin() const { -return _inlist_access_traits::endT(this-_impl._list); +return reverse_iterator(end()); } const_reverse_iterator rend() const { -return const_reverse_iterator(end()); +return const_reverse_iterator(begin()); } reverse_iterator rbegin() { -return reverse_iterator(begin()); +return reverse_iterator(end()); } reverse_iterator rend() { -return reverse_iterator(end()); +return reverse_iterator(begin()); } const_iterator cbegin() const { diff --git a/src/bindings/eina_cxx/eina_ptrarray.hh b/src/bindings/eina_cxx/eina_ptrarray.hh index 0587610..561c83e 100644 --- a/src/bindings/eina_cxx/eina_ptrarray.hh +++ b/src/bindings/eina_cxx/eina_ptrarray.hh @@ -178,22 +178,22 @@ static _ptr_array_iteratorT end(Eina_Array const* array) template typename T static std::reverse_iterator_ptr_array_iteratorT rbegin(Eina_Array* array) { - return std::reverse_iterator_ptr_array_iteratorT (_ptr_array_access_traits::beginT(array)); + return std::reverse_iterator_ptr_array_iteratorT (_ptr_array_access_traits::endT(array)); } template typename T
[EGIT] [core/efl] master 01/01: Correction for the macro EINA_CXX_DOM_LOG
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=062c08fbabdd80707abe3ecfddf25f48f2d35221 commit 062c08fbabdd80707abe3ecfddf25f48f2d35221 Author: Vitor Sousa vitorsousa@vitorsousa-ws.(none) Date: Wed May 28 17:51:14 2014 +0900 Correction for the macro EINA_CXX_DOM_LOG Summary: The previous definition of EINA_CXX_DOM_LOG could cause a problem if used inside an one-line if statement followed by an else. Changed the top if by a for statement to avoid this problem. Reviewers: felipealmeida, cedric, woohyun, smohanty, raster Reviewed By: raster CC: savio, cedric Differential Revision: https://phab.enlightenment.org/D902 --- src/bindings/eina_cxx/eina_log.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/eina_cxx/eina_log.hh b/src/bindings/eina_cxx/eina_log.hh index fe4e3bf..87bcdb1 100644 --- a/src/bindings/eina_cxx/eina_log.hh +++ b/src/bindings/eina_cxx/eina_log.hh @@ -80,7 +80,7 @@ inline void _log(std::stringstream const stream, int domain, ::Eina_Log_Level l } #define EINA_CXX_DOM_LOG(DOMAIN, LEVEL) \ -if( bool run = ::eina_log_domain_level_check((DOMAIN), LEVEL) ) \ +for( bool run = ::eina_log_domain_level_check((DOMAIN), LEVEL); run;) \ for(std::stringstream stream; run ; \ ::efl::eina::_log(std::move(stream), (DOMAIN), LEVEL \ , __FILE__, __FUNCTION__, __LINE__), run = false) \ --
[EGIT] [core/efl] master 01/01: C++11 explicit conversion from accessor to bollean
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b5718761b9b91f1cd5817bbce9591d7aa75be12e commit b5718761b9b91f1cd5817bbce9591d7aa75be12e Author: Vitor Sousa vitorsousa@vitorsousa-ws.(none) Date: Wed May 28 17:54:01 2014 +0900 C++11 explicit conversion from accessor to bollean Summary: Replaced the safe bool idiom by explicit conversion to bollean, in order to follow the improved conventions of the C++11. Reviewers: felipealmeida, cedric, woohyun, smohanty, raster Reviewed By: raster CC: savio, cedric Differential Revision: https://phab.enlightenment.org/D903 --- src/bindings/eina_cxx/eina_accessor.hh | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bindings/eina_cxx/eina_accessor.hh b/src/bindings/eina_cxx/eina_accessor.hh index b389b31..5798c9b 100644 --- a/src/bindings/eina_cxx/eina_accessor.hh +++ b/src/bindings/eina_cxx/eina_accessor.hh @@ -59,10 +59,7 @@ struct accessor { std::swap(_impl, other._impl); } -private: - typedef Eina_Accessor*(accessorT::*unspecified_bool_type)() const; -public: - operator unspecified_bool_type() const + explicit operator bool() const { return native_handle() ? accessorT::native_handle : 0 ; } --
[EGIT] [admin/devs] master 01/01: change info for probie herdsman
herdsman pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=96baa1c0ee5ff30eee76ad9e3d211e65e30eecaf commit 96baa1c0ee5ff30eee76ad9e3d211e65e30eecaf Author: Daniel Hirt daniel.h...@samsung.com Date: Wed May 28 12:02:34 2014 +0300 change info for probie herdsman --- probies/herdsman/info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probies/herdsman/info.txt b/probies/herdsman/info.txt index 9eb28de..5c4521c 100644 --- a/probies/herdsman/info.txt +++ b/probies/herdsman/info.txt @@ -1,5 +1,5 @@ Login:herdsman -IRC Nick: herdsman +IRC Nick: herdzy Name: Daniel Hirt Location: Herzliya, Israel E-Mail: daniel.h...@samsung.com --
[E-devel] Last 1.9.x branches release next Monday
Hello. Some more patches piled up in the 1.9 branches so there will be another release of it before I switch over to 1.10 maintenance. If you have anything that needs to be backported do it until Sunday. regards Stefan Schmidt -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) Date: Wed May 28 18:21:10 2014 +0900 Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode. Summary: 1|4 _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT returns EINA_FALSE for item no. 3, 2| which should return EINA_TRUE. Fixed this. 3| 1|4|7| _elm_gengrid_item_edge_check for ELM_FOCUS_RIGHT returns EINA_FALSE for item no.5, 2|5|which should return EINA_TRUE. Fixed this. 3|6| Test Plan: elementary_test -to gengrid2 Reviewers: seoz, eagleeye, SanghyeonLee, raster CC: seoz, raster Differential Revision: https://phab.enlightenment.org/D846 --- src/lib/elm_gengrid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 11b7254..37f8cd2 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -1947,7 +1947,7 @@ _elm_gengrid_item_edge_check(Elm_Object_Item *it, { row = cvh / sd-item_height; if (row = 0) row = 1; - if (tmp-position row) + if (tmp-position = row) return EINA_TRUE; } else if (sd-item_width 0) @@ -1974,13 +1974,13 @@ _elm_gengrid_item_edge_check(Elm_Object_Item *it, if (x == 0) { if ((tmp-position = (row * col)) - (tmp-position = (row *(col - 1 + (tmp-position (row *(col - 1 return EINA_TRUE; } else { if ((tmp-position = ((col * row) + x)) - (tmp-position = (col * row))) + (tmp-position ((col-1) * row) + x)) return EINA_TRUE; } } --
[EGIT] [core/efl] master 02/02: warning--
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cedfc6e49e295370f9922dc6963bdfcad3c9e2f6 commit cedfc6e49e295370f9922dc6963bdfcad3c9e2f6 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed May 28 18:26:51 2014 +0900 warning-- --- src/lib/evas/canvas/evas_3d_scene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c index a576eb4..7552acd 100644 --- a/src/lib/evas/canvas/evas_3d_scene.c +++ b/src/lib/evas/canvas/evas_3d_scene.c @@ -687,7 +687,7 @@ _evas_3d_scene_exist(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y, EOLIAN static Eina_List * _evas_3d_scene_pick_member_list_get(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y) { - const Eina_List *list = NULL; + Eina_List *list = NULL; Eina_List *picked_nodes = NULL, *l = NULL; void *node; Eina_Bool pick = EINA_FALSE; --
[EGIT] [core/efl] master 01/02: [Evas/evas_3d_scene] Propagate events.
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0bc5d3176abb89d12276b94f7517eeea5d12f251 commit 0bc5d3176abb89d12276b94f7517eeea5d12f251 Author: se.osadchy se.osad...@samsung.com Date: Wed May 28 18:24:58 2014 +0900 [Evas/evas_3d_scene] Propagate events. Summary: Add 3 new APIs function for full work of the picking nodes. Reviewers: Hermet, cedric, raster CC: cedric Differential Revision: https://phab.enlightenment.org/D889 --- src/lib/evas/canvas/evas_3d_scene.c | 137 ++- src/lib/evas/canvas/evas_3d_scene.eo | 28 +++ 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c index ef5e7c9..a576eb4 100644 --- a/src/lib/evas/canvas/evas_3d_scene.c +++ b/src/lib/evas/canvas/evas_3d_scene.c @@ -225,7 +225,12 @@ _position_get(Evas_Vec3 *out, const Evas_3D_Vertex_Buffer *pos0, const Evas_3D_V { if (pos1-data == NULL) { -float *ptr = (float *)((char *)pos0-data + pos0-stride * index); +float *ptr; + +if (pos0-stride != 0.0) + ptr = (float *)((char *)pos0-data + pos0-stride * index); +else + ptr = (float *)((char *)pos0-data + (3 * sizeof(float)) * index); out-x = ptr[0]; out-y = ptr[1]; @@ -235,8 +240,15 @@ _position_get(Evas_Vec3 *out, const Evas_3D_Vertex_Buffer *pos0, const Evas_3D_V { float *ptr0, *ptr1; -ptr0 = (float *)((char *)pos0-data + pos0-stride * index); -ptr1 = (float *)((char *)pos1-data + pos1-stride * index); +if (pos0-stride != 0.0) + ptr0 = (float *)((char *)pos0-data + pos0-stride * index); +else + ptr0 = (float *)((char *)pos0-data + (3 * sizeof(float)) * index); + +if (pos1-stride != 0.0) + ptr1 = (float *)((char *)pos1-data + pos1-stride * index); +else + ptr1 = (float *)((char *)pos1-data + (3 * sizeof(float)) * index); out-x = ptr0[0] * weight + ptr1[0] * (1.0 - weight); out-y = ptr0[1] * weight + ptr1[1] * (1.0 - weight); @@ -498,6 +510,64 @@ _pick_data_mesh_add(Evas_3D_Pick_Data *data, const Evas_Ray3 *ray, } } } + else if (pdmesh-index_count == 0.0 pdmesh-vertex_count != 0) + { +if (pdmesh-assembly == EVAS_3D_VERTEX_ASSEMBLY_TRIANGLES) + { + for (i = 0; i pdmesh-vertex_count; i += 3) + { + _position_get(tri.p0, pos0, pos1, pos_weight, i); + _position_get(tri.p1, pos0, pos1, pos_weight, i + 1); + _position_get(tri.p2, pos0, pos1, pos_weight, i + 2); + + if (_pick_data_triangle_add(data, ray, tri)) +{ + _pick_data_texcoord_update(data, tex0, tex1, tex_weight, i, i + 1, i + 2); + data-mesh = mesh; + data-node = node; +} + } + } +else if (pdmesh-assembly == EVAS_3D_VERTEX_ASSEMBLY_TRIANGLE_STRIP) + { + _position_get(tri.p1, pos0, pos1, pos_weight, 0); + _position_get(tri.p2, pos0, pos1, pos_weight, 1); + + for (i = 0; i pdmesh-vertex_count - 2; i++) + { + tri.p0 = tri.p1; + tri.p1 = tri.p2; + + _position_get(tri.p2, pos0, pos1, pos_weight, i + 2); + + if (_pick_data_triangle_add(data, ray, tri)) +{ + _pick_data_texcoord_update(data, tex0, tex1, tex_weight, i, i + 1, i + 2); + data-mesh = mesh; + data-node = node; +} + } + } +else if (pdmesh-assembly == EVAS_3D_VERTEX_ASSEMBLY_TRIANGLE_FAN) + { + _position_get(tri.p0, pos0, pos1, pos_weight, 0); + _position_get(tri.p2, pos0, pos1, pos_weight, 1); + + for (i = 1; i pdmesh-vertex_count - 1; i++) + { + tri.p1 = tri.p2; + + _position_get(tri.p2, pos0, pos1, pos_weight, i + 1); + + if (_pick_data_triangle_add(data, ray, tri)) +{ + _pick_data_texcoord_update(data, tex0, tex1, tex_weight, 0, i, i + 1); + data-mesh = mesh; + data-node = node; +} + } + } + } } Eina_Bool @@ -579,4 +649,65 @@ _evas_3d_scene_pick(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y, return EINA_TRUE; } +EOLIAN static Evas_3D_Node * +_evas_3d_scene_exist(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_3D_Node *node) +{ + Evas_3D_Pick_Data data; + Evas_3D_Node_Data *pd_camera_node; + Evas_3D_Camera_Data *pd_camera; + + data.x =
[EGIT] [core/enlightenment] master 01/01: e scale dialog - set elm scale too to the same
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e811fcd1493d3efb108f872170d1723a2c0aeb9c commit e811fcd1493d3efb108f872170d1723a2c0aeb9c Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed May 28 18:40:29 2014 +0900 e scale dialog - set elm scale too to the same --- src/bin/e_scale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c index bdcc38d..675200b 100644 --- a/src/bin/e_scale.c +++ b/src/bin/e_scale.c @@ -41,7 +41,8 @@ e_scale_update(void) else if (e_scale e_config-scale.min) e_scale = e_config-scale.min; } - + elm_config_scale_set(e_scale); + elm_config_all_flush(); edje_scale_set(e_scale); snprintf(buf, sizeof(buf), %1.3f, e_scale); e_util_env_set(E_SCALE, buf); --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
Hello. On Wed, 2014-05-28 at 02:23, efl wrote: http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) What the heck? Please setup your git with a real name and email when submitting patches. regards Stefan Schmidt -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
And reviewers, please keep an eye for those kind of things... On 28/05/14 11:02, Stefan Schmidt wrote: Hello. On Wed, 2014-05-28 at 02:23, efl wrote: http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) What the heck? Please setup your git with a real name and email when submitting patches. regards Stefan Schmidt -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [admin/devs] master 01/01: Revert change info for probie herdsman
herdsman pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=34e3a1ec58572f0c25d9f71d76ae14900b414f49 commit 34e3a1ec58572f0c25d9f71d76ae14900b414f49 Author: Daniel Hirt daniel.h...@samsung.com Date: Wed May 28 13:23:38 2014 +0300 Revert change info for probie herdsman This reverts commit 96baa1c0ee5ff30eee76ad9e3d211e65e30eecaf. --- probies/herdsman/info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probies/herdsman/info.txt b/probies/herdsman/info.txt index 5c4521c..9eb28de 100644 --- a/probies/herdsman/info.txt +++ b/probies/herdsman/info.txt @@ -1,5 +1,5 @@ Login:herdsman -IRC Nick: herdzy +IRC Nick: herdsman Name: Daniel Hirt Location: Herzliya, Israel E-Mail: daniel.h...@samsung.com --
[EGIT] [core/efl] master 03/04: Eo legacy events: Add legacy events tests.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=75b56c75898ca527a013d275c950a21b173dd1f8 commit 75b56c75898ca527a013d275c950a21b173dd1f8 Author: Tom Hacohen t...@stosb.com Date: Tue May 20 15:31:53 2014 +0100 Eo legacy events: Add legacy events tests. These tests test mixing legacy events with eo events. --- src/tests/eo/suite/eo_test_general.c | 34 +++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 6547218..f1ff3f2 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -38,15 +38,15 @@ START_TEST(eo_stack) } END_TEST -static int _eo_signals_cb_curent = 0; +static int _eo_signals_cb_current = 0; static int _eo_signals_cb_flag = 0; static Eina_Bool _eo_signals_a_changed_cb(void *_data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { int data = (intptr_t) _data; - _eo_signals_cb_curent++; - ck_assert_int_eq(data, _eo_signals_cb_curent); + _eo_signals_cb_current++; + ck_assert_int_eq(data, _eo_signals_cb_current); _eo_signals_cb_flag |= 0x1; return EO_CALLBACK_CONTINUE; } @@ -115,6 +115,34 @@ START_TEST(eo_signals) eo_unref(obj); + obj = eo_add(SIMPLE_CLASS, NULL); + /* Legacy support signals. */ + { +const Eo_Event_Description *a_desc = eo_base_legacy_only_event_description_get(a,changed); +fail_if(!a_desc); +ck_assert_str_eq(a_desc-name, a,changed); +fail_if(a_desc == EV_A_CHANGED); + +const Eo_Event_Description *bad_desc = eo_base_legacy_only_event_description_get(bad); +fail_if(!bad_desc); +ck_assert_str_eq(bad_desc-name, bad); + +/* Call Eo event with legacy and non-legacy callbacks. */ +_eo_signals_cb_current = 0; +eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, -100, _eo_signals_a_changed_cb, (void *) 1)); +eo_do(obj, eo_event_callback_add(a_desc, _eo_signals_a_changed_cb2, NULL)); +eo_do(obj, simple_a_set(1)); +ck_assert_int_eq(_eo_signals_cb_flag, 0x3); + +/* Call legacy event with legacy and non-legacy callbacks. */ +int a = 3; +_eo_signals_cb_current = 0; +_eo_signals_cb_flag = 0; +eo_do(obj, eo_event_callback_call(a_desc, a)); +ck_assert_int_eq(_eo_signals_cb_flag, 0x3); + } + eo_unref(obj); + eo_shutdown(); } END_TEST --
[EGIT] [core/efl] master 01/04: Eo/evas events: Move legacy events dynamic generator to eo.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c58b3401c3e7feeca74007297c41a880d0c6abe9 commit c58b3401c3e7feeca74007297c41a880d0c6abe9 Author: Tom Hacohen t...@stosb.com Date: Mon May 19 15:17:08 2014 +0100 Eo/evas events: Move legacy events dynamic generator to eo. --- src/lib/eo/Eo.h | 6 + src/lib/eo/eo_base_class.c | 43 +++-- src/lib/evas/canvas/common_interfaces.c | 34 -- src/lib/evas/canvas/evas_object_smart.c | 38 ++--- src/lib/evas/include/evas_private.h | 7 -- 5 files changed, 60 insertions(+), 68 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 26039b8..2a4d5d2 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -1109,6 +1109,12 @@ EAPI void eo_destructor(void); */ /** + * Don't use. + * @internal + */ +EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const char *_event_name); + +/** * @def EO_CALLBACK_PRIORITY_BEFORE * Slightly more prioritized than default. */ diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index f8eb1ff..c5c6ab6 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -409,6 +409,39 @@ _wref_destruct(Private_Data *pd) /* Callbacks */ +/* XXX: Legacy support, remove when legacy is dead. */ +static Eina_Hash *_legacy_events_hash = NULL; +static const char *_legacy_event_desc = Dynamically generated legacy event; + +EAPI const Eo_Event_Description * +eo_base_legacy_only_event_description_get(const char *_event_name) +{ + Eina_Stringshare *event_name = eina_stringshare_add(_event_name); + Eo_Event_Description *event_desc = eina_hash_find(_legacy_events_hash, event_name); + if (!event_desc) + { +event_desc = calloc(1, sizeof(Eo_Event_Description)); +event_desc-name = event_name; +event_desc-doc = _legacy_event_desc; + } + else + { +eina_stringshare_del(event_name); + } + + return event_desc; +} + +static void +_legacy_events_hash_free_cb(void *_desc) +{ + Eo_Event_Description *desc = _desc; + eina_stringshare_del(desc-name); + free(desc); +} + +/* EOF Legacy */ + struct _Eo_Callback_Description { Eo_Callback_Description *next; @@ -910,7 +943,6 @@ EAPI const Eina_Value_Type *EO_DBG_INFO_TYPE = _EO_DBG_INFO_TYPE; /* EOF event callbacks */ - /* EO_CLASS stuff */ #define MY_CLASS EO_CLASS @@ -953,6 +985,13 @@ static void _class_constructor(Eo_Class *klass EINA_UNUSED) { event_freeze_count = 0; + _legacy_events_hash = eina_hash_stringshared_new(_legacy_events_hash_free_cb); +} + +static void +_class_destructor(Eo_Class *klass EINA_UNUSED) +{ + eina_hash_free(_legacy_events_hash); } static Eo_Op_Description op_descs [] = { @@ -999,7 +1038,7 @@ static const Eo_Class_Description class_desc = { event_desc, sizeof(Private_Data), _class_constructor, - NULL + _class_destructor }; EO_DEFINE_CLASS(eo_base_class_get, class_desc, NULL, NULL) diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c index 21af58b..ea9c8e1 100644 --- a/src/lib/evas/canvas/common_interfaces.c +++ b/src/lib/evas/canvas/common_interfaces.c @@ -1,54 +1,20 @@ #include evas_common_private.h #include evas_private.h -Eina_Hash* signals_hash_table = NULL; - static const Eo_Event_Description *_evas_clickable_interface_event_desc[]; static const Eo_Event_Description *_evas_draggable_interface_event_desc[]; static const Eo_Event_Description *_evas_scrollable_interface_event_desc[]; static const Eo_Event_Description *_evas_selectable_interface_event_desc[]; static const Eo_Event_Description *_evas_zoomable_interface_event_desc[]; -#define ADD_SIGNAL(name, event) eina_hash_add(signals_hash_table, name, event) -#define ADD_INTERFACE_SIGNALS(events_desc) \ - do \ - { \ - int i = 0; \ - while (events_desc[i]) { \ - _Evas_Event_Description *desc = calloc(1, sizeof(*desc)); \ - desc-eo_desc = (Eo_Event_Description *)events_desc[i]; \ - desc-is_desc_allocated = EINA_FALSE; \ - ADD_SIGNAL(events_desc[i]-name, desc); \ - i++; \ - } \ - } \ - while (0); - -static void -_signal_interface_del(void *data) -{ - _Evas_Event_Description *desc = data; - if (desc-is_desc_allocated) free(desc-eo_desc); - free(desc); -} - static void _evas_signal_interface_class_constructor(Eo_Class *klass EINA_UNUSED) { - signals_hash_table = eina_hash_string_superfast_new(_signal_interface_del); - ADD_INTERFACE_SIGNALS(_evas_clickable_interface_event_desc); - ADD_INTERFACE_SIGNALS(_evas_scrollable_interface_event_desc); - ADD_INTERFACE_SIGNALS(_evas_zoomable_interface_event_desc); - ADD_INTERFACE_SIGNALS(_evas_selectable_interface_event_desc); -
[EGIT] [core/efl] master 02/04: Eo: Support mixing legacy and non-legacy callbacks.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=50a6e371a1d284b96106ce5fbfeaaaeae8605eb5 commit 50a6e371a1d284b96106ce5fbfeaaaeae8605eb5 Author: Tom Hacohen t...@stosb.com Date: Mon May 19 15:28:49 2014 +0100 Eo: Support mixing legacy and non-legacy callbacks. --- src/lib/eo/eo_base_class.c | 29 +++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index c5c6ab6..8760b73 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -670,6 +670,31 @@ EAPI EO_VOID_FUNC_BODYV(eo_event_callback_array_del, const void *user_data); static Eina_Bool +_cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b) +{ + if (!a) + return EINA_FALSE; + + /* If either is legacy, fallback to string comparison. */ + if ((a-doc == _legacy_event_desc) || (b-doc == _legacy_event_desc)) + { +/* Take stringshare shortcut if both are legacy */ +if (a-doc == b-doc) + { + return (a-name == b-name); + } +else + { + return !strcmp(a-name, b-name); + } + } + else + { +return (a == b); + } +} + +static Eina_Bool _ev_cb_call(Eo *obj_id, void *class_data, const Eo_Event_Description *desc, void *event_info) @@ -695,7 +720,7 @@ _ev_cb_call(Eo *obj_id, void *class_data, for (it = cb-items.item_array; it-func; it++) { - if (it-desc != desc) + if (!_cb_desc_match(it-desc, desc)) continue; if (!it-desc-unfreezable (event_freeze_count || pd-event_freeze_count)) @@ -712,7 +737,7 @@ _ev_cb_call(Eo *obj_id, void *class_data, } else { - if (cb-items.item.desc != desc) + if (!_cb_desc_match(cb-items.item.desc, desc)) continue; if ((!cb-items.item.desc || !cb-items.item.desc-unfreezable) --
[EGIT] [core/efl] master 04/04: Eo/evas events: Fix support of mixing legacy smart events and eo events.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6732ea64a9717aec8e14462a354e0bb5614fdcbd commit 6732ea64a9717aec8e14462a354e0bb5614fdcbd Merge: cedfc6e 75b56c7 Author: Tom Hacohen t...@stosb.com Date: Wed May 28 12:28:41 2014 +0100 Eo/evas events: Fix support of mixing legacy smart events and eo events. This merge removes the old hash table and a few other things that were wrong in the old way of doing things. This should also make things a bit faster with legacy callbacks. @fix (no backport, as it's too intrusive) src/lib/eo/Eo.h | 6 +++ src/lib/eo/eo_base_class.c | 72 +++-- src/lib/evas/canvas/common_interfaces.c | 34 src/lib/evas/canvas/evas_object_smart.c | 38 ++--- src/lib/evas/include/evas_private.h | 7 src/tests/eo/suite/eo_test_general.c| 34 ++-- 6 files changed, 118 insertions(+), 73 deletions(-) --
[EGIT] [core/emotion_generic_players] master 01/01: build: Add fake doc target
stefan pushed a commit to branch master. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=2cfb036ef234d6a22c1e8b888f5425deb6778a67 commit 2cfb036ef234d6a22c1e8b888f5425deb6778a67 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed May 28 21:13:34 2014 +0200 build: Add fake doc target Needed to have it run on the nightly jenkins builds. --- Makefile.am | 5 + 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0355026..ec4045b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,3 +50,8 @@ src_vlc_vlc_SOURCES = src/vlc/emotion_generic_vlc.c src_vlc_vlc_CPPFLAGS = @VLC_CFLAGS@ src_vlc_vlc_LDADD = @VLC_LIBS@ endif + +.PHONY: doc + +doc: + @echo Empty doc target until we have real documentation. --
[EGIT] [core/evas_generic_loaders] master 01/01: build: Add fake doc target
stefan pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=81224b46b4887c8fd60510fa2ddaaab385cfacbb commit 81224b46b4887c8fd60510fa2ddaaab385cfacbb Author: Stefan Schmidt s.schm...@samsung.com Date: Wed May 28 21:48:52 2014 +0200 build: Add fake doc target Needed to have it run on the nightly jenkins builds. --- Makefile.am | 5 + 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am index d4ce0b7..9203d09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,3 +30,8 @@ autogen.sh \ m4/ac_attribute.m4 \ m4/ac_path_generic.m4 \ README + +.PHONY: doc + +doc: + @echo Empty doc target until we have real documentation. --
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina-tiler:add union, subtract, intersection, equal apis for tilers
Yay !! :) I'll make some changes locally here (wrt the new wayland compositor) and using eina_tiler. Assuming all goes well, I'll put those in my dev branch when ready. Cheers, devilhorns On 28/05/14 03:50, MinJeong Kim wrote: raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=61cecf1f3f68f5850c58c3abdb4a37a1c158cc10 commit 61cecf1f3f68f5850c58c3abdb4a37a1c158cc10 Author: MinJeong Kim minjjj@samsung.com Date: Wed May 28 16:34:05 2014 +0900 eina-tiler:add union, subtract, intersection, equal apis for tilers Summary: Support union, subtract, intersection, equal(comparison) between tilers. @feature Test Plan: Test with added test case(src/tests/eina/eina_test_tiler.c) and the example(src/examples/eina/eina_tiler_02.c) Reviewers: gwanglim, devilhorns, raster, zmike, cedric CC: cedric Differential Revision: https://phab.enlightenment.org/D880 --- src/examples/eina/eina_tiler_02.c | 354 ++ src/lib/eina/eina_tiler.c | 206 ++ src/lib/eina/eina_tiler.h | 49 ++ src/tests/eina/eina_test_tiler.c | 107 4 files changed, 716 insertions(+) diff --git a/src/examples/eina/eina_tiler_02.c b/src/examples/eina/eina_tiler_02.c new file mode 100644 index 000..2e80aaa --- /dev/null +++ b/src/examples/eina/eina_tiler_02.c @@ -0,0 +1,354 @@ +//Compile with: +//gcc eina_tiler_02.c -o eina_tiler_02 `pkg-config --cflags --libs ecore-evas ecore evas eina` + +#include Ecore_Evas.h +#include Ecore.h +#include Evas.h +#include Eina.h + +#define WIN_W(810) +#define WIN_H(280) + +#define TILER1_X (30) +#define TILER1_Y (30) +#define TILER2_X (530) +#define TILER2_Y (30) +#define TILER_W (250) +#define TILER_H (250) +#define RESULT_X (280) +#define RESULT_Y (30) + +static Eina_Tiler *tiler1, *tiler2; +static Eina_List *t1_objs, *t2_objs, *tiler_objs; +static Evas *evas; +static Evas_Object *bg; + +static unsigned int cur_method; +typedef enum { + METHOD_UNION = 0, + METHOD_SUBTRACT, + METHOD_INTERSECTION, +}Current_Method; + +static unsigned int rect_idx =0, rect_count = 4; +static const Eina_Rectangle + rects[4][2][2] = { + {{{40, 0, 80, 250}}, +{{0, 150, 250, 70}, {0, 20, 250, 70}}}, + +{{{20, 20, 65, 150}, {135, 80, 65, 150}}, + {{20, 80, 65, 150}, {135, 20, 65, 150}}}, + +{{{20, 20, 210, 210}}, + {{80, 80, 90, 90}}}, + +{{{0, 0, 150, 90}, {180, 180, 70, 70}}, + {{70, 70, 120, 120}}} +}; + +static const char* + Methods[3] = { + UNION 1+2, + SUBTRACT 1-2, + INTERSECTION 12 +}; + +static unsigned int tile_idx =0, tile_count = 5; +static const unsigned int + tilesize[5] = { +32, +16, +8, +4, +1 +}; + +static const char commands[] = \ + commands are:\n + \tn - next arrangement \n + \tu - get union\n + \ts - get subtract\n + \ti - get intersection\n + \tt - chage tile size ([32], 16, 8, 4) \n + \tEsc - Exit\n; + + +static Evas_Object * +add_text(const char *text, int x, int y, int w) +{ + Evas_Object *o = evas_object_text_add(evas); + evas_object_color_set(o, 0, 0, 0, 255); + evas_object_move(o, x, y); + evas_object_text_font_set(o, Sans, 20); + evas_object_text_text_set(o, text); + evas_object_show(o); + + return o; +} + +void tiler_calc() +{ + Eina_Tiler *tiler; + Eina_Iterator *itr; + Evas_Object *o; + Eina_Rectangle *rect; + int i = 0; + + /* clear evas rectangles */ + if (tiler_objs) + { +EINA_LIST_FREE(tiler_objs, o) + { + evas_object_hide(o); + evas_object_del(o); + } + } + + tiler = eina_tiler_new(TILER_W, TILER_H); + eina_tiler_tile_size_set(tiler, tilesize[tile_idx], tilesize[tile_idx]); + + /* calculate with tiler1 and tiler2 */ + switch(cur_method) + { + case METHOD_UNION: + eina_tiler_union(tiler, tiler1); + eina_tiler_union(tiler, tiler2); + break; + case METHOD_SUBTRACT: + eina_tiler_union(tiler, tiler1); + eina_tiler_subtract(tiler, tiler2); + break; + case METHOD_INTERSECTION: + tiler = eina_tiler_intersection(tiler1, tiler2); + break; + } + + if (tiler) + { +/* draw rects of result tiler */ +itr = eina_tiler_iterator_new(tiler); +EINA_ITERATOR_FOREACH(itr, rect) + { + fprintf(stdout, Result Rect [%d] (%d, %d) (%d x %d)\n, i++, rect-x, rect-y, rect-w, rect-h); + + o = evas_object_rectangle_add(evas); + evas_object_color_set(o, 0, 255, 0, 255); + evas_object_resize(o, rect-w, rect-h); + evas_object_move(o, RESULT_X + rect-x, RESULT_Y + rect-y); +
[EGIT] [bindings/python/python-efl] master 02/02: Elementary: Add an example for sys_notify
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=9ba009c46ad797eee1a78e698bbcb41ab5528296 commit 9ba009c46ad797eee1a78e698bbcb41ab5528296 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu May 29 01:39:09 2014 +0300 Elementary: Add an example for sys_notify --- examples/elementary/test.py| 3 ++ examples/elementary/test_sys_notify.py | 92 ++ 2 files changed, 95 insertions(+) diff --git a/examples/elementary/test.py b/examples/elementary/test.py index 30e3df6..462885f 100755 --- a/examples/elementary/test.py +++ b/examples/elementary/test.py @@ -202,6 +202,9 @@ items = [ (Stored Surface Buffer, [ (Launcher, test_mapbuf, mapbuf_clicked), ]), + (System, [ +(Notification, test_sys_notify, sys_notify_clicked), +]), (Text, [ (Label, test_label, label_clicked), ]), diff --git a/examples/elementary/test_sys_notify.py b/examples/elementary/test_sys_notify.py new file mode 100644 index 000..f0a0812 --- /dev/null +++ b/examples/elementary/test_sys_notify.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python +# encoding: utf-8 + +from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL +from efl import elementary +from efl.elementary.window import StandardWindow +from efl.elementary.box import Box +from efl.elementary.button import Button +from efl.elementary.notify import Notify +from efl.elementary.label import Label +from efl.elementary.entry import Entry, utf8_to_markup +from efl.elementary.need import need_sys_notify +from efl.elementary.general import on_sys_notify_action_invoked, \ +on_sys_notify_notification_closed, sys_notify_send +from efl.ecore import ECORE_CALLBACK_DONE + +EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND +EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0 +FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL +FILL_HORIZ = EVAS_HINT_FILL, 0.5 + + +def _ev_handler(event, l, n): +print(event) +l.text = utf8_to_markup(str(event)) +n.show() + +return ECORE_CALLBACK_DONE + + +def _bt_clicked(obj, s, b): +sys_notify_send(icon=, summary=s.entry, body=b.entry) + + +def sys_notify_clicked(obj): + +if not need_sys_notify(): +raise SystemExit(Sys notify not available) + +win = StandardWindow( +sys_notify, Sys notify test, autodel=True, size=(320, 160) +) +if obj is None: +win.callback_delete_request_add(lambda o: elementary.exit()) + +bx = Box(win, size_hint_weight=EXPAND_BOTH) +win.resize_object_add(bx) +bx.show() + +l = Label(win) +l.show() + +n = Notify( +win, size_hint_weight=EXPAND_BOTH, align=(0.5, 0.0), timeout=2.0, +content=l +) + +on_sys_notify_action_invoked(_ev_handler, l, n) +on_sys_notify_notification_closed(_ev_handler, l, n) + +bx = Box(win, size_hint_weight=EXPAND_BOTH) +win.resize_object_add(bx) +bx.show() + +s = Entry( +win, single_line=True, scrollable=True, entry=Summary, +size_hint_align=FILL_BOTH +) +bx.pack_end(s) +s.show() + +b = Entry( +win, single_line=True, scrollable=True, entry=Body long description., +size_hint_align=FILL_BOTH +) +bx.pack_end(b) +b.show() + +it = Button(win, text=Send Notification) +it.callback_clicked_add(_bt_clicked, s, b) +bx.pack_end(it) +it.show() + +win.show() + +if __name__ == __main__: +elementary.init() + +sys_notify_clicked(None) + +elementary.run() +elementary.shutdown() --
[EGIT] [bindings/python/python-efl] master 01/02: Ecore: Add missing event return value constants
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=045f45bfb7226c632045f67ac9f22e9212d9aeb9 commit 045f45bfb7226c632045f67ac9f22e9212d9aeb9 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu May 29 01:27:19 2014 +0300 Ecore: Add missing event return value constants --- efl/ecore/__init__.pyx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/efl/ecore/__init__.pyx b/efl/ecore/__init__.pyx index 45fa24b..dd7345c 100644 --- a/efl/ecore/__init__.pyx +++ b/efl/ecore/__init__.pyx @@ -223,6 +223,9 @@ cimport efl.ecore.enums as enums ECORE_CALLBACK_CANCEL = enums.ECORE_CALLBACK_CANCEL ECORE_CALLBACK_RENEW = enums.ECORE_CALLBACK_RENEW +ECORE_CALLBACK_PASS_ON = enums.ECORE_CALLBACK_PASS_ON +ECORE_CALLBACK_DONE = enums.ECORE_CALLBACK_DONE + # Ecore_Fd_Handler_Flags: ECORE_FD_READ = enums.ECORE_FD_READ ECORE_FD_WRITE = enums.ECORE_FD_WRITE --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
On Wed, 28 May 2014 12:02:10 +0200 Stefan Schmidt ste...@datenfreihafen.org said: Hello. On Wed, 2014-05-28 at 02:23, efl wrote: http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) What the heck? Please setup your git with a real name and email when submitting patches. oh god. i didnt see that - he has a username in phab, so i didnt look at the commit author details. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 02/02: Bump versions and compile changelog for release
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=0c258e323b936fa13dbafd7bc1514dccb2f0333a commit 0c258e323b936fa13dbafd7bc1514dccb2f0333a Author: Kai Huuhko kai.huu...@gmail.com Date: Thu May 29 02:25:45 2014 +0300 Bump versions and compile changelog for release --- README.rst | 2 +- changes.html | 202 +-- setup.py | 6 +- 3 files changed, 201 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index d506217..291db82 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ - -PYTHON-EFL 1.9.99 +PYTHON-EFL 1.10.0 - EFL is a collection of libraries for handling many common tasks a diff --git a/changes.html b/changes.html index 60a9253..5d03630 100644 --- a/changes.html +++ b/changes.html @@ -74,7 +74,202 @@ i { div class=document div class=body - h1Automatically generated list of changes in version 1.9/h1 +h1Automatically generated list of changes/h1 +ul +lia href=#1.10bversion 1.10/b/a/li +lia href=#1.9bversion 1.9/b/a/li +lia href=#1.8bversion 1.8/b/a/li +/ul + + +a name=1.10h2Automatically generated list of changes in version 1.10/h2/a + +h4efl.elementary.configuration/h4 + +ul +libConfiguration.accel_preference/b: iadded:/i New in version 1.10./li + +libConfiguration.atspi_mode/b: iadded:/i New in version 1.10./li + +libConfiguration.audio_mute_get/b: iadded:/i New in version 1.10./li + +libConfiguration.audio_mute_set/b: iadded:/i New in version 1.10./li + +libConfiguration.color_classes_list/b: iadded:/i New in version 1.10./li + +libConfiguration.color_overlay_apply/b: iadded:/i New in version 1.10./li + +libConfiguration.color_overlay_list/b: iadded:/i New in version 1.10./li + +libConfiguration.color_overlay_set/b: iadded:/i New in version 1.10./li + +libConfiguration.color_overlay_unset/b: iadded:/i New in version 1.10./li + +libConfiguration.focus_autoscroll_mode/b: iadded:/i New in version 1.10./li + +libConfiguration.focus_highlight_clip_disabled/b: iadded:/i New in version 1.10./li + +libConfiguration.focus_move_policy/b: iadded:/i New in version 1.10./li + +libConfiguration.item_select_on_focus_disabled/b: iadded:/i New in version 1.10./li + +libConfiguration.magnifier_enabled/b: iadded:/i New in version 1.10./li + +libConfiguration.magnifier_scale/b: iadded:/i New in version 1.10./li +/ul + + +h4efl.elementary.datetime_elm/h4 + +ul +libDatetime.callback_languge_changed_add/b: ideprecated:/i Deprecated since version 1.10: Use callback_language_changed_add instead./li +/ul + + +h4efl.elementary.entry/h4 + +ul +libELM_INPUT_PANEL_LAYOUT_DATETIME/b: iadded:/i New in version 1.10./li + +libELM_INPUT_PANEL_LAYOUT_EMOTICON/b: iadded:/i New in version 1.10./li + +libELM_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN/b: iadded:/i New in version 1.10./li +/ul + + +h4efl.elementary.general/h4 + +ul +libELM_SYS_NOTIFY_CLOSED_EXPIRED/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_CLOSED_DISMISSED/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_CLOSED_REQUESTED/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_CLOSED_UNDEFINED/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_URGENCY_LOW/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_URGENCY_NORMAL/b: iadded:/i New in version 1.10./li + +libELM_SYS_NOTIFY_URGENCY_CRITICAL/b: iadded:/i New in version 1.10./li + +libsys_notify_close/b: iadded:/i New in version 1.10./li + +libsys_notify_send/b: iadded:/i New in version 1.10./li +/ul + + +h4efl.elementary.gengrid/h4 + +ul +libELM_OBJECT_MULTI_SELECT_MODE_DEFAULT/b: iadded:/i New in version 1.10./li + +libELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL/b: iadded:/i New in version 1.10./li + +libELM_OBJECT_MULTI_SELECT_MODE_MAX/b: iadded:/i New in version 1.10./li + +libGengrid.callback_item_focused_add/b: iadded:/i New in version 1.10./li + +libGengrid.callback_item_reorder_anim_start_add/b: iadded:/i New in version 1.10./li + +libGengrid.callback_item_reorder_anim_stop_add/b: iadded:/i New in version 1.10./li + +libGengrid.callback_item_unfocused_add/b: iadded:/i New in version 1.10./li + +libGengrid.multi_select_mode/b: iadded:/i New in version 1.10./li + +libGengrid.page_relative/b: iadded:/i New in version 1.10./li + +libGengrid.page_size/b: iadded:/i New in version 1.10./li + +libGengrid.reorder_mode_start/b: iadded:/i New in version 1.10./li + +libGengrid.reorder_mode_stop/b: iadded:/i New in version 1.10./li + +libGengrid.wheel_disabled/b: iadded:/i New in version 1.10./li +/ul + + +h4efl.elementary.genlist/h4 + +ul +libGenlist.callback_item_focused_add/b: iadded:/i New in version 1.10./li + +libGenlist.callback_item_unfocused_add/b: iadded:/i New in version 1.10./li +/ul + + +h4efl.elementary.hoversel/h4 + +ul +libHoversel.callback_item_focused_add/b: iadded:/i New in version 1.10./li +
[EGIT] [bindings/python/python-efl] master 01/02: Elementary.general: Fix docs
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=be6bd076b24c4fd67d5e06c50be0bd4a5fddd234 commit be6bd076b24c4fd67d5e06c50be0bd4a5fddd234 Author: Kai Huuhko kai.huu...@gmail.com Date: Thu May 29 02:24:56 2014 +0300 Elementary.general: Fix docs --- efl/elementary/general.pyx | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/efl/elementary/general.pyx b/efl/elementary/general.pyx index 8f2e2aa..13d50e4 100644 --- a/efl/elementary/general.pyx +++ b/efl/elementary/general.pyx @@ -124,45 +124,58 @@ Notify close reasons The reason the notification was closed -.. versionadded:: 1.10 - .. data:: ELM_SYS_NOTIFY_CLOSED_EXPIRED The notification expired. +.. versionadded:: 1.10 + .. data:: ELM_SYS_NOTIFY_CLOSED_DISMISSED The notification was dismissed by the user. +.. versionadded:: 1.10 + .. data:: ELM_SYS_NOTIFY_CLOSED_REQUESTED The notification was closed by a call to CloseNotification method. +.. versionadded:: 1.10 + .. data:: ELM_SYS_NOTIFY_CLOSED_UNDEFINED Undefined/reserved reasons. +.. versionadded:: 1.10 + .. _Elm_Sys_Notify_Urgency: +Notify urgency levels +- + Urgency levels of a notification :see: :py:func:`sys_notify_send` -.. versionadded:: 1.10 - .. data:: ELM_SYS_NOTIFY_URGENCY_LOW Low +.. versionadded:: 1.10 + .. data:: ELM_SYS_NOTIFY_URGENCY_NORMAL Normal +.. versionadded:: 1.10 + .. data:: ELM_SYS_NOTIFY_URGENCY_CRITICAL Critical +.. versionadded:: 1.10 + --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
Oh, so it was you (didn't bother looking)! Better luck next time. :) On Wed, May 28, 2014 at 11:56 PM, Carsten Haitzler ras...@rasterman.comwrote: On Wed, 28 May 2014 12:02:10 +0200 Stefan Schmidt ste...@datenfreihafen.org said: Hello. On Wed, 2014-05-28 at 02:23, efl wrote: http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) What the heck? Please setup your git with a real name and email when submitting patches. oh god. i didnt see that - he has a username in phab, so i didnt look at the commit author details. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/forecasts] master 01/01: compilation fixes for forecasts module to match compositor rewrite / charlie-foxtrot situation
raster pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=db9cb7693228efda3eeb4c79fd442666cbd03e5a commit db9cb7693228efda3eeb4c79fd442666cbd03e5a Author: teacup-on-rockingchair strandj...@gmail.com Date: Thu May 29 10:57:33 2014 +0900 compilation fixes for forecasts module to match compositor rewrite / charlie-foxtrot situation Summary: Made forecasts module to compile with latest enlightenment infrastructure Test Plan: verified module runs ok and also can be configured from the context menus etc Differential Revision: https://phab.enlightenment.org/D757 --- src/e_mod_config.c | 6 +++--- src/e_mod_main.c | 8 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/e_mod_config.c b/src/e_mod_config.c index f3d2865..fc954c3 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -24,7 +24,7 @@ _config_forecasts_module(Config_Item *ci) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - E_Container *con; + E_Comp *comp; char buf[4096]; v = E_NEW(E_Config_Dialog_View, 1); @@ -37,9 +37,9 @@ _config_forecasts_module(Config_Item *ci) snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(forecasts_config-module)); - con = e_container_current_get(e_manager_current_get()); + comp = e_util_comp_current_get(); cfd = - e_config_dialog_new(con, D_(Forecasts Settings), Forecasts, _e_modules_forecasts_config_dialog, buf, 0, v, ci); + e_config_dialog_new(comp, D_(Forecasts Settings), Forecasts, _e_modules_forecasts_config_dialog, buf, 0, v, ci); forecasts_config-config_dialog = cfd; } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index dd27405..0e7fcd9 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -1003,9 +1003,9 @@ _forecasts_popup_content_create(Instance *inst) if (!inst-location) return; - inst-popup = e_gadcon_popup_new(inst-gcc); + inst-popup = e_gadcon_popup_new(inst-gcc, E_COMP_OBJECT_TYPE_POPUP); - evas = inst-popup-win-evas; + evas = e_comp_get(inst-gcc)-evas; o = e_widget_list_add(evas, 0, 0); snprintf(buf, sizeof(buf), D_(%s: Current Conditions), inst-location); of = e_widget_frametable_add(evas, buf, 0); @@ -1014,7 +1014,7 @@ _forecasts_popup_content_create(Instance *inst) ob = e_widget_label_add(evas, buf); e_widget_frametable_object_append(of, ob, 0, row, 2, 1, 0, 0, 1, 0); - oi = _forecasts_popup_icon_create(inst-popup-win-evas, + oi = _forecasts_popup_icon_create(e_comp_get(inst-gcc)-evas, inst-condition.code); edje_object_size_max_get(oi, w, h); DEBUG(Icon size %dx%d, w, h); @@ -1097,7 +1097,7 @@ _forecasts_popup_content_create(Instance *inst) e_widget_frametable_object_append(of, ob, 1, row, 1, 1, 1, 0, 1, 0); ob = e_widget_image_add_from_object(evas, - _forecasts_popup_icon_create(inst-popup-win-evas, + _forecasts_popup_icon_create(e_comp_get(inst-gcc)-evas, inst-forecast[i].code), 0, 0); e_widget_frametable_object_append(of, ob, 2, row, 1, 2, 1, 1, 0, 0); --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: Gengrid: Fixed _elm_gengrid_item_edge_check for ELM_FOCUS_LEFT and ELM_FOCUS_RIGHT in horizontal mode.
On Thu, 29 May 2014 00:24:06 +0100 Tom Hacohen t...@stosb.com said: Oh, so it was you (didn't bother looking)! Better luck next time. :) i read the patch in phab and do a compile+run check. the rest i have scripted already. :) On Wed, May 28, 2014 at 11:56 PM, Carsten Haitzler ras...@rasterman.comwrote: On Wed, 28 May 2014 12:02:10 +0200 Stefan Schmidt ste...@datenfreihafen.org said: Hello. On Wed, 2014-05-28 at 02:23, efl wrote: http://git.enlightenment.org/core/elementary.git/commit/?id=c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c commit c0d93aa4bfbed577493a9ff4d7de3c6586d9bc2c Author: efl efl@efl.(none) What the heck? Please setup your git with a real name and email when submitting patches. oh god. i didnt see that - he has a username in phab, so i didnt look at the commit author details. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore-drm: convert compose string into utf8
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2d3ecfa20ca62c47cd2171e3be95a39b27905ec9 commit 2d3ecfa20ca62c47cd2171e3be95a39b27905ec9 Author: Moritz Bitsch moritzbit...@googlemail.com Date: Thu May 29 11:33:20 2014 +0900 ecore-drm: convert compose string into utf8 Summary: Key event string encoding was LATIN1 instead of UTF-8. This unifies the handling with the x backend. Reviewers: raster Reviewed By: raster CC: cedric Differential Revision: https://phab.enlightenment.org/D912 --- src/lib/ecore_drm/ecore_drm_evdev.c | 26 +++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index 6095e05..e5fb531 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c @@ -294,9 +294,11 @@ _device_notify_key(Ecore_Drm_Evdev *dev, struct input_event *event, unsigned int /* unsigned int *keycode; */ const xkb_keysym_t *syms; xkb_keysym_t sym = XKB_KEY_NoSymbol; - char key[256], keyname[256], compose[256]; + char key[256], keyname[256], compose_buffer[256]; Ecore_Event_Key *e; Ecore_Drm_Input *input; + char *tmp = NULL; + char *compose = NULL; if (!(input = dev-seat-input)) return; @@ -330,8 +332,24 @@ _device_notify_key(Ecore_Drm_Evdev *dev, struct input_event *event, unsigned int keyname[0] = tolower(keyname[0]); } - memset(compose, 0, sizeof(compose)); - _device_keysym_translate(sym, dev-xkb.modifiers, compose, sizeof(compose)); + memset(compose_buffer, 0, sizeof(compose_buffer)); + if (_device_keysym_translate(sym, dev-xkb.modifiers, compose_buffer, sizeof(compose_buffer))) + { +compose = eina_str_convert(ISO8859-1, UTF-8, + compose_buffer); +if (!compose) + { + ERR(Ecore_DRM cannot convert input key string '%s' to UTF-8. + Is Eina built with iconv support?, compose_buffer); + } +else + { + tmp = compose; + } + } + + if (!compose) + compose = compose_buffer; e = malloc(sizeof(Ecore_Event_Key) + strlen(key) + strlen(keyname) + ((compose[0] != '\0') ? strlen(compose) : 0) + 3); @@ -362,6 +380,8 @@ _device_notify_key(Ecore_Drm_Evdev *dev, struct input_event *event, unsigned int else ecore_event_add(ECORE_EVENT_KEY_UP, e, NULL, NULL); + if (tmp) + free(tmp); } static void --
[EGIT] [core/elementary] master 01/01: fileselector: Added focus cycle feature.
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1d38e0b97fee7ae2b3851766ab77d475e2e44284 commit 1d38e0b97fee7ae2b3851766ab77d475e2e44284 Author: Anil Kumar Nahak ak.na...@samsung.com Date: Thu May 29 11:35:46 2014 +0900 fileselector: Added focus cycle feature. Summary: Previously there was no focus_direction focus_next. These functions are added in filesector winset for currect focus movement inside the winset. Test Plan: elementary_test-fileselector Reviewers: raster, seoz, nirajkr, singh.amitesh Differential Revision: https://phab.enlightenment.org/D913 --- src/bin/test_fileselector.c | 1 + src/lib/elc_fileselector.c | 49 +++-- src/lib/elc_fileselector.eo | 2 ++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c index a410e92..b32cd87 100644 --- a/src/bin/test_fileselector.c +++ b/src/bin/test_fileselector.c @@ -529,6 +529,7 @@ test_fileselector(void *data EINA_UNUSED, win = elm_win_util_standard_add(fileselector, File Selector); elm_win_autodel_set(win, EINA_TRUE); + elm_win_focus_highlight_enabled_set(win, EINA_TRUE); box = elm_box_add(win); elm_box_horizontal_set(box, EINA_TRUE); diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c index 686369d..584e7b9 100644 --- a/src/lib/elc_fileselector.c +++ b/src/lib/elc_fileselector.c @@ -2152,13 +2152,58 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED EOLIAN static Eina_Bool _elm_fileselector_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd EINA_UNUSED) { - return EINA_FALSE; + return EINA_TRUE; +} + +EOLIAN static Eina_Bool +_elm_fileselector_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, Elm_Focus_Direction dir, Evas_Object **next) +{ + Eina_List *items = NULL; + + if (sd-up_button) items = eina_list_append(items, sd-up_button); + if (sd-home_button) items = eina_list_append(items, sd-home_button); + if (sd-files_view) items = eina_list_append(items, sd-files_view); + if (sd-path_entry) items = eina_list_append(items, sd-path_entry); + if (sd-name_entry) items = eina_list_append(items, sd-name_entry); + if (sd-cancel_button) items = eina_list_append(items, sd-cancel_button); + if (sd-ok_button) items = eina_list_append(items, sd-ok_button); + + if (_elm_config-access_mode) + return elm_widget_focus_list_next_get(obj, items, eina_list_data_get, dir, next); + + if (!elm_widget_focus_list_next_get(obj, items, eina_list_data_get, dir, next)) + *next = (Evas_Object *)obj; + + eina_list_free(items); + + return EINA_TRUE; } EOLIAN static Eina_Bool _elm_fileselector_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd EINA_UNUSED) { - return EINA_FALSE; + return EINA_TRUE; +} + +EOLIAN static Eina_Bool +_elm_fileselector_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, double *weight) +{ + Eina_List *items = NULL; + + if (sd-up_button) items = eina_list_append(items, sd-up_button); + if (sd-home_button) items = eina_list_append(items, sd-home_button); + if (sd-files_view) items = eina_list_append(items, sd-files_view); + if (sd-path_entry) items = eina_list_append(items, sd-path_entry); + if (sd-name_entry) items = eina_list_append(items, sd-name_entry); + if (sd-cancel_button) items = eina_list_append(items, sd-cancel_button); + if (sd-ok_button) items = eina_list_append(items, sd-ok_button); + + elm_widget_focus_list_direction_get + (obj, base, items, eina_list_data_get, degree, direction, weight); + + eina_list_free(items); + + return EINA_TRUE; } EOLIAN static Eina_Bool diff --git a/src/lib/elc_fileselector.eo b/src/lib/elc_fileselector.eo index 65878a3..656089e 100644 --- a/src/lib/elc_fileselector.eo +++ b/src/lib/elc_fileselector.eo @@ -39,7 +39,9 @@ class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector) Eo_Base::constructor; Evas_Smart::add; Evas_Smart::del; + Elm_Widget::focus_next; Elm_Widget::focus_direction_manager_is; + Elm_Widget::focus_direction; Elm_Widget::event; Elm_Widget::theme_apply; Elm_Widget::focus_next_manager_is; --
[EGIT] [core/enlightenment] master 01/01: fix screen move by action to work again
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=05d6225d7656abe643f7f792cd027743d2d3383f commit 05d6225d7656abe643f7f792cd027743d2d3383f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu May 29 14:08:09 2014 +0900 fix screen move by action to work again this fixes T1275 --- src/bin/e_actions.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 068bd65..283626e 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1308,14 +1308,15 @@ ACT_FN_GO(window_zone_move_by, ) move = eina_list_count(ec-zone-comp-zones) - 1; else if ((unsigned int)move = eina_list_count(ec-zone-comp-zones)) move = 0; - zone = eina_list_nth(ec-zone-comp-zones, move); - if ((!zone) || (zone-num != (unsigned int)move)) return; + zone = e_util_comp_zone_number_get(0, move); + if (!zone) return; max = ec-maximized; fs = ec-fullscreen_policy; fullscreen = ec-fullscreen; if (ec-maximized) e_client_unmaximize(ec, E_MAXIMIZE_BOTH); if (fullscreen) e_client_unfullscreen(ec); e_client_zone_set(ec, zone); +// e_client_desk_set(ec, e_desk_current_get(zone)); if (max) e_client_maximize(ec, max); if (fullscreen) e_client_fullscreen(ec, fs); evas_object_focus_set(ec-frame, 1); --
[EGIT] [core/efl] efl-1.10 01/01: Revert Evas: gif decoding bug fix
raster pushed a commit to branch efl-1.10. http://git.enlightenment.org/core/efl.git/commit/?id=0a345eea634fbf18dedc644bb199e30c8ec878c9 commit 0a345eea634fbf18dedc644bb199e30c8ec878c9 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu May 29 14:21:54 2014 +0900 Revert Evas: gif decoding bug fix This reverts commit 96f9353f4c951dd5dd41a687e272ffe1c28bb9ba. This breaks gif playing BDLY! --- src/modules/evas/loaders/gif/evas_image_load_gif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c index 29ead8e..3f6fbdb 100644 --- a/src/modules/evas/loaders/gif/evas_image_load_gif.c +++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c @@ -753,9 +753,9 @@ open_file: DGifGetCodeNext(gif, img); } } + imgnum++; // if we found the image we wanted - get out of here if (imgnum = index) break; - imgnum++; } } while (rec != TERMINATE_RECORD_TYPE); --
[EGIT] [core/efl] master 01/01: Revert Evas: gif decoding bug fix
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=20c350b9ef10c468e18605d93d50275780107910 commit 20c350b9ef10c468e18605d93d50275780107910 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu May 29 14:21:54 2014 +0900 Revert Evas: gif decoding bug fix This reverts commit 96f9353f4c951dd5dd41a687e272ffe1c28bb9ba. This breaks gif playing BDLY! --- src/modules/evas/loaders/gif/evas_image_load_gif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c index 29ead8e..3f6fbdb 100644 --- a/src/modules/evas/loaders/gif/evas_image_load_gif.c +++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c @@ -753,9 +753,9 @@ open_file: DGifGetCodeNext(gif, img); } } + imgnum++; // if we found the image we wanted - get out of here if (imgnum = index) break; - imgnum++; } } while (rec != TERMINATE_RECORD_TYPE); --
[EGIT] [core/enlightenment] master 01/01: use gstreamer1 emotion module now for video as its rather stable
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=069a1b169a7233aee28e5f5e396b0a24ed65f2b0 commit 069a1b169a7233aee28e5f5e396b0a24ed65f2b0 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu May 29 14:30:34 2014 +0900 use gstreamer1 emotion module now for video as its rather stable this also fixes T1290 --- src/bin/e_widget_filepreview.c | 2 +- src/modules/teamwork/e_mod_tw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c index 50e28e3..1863fad 100644 --- a/src/bin/e_widget_filepreview.c +++ b/src/bin/e_widget_filepreview.c @@ -333,7 +333,7 @@ _e_wid_fprev_preview_video_widgets(E_Widget_Data *wd) wd-o_preview_preview = e_widget_preview_add(evas, 4, 4); em = o = emotion_object_add(e_widget_preview_evas_get(wd-o_preview_preview)); - emotion_object_init(o, vlc); + emotion_object_init(o, gstreamer1); emotion_object_file_set(o, wd-path); emotion_object_play_set(o, EINA_TRUE); evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_BOTH, wd-w, wd-h); diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index 257ee5e..07bd467 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -905,7 +905,7 @@ tw_show_video(Evas_Object *prev, const char *uri) Evas_Object *o; o = emotion_object_add(e_livethumb_evas_get(prev)); - emotion_object_init(o, vlc); + emotion_object_init(o, gstreamer1); emotion_object_file_set(o, uri); emotion_object_play_set(o, EINA_TRUE); evas_object_smart_callback_add(o, frame_decode, tw_video_opened_cb, prev); --
[EGIT] [core/enlightenment] master 01/01: this should fix some remember shutdown problem where ec-zone is NULL
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a28bc668c0df6c45c2cb76d41f5d8b6210f1b35b commit a28bc668c0df6c45c2cb76d41f5d8b6210f1b35b Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu May 29 14:35:32 2014 +0900 this should fix some remember shutdown problem where ec-zone is NULL should fix T1272 --- src/bin/e_remember.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 162a1f6..54b01b3 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -389,6 +389,7 @@ _e_remember_event_free(void *d EINA_UNUSED, void *event) static void _e_remember_update(E_Client *ec, E_Remember *rem) { + if (!ec-zone) return; if (rem-apply E_REMEMBER_APPLY_POS || rem-apply E_REMEMBER_APPLY_SIZE) { --