[EGIT] [core/efl] master 01/01: configure: Bump version to 1.9.99 to indicate development cycle
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3f1c866b50151d1411edcb4b7c32b59e73da42c3 commit 3f1c866b50151d1411edcb4b7c32b59e73da42c3 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed Feb 26 09:25:44 2014 +0100 configure: Bump version to 1.9.99 to indicate development cycle 1.9 is released and the master branch is now in development mode again. Make sure the version indicates that. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0720b8e..a0baf94 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [9], [0], [release]) +EFL_VERSION([1], [9], [99], [dev]) AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.60]) --
[EGIT] [core/elementary] master 01/01: configure: Bump version to 1.9.99 to indicate development cycle
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4a99f080fc645930b0f63946f410a2485a3844b9 commit 4a99f080fc645930b0f63946f410a2485a3844b9 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed Feb 26 09:29:01 2014 +0100 configure: Bump version to 1.9.99 to indicate development cycle 1.9 is released and the master branch is now in development mode again. Make sure the version indicates that. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d281deb..4c9263d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [9], [0], [release]) +EFL_VERSION([1], [9], [99], [dev]) AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ(2.60) --
[EGIT] [core/evas_generic_loaders] master 01/01: configure: Bump version to 1.9.99 to indicate development cycle
stefan pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=669b58fcabf442317d83a4e821b5cfa0e968e037 commit 669b58fcabf442317d83a4e821b5cfa0e968e037 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed Feb 26 09:32:44 2014 +0100 configure: Bump version to 1.9.99 to indicate development cycle 1.9 is released and the master branch is now in development mode again. Make sure the version indicates that. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55a3675..973e89e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [9]) -m4_define([v_mic], [0]) +m4_define([v_mic], [99]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo 0) | tr -d '\n'])) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) --
[EGIT] [core/emotion_generic_players] master 01/01: configure: Bump version to 1.9.99 to indicate development cycle
stefan pushed a commit to branch master. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=68fff9e216a37c2931bd62dda7eaacf301b995a1 commit 68fff9e216a37c2931bd62dda7eaacf301b995a1 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed Feb 26 09:34:38 2014 +0100 configure: Bump version to 1.9.99 to indicate development cycle 1.9 is released and the master branch is now in development mode again. Make sure the version indicates that. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a079f33..4bb4d15 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [9]) -m4_define([v_mic], [0]) +m4_define([v_mic], [99]) dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo 0) | tr -d '\n'])) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) --
Re: [E-devel] master branches are open for new development
Hello. On Wed, 2014-02-26 at 07:28, Simon wrote: On 02/26/2014 12:36 AM, Stefan Schmidt wrote: Hello. You might have seen it. 1.9 is out. This also means that the master branches are open for new development again. I created stabilization branches like we had in at the last release. Please make sure to backport/cherry-pick your fixes into this branch so we can prepare stabilization releases with fixes that missed 1.9. I will send a mail with a revised schedule for discussion for 1.10 either later today or tomorrow. regards Stefan Schmidt Hi all, It doesn't look like anyone bumped the versions to 1.9.99 yet Thanks for the notice. Fixed it up. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
Hello. On Tue, 2014-02-25 at 13:10, Felipe Magno de Almeida wrote: cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f279225a6300063c0bc6a47dedd3036ac72e89a6 commit f279225a6300063c0bc6a47dedd3036ac72e89a6 Author: Felipe Magno de Almeida fel...@expertisesolutions.com.br Date: Tue Feb 25 17:24:32 2014 -0300 eina: add a C++ bindings to Eina @feature. The goal of this library is to make the life of C++ developers easier when having to manipulate Eina datatype by providing a layer to abstract those data type in C++. Check examples for now. Documentation will come soon, but we are pushing that rather sooner to get feedback on those bindings. As you will notice, this library is just composed of headers. There is no .so and we do think it is better this way. Reducing ABI and API stability issue for applications developers who are the primary target of this binding. Also please note that you will need to have C++11 to use this binding. Signed-off-by: Cedric Bail cedric.b...@free.fr This brings up various build problems on jenkins. gcc x86: tests/eina_cxx/eina_cxx_test_eina_value.cc:32:43: error: call of overloaded 'eina_value(uint64_t)' is ambiguous https://build.enlightenment.org/job/changely_efl_gcc_x86/lastFailedBuild/console gcc x32: tests/eina_cxx/eina_cxx_test_eina_value.cc:32:43: error: call of overloaded 'eina_value(uint64_t)' is ambiguous https://build.enlightenment.org/job/changely_efl_gcc_x32/lastFailedBuild/console clang x86_64: ../src/lib/eina_cxx/eina_thread.hh:189:20: error: '_raw' is a private member of 'efl::eina::thread_id' https://build.enlightenment.org/job/changely_efl_clang_x86_64/lastFailedBuild/console clang x86: ../src/lib/eina_cxx/eina_thread.hh:189:20: error: '_raw' is a private member of 'efl::eina::thread_id' https://build.enlightenment.org/job/changely_efl_clang_x86/lastFailedBuild/console If you believe that some of these are due to the gcc and clang version we use (and thus maybe missing C++ 11 support) please talk to beber to get this updated. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Prposed release schedule for 1.10
Hello. On Tue, 2014-02-25 at 23:10, Adrien Nader wrote: Hi again, I mentionned in the 1.9 release should happen within the next 24h thread that I found the last step too short and I'm answering here since I find it more appropriate. Indeed it is. I am the main dev behind http://win-builds.org which makes builds for, well, Windows. Everything is cross-compiled from linux64. Windows is one of the platforms that gets built and tested less often It should get build for every push to efl master. Jenkins takes care of that. It is correct though that it is broken more often than the other builds. and we found several issues in beta1 (you can see windows and cross-compilation fixes in git soon after beta1). Thanks! (it's Windows but it could as well be Linux on MIPS; it's not Linux x86/x86_64 nor Linux ARM and it's not tested often) Correct, I would bet our builds on MIPS, Sparc, etc are problematic as well. While I am a developer, I do not intend to take a more active role in the development of the EFLs. Using them, yes; working on them, there's simply no time for that. This is one of the reasons I don't build and test intermediate versions. Another reason is that for platforms that get tested less, this would mean getting way too many errors. And here we have the problem. Nobody is willing to invest in having efl working well on mingw/windows. You did some patches which is more than other people do so thanks for that. Still, what I mostly hear is like EFL needs to support windows because the app I write should work there. But the reality is that none of the active developers is using it or working on it behind the causual bug fix if jenkins complains about broken builds. The mingw automated build on jenkins is as what Cedric and I did to have at leats an idea if we break stuff for mingw on the compilation side. Its as far as I personally will go. I siad it before and I will say it it again to everyone who wants efl top support mingw/windows as a first class citizen: If you don't do the work nobody else does. It may sound harsh but I have done my share on keeping the mingw port build even if I have _zero_ interest in it. I tried 1.9 beta1 because Cedric asked me to do it and I had some free time that day. With only one week between beta and the release, it is difficult to test and it is highly likely that my time will already be allocated for something else. This is without even accounting for other changes like evolving packaging, dependency on luajit (mostly to evaluate it), ... I would suggest startring with the alpha that would give you one more week. To late now for 1.9 anyway just saying. From my packager perspective, more time between beta and final release is better. From my developer perspective, I actually like it when other devs get bored with the feeling they have nothing to do near the end of a stabilization period. If they would get bored it would be good. What I see though is that people loose interest if the stabilization phase is to long and just start working on new developments. In the end these people are not working on bug fixes and thus a longer time brings nothing. The main need is to be able to iterate several times with {build, test, report issue/send patch, have it commited} and for that the 1.9 setup has been quite short. I believe the two weeks will be much better. You really should start with the alpha which gives you three weeks during 1.10 if the schedule I proposed holds. PS: I also hope that before 1.10 alpha, I will have finished a few changes to win-builds to harass most of you into testing for Windows. PS2: Wine works well enough. Good luck finding people for that. :) regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
Cedric Bail On Feb 26, 2014 6:04 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On Tue, 2014-02-25 at 13:10, Felipe Magno de Almeida wrote: cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f279225a6300063c0bc6a47dedd3036ac72e89a6 commit f279225a6300063c0bc6a47dedd3036ac72e89a6 Author: Felipe Magno de Almeida fel...@expertisesolutions.com.br Date: Tue Feb 25 17:24:32 2014 -0300 eina: add a C++ bindings to Eina @feature. The goal of this library is to make the life of C++ developers easier when having to manipulate Eina datatype by providing a layer to abstract those data type in C++. Check examples for now. Documentation will come soon, but we are pushing that rather sooner to get feedback on those bindings. As you will notice, this library is just composed of headers. There is no .so and we do think it is better this way. Reducing ABI and API stability issue for applications developers who are the primary target of this binding. Also please note that you will need to have C++11 to use this binding. Signed-off-by: Cedric Bail cedric.b...@free.fr This brings up various build problems on jenkins. gcc x86: tests/eina_cxx/eina_cxx_test_eina_value.cc:32:43: error: call of overloaded 'eina_value(uint64_t)' is ambiguous https://build.enlightenment.org/job/changely_efl_gcc_x86/lastFailedBuild/console gcc x32: tests/eina_cxx/eina_cxx_test_eina_value.cc:32:43: error: call of overloaded 'eina_value(uint64_t)' is ambiguous https://build.enlightenment.org/job/changely_efl_gcc_x32/lastFailedBuild/console clang x86_64: ../src/lib/eina_cxx/eina_thread.hh:189:20: error: '_raw' is a private member of 'efl::eina::thread_id' https://build.enlightenment.org/job/changely_efl_clang_x86_64/lastFailedBuild/console clang x86: ../src/lib/eina_cxx/eina_thread.hh:189:20: error: '_raw' is a private member of 'efl::eina::thread_id' https://build.enlightenment.org/job/changely_efl_clang_x86/lastFailedBuild/console If you believe that some of these are due to the gcc and clang version we use (and thus maybe missing C++ 11 support) please talk to beber to get this updated. Interesting,will give it a look today.thanks for the report. Cedric regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
On 26/02/14 10:44, Cedric BAIL wrote: Cedric Bail On Feb 26, 2014 6:04 AM, Tom Hacohen tom.haco...@samsung.com mailto:tom.haco...@samsung.com wrote: Hey, I thought we agreed to have them disabled by default. Cedric, please fix. Disabled what? It doesn't build anything except if you build example manually and have c++11. Please check what this commit do. Sorry, you are right, I misread the configure.ac checks, I thought it'd fail if no CXX11 found. By the way, please move all of the bindings related stuff c++/lua into src/bindings... No need to pollute our tree. -- Tom. -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Disabling colour escapes in Eina_Log
Ah, no bother - I found a bug in Eina_Log. Fixing :) Andrew - Andy Williams blog: http://ajwillia.ms web:http://andywilliams.me On 26 Feb 2014, at 00:21, Andrew Williams a...@andywilliams.me wrote: Hi, I have called eina_log_color_disable_set(EINA_YES) but eina log output is still in full colour. I am trying to create a custom logging function but some of the strings passed in still contain ansi escape sequences which are causing quite a few problems. Any tips / comments? Thanks, Andrew - Andy Williams blog: http://ajwillia.ms web: http://andywilliams.me -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: bugfix: Fix Wayland Shm engine destination calculation typo
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=44e023c8880fa72f4d8ac7416333057c2b551f58 commit 44e023c8880fa72f4d8ac7416333057c2b551f58 Author: Chris Michael cp.mich...@samsung.com Date: Wed Feb 26 11:36:27 2014 + bugfix: Fix Wayland Shm engine destination calculation typo When rotation is 0, we need to advance the destination pointer in the X direction by a Multiple of Bits-Per-Pixel...not an addition. Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c index fe103d3..56ff4a3 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c @@ -328,7 +328,7 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in if (ob-rotation == 0) { RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, ww, hh); -dst += (bpl * rect.y) + (rect.x + bpp); +dst += (bpl * rect.y) + (rect.x * bpp); w -= rx; } else if (ob-rotation == 180) --
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
On 26/02/14 10:56, Tom Hacohen wrote: On 26/02/14 10:44, Cedric BAIL wrote: Cedric Bail On Feb 26, 2014 6:04 AM, Tom Hacohen tom.haco...@samsung.com mailto:tom.haco...@samsung.com wrote: Hey, I thought we agreed to have them disabled by default. Cedric, please fix. Disabled what? It doesn't build anything except if you build example manually and have c++11. Please check what this commit do. Sorry, you are right, I misread the configure.ac checks, I thought it'd fail if no CXX11 found. By the way, please move all of the bindings related stuff c++/lua into src/bindings... No need to pollute our tree. And of course I wasn't completely off. It is on by default. Tests are compiled and run by default for this. This is annoying in general, but more annoying because they are failing. Please fix this. ../../src/tests/eina_cxx/eina_cxx_test_inlist.cc:2:19: fatal error: Eina.hh: No such file or directory #include Eina.hh ^ compilation terminated. Makefile:24782: recipe for target 'tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_inlist.o' failed make[4]: *** [tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_inlist.o] Error 1 make[4]: *** Waiting for unfinished jobs ../../src/tests/eina_cxx/eina_cxx_suite.cc:2:19: fatal error: Eina.hh: No such file or directory #include Eina.hh ^ -- Tom. -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: bugfix: Fix Wayland Shm engine destination calculation typo
Hey, That's not the EFL commit message format. While we haven't decided on a format for 1.10, this is neither the 1.10 format or the 1.9 format. bugfix: should be Ecore wayland:. If you'd like to follow the newly proposed 1.10 guidelines, use @bug or @fix somewhere in the commit message (not the summary line). -- Tom. On 26/02/14 11:38, Christopher Michael wrote: devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=44e023c8880fa72f4d8ac7416333057c2b551f58 commit 44e023c8880fa72f4d8ac7416333057c2b551f58 Author: Chris Michael cp.mich...@samsung.com Date: Wed Feb 26 11:36:27 2014 + bugfix: Fix Wayland Shm engine destination calculation typo When rotation is 0, we need to advance the destination pointer in the X direction by a Multiple of Bits-Per-Pixel...not an addition. Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c index fe103d3..56ff4a3 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c @@ -328,7 +328,7 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in if (ob-rotation == 0) { RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, ww, hh); -dst += (bpl * rect.y) + (rect.x + bpp); +dst += (bpl * rect.y) + (rect.x * bpp); w -= rx; } else if (ob-rotation == 180) -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: Evas textblock: removed unused internal function.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0378e4195895ac1b1eb0199de261313fcdc00b3d commit 0378e4195895ac1b1eb0199de261313fcdc00b3d Author: Tom Hacohen t...@stosb.com Date: Wed Feb 26 12:25:08 2014 + Evas textblock: removed unused internal function. --- src/lib/evas/canvas/evas_object_textblock.c | 19 --- 1 file changed, 19 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 4297014..0939c85 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -6031,25 +6031,6 @@ evas_textblock_string_escape_get(const char *string, int *len_ret) /** * @internal - * Appends the escaped char beteewn s and s_end to the curosr - * - * - * @param s the start of the string - * @param s_end the end of the string. - */ -static inline void -_append_escaped_char(Evas_Textblock_Cursor *cur, const char *s, - const char *s_end) -{ - const char *escape; - - escape = _escaped_char_get(s, s_end); - if (escape) - evas_textblock_cursor_text_append(cur, escape); -} - -/** - * @internal * prepends the escaped char beteewn s and s_end to the curosr * * --
Re: [E-devel] [EGIT] [core/efl] master 01/01: bugfix: Fix Wayland Shm engine destination calculation typo
Also, please backport. -- Tom. On 26/02/14 12:19, Tom Hacohen wrote: Hey, That's not the EFL commit message format. While we haven't decided on a format for 1.10, this is neither the 1.10 format or the 1.9 format. bugfix: should be Ecore wayland:. If you'd like to follow the newly proposed 1.10 guidelines, use @bug or @fix somewhere in the commit message (not the summary line). -- Tom. On 26/02/14 11:38, Christopher Michael wrote: devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=44e023c8880fa72f4d8ac7416333057c2b551f58 commit 44e023c8880fa72f4d8ac7416333057c2b551f58 Author: Chris Michael cp.mich...@samsung.com Date: Wed Feb 26 11:36:27 2014 + bugfix: Fix Wayland Shm engine destination calculation typo When rotation is 0, we need to advance the destination pointer in the X direction by a Multiple of Bits-Per-Pixel...not an addition. Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c index fe103d3..56ff4a3 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c @@ -328,7 +328,7 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in if (ob-rotation == 0) { RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, ww, hh); -dst += (bpl * rect.y) + (rect.x + bpp); +dst += (bpl * rect.y) + (rect.x * bpp); w -= rx; } else if (ob-rotation == 180) -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
On Wed, 26 Feb 2014 10:56:07 + Tom Hacohen tom.haco...@samsung.com wrote: By the way, please move all of the bindings related stuff c++/lua into src/bindings... No need to pollute our tree. While I agree in general, the Edje Lua stuff is like Embryo, a scripting language for Edje. It's not a binding as such. C++ stuff, sure, don't pollute our tree. B-) -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] efl-1.9 01/01: bugfix: Fix Wayland Shm engine destination calculation typo
devilhorns pushed a commit to branch efl-1.9. http://git.enlightenment.org/core/efl.git/commit/?id=6c418895e2463988e24f4638d3bfe16c0cd5dfae commit 6c418895e2463988e24f4638d3bfe16c0cd5dfae Author: Chris Michael cp.mich...@samsung.com Date: Wed Feb 26 11:36:27 2014 + bugfix: Fix Wayland Shm engine destination calculation typo When rotation is 0, we need to advance the destination pointer in the X direction by a Multiple of Bits-Per-Pixel...not an addition. Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/evas/engines/wayland_shm/evas_swapbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c index fe103d3..56ff4a3 100644 --- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c +++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c @@ -328,7 +328,7 @@ evas_swapbuf_update_region_push(Outbuf *ob, RGBA_Image *update, int x, int y, in if (ob-rotation == 0) { RECTS_CLIP_TO_RECT(rect.x, rect.y, rect.w, rect.h, 0, 0, ww, hh); -dst += (bpl * rect.y) + (rect.x + bpp); +dst += (bpl * rect.y) + (rect.x * bpp); w -= rx; } else if (ob-rotation == 180) --
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
On Wed, Feb 26, 2014 at 8:49 AM, Tom Hacohen tom.haco...@samsung.com wrote: On 26/02/14 10:56, Tom Hacohen wrote: On 26/02/14 10:44, Cedric BAIL wrote: Cedric Bail On Feb 26, 2014 6:04 AM, Tom Hacohen tom.haco...@samsung.com mailto:tom.haco...@samsung.com wrote: Hey, I thought we agreed to have them disabled by default. Cedric, please fix. Disabled what? It doesn't build anything except if you build example manually and have c++11. Please check what this commit do. Sorry, you are right, I misread the configure.ac checks, I thought it'd fail if no CXX11 found. By the way, please move all of the bindings related stuff c++/lua into src/bindings... No need to pollute our tree. Good idea. And of course I wasn't completely off. It is on by default. Tests are compiled and run by default for this. This is annoying in general, but more annoying because they are failing. Please fix this. It is not. We have code that need to be tested. Tests are there for that. I don't see the point of disabling test that would just ruin the purpose of CI or make sure that our C++ rot over time. Our tests should cover as much as possible. ../../src/tests/eina_cxx/eina_cxx_test_inlist.cc:2:19: fatal error: Eina.hh: No such file or directory #include Eina.hh ^ Weird it did pass all our build, but it fail since Stefan turned back to development mode. Will check that. -- Cedric BAIL -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: syntax_color - support more keywords
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=f16fc6e53ec3323eb734aa526f6cf4e1f8dca8c5 commit f16fc6e53ec3323eb734aa526f6cf4e1f8dca8c5 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Feb 26 22:24:56 2014 +0900 syntax_color - support more keywords --- src/bin/syntax_color.c | 29 +++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/bin/syntax_color.c b/src/bin/syntax_color.c index aefb92d..833e164 100644 --- a/src/bin/syntax_color.c +++ b/src/bin/syntax_color.c @@ -9,7 +9,7 @@ else if (ret == -1) goto finished; \ } \ -#define COL_NUM 6 +#define COL_NUM 8 struct syntax_color_s { @@ -29,6 +29,8 @@ color_init(Eina_Strbuf *strbuf) cd-cols[3] = eina_stringshare_add(D4D42A); cd-cols[4] = eina_stringshare_add(00B000); cd-cols[5] = eina_stringshare_add(D42A2A); + cd-cols[6] = eina_stringshare_add(00); + cd-cols[7] = eina_stringshare_add(D78700); return cd; } @@ -450,6 +452,7 @@ color_apply(color_data *cd, const char *src, int length) COLOR_INSERT(strbuf, src, length, cur, prev, rel1, col2); COLOR_INSERT(strbuf, src, length, cur, prev, rel2, col2); COLOR_INSERT(strbuf, src, length, cur, prev, rotation, col2); +COLOR_INSERT(strbuf, src, length, cur, prev, script, col2); COLOR_INSERT(strbuf, src, length, cur, prev, styles, col2); //syntax group 3 @@ -533,6 +536,7 @@ color_apply(color_data *cd, const char *src, int length) COLOR_INSERT(strbuf, src, length, cur, prev, OUTLINE_SHADOW, col4); COLOR_INSERT(strbuf, src, length, cur, prev, OUTLINE, col4); COLOR_INSERT(strbuf, src, length, cur, prev, PLAIN, col4); +COLOR_INSERT(strbuf, src, length, cur, prev, PROGRAM, col4); COLOR_INSERT(strbuf, src, length, cur, prev, PROXY, col4); COLOR_INSERT(strbuf, src, length, cur, prev, RAW, col4); COLOR_INSERT(strbuf, src, length, cur, prev, RECT, col4); @@ -552,6 +556,28 @@ color_apply(color_data *cd, const char *src, int length) COLOR_INSERT(strbuf, src, length, cur, prev, USER, col4); COLOR_INSERT(strbuf, src, length, cur, prev, VERTICAL, col4); +//syntax group 7 +Eina_Stringshare *col6 = cd-cols[6]; +COLOR_INSERT(strbuf, src, length, cur, prev, anim, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, cancel_anim, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, cancel_timer, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, get_float, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, get_int, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, run_program, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, set_float, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, set_int, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, set_state, col6); +COLOR_INSERT(strbuf, src, length, cur, prev, set_tween_state, + col6); +COLOR_INSERT(strbuf, src, length, cur, prev, timer, col6); + +//syntax group 8 +Eina_Stringshare *col7 = cd-cols[7]; +COLOR_INSERT(strbuf, src, length, cur, prev, if, col7); +COLOR_INSERT(strbuf, src, length, cur, prev, else, col7); +COLOR_INSERT(strbuf, src, length, cur, prev, new, col7); +COLOR_INSERT(strbuf, src, length, cur, prev, public, col7); + //duplicated groups 1 COLOR_INSERT(strbuf, src, length, cur, prev, image:, col3); COLOR_INSERT(strbuf, src, length, cur, prev, size:, col3); @@ -563,7 +589,6 @@ color_apply(color_data *cd, const char *src, int length) COLOR_INSERT(strbuf, src, length, cur, prev, text, col2); COLOR_INSERT(strbuf, src, length, cur, prev, perspective, col2); - cur++; } --
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina: add a C++ bindings to Eina @feature.
On 26/02/14 13:23, Cedric BAIL wrote: On Wed, Feb 26, 2014 at 8:49 AM, Tom Hacohen tom.haco...@samsung.com wrote: On 26/02/14 10:56, Tom Hacohen wrote: On 26/02/14 10:44, Cedric BAIL wrote: Cedric Bail On Feb 26, 2014 6:04 AM, Tom Hacohen tom.haco...@samsung.com mailto:tom.haco...@samsung.com wrote: Hey, I thought we agreed to have them disabled by default. Cedric, please fix. Disabled what? It doesn't build anything except if you build example manually and have c++11. Please check what this commit do. Sorry, you are right, I misread the configure.ac checks, I thought it'd fail if no CXX11 found. By the way, please move all of the bindings related stuff c++/lua into src/bindings... No need to pollute our tree. Good idea. And of course I wasn't completely off. It is on by default. Tests are compiled and run by default for this. This is annoying in general, but more annoying because they are failing. Please fix this. It is not. We have code that need to be tested. Tests are there for that. I don't see the point of disabling test that would just ruin the purpose of CI or make sure that our C++ rot over time. Our tests should cover as much as possible. ../../src/tests/eina_cxx/eina_cxx_test_inlist.cc:2:19: fatal error: Eina.hh: No such file or directory #include Eina.hh ^ Weird it did pass all our build, but it fail since Stefan turned back to development mode. Will check that. Because being the borker that you are, you didn't run make check... Development mode automatically enables tests. -- Tom. -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eina_cxx: make sure it can build out of the source tree.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=47955c302a9d70d54ee3db0b32b1223539df12d3 commit 47955c302a9d70d54ee3db0b32b1223539df12d3 Author: Cedric Bail cedric.b...@free.fr Date: Wed Feb 26 11:06:05 2014 -0300 eina_cxx: make sure it can build out of the source tree. --- src/Makefile_Eina_Cxx.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am index fa4888d..ffd9111 100644 --- a/src/Makefile_Eina_Cxx.am +++ b/src/Makefile_Eina_Cxx.am @@ -47,6 +47,7 @@ tests/eina_cxx/eina_cxx_test_eina_value.cc tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/lib/eina_cxx \ +-I$(top_srcdir)/src/lib/eina_cxx \ -DTESTS_WD=\`pwd`\ \ -DTESTS_SRC_DIR=\$(top_srcdir)/src/tests/eina_cxx\ \ -DPACKAGE_BUILD_DIR=\`pwd`/$(top_builddir)/src/tests/eina_cxx\ \ --
[EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Removals: diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 46494d6..e225e34 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -920,6 +920,7 @@ eina_log_domain_new(Eina_Log_Domain *d, Eina_Log_Timing *t, EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); d-level = EINA_LOG_LEVEL_UNKNOWN; + d-color = color; d-deleted = EINA_FALSE; if ((color) (!_disable_color)) @@ -1581,7 +1582,24 @@ EAPI void eina_log_color_disable_set(Eina_Bool disabled) { #ifdef EINA_ENABLE_LOG + Eina_Log_Domain *domain; + unsigned int i; + _disable_color = disabled; + + for (i = 0; i _log_domains_count; i++) + { +domain = _log_domains[i]; + +if (domain-domain_str) + free((char *)domain-domain_str); + +if ((domain-color) (!_disable_color)) + domain-domain_str = eina_log_domain_str_get(domain-name, domain-color); +else + domain-domain_str = eina_log_domain_str_get(domain-name, NULL); + } + #else (void) disabled; #endif diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h index feb1b2e..bc59d78 100644 --- a/src/lib/eina/eina_log.h +++ b/src/lib/eina/eina_log.h @@ -413,6 +413,7 @@ typedef struct _Eina_Log_Domain Eina_Log_Domain; struct _Eina_Log_Domain { int level; /** Max level to log */ + const char *color; /** Color to use when printing in this domain */ const char *domain_str; /** Formatted string with color to print */ const char *name; /** Domain name */ size_t namelen; /** strlen(name) */ --
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Hey, We don't update the NEWS file anymore. This should probably be backported as well, and for that, @fix should be added in the commit log (not official requirement yet, but will probably become one soon, as there were no objections). -- Tom. On 26/02/14 14:37, Andy Williams wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Removals: diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 46494d6..e225e34 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -920,6 +920,7 @@ eina_log_domain_new(Eina_Log_Domain *d, Eina_Log_Timing *t, EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); d-level = EINA_LOG_LEVEL_UNKNOWN; + d-color = color; d-deleted = EINA_FALSE; if ((color) (!_disable_color)) @@ -1581,7 +1582,24 @@ EAPI void eina_log_color_disable_set(Eina_Bool disabled) { #ifdef EINA_ENABLE_LOG + Eina_Log_Domain *domain; + unsigned int i; + _disable_color = disabled; + + for (i = 0; i _log_domains_count; i++) + { +domain = _log_domains[i]; + +if (domain-domain_str) + free((char *)domain-domain_str); + +if ((domain-color) (!_disable_color)) + domain-domain_str = eina_log_domain_str_get(domain-name, domain-color); +else + domain-domain_str = eina_log_domain_str_get(domain-name, NULL); + } + #else (void) disabled; #endif diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h index feb1b2e..bc59d78 100644 --- a/src/lib/eina/eina_log.h +++ b/src/lib/eina/eina_log.h @@ -413,6 +413,7 @@ typedef struct _Eina_Log_Domain Eina_Log_Domain; struct _Eina_Log_Domain { int level; /** Max level to log */ + const char *color; /** Color to use when printing in this domain */ const char *domain_str; /** Formatted string with color to print */ const char *name; /** Domain name */ size_t namelen; /** strlen(name) */ -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Hello. On Wed, 2014-02-26 at 06:37, Andy Williams wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Please don't do that. This is wrong in two different ways: 1) You added it to 1.9 while this happened after 2) We will auto generate the NEWS files for 1.10 and already have not updated them during development in 1.9 Just having a proper commit summary and the tags like fixes TXXX and @fix in the longer description is enough. No need to touch the NEWS file. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 04/06: eo: replace composite_objects Eina_List with an array of Eo_Object*
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7821df17dcf20b4f9a17bce9261f7167fa52cd0d commit 7821df17dcf20b4f9a17bce9261f7167fa52cd0d Author: Jérémy Zurcher jer...@asynk.ch Date: Wed Feb 19 10:08:56 2014 +0100 eo: replace composite_objects Eina_List with an array of Eo_Object* as we don't support multiple composites of the same class, and know at class elaboration how many composites we should have, we can create the composites array and pack it at the end of the object. --- src/lib/eo/Eo.h | 6 ++-- src/lib/eo/eo.c | 85 ++--- src/lib/eo/eo_private.h | 12 --- 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 06a8ca1..74257ad 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -938,7 +938,8 @@ EAPI Eina_Bool eo_destructed_is(const Eo *obj); * @param parent the parent object. * @return EINA_TRUE if successfull. EINA_FALSE otherwise. * - * The class of comp_obj must be part of the extensions of the class of the parent. + * The class of comp_obj must be of the type EO_CLASS_TYPE_REGULAR + * and be part of the extensions of the class of the parent. * It is not possible to attach more then 1 composite of the same class. * This functions also sets the parent of comp_obj to parent. * @@ -951,13 +952,14 @@ EAPI Eina_Bool eo_composite_attach(Eo *comp_obj, Eo *parent); * @brief Detach a composite object from another object. * @param comp_obj the object attached to parent. * @param parent the parent object. + * @return EINA_TRUE if successfull. EINA_FALSE otherwise. * * This functions also sets the parent of comp_obj to @c NULL. * * @see eo_composite_attach() * @see eo_composite_is() */ -EAPI void eo_composite_detach(Eo *comp_obj, Eo *parent); +EAPI Eina_Bool eo_composite_detach(Eo *comp_obj, Eo *parent); /** * @brief Check if an object is a composite object. diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index 2de799d..b2cec78 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -311,18 +311,19 @@ _eo_op_internal(const char *file, int line, Eo_Base *eo_ptr, const _Eo_Class *cu /* Try composite objects */ if (op_type == EO_OP_TYPE_REGULAR) { -Eina_List *itr; -Eo *emb_obj_id; -EINA_LIST_FOREACH(((_Eo_Object *) eo_ptr)-composite_objects, itr, emb_obj_id) - { - /* FIXME: Clean this up a bit. */ - EO_OBJ_POINTER_RETURN_VAL(emb_obj_id, emb_obj, EINA_FALSE); - if (_eo_op_internal(file, line, (Eo_Base *) emb_obj, emb_obj-klass, op_type, op, p_list)) - { - return EINA_TRUE; - } - } +const _Eo_Object **comp_itr = ((_Eo_Object *) eo_ptr)-composites; +if (!comp_itr) return EINA_FALSE; + +for (unsigned int i = 0; i ((_Eo_Object *) eo_ptr)-klass-composites_count; i++, comp_itr++) + if (*comp_itr) +{ + if (_eo_op_internal(file, line, (Eo_Base *) (*comp_itr), (*comp_itr)-klass, op_type, op, p_list)) + { +return EINA_TRUE; + } +} } + return EINA_FALSE; } @@ -919,6 +920,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) EINA_LIST_FREE(extn_list, extn) { *(extn_itr++) = extn; + if (extn-desc-type == EO_CLASS_TYPE_REGULAR) + klass-composites_count += 1; DBG(Added '%s' extension, extn-desc-name); } @@ -960,6 +963,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) } klass-obj_size = _eo_sz + extn_data_off; + if (klass-composites_count 0) + klass-obj_size += (klass-composites_count * sizeof(_Eo_Object *)); if (getenv(EO_DEBUG)) { fprintf(stderr, Eo class '%s' will take %u bytes per object.\n, @@ -1084,6 +1089,10 @@ eo_add_internal(const char *file, int line, const Eo_Class *klass_id, Eo *parent obj-refcount++; obj-klass = klass; + if (klass-composites_count == 0) + obj-composites = NULL; + else + obj-composites = (const _Eo_Object **) ((char *) obj + sizeof(_Eo_Object)); #ifndef HAVE_EO_ID EINA_MAGIC_SET((Eo_Base *) obj, EO_EINA_MAGIC); @@ -1492,39 +1501,65 @@ eo_shutdown(void) EAPI Eina_Bool eo_composite_attach(Eo *comp_obj_id, Eo *parent_id) { + const _Eo_Object **comp_itr; + const _Eo_Object **comp_dst; + EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE); EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE); - if (!eo_isa(parent_id, _eo_class_id_get(comp_obj-klass))) return EINA_FALSE; + if (!parent-composites) return EINA_FALSE; + + if (comp_obj-klass-desc-type != EO_CLASS_TYPE_REGULAR) + return EINA_FALSE; + if (!eo_isa(parent_id,
[EGIT] [core/efl] master 02/06: eo: eo_composite_attach check composite class, disallow duplicates
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e199230615d5cbc317faf85fa43b5383628b6af6 commit e199230615d5cbc317faf85fa43b5383628b6af6 Author: Jérémy Zurcher jer...@asynk.ch Date: Tue Feb 18 15:33:24 2014 +0100 eo: eo_composite_attach check composite class, disallow duplicates eo_composite_attach fail if the class of the composite is not listed in the parent class extensions, or if there is already a composite of the same class. The later because calls are forwarded to the first responding composite, see _eo_op_internal(). --- src/lib/eo/Eo.h | 5 - src/lib/eo/eo.c | 21 ++--- .../eo/composite_objects/composite_objects_main.c | 8 +++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 9ae740c..06a8ca1 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -936,13 +936,16 @@ EAPI Eina_Bool eo_destructed_is(const Eo *obj); * @brief Make an object a composite object of another. * @param comp_obj the object that will be used to composite parent. * @param parent the parent object. + * @return EINA_TRUE if successfull. EINA_FALSE otherwise. * + * The class of comp_obj must be part of the extensions of the class of the parent. + * It is not possible to attach more then 1 composite of the same class. * This functions also sets the parent of comp_obj to parent. * * @see eo_composite_detach() * @see eo_composite_is() */ -EAPI void eo_composite_attach(Eo *comp_obj, Eo *parent); +EAPI Eina_Bool eo_composite_attach(Eo *comp_obj, Eo *parent); /** * @brief Detach a composite object from another object. diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index fc64464..bfee7eb 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -1485,16 +1485,31 @@ eo_shutdown(void) return EINA_TRUE; } -EAPI void +EAPI Eina_Bool eo_composite_attach(Eo *comp_obj_id, Eo *parent_id) { - EO_OBJ_POINTER_RETURN(comp_obj_id, comp_obj); - EO_OBJ_POINTER_RETURN(parent_id, parent); + EO_OBJ_POINTER_RETURN_VAL(comp_obj_id, comp_obj, EINA_FALSE); + EO_OBJ_POINTER_RETURN_VAL(parent_id, parent, EINA_FALSE); + + if (!eo_isa(parent_id, _eo_class_id_get(comp_obj-klass))) return EINA_FALSE; + + { +Eina_List *itr; +Eo *emb_obj_id; +EINA_LIST_FOREACH(parent-composite_objects, itr, emb_obj_id) + { + EO_OBJ_POINTER_RETURN_VAL(emb_obj_id, emb_obj, EINA_FALSE); + if(emb_obj-klass == comp_obj-klass) + return EINA_FALSE; + } + } comp_obj-composite = EINA_TRUE; parent-composite_objects = eina_list_prepend(parent-composite_objects, comp_obj_id); eo_do(comp_obj_id, eo_parent_set(parent_id)); + + return EINA_TRUE; } EAPI void diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index 2e5d9ab..1d5b8c0 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -33,6 +33,9 @@ main(int argc, char *argv[]) Eo *obj = eo_add(COMP_CLASS, NULL); eo_do(obj, eo_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL)); + fail_if(!eo_isa(obj, COMP_CLASS)); + fail_if(!eo_isa(obj, SIMPLE_CLASS)); + int a; eo_do(obj, simple_a_set(1)); fail_if(!cb_called); @@ -53,8 +56,11 @@ main(int argc, char *argv[]) fail_if(!eo_composite_is(simple)); eo_composite_detach(simple, obj); fail_if(eo_composite_is(simple)); - eo_composite_attach(simple, obj); + fail_if(!eo_composite_attach(simple, obj)); fail_if(!eo_composite_is(simple)); + fail_if(eo_composite_attach(simple, obj)); + + fail_if(eo_composite_attach(obj, simple)); eo_unref(simple); eo_unref(obj); --
[EGIT] [core/efl] master 06/06: eo: first check class desc in eo_class_new
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2d520158233b35c408677e61da79e8beda17c41c commit 2d520158233b35c408677e61da79e8beda17c41c Author: Jérémy Zurcher jer...@asynk.ch Date: Wed Feb 19 10:13:47 2014 +0100 eo: first check class desc in eo_class_new --- src/lib/eo/eo.c | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index b2cec78..de79d77 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -763,6 +763,14 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) size_t extn_sz, mro_sz, mixins_sz; Eina_List *extn_list, *mro, *mixins; + EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(desc-name, NULL); + + DBG(Started building class '%s', desc-name); + + if (!_eo_class_check_op_descs(desc)) + return NULL; + _Eo_Class *parent = _eo_class_pointer_get(parent_id); #ifndef HAVE_EO_ID if (parent !EINA_MAGIC_CHECK((Eo_Base *) parent, EO_CLASS_EINA_MAGIC)) @@ -772,12 +780,6 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) } #endif - EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(desc-name, NULL); - - if (!_eo_class_check_op_descs(desc)) - return NULL; - /* Check restrictions on Interface types. */ if (desc-type == EO_CLASS_TYPE_INTERFACE) { @@ -1027,6 +1029,8 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) _eo_class_constructor(klass); + DBG(Finished building class '%s', klass-desc-name); + return _eo_class_id_get(klass); } --
[EGIT] [core/efl] master 05/06: eo: add tests for eo_composite_detach
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=13502a159c2a8e1c1bd18f63235815d43ce87273 commit 13502a159c2a8e1c1bd18f63235815d43ce87273 Author: Jérémy Zurcher jer...@asynk.ch Date: Wed Feb 19 10:12:47 2014 +0100 eo: add tests for eo_composite_detach --- src/tests/eo/composite_objects/composite_objects_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index 1d5b8c0..ba96eb4 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -54,7 +54,8 @@ main(int argc, char *argv[]) fail_if(cb_called); fail_if(!eo_composite_is(simple)); - eo_composite_detach(simple, obj); + fail_if(!eo_composite_detach(simple, obj)); + fail_if(eo_composite_detach(simple, obj)); fail_if(eo_composite_is(simple)); fail_if(!eo_composite_attach(simple, obj)); fail_if(!eo_composite_is(simple)); --
[EGIT] [core/efl] master 01/06: evas: rename macro EVAS_COMMON_CLASS - EVAS_COMMON_INTERFACE as it is one
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f98c1393b8b870f9d8c0830f3da23da48a68d812 commit f98c1393b8b870f9d8c0830f3da23da48a68d812 Author: Jérémy Zurcher jer...@asynk.ch Date: Mon Feb 17 15:00:14 2014 +0100 evas: rename macro EVAS_COMMON_CLASS - EVAS_COMMON_INTERFACE as it is one --- src/lib/evas/Evas_Eo.h | 2 +- src/lib/evas/canvas/evas_main.c| 2 +- src/lib/evas/canvas/evas_object_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index fcd6e0c..6e3166e 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -4411,7 +4411,7 @@ enum * @} */ -#define EVAS_COMMON_CLASS evas_common_class_get() +#define EVAS_COMMON_INTERFACE evas_common_class_get() const Eo_Class *evas_common_class_get(void) EINA_CONST; diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index e3f520b..50ae199 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1242,5 +1242,5 @@ static const Eo_Class_Description class_desc = { NULL }; -EO_DEFINE_CLASS(evas_class_get, class_desc, EO_BASE_CLASS, EVAS_COMMON_CLASS, NULL); +EO_DEFINE_CLASS(evas_class_get, class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index edef53b..9db95d4 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -2605,5 +2605,5 @@ static const Eo_Class_Description class_desc = { NULL }; -EO_DEFINE_CLASS(evas_object_class_get, class_desc, EO_BASE_CLASS, EVAS_COMMON_CLASS, NULL) +EO_DEFINE_CLASS(evas_object_class_get, class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL) --
[EGIT] [core/efl] master 03/06: eo: block regular non-instantiable classes in class extension list
jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5be3b666b29c4b5d2e4d5a533cdbea5a1ae890ea commit 5be3b666b29c4b5d2e4d5a533cdbea5a1ae890ea Author: Jérémy Zurcher jer...@asynk.ch Date: Tue Feb 18 16:02:56 2014 +0100 eo: block regular non-instantiable classes in class extension list --- src/lib/eo/eo.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index bfee7eb..2de799d 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -827,8 +827,12 @@ eo_class_new(const Eo_Class_Description *desc, const Eo_Class *parent_id, ...) extn = _eo_class_pointer_get((Eo_Class *)extn_id); switch (extn-desc-type) { -case EO_CLASS_TYPE_REGULAR: case EO_CLASS_TYPE_REGULAR_NO_INSTANT: + ERR(Regular non-instantiable classes ('%s') aren't allowed in class ('%s') extension list, + extn-desc-name, desc-name); + return NULL; + break; +case EO_CLASS_TYPE_REGULAR: case EO_CLASS_TYPE_INTERFACE: case EO_CLASS_TYPE_MIXIN: extn_list = eina_list_append(extn_list, extn); --
[EGIT] [core/efl] master 01/03: eina_cxx: fix build on 32bits systems.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1fb3822893a414b123f81f4b4ae4faa105e4fdc4 commit 1fb3822893a414b123f81f4b4ae4faa105e4fdc4 Author: Cedric Bail cedric.b...@free.fr Date: Wed Feb 26 12:09:26 2014 -0300 eina_cxx: fix build on 32bits systems. --- src/lib/eina_cxx/eina_value.hh | 41 + 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/src/lib/eina_cxx/eina_value.hh b/src/lib/eina_cxx/eina_value.hh index aee5b85..378c344 100644 --- a/src/lib/eina_cxx/eina_value.hh +++ b/src/lib/eina_cxx/eina_value.hh @@ -8,28 +8,15 @@ namespace efl { namespace eina { +template typename T, typename Enable = void +struct _eina_value_traits; + template typename T struct _eina_value_traits_base; template typename T struct _eina_value_traits_aux; -// Indirection for uint64_t. uint64_t can be a typedef for unsigned -// long, so we can't specialize on the same template -template -struct _eina_value_traits_auxuint64_t -{ - static ::Eina_Value_Type const* value_type() - { -return EINA_VALUE_TYPE_UINT64; - } -}; - -template typename T, typename Enable = void -struct _eina_value_traits : _eina_value_traits_auxT -{ -}; - template typename T struct _eina_value_traits_base { @@ -62,6 +49,23 @@ struct _eina_value_traits_base } }; +// Indirection for uint64_t. uint64_t can be a typedef for unsigned +// long, so we can't specialize on the same template +template +struct _eina_value_traits_auxuint64_t + : _eina_value_traits_baseuint64_t +{ + static ::Eina_Value_Type const* value_type() + { +return EINA_VALUE_TYPE_UINT64; + } +}; + +template typename T, typename Enable +struct _eina_value_traits : _eina_value_traits_auxT +{ +}; + template struct _eina_value_traitsunsigned char : _eina_value_traits_baseunsigned char @@ -241,6 +245,11 @@ public: : _raw(_eina_value_traitschar::create()) { } + template typename T + eina_value(T v) + { +primitive_init(v); + } eina_value(char v) { primitive_init(v); --
[EGIT] [core/efl] master 03/03: eina_cxx: move Eina_CXX to a bindings subdirectory.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=96b1b880a429c3b0620694add228c151c2f68e35 commit 96b1b880a429c3b0620694add228c151c2f68e35 Author: Cedric Bail cedric.b...@free.fr Date: Wed Feb 26 12:16:40 2014 -0300 eina_cxx: move Eina_CXX to a bindings subdirectory. We do expect to integrate more bindings support in EFL to make them first class citizen and make sure they get proper attention during the development cycle. It so make sense to give them a proper subdirectory. --- src/Makefile_Eina_Cxx.am | 36 ++ src/{lib = bindings}/eina_cxx/Eina.hh | 0 src/{lib = bindings}/eina_cxx/eina_accessor.hh| 0 .../eina_cxx/eina_clone_allocators.hh | 0 src/{lib = bindings}/eina_cxx/eina_error.hh | 0 src/{lib = bindings}/eina_cxx/eina_inarray.hh | 0 src/{lib = bindings}/eina_cxx/eina_inlist.hh | 0 src/{lib = bindings}/eina_cxx/eina_iterator.hh| 0 .../eina_cxx/eina_lists_auxiliary.hh | 0 src/{lib = bindings}/eina_cxx/eina_ptrarray.hh| 0 src/{lib = bindings}/eina_cxx/eina_ptrlist.hh | 0 src/{lib = bindings}/eina_cxx/eina_ref.hh | 0 src/{lib = bindings}/eina_cxx/eina_stringshare.hh | 0 src/{lib = bindings}/eina_cxx/eina_thread.hh | 0 src/{lib = bindings}/eina_cxx/eina_type_traits.hh | 0 src/{lib = bindings}/eina_cxx/eina_value.hh | 0 16 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am index ffd9111..0f19276 100644 --- a/src/Makefile_Eina_Cxx.am +++ b/src/Makefile_Eina_Cxx.am @@ -1,28 +1,26 @@ ### Library -#lib_LTLIBRARIES += lib/eina/libeina.la - installed_einacxxmainheadersdir = $(includedir)/eina_cxx-@VMAJ@ dist_installed_einacxxmainheaders_DATA = \ -lib/eina_cxx/Eina.hh +bindings/eina_cxx/Eina.hh installed_einacxxheadersdir = $(includedir)/eina_cxx-@VMAJ@/eina_cxx dist_installed_einacxxheaders_DATA = \ -lib/eina_cxx/eina_accessor.hh \ -lib/eina_cxx/eina_clone_allocators.hh \ -lib/eina_cxx/eina_error.hh \ -lib/eina_cxx/eina_inarray.hh \ -lib/eina_cxx/eina_inlist.hh \ -lib/eina_cxx/eina_iterator.hh \ -lib/eina_cxx/eina_lists_auxiliary.hh \ -lib/eina_cxx/eina_ptrarray.hh \ -lib/eina_cxx/eina_ptrlist.hh \ -lib/eina_cxx/eina_ref.hh \ -lib/eina_cxx/eina_stringshare.hh \ -lib/eina_cxx/eina_thread.hh \ -lib/eina_cxx/eina_type_traits.hh \ -lib/eina_cxx/eina_value.hh +bindings/eina_cxx/eina_accessor.hh \ +bindings/eina_cxx/eina_clone_allocators.hh \ +bindings/eina_cxx/eina_error.hh \ +bindings/eina_cxx/eina_inarray.hh \ +bindings/eina_cxx/eina_inlist.hh \ +bindings/eina_cxx/eina_iterator.hh \ +bindings/eina_cxx/eina_lists_auxiliary.hh \ +bindings/eina_cxx/eina_ptrarray.hh \ +bindings/eina_cxx/eina_ptrlist.hh \ +bindings/eina_cxx/eina_ref.hh \ +bindings/eina_cxx/eina_stringshare.hh \ +bindings/eina_cxx/eina_thread.hh \ +bindings/eina_cxx/eina_type_traits.hh \ +bindings/eina_cxx/eina_value.hh ### Unit tests @@ -46,8 +44,8 @@ tests/eina_cxx/eina_cxx_test_thread.cc \ tests/eina_cxx/eina_cxx_test_eina_value.cc tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ --I$(top_builddir)/src/lib/eina_cxx \ --I$(top_srcdir)/src/lib/eina_cxx \ +-I$(top_builddir)/src/bindings/eina_cxx \ +-I$(top_srcdir)/src/bindings/eina_cxx \ -DTESTS_WD=\`pwd`\ \ -DTESTS_SRC_DIR=\$(top_srcdir)/src/tests/eina_cxx\ \ -DPACKAGE_BUILD_DIR=\`pwd`/$(top_builddir)/src/tests/eina_cxx\ \ diff --git a/src/lib/eina_cxx/Eina.hh b/src/bindings/eina_cxx/Eina.hh similarity index 100% rename from src/lib/eina_cxx/Eina.hh rename to src/bindings/eina_cxx/Eina.hh diff --git a/src/lib/eina_cxx/eina_accessor.hh b/src/bindings/eina_cxx/eina_accessor.hh similarity index 100% rename from src/lib/eina_cxx/eina_accessor.hh rename to src/bindings/eina_cxx/eina_accessor.hh diff --git a/src/lib/eina_cxx/eina_clone_allocators.hh b/src/bindings/eina_cxx/eina_clone_allocators.hh similarity index 100% rename from src/lib/eina_cxx/eina_clone_allocators.hh rename to src/bindings/eina_cxx/eina_clone_allocators.hh diff --git a/src/lib/eina_cxx/eina_error.hh b/src/bindings/eina_cxx/eina_error.hh similarity index 100% rename from src/lib/eina_cxx/eina_error.hh rename to src/bindings/eina_cxx/eina_error.hh diff --git a/src/lib/eina_cxx/eina_inarray.hh b/src/bindings/eina_cxx/eina_inarray.hh similarity index 100% rename from src/lib/eina_cxx/eina_inarray.hh rename to src/bindings/eina_cxx/eina_inarray.hh diff --git a/src/lib/eina_cxx/eina_inlist.hh b/src/bindings/eina_cxx/eina_inlist.hh similarity index 100% rename from src/lib/eina_cxx/eina_inlist.hh rename to src/bindings/eina_cxx/eina_inlist.hh diff --git a/src/lib/eina_cxx/eina_iterator.hh b/src/bindings/eina_cxx/eina_iterator.hh similarity index 100% rename from src/lib/eina_cxx/eina_iterator.hh rename to src/bindings/eina_cxx/eina_iterator.hh diff --git
[EGIT] [core/efl] master 02/03: eina_cxx: fix build with clang.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97ede98b5df45c3ba0da5aec3cf8fbcd30f6bd44 commit 97ede98b5df45c3ba0da5aec3cf8fbcd30f6bd44 Author: Cedric Bail cedric.b...@free.fr Date: Wed Feb 26 12:12:21 2014 -0300 eina_cxx: fix build with clang. --- src/lib/eina_cxx/eina_clone_allocators.hh | 2 +- src/lib/eina_cxx/eina_inarray.hh | 3 ++- src/lib/eina_cxx/eina_ptrarray.hh | 8 src/lib/eina_cxx/eina_ptrlist.hh | 12 ++-- src/lib/eina_cxx/eina_thread.hh | 14 +++--- src/lib/eina_cxx/eina_value.hh| 5 + 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/lib/eina_cxx/eina_clone_allocators.hh b/src/lib/eina_cxx/eina_clone_allocators.hh index 6f7aba4..459b635 100644 --- a/src/lib/eina_cxx/eina_clone_allocators.hh +++ b/src/lib/eina_cxx/eina_clone_allocators.hh @@ -46,7 +46,7 @@ struct view_clone_allocator return const_castT*(v); } template typename T - static void deallocate_clone(T* p) + static void deallocate_clone(T*) { } }; diff --git a/src/lib/eina_cxx/eina_inarray.hh b/src/lib/eina_cxx/eina_inarray.hh index 3619358..4b59be6 100644 --- a/src/lib/eina_cxx/eina_inarray.hh +++ b/src/lib/eina_cxx/eina_inarray.hh @@ -375,7 +375,8 @@ public: } for(size_type i = 0;i != n;++i) new (*first++) T(t); -assert(last - first == _array-len - index - n); +std::size_t diff = last - first; +assert(diff == _array-len - index - n); while(first != last) { new (*first++) T(*old_first); diff --git a/src/lib/eina_cxx/eina_ptrarray.hh b/src/lib/eina_cxx/eina_ptrarray.hh index 7b0e88b..85ed8b6 100644 --- a/src/lib/eina_cxx/eina_ptrarray.hh +++ b/src/lib/eina_cxx/eina_ptrarray.hh @@ -233,10 +233,10 @@ public: } void push_back(pointer p) { -std::auto_ptrvalue_type p1(p); +std::unique_ptrvalue_type p1(p); push_back(p1); } - void push_back(std::auto_ptrT p) + void push_back(std::unique_ptrT p) { if(eina_array_push(this-_impl._array, p.get())) p.release(); @@ -253,10 +253,10 @@ public: } iterator insert(iterator i, pointer pv) { -std::auto_ptrvalue_type p(pv); +std::unique_ptrvalue_type p(pv); return insert(i, p); } - iterator insert(iterator i, std::auto_ptrvalue_type p) + iterator insert(iterator i, std::unique_ptrvalue_type p) { std::size_t j = i.native_handle() - this-_impl._array-data diff --git a/src/lib/eina_cxx/eina_ptrlist.hh b/src/lib/eina_cxx/eina_ptrlist.hh index b913287..0ae0319 100644 --- a/src/lib/eina_cxx/eina_ptrlist.hh +++ b/src/lib/eina_cxx/eina_ptrlist.hh @@ -225,10 +225,10 @@ public: } void push_back(pointer p) { -std::auto_ptrvalue_type p1(p); +std::unique_ptrvalue_type p1(p); push_back(p1); } - void push_back(std::auto_ptrT p) + void push_back(std::unique_ptrT p) { Eina_List* new_list = eina_list_append(this-_impl._list, p.get()); if(new_list) @@ -245,10 +245,10 @@ public: } void push_front(pointer p) { -std::auto_ptrvalue_type p1(p); +std::unique_ptrvalue_type p1(p); push_front(p1); } - void push_front(std::auto_ptrT p) + void push_front(std::unique_ptrT p) { Eina_List* new_list = eina_list_prepend(this-_impl._list, p.get()); if(new_list) @@ -273,10 +273,10 @@ public: } iterator insert(iterator i, pointer pv) { -std::auto_ptrvalue_type p(pv); +std::unique_ptrvalue_type p(pv); return insert(i, p); } - iterator insert(iterator i, std::auto_ptrvalue_type p) + iterator insert(iterator i, std::unique_ptrvalue_type p) { this-_impl._list = _eina_list_prepend_relative_list (this-_impl._list, p.get(), i.native_handle()); diff --git a/src/lib/eina_cxx/eina_thread.hh b/src/lib/eina_cxx/eina_thread.hh index bb630a5..84bd0e5 100644 --- a/src/lib/eina_cxx/eina_thread.hh +++ b/src/lib/eina_cxx/eina_thread.hh @@ -167,6 +167,13 @@ struct thread_id } private: Eina_Thread _raw; + + template typename charT, typename Traits + friend std::basic_ostreamcharT, Traits + operator(std::basic_ostreamcharT, Traits out, thread_id id) + { +return out id._raw; + } }; inline bool operator=(thread_id lhs, thread_id rhs) @@ -182,13 +189,6 @@ inline bool operator=(thread_id lhs, thread_id rhs) return !(lhs rhs); } -template typename charT, typename Traits -std::basic_ostreamcharT, Traits -operator(std::basic_ostreamcharT, Traits out, thread_id id) -{ - return out id._raw; -} - namespace _detail { struct arguments diff --git a/src/lib/eina_cxx/eina_value.hh b/src/lib/eina_cxx/eina_value.hh index 378c344..b202f2e 100644 --- a/src/lib/eina_cxx/eina_value.hh +++ b/src/lib/eina_cxx/eina_value.hh @@ -232,6 +232,11 @@ struct _eina_value_traitsT[], typename eina::enable_ifeina::is_podT::value: } }; +class eina_value; + +template typename T +T
Re: [E-devel] [EGIT] [core/efl] master 03/03: eina_cxx: move Eina_CXX to a bindings subdirectory.
On 26/02/14 15:19, Cedric BAIL wrote: --I$(top_builddir)/src/lib/eina_cxx \ --I$(top_srcdir)/src/lib/eina_cxx \ +-I$(top_builddir)/src/bindings/eina_cxx \ +-I$(top_srcdir)/src/bindings/eina_cxx \ Awesome, thank you very much. By the way, you could just use $(srcdir) and $(buildir) which point to the location of the makefile, instead of top_* and then changing the whole path. -- Tom. -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 05/06: eo: add tests for eo_composite_detach
Hello. On Wed, 2014-02-26 at 07:11, JXXrXXmy Zurcher wrote: jeyzu pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=13502a159c2a8e1c1bd18f63235815d43ce87273 commit 13502a159c2a8e1c1bd18f63235815d43ce87273 Author: Jérémy Zurcher jer...@asynk.ch Date: Wed Feb 19 10:12:47 2014 +0100 eo: add tests for eo_composite_detach --- src/tests/eo/composite_objects/composite_objects_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c index 1d5b8c0..ba96eb4 100644 --- a/src/tests/eo/composite_objects/composite_objects_main.c +++ b/src/tests/eo/composite_objects/composite_objects_main.c @@ -54,7 +54,8 @@ main(int argc, char *argv[]) fail_if(cb_called); fail_if(!eo_composite_is(simple)); - eo_composite_detach(simple, obj); + fail_if(!eo_composite_detach(simple, obj)); + fail_if(eo_composite_detach(simple, obj)); fail_if(eo_composite_is(simple)); fail_if(!eo_composite_attach(simple, obj)); fail_if(!eo_composite_is(simple)); One of your eo_composite changes now breaks the eo_composite test on jenkins on all 32 bit builds. Please have a look. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: bugfix: pointer warp speed config slider correctly detects changed state
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9d3363d6aed08ccf696ada94250fba9adc35c76a commit 9d3363d6aed08ccf696ada94250fba9adc35c76a Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:08:01 2014 -0500 bugfix: pointer warp speed config slider correctly detects changed state fix T1020 --- src/modules/conf_window_manipulation/e_int_config_focus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c index 97b6bda..a093c8f 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -204,7 +204,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c (e_config-focus_revert_on_hide_or_close != cfdata-focus_revert_on_hide_or_close) || (e_config-pointer_slide != cfdata-pointer_slide) || (e_config-disable_all_pointer_warps != cfdata-disable_all_pointer_warps) || - (fabs(e_config-pointer_warp_speed - cfdata-pointer_warp_speed) DBL_EPSILON) || + (fabs(e_config-pointer_warp_speed - cfdata-pointer_warp_speed) DBL_EPSILON) || (e_config-use_auto_raise != cfdata-use_auto_raise) || (e_config-auto_raise_delay != cfdata-auto_raise_delay) || (e_config-border_raise_on_mouse_action != cfdata-border_raise_on_mouse_action); --
[EGIT] [core/enlightenment] master 05/10: track current nocomp client
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a52ede0c66e8fed26df354794315c94c575e631a commit a52ede0c66e8fed26df354794315c94c575e631a Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:40:17 2014 -0500 track current nocomp client --- src/bin/e_comp.c | 6 +- src/bin/e_comp.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 6f9ead7..12372f5 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -228,6 +228,7 @@ _e_comp_cb_nocomp_begin(E_Comp *c) ecf = _e_comp_fullscreen_check(c); if (!ecf) return; + c-nocomp_ec = ecf; E_CLIENT_FOREACH(c, ec) if (ec != ecf) e_client_redirected_set(ec, 0); @@ -472,7 +473,10 @@ nocomp: c-nocomp_want = 0; E_FREE_FUNC(c-nocomp_delay_timer, ecore_timer_del); if (c-nocomp) - _e_comp_cb_nocomp_end(c); + { + _e_comp_cb_nocomp_end(c); + c-nocomp_ec = NULL; + } } return ECORE_CALLBACK_RENEW; diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h index 1ee47a5..b69d030 100644 --- a/src/bin/e_comp.h +++ b/src/bin/e_comp.h @@ -99,6 +99,7 @@ struct _E_Comp int block_count; //number of times block window has been requested Ecore_Window cm_selection; //FIXME: move to comp_x ? + E_Client *nocomp_ec; int depth; unsigned intinput_key_grabs; --
[EGIT] [core/enlightenment] master 10/10: manage comp overrides for comp objects
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c01a1fcc6c27be8d5dfba5ef8d35788a130d4521 commit c01a1fcc6c27be8d5dfba5ef8d35788a130d4521 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:45:50 2014 -0500 manage comp overrides for comp objects fix T1019 --- src/bin/e_comp_object.c | 20 1 file changed, 20 insertions(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 98f0ea2..7beecce 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2090,6 +2090,17 @@ _e_comp_object_util_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object } static void +_e_comp_object_util_restack(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + if (e_comp_util_object_is_above_nocomp(obj) + (!evas_object_data_get(obj, comp_override))) + { +evas_object_data_set(obj, comp_override, (void*)1); +e_comp_override_add(e_comp_util_evas_object_comp_get(obj)); + } +} + +static void _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj) { Eina_Bool ref = EINA_TRUE; @@ -2112,6 +2123,11 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj) if (ref) evas_object_ref(obj); edje_object_signal_emit(obj, e,state,visible, e); evas_object_data_set(obj, comp_showing, (void*)1); + if (e_comp_util_object_is_above_nocomp(obj)) + { +evas_object_data_set(obj, comp_override, (void*)1); +e_comp_override_add(e_comp_util_evas_object_comp_get(obj)); + } } static void @@ -2123,6 +2139,9 @@ _e_comp_object_util_hide(void *data EINA_UNUSED, Evas_Object *obj) evas_object_data_del(obj, comp_showing); edje_object_signal_emit(obj, e,state,hidden, e); evas_object_data_set(obj, comp_hiding, (void*)1); + + if (evas_object_data_del(obj, comp_override)) + e_comp_override_timed_pop(e_comp_util_evas_object_comp_get(obj)); } static void @@ -2275,6 +2294,7 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE, _e_comp_object_util_moveresize, z); evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_comp_object_util_del, z); evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _e_comp_object_util_moveresize, z); + evas_object_event_callback_add(o, EVAS_CALLBACK_RESTACK, _e_comp_object_util_restack, z); e_comp_object_signal_emit(o, e,state,hidden, e); --
[EGIT] [core/enlightenment] master 08/10: use comp overrides when grabbing comp input
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6a90f66cc494be53a23d1a99385f6b37d89c3718 commit 6a90f66cc494be53a23d1a99385f6b37d89c3718 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:43:11 2014 -0500 use comp overrides when grabbing comp input --- src/bin/e_comp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 9b162be..7d6b877 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1738,6 +1738,7 @@ e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd) mwin = c-ee_win; if (kbd || c-input_mouse_grabs) kwin = c-ee_win; + e_comp_override_add(c); if ((c-input_mouse_grabs c-input_key_grabs) || e_grabinput_get(mwin, 0, kwin)) { @@ -1763,6 +1764,7 @@ e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd) c-input_mouse_grabs -= mouse; if (c-input_key_grabs) c-input_key_grabs -= kbd; + e_comp_override_timed_pop(c); if ((!mwin) (!kwin)) return; e_grabinput_release(mwin, kwin); evas_event_feed_mouse_out(c-evas, 0, NULL); --
[EGIT] [core/enlightenment] master 04/10: allow nocomp on some overrides
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a22181c0da05ab6cd4c64c8039e22c81ab780822 commit a22181c0da05ab6cd4c64c8039e22c81ab780822 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:26:55 2014 -0500 allow nocomp on some overrides --- src/bin/e_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 1d996a9..6f9ead7 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -173,7 +173,7 @@ _e_comp_fullscreen_check(E_Comp *c) { Evas_Object *o = ec-frame; -if (e_client_util_ignored_get(ec) || (!evas_object_visible_get(ec-frame))) +if (ec-ignored || ec-input_only || (!evas_object_visible_get(ec-frame))) continue; if (!e_comp_util_client_is_fullscreen(ec)) return NULL; while (o) --
[EGIT] [core/enlightenment] master 02/10: bugfix: pointer warp speed config slider correctly detects changed state
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1920e62c80345d20f99426768036742e0b666f9d commit 1920e62c80345d20f99426768036742e0b666f9d Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:06:46 2014 -0500 bugfix: pointer warp speed config slider correctly detects changed state fix T1020 --- src/modules/conf_window_manipulation/e_int_config_focus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c index 51b7162..b859e16 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -207,7 +207,7 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c (e_config-focus_revert_on_hide_or_close != cfdata-focus_revert_on_hide_or_close) || (e_config-pointer_slide != cfdata-pointer_slide) || (e_config-disable_all_pointer_warps != cfdata-disable_all_pointer_warps) || - (fabs(e_config-pointer_warp_speed - cfdata-pointer_warp_speed) DBL_EPSILON) || + (fabs(e_config-pointer_warp_speed - cfdata-pointer_warp_speed) DBL_EPSILON) || (e_config-use_auto_raise != cfdata-use_auto_raise) || (e_config-auto_raise_delay != cfdata-auto_raise_delay) || (e_config-border_raise_on_mouse_action != cfdata-border_raise_on_mouse_action) || --
[EGIT] [core/enlightenment] master 09/10: +e_comp_util_object_is_above_nocomp()
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=def17d763b8b9cffc177190f82df7137001cbaee commit def17d763b8b9cffc177190f82df7137001cbaee Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:45:23 2014 -0500 +e_comp_util_object_is_above_nocomp() --- src/bin/e_comp.c | 28 src/bin/e_comp.h | 1 + 2 files changed, 29 insertions(+) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 7d6b877..e20c487 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1829,3 +1829,31 @@ e_comp_client_redirect_toggle(E_Client *ec) ec-no_shape_cut = !ec-redirected; e_comp_shape_queue(ec-comp); } + +EAPI Eina_Bool +e_comp_util_object_is_above_nocomp(Evas_Object *obj) +{ + E_Comp *comp; + Evas_Object *o; + int cl, ol; + + EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); + if (!evas_object_visible_get(obj)) return EINA_FALSE; + comp = e_comp_util_evas_object_comp_get(obj); + if (!comp-nocomp_ec) return EINA_FALSE; + cl = evas_object_layer_get(comp-nocomp_ec-frame); + ol = evas_object_layer_get(obj); + if (cl ol) return EINA_FALSE; + o = evas_object_above_get(comp-nocomp_ec-frame); + if ((cl == ol) (evas_object_layer_get(o) == cl)) + { +do { + if (o == obj) + return EINA_TRUE; + o = evas_object_above_get(o); +} while (o (evas_object_layer_get(o) == cl)); + } + else + return EINA_TRUE; + return EINA_FALSE; +} diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h index b69d030..3cb0238 100644 --- a/src/bin/e_comp.h +++ b/src/bin/e_comp.h @@ -167,6 +167,7 @@ EAPI E_Comp *e_comp_evas_find(const Evas *e); EAPI void e_comp_button_bindings_grab_all(void); EAPI void e_comp_button_bindings_ungrab_all(void); EAPI void e_comp_client_redirect_toggle(E_Client *ec); +EAPI Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj); EINTERN Evas_Object *e_comp_style_selector_create(Evas *evas, const char **source); EAPI E_Config_Dialog *e_int_config_comp(E_Comp *comp, const char *params); --
[EGIT] [core/enlightenment] master 06/10: reduce comp override pop timer, successive pops trigger instapop
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a331627e09de6d283318945c0673121289f3610b commit a331627e09de6d283318945c0673121289f3610b Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:41:49 2014 -0500 reduce comp override pop timer, successive pops trigger instapop --- src/bin/e_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 12372f5..e85ca7e 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1688,9 +1688,9 @@ e_comp_override_timed_pop(E_Comp *c) EINA_SAFETY_ON_NULL_RETURN(c); if (c-nocomp_override = 0) return; if (c-nocomp_override_timer) - ecore_timer_reset(c-nocomp_override_timer); + c-nocomp_override--; else - c-nocomp_override_timer = ecore_timer_add(5.0, _e_comp_override_expire, c); + c-nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, c); } EAPI unsigned int --
[EGIT] [core/enlightenment] master 01/10: set winlist input window as child of root, not comp overlay win
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ef520ba331f074fbb6213a5c9b30a58097af7187 commit ef520ba331f074fbb6213a5c9b30a58097af7187 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 10:51:19 2014 -0500 set winlist input window as child of root, not comp overlay win T1019 --- src/modules/winlist/e_winlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c index ee00884..afb9303 100644 --- a/src/modules/winlist/e_winlist.c +++ b/src/modules/winlist/e_winlist.c @@ -103,7 +103,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter) if (_winlist) return 0; - _input_window = ecore_x_window_input_new(zone-comp-win, 0, 0, 1, 1); + _input_window = ecore_x_window_input_new(zone-comp-man-root, 0, 0, 1, 1); ecore_x_window_show(_input_window); if (!e_grabinput_get(_input_window, 0, _input_window)) { --
[EGIT] [core/enlightenment] master 03/10: set client-redirected on overrides
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ef26b0fb1ef18bf6ff0ddaa8cd7d28f44efb85b7 commit ef26b0fb1ef18bf6ff0ddaa8cd7d28f44efb85b7 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:26:36 2014 -0500 set client-redirected on overrides --- src/bin/e_comp_x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 0611b4e..f69e0a1 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1163,6 +1163,7 @@ _e_comp_x_show_helper(E_Client *ec) } else if (ec-override) { +ec-redirected = !ec-input_only; ec-changes.visible = ec-visible = 1; EC_CHANGED(ec); if (!ec-comp_data-first_map) --
[EGIT] [core/enlightenment] master 07/10: use one comp override per comp, not per zone, when toggling screensaver fading
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7604e7a6f71f3caff7b6fd0ee84d35a3590daac7 commit 7604e7a6f71f3caff7b6fd0ee84d35a3590daac7 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Feb 26 11:42:44 2014 -0500 use one comp override per comp, not per zone, when toggling screensaver fading --- src/bin/e_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index e85ca7e..9b162be 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -820,12 +820,12 @@ _e_comp_screensaver_on(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_LIST_FOREACH(compositors, l, c) { if (c-saver) continue; +e_comp_override_add(c); c-saver = EINA_TRUE; if (c-render_animator) ecore_animator_freeze(c-render_animator); EINA_LIST_FOREACH(c-zones, ll, zone) { - e_comp_override_add(c); e_zone_fade_handle(zone, 1, 3.0); edje_object_signal_emit(zone-base, e,state,screensaver,on, e); edje_object_signal_emit(zone-over, e,state,screensaver,on, e); @@ -848,6 +848,7 @@ _e_comp_screensaver_off(void *data EINA_UNUSED, int type EINA_UNUSED, void *even { E_Client *ec; if (!c-saver) continue; +e_comp_override_timed_pop(c); c-saver = EINA_FALSE; if (!c-nocomp) ecore_evas_manual_render_set(c-ee, EINA_FALSE); @@ -856,7 +857,6 @@ _e_comp_screensaver_off(void *data EINA_UNUSED, int type EINA_UNUSED, void *even edje_object_signal_emit(zone-base, e,state,screensaver,off, e); edje_object_signal_emit(zone-over, e,state,screensaver,off, e); e_zone_fade_handle(zone, 0, 0.5); - e_comp_override_timed_pop(c); } E_CLIENT_FOREACH(c, ec) if (e_comp_object_damage_exists(ec-frame)) --
[EGIT] [core/efl] master 01/01: eina_cxx: oops forgotten path.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3312ba4c56f352d774ef72273242392c2a110f96 commit 3312ba4c56f352d774ef72273242392c2a110f96 Author: Cedric Bail cedric.b...@free.fr Date: Wed Feb 26 14:42:29 2014 -0300 eina_cxx: oops forgotten path. --- src/examples/eina_cxx/Makefile.am | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/examples/eina_cxx/Makefile.am b/src/examples/eina_cxx/Makefile.am index b42b6e7..03b3bbd 100644 --- a/src/examples/eina_cxx/Makefile.am +++ b/src/examples/eina_cxx/Makefile.am @@ -1,15 +1,14 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = \ +AM_CXXFLAGS = \ -I$(top_builddir)/src/lib/efl \ -I. \ -I$(top_srcdir)/src/lib/eina \ -I$(top_builddir)/src/lib/eina \ --I$(top_srcdir)/src/lib/eina_cxx \ --I$(top_builddir)/src/lib/eina_cxx +-I$(top_srcdir)/src/bindings/eina_cxx \ +-I$(top_builddir)/src/bindings/eina_cxx LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LDFLAGS@ -AM_CXXFLAGS = SRCS = \ eina_cxx_list_01.cc --
Re: [E-devel] Image editing for e
On Mon, 24 Feb 2014 08:51:24 +0100 Hendrik Siedelmann hendrik.siedelm...@googlemail.com said: oh. cool bananas! thought i think you have some bugs... : http://www.enlightenment.org/ss/e-530e3cdc1434c8.05020334.png :) your argb byte ordering is... broken when messing with the image pixels. :( rememebr that with evas (and efl) pixels are INTS not bytes. int. an int is 32bit. the MSB (high byte withn the int) is A, then R then G then B ie for 32bits the bits rom highest to lowest are: or int pixel; a = (pixel 24); r = (pixel 16) 0xff; g = (pixel 8) 0xff; b = pixel 0xff; and reverse: pixel = (a 24) | (r 16) | (g 8) | b; :) yes... you can access byte by byte too - but you need to account for endianess then as it changes between x86 and ppc, mips, some arm implementations etc. etc. :) there ae macros in evas src like A_VAL(), R_VAL() G_VAL() that do this internally as needed if you look. :) then macros for merging together again. Hello everybody! I present you a image editing tool/library for e! It is still very experimental, but I have used it to sort trough my images on a long trip so maybe it can be useful for more someone. It allows simple image editing tasks (like sharpen, denoise, rotate,... ), works completely non-destructive and saves tags and the filter chain in xmp sidecar files. Code is here: https://github.com/Gridrix/lime.git The program is based on scale-invariant image editing which I descibe in this paper: http://elib.uni-stuttgart.de/opus/volltexte/2013/8717/pdf/STUD_2369.pdf Have fun! Hendrik -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ 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 -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 02/03: utils: Check retrun value of edje_object_file_set
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=d1810ed034156a45c518a122f525f5a39aef5cae commit d1810ed034156a45c518a122f525f5a39aef5cae Author: Stefan Schmidt ste...@datenfreihafen.org Date: Thu Jan 30 11:38:07 2014 +0100 utils: Check retrun value of edje_object_file_set In this case it not really useful as the functions returns void and this is the last instruction anyway. Still better to have this in to set good examples in the code. CID 1100661 --- src/bin/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/utils.c b/src/bin/utils.c index 67fb71c..66f2f89 100644 --- a/src/bin/utils.c +++ b/src/bin/utils.c @@ -37,7 +37,7 @@ theme_reload(Evas_Object *edje) edje_object_file_get(edje, file, group); INF(file=%s, group=%s, file, group); - edje_object_file_set(edje, file, group); + if (!edje_object_file_set(edje, file, group)) return; } static void --
[EGIT] [apps/terminology] master 01/03: options_wallpaper: Check retrun value of edje_object_file_set
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=99869d3dff1e0d7db18a3b6a30df23521bb929c8 commit 99869d3dff1e0d7db18a3b6a30df23521bb929c8 Author: Stefan Schmidt ste...@datenfreihafen.org Date: Thu Jan 30 11:24:47 2014 +0100 options_wallpaper: Check retrun value of edje_object_file_set edje_object_file_set can fail. Better check for the return value and act accordingly. CID 1147527 --- src/bin/options_wallpaper.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/options_wallpaper.c b/src/bin/options_wallpaper.c index 7dc6f9f..6bec4fb 100644 --- a/src/bin/options_wallpaper.c +++ b/src/bin/options_wallpaper.c @@ -132,7 +132,11 @@ _grid_content_get(void *data, Evas_Object *obj, const char *part) config-theme); o = elm_layout_add(obj); oe = elm_layout_edje_get(o); - edje_object_file_set(oe, path, terminology/background); + if (!edje_object_file_set(oe, path, terminology/background)) + { + evas_object_del(o); + return NULL; + } evas_object_show(o); return o; } --
[EGIT] [apps/terminology] master 03/03: tyls: Make sure we never divide by zero
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=f1deb3ca3e5ebed830d745603cda6993d5b0186f commit f1deb3ca3e5ebed830d745603cda6993d5b0186f Author: Stefan Schmidt ste...@datenfreihafen.org Date: Thu Jan 30 13:19:19 2014 +0100 tyls: Make sure we never divide by zero Avoid the case where cols is 0 and we divide through it. CID 1100655 --- src/bin/tyls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/tyls.c b/src/bin/tyls.c index 82ef6c7..d046163 100644 --- a/src/bin/tyls.c +++ b/src/bin/tyls.c @@ -640,6 +640,7 @@ list_dir(const char *dir, int mode) stuff--; } if (cols num) cols = num; +if (cols == 0) cols = 1; rows = ((num + (cols - 1)) / cols); for (i = 0; i rows; i++) { --
[EGIT] [bindings/python/python-efl] master 01/01: Python-EFL: Fileselector 1,9 API additions.
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=684aee077e98ab332d683d901f3f7f3cfeb9d405 commit 684aee077e98ab332d683d901f3f7f3cfeb9d405 Author: davemds d...@gurumeditation.it Date: Wed Feb 26 21:37:04 2014 +0100 Python-EFL: Fileselector 1,9 API additions. * added property thumbnail_size * added function custom_filter_append * splitted the 3 tests in 3 different files * test rewritten to better match the C one. NOTE: custom_filter_append is leaking...need to find a proper way to unref Added a note in the TODO for this issue. --- TODO| 2 + efl/elementary/fileselector.pxd | 7 +- efl/elementary/fileselector.pyx | 67 - examples/elementary/test.py | 4 +- examples/elementary/test_fileselector.py| 317 +++- examples/elementary/test_fileselector_button.py | 82 ++ examples/elementary/test_fileselector_entry.py | 84 +++ 7 files changed, 385 insertions(+), 178 deletions(-) diff --git a/TODO b/TODO index 73ccafb..39af69c 100644 --- a/TODO +++ b/TODO @@ -3,6 +3,8 @@ BUGS * EdjeEdit: PartState API does not work * Elm.Map: overlays_show segfaults, scrollers in examples are jumpy +* Entry.markup_filter_append() and Fileselector.custom_filter_append() are + leaking badly, fix and check all other place that have the same issue. Failing unit tests -- diff --git a/efl/elementary/fileselector.pxd b/efl/elementary/fileselector.pxd index 93eecde..30bc290 100644 --- a/efl/elementary/fileselector.pxd +++ b/efl/elementary/fileselector.pxd @@ -1,9 +1,11 @@ from efl.eina cimport Eina_Bool, const_Eina_List -from efl.evas cimport Evas_Object, const_Evas_Object +from efl.evas cimport Evas_Object, const_Evas_Object, Evas_Coord from enums cimport Elm_Fileselector_Mode, Elm_Fileselector_Sort from libc.string cimport const_char cdef extern from Elementary.h: +ctypedef Eina_Bool (*Elm_Fileselector_Filter_Func)(const_char *path, Eina_Bool dir, void *data) + Evas_Object * elm_fileselector_add(Evas_Object *parent) voidelm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save) Eina_Bool elm_fileselector_is_save_get(const_Evas_Object *obj) @@ -23,8 +25,11 @@ cdef extern from Elementary.h: const_char *elm_fileselector_selected_get(const_Evas_Object *obj) const_Eina_List * elm_fileselector_selected_paths_get(const_Evas_Object *obj) Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object *obj, const_char *mime_types, const_char *filter_name) +Eina_Bool elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const_char *filter_name) voidelm_fileselector_filters_clear(Evas_Object *obj) voidelm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible) Eina_Bool elm_fileselector_hidden_visible_get(const_Evas_Object *obj) Elm_Fileselector_Sort elm_fileselector_sort_method_get(const_Evas_Object *obj) voidelm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort method) +voidelm_fileselector_thumbnail_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) +void elm_fileselector_thumbnail_size_get(const_Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index 62b3dbc..7c50ad3 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -138,7 +138,7 @@ Fileselector sort method -from cpython cimport PyUnicode_AsUTF8String +from cpython cimport PyUnicode_AsUTF8String, Py_INCREF from libc.stdint cimport uintptr_t from efl.eo cimport _object_mapping_register @@ -148,6 +148,8 @@ from layout_class cimport LayoutClass cimport enums +import traceback + ELM_FILESELECTOR_LIST = enums.ELM_FILESELECTOR_LIST ELM_FILESELECTOR_GRID = enums.ELM_FILESELECTOR_GRID @@ -165,6 +167,15 @@ def _cb_string_conv(uintptr_t addr): cdef const_char *s = const_char *addr return _ctouni(s) if s is not NULL else None +cdef Eina_Bool py_elm_fileselector_custom_filter_cb(const_char *path, Eina_Bool is_dir, void *data) with gil: +cb_func, cb_data = objectdata +try: +return cb_func(_ctouni(path), is_dir, cb_data) +except: +traceback.print_exc() +return 0 + + cdef class Fileselector(LayoutClass): This is the class that actually implements the widget. @@ -425,6 +436,7 @@ cdef class Fileselector(LayoutClass): .. note:: first added filter will be the default filter at the moment. :seealso:
[EGIT] [bindings/python/python-efl] master 01/01: Python-EFL: fix Fileselector.mime_types_filter_append() to work with py3
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=ad592d50aa7e02f19c3d36796ee4d6b58b3292ab commit ad592d50aa7e02f19c3d36796ee4d6b58b3292ab Author: davemds d...@gurumeditation.it Date: Wed Feb 26 21:43:31 2014 +0100 Python-EFL: fix Fileselector.mime_types_filter_append() to work with py3 --- efl/elementary/fileselector.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index 7c50ad3..0ad9a2e 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -443,7 +443,7 @@ cdef class Fileselector(LayoutClass): mime_types_s = ,.join(mime_types) -if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types) +if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types_s) if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name) if not elm_fileselector_mime_types_filter_append(self.obj, mime_types_s, const_char *filter_name if filter_name is not None else NULL): --
[EGIT] [bindings/python/python-efl] python-efl-1.8 01/01: Python-EFL: fix Fileselector.mime_types_filter_append() to work with py3
davemds pushed a commit to branch python-efl-1.8. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=a54bd1a126d043fddd409404c46b7bb511d99e8c commit a54bd1a126d043fddd409404c46b7bb511d99e8c Author: davemds d...@gurumeditation.it Date: Wed Feb 26 21:46:31 2014 +0100 Python-EFL: fix Fileselector.mime_types_filter_append() to work with py3 --- efl/elementary/fileselector.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx index 6ba429d..5756234 100644 --- a/efl/elementary/fileselector.pyx +++ b/efl/elementary/fileselector.pyx @@ -348,7 +348,7 @@ cdef class Fileselector(LayoutClass): mime_types_s = ,.join(mime_types) -if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types) +if isinstance(mime_types_s, unicode): mime_types_s = PyUnicode_AsUTF8String(mime_types_s) if isinstance(filter_name, unicode): filter_name = PyUnicode_AsUTF8String(filter_name) if not elm_fileselector_mime_types_filter_append(self.obj, mime_types_s, const_char *filter_name if filter_name is not None else NULL): --
[E-devel] `external type 'elm/toolbar' not registered' in compiled programs
Hello, Today I have cloned EFL git repository and compiled commit 96b1b880a429c3b0620694add228c151c2f68e35. Before that I have installed EFL using Ubuntu official repository and also non-official ppa:vase/ppa repository and removed and reinstalled individual packages a few times. After off all these I can't see any icons in running EFL programs I wrote using various layouts. For example when I use this: elm_layout_theme_set (ly, layout, application, toolbar-content-back); I get the following error: ERR18997:edje lib/edje/edje_external.c:449 _edje_external_type_add() external type 'elm/toolbar' not registered I am running Ubuntu 12.04.1. What files are missing on my machine? How to fix it? -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_cxx: add main_loop_thread_safe_call_sync and main_loop_thread_safe_call_async with tests
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=91f5a9b0431ed6ba1adab28fff0a3fab7fc65211 commit 91f5a9b0431ed6ba1adab28fff0a3fab7fc65211 Author: Felipe Magno de Almeida fel...@expertisesolutions.com.br Date: Wed Feb 26 18:37:21 2014 -0300 ecore_cxx: add main_loop_thread_safe_call_sync and main_loop_thread_safe_call_async with tests The point of this binding is to enable the support for easy lambda for ecore function that wont be using Eo. See the tests on how to use those. Reviewers: cedric, raster CC: savio, cedric Differential Revision: https://phab.enlightenment.org/D582 Signed-off-by: Cedric Bail cedric.b...@free.fr --- src/Makefile.am | 1 + src/Makefile_Ecore_Cxx.am | 36 + src/bindings/ecore_cxx/Ecore.hh | 123 +++ src/tests/ecore_cxx/ecore_cxx_suite.cc | 103 + src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc | 193 5 files changed, 456 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 9abc8a9..b2ac30d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,7 @@ include Makefile_Eo.am include Makefile_Eet.am include Makefile_Evas.am include Makefile_Ecore.am +include Makefile_Ecore_Cxx.am include Makefile_Ecore_Con.am include Makefile_Ecore_Ipc.am include Makefile_Ecore_File.am diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am new file mode 100644 index 000..ff8efdc --- /dev/null +++ b/src/Makefile_Ecore_Cxx.am @@ -0,0 +1,36 @@ + +### Library + +installed_ecorecxxmainheadersdir = $(includedir)/ecore_cxx-@VMAJ@ +dist_installed_ecorecxxmainheaders_DATA = \ +bindings/ecore_cxx/Ecore.hh + +### Unit tests + +if EFL_ENABLE_TESTS +if HAVE_CXX11 + +check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite +TESTS += tests/ecore_cxx/ecore_cxx_suite + +tests_ecore_cxx_ecore_cxx_suite_SOURCES = \ +tests/ecore_cxx/ecore_cxx_suite.cc \ +tests/ecore_cxx/ecore_cxx_test_safe_call.cc + +tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +-I$(top_srcdir)/src/bindings/ecore_cxx \ +-I$(top_srcdir)/src/bindings/eina_cxx \ +-DTESTS_SRC_DIR=\$(top_srcdir)/src/tests/ecore_cxx\ \ +-DTESTS_BUILD_DIR=\$(top_builddir)/src/tests/ecore_cxx\ \ +@CHECK_CFLAGS@ \ +@ECORE_CFLAGS@ \ +@EINA_CFLAGS@ + +tests_ecore_cxx_ecore_cxx_suite_LDADD = \ +@CHECK_LIBS@ \ +@USE_ECORE_LIBS@ +tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = \ +@USE_ECORE_INTERNAL_LIBS@ + +endif +endif diff --git a/src/bindings/ecore_cxx/Ecore.hh b/src/bindings/ecore_cxx/Ecore.hh new file mode 100644 index 000..9d2dd0b --- /dev/null +++ b/src/bindings/ecore_cxx/Ecore.hh @@ -0,0 +1,123 @@ +#ifndef _EFL_ECORE_CXX_ECORE_HH +#define _EFL_ECORE_CXX_ECORE_HH + +#include Ecore.h + +#include utility +#include type_traits +#include memory +#include cstring + +namespace efl { namespace ecore { + +template typename T, typename Enable = void +struct _ecore_result_type_marshaller; + +template typename T +struct _ecore_result_type_marshaller + T, typename std::enable_ifstd::is_pointerT::value::type +{ + static void* to_void(T o) + { +return static_castvoid*(o); + } + static T from_void(void* o) + { +return static_castT(o); + } +}; + +template typename T +struct _ecore_result_type_marshaller + T, typename std::enable_if!std::is_pointerT::value std::is_podT::value + sizeof(T) = sizeof(void*)::type +{ + static void* to_void(T o) + { +unsigned char buf[sizeof(void*)]; +T* p = static_castT*(static_castvoid*(buf[0])); +new (p) T(std::move(o)); +void* store; +std::memcpy(store, buf, sizeof(void*)); +return store; + } + static T from_void(void* store) + { +T* p = static_castT*(static_castvoid*(store)); +struct destroy_T +{ + destroy_T(T p) +: p(p) {} + ~destroy_T() + { +p.~T(); + } + T p; +} destroy(*p); +return T(std::move(*p)); + } +}; + +template typename T +struct _ecore_result_type_marshaller +T, typename std::enable_if(sizeof(T) sizeof(void*)) || !std::is_podT::value::type +{ + static void* to_void(T o) + { +return new T(o); + } + static T from_void(void* store) + { +std::unique_ptrT p(static_castT*(store)); +return T(std::move(*p.get())); + } +}; + +template typename F +void _ecore_main_loop_thread_safe_call_async_callback(void* data) +{ + F* f = static_castF*(data); + (*f)(); + delete f; +} + +template typename F +void* _ecore_main_loop_thread_safe_call_sync_callback(void* data) +{ + F* f = static_castF*(data); + typedef typename std::result_ofF()::type result_type; + return _ecore_result_type_marshallerresult_type::to_void((*f)()); +} + +template typename F +void main_loop_thread_safe_call_async(F f) +{ + ::ecore_main_loop_thread_safe_call_async( ecore::_ecore_main_loop_thread_safe_call_async_callbackF +
[EGIT] [apps/terminology] master 02/02: load themes from ~/.config/terminology/themes. Closes T1030
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4bfc84110e4635c42333a64e784ba921745878be commit 4bfc84110e4635c42333a64e784ba921745878be Author: Boris Faure bill...@gmail.com Date: Wed Feb 26 23:03:27 2014 +0100 load themes from ~/.config/terminology/themes. Closes T1030 --- README | 4 ++ man/terminology.1 | 4 ++ src/bin/config.c| 12 +++--- src/bin/main.c | 16 src/bin/options_theme.c | 97 - src/bin/utils.c | 22 +++ src/bin/utils.h | 1 + 7 files changed, 110 insertions(+), 46 deletions(-) diff --git a/README b/README index eb46145..57c6521 100644 --- a/README +++ b/README @@ -122,6 +122,10 @@ or aa[true/false] should become something like: or aafalse +Themes: + +Themes can be stored in ~/.config/terminology/themes/ . + --- pn[FULL-PATH-OR-URL] diff --git a/man/terminology.1 b/man/terminology.1 index 064e074..d54b3c3 100644 --- a/man/terminology.1 +++ b/man/terminology.1 @@ -275,6 +275,10 @@ Reset the background (no media) .B bPATH Set the background media to an absolute file PATH +.SH THEMES: +Themes can be stored in ~/.config/terminology/themes/ . + + .SH EXTENDED ESCAPES FOR TERMINOLOGY: . .TP diff --git a/src/bin/config.c b/src/bin/config.c index 949a09b..ba6397b 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -5,6 +5,7 @@ #include config.h #include main.h #include col.h +#include utils.h #define CONF_VER 2 @@ -23,10 +24,15 @@ void config_init(void) { Eet_Data_Descriptor_Class eddc; + char path[PATH_MAX] = {}; elm_need_efreet(); efreet_init(); + snprintf(path, sizeof(path) -1, %s/terminology/themes, +_config_home_get()); + ecore_file_mkpath(path); + eet_eina_stream_data_descriptor_class_set (eddc, sizeof(eddc), Config, sizeof(Config)); edd_base = eet_data_descriptor_stream_new(eddc); @@ -613,17 +619,13 @@ config_del(Config *config) const char * config_theme_path_get(const Config *config) { - static char path[PATH_MAX]; - EINA_SAFETY_ON_NULL_RETURN_VAL(config, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(config-theme, NULL); if (strchr(config-theme, '/')) return config-theme; - snprintf(path, sizeof(path), %s/themes/%s, -elm_app_data_dir_get(), config-theme); - return path; + return theme_path_get(config-theme); } const char * diff --git a/src/bin/main.c b/src/bin/main.c index 3d6c94d..9ccb4a0 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -2753,20 +2753,20 @@ elm_main(int argc, char **argv) if (theme) { char path[PATH_MAX]; -char nom[PATH_MAX]; +char theme_name[PATH_MAX]; +const char *theme_path = (const char *)path; if (eina_str_has_suffix(theme, .edj)) - eina_strlcpy(nom, theme, sizeof(nom)); + eina_strlcpy(theme_name, theme, sizeof(theme_name)); else - snprintf(nom, sizeof(nom), %s.edj, theme); + snprintf(theme_name, sizeof(theme_name), %s.edj, theme); -if (strchr(nom, '/')) - eina_strlcpy(path, nom, sizeof(path)); +if (strchr(theme_name, '/')) + eina_strlcpy(path, theme_name, sizeof(path)); else - snprintf(path, sizeof(path), %s/themes/%s, - elm_app_data_dir_get(), nom); + theme_path = theme_path_get(theme_name); -eina_stringshare_replace((config-theme), path); +eina_stringshare_replace((config-theme), theme_path); config-temporary = EINA_TRUE; } diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c index fc2b648..03585d7 100644 --- a/src/bin/options_theme.c +++ b/src/bin/options_theme.c @@ -42,14 +42,12 @@ _cb_op_theme_content_get(void *data, Evas_Object *obj, const char *part) if (!strcmp(part, elm.swallow.icon)) { Evas_Object *o; -char buf[4096]; Config *config = termio_config_get(t-term); - + if (config) { - snprintf(buf, sizeof(buf), %s/themes/%s, - elm_app_data_dir_get(), t-name); - o = options_theme_preview_add(obj, config, buf, + o = options_theme_preview_add(obj, config, + theme_path_get(t-name), 128 * elm_config_scale_get(), 64 * elm_config_scale_get()); return o; @@ -98,10 +96,13 @@ options_theme(Evas_Object *opbox, Evas_Object *term) { Evas_Object *o, *box, *fr; Elm_Gengrid_Item_Class *it_class; - Eina_List *files; + Eina_List *files, *userfiles, *l, *l_next; char buf[4096], *file; - Theme *t; + const char *config_dir = efreet_config_home_get(), + *data_dir = elm_app_data_dir_get(); Config *config = termio_config_get(term); + Eina_Bool to_skip =
[EGIT] [apps/terminology] master 01/02: change defaults not to flicker on key and produce sounds
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=f7578684362bec45ae1cce3086749cc9fbaf97d6 commit f7578684362bec45ae1cce3086749cc9fbaf97d6 Author: Boris Faure bill...@gmail.com Date: Wed Feb 26 21:21:25 2014 +0100 change defaults not to flicker on key and produce sounds --- src/bin/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/config.c b/src/bin/config.c index d063682..949a09b 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -486,7 +486,7 @@ config_load(const char *key) config-translucent = EINA_FALSE; config-jump_on_change = EINA_TRUE; config-jump_on_keypress = EINA_TRUE; - config-flicker_on_key = EINA_TRUE; + config-flicker_on_key = EINA_FALSE; config-disable_cursor_blink = EINA_FALSE; config-disable_visual_bell = EINA_FALSE; s = eina_unicode_unicode_to_utf8(sep, slen); --
[EGIT] [bindings/python/python-efl] master 01/01: Python-EFL: added 1.9 API: Colorselector.palette_items_get()
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=1bfb4d8922201821e5054e073e544ab6603cd046 commit 1bfb4d8922201821e5054e073e544ab6603cd046 Author: davemds d...@gurumeditation.it Date: Wed Feb 26 23:20:04 2014 +0100 Python-EFL: added 1.9 API: Colorselector.palette_items_get() --- efl/elementary/colorselector.pxd | 3 ++- efl/elementary/colorselector.pyx | 29 + examples/elementary/test_colorselector.py | 3 +++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/efl/elementary/colorselector.pxd b/efl/elementary/colorselector.pxd index 51c229c..c0f814a 100644 --- a/efl/elementary/colorselector.pxd +++ b/efl/elementary/colorselector.pxd @@ -1,4 +1,4 @@ -from efl.evas cimport Evas_Object +from efl.evas cimport Evas_Object, const_Evas_Object, const_Eina_List from object_item cimport Elm_Object_Item from enums cimport Elm_Colorselector_Mode from libc.string cimport const_char @@ -15,3 +15,4 @@ cdef extern from Elementary.h: voidelm_colorselector_palette_clear(Evas_Object *obj) voidelm_colorselector_palette_name_set(Evas_Object *obj, const_char *palette_name) const_char *elm_colorselector_palette_name_get(Evas_Object *obj) +const_Eina_List * elm_colorselector_palette_items_get(const_Evas_Object *obj) diff --git a/efl/elementary/colorselector.pyx b/efl/elementary/colorselector.pyx index 3ffb423..1d25540 100644 --- a/efl/elementary/colorselector.pyx +++ b/efl/elementary/colorselector.pyx @@ -230,6 +230,35 @@ cdef class Colorselector(LayoutClass): def palette_name_get(self): return _ctouni(elm_colorselector_palette_name_get(self.obj)) +def palette_items_get(self): +palette_items_get() + +Get a list of palette items (colors). + +:return: A list of palette Items. +:rtype: list of :py:class:`ColorselectorPaletteItem` + +.. versionadded:: 1.9 + + +cdef: +const_Eina_List *lst = elm_colorselector_palette_items_get(self.obj) +Elm_Object_Item *obj_item +int r, g, b, a +list ret = list() +ColorselectorPaletteItem item + +while lst: +obj_item = Elm_Object_Item *lst.data +elm_colorselector_palette_item_color_get(obj_item, r, g, b, a) +item = ColorselectorPaletteItem(r, g, b, a) +item._set_obj(obj_item) +ret.append(item) +lst = lst.next + +return ret + + def callback_changed_add(self, func, *args, **kwargs): When the color value changes on selector self._callback_add(changed, func, *args, **kwargs) diff --git a/examples/elementary/test_colorselector.py b/examples/elementary/test_colorselector.py index 0ef99fa..2021c31 100644 --- a/examples/elementary/test_colorselector.py +++ b/examples/elementary/test_colorselector.py @@ -85,6 +85,9 @@ def colorselector_clicked(obj): cs.palette_color_add(255, 255, 119, 255) cs.palette_color_add(133, 100, 255, 255) +last_item = cs.palette_items_get()[-1] +last_item.color = (255, 0, 0, 255) + hbox = Box(win, horizontal=True, size_hint_align=FILL_AND_ALIGN_TOP, size_hint_weight=EXPAND_HORIZ) vbox.pack_end(hbox) --
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Apologies. Wrong place in NEWS was a bad merge conflict. Also I saw a 1.10 section with 1 item so added to it. Noted for future - sorry for the hassle. Andrew Sent from my iPhone On 26 Feb 2014, at 02:55 pm, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On Wed, 2014-02-26 at 06:37, Andy Williams wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Please don't do that. This is wrong in two different ways: 1) You added it to 1.9 while this happened after 2) We will auto generate the NEWS files for 1.10 and already have not updated them during development in 1.9 Just having a proper commit summary and the tags like fixes TXXX and @fix in the longer description is enough. No need to touch the NEWS file. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Back ported how far? I must have missed a doc about this sorry. Andrew Sent from my iPhone On 26 Feb 2014, at 02:38 pm, Tom Hacohen tom.haco...@samsung.com wrote: Hey, We don't update the NEWS file anymore. This should probably be backported as well, and for that, @fix should be added in the commit log (not official requirement yet, but will probably become one soon, as there were no objections). -- Tom. On 26/02/14 14:37, Andy Williams wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Removals: diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 46494d6..e225e34 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -920,6 +920,7 @@ eina_log_domain_new(Eina_Log_Domain *d, Eina_Log_Timing *t, EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); d-level = EINA_LOG_LEVEL_UNKNOWN; + d-color = color; d-deleted = EINA_FALSE; if ((color) (!_disable_color)) @@ -1581,7 +1582,24 @@ EAPI void eina_log_color_disable_set(Eina_Bool disabled) { #ifdef EINA_ENABLE_LOG + Eina_Log_Domain *domain; + unsigned int i; + _disable_color = disabled; + + for (i = 0; i _log_domains_count; i++) + { +domain = _log_domains[i]; + +if (domain-domain_str) + free((char *)domain-domain_str); + +if ((domain-color) (!_disable_color)) + domain-domain_str = eina_log_domain_str_get(domain-name, domain-color); +else + domain-domain_str = eina_log_domain_str_get(domain-name, NULL); + } + #else (void) disabled; #endif diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h index feb1b2e..bc59d78 100644 --- a/src/lib/eina/eina_log.h +++ b/src/lib/eina/eina_log.h @@ -413,6 +413,7 @@ typedef struct _Eina_Log_Domain Eina_Log_Domain; struct _Eina_Log_Domain { int level; /** Max level to log */ + const char *color; /** Color to use when printing in this domain */ const char *domain_str; /** Formatted string with color to print */ const char *name; /** Domain name */ size_t namelen; /** strlen(name) */ -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: Remove bad NEWS line
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fbb1aa775c8e5e3d8cbe8a220dc655868dad0d0e commit fbb1aa775c8e5e3d8cbe8a220dc655868dad0d0e Author: Andy Williams a...@andywilliams.me Date: Wed Feb 26 23:43:15 2014 + Remove bad NEWS line --- NEWS | 1 - 1 file changed, 1 deletion(-) diff --git a/NEWS b/NEWS index af440d8..f495176 100644 --- a/NEWS +++ b/NEWS @@ -429,7 +429,6 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. - * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Removals: --
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Fixed now. Apologies about the short commit message, could not think of a longer explanation of the reversion. Andrew P.S. why is an out of date NEWS file stored in the source at that level? It seems missleading. On 26/02/14 14:55, Stefan Schmidt wrote: Hello. On Wed, 2014-02-26 at 06:37, Andy Williams wrote: ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5913ce7ec87beb267d2d02846e5267eae08ef860 commit 5913ce7ec87beb267d2d02846e5267eae08ef860 Author: Andy Williams a...@andywillias.me Date: Wed Feb 26 03:59:41 2014 + eina_log: Update domain colouring when color_disable_set is called After color_disable is set we should update the domain_str for each domain as this cached the setting from when the domain was registered. This required storing the colour within the domain for later use. Fixes T1029 --- NEWS| 1 + src/lib/eina/eina_log.c | 18 ++ src/lib/eina/eina_log.h | 1 + 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index f495176..af440d8 100644 --- a/NEWS +++ b/NEWS @@ -429,6 +429,7 @@ Fixes: * textgrid - with new fallback fonts we cant depend on glyph extents anymore * textgrid - out-of-bounds chars cause update artifacts - fix. * Emotion test: fix calculation of the displayed time. + * eina: Update domain output if eina_log_color_disable_set is called after a domain is registered (T1029). Please don't do that. This is wrong in two different ways: 1) You added it to 1.9 while this happened after 2) We will auto generate the NEWS files for 1.10 and already have not updated them during development in 1.9 Just having a proper commit summary and the tags like fixes TXXX and @fix in the longer description is enough. No need to touch the NEWS file. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: evas: replace EINA_LIST_FREE to EINA_LIST_FOREACH_SAFE.
woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6093e68cb01cf915057b9e330f7586039d092990 commit 6093e68cb01cf915057b9e330f7586039d092990 Author: WooHyun Jung wh0705.j...@samsung.com Date: Thu Feb 27 10:31:42 2014 +0900 evas: replace EINA_LIST_FREE to EINA_LIST_FOREACH_SAFE. EINA_LIST_FREE does eina_list_remove_list, and clip_unset does the same thing to the same list pointer. So, EINA_LIST_FOREACH_SAFE is proper for this case. --- src/lib/evas/canvas/evas_object_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 9db95d4..d8d3850 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -654,7 +654,7 @@ _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) goto end; } evas_object_grabs_cleanup(eo_obj, obj); - EINA_LIST_FREE(obj-clip.clipees, tmp) + EINA_LIST_FOREACH_SAFE(obj-clip.clipees, l, l2, tmp) evas_object_clip_unset(tmp-object); EINA_LIST_FOREACH_SAFE(obj-proxy-proxies, l, l2, proxy) evas_object_image_source_unset(proxy); --
[EGIT] [core/efl] efl-1.9 01/01: evas: replace EINA_LIST_FREE to EINA_LIST_FOREACH_SAFE.
woohyun pushed a commit to branch efl-1.9. http://git.enlightenment.org/core/efl.git/commit/?id=e6eafc517f341700bb9713fbe222bac0ae00bb5d commit e6eafc517f341700bb9713fbe222bac0ae00bb5d Author: WooHyun Jung wh0705.j...@samsung.com Date: Thu Feb 27 10:31:42 2014 +0900 evas: replace EINA_LIST_FREE to EINA_LIST_FOREACH_SAFE. EINA_LIST_FREE does eina_list_remove_list, and clip_unset does the same thing to the same list pointer. So, EINA_LIST_FOREACH_SAFE is proper for this case. --- src/lib/evas/canvas/evas_object_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index edef53b..637551a 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -654,7 +654,7 @@ _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) goto end; } evas_object_grabs_cleanup(eo_obj, obj); - EINA_LIST_FREE(obj-clip.clipees, tmp) + EINA_LIST_FOREACH_SAFE(obj-clip.clipees, l, l2, tmp) evas_object_clip_unset(tmp-object); EINA_LIST_FOREACH_SAFE(obj-proxy-proxies, l, l2, proxy) evas_object_image_source_unset(proxy); --
Re: [E-devel] Prposed release schedule for 1.10
On 26 February 2014 18:20, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On Tue, 2014-02-25 at 23:10, Adrien Nader wrote: PS: I also hope that before 1.10 alpha, I will have finished a few changes to win-builds to harass most of you into testing for Windows. PS2: Wine works well enough. Good luck finding people for that. :) If some people work to make the windows port to a usable state for a release, then after this release, would it be ok to say that new showstopper bugs on windows should block the next release? -- http://indefini.org -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: hover: Made hover itself unfocusable.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0bc768bff0791ad2acfc7809d7848b1eef7819b5 commit 0bc768bff0791ad2acfc7809d7848b1eef7819b5 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Thu Feb 27 11:38:47 2014 +0900 hover: Made hover itself unfocusable. @fix Hover itself does not get key event. It should just forward the event to the internal objects. So make it unfocusable. Special thanks to Woohyun Jung. --- src/lib/elm_hover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c index 2857c86..5ea9a21 100644 --- a/src/lib/elm_hover.c +++ b/src/lib/elm_hover.c @@ -558,7 +558,7 @@ _elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) elm_layout_content_set(obj, elm.swallow.offset, priv-offset); elm_layout_content_set(obj, elm.swallow.size, priv-size); - elm_widget_can_focus_set(obj, EINA_TRUE); + elm_widget_can_focus_set(obj, EINA_FALSE); } static void --
[EGIT] [core/efl] master 01/01: reset textblock cache when text_class is changed
sohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=85b2a8f5dc3ce5b89e2f95e55d96fe13d53ee947 commit 85b2a8f5dc3ce5b89e2f95e55d96fe13d53ee947 Author: Sohyun Kim sohyun.a...@gmail.com Date: Thu Feb 27 13:31:42 2014 +0900 reset textblock cache when text_class is changed If text_class in the textblock is changed, it is not applied because of the cache. When text_class is changed, reset cache to update text information. --- src/lib/edje/edje_private.h | 1 + src/lib/edje/edje_textblock_styles.c | 29 + src/lib/edje/edje_util.c | 3 +++ 3 files changed, 33 insertions(+) diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 698d085..3f81442 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -2165,6 +2165,7 @@ void _edje_message_del (Edje *ed); void _edje_textblock_styles_add(Edje *ed); void _edje_textblock_styles_del(Edje *ed); +void _edje_textblock_styles_cache_free(Edje *ed, const char *text_class); void _edje_textblock_style_all_update(Edje *ed); void _edje_textblock_style_parse_and_fix(Edje_File *edf); void _edje_textblock_style_cleanup(Edje_File *edf); diff --git a/src/lib/edje/edje_textblock_styles.c b/src/lib/edje/edje_textblock_styles.c index 9f089c8..4093c64 100644 --- a/src/lib/edje/edje_textblock_styles.c +++ b/src/lib/edje/edje_textblock_styles.c @@ -310,6 +310,35 @@ _edje_textblock_styles_del(Edje *ed) } } +void +_edje_textblock_styles_cache_free(Edje *ed, const char *text_class) +{ + Eina_List *l, *ll; + Edje_Style *stl; + + if (!ed-file) return; + if (!text_class) return; + + EINA_LIST_FOREACH(ed-file-styles, l, stl) + { +Edje_Style_Tag *tag; +Eina_Bool found = EINA_FALSE; + +EINA_LIST_FOREACH(stl-tags, ll, tag) + { + if (!tag-text_class) continue; + + if (!strcmp(tag-text_class, text_class)) + { + found = EINA_TRUE; + break; + } + } +if (found) + stl-cache = EINA_FALSE; + } +} + /* When we get to here the edje file had been read into memory * the name of the style is established as well as the name and * data for the tags. This function will create the Evas_Style diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index a0a9357..8eb743e 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -962,6 +962,7 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz ed = eina_list_data_get(members); ed-dirty = EINA_TRUE; ed-recalc_call = EINA_TRUE; +_edje_textblock_styles_cache_free(ed, text_class); _edje_textblock_style_all_update(ed); #ifdef EDJE_CALC_CACHE ed-text_part_change = EINA_TRUE; @@ -995,6 +996,7 @@ edje_text_class_del(const char *text_class) ed = eina_list_data_get(members); ed-dirty = EINA_TRUE; +_edje_textblock_styles_cache_free(ed, text_class); _edje_textblock_style_all_update(ed); #ifdef EDJE_CALC_CACHE ed-text_part_change = EINA_TRUE; @@ -1107,6 +1109,7 @@ _text_class_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) #ifdef EDJE_CALC_CACHE ed-text_part_change = EINA_TRUE; #endif + _edje_textblock_styles_cache_free(ed, text_class); _edje_textblock_style_all_update(ed); _edje_recalc(ed); if (ret) *ret = EINA_TRUE; --
[EGIT] [core/efl] efl-1.9 01/01: edje: Fix CURRENT option works.
jaehwan pushed a commit to branch efl-1.9. http://git.enlightenment.org/core/efl.git/commit/?id=5a7321a31440d34d20ae9d0cbd472dd6eba303b8 commit 5a7321a31440d34d20ae9d0cbd472dd6eba303b8 Author: Jaehwan Kim jae.hwan@samsung.com Date: Thu Feb 27 13:36:02 2014 +0900 edje: Fix CURRENT option works. By this code the CURRENT option didn't work. Don't remove rp-current before the animation is excuted. The memory leak issue is resolved by commit(d636c0f801dd56671a970076acdfdf78dd3115f6). --- src/lib/edje/edje_program.c | 10 -- 1 file changed, 10 deletions(-) diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index ac32aa5..0a7c55a 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -450,15 +450,6 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp) runp-program-tween.v3, runp-program-tween.v4); - if (rp-current) -{ - eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) rp-current-map); -#ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) rp-current-physics); -#endif - free(rp-current); - rp-current = NULL; -} rp-program = NULL; } } @@ -586,7 +577,6 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, free(rp-current); } rp-current = tmp; - } else { --
[EGIT] [core/efl] master 01/01: edje: Fix CURRENT option works.
jaehwan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8d46f46243bc7ae956733100908e43214b7eb493 commit 8d46f46243bc7ae956733100908e43214b7eb493 Author: Jaehwan Kim jae.hwan@samsung.com Date: Thu Feb 27 13:36:02 2014 +0900 edje: Fix CURRENT option works. By this code the CURRENT option didn't work. Don't remove rp-current before the animation is excuted. The memory leak issue is resolved by commit(d636c0f801dd56671a970076acdfdf78dd3115f6). --- src/lib/edje/edje_program.c | 10 -- 1 file changed, 10 deletions(-) diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index ac32aa5..0a7c55a 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -450,15 +450,6 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp) runp-program-tween.v3, runp-program-tween.v4); - if (rp-current) -{ - eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) rp-current-map); -#ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) rp-current-physics); -#endif - free(rp-current); - rp-current = NULL; -} rp-program = NULL; } } @@ -586,7 +577,6 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, free(rp-current); } rp-current = tmp; - } else { --
[EGIT] [core/efl] master 01/01: ecore_imf: Add ECORE_IMF_INPUT_PANEL_LAYOUT_EMOTICON
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8940ce308d443d9b4f8f939e561259df51c4f932 commit 8940ce308d443d9b4f8f939e561259df51c4f932 Author: Jihoon Kim jihoon48@samsung.com Date: Thu Feb 27 13:46:16 2014 +0900 ecore_imf: Add ECORE_IMF_INPUT_PANEL_LAYOUT_EMOTICON --- src/lib/ecore_imf/Ecore_IMF.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h index f4521fb..6dc31f7 100644 --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h @@ -274,7 +274,8 @@ typedef enum ECORE_IMF_INPUT_PANEL_LAYOUT_HEX, /** Hexadecimal layout @since 1.2 */ ECORE_IMF_INPUT_PANEL_LAYOUT_TERMINAL,/** Command-line terminal layout including ESC, Alt, Ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2 */ ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD,/** Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */ - ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME /** Date and time layout @since 1.8 */ + ECORE_IMF_INPUT_PANEL_LAYOUT_DATETIME,/** Date and time layout @since 1.8 */ + ECORE_IMF_INPUT_PANEL_LAYOUT_EMOTICON /** Emoticon layout @since 1.10 */ } Ecore_IMF_Input_Panel_Layout; /** --
[EGIT] [core/efl] master 01/01: edje: Add emoticon input panel layout
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=16f5a5c32325e824af4e67dbe4b593d633e24742 commit 16f5a5c32325e824af4e67dbe4b593d633e24742 Author: Jihoon Kim jihoon48@samsung.com Date: Thu Feb 27 14:08:18 2014 +0900 edje: Add emoticon input panel layout --- src/lib/edje/Edje_Common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index 9d83fb5..7180fac 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h @@ -1003,7 +1003,8 @@ typedef enum _Edje_Input_Panel_Layout EDJE_INPUT_PANEL_LAYOUT_HEX, /** Hexadecimal layout @since 1.2 */ EDJE_INPUT_PANEL_LAYOUT_TERMINAL,/** Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization) @since 1.2 */ EDJE_INPUT_PANEL_LAYOUT_PASSWORD,/** Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */ - EDJE_INPUT_PANEL_LAYOUT_DATETIME /** Date and time layout @since 1.8 */ + EDJE_INPUT_PANEL_LAYOUT_DATETIME,/** Date and time layout @since 1.8 */ + EDJE_INPUT_PANEL_LAYOUT_EMOTICON /** Emoticon layout @since 1.10 */ } Edje_Input_Panel_Layout; enum --
Re: [E-devel] Image editing for e
If there is interest I would like to eventually implemenet this as an evas_object and then make a widget for elm out of it. But theres still a lot to change under the hood before that. On 02/25/2014 12:39 AM, Fan Cris wrote: i hope to see a this in ephoto :) On Mon, Feb 24, 2014 at 8:16 PM, Hendrik Siedelmann hendrik.siedelm...@googlemail.com wrote: Currently I'm using 1.8.9 but older versions used to work just fine, just not tested. On 02/24/2014 07:04 PM, Jeff Hoogland wrote: Neat! What version of EFL is needed/has this been tested against? On Mon, Feb 24, 2014 at 1:51 AM, Hendrik Siedelmann hendrik.siedelm...@googlemail.com wrote: Hello everybody! I present you a image editing tool/library for e! It is still very experimental, but I have used it to sort trough my images on a long trip so maybe it can be useful for more someone. It allows simple image editing tasks (like sharpen, denoise, rotate,... ), works completely non-destructive and saves tags and the filter chain in xmp sidecar files. Code is here: https://github.com/Gridrix/lime.git The program is based on scale-invariant image editing which I descibe in this paper: http://elib.uni-stuttgart.de/opus/volltexte/2013/8717/pdf/STUD_2369.pdf Have fun! Hendrik -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: entry: Add ELM_INPUT_PANEL_LAYOUT_EMOTICON
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=50e781d383f3de433f4b397d6853b7780e09a6f8 commit 50e781d383f3de433f4b397d6853b7780e09a6f8 Author: Jihoon Kim jihoon48@samsung.com Date: Thu Feb 27 14:58:36 2014 +0900 entry: Add ELM_INPUT_PANEL_LAYOUT_EMOTICON --- src/lib/elm_entry_common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_entry_common.h b/src/lib/elm_entry_common.h index 3c49e8b..12a581b 100644 --- a/src/lib/elm_entry_common.h +++ b/src/lib/elm_entry_common.h @@ -48,7 +48,8 @@ typedef enum ELM_INPUT_PANEL_LAYOUT_HEX, /** Hexadecimal layout */ ELM_INPUT_PANEL_LAYOUT_TERMINAL,/** Command-line terminal layout including esc, alt, ctrl key, so on (no auto-correct, no auto-capitalization) */ ELM_INPUT_PANEL_LAYOUT_PASSWORD,/** Like normal, but no auto-correct, no auto-capitalization etc. */ - ELM_INPUT_PANEL_LAYOUT_DATETIME /** Date and time layout @since 1.8 */ + ELM_INPUT_PANEL_LAYOUT_DATETIME,/** Date and time layout @since 1.8 */ + ELM_INPUT_PANEL_LAYOUT_EMOTICON /** Emoticon layout @since 1.10 */ } Elm_Input_Panel_Layout; /** Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired. */ enum --
Re: [E-devel] Image editing for e
Thanks! I'll have a look into the macros. But still this should actually work ... or put an other way on which platform did you try it, because big-endian is broken atm. and should not give you a running program at all ;-). And little endian should work! On 02/26/2014 08:18 PM, Carsten Haitzler (The Rasterman) wrote: On Mon, 24 Feb 2014 08:51:24 +0100 Hendrik Siedelmann hendrik.siedelm...@googlemail.com said: oh. cool bananas! thought i think you have some bugs... : http://www.enlightenment.org/ss/e-530e3cdc1434c8.05020334.png :) your argb byte ordering is... broken when messing with the image pixels. :( rememebr that with evas (and efl) pixels are INTS not bytes. int. an int is 32bit. the MSB (high byte withn the int) is A, then R then G then B ie for 32bits the bits rom highest to lowest are: or int pixel; a = (pixel 24); r = (pixel 16) 0xff; g = (pixel 8) 0xff; b = pixel 0xff; and reverse: pixel = (a 24) | (r 16) | (g 8) | b; :) yes... you can access byte by byte too - but you need to account for endianess then as it changes between x86 and ppc, mips, some arm implementations etc. etc. :) there ae macros in evas src like A_VAL(), R_VAL() G_VAL() that do this internally as needed if you look. :) then macros for merging together again. Hello everybody! I present you a image editing tool/library for e! It is still very experimental, but I have used it to sort trough my images on a long trip so maybe it can be useful for more someone. It allows simple image editing tasks (like sharpen, denoise, rotate,... ), works completely non-destructive and saves tags and the filter chain in xmp sidecar files. Code is here: https://github.com/Gridrix/lime.git The program is based on scale-invariant image editing which I descibe in this paper: http://elib.uni-stuttgart.de/opus/volltexte/2013/8717/pdf/STUD_2369.pdf Have fun! Hendrik -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: edc_editor - set the default font size to the default entry size.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=144ec65ee6932a81058ace1049964b665b071a4c commit 144ec65ee6932a81058ace1049964b665b071a4c Author: ChunEon Park her...@hermet.pe.kr Date: Thu Feb 27 16:29:23 2014 +0900 edc_editor - set the default font size to the default entry size. now editor doesn't need to customize the entry theme. --- data/themes/default/images/Makefile.am | 2 - .../images/horizontal_separated_bar_small_glow.png | Bin 309 - 0 bytes data/themes/default/images/white_bar_vert_glow.png | Bin 370 - 0 bytes data/themes/default/theme_ext.edc | 263 - src/bin/edc_editor.c | 3 +- 5 files changed, 1 insertion(+), 267 deletions(-) diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 537531f..f795a40 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -26,7 +26,6 @@ EXTRA_DIST = \ holes_tiny_horiz.png \ holes_tiny_vert.png \ holes_vert.png \ - horizontal_separated_bar_small_glow.png \ inset_shadow.png \ logo.png \ menu_layout.png \ @@ -55,7 +54,6 @@ EXTRA_DIST = \ sym_up_light_normal.png \ vgrad_med_lighter.png \ warning.png \ - white_bar_vert_glow.png \ panes_left_arrow.png \ panes_right_arrow.png \ panes_recover_arrow.png \ diff --git a/data/themes/default/images/horizontal_separated_bar_small_glow.png b/data/themes/default/images/horizontal_separated_bar_small_glow.png deleted file mode 100644 index 31ddfee..000 Binary files a/data/themes/default/images/horizontal_separated_bar_small_glow.png and /dev/null differ diff --git a/data/themes/default/images/white_bar_vert_glow.png b/data/themes/default/images/white_bar_vert_glow.png deleted file mode 100644 index 49c6735..000 Binary files a/data/themes/default/images/white_bar_vert_glow.png and /dev/null differ diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index 5a0c902..af271c8 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -8,36 +8,6 @@ #define FIXED_SIZE(_WIDTH, _HEIGHT) \ min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1; -styles - { - style { name: entry_linenumber_style; -base: font=FN font_size=11 color=#656565 text_class=entry shadow_color=#0080 style=shadow,bottom; -tag: em + font_style=Oblique; -tag: link + color=#800 underline=on underline_color=#8008; -tag: hilight + font_weight=Bold; -tag: preedit + underline=on underline_color=#000; -tag: preedit_sel + backing=on backing_color=#000 color=#FF; - } - style { name: entry_edit_style; -base: font=FN font_size=11 color=#d4d4d4 text_class=entry shadow_color=#0080 style=shadow,bottom; -tag: em + font_style=Oblique; -tag: link + color=#800 underline=on underline_color=#8008; -tag: hilight + font_weight=Bold; -tag: preedit + underline=on underline_color=#000; -tag: preedit_sel + backing=on backing_color=#000 color=#FF; - } - style { name: entry_single_textblock_style; -base: font=FN font_size=11 color=#ff wrap=none text_class=entry left_margin=2 right_margin=2 shadow_color=#0080 style=shadow,bottom; -tag: br ; -tag: ps ; -tag: em + font_style=Oblique; -tag: link + color=#0080 underline=on underline_color=#0080; -tag: hilight + font_weight=Bold; -tag: preedit + underline=on underline_color=#000; -tag: preedit_sel + backing=on backing_color=#000 color=#FF; - } - } - group { name: elm/scroller/base/enventor; images.image: inset_shadow.png COMP; images.image: bevel_in.png COMP; @@ -896,239 +866,6 @@ group { name: elm/scroller/entry/about; } } -group { name: elm/entry/base/enventor; - alias: elm/entry/base/about; -/* - sounds { - sample { name: key-tap1 LOSSY 64; - source: kbd-tap.wav; - } - sample { name: key-tap2 LOSSY 64; - source: kbd-tap2.wav; - } - sample { name: key-tap3 LOSSY 64; - source: kbd-tap3.wav; - } - sample { name: key-tap4 LOSSY 64; - source: kbd-tap4.wav; - } - sample { name: key-tap5 LOSSY 64; - source: kbd-tap5.wav; - } - } -*/ - parts { - part { name: elm.text; type: TEXTBLOCK; - scale: 1; - entry_mode: EDITABLE; - select_mode: EXPLICIT; - cursor_mode: BEFORE; - multiline: 1; - source: elm/entry/selection/enventor; // selection under - source4: elm/entry/cursor/enventor; // cursorover - source6: elm/entry/anchor/enventor; // anchor over - description { state: default 0.0; -/* we gotta use 0 0 here, because of scrolled entries */ -
[EGIT] [tools/enventor] master 01/01: about - removed inset image in the about scroller.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c4b685bdbe82faa57438ff2586301b65a3e2e7ac commit c4b685bdbe82faa57438ff2586301b65a3e2e7ac Author: ChunEon Park her...@hermet.pe.kr Date: Thu Feb 27 16:38:35 2014 +0900 about - removed inset image in the about scroller. --- data/themes/default/theme_ext.edc | 23 --- 1 file changed, 23 deletions(-) diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index af271c8..e391f3a 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -396,29 +396,6 @@ group { name: elm/scroller/base/enventor; rel2.to_y: sb_hbar; } } - part { name: inset; mouse_events: 0; - description { state: default 0.0; -image.normal: bevel_in.png; -image.border: 1 1 1 1; -image.middle: 0; -rel1.to: bg; -rel1.offset: -1 -1; -rel2.to: bg; -rel2.offset: 0 0; -fill.smooth: 0; - } - } - part { name: shadow; mouse_events: 0; - description { state: default 0.0; -image.normal: inset_shadow.png; -image.border: 5 5 7 3; -image.middle: 0; -rel1.to: bg; -rel2.to: bg; -fill.smooth: 0; -color: 255 255 255 128; - } - } part { name: elm.swallow.overlay; type: SWALLOW; clip_to: clipper; description { state: default 0.0; --
Re: [E-devel] Prposed release schedule for 1.10
Hello. On Thu, 2014-02-27 at 12:00, Christophe Sadoine wrote: On 26 February 2014 18:20, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On Tue, 2014-02-25 at 23:10, Adrien Nader wrote: PS: I also hope that before 1.10 alpha, I will have finished a few changes to win-builds to harass most of you into testing for Windows. PS2: Wine works well enough. Good luck finding people for that. :) If some people work to make the windows port to a usable state for a release, then after this release, would it be ok to say that new showstopper bugs on windows should block the next release? That all depends on how active and responsive the people are. If we constantly see patches coming in and prompt reactions on bugs or problems this might be ok. What I don't want is to have bugs declared as show stoppers but people dealing with these only show up every few weeks. Regular contributions during the 1.10 cycle would give me confidence that a bug related to mingw declared as a showstopper for the release would be worked on. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: eina_log: Update domain colouring when color_disable_set is called
Hello. On Wed, 2014-02-26 at 23:45, Andy Williams wrote: Fixed now. Apologies about the short commit message, could not think of a longer explanation of the reversion. Andrew P.S. why is an out of date NEWS file stored in the source at that level? It seems missleading. Because the NEWS file always has been stored in the source code. Besides a NEWS file should really only be of interest on a released tarball and at that point its updated. regards Stefan Schmidt -- Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel