Re: [E-devel] Eio soname conflicts with another libeio library
On 03/12/2014 06:39 PM, Gustavo Sverzut Barbieri wrote: > Not all distros pack the other eio, and we're not going to change in > upstream. > > This means you must change it at fedora side. Patch our Makefile and eio.pc > so it uses the new name. As all our users should be using pkg-config it > would be transparent to them. Just keep the name stable in fedora. Thanks all for responses. We are considering more options (for example it looks like libeio doesn't do regular releases and projects using this library always bundle specific revision of the library, so it probably makes sense to allow bundling of libeio. This would mean Eio won't change in Fedora.). I don't have more question about this topic for now. I've just wanted to know your opinion on this problem which I know now :). Regards, Jan Kaluza > On Wednesday, March 12, 2014, Cedric BAIL wrote: > >> Hello, >> >> On Wed, Mar 12, 2014 at 4:15 PM, Jan Kaluža >> > >> wrote: >>> while packaging libeio library (not the one from Enlightenment) [1], I >>> have found out that the soname conflicts with Eio library from your >>> project. I have already asked libeio upstream if they are willing to >>> solve this problem somehow globally, but they are not. >>> >>> They think their libeio is here for longer time and used by more >>> external projects while Eio is more like internal library. I can't prove >>> that anyhow, since I don't know the history of these libraries. >> >> Their libeio seems to be 5 years old, ours date from July 2010. As for >> being internal it is not. Eio is a public API part of EFL and to be >> used by anyone doing asynchronous IO with or without a UI. Except >> Ephoto and Elementary, I don't think there is any other open source >> user of it. Most of the user I know of are proprietary application and >> would not be using Fedora. >> >>> My question is if you, as a Eio upstream, would like to fix this >>> conflict in the library name. We will probably have to rename one of the >>> libraries in Fedora otherwise [2]. >> >> It is something tricky to solve, by now we have already application >> using it. It is a public and supported API on our side, changing the >> naming would break existing application on every other distribution. I >> don't really see a solution to this problem at this stage. Sadly it is >> almost 3 years to late... >> >>> Sorry if this question has been asked already but I was not able to find >>> it in archive. >> >> I think the question was raised maybe once in the past, I may be >> mistaken, for another distribution. I think the conclusion was to drop >> that other eio library as it didn't have any application using it in >> their repository. >> >> Regards, >> -- >> Cedric BAIL >> >> >> -- >> Learn Graph Databases - Download FREE O'Reilly Book >> "Graph Databases" is the definitive new guide to graph databases and their >> applications. Written by three acclaimed leaders in the field, >> this first edition is now available. Download your free book today! >> http://p.sf.net/sfu/13534_NeoTech >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Request for ABI break
On Thu, Mar 13, 2014 at 12:49 PM, David Seikel wrote: > Congratulations Cedric, you have been promoted from git b0rker to ABI > b0rker. Remember, with great power comes great ice cream. Yeah, ice cream ! \o/ I am sure it would motivate Hermet to bork more :-D > On Thu, 13 Mar 2014 12:19:28 +0900 Carsten Haitzler (The Rasterman) > wrote: > >> On Wed, 12 Mar 2014 23:54:23 -0300 Gustavo Sverzut Barbieri >> said: >> >> that was my point in the phab comments... edje_edit was not meant to >> be stable and to be used by ordinary apps/people. it was a specific >> api added to expose internals to help write edje editors... and >> editors are very much tied to internal details of edje... >> theoretically an edje editor should ship WITH edje... but it >> doesn't. :) >> >> > edje_edit is unstable... I recall we even request a #define to >> > include it, no? >> > >> > On Wed, Mar 12, 2014 at 11:14 PM, Cedric BAIL >> > wrote: >> > > Hello, >> > > >> > > There is an open review https://phab.enlightenment.org/D562 that >> > > raise a good point. The current API is not correct and don't let >> > > Edje_Edit change edje value accurately (lost of precision). >> > > Changing the type of the parameter will be an ABI break, but the >> > > only application that should use this API should already be >> > > impacted by the problem or there is only one application that use >> > > it (and that's where the patch come from). >> > > >> > > I am very close to accept this patch in. If anyone does have any >> > > strong reason to say no to this, time to raise your voice. >> > > >> > > Regards, >> > > -- >> > > Cedric BAIL >> > > >> > > -- >> > > Learn Graph Databases - Download FREE O'Reilly Book >> > > "Graph Databases" is the definitive new guide to graph databases >> > > and their applications. Written by three acclaimed leaders in the >> > > field, this first edition is now available. Download your free >> > > book today! http://p.sf.net/sfu/13534_NeoTech >> > > ___ >> > > enlightenment-devel mailing list >> > > enlightenment-devel@lists.sourceforge.net >> > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > >> > >> > >> > -- >> > Gustavo Sverzut Barbieri >> > -- >> > Mobile: +55 (19) 99225-2202 >> > Contact: http://www.gustavobarbieri.com.br/contact >> > >> > -- >> > Learn Graph Databases - Download FREE O'Reilly Book >> > "Graph Databases" is the definitive new guide to graph databases >> > and their applications. Written by three acclaimed leaders in the >> > field, this first edition is now available. Download your free book >> > today! http://p.sf.net/sfu/13534_NeoTech >> > ___ >> > enlightenment-devel mailing list >> > enlightenment-devel@lists.sourceforge.net >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > >> >> > > > -- > A big old stinking pile of genius that no one wants > coz there are too many silver coated monkeys in the world. > > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Cedric BAIL -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: tools - use the icon groups instead of the separate icon files.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7fb77f2c9fea784c82986aa20ab0925c73269fd5
commit 7fb77f2c9fea784c82986aa20ab0925c73269fd5
Author: ChunEon Park
Date: Thu Mar 13 13:18:25 2014 +0900
tools - use the icon groups instead of the separate icon files.
---
data/images/Makefile.am| 11 +--
data/images/about.png | Bin 876 -> 0 bytes
data/themes/default/images.edc | 95 +
data/themes/default/images/Makefile.am | 10 ++-
data/{ => themes/default}/images/file.png | Bin
data/{ => themes/default}/images/find.png | Bin
data/{ => themes/default}/images/highlight.png | Bin
data/{ => themes/default}/images/lines.png | Bin
data/{ => themes/default}/images/new.png | Bin
data/{ => themes/default}/images/setting.png | Bin
data/{ => themes/default}/images/status.png| Bin
.../default/images/swallow_s.png} | Bin
src/bin/tools.c| 39 -
13 files changed, 123 insertions(+), 32 deletions(-)
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 2287a8c..76b6729 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,15 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/images
-files_DATA = logo.png \
- about.png \
- new.png \
- file.png \
- highlight.png \
- swallow.png \
- status.png \
- lines.png \
- find.png \
- setting.png
+files_DATA = logo.png
EXTRA_DIST = $(files_DATA)
diff --git a/data/images/about.png b/data/images/about.png
deleted file mode 100644
index e9022c5..000
Binary files a/data/images/about.png and /dev/null differ
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index 53aa2eb..554ae54 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -4,6 +4,101 @@ images {
image: "panes_left_arrow.png" COMP;
image: "panes_right_arrow.png" COMP;
image: "panes_recover_arrow.png" COMP;
+ image: "file.png" COMP;
+ image: "find.png" COMP;
+ image: "highlight.png" COMP;
+ image: "lines.png" COMP;
+ image: "new.png" COMP;
+ image: "setting.png" COMP;
+ image: "status.png" COMP;
+ image: "swallow_s.png" COMP;
+}
+
+group { name: "file";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "file.png";
+ }
+ }
+ }
+}
+
+group { name: "find";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "find.png";
+ }
+ }
+ }
+}
+
+group { name: "highlight";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "highlight.png";
+ }
+ }
+ }
+}
+
+group { name: "lines";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "lines.png";
+ }
+ }
+ }
+}
+group { name: "new";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "new.png";
+ }
+ }
+ }
+}
+
+group { name: "setting";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "setting.png";
+ }
+ }
+ }
+}
+
+group { name: "status";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "status.png";
+ }
+ }
+ }
+}
+
+group { name: "swallow_s";
+ parts {
+ part { name: "img";
+ type: IMAGE;
+ description { state: "default" 0.0;
+image.normal: "swallow_s.png";
+ }
+ }
+ }
}
group { name: "plus";
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 9fc3470..796627e 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -46,4 +46,12 @@ EXTRA_DIST = \
panes_left_arrow.png \
panes_right_arrow.png \
panes_recover_arrow.png \
- pm_fill.png
+ pm_fill.png \
+ file.png \
+ find.png \
+ highlight.png \
+ lines.png \
+ new.png \
+ setting.png \
+ status.png \
+ swallow_s.png
diff --git a/data/images/file.png b/data/themes/default/images/file.png
similarity index 100%
rename from data/images/file.png
rename to data/themes/default/images/file.png
diff --git a/data/images/find.png b/data/themes/default/images/find.png
similarity index 100%
rename from data/images/find.png
rename to data/themes/default/images/f
Re: [E-devel] Eio soname conflicts with another libeio library
On Thu, Mar 13, 2014 at 12:14 AM, Carsten Haitzler wrote: > On Wed, 12 Mar 2014 23:47:58 -0300 Gustavo Sverzut Barbieri > said: > >> On Wed, Mar 12, 2014 at 8:53 PM, Carsten Haitzler >> wrote: >> > On Wed, 12 Mar 2014 14:39:33 -0300 Gustavo Sverzut Barbieri >> > said: >> > >> >> Not all distros pack the other eio, and we're not going to change in >> >> upstream. >> >> >> >> This means you must change it at fedora side. Patch our Makefile and >> >> eio.pc >> >> so it uses the new name. As all our users should be using pkg-config it >> >> would be transparent to them. Just keep the name stable in fedora. >> > >> > of course this means that binaries NOT packaged and modified to link to >> > your >> > rename of eio on fedora will fail to work at all. you basically broke abi >> > "universally" for fedora (ie within fedora it works but not >> > across/outside). >> >> realistically speaking there is no such thing as "universal abi". The >> ABI is defined within a distro unless there is some external >> requirement for such (ie: crap LSB). Different libc tweaks, security >> methods, required signatures, etc varies accross distros. > > valve, steam, sdl and most game makers might disagree with you there. valve/steam is exactly what i say: http://media.steampowered.com/client/installer/steam.deb # ar -x steam.deb # tar xzf control.tar.gz # cat control ... Depends: python, curl, libc6 (>= 2.15), python-apt, xterm | gnome-terminal | konsole, xz-utils, zenity ... # tar xzvf data.tar.gz ... usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz ... # tar xJvf usr/lib/steam/bootstraplinux_ubuntu12_32.tar.xz ... ubuntu12_32/steam-runtime/i386/usr/lib/i386-linux-gnu/libfreetype.so.6.8.0 ubuntu12_32/steam-runtime/i386/usr/lib/i386-linux-gnu/libX11.so.6 ... ubuntu12_32/steam-runtime/i386/lib/i386-linux-gnu/libgcc_s.so.1 # cat usr/bin/steam* # read it, just ubuntu stuff As you can see they are ubuntu specific AND even then they can't trust the platform libraries, so they provide their own versions of all libraries. This is the only way they can "guarantee" it will work, or at least avoid major problems. So they do AGREE with me :-) [and they don't use efl :-D] -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 99225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Request for ABI break
Congratulations Cedric, you have been promoted from git b0rker to ABI b0rker. Remember, with great power comes great ice cream. On Thu, 13 Mar 2014 12:19:28 +0900 Carsten Haitzler (The Rasterman) wrote: > On Wed, 12 Mar 2014 23:54:23 -0300 Gustavo Sverzut Barbieri > said: > > that was my point in the phab comments... edje_edit was not meant to > be stable and to be used by ordinary apps/people. it was a specific > api added to expose internals to help write edje editors... and > editors are very much tied to internal details of edje... > theoretically an edje editor should ship WITH edje... but it > doesn't. :) > > > edje_edit is unstable... I recall we even request a #define to > > include it, no? > > > > On Wed, Mar 12, 2014 at 11:14 PM, Cedric BAIL > > wrote: > > > Hello, > > > > > > There is an open review https://phab.enlightenment.org/D562 that > > > raise a good point. The current API is not correct and don't let > > > Edje_Edit change edje value accurately (lost of precision). > > > Changing the type of the parameter will be an ABI break, but the > > > only application that should use this API should already be > > > impacted by the problem or there is only one application that use > > > it (and that's where the patch come from). > > > > > > I am very close to accept this patch in. If anyone does have any > > > strong reason to say no to this, time to raise your voice. > > > > > > Regards, > > > -- > > > Cedric BAIL > > > > > > -- > > > Learn Graph Databases - Download FREE O'Reilly Book > > > "Graph Databases" is the definitive new guide to graph databases > > > and their applications. Written by three acclaimed leaders in the > > > field, this first edition is now available. Download your free > > > book today! http://p.sf.net/sfu/13534_NeoTech > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > -- > > Gustavo Sverzut Barbieri > > -- > > Mobile: +55 (19) 99225-2202 > > Contact: http://www.gustavobarbieri.com.br/contact > > > > -- > > Learn Graph Databases - Download FREE O'Reilly Book > > "Graph Databases" is the definitive new guide to graph databases > > and their applications. Written by three acclaimed leaders in the > > field, this first edition is now available. Download your free book > > today! http://p.sf.net/sfu/13534_NeoTech > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > -- 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 -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/02: Revert "Make an option to disable tab switch animations."
glima pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=1ee57c508e96237fb84ddeb196a77a5b5fc44022
commit 1ee57c508e96237fb84ddeb196a77a5b5fc44022
Author: Gustavo Lima Chaves
Date: Wed Mar 12 23:22:27 2014 -0300
Revert "Make an option to disable tab switch animations."
This reverts commit 1d689839c065964333cd2ee8f3e6573b1f38a020.
---
src/bin/config.c | 5 -
src/bin/config.h | 3 ---
src/bin/main.c | 17 +++--
src/bin/options_behavior.c | 21 -
4 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/src/bin/config.c b/src/bin/config.c
index d47a893..ba6397b 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -97,8 +97,6 @@ config_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC
(edd_base, Config, "disable_visual_bell", disable_visual_bell,
EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC
- (edd_base, Config, "disable_switch_anim", disable_switch_anim,
EET_T_UCHAR);
- EET_DATA_DESCRIPTOR_ADD_BASIC
(edd_base, Config, "translucent", translucent, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC
(edd_base, Config, "mute", mute, EET_T_UCHAR);
@@ -209,7 +207,6 @@ config_sync(const Config *config_src, Config *config)
config->flicker_on_key = config_src->flicker_on_key;
config->disable_cursor_blink = config_src->disable_cursor_blink;
config->disable_visual_bell = config_src->disable_visual_bell;
- config->disable_switch_anim = config_src->disable_switch_anim;
config->mute = config_src->mute;
config->urg_bell = config_src->urg_bell;
config->multi_instance = config_src->multi_instance;
@@ -498,7 +495,6 @@ config_load(const char *key)
config->flicker_on_key = EINA_FALSE;
config->disable_cursor_blink = EINA_FALSE;
config->disable_visual_bell = EINA_FALSE;
- config->disable_switch_anim = EINA_FALSE;
s = eina_unicode_unicode_to_utf8(sep, &slen);
if (s)
{
@@ -578,7 +574,6 @@ config_fork(Config *config)
CPY(flicker_on_key);
CPY(disable_cursor_blink);
CPY(disable_visual_bell);
- CPY(disable_switch_anim);
CPY(translucent);
CPY(mute);
CPY(urg_bell);
diff --git a/src/bin/config.h b/src/bin/config.h
index fe4451d..e83b6b9 100644
--- a/src/bin/config.h
+++ b/src/bin/config.h
@@ -42,9 +42,6 @@ struct _Config
Eina_Bool flicker_on_key;
Eina_Bool disable_cursor_blink;
Eina_Bool disable_visual_bell;
- Eina_Bool disable_switch_anim; /* disable terminal switch
- * animations when issued by
- * key binds */
Eina_Bool translucent;
Eina_Bool mute;
Eina_Bool urg_bell;
diff --git a/src/bin/main.c b/src/bin/main.c
index 9cb805d..9ccb4a0 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1373,7 +1373,6 @@ _cb_prev(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
{
Term *term = data;
Term *term2 = NULL;
- Config *config = termio_config_get(term->term);
if (term->focused) term2 = _term_prev_get(term);
if (term2)
@@ -1382,7 +1381,7 @@ _cb_prev(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
sp0 = _split_find(term->wn->win, term->term);
sp = _split_find(term2->wn->win, term2->term);
-if (sp == sp0 && !config->disable_switch_anim)
+if (sp == sp0)
_sel_go(sp, term2);
else
{
@@ -1397,8 +1396,7 @@ _cb_next(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
{
Term *term = data;
Term *term2 = NULL;
- Config *config = termio_config_get(term->term);
-
+
if (term->focused) term2 = _term_next_get(term);
if (term2)
{
@@ -1406,7 +1404,7 @@ _cb_next(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
sp0 = _split_find(term->wn->win, term->term);
sp = _split_find(term2->wn->win, term2->term);
-if (sp == sp0 && !config->disable_switch_anim)
+if (sp == sp0)
_sel_go(sp, term2);
else
{
@@ -2586,8 +2584,6 @@ static const Ecore_Getopt options = {
"Set cursor blink mode."),
ECORE_GETOPT_STORE_BOOL('G', "visual-bell",
"Set visual bell mode."),
- ECORE_GETOPT_STORE_BOOL('A', "switch-anim",
- "Set terminal switch animations mode."),
ECORE_GETOPT_STORE_TRUE('F', "fullscreen",
"Go into the fullscreen mode from start."),
ECORE_GETOPT_STORE_TRUE('I', "iconic",
@@ -2633,7 +2629,6 @@ elm_main(int argc, char **argv)
Eina_Bool video_mute = 0xff; /* unset */
Eina_Bool cursor_blink = 0xff; /* unset */
Eina_Bool visual_bell = 0xff; /* unset */
- Eina_Bool switch_anim = 0xff; /* unset
[EGIT] [apps/terminology] master 02/02: Make zero-time switches between tabs flick-less.
glima pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a78acc35d790af56d4e8f9f4df46143a174ffd2f
commit a78acc35d790af56d4e8f9f4df46143a174ffd2f
Author: Gustavo Lima Chaves
Date: Thu Mar 13 00:20:32 2014 -0300
Make zero-time switches between tabs flick-less.
---
src/bin/main.c | 8 +---
src/bin/options_behavior.c | 12 +++-
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 9ccb4a0..55ab553 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1373,6 +1373,7 @@ _cb_prev(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
{
Term *term = data;
Term *term2 = NULL;
+ Config *config = termio_config_get(term->term);
if (term->focused) term2 = _term_prev_get(term);
if (term2)
@@ -1381,7 +1382,7 @@ _cb_prev(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
sp0 = _split_find(term->wn->win, term->term);
sp = _split_find(term2->wn->win, term2->term);
-if (sp == sp0)
+if (sp == sp0 && config->tab_zoom >= 0.01)
_sel_go(sp, term2);
else
{
@@ -1396,7 +1397,8 @@ _cb_next(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
{
Term *term = data;
Term *term2 = NULL;
-
+ Config *config = termio_config_get(term->term);
+
if (term->focused) term2 = _term_next_get(term);
if (term2)
{
@@ -1404,7 +1406,7 @@ _cb_next(void *data, Evas_Object *obj EINA_UNUSED, void
*event EINA_UNUSED)
sp0 = _split_find(term->wn->win, term->term);
sp = _split_find(term2->wn->win, term2->term);
-if (sp == sp0)
+if (sp == sp0 && config->tab_zoom >= 0.01)
_sel_go(sp, term2);
else
{
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 1e671fa..ac3fa19 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -524,11 +524,21 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
o = elm_label_add(bx);
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, 0.0, 0.5);
- elm_object_text_set(o, "Tab Zoom Animation:");
+ elm_object_text_set(o, "Tab zoom/switch animation time:");
+ elm_object_tooltip_text_set
+ (o, "Set the time of the animation that"
+ "takes places on tab switches,"
+ "be them by key binding, mouse"
+ "wheel or tabs panel mouse move");
elm_box_pack_end(bx, o);
evas_object_show(o);
o = elm_slider_add(bx);
+ elm_object_tooltip_text_set
+ (o, "Set the time of the animation that"
+ "takes places on tab switches,"
+ "be them by key binding, mouse"
+ "wheel or tabs panel mouse move");
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
elm_slider_span_size_set(o, 40);
--
Re: [E-devel] Eio soname conflicts with another libeio library
On Wed, 12 Mar 2014 23:47:58 -0300 Gustavo Sverzut Barbieri said: > On Wed, Mar 12, 2014 at 8:53 PM, Carsten Haitzler > wrote: > > On Wed, 12 Mar 2014 14:39:33 -0300 Gustavo Sverzut Barbieri > > said: > > > >> Not all distros pack the other eio, and we're not going to change in > >> upstream. > >> > >> This means you must change it at fedora side. Patch our Makefile and eio.pc > >> so it uses the new name. As all our users should be using pkg-config it > >> would be transparent to them. Just keep the name stable in fedora. > > > > of course this means that binaries NOT packaged and modified to link to your > > rename of eio on fedora will fail to work at all. you basically broke abi > > "universally" for fedora (ie within fedora it works but not across/outside). > > realistically speaking there is no such thing as "universal abi". The > ABI is defined within a distro unless there is some external > requirement for such (ie: crap LSB). Different libc tweaks, security > methods, required signatures, etc varies accross distros. valve, steam, sdl and most game makers might disagree with you there. > People that tried to do this with those ancient "sh-tarball" > installers fail miserably over the years. Nowadays they provide distro > specific packages and if you don't have that distro is up to you to > fix the problems, take Tizen SDK installer as an example :-) > > > -- > Gustavo Sverzut Barbieri > -- > Mobile: +55 (19) 99225-2202 > Contact: http://www.gustavobarbieri.com.br/contact > -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Transparent background, E18+elm? E18 (Enlightenment 0.18.2, efl 1.8.3, elm 1.8.2)
On Wed, 12 Mar 2014 21:14:17 -0400 Robert Heller said: > At Thu, 13 Mar 2014 09:22:59 +0900 Carsten Haitzler (The Rasterman) > wrote: > > > > > On Wed, 12 Mar 2014 12:20:43 -0400 Robert Heller said: > > > > > With code like this: > > > > > >Evas_Object *o; > > > > > >o = edje_object_add(e_comp_get(m->zone)->evas); > > >evas_object_name_set(o, "menu->sw_bg_object"); > > >evas_object_data_set(o, "e_menu", m); > > >e_theme_edje_object_set(o, "base/theme/menus", > > > "e/widgets/menu/default/background"); > > >m->sw_bg_object = o; > > >sm_object = e_start_menu_realize_inwindow(m,m->sw_bg_object); > > >edje_object_part_swallow > > > (m->sw_bg_object,"e.swallow.content",sm_object); m->cur.w = 350; > > >m->cur.h = 420; > > >m->cur.x = 0; > > >m->cur.y = 0; > > > > > > And later (in the idle handler): > > > > > >evas_object_move(m->sw_bg_object,m->cur.x,m->cur.y); > > >evas_object_resize(m->sw_bg_object,m->cur.w,m->cur.h); > > >E_LAYER_SET(m->sw_bg_object,E_COMP_CANVAS_LAYER_MENU); > > >E_LAYER_SET(m->container_object,E_COMP_CANVAS_LAYER_MENU); > > >evas_object_show(m->sw_bg_object); > > > > > > e_start_menu_realize_inwindow() contains: > > > > > > Evas_Object *o; > > > > > > /* Create the menu container, an Elm Table widget. */ > > > o = elm_table_add(canvas); > > > m->container_object = o; > > > elm_table_homogeneous_set(o, EINA_FALSE); > > > elm_table_padding_set(m->container_object, 5, 5); > > > evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, > > > EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, > > > EVAS_HINT_FILL); evas_object_name_set(o, "menu->container_object"); > > > evas_object_intercept_move_callback_add > > > (o,_e_intercept_container_move,m); > > > evas_object_intercept_resize_callback_add > > > (o,_e_intercept_container_resize,m); elm_object_focus_allow_set > > > (m->container_object, EINA_TRUE); elm_object_focus_set > > > ( m->container_object, EINA_TRUE); > > > > > > /* e_start_menu_realize_inwindow() then populates m->container_object > > > * -- eg create more elm widgets and pack them with > > > * elm_table_pack(m->container_object, ...) calls -- standard stuff > > > * straight out of the elementary docs. > > > */ > > > > > > /* Finally: */ > > > /* Return the container. */ > > > return m->container_object; > > > > > > This code works, but the widgets in m->container_object have a > > > *transparent* background, that is, for some reason 'm->sw_bg_object' is > > > ending up as transparent, even though "e/widgets/menu/default/background" > > > isn't defined as transparent (as far as my understanding of the menu.edc > > > file in the theme goes). I don't want that. What do I need to do to NOT > > > have a transparent background? Should I be using a *different* theme > > > group? Am I missing a edje_object function call somewhere? > > > > you're missing some information here. or confused. yes - normally menu > > items we have in e are transparent (widgets IN m->container_object... ie > > inside of it, not the container itself or the bg object which is a parent). > > this is what is designed and wanted so the menu background (bg object) > > shows through, UNTIL a menu item is selected, then it becomes "solid" (dark > > black with some gradients, shadowing etc.). that's the way it's designed, > > but then later you're talking about the menu background being > > transparent... which it is not by default. for sure. > > > > so is it that your menu background is transparent .. and that's your > > problem, or that the items themselves are transparent and you see through > > to the menu background? > > The background is transparent. The populated items in the 'menu' are opaque. > The table contains several genlist objects, not all of which fill all of the > available space and the 'unused' space is transparent. I'll take a screen > short and post it tomorrow. well i need to see what you're seeing, but what you are saying doesn't make sense given the default theme, that menus already work that way and are opaque etc. - i am unsure what is wrong there at this stage. > > > > i do have some q's - why do you set move/resize intercepts on the table? you > > want the emnu bg to swallow your table and control it... why not just let > > it do that? also be aware using elm objects in e's canvas like this will > > mean certain things are going to be iffy - like focus handling, so i'd > > suggest skipping that for not (elm_object_focus_* calls - just going to > > clutter up your code at the moment). also setting padding manually - i > > don't suggest that. it won't scale based on dpi or scaling factors, or > > finger size etc. i'd suggest not having any padding,a dn any spacing around > > items, do that in the theme, not in code (ie in edc). also you set the name > > of the container object.. you kn
Re: [E-devel] Request for ABI break
On Wed, 12 Mar 2014 23:54:23 -0300 Gustavo Sverzut Barbieri said: that was my point in the phab comments... edje_edit was not meant to be stable and to be used by ordinary apps/people. it was a specific api added to expose internals to help write edje editors... and editors are very much tied to internal details of edje... theoretically an edje editor should ship WITH edje... but it doesn't. :) > edje_edit is unstable... I recall we even request a #define to include it, no? > > On Wed, Mar 12, 2014 at 11:14 PM, Cedric BAIL wrote: > > Hello, > > > > There is an open review https://phab.enlightenment.org/D562 that raise > > a good point. The current API is not correct and don't let Edje_Edit > > change edje value accurately (lost of precision). Changing the type of > > the parameter will be an ABI break, but the only application that > > should use this API should already be impacted by the problem or there > > is only one application that use it (and that's where the patch come > > from). > > > > I am very close to accept this patch in. If anyone does have any > > strong reason to say no to this, time to raise your voice. > > > > Regards, > > -- > > Cedric BAIL > > > > -- > > Learn Graph Databases - Download FREE O'Reilly Book > > "Graph Databases" is the definitive new guide to graph databases and their > > applications. Written by three acclaimed leaders in the field, > > this first edition is now available. Download your free book today! > > http://p.sf.net/sfu/13534_NeoTech > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > -- > Gustavo Sverzut Barbieri > -- > Mobile: +55 (19) 99225-2202 > Contact: http://www.gustavobarbieri.com.br/contact > > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > 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 -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Request for ABI break
edje_edit is unstable... I recall we even request a #define to include it, no? On Wed, Mar 12, 2014 at 11:14 PM, Cedric BAIL wrote: > Hello, > > There is an open review https://phab.enlightenment.org/D562 that raise > a good point. The current API is not correct and don't let Edje_Edit > change edje value accurately (lost of precision). Changing the type of > the parameter will be an ABI break, but the only application that > should use this API should already be impacted by the problem or there > is only one application that use it (and that's where the patch come > from). > > I am very close to accept this patch in. If anyone does have any > strong reason to say no to this, time to raise your voice. > > Regards, > -- > Cedric BAIL > > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 99225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Eio soname conflicts with another libeio library
On Wed, Mar 12, 2014 at 8:53 PM, Carsten Haitzler wrote: > On Wed, 12 Mar 2014 14:39:33 -0300 Gustavo Sverzut Barbieri > said: > >> Not all distros pack the other eio, and we're not going to change in >> upstream. >> >> This means you must change it at fedora side. Patch our Makefile and eio.pc >> so it uses the new name. As all our users should be using pkg-config it >> would be transparent to them. Just keep the name stable in fedora. > > of course this means that binaries NOT packaged and modified to link to your > rename of eio on fedora will fail to work at all. you basically broke abi > "universally" for fedora (ie within fedora it works but not across/outside). realistically speaking there is no such thing as "universal abi". The ABI is defined within a distro unless there is some external requirement for such (ie: crap LSB). Different libc tweaks, security methods, required signatures, etc varies accross distros. People that tried to do this with those ancient "sh-tarball" installers fail miserably over the years. Nowadays they provide distro specific packages and if you don't have that distro is up to you to fix the problems, take Tizen SDK installer as an example :-) -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 99225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Request for ABI break
Hello, There is an open review https://phab.enlightenment.org/D562 that raise a good point. The current API is not correct and don't let Edje_Edit change edje value accurately (lost of precision). Changing the type of the parameter will be an ABI break, but the only application that should use this API should already be impacted by the problem or there is only one application that use it (and that's where the patch come from). I am very close to accept this patch in. If anyone does have any strong reason to say no to this, time to raise your voice. Regards, -- Cedric BAIL -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 10/10: evas: simplify path logic and make backend code more robust.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d3bc06ae33320f07d6448fc114ce488e785686f1
commit d3bc06ae33320f07d6448fc114ce488e785686f1
Author: Cedric BAIL
Date: Thu Mar 13 10:57:38 2014 +0900
evas: simplify path logic and make backend code more robust.
Fix CID 1039665.
---
src/lib/evas/canvas/evas_font_dir.c | 2 +-
src/lib/evas/common/evas_font_load.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_font_dir.c
b/src/lib/evas/canvas/evas_font_dir.c
index a4d59bc..1eed53a 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -633,7 +633,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc,
const char *source,
int fsize = 0;
fdata = eet_read(ef, nm, &fsize);
-if ((fdata) && (fsize > 0))
+if (fdata)
{
font =
evas->engine.func->font_memory_load(evas->engine.data.output, source, nm, size,
fdata, fsize, wanted_rend);
free(fdata);
diff --git a/src/lib/evas/common/evas_font_load.c
b/src/lib/evas/common/evas_font_load.c
index 8b1991e..92fdd24 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -135,6 +135,7 @@ evas_common_font_source_memory_load(const char *name, const
void *data, int data
RGBA_Font_Source *fs;
assert(name != NULL);
+ if (data_size <= 0) return NULL;
fs = calloc(1, sizeof(RGBA_Font_Source) + data_size);
if (!fs) return NULL;
fs->data = ((unsigned char *)fs) + sizeof(RGBA_Font_Source);
--
[EGIT] [core/efl] master 03/10: evas: restore behavior of stack above and below when no rel is specified.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e9bd738dc4ec5e8906c8c15ba4176e099a21df74
commit e9bd738dc4ec5e8906c8c15ba4176e099a21df74
Author: Cedric BAIL
Date: Thu Mar 13 10:33:05 2014 +0900
evas: restore behavior of stack above and below when no rel is specified.
This will fix CID 1191907 and CID 1191906.
@fix
---
src/lib/evas/canvas/evas_stack.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index b5d1b63..e018db1 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -133,14 +133,13 @@ _evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data
*obj)
EOLIAN void
_evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Evas_Object *eo_above)
{
- if (!eo_above) return;
- if (eo_obj == eo_above) return;
- if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return;
if (!eo_above)
{
evas_object_raise(eo_obj);
return;
}
+ if (eo_obj == eo_above) return;
+ if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return;
Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above,
EVAS_OBJ_CLASS);
if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
{
@@ -209,14 +208,13 @@ _evas_object_stack_above(Eo *eo_obj,
Evas_Object_Protected_Data *obj, Evas_Objec
EOLIAN void
_evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj,
Evas_Object *eo_below)
{
- if (!eo_below) return;
- if (eo_obj == eo_below) return;
- if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return;
if (!eo_below)
{
evas_object_lower(eo_obj);
return;
}
+ if (eo_obj == eo_below) return;
+ if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return;
Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below,
EVAS_OBJ_CLASS);
if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
{
--
[EGIT] [core/efl] master 08/10: evas: be consistent in our check for NULL layer.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9b0127f1028d3725cd52474a0efc51f4184e5faa
commit 9b0127f1028d3725cd52474a0efc51f4184e5faa
Author: Cedric BAIL
Date: Thu Mar 13 10:46:05 2014 +0900
evas: be consistent in our check for NULL layer.
Fix CID 1191913.
---
src/lib/evas/canvas/evas_name.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index b8289c6..1d686eb 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -14,7 +14,8 @@ _evas_object_name_set(Eo *eo_obj, Evas_Object_Protected_Data
*obj, const char *n
else
{
obj->name = strdup(name);
-eina_hash_add(obj->layer->evas->name_hash, obj->name, eo_obj);
+if (obj->layer && obj->layer->evas && obj->layer->evas->name_hash)
+ eina_hash_add(obj->layer->evas->name_hash, obj->name, eo_obj);
}
}
--
[EGIT] [core/efl] master 02/10: edje: external is already used directly before, so checking it is unnecessary.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=48aca12d223743d457a02c3edc606366c9dc577e
commit 48aca12d223743d457a02c3edc606366c9dc577e
Author: Cedric BAIL
Date: Thu Mar 13 10:29:27 2014 +0900
edje: external is already used directly before, so checking it is
unnecessary.
CID 1191908.
---
src/lib/edje/edje_edit.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index d87ff07..ef7ade0 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4365,10 +4365,7 @@ edje_edit_state_external_param_set(Evas_Object *obj,
const char *part, const cha
if (!found)
{
- if (external)
-external->external_params =
eina_list_append(external->external_params, p);
- else
-free(p);
+ external->external_params =
eina_list_append(external->external_params, p);
}
if (rp->typedata.swallow && rp->param1.external_params)
--
[EGIT] [core/efl] master 05/10: evas: let's not access a potential NULL object when looping on a corrupted object list.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4dcf49c6e9b478b8115e82f312566f042f086c9a
commit 4dcf49c6e9b478b8115e82f312566f042f086c9a
Author: Cedric BAIL
Date: Thu Mar 13 10:36:43 2014 +0900
evas: let's not access a potential NULL object when looping on a corrupted
object list.
This fix CID 1191920.
---
src/lib/evas/canvas/evas_map.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index d7cd29d..142f6f0 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -484,8 +484,8 @@ _evas_object_map_enable_set(Eo *eo_obj,
Evas_Object_Protected_Data *obj, Eina_Bo
for (eo_parents = obj->smart.parent; eo_parents; eo_parents =
parents->smart.parent)
{
parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS);
- if (parents)
- parents->child_has_map = EINA_TRUE;
+ if (!parents) break;
+ parents->child_has_map = EINA_TRUE;
}
}
else
--
[EGIT] [core/efl] master 07/10: evas: protect correctly for object layer not being set.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e9d86e8719123655b89697211f20e543d06adbc0 commit e9d86e8719123655b89697211f20e543d06adbc0 Author: Cedric BAIL Date: Thu Mar 13 10:44:15 2014 +0900 evas: protect correctly for object layer not being set. FIX CID 1191914, CID 1191915, CID 1191916 and CID 1191917. --- src/lib/evas/canvas/evas_stack.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index 993d90c..aaca427 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -63,7 +63,7 @@ _evas_object_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj) obj->restack = EINA_TRUE; evas_object_change(eo_obj, obj); evas_object_inform_call_restack(eo_obj); - if (obj->layer->evas->is_frozen) return; + if (!obj->layer || obj->layer->evas->is_frozen) return; if ((!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && (!evas_object_is_source_invisible(eo_obj, obj))) @@ -110,7 +110,7 @@ _evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) obj->restack = EINA_TRUE; evas_object_change(eo_obj, obj); evas_object_inform_call_restack(eo_obj); - if (obj->layer->evas->is_frozen) return; + if (!obj->layer || obj->layer->evas->is_frozen) return; if ((!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && (!evas_object_is_source_invisible(eo_obj, obj))) @@ -185,7 +185,7 @@ _evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Objec obj->restack = EINA_TRUE; evas_object_change(eo_obj, obj); evas_object_inform_call_restack(eo_obj); - if (obj->layer->evas->is_frozen) return; + if (!obj->layer || obj->layer->evas->is_frozen) return; if ((!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && (!evas_object_is_source_invisible(eo_obj, obj))) @@ -260,7 +260,7 @@ _evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Objec obj->restack = EINA_TRUE; evas_object_change(eo_obj, obj); evas_object_inform_call_restack(eo_obj); - if (obj->layer->evas->is_frozen) return; + if (!obj->layer || obj->layer->evas->is_frozen) return; if ((!evas_event_passes_through(eo_obj, obj)) && (!evas_event_freezes_through(eo_obj, obj)) && (!evas_object_is_source_invisible(eo_obj, obj))) --
[EGIT] [core/efl] master 06/10: evas: protect against potential NULL access.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bd2152a1cc1dc0f689d61573a63d879778c48166
commit bd2152a1cc1dc0f689d61573a63d879778c48166
Author: Cedric BAIL
Date: Thu Mar 13 10:39:27 2014 +0900
evas: protect against potential NULL access.
Fix CID 1191919.
---
src/lib/evas/canvas/evas_clip.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 918fe36..01d2ede 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -235,6 +235,11 @@ _evas_object_clip_set(Eo *eo_obj,
Evas_Object_Protected_Data *obj, Evas_Object *
CRI("Setting object %p from Evas (%p) to another Evas (%p)", obj,
obj->layer->evas, clip->layer->evas);
return;
}
+ if (!obj->layer || !clip->layer)
+ {
+CRI("Object %p or clip %p layer is not set !", obj, clip);
+return;
+ }
if (evas_object_intercept_call_clip_set(eo_obj, obj, eo_clip)) return;
// illegal to set anything but a rect as a clip
--
[EGIT] [core/efl] master 04/10: evas: the while guarantee that obj will be NULL, so let's not access it.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=34c836ec608d66dc0a7df6c2c6b843d60cdc6fa8 commit 34c836ec608d66dc0a7df6c2c6b843d60cdc6fa8 Author: Cedric BAIL Date: Thu Mar 13 10:34:55 2014 +0900 evas: the while guarantee that obj will be NULL, so let's not access it. This will fix CID 1191918. --- src/lib/evas/canvas/evas_stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index e018db1..993d90c 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -366,6 +366,6 @@ _evas_object_top_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) obj = evas_object_below_get_internal(obj); } - return obj->object; + return NULL; } --
[EGIT] [core/efl] master 01/10: edje_edit: adding of NULL-checks
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a4d2e420424666d93fda6ad989d1584390629a0f
commit a4d2e420424666d93fda6ad989d1584390629a0f
Author: perepelits.m
Date: Thu Mar 13 10:26:20 2014 +0900
edje_edit: adding of NULL-checks
Summary:
New NULL-checks have been added in:
edje_edit_state_color_class_set
edje_edit_state_external_param_get
edje_edit_state_external_param_int_get
edje_edit_state_external_param_bool_get
edje_edit_state_external_param_double_get
edje_edit_state_external_param_string_get
edje_edit_state_external_param_choice_get
edje_edit_state_external_param_set
Reviewers: cedric, seoz, raster
Reviewed By: cedric
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D629
---
src/lib/edje/edje_edit.c | 27 +++
1 file changed, 27 insertions(+)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 4bf1531..d87ff07 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4013,6 +4013,12 @@ edje_edit_state_color_class_set(Evas_Object *obj, const
char *part, const char *
if ((!obj) || (!part) || (!state)) return EINA_FALSE;
GET_PD_OR_RETURN(EINA_FALSE);
+ if (!color_class)
+ {
+ pd->color_class = NULL;
+ return EINA_FALSE;
+ }
+
if (!ed->file->color_classes) return EINA_FALSE;
EINA_LIST_FOREACH(ed->file->color_classes, l, cc)
{
@@ -4070,6 +4076,9 @@ edje_edit_state_external_param_get(Evas_Object *obj,
const char *part, const cha
if (rp->part->type != EDJE_PART_TYPE_EXTERNAL)
return EINA_FALSE;
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4114,6 +4123,9 @@ edje_edit_state_external_param_int_get(Evas_Object *obj,
const char *part, const
return EINA_FALSE;
}
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4144,6 +4156,9 @@ edje_edit_state_external_param_bool_get(Evas_Object *obj,
const char *part, cons
return EINA_FALSE;
}
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4174,6 +4189,9 @@ edje_edit_state_external_param_double_get(Evas_Object
*obj, const char *part, co
return EINA_FALSE;
}
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4204,6 +4222,9 @@ edje_edit_state_external_param_string_get(Evas_Object
*obj, const char *part, co
return EINA_FALSE;
}
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4234,6 +4255,9 @@ edje_edit_state_external_param_choice_get(Evas_Object
*obj, const char *part, co
return EINA_FALSE;
}
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
EINA_LIST_FOREACH(external->external_params, l, p)
@@ -4263,6 +4287,9 @@ edje_edit_state_external_param_set(Evas_Object *obj,
const char *part, const cha
if (rp->part->type != EDJE_PART_TYPE_EXTERNAL)
return EINA_FALSE;
+ if (!param)
+ return EINA_FALSE;
+
external = (Edje_Part_Description_External *) pd;
va_start(ap, type);
--
[EGIT] [core/efl] master 09/10: evas: track modifier in the limited range of unsigned long long.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=522cb7756d663ac14eaa9d8ecc534bc17fa03aa3 commit 522cb7756d663ac14eaa9d8ecc534bc17fa03aa3 Author: Cedric BAIL Date: Thu Mar 13 10:52:37 2014 +0900 evas: track modifier in the limited range of unsigned long long. This fix CID 1191924, CID 1191923, CID 1191922 and CID 1191921. --- src/lib/evas/canvas/evas_key.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c index 22c9f2e..188870c 100644 --- a/src/lib/evas/canvas/evas_key.c +++ b/src/lib/evas/canvas/evas_key.c @@ -150,7 +150,7 @@ _evas_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *key int n; n = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname); - if (n < 0) return; + if (n < 0 || n > 63) return; num = (Evas_Modifier_Mask)n; num = 1 << num; e->modifiers.mask |= num; @@ -163,7 +163,7 @@ _evas_key_modifier_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *ke int n; n = evas_key_modifier_number(&(e->modifiers), keyname); - if (n < 0) return; + if (n < 0 || n > 63) return; num = (Evas_Modifier_Mask)n; num = 1 << num; e->modifiers.mask &= ~num; @@ -176,7 +176,7 @@ _evas_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keyname int n; n = evas_key_lock_number(&(e->locks), keyname); - if (n < 0) return; + if (n < 0 || n > 63) return; num = (Evas_Modifier_Mask)n; num = 1 << num; e->locks.mask |= num; @@ -189,7 +189,7 @@ _evas_key_lock_off(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *keynam int n; n = evas_key_lock_number(&(e->locks), keyname); - if (n < 0) return; + if (n < 0 || n > 63) return; num = (Evas_Modifier_Mask)n; num = 1 << num; e->locks.mask &= ~num; @@ -206,7 +206,7 @@ _evas_key_modifier_mask_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, const cha if (!keyname) return 0; n = evas_key_modifier_number(&(e->modifiers), keyname); - if (n < 0) return 0; + if (n < 0 || n > 63) return 0; num = (Evas_Modifier_Mask)n; return 1 << num; } --
Re: [E-devel] Transparent background, E18+elm? E18 (Enlightenment 0.18.2, efl 1.8.3, elm 1.8.2)
At Thu, 13 Mar 2014 09:22:59 +0900 Carsten Haitzler (The Rasterman) wrote: > > On Wed, 12 Mar 2014 12:20:43 -0400 Robert Heller said: > > > With code like this: > > > >Evas_Object *o; > > > >o = edje_object_add(e_comp_get(m->zone)->evas); > >evas_object_name_set(o, "menu->sw_bg_object"); > >evas_object_data_set(o, "e_menu", m); > >e_theme_edje_object_set(o, "base/theme/menus", > > "e/widgets/menu/default/background"); > >m->sw_bg_object = o; > >sm_object = e_start_menu_realize_inwindow(m,m->sw_bg_object); > >edje_object_part_swallow(m->sw_bg_object,"e.swallow.content",sm_object); > >m->cur.w = 350; > >m->cur.h = 420; > >m->cur.x = 0; > >m->cur.y = 0; > > > > And later (in the idle handler): > > > >evas_object_move(m->sw_bg_object,m->cur.x,m->cur.y); > >evas_object_resize(m->sw_bg_object,m->cur.w,m->cur.h); > >E_LAYER_SET(m->sw_bg_object,E_COMP_CANVAS_LAYER_MENU); > >E_LAYER_SET(m->container_object,E_COMP_CANVAS_LAYER_MENU); > >evas_object_show(m->sw_bg_object); > > > > e_start_menu_realize_inwindow() contains: > > > > Evas_Object *o; > > > > /* Create the menu container, an Elm Table widget. */ > > o = elm_table_add(canvas); > > m->container_object = o; > > elm_table_homogeneous_set(o, EINA_FALSE); > > elm_table_padding_set(m->container_object, 5, 5); > > evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > > evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > > evas_object_name_set(o, "menu->container_object"); > > > > evas_object_intercept_move_callback_add(o,_e_intercept_container_move,m); > > evas_object_intercept_resize_callback_add > > (o,_e_intercept_container_resize,m); elm_object_focus_allow_set > > (m->container_object, EINA_TRUE); elm_object_focus_set ( > > m->container_object, > > EINA_TRUE); > > > > /* e_start_menu_realize_inwindow() then populates m->container_object > > * -- eg create more elm widgets and pack them with > > * elm_table_pack(m->container_object, ...) calls -- standard stuff > > * straight out of the elementary docs. > > */ > > > > /* Finally: */ > > /* Return the container. */ > > return m->container_object; > > > > This code works, but the widgets in m->container_object have a *transparent* > > background, that is, for some reason 'm->sw_bg_object' is ending up as > > transparent, even though "e/widgets/menu/default/background" isn't defined > > as > > transparent (as far as my understanding of the menu.edc file in the theme > > goes). I don't want that. What do I need to do to NOT have a transparent > > background? Should I be using a *different* theme group? Am I missing a > > edje_object function call somewhere? > > you're missing some information here. or confused. yes - normally menu items > we > have in e are transparent (widgets IN m->container_object... ie inside of it, > not the container itself or the bg object which is a parent). this is what is > designed and wanted so the menu background (bg object) shows through, UNTIL a > menu item is selected, then it becomes "solid" (dark black with some > gradients, > shadowing etc.). that's the way it's designed, but then later you're talking > about the menu background being transparent... which it is not by default. for > sure. > > so is it that your menu background is transparent .. and that's your problem, > or > that the items themselves are transparent and you see through to the menu > background? The background is transparent. The populated items in the 'menu' are opaque. The table contains several genlist objects, not all of which fill all of the available space and the 'unused' space is transparent. I'll take a screen short and post it tomorrow. > > i do have some q's - why do you set move/resize intercepts on the table? you > want the emnu bg to swallow your table and control it... why not just let it > do > that? also be aware using elm objects in e's canvas like this will mean > certain > things are going to be iffy - like focus handling, so i'd suggest skipping > that > for not (elm_object_focus_* calls - just going to clutter up your code at the > moment). also setting padding manually - i don't suggest that. it won't scale > based on dpi or scaling factors, or finger size etc. i'd suggest not having > any > padding,a dn any spacing around items, do that in the theme, not in code (ie > in > edc). also you set the name of the container object.. you know if you have > submenus or other menus, with the same name, there can be a clash. i generally > avoid setting object names because they do share a flat namespace. beware. > also > tables are not homogeneous by default. no need to set that to false as that's > how they come. The intercepts are mostly for debugging and for capturing the size and location information. Even though tables are not homogeneou
Re: [E-devel] Transparent background, E18+elm? E18 (Enlightenment 0.18.2, efl 1.8.3, elm 1.8.2)
On Wed, 12 Mar 2014 12:20:43 -0400 Robert Heller said: > With code like this: > >Evas_Object *o; > >o = edje_object_add(e_comp_get(m->zone)->evas); >evas_object_name_set(o, "menu->sw_bg_object"); >evas_object_data_set(o, "e_menu", m); >e_theme_edje_object_set(o, "base/theme/menus", > "e/widgets/menu/default/background"); >m->sw_bg_object = o; >sm_object = e_start_menu_realize_inwindow(m,m->sw_bg_object); >edje_object_part_swallow(m->sw_bg_object,"e.swallow.content",sm_object); >m->cur.w = 350; >m->cur.h = 420; >m->cur.x = 0; >m->cur.y = 0; > > And later (in the idle handler): > >evas_object_move(m->sw_bg_object,m->cur.x,m->cur.y); >evas_object_resize(m->sw_bg_object,m->cur.w,m->cur.h); >E_LAYER_SET(m->sw_bg_object,E_COMP_CANVAS_LAYER_MENU); >E_LAYER_SET(m->container_object,E_COMP_CANVAS_LAYER_MENU); >evas_object_show(m->sw_bg_object); > > e_start_menu_realize_inwindow() contains: > > Evas_Object *o; > > /* Create the menu container, an Elm Table widget. */ > o = elm_table_add(canvas); > m->container_object = o; > elm_table_homogeneous_set(o, EINA_FALSE); > elm_table_padding_set(m->container_object, 5, 5); > evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); > evas_object_name_set(o, "menu->container_object"); > evas_object_intercept_move_callback_add(o,_e_intercept_container_move,m); > evas_object_intercept_resize_callback_add > (o,_e_intercept_container_resize,m); elm_object_focus_allow_set > (m->container_object, EINA_TRUE); elm_object_focus_set ( m->container_object, > EINA_TRUE); > > /* e_start_menu_realize_inwindow() then populates m->container_object > * -- eg create more elm widgets and pack them with > * elm_table_pack(m->container_object, ...) calls -- standard stuff > * straight out of the elementary docs. > */ > > /* Finally: */ > /* Return the container. */ > return m->container_object; > > This code works, but the widgets in m->container_object have a *transparent* > background, that is, for some reason 'm->sw_bg_object' is ending up as > transparent, even though "e/widgets/menu/default/background" isn't defined as > transparent (as far as my understanding of the menu.edc file in the theme > goes). I don't want that. What do I need to do to NOT have a transparent > background? Should I be using a *different* theme group? Am I missing a > edje_object function call somewhere? you're missing some information here. or confused. yes - normally menu items we have in e are transparent (widgets IN m->container_object... ie inside of it, not the container itself or the bg object which is a parent). this is what is designed and wanted so the menu background (bg object) shows through, UNTIL a menu item is selected, then it becomes "solid" (dark black with some gradients, shadowing etc.). that's the way it's designed, but then later you're talking about the menu background being transparent... which it is not by default. for sure. so is it that your menu background is transparent .. and that's your problem, or that the items themselves are transparent and you see through to the menu background? i do have some q's - why do you set move/resize intercepts on the table? you want the emnu bg to swallow your table and control it... why not just let it do that? also be aware using elm objects in e's canvas like this will mean certain things are going to be iffy - like focus handling, so i'd suggest skipping that for not (elm_object_focus_* calls - just going to clutter up your code at the moment). also setting padding manually - i don't suggest that. it won't scale based on dpi or scaling factors, or finger size etc. i'd suggest not having any padding,a dn any spacing around items, do that in the theme, not in code (ie in edc). also you set the name of the container object.. you know if you have submenus or other menus, with the same name, there can be a clash. i generally avoid setting object names because they do share a flat namespace. beware. also tables are not homogeneous by default. no need to set that to false as that's how they come. -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_win: Unbreak the ABI break of window type.
On Wed, 12 Mar 2014 14:25:57 -0300 Gustavo Sverzut Barbieri
said:
> This is basically useless as the point of having unknown as 0 is to get
> uninitialized stuff. Just remove this unknown value.
i would have to agree. a window will ALWAYS have a known type because it's set
up at creation. a window can never be unknown...
UNLESS the object is null or the wrong type. ie it's not a window. if that's
the case... it's largely irrelevant what is returned - there is nothing really
sensible you can do with the type - so returning "basic" is as good as anything.
> On Tuesday, March 11, 2014, Daniel Juyung Seo wrote:
>
> > seoz pushed a commit to branch master.
> >
> >
> > http://git.enlightenment.org/core/elementary.git/commit/?id=79d2df12fe5e4d57d7a6247975feac1f0793ec72
> >
> > commit 79d2df12fe5e4d57d7a6247975feac1f0793ec72
> > Author: Daniel Juyung Seo >
> > Date: Wed Mar 12 12:42:59 2014 +0900
> >
> > elm_win: Unbreak the ABI break of window type.
> >
> > @fix
> > ---
> > src/lib/elm_win_common.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/lib/elm_win_common.h b/src/lib/elm_win_common.h
> > index b5eb567..3c88278 100644
> > --- a/src/lib/elm_win_common.h
> > +++ b/src/lib/elm_win_common.h
> > @@ -9,7 +9,7 @@
> > */
> > typedef enum
> > {
> > - ELM_WIN_UNKNOWN, /**< Unknown window type. */
> > + ELM_WIN_UNKNOWN = -1, /**< Unknown window type. */
> > ELM_WIN_BASIC, /**< A normal window. Indicates a normal, top-level
> > window. Almost every window will be created with this
> > type. */
> >
> > --
> >
> >
> >
>
> --
> Gustavo Sverzut Barbieri
> --
> Mobile: +55 (19) 99225-2202
> Contact: http://www.gustavobarbieri.com.br/contact
> --
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/13534_NeoTech
> ___
> 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
--
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Eio soname conflicts with another libeio library
On Wed, 12 Mar 2014 14:39:33 -0300 Gustavo Sverzut Barbieri said: > Not all distros pack the other eio, and we're not going to change in > upstream. > > This means you must change it at fedora side. Patch our Makefile and eio.pc > so it uses the new name. As all our users should be using pkg-config it > would be transparent to them. Just keep the name stable in fedora. of course this means that binaries NOT packaged and modified to link to your rename of eio on fedora will fail to work at all. you basically broke abi "universally" for fedora (ie within fedora it works but not across/outside). > On Wednesday, March 12, 2014, Cedric BAIL wrote: > > > Hello, > > > > On Wed, Mar 12, 2014 at 4:15 PM, Jan Kaluža > > > wrote: > > > while packaging libeio library (not the one from Enlightenment) [1], I > > > have found out that the soname conflicts with Eio library from your > > > project. I have already asked libeio upstream if they are willing to > > > solve this problem somehow globally, but they are not. > > > > > > They think their libeio is here for longer time and used by more > > > external projects while Eio is more like internal library. I can't prove > > > that anyhow, since I don't know the history of these libraries. > > > > Their libeio seems to be 5 years old, ours date from July 2010. As for > > being internal it is not. Eio is a public API part of EFL and to be > > used by anyone doing asynchronous IO with or without a UI. Except > > Ephoto and Elementary, I don't think there is any other open source > > user of it. Most of the user I know of are proprietary application and > > would not be using Fedora. > > > > > My question is if you, as a Eio upstream, would like to fix this > > > conflict in the library name. We will probably have to rename one of the > > > libraries in Fedora otherwise [2]. > > > > It is something tricky to solve, by now we have already application > > using it. It is a public and supported API on our side, changing the > > naming would break existing application on every other distribution. I > > don't really see a solution to this problem at this stage. Sadly it is > > almost 3 years to late... > > > > > Sorry if this question has been asked already but I was not able to find > > > it in archive. > > > > I think the question was raised maybe once in the past, I may be > > mistaken, for another distribution. I think the conclusion was to drop > > that other eio library as it didn't have any application using it in > > their repository. > > > > Regards, > > -- > > Cedric BAIL > > > > > > -- > > Learn Graph Databases - Download FREE O'Reilly Book > > "Graph Databases" is the definitive new guide to graph databases and their > > applications. Written by three acclaimed leaders in the field, > > this first edition is now available. Download your free book today! > > http://p.sf.net/sfu/13534_NeoTech > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > -- > Gustavo Sverzut Barbieri > -- > Mobile: +55 (19) 99225-2202 > Contact: http://www.gustavobarbieri.com.br/contact > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > 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 -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: status - don't display part highlight message when setting change is applied.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=7ab80a9c1411c197e4cd50e4dbb40e8e1dc8f863 commit 7ab80a9c1411c197e4cd50e4dbb40e8e1dc8f863 Author: ChunEon Park Date: Thu Mar 13 04:12:14 2014 +0900 status - don't display part highlight message when setting change is applied. --- src/bin/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/main.c b/src/bin/main.c index 7bdd653..21c570b 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -367,7 +367,7 @@ config_update_cb(void *data) base_tools_toggle(EINA_FALSE); base_statusbar_toggle(EINA_FALSE); - edit_part_highlight_toggle(ad->ed, EINA_TRUE); + edit_part_highlight_toggle(ad->ed, EINA_FALSE); view_dummy_toggle(VIEW_DATA, EINA_FALSE); //previous build was failed, Need to rebuild then reload the edj. --
[EGIT] [tools/enventor] master 01/01: newfile - open real "new" template code when NEW file is requested.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5a4d2baaf3f160e4bbfb2c88efbd1497ce4fba33
commit 5a4d2baaf3f160e4bbfb2c88efbd1497ce4fba33
Author: ChunEon Park
Date: Thu Mar 13 03:54:03 2014 +0900
newfile - open real "new" template code when NEW file is requested.
previously, it doesn't open a new template code but modified one.
now it's fixed.
---
src/bin/Makefile.am | 1 +
src/bin/edc_editor.c | 9 +
src/bin/main.c | 20 +---
src/bin/menu.c | 21 +
src/bin/newfile.c| 21 +
src/include/Makefile.am | 1 +
src/include/common.h | 1 +
src/include/edc_editor.h | 1 +
src/include/newfile.h| 1 +
9 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 29e0f9a..e614c7b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -28,6 +28,7 @@ enventor_SOURCES = \
build.c \
tools.c \
search.c \
+ newfile.c \
globals.c
enventor_LDADD = @ENVENTOR_LIBS@
diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c
index 04e2358..f2c95db 100644
--- a/src/bin/edc_editor.c
+++ b/src/bin/edc_editor.c
@@ -927,3 +927,12 @@ edit_part_highlight_toggle(edit_data *ed, Eina_Bool msg)
else
stats_info_msg_update("Part Highlighting Disabled.");
}
+
+void
+edit_edc_reload(edit_data *ed, const char *edc_path)
+{
+ config_edc_path_set(edc_path);
+ edit_new(ed);
+ edj_mgr_reload_need_set(EINA_TRUE);
+ config_apply();
+}
diff --git a/src/bin/main.c b/src/bin/main.c
index 878a89a..7bdd653 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -36,25 +36,7 @@ edc_changed_cb(void *data, int type EINA_UNUSED, void *event)
static Eina_Bool
edc_proto_setup()
{
- Eina_Bool success = EINA_TRUE;
-
- char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), "%s/.proto/proto.edc",
-elm_app_data_dir_get());
-
- if (!ecore_file_exists(config_edc_path_get()))
- {
-EINA_LOG_INFO("No working edc file exists. Copy a proto.edc");
-success = eina_file_copy(buf, config_edc_path_get(),
- EINA_FILE_COPY_DATA, NULL, NULL);
- }
-
- if (!success)
- {
-EINA_LOG_ERR("Cannot find file! \"%s\"", buf);
-return EINA_FALSE;
- }
-
+ newfile_new(NULL, EINA_TRUE);
build_edc();
return EINA_TRUE;
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 3fa8f7d..1689f71 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -37,7 +37,6 @@ static void warning_no_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED);
static void new_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED);
-static void edc_reload(menu_data *md, const char *edc_path);
static void edc_file_save(menu_data *md);
static void
@@ -601,8 +600,7 @@ new_yes_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
menu_data *md = data;
-
- edc_reload(md, PROTO_EDC_PATH);
+ newfile_new(md->ed, EINA_FALSE);
warning_close(md);
menu_close(md);
}
@@ -659,15 +657,6 @@ btn_effect_timer_cb(void *data)
}
static void
-edc_reload(menu_data *md, const char *edc_path)
-{
- config_edc_path_set(edc_path);
- edit_new(md->ed);
- edj_mgr_reload_need_set(EINA_TRUE);
- config_apply();
-}
-
-static void
warning_no_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
@@ -682,7 +671,7 @@ new_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
menu_data *md = data;
edit_save(md->ed);
- edc_reload(md, PROTO_EDC_PATH);
+ newfile_new(md->ed, EINA_FALSE);
warning_close(md);
menu_close(md);
}
@@ -692,7 +681,7 @@ new_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
menu_data *md = data;
- menu_edc_new(md);
+ menu_edc_new();
}
static void
@@ -820,7 +809,7 @@ fileselector_load_done_cb(void *data, Evas_Object *obj,
void *event_info)
return;
}
- edc_reload(md, selected);
+ edit_edc_reload(md->ed, selected);
fileselector_close(md);
menu_close(md);
}
@@ -1023,7 +1012,7 @@ menu_edc_new()
warning_layout_create(md, new_yes_btn_cb, new_save_btn_cb);
return EINA_TRUE;
}
- edc_reload(md, PROTO_EDC_PATH);
+ newfile_new(md->ed, EINA_FALSE);
menu_close(md);
return EINA_FALSE;
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
new file mode 100644
index 000..9e1995f
--- /dev/null
+++ b/src/bin/newfile.c
@@ -0,0 +1,21 @@
+#include
+#include "common.h"
+
+
+void
+newfile_new(edit_data *ed, Eina_Bool init)
+{
+ Eina_Bool success = EINA_TRUE;
+ char buf[PATH_MAX];
+ snprintf(buf, sizeof(buf), "%s/.proto/proto.edc",
+elm_app_data_dir_get());
+ success =
[EGIT] [tools/enventor] master 01/01: parser - fix the inccorect decision to
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2a19e9907962e629e2a5df06431306c545f33d0e
commit 2a19e9907962e629e2a5df06431306c545f33d0e
Author: ChunEon Park
Date: Thu Mar 13 03:11:01 2014 +0900
parser - fix the inccorect decision to
When the user double clicks a word,
enventor parser checks whether the word is regarded to some values
that ctxpopup shows the candidates list of (for other values).
In case the user just clicks the ":" and ";"
the parser misjudges it's the values that chould be changes to other values.
Now parser avoids the both cases to do nothing.
---
src/bin/edc_parser.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c
index 68df568..9b1f692 100644
--- a/src/bin/edc_parser.c
+++ b/src/bin/edc_parser.c
@@ -200,13 +200,14 @@ attr_value *
parser_attribute_get(parser_data *pd, const char *text, const char *cur)
{
if (!text || !cur) return NULL;
-
- char *p = (char *) cur;
+ if ((*cur == ';') || (*cur == ':')) return NULL;
parser_attr *attr;
Eina_Bool instring = EINA_FALSE;
Eina_Bool necessary = EINA_FALSE;
+ char *p = (char *) cur;
+
while (p >= text)
{
if (*p == ':')
--
Re: [E-devel] Eio soname conflicts with another libeio library
Not all distros pack the other eio, and we're not going to change in upstream. This means you must change it at fedora side. Patch our Makefile and eio.pc so it uses the new name. As all our users should be using pkg-config it would be transparent to them. Just keep the name stable in fedora. On Wednesday, March 12, 2014, Cedric BAIL wrote: > Hello, > > On Wed, Mar 12, 2014 at 4:15 PM, Jan Kaluža > > wrote: > > while packaging libeio library (not the one from Enlightenment) [1], I > > have found out that the soname conflicts with Eio library from your > > project. I have already asked libeio upstream if they are willing to > > solve this problem somehow globally, but they are not. > > > > They think their libeio is here for longer time and used by more > > external projects while Eio is more like internal library. I can't prove > > that anyhow, since I don't know the history of these libraries. > > Their libeio seems to be 5 years old, ours date from July 2010. As for > being internal it is not. Eio is a public API part of EFL and to be > used by anyone doing asynchronous IO with or without a UI. Except > Ephoto and Elementary, I don't think there is any other open source > user of it. Most of the user I know of are proprietary application and > would not be using Fedora. > > > My question is if you, as a Eio upstream, would like to fix this > > conflict in the library name. We will probably have to rename one of the > > libraries in Fedora otherwise [2]. > > It is something tricky to solve, by now we have already application > using it. It is a public and supported API on our side, changing the > naming would break existing application on every other distribution. I > don't really see a solution to this problem at this stage. Sadly it is > almost 3 years to late... > > > Sorry if this question has been asked already but I was not able to find > > it in archive. > > I think the question was raised maybe once in the past, I may be > mistaken, for another distribution. I think the conclusion was to drop > that other eio library as it didn't have any application using it in > their repository. > > Regards, > -- > Cedric BAIL > > > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 99225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_win: Unbreak the ABI break of window type.
This is basically useless as the point of having unknown as 0 is to get
uninitialized stuff. Just remove this unknown value.
On Tuesday, March 11, 2014, Daniel Juyung Seo wrote:
> seoz pushed a commit to branch master.
>
>
> http://git.enlightenment.org/core/elementary.git/commit/?id=79d2df12fe5e4d57d7a6247975feac1f0793ec72
>
> commit 79d2df12fe5e4d57d7a6247975feac1f0793ec72
> Author: Daniel Juyung Seo >
> Date: Wed Mar 12 12:42:59 2014 +0900
>
> elm_win: Unbreak the ABI break of window type.
>
> @fix
> ---
> src/lib/elm_win_common.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/lib/elm_win_common.h b/src/lib/elm_win_common.h
> index b5eb567..3c88278 100644
> --- a/src/lib/elm_win_common.h
> +++ b/src/lib/elm_win_common.h
> @@ -9,7 +9,7 @@
> */
> typedef enum
> {
> - ELM_WIN_UNKNOWN, /**< Unknown window type. */
> + ELM_WIN_UNKNOWN = -1, /**< Unknown window type. */
> ELM_WIN_BASIC, /**< A normal window. Indicates a normal, top-level
> window. Almost every window will be created with this
> type. */
>
> --
>
>
>
--
Gustavo Sverzut Barbieri
--
Mobile: +55 (19) 99225-2202
Contact: http://www.gustavobarbieri.com.br/contact
--
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Transparent background, E18+elm? E18 (Enlightenment 0.18.2, efl 1.8.3, elm 1.8.2)
With code like this: Evas_Object *o; o = edje_object_add(e_comp_get(m->zone)->evas); evas_object_name_set(o, "menu->sw_bg_object"); evas_object_data_set(o, "e_menu", m); e_theme_edje_object_set(o, "base/theme/menus", "e/widgets/menu/default/background"); m->sw_bg_object = o; sm_object = e_start_menu_realize_inwindow(m,m->sw_bg_object); edje_object_part_swallow(m->sw_bg_object,"e.swallow.content",sm_object); m->cur.w = 350; m->cur.h = 420; m->cur.x = 0; m->cur.y = 0; And later (in the idle handler): evas_object_move(m->sw_bg_object,m->cur.x,m->cur.y); evas_object_resize(m->sw_bg_object,m->cur.w,m->cur.h); E_LAYER_SET(m->sw_bg_object,E_COMP_CANVAS_LAYER_MENU); E_LAYER_SET(m->container_object,E_COMP_CANVAS_LAYER_MENU); evas_object_show(m->sw_bg_object); e_start_menu_realize_inwindow() contains: Evas_Object *o; /* Create the menu container, an Elm Table widget. */ o = elm_table_add(canvas); m->container_object = o; elm_table_homogeneous_set(o, EINA_FALSE); elm_table_padding_set(m->container_object, 5, 5); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_name_set(o, "menu->container_object"); evas_object_intercept_move_callback_add(o,_e_intercept_container_move,m); evas_object_intercept_resize_callback_add(o,_e_intercept_container_resize,m); elm_object_focus_allow_set (m->container_object, EINA_TRUE); elm_object_focus_set ( m->container_object, EINA_TRUE); /* e_start_menu_realize_inwindow() then populates m->container_object * -- eg create more elm widgets and pack them with * elm_table_pack(m->container_object, ...) calls -- standard stuff * straight out of the elementary docs. */ /* Finally: */ /* Return the container. */ return m->container_object; This code works, but the widgets in m->container_object have a *transparent* background, that is, for some reason 'm->sw_bg_object' is ending up as transparent, even though "e/widgets/menu/default/background" isn't defined as transparent (as far as my understanding of the menu.edc file in the theme goes). I don't want that. What do I need to do to NOT have a transparent background? Should I be using a *different* theme group? Am I missing a edje_object function call somewhere? -- Robert Heller -- 978-544-6933 / hel...@deepsoft.com Deepwoods Software-- http://www.deepsoft.com/ () ascii ribbon campaign -- against html e-mail /\ www.asciiribbon.org -- against proprietary attachments -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: elm_web2: Implemented to support HTML5 fullscreen API
ryuan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=85af615900976fc330d4c6b9e7eb13abc339d71d
commit 85af615900976fc330d4c6b9e7eb13abc339d71d
Author: Ryuan Choi
Date: Thu Mar 13 00:41:48 2014 +0900
elm_web2: Implemented to support HTML5 fullscreen API
test case : elementary_test -to webui
---
src/bin/test_web.c | 29 +++
src/lib/elm_web2.c | 68 ++
2 files changed, 97 insertions(+)
diff --git a/src/bin/test_web.c b/src/bin/test_web.c
index ca80758..d9e7cc0 100644
--- a/src/bin/test_web.c
+++ b/src/bin/test_web.c
@@ -394,6 +394,33 @@ _new_window_test_cb(void *data, Evas_Object *obj, void
*event_info)
elm_web_html_string_load(wt->web, new_window_html, NULL, NULL);
}
+
+static void
+_fullscreen_test_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ Web_Test *wt = data;
+ const char *selected = elm_object_item_text_get(event_info);
+ const char fullscreen_html[] = ""
+ ""
+ "var launch = function(obj) {"
+ " var f = document.webkitFullscreenElement;"
+ " if (f) document.webkitExitFullscreen();"
+ " if (f != obj) obj.webkitRequestFullscreen();"
+ "}\n"
+ "var test_full = function() { launch(document.documentElement); }\n"
+ "var test_small = function() { launch(document.getElementById('box'));
}\n"
+ ""
+ ""
+ "small box"
+ ""
+ "";
+
+ printf("selected test : %s\n", selected);
+ elm_object_text_set(obj, selected);
+
+ elm_web_html_string_load(wt->web, fullscreen_html, NULL, NULL);
+}
+
static void
_main_web_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -586,6 +613,8 @@ test_web_ui(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
_select_tag_test_cb, wt);
elm_hoversel_item_add(hoversel, "new window", NULL, ELM_ICON_NONE,
_new_window_test_cb, wt);
+ elm_hoversel_item_add(hoversel, "fullscreen", NULL, ELM_ICON_NONE,
+ _fullscreen_test_cb, wt);
elm_box_pack_end(bx, hoversel);
evas_object_show(hoversel);
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index dfaf9b9..24418e4 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -77,6 +77,72 @@ _view_smart_window_close(Ewk_View_Smart_Data *sd)
evas_object_smart_callback_call(obj, "windows,close,request", NULL);
}
+static void
+_fullscreen_accept(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+{
+ Evas_Object *ewk = data;
+ evas_object_del(evas_object_data_get(ewk, "_fullscreen_permission_popup"));
+}
+
+static void
+_fullscreen_deny(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+{
+ Evas_Object *ewk = data;
+ ewk_view_fullscreen_exit(ewk);
+ evas_object_del(evas_object_data_get(ewk, "_fullscreen_permission_popup"));
+}
+
+static Eina_Bool
+_view_smart_fullscreen_enter(Ewk_View_Smart_Data *sd, Ewk_Security_Origin
*origin)
+{
+ Evas_Object *btn, *popup, *top;
+ const char *host;
+ char buffer[2048];
+
+ Evas_Object *obj = evas_object_smart_parent_get(sd->self);
+
+ ELM_WEB_CHECK(obj) EINA_FALSE;
+
+ top = elm_widget_top_get(obj);
+ elm_win_fullscreen_set(top, EINA_TRUE);
+
+ popup = elm_popup_add(top);
+ elm_popup_orient_set(popup, ELM_POPUP_ORIENT_TOP);
+ evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+ host = ewk_security_origin_host_get(origin);
+ snprintf(buffer, sizeof(buffer), "%s is now fullscreen.Press ESC at any
time to exit fullscreen,Allow fullscreen?", host);
+ elm_object_text_set(popup, buffer);
+
+ btn = elm_button_add(popup);
+ elm_object_text_set(btn, "Accept");
+ elm_object_part_content_set(popup, "button1", btn);
+ evas_object_smart_callback_add(btn, "clicked", _fullscreen_accept,
sd->self);
+
+ btn = elm_button_add(popup);
+ elm_object_text_set(btn, "Deny");
+ elm_object_part_content_set(popup, "button2", btn);
+ evas_object_smart_callback_add(btn, "clicked", _fullscreen_deny, sd->self);
+
+ evas_object_data_set(sd->self, "_fullscreen_permission_popup", popup);
+ evas_object_show(popup);
+
+ return EINA_TRUE;
+}
+
+static Eina_Bool
+_view_smart_fullscreen_exit(Ewk_View_Smart_Data *sd)
+{
+ Evas_Object *obj = evas_object_smart_parent_get(sd->self);
+
+ ELM_WEB_CHECK(obj) EINA_FALSE;
+
+ Evas_Object *top = elm_widget_top_get(obj);
+ elm_win_fullscreen_set(top, EINA_FALSE);
+
+ return EINA_TRUE;
+}
+
/**
* Creates a new view object given the parent.
*
@@ -109,6 +175,8 @@ _view_add(Evas_Object *parent)
api.sc.del = _view_smart_del;
api.window_create = _view_smart_window_create;
api.window_close = _view_smart_window_close;
+api.fullscreen_enter = _view_smart_fullscreen_enter;
+api.fullscreen_exit = _view_smart_fullscreen_exit;
[EGIT] [core/elementary] elementary-1.9 01/01: Ship missing headers, and remove wrong includes
tasn pushed a commit to branch elementary-1.9. http://git.enlightenment.org/core/elementary.git/commit/?id=d260dc3ec2e3e9f4475c08b89922f3599b4dcf93 commit d260dc3ec2e3e9f4475c08b89922f3599b4dcf93 Author: Tom Hacohen Date: Wed Mar 12 14:17:26 2014 + Ship missing headers, and remove wrong includes elm_gen_common.h was not installed, but is needed by installed headers. Remove dependencies on internal headers from shipped headers. --- src/lib/Makefile.am | 2 +- src/lib/elm_gen_common.h | 1 - src/lib/elm_panel.c | 2 ++ src/lib/elm_toolbar.c| 1 + src/lib/elm_widget_panel.h | 1 - src/lib/elm_widget_toolbar.h | 1 - 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1d046c4..eefc378 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -39,6 +39,7 @@ Elementary_Cursor.h includesdir = $(includedir)/elementary-@VMAJ@ includesunstable_HEADERS = \ +elm_gen_common.h \ elm_interface_fileselector.h \ elm_interface_scrollable.h \ elm_widget.h \ @@ -388,7 +389,6 @@ elm_win_legacy.h includesubdir = $(includedir)/elementary-@VMAJ@/ libelementary_la_SOURCES = \ -elm_gen_common.h \ elm_priv.h \ els_box.h \ elc_ctxpopup.c \ diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h index 19e4a11..3df68a5 100644 --- a/src/lib/elm_gen_common.h +++ b/src/lib/elm_gen_common.h @@ -3,7 +3,6 @@ #include #include -#include "elm_priv.h" #define ELM_GEN_ITEM_FROM_INLIST(it) \ ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index 060c82f..b181bd8 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -7,6 +7,8 @@ #include "elm_priv.h" #include "elm_widget_panel.h" +#include "els_box.h" + EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP; #define MY_CLASS ELM_OBJ_PANEL_CLASS diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 1e0ae05..e5623aa 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -6,6 +6,7 @@ #include "elm_priv.h" #include "elm_widget_toolbar.h" +#include "els_box.h" EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID = EO_NOOP; diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h index e869f01..c72f606 100644 --- a/src/lib/elm_widget_panel.h +++ b/src/lib/elm_widget_panel.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_PANEL_H #include "elm_widget_layout.h" -#include "els_box.h" /** * @addtogroup Widget diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h index 500b53a..9c731ea 100644 --- a/src/lib/elm_widget_toolbar.h +++ b/src/lib/elm_widget_toolbar.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_TOOLBAR_H #include "elm_interface_scrollable.h" -#include "els_box.h" /** * @addtogroup Widget --
[EGIT] [core/elementary] master 01/01: Ship missing headers, and remove wrong includes
tasn pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1d951009b37b815c69e67b0e64a2be3253792450 commit 1d951009b37b815c69e67b0e64a2be3253792450 Author: Tom Hacohen Date: Wed Mar 12 14:17:26 2014 + Ship missing headers, and remove wrong includes elm_gen_common.h was not installed, but is needed by installed headers. Remove dependencies on internal headers from shipped headers. --- src/lib/Makefile.am | 2 +- src/lib/elm_gen_common.h | 1 - src/lib/elm_panel.c | 2 ++ src/lib/elm_toolbar.c| 1 + src/lib/elm_widget_panel.h | 1 - src/lib/elm_widget_toolbar.h | 1 - 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 443f68c..9f2cb9e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -43,6 +43,7 @@ Elementary_Cursor.h includesdir = $(includedir)/elementary-@VMAJ@ includesunstable_HEADERS = \ +elm_gen_common.h \ elm_interface_fileselector.h \ elm_interface_scrollable.h \ elm_widget.h \ @@ -392,7 +393,6 @@ elm_win_legacy.h includesubdir = $(includedir)/elementary-@VMAJ@/ libelementary_la_SOURCES = \ -elm_gen_common.h \ elm_priv.h \ els_box.h \ elc_ctxpopup.c \ diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h index 19e4a11..3df68a5 100644 --- a/src/lib/elm_gen_common.h +++ b/src/lib/elm_gen_common.h @@ -3,7 +3,6 @@ #include #include -#include "elm_priv.h" #define ELM_GEN_ITEM_FROM_INLIST(it) \ ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c index a6d3072..160538f 100644 --- a/src/lib/elm_panel.c +++ b/src/lib/elm_panel.c @@ -7,6 +7,8 @@ #include "elm_priv.h" #include "elm_widget_panel.h" +#include "els_box.h" + EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP; #define MY_CLASS ELM_OBJ_PANEL_CLASS diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 1e0ae05..e5623aa 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -6,6 +6,7 @@ #include "elm_priv.h" #include "elm_widget_toolbar.h" +#include "els_box.h" EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID = EO_NOOP; diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h index e869f01..c72f606 100644 --- a/src/lib/elm_widget_panel.h +++ b/src/lib/elm_widget_panel.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_PANEL_H #include "elm_widget_layout.h" -#include "els_box.h" /** * @addtogroup Widget diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h index 500b53a..9c731ea 100644 --- a/src/lib/elm_widget_toolbar.h +++ b/src/lib/elm_widget_toolbar.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_TOOLBAR_H #include "elm_interface_scrollable.h" -#include "els_box.h" /** * @addtogroup Widget --
Re: [E-devel] ABI/API checking for the EFL
On 12/03/14 13:54, Tom Hacohen wrote: > Hey, > > So following the previous discussion, I've decided to do it myself. It's > quite easy, and will be integrated into Jenkins once the Jenkins admins > will have more free time. > > For the time being, I've generated reports for the efl (will do > elemenatry soon) manually. Here are the results: > http://www.enlightenment.org/~tasn/eflabi/1.8.0_to_1.9.0/compat_report.html > http://www.enlightenment.org/~tasn/eflabi/1.9.0_to_1.10.0/compat_report.html > > > By skimming the results, I found that we broke ABI in 1.9, deleting some > ecore_x atoms. This is really bad, but at least those were parts of our > api that people don't usually use. > > The to 1.10 is actually to bdf00c28b74cc163fed5a29561de43be66efed41, i.e > current HEAD. We've made a lot of mess there. From what I've seen, we've > only broken ABI because of Eo, which is internal ABI anyway, and we knew > it was going to happen anyway because of the Eo2 change, so that's > mostly fine. Shouldn't affect users too much. > > -- > Tom. OK, got elm too: http://www.enlightenment.org/~tasn/elmabi/1.9.0_to_1.10.0/compat_report.html I found and fixed some issues with wrong shipping of headers. I think most of the mess is because we ship the elm_widget internal files. It's time to get rid of those now that we have Eo api which is as experimental. :) -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [apps/terminology] master 01/01: Make an option to disable tab switch animations.
* Boris Faure [2014-03-12 10:17:36 +0100]: > On 14-03-12 13:37, Cedric BAIL wrote: > > On Wed, Mar 12, 2014 at 11:51 AM, Gustavo Lima Chaves > > wrote: > > > glima pushed a commit to branch master. > > > > > > http://git.enlightenment.org/apps/terminology.git/commit/?id=1d689839c065964333cd2ee8f3e6573b1f38a020 > > > > > > commit 1d689839c065964333cd2ee8f3e6573b1f38a020 > > > Author: Gustavo Lima Chaves > > > Date: Tue Mar 11 23:49:40 2014 -0300 > > > > > > Make an option to disable tab switch animations. > > > > Wasn't setting the animation time to zero enough to do the same things ? > > You should revert that patch but make a new one to improve the message > on the "Tab Zoom Animation" setting, by adding "(0 disables the > animation)" for example. Sorry for missing this path to achieve my goal, but there's a slight difference -- with my way, we get zero flicks on the switch, which may not be true for the 0-time one. I'll revert it today at night, but trying to optimize for the 0 seconds case. > > -- > Boris Faure > Pointer Arithmetician > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Gustavo Lima Chaves Senior Developer @ Intel - Open Source Technology Center -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: Bug fix: Elm_List was not correctly setting the highlight theme for its items.
glima pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a50fdbc2bb89eb9d7daba246b806874446cccac1
commit a50fdbc2bb89eb9d7daba246b806874446cccac1
Author: Guilherme Iscaro de Godoy
Date: Wed Mar 12 10:02:17 2014 -0300
Bug fix: Elm_List was not correctly setting the highlight theme for its
items.
With the introduction of the patch 3628a8c4ea2485ee7ee5a81cfd4e0f0fe62b10d6,
it is possible to highlight focused Elm_List and Elm_Genlistenlist items.
However, this feature does not work correctly if one wants to create a
custom
highlight theme for Elm_List items.
The whole problem was happening, because the function
_elm_widget_item_highlight_in_theme() was being called in a incorrect
location. This function must be called at _items_fix(), because
there the Elm_List already set the item theme and then it's possible
to check if the one wants a custom highlight or not.
---
src/lib/elm_list.c| 14 --
src/lib/elm_widget_list.h | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 3b0ddd1..3c14465 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -890,6 +890,10 @@ _items_fix(Evas_Object *obj)
_elm_list_mode_set_internal(obj);
_elm_list_unwalk(obj, sd);
+ //focus highlight in_theme is set by list item theme.
+ _elm_widget_item_highlight_in_theme(
+ obj, elm_list_first_item_get(obj));
+
evas_object_unref(obj);
}
@@ -986,10 +990,6 @@ _elm_list_smart_theme(Eo *obj, void *_pd, va_list *list)
_items_fix(obj);
- //focus highlight in_theme is set by list item theme.
- _elm_widget_item_highlight_in_theme(
- obj, elm_list_first_item_get(obj));
-
elm_layout_sizing_eval(obj);
if (ret) *ret = EINA_TRUE;
@@ -2552,12 +2552,6 @@ _item_append(Eo *obj, void *_pd, va_list *list)
it = _item_new(obj, label, icon, end, func, data);
- if (!sd->in_theme_checked)
- {
-_elm_widget_item_highlight_in_theme(obj, (Elm_Object_Item *)it);
-sd->in_theme_checked = EINA_TRUE;
- }
-
sd->items = eina_list_append(sd->items, it);
it->node = eina_list_last(sd->items);
elm_box_pack_end(sd->box, VIEW(it));
diff --git a/src/lib/elm_widget_list.h b/src/lib/elm_widget_list.h
index ccef187..06562da 100644
--- a/src/lib/elm_widget_list.h
+++ b/src/lib/elm_widget_list.h
@@ -53,7 +53,6 @@ struct _Elm_List_Smart_Data
Eina_Bool multi : 1;
Eina_Bool swipe : 1;
Eina_Bool delete_me : 1;
- Eina_Bool in_theme_checked : 1; /**< flag for
setting item highlight in theme. */
};
typedef struct _Elm_List_Item Elm_List_Item;
--
[E-devel] ABI/API checking for the EFL
Hey, So following the previous discussion, I've decided to do it myself. It's quite easy, and will be integrated into Jenkins once the Jenkins admins will have more free time. For the time being, I've generated reports for the efl (will do elemenatry soon) manually. Here are the results: http://www.enlightenment.org/~tasn/eflabi/1.8.0_to_1.9.0/compat_report.html http://www.enlightenment.org/~tasn/eflabi/1.9.0_to_1.10.0/compat_report.html By skimming the results, I found that we broke ABI in 1.9, deleting some ecore_x atoms. This is really bad, but at least those were parts of our api that people don't usually use. The to 1.10 is actually to bdf00c28b74cc163fed5a29561de43be66efed41, i.e current HEAD. We've made a lot of mess there. From what I've seen, we've only broken ABI because of Eo, which is internal ABI anyway, and we knew it was going to happen anyway because of the Eo2 change, so that's mostly fine. Shouldn't affect users too much. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: preview: add support for TGV.
cedric pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=754cec593991f4bdaa41607a36a4094efe75f958 commit 754cec593991f4bdaa41607a36a4094efe75f958 Author: Cedric BAIL Date: Wed Mar 12 19:14:06 2014 +0900 preview: add support for TGV. --- src/bin/extns.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/extns.c b/src/bin/extns.c index b830589..36cb94c 100644 --- a/src/bin/extns.c +++ b/src/bin/extns.c @@ -7,6 +7,7 @@ const char *extn_img[] = ".cur", ".xcf", ".xcf.gz", ".arw", ".cr2", ".crw", ".dcr", ".dng", ".k25", ".kdc", ".erf", ".mrw", ".nef", ".nrf", ".nrw", ".orf", ".raw", ".rw2", ".pef", ".raf", ".sr2", ".srf", ".x3f", ".webp", ".ppt", ".pptx", ".odp", + ".tgv", NULL }; --
[E-devel] Efl and Elementary 1.9.1 release
We are happy to release our first stable update for the 1.9.x series. This time only EFL and Elementary had changes. Within the several fixes we also have an ABI break that got fixed. Download http://download.enlightenment.org/rel/libs/efl/efl-1.9.1.tar.gz 265bf2480efb988d3d54ce710e15e622bec503f64b1df20a3ea1693566a0c727 http://download.enlightenment.org/rel/libs/elementary/elementary-1.9.1.tar.gz e8b8630482c855d71e2ef8ca4165cab18c5471c819c1473e210bc83d833eae0b Building and Dependencies If you have an existing EFL or Elementary install, you may wish to delete its header files and libraries before compiling and installing to avoid possible conflicts during compilation. If you are compiling the above, please compile them in the following order: efl elementary emotion_generic_players enlightenemt If you have an existing EFL or Elementary install, you may wish to delete its header files and libraries before building the above. regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [website/www] master 01/01: Update version for efl and elm
stefan pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=da7cc26a05163925b3736dec86ef0536ad56ac19 commit da7cc26a05163925b3736dec86ef0536ad56ac19 Author: Stefan Schmidt Date: Wed Mar 12 13:49:02 2014 +0100 Update version for efl and elm --- public_html/p/download/en-body | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index f495642..9ca3dcb 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -71,18 +71,18 @@ - EFL 1.9.0 + EFL 1.9.1 Core libraries. http://download.enlightenment.org/rel/libs/efl/efl-1.9.0.tar.gz"; + "http://download.enlightenment.org/rel/libs/efl/efl-1.9.1.tar.gz"; );?> - Elementary 1.9.0 + Elementary 1.9.1 Widget set/toolkit. http://download.enlightenment.org/rel/libs/elementary/elementary-1.9.0.tar.gz"; + "http://download.enlightenment.org/rel/libs/elementary/elementary-1.9.1.tar.gz"; );?> --
[EGIT] [core/efl] annotated tag v1.9.1 created
stefan pushed a change to annotated tag v1.9.1 in repository core/efl. at b2825589ff (tag) tagging bd292073952471db99e8590525382b3521086c53 (commit) replaces v1.9.0 tagged by Stefan Schmidt on Wed Mar 12 13:41:47 2014 +0100 - Log - v1.9.1 Andy Williams (1): eina_log: Update domain colouring when color_disable_set is called Cedric BAIL (3): ecore: @fix race condition when using ecore_main_loop_thread_safe_call_sync. ecore_avahi: fix timeout to be relative from now. ecore_avahi: @fix timeout to avoid pitfall of forever frozen timer. Christopher Michael (1): bugfix: Fix Wayland Shm engine destination calculation typo ChunEon Park (1): edje - allow lager clipper space. Jaehwan Kim (1): edje: Fix CURRENT option works. Jean-Philippe ANDRÉ (4): Evas filters: fix black squares with the GL engine Evas filters: fix random cases of 'dancing text' Evas filters: fix clip to target calculation Evas filters: Avoid CRI message when using the GL engine Jihoon Kim (1): Edje entry: fix bug preedit text is committed in the next entry when Tab key is pressed. Stefan Schmidt (4): examples/evas: Set a proper format string for fprintf release: Update NEWS and bump version for 1.9.1 release release: Update NEWS for last minute changes to 1.9.1 release: Remove uinrelevant NEWS file entry. Tom Hacohen (2): Evas font: Don't add canvas specific path to the global fontconfig path list. Eina Log: Fixed ABI break introduce by the addition of 'color'. WooHyun Jung (2): evas: replace EINA_LIST_FREE to EINA_LIST_FOREACH_SAFE. evas: Replace EINA_LIST_FOREACH_SAFE to while statement. Youngbok Shin (1): edje/entry: fix to not emit "changed" signal in unnecessary cases of password mode. --- No new revisions were added by this update. --
[EGIT] [core/elementary] annotated tag v1.9.1 created
stefan pushed a change to annotated tag v1.9.1 in repository core/elementary. at 2c912d9f15 (tag) tagging 63e989b7f8897010131e8897a1de518889691832 (commit) replaces v1.9.0 tagged by Stefan Schmidt on Wed Mar 12 13:42:50 2014 +0100 - Log - v1.9.1 Carsten Haitzler (2): fix ctxpopup getting min size from content immediately on set entry - fix menu to not popup after every time mobile sel handles are clicked ChunEon Park (1): entry - send selection,cleared signal if a selection is dismissed. Daniel Juyung Seo (3): hover: Made hover itself unfocusable. object_item: Check null in elm_object_item_del. elm_win: Unbreak the ABI break of window type. Jaehyun Cho (1): naviframe: Fix smart_show function to show only top item view Jaeun Choi (1): diskselector: Fix segmentation fault Mike Blumenkrantz (5): @fix homogeneous genlist recalc on theme change move slider track functions up @fix slider popup creation with custom themes @fix broken slider popup hide logic @fix slider overlay parenting Shilpa Singh (1): Avoid Month wrapping by ignoring summer time correction. Stefan Schmidt (1): release: Update NEWS and bump version for 1.9.1 release Thiep Ha (1): Fix bug of moving cursor handler prashant (1): actionslider: Fixed mouse movement issue. --- No new revisions were added by this update. --
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
On 12/03/14 10:55, Stefan Schmidt wrote: > Hello. > > On Wed, 2014-03-12 at 10:31, Tom Hacohen wrote: >> On 12/03/14 10:15, Stefan Schmidt wrote: >>> Hello. >>> >>> On Wed, 2014-03-12 at 09:52, Tom Hacohen wrote: On 12/03/14 09:44, Stefan Schmidt wrote: > Hello. > > On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: >> Just reading the last few commits that got backported, it seems that 1.9 >> was all about breaking ABI. That's just great. > > Which mreminds me about something Cedric and I have talked about. > > http://upstream-tracker.org/ > > Some tooling to help indentifying ABI/API breaks. I'm looking for a > volunteer who would like to make use of it for EFL. I see three > options: > > 1) Making the website run on our code more often. > > 2) Run the tools on your own machine our our E servers at least once > or twice in the last week before the release (better would be earlier > as well) > > 3) Setup the tools on our E servers and have it integrated with > jenkins. > > A combination of 1 and 3 would be great imho. I'm not going to work on > this myself though. No more time to mainatin yet another tool in our > CI/QA infrastructure. There are self hosted tools that we can put on Jenkins and run nightly. It's probably better than an external solution. > > Given the recent ABI breaks we should be able to find a volunteer for > this, right? I nominate the release manager. >>> >>> So you are taking over here from me for 1.10 already? Please confirm >>> so I can stop working on it. >>> >>> You have read the mail. I already stated that I'm not going to set it >>> all up. >> >> Trolling aside, you volunteered to be in charge of Jenkins, and that's >> why we changed to Jenkins, for you. Same way I still do Git, and Beber >> still does server/infra admin. It's not because you are the release >> manager, it's because you are the Jenkins manager. :) > > I call bullshit. > > I'm in charge now of every piece of software because it possibly can be > run from jenkins? No, but you should be involved in getting it there. > >> No one else knows how to handle Jenkins the way you do. You are really >> the most suitable man for the job. > > Which also fits you perfectly in me doing it. I'm over my time budget > for jenkins and already said I'm not doing it. While asking for > someone else to volunteer you are pressuring me to do it instead. > Really irritating social behaviour in my view. The answer stay no. You take things way too seriously. Chill. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
On Wed, Mar 12, 2014 at 7:31 PM, Tom Hacohen wrote: > On 12/03/14 10:15, Stefan Schmidt wrote: >> Hello. >> >> On Wed, 2014-03-12 at 09:52, Tom Hacohen wrote: >>> On 12/03/14 09:44, Stefan Schmidt wrote: Hello. On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > Just reading the last few commits that got backported, it seems that 1.9 > was all about breaking ABI. That's just great. Which mreminds me about something Cedric and I have talked about. http://upstream-tracker.org/ Some tooling to help indentifying ABI/API breaks. I'm looking for a volunteer who would like to make use of it for EFL. I see three options: 1) Making the website run on our code more often. 2) Run the tools on your own machine our our E servers at least once or twice in the last week before the release (better would be earlier as well) 3) Setup the tools on our E servers and have it integrated with jenkins. A combination of 1 and 3 would be great imho. I'm not going to work on this myself though. No more time to mainatin yet another tool in our CI/QA infrastructure. >>> >>> >>> There are self hosted tools that we can put on Jenkins and run nightly. >>> It's probably better than an external solution. >>> Given the recent ABI breaks we should be able to find a volunteer for this, right? >>> >>> I nominate the release manager. >> >> So you are taking over here from me for 1.10 already? Please confirm >> so I can stop working on it. >> >> You have read the mail. I already stated that I'm not going to set it >> all up. > > Trolling aside, you volunteered to be in charge of Jenkins, and that's > why we changed to Jenkins, for you. Same way I still do Git, and Beber > still does server/infra admin. It's not because you are the release > manager, it's because you are the Jenkins manager. :) > No one else knows how to handle Jenkins the way you do. You are really > the most suitable man for the job. I disagree with this completely. Stefan state he can't look at it right now and your mail does just exclude the possibility that anyone else can step up for the task. This is raising our bus factor very high. I absolutely encourage anyone else to look into this task as requested by Stefan. > Furthermore, it's not *too* much work. I could ask Thiago from Qt if > you'd like. He gave a talk at Edinbrugh about the tools they use to > ensure API/ABI doesn't break, and I'm sure he'll be more than willing to > send it to you. Whatever tool does the job and isn't a pain to setup. -- Cedric BAIL -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Hello. On Wed, 2014-03-12 at 10:31, Tom Hacohen wrote: > On 12/03/14 10:15, Stefan Schmidt wrote: > > Hello. > > > > On Wed, 2014-03-12 at 09:52, Tom Hacohen wrote: > >> On 12/03/14 09:44, Stefan Schmidt wrote: > >>> Hello. > >>> > >>> On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > Just reading the last few commits that got backported, it seems that 1.9 > was all about breaking ABI. That's just great. > >>> > >>> Which mreminds me about something Cedric and I have talked about. > >>> > >>> http://upstream-tracker.org/ > >>> > >>> Some tooling to help indentifying ABI/API breaks. I'm looking for a > >>> volunteer who would like to make use of it for EFL. I see three > >>> options: > >>> > >>> 1) Making the website run on our code more often. > >>> > >>> 2) Run the tools on your own machine our our E servers at least once > >>> or twice in the last week before the release (better would be earlier > >>> as well) > >>> > >>> 3) Setup the tools on our E servers and have it integrated with > >>> jenkins. > >>> > >>> A combination of 1 and 3 would be great imho. I'm not going to work on > >>> this myself though. No more time to mainatin yet another tool in our > >>> CI/QA infrastructure. > >> > >> > >> There are self hosted tools that we can put on Jenkins and run nightly. > >> It's probably better than an external solution. > >> > >>> > >>> Given the recent ABI breaks we should be able to find a volunteer for > >>> this, right? > >> > >> I nominate the release manager. > > > > So you are taking over here from me for 1.10 already? Please confirm > > so I can stop working on it. > > > > You have read the mail. I already stated that I'm not going to set it > > all up. > > Trolling aside, you volunteered to be in charge of Jenkins, and that's > why we changed to Jenkins, for you. Same way I still do Git, and Beber > still does server/infra admin. It's not because you are the release > manager, it's because you are the Jenkins manager. :) I call bullshit. I'm in charge now of every piece of software because it possibly can be run from jenkins? > No one else knows how to handle Jenkins the way you do. You are really > the most suitable man for the job. Which also fits you perfectly in me doing it. I'm over my time budget for jenkins and already said I'm not doing it. While asking for someone else to volunteer you are pressuring me to do it instead. Really irritating social behaviour in my view. The answer stay no. regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 04/04: ecore-evas-drm: Fix printing of device name error message
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7d5600ffb484c782e2465f48a5ec70c590bd5af3
commit 7d5600ffb484c782e2465f48a5ec70c590bd5af3
Author: Chris Michael
Date: Wed Mar 12 10:43:44 2014 +
ecore-evas-drm: Fix printing of device name error message
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 531cdc1..96175ee 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -246,7 +246,7 @@ _ecore_evas_drm_init(const char *device)
/* try to find the device */
if (!(dev = ecore_drm_device_find(device, NULL)))
{
-ERR("Could not find drm device with name: %s");
+ERR("Could not find drm device with name: %s", device);
/* try getting the default drm device */
if (!(dev = ecore_drm_device_find(NULL, NULL)))
--
[EGIT] [core/efl] master 02/04: ecore-drm: Fix doxygen group for sprites
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c48fc5155af71eef8ab19ddf7db4c4ac5e1c69c7 commit c48fc5155af71eef8ab19ddf7db4c4ac5e1c69c7 Author: Chris Michael Date: Wed Mar 12 10:30:33 2014 + ecore-drm: Fix doxygen group for sprites Signed-off-by: Chris Michael --- src/lib/ecore_drm/ecore_drm_sprites.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_drm/ecore_drm_sprites.c b/src/lib/ecore_drm/ecore_drm_sprites.c index b457afe..85457ae 100644 --- a/src/lib/ecore_drm/ecore_drm_sprites.c +++ b/src/lib/ecore_drm/ecore_drm_sprites.c @@ -5,7 +5,7 @@ #include "ecore_drm_private.h" /** - * @defgroup Ecore_Drm_Fb_Group + * @defgroup Ecore_Drm_Sprite_Group * */ --
[EGIT] [core/efl] master 01/04: ecore-evas-drm: Remove FIXME comment
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33b475c74ca538102b6c5564e29c3394ca789af4
commit 33b475c74ca538102b6c5564e29c3394ca789af4
Author: Chris Michael
Date: Wed Mar 12 10:29:34 2014 +
ecore-evas-drm: Remove FIXME comment
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 600b805..531cdc1 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -267,8 +267,6 @@ _ecore_evas_drm_init(const char *device)
goto tty_open_err;
}
- /* FIXME: Init egl/software renderer here ?? */
-
/* try to create sprites */
if (!ecore_drm_sprites_create(dev))
{
--
[EGIT] [core/efl] master 03/04: ecore-drm: Quiet down ecore_drm_output rendering messages
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2f3082df66cf2d598ada173d6fc4242a77552509
commit 2f3082df66cf2d598ada173d6fc4242a77552509
Author: Chris Michael
Date: Wed Mar 12 10:41:57 2014 +
ecore-drm: Quiet down ecore_drm_output rendering messages
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_output.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index f55e1f1..5a193f4 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -414,13 +414,13 @@ _ecore_drm_output_repaint_start(Ecore_Drm_Output *output)
{
unsigned int fb;
- DBG("Output Repaint Start");
+ /* DBG("Output Repaint Start"); */
if (!output) return;
if (!output->current)
{
-DBG("\tNo Current FB");
+/* DBG("\tNo Current FB"); */
goto finish;
}
@@ -615,7 +615,7 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output)
if (!output) return;
- DBG("Output Repaint: %d %d", output->crtc_id, output->conn_id);
+ /* DBG("Output Repaint: %d %d", output->crtc_id, output->conn_id); */
/* TODO: assign planes ? */
@@ -635,7 +635,7 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output)
if (!output->next)
{
-DBG("\tNo Next Fb");
+/* DBG("\tNo Next Fb"); */
return;
}
@@ -652,7 +652,7 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output)
&mode->info);
if (ret)
{
- ERR("Setting output mode failed");
+ /* ERR("Setting output mode failed"); */
goto err;
}
}
@@ -660,7 +660,7 @@ ecore_drm_output_repaint(Ecore_Drm_Output *output)
if (drmModePageFlip(output->dev->drm.fd, output->crtc_id, output->next->id,
DRM_MODE_PAGE_FLIP_EVENT, output) < 0)
{
-ERR("Scheduling pageflip failed");
+/* ERR("Scheduling pageflip failed"); */
goto err;
}
--
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
On 12/03/14 10:15, Stefan Schmidt wrote: > Hello. > > On Wed, 2014-03-12 at 09:52, Tom Hacohen wrote: >> On 12/03/14 09:44, Stefan Schmidt wrote: >>> Hello. >>> >>> On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: Just reading the last few commits that got backported, it seems that 1.9 was all about breaking ABI. That's just great. >>> >>> Which mreminds me about something Cedric and I have talked about. >>> >>> http://upstream-tracker.org/ >>> >>> Some tooling to help indentifying ABI/API breaks. I'm looking for a >>> volunteer who would like to make use of it for EFL. I see three >>> options: >>> >>> 1) Making the website run on our code more often. >>> >>> 2) Run the tools on your own machine our our E servers at least once >>> or twice in the last week before the release (better would be earlier >>> as well) >>> >>> 3) Setup the tools on our E servers and have it integrated with >>> jenkins. >>> >>> A combination of 1 and 3 would be great imho. I'm not going to work on >>> this myself though. No more time to mainatin yet another tool in our >>> CI/QA infrastructure. >> >> >> There are self hosted tools that we can put on Jenkins and run nightly. >> It's probably better than an external solution. >> >>> >>> Given the recent ABI breaks we should be able to find a volunteer for >>> this, right? >> >> I nominate the release manager. > > So you are taking over here from me for 1.10 already? Please confirm > so I can stop working on it. > > You have read the mail. I already stated that I'm not going to set it > all up. Trolling aside, you volunteered to be in charge of Jenkins, and that's why we changed to Jenkins, for you. Same way I still do Git, and Beber still does server/infra admin. It's not because you are the release manager, it's because you are the Jenkins manager. :) No one else knows how to handle Jenkins the way you do. You are really the most suitable man for the job. Furthermore, it's not *too* much work. I could ask Thiago from Qt if you'd like. He gave a talk at Edinbrugh about the tools they use to ensure API/ABI doesn't break, and I'm sure he'll be more than willing to send it to you. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore-evas-drm: Try to find a drm device with the given name
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca701a5ff2773c6c77d9f6feeab8299c20dc3a93
commit ca701a5ff2773c6c77d9f6feeab8299c20dc3a93
Author: Chris Michael
Date: Wed Mar 12 10:25:36 2014 +
ecore-evas-drm: Try to find a drm device with the given name
If we are given a drm device name, tell ecore_drm to try and find That
device. If it is not found, we fallback to the default drm device.
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index cd408e4..600b805 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -28,7 +28,7 @@ struct _Ecore_Evas_Engine_Data_Drm
};
/* local function prototypes */
-static int _ecore_evas_drm_init(void);
+static int _ecore_evas_drm_init(const char *device);
static int _ecore_evas_drm_shutdown(void);
static Ecore_Evas_Interface_Drm *_ecore_evas_drm_interface_new(void);
@@ -137,7 +137,7 @@ ecore_evas_drm_new_internal(const char *device, unsigned
int parent, int x, int
}
/* try to init drm */
- if (_ecore_evas_drm_init() < 1) return NULL;
+ if (_ecore_evas_drm_init(device) < 1) return NULL;
/* try to allocate space for new ecore_evas */
if (!(ee = calloc(1, sizeof(Ecore_Evas
@@ -232,7 +232,7 @@ ee_err:
/* local functions */
static int
-_ecore_evas_drm_init(void)
+_ecore_evas_drm_init(const char *device)
{
if (++_ecore_evas_init_count != 1) return _ecore_evas_init_count;
@@ -244,10 +244,13 @@ _ecore_evas_drm_init(void)
}
/* try to find the device */
- if (!(dev = ecore_drm_device_find(NULL, NULL)))
+ if (!(dev = ecore_drm_device_find(device, NULL)))
{
-ERR("Could not find default drm device");
-goto dev_err;
+ERR("Could not find drm device with name: %s");
+
+/* try getting the default drm device */
+if (!(dev = ecore_drm_device_find(NULL, NULL)))
+ goto dev_err;
}
/* try to open the graphics card */
--
[EGIT] [core/efl] master 01/01: ecore-evas-drm: If not device name is passed in, use the device name from drm.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=baedf0223a7b4a60c08b12b7dbc9b27f5e921719 commit baedf0223a7b4a60c08b12b7dbc9b27f5e921719 Author: Chris Michael Date: Wed Mar 12 10:17:00 2014 + ecore-evas-drm: If not device name is passed in, use the device name from drm. This assigns a name to the ecore_evas. If no device name was passed in, we will get the device name from the drm card. Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c index e3684a7..cd408e4 100644 --- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c +++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c @@ -156,6 +156,8 @@ ecore_evas_drm_new_internal(const char *device, unsigned int parent, int x, int /* set some engine properties */ ee->driver = "drm"; if (device) ee->name = strdup(device); + else + ee->name = strdup(ecore_drm_device_name_get(dev)); if (w < 1) w = 1; if (h < 1) h = 1; --
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Hello. On Wed, 2014-03-12 at 09:52, Tom Hacohen wrote: > On 12/03/14 09:44, Stefan Schmidt wrote: > > Hello. > > > > On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > >> Just reading the last few commits that got backported, it seems that 1.9 > >> was all about breaking ABI. That's just great. > > > > Which mreminds me about something Cedric and I have talked about. > > > > http://upstream-tracker.org/ > > > > Some tooling to help indentifying ABI/API breaks. I'm looking for a > > volunteer who would like to make use of it for EFL. I see three > > options: > > > > 1) Making the website run on our code more often. > > > > 2) Run the tools on your own machine our our E servers at least once > > or twice in the last week before the release (better would be earlier > > as well) > > > > 3) Setup the tools on our E servers and have it integrated with > > jenkins. > > > > A combination of 1 and 3 would be great imho. I'm not going to work on > > this myself though. No more time to mainatin yet another tool in our > > CI/QA infrastructure. > > > There are self hosted tools that we can put on Jenkins and run nightly. > It's probably better than an external solution. > > > > > Given the recent ABI breaks we should be able to find a volunteer for > > this, right? > > I nominate the release manager. So you are taking over here from me for 1.10 already? Please confirm so I can stop working on it. You have read the mail. I already stated that I'm not going to set it all up. regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: naviframe : Refactored item_push functionality in naviframe.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=bb3d479ca55d1c2f262f9fa9aea0c4ab2833
commit bb3d479ca55d1c2f262f9fa9aea0c4ab2833
Author: Subhransu Sekhar Mohanty
Date: Wed Mar 12 19:13:26 2014 +0900
naviframe : Refactored item_push functionality in naviframe.
Summary:
Added item_push_helper function, so that both item_push as well as
item_promote
will reuse the same functionality.
Reviewers: seoz, Hermet, Jaehyun
Differential Revision: https://phab.enlightenment.org/D627
---
src/lib/elc_naviframe.c | 132
1 file changed, 54 insertions(+), 78 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 8e358dd..5b69b39 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1480,6 +1480,50 @@ _push_transition_cb(void *data)
return ECORE_CALLBACK_CANCEL;
}
+static void
+_item_push_helper(Elm_Naviframe_Item *item)
+{
+ Elm_Naviframe_Item *top_item;
+ Evas_Object *obj = WIDGET(item);
+ ELM_NAVIFRAME_DATA_GET(obj, sd);
+ top_item = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
+ evas_object_show(VIEW(item));
+
+ if (top_item) elm_widget_focused_object_clear(VIEW(top_item));
+ _resize_object_reset(obj, item);
+ if (top_item)
+ {
+if (sd->freeze_events)
+ {
+ evas_object_freeze_events_set(VIEW(item), EINA_TRUE);
+ evas_object_freeze_events_set(VIEW(top_item), EINA_TRUE);
+ }
+elm_object_signal_emit(VIEW(top_item), "elm,state,cur,pushed", "elm");
+elm_object_signal_emit(VIEW(item), "elm,state,new,pushed", "elm");
+
edje_object_message_signal_process(elm_layout_edje_get(VIEW(top_item)));
+edje_object_message_signal_process(elm_layout_edje_get(VIEW(item)));
+
+elm_widget_tree_unfocusable_set(VIEW(top_item), EINA_TRUE);
+
+ecore_animator_del(item->animator);
+item->animator = ecore_animator_add(_push_transition_cb, item);
+ }
+ else
+ {
+if (elm_object_focus_allow_get(VIEW(item)))
+ elm_object_focus_set(VIEW(item), EINA_TRUE);
+else
+ elm_object_focus_set(WIDGET(item), EINA_TRUE);
+ }
+
+ sd->stack = eina_inlist_append(sd->stack, EINA_INLIST_GET(item));
+
+ if (!top_item)
+ elm_object_signal_emit(VIEW(item), "elm,state,visible", "elm");
+
+ elm_layout_sizing_eval(obj);
+}
+
EAPI Evas_Object *
elm_naviframe_add(Evas_Object *parent)
{
@@ -1513,11 +1557,9 @@ elm_naviframe_item_push(Evas_Object *obj,
}
static void
-_item_push(Eo *obj, void *_pd, va_list *list)
+_item_push(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
- Elm_Naviframe_Item *prev_it, *it;
-
- Elm_Naviframe_Smart_Data *sd = _pd;
+ Elm_Naviframe_Item *top_item, *item;
const char *title_label = va_arg(*list, const char *);
Evas_Object *prev_btn = va_arg(*list, Evas_Object *);
@@ -1526,50 +1568,12 @@ _item_push(Eo *obj, void *_pd, va_list *list)
const char *item_style = va_arg(*list, const char *);
Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
*ret = NULL;
-
- prev_it = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
- it = _item_new(obj, prev_it,
+ top_item = (Elm_Naviframe_Item *)elm_naviframe_top_item_get(obj);
+ item = _item_new(obj, top_item,
title_label, prev_btn, next_btn, content, item_style);
- if (!it) return;
-
- evas_object_show(VIEW(it));
-
- if (prev_it) elm_widget_focused_object_clear(VIEW(prev_it));
- _resize_object_reset(obj, it);
- if (prev_it)
- {
-if (sd->freeze_events)
- {
- evas_object_freeze_events_set(VIEW(it), EINA_TRUE);
- evas_object_freeze_events_set(VIEW(prev_it), EINA_TRUE);
- }
-
-elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm");
-elm_object_signal_emit(VIEW(it), "elm,state,new,pushed", "elm");
-edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
-edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
-
-elm_widget_tree_unfocusable_set(VIEW(prev_it), EINA_TRUE);
-
-ecore_animator_del(it->animator);
-it->animator = ecore_animator_add(_push_transition_cb, it);
- }
- else
- {
-if (elm_object_focus_allow_get(VIEW(it)))
- elm_object_focus_set(VIEW(it), EINA_TRUE);
-else
- elm_object_focus_set(WIDGET(it), EINA_TRUE);
- }
-
- sd->stack = eina_inlist_append(sd->stack, EINA_INLIST_GET(it));
-
- if (!prev_it)
- elm_object_signal_emit(VIEW(it), "elm,state,visible", "elm");
-
- elm_layout_sizing_eval(obj);
-
- *ret = (Elm_Object_Item *)it;
+ if (!item) return;
+ _item_push_helper(item);
+ *ret = (Elm_Object_Item *)item;
}
EAPI Elm_Object_Item *
@@ -1813,45 +1817,17 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
{
Elm_Object_I
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
On 12/03/14 09:44, Stefan Schmidt wrote: > Hello. > > On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: >> Just reading the last few commits that got backported, it seems that 1.9 >> was all about breaking ABI. That's just great. > > Which mreminds me about something Cedric and I have talked about. > > http://upstream-tracker.org/ > > Some tooling to help indentifying ABI/API breaks. I'm looking for a > volunteer who would like to make use of it for EFL. I see three > options: > > 1) Making the website run on our code more often. > > 2) Run the tools on your own machine our our E servers at least once > or twice in the last week before the release (better would be earlier > as well) > > 3) Setup the tools on our E servers and have it integrated with > jenkins. > > A combination of 1 and 3 would be great imho. I'm not going to work on > this myself though. No more time to mainatin yet another tool in our > CI/QA infrastructure. There are self hosted tools that we can put on Jenkins and run nightly. It's probably better than an external solution. > > Given the recent ABI breaks we should be able to find a volunteer for > this, right? I nominate the release manager. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Hello. On Wed, 2014-03-12 at 09:33, Tom Hacohen wrote: > On 12/03/14 09:22, Stefan Schmidt wrote: > > Hello. > > > > On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > >> Just reading the last few commits that got backported, it seems that 1.9 > >> was all about breaking ABI. That's just great. > >> > >> -- > >> Tom. > >> > >> On 12/03/14 03:44, Daniel Juyung Seo wrote: > >>> seoz pushed a commit to branch elementary-1.9. > >>> > >>> http://git.enlightenment.org/core/elementary.git/commit/?id=6ebc1d808bd6e310017b3ab65ec45c27a81960b7 > >>> > >>> commit 6ebc1d808bd6e310017b3ab65ec45c27a81960b7 > >>> Author: Daniel Juyung Seo > >>> Date: Wed Mar 12 12:42:59 2014 +0900 > >>> > >>> elm_win: Unbreak the ABI break of window type. > > > > I will pull this one into elementary 1.9.1 which will get released > > later today. Don't really like to pull something in that late but > > releasing 1.9.1 with this known ABI break where we already have a > > backported fix would be stupid. Bending my own rules here. > > This has nothing to do with rules. Although really sad, ABI breaks > should not happen and should be minimized. Critical issues like this > warrant an immediate follow-up release. > > By the way, we need to find/start using a mechanism to detect ABI > breaks. It's very easy to do (the basics are), and there are many tools > that do it (check changes in exported symbols). We should add that to > nightlies. See my other mail I just wrote while yours arrived. Be the volunteer doing it. The tools are out there. regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Hello. On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > Just reading the last few commits that got backported, it seems that 1.9 > was all about breaking ABI. That's just great. Which mreminds me about something Cedric and I have talked about. http://upstream-tracker.org/ Some tooling to help indentifying ABI/API breaks. I'm looking for a volunteer who would like to make use of it for EFL. I see three options: 1) Making the website run on our code more often. 2) Run the tools on your own machine our our E servers at least once or twice in the last week before the release (better would be earlier as well) 3) Setup the tools on our E servers and have it integrated with jenkins. A combination of 1 and 3 would be great imho. I'm not going to work on this myself though. No more time to mainatin yet another tool in our CI/QA infrastructure. Given the recent ABI breaks we should be able to find a volunteer for this, right? regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: Elm test dnd: Fixed substraction of void *.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2800c120253f617e0044330985d5080d0472ff84
commit 2800c120253f617e0044330985d5080d0472ff84
Author: Tom Hacohen
Date: Wed Mar 12 09:39:10 2014 +
Elm test dnd: Fixed substraction of void *.
This is not allowed. The pointers need to be cast to char * before doing
pointer arithmetics.
---
src/bin/test_dnd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/test_dnd.c b/src/bin/test_dnd.c
index 2f538f4..1507ade 100644
--- a/src/bin/test_dnd.c
+++ b/src/bin/test_dnd.c
@@ -46,7 +46,7 @@ static Ecore_Timer *_5s_timeout = NULL;
static int
_item_ptr_cmp(const void *d1, const void *d2)
{
- return (d1 - d2);
+ return ((const char *) d1 - (const char *) d2);
}
static Elm_Genlist_Item_Class *itc1;
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore-drm: Add API function to return the drm device name
On 12/03/14 09:28, Christopher Michael wrote: > ecore-drm: Add API function to return the drm device name > > @feature: Add new API function to return the drm device name Adding @feature is enough. You don't need to copy the feature description. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
On 12/03/14 09:22, Stefan Schmidt wrote: > Hello. > > On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: >> Just reading the last few commits that got backported, it seems that 1.9 >> was all about breaking ABI. That's just great. >> >> -- >> Tom. >> >> On 12/03/14 03:44, Daniel Juyung Seo wrote: >>> seoz pushed a commit to branch elementary-1.9. >>> >>> http://git.enlightenment.org/core/elementary.git/commit/?id=6ebc1d808bd6e310017b3ab65ec45c27a81960b7 >>> >>> commit 6ebc1d808bd6e310017b3ab65ec45c27a81960b7 >>> Author: Daniel Juyung Seo >>> Date: Wed Mar 12 12:42:59 2014 +0900 >>> >>> elm_win: Unbreak the ABI break of window type. > > I will pull this one into elementary 1.9.1 which will get released > later today. Don't really like to pull something in that late but > releasing 1.9.1 with this known ABI break where we already have a > backported fix would be stupid. Bending my own rules here. This has nothing to do with rules. Although really sad, ABI breaks should not happen and should be minimized. Critical issues like this warrant an immediate follow-up release. By the way, we need to find/start using a mechanism to detect ABI breaks. It's very easy to do (the basics are), and there are many tools that do it (check changes in exported symbols). We should add that to nightlies. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore-drm: Add API function to return the drm device name
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bdf00c28b74cc163fed5a29561de43be66efed41
commit bdf00c28b74cc163fed5a29561de43be66efed41
Author: Chris Michael
Date: Wed Mar 12 09:26:43 2014 +
ecore-drm: Add API function to return the drm device name
@feature: Add new API function to return the drm device name
NB: This will be used in the ecore_evas_drm code to set the
ecore_evas->name.
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/Ecore_Drm.h| 1 +
src/lib/ecore_drm/ecore_drm_device.c | 14 ++
2 files changed, 15 insertions(+)
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index fdf41b4..7db37e5 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -143,6 +143,7 @@ EAPI Eina_Bool ecore_drm_device_master_set(Ecore_Drm_Device
*dev);
EAPI Eina_Bool ecore_drm_device_master_drop(Ecore_Drm_Device *dev);
EAPI int ecore_drm_device_fd_get(Ecore_Drm_Device *dev);
EAPI void ecore_drm_device_window_set(Ecore_Drm_Device *dev, void *window);
+EAPI const char *ecore_drm_device_name_get(Ecore_Drm_Device *dev);
EAPI Eina_Bool ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name);
EAPI Eina_Bool ecore_drm_tty_close(Ecore_Drm_Device *dev);
diff --git a/src/lib/ecore_drm/ecore_drm_device.c
b/src/lib/ecore_drm/ecore_drm_device.c
index 0f7efdf..d846e8f 100644
--- a/src/lib/ecore_drm/ecore_drm_device.c
+++ b/src/lib/ecore_drm/ecore_drm_device.c
@@ -606,3 +606,17 @@ ecore_drm_device_window_set(Ecore_Drm_Device *dev, void
*window)
dev->window = window;
}
+
+/**
+ * TODO: Doxy
+ *
+ * @since 1.10
+ */
+EAPI const char *
+ecore_drm_device_name_get(Ecore_Drm_Device *dev)
+{
+ /* check for valid device */
+ if ((!dev) || (dev->drm.fd < 0)) return NULL;
+
+ return dev->drm.name;
+}
--
[EGIT] [core/elementary] elementary-1.9 01/01: release: Update NEWS and bump version for 1.9.1 release
stefan pushed a commit to branch elementary-1.9. http://git.enlightenment.org/core/elementary.git/commit/?id=63e989b7f8897010131e8897a1de518889691832 commit 63e989b7f8897010131e8897a1de518889691832 Author: Stefan Schmidt Date: Mon Mar 10 14:54:02 2014 +0100 release: Update NEWS and bump version for 1.9.1 release --- NEWS | 30 +- configure.ac | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2680f36..61d7027 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,35 @@ -Elementary 1.9.0 +Elementary 1.9.1 +Changes since Elementary 1.9.0: +--- + +Additions: + +Improvements: + +Fixes: + + * elm_win: Unbreak the ABI break of window type. + * Fix slider overlay parenting + * entry - send selection,cleared signal if a selection is dismissed. + * naviframe: Fix smart_show function to show only top item view + * Avoid Month wrapping by ignoring summer time correction. + * entry - fix menu to not popup after every time mobile sel handles are clicked + * Fix bug of moving cursor handler + * fix ctxpopup getting min size from content immediately on set + * object_item: Check null in elm_object_item_del. + * diskselector: Fix segmentation fault (T988) + * Fix broken slider popup hide logic + * Fix slider popup creation with custom themes + * move slider track functions up + * Fix homogeneous genlist recalc on theme change (T1023) + * hover: Made hover itself unfocusable. + +Removals: + + Changes since Elementary 1.8.0: --- diff --git a/configure.ac b/configure.ac index d281deb..d749286 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [9], [0], [release]) +EFL_VERSION([1], [9], [1], [release]) AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ(2.60) --
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Hello. On Wed, 2014-03-12 at 08:58, Tom Hacohen wrote: > Just reading the last few commits that got backported, it seems that 1.9 > was all about breaking ABI. That's just great. > > -- > Tom. > > On 12/03/14 03:44, Daniel Juyung Seo wrote: > > seoz pushed a commit to branch elementary-1.9. > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=6ebc1d808bd6e310017b3ab65ec45c27a81960b7 > > > > commit 6ebc1d808bd6e310017b3ab65ec45c27a81960b7 > > Author: Daniel Juyung Seo > > Date: Wed Mar 12 12:42:59 2014 +0900 > > > > elm_win: Unbreak the ABI break of window type. I will pull this one into elementary 1.9.1 which will get released later today. Don't really like to pull something in that late but releasing 1.9.1 with this known ABI break where we already have a backported fix would be stupid. Bending my own rules here. regards Stefan Schmidt -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] efl-1.9 01/01: release: Update NEWS and bump version for 1.9.1 release
On 12/03/14 09:09, Andy Williams wrote: > Hi tom, > > Thanks very much for this. I had an open question to the ML about the right > way to fix this but it never got responded to so it fell off my watch list. > No worries. However, for future reference, it's your responsibility to follow up on such matters. Also, I don't remember any mail from you that went unanswered. I remember Gustavo replying saying what needs to be done, and that's where the discussions ended. -- Tom. -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [apps/terminology] master 01/01: Make an option to disable tab switch animations.
On 14-03-12 13:37, Cedric BAIL wrote: > On Wed, Mar 12, 2014 at 11:51 AM, Gustavo Lima Chaves > wrote: > > glima pushed a commit to branch master. > > > > http://git.enlightenment.org/apps/terminology.git/commit/?id=1d689839c065964333cd2ee8f3e6573b1f38a020 > > > > commit 1d689839c065964333cd2ee8f3e6573b1f38a020 > > Author: Gustavo Lima Chaves > > Date: Tue Mar 11 23:49:40 2014 -0300 > > > > Make an option to disable tab switch animations. > > Wasn't setting the animation time to zero enough to do the same things ? You should revert that patch but make a new one to improve the message on the "Tab Zoom Animation" setting, by adding "(0 disables the animation)" for example. -- Boris Faure Pointer Arithmetician signature.asc Description: Digital signature -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] efl-1.9 01/01: release: Update NEWS and bump version for 1.9.1 release
Hi tom, Thanks very much for this. I had an open question to the ML about the right way to fix this but it never got responded to so it fell off my watch list. Apologies again for the breakage, Andy Sent from my iPhone > On 10 Mar 2014, at 04:52 pm, Tom Hacohen wrote: > >> On 10/03/14 16:32, Stefan Schmidt wrote: >> Hello. >> >>> On Mon, 2014-03-10 at 13:20, Gustavo Sverzut Barbieri wrote: >>> sorry, but you did release it with the Eina_Log_Domain struct abi >>> break that I requested the guy to fix, it wasn't fixed and got >>> released :-( >> >> I have good news for you. It was not released. Was still in the >> preparation when Tom pointed this mail out to me. Not even testing >> tarballs for efl are up. >> >>> move new member color as the last one in the struct, not in the >>> middle. And this needs fixing in the main branch. >> >> I will postpone 1.9.1 until this is fixed in master and backported to >> the 1.9 branch. >> >> I have seen your complain before put somehow had it in my had that it >> was already taken care of. :) >> >> Anyway, not released yet so all is good. Waiting for Andy to fix it up >> now. :) >> >> regards >> Stefan Schmidt >> >> -- >> Learn Graph Databases - Download FREE O'Reilly Book >> "Graph Databases" is the definitive new guide to graph databases and their >> applications. Written by three acclaimed leaders in the field, >> this first edition is now available. Download your free book today! >> http://p.sf.net/sfu/13534_NeoTech >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > Fixed and backported. > > Gustavo: next time you see something like this which is not addressed > (reply or fix) after a timely manner, just revert. > > -- > Tom. > > > -- > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, > this first edition is now available. Download your free book today! > http://p.sf.net/sfu/13534_NeoTech > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 03/03: Eolian: Integration of Evas Grid
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2a90b4f23daef9476ea9d60b144e135931c3d5b2
commit 2a90b4f23daef9476ea9d60b144e135931c3d5b2
Author: Yossi Kantor
Date: Mon Mar 10 17:02:10 2014 +0200
Eolian: Integration of Evas Grid
---
src/Makefile_Evas.am | 10 +-
src/lib/evas/Evas_Eo.h | 3 +
src/lib/evas/canvas/evas_grid.eo | 155 +
src/lib/evas/canvas/evas_object_grid.c | 309 ++---
4 files changed, 218 insertions(+), 259 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 5723530..b1f075e 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -27,7 +27,9 @@ BUILT_SOURCES += \
lib/evas/canvas/evas_object.eo.c \
lib/evas/canvas/evas_object.eo.h \
lib/evas/canvas/evas.eo.c \
- lib/evas/canvas/evas.eo.h
+ lib/evas/canvas/evas.eo.h \
+ lib/evas/canvas/evas_grid.eo.c \
+ lib/evas/canvas/evas_grid.eo.h
EXTRA_DIST += \
lib/evas/canvas/evas_object.eo \
@@ -42,7 +44,8 @@ EXTRA_DIST += \
lib/evas/canvas/evas_smart_clipped.eo \
lib/evas/canvas/evas_table.eo \
lib/evas/canvas/evas_common_interface.eo \
- lib/evas/canvas/evas.eo
+ lib/evas/canvas/evas.eo \
+ lib/evas/canvas/evas_grid.eo
lib_LTLIBRARIES += lib/evas/libevas.la
noinst_LTLIBRARIES =
@@ -70,7 +73,8 @@ nodist_installed_evascanvasheaders_DATA = \
lib/evas/canvas/evas_table.eo.h \
lib/evas/canvas/evas_common_interface.eo.h \
lib/evas/canvas/evas_object.eo.h \
-lib/evas/canvas/evas.eo.h
+lib/evas/canvas/evas.eo.h \
+lib/evas/canvas/evas_grid.eo.h
noinst_HEADERS = \
lib/evas/include/evas_inline.x \
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 6d383e7..bc391f4 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -4256,6 +4256,8 @@ enum
*
* @{
*/
+#include "canvas/evas_grid.eo.h"
+#if 0
#define EVAS_OBJ_GRID_CLASS evas_object_grid_class_get()
const Eo_Class *evas_object_grid_class_get(void) EINA_CONST;
@@ -4451,6 +4453,7 @@ enum
*/
#define evas_obj_grid_mirrored_set(mirrored)
EVAS_OBJ_GRID_ID(EVAS_OBJ_GRID_SUB_ID_MIRRORED_SET), EO_TYPECHECK(Eina_Bool,
mirrored)
+#endif
/**
* @}
*/
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
new file mode 100644
index 000..e573f36
--- /dev/null
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -0,0 +1,155 @@
+class Evas_Grid (Evas_Smart_Clipped)
+{
+ legacy_prefix: evas_object_grid;
+ eo_prefix: evas_obj_grid;
+ properties {
+ mirrored {
+ set {
+/*@
+Sets the mirrored mode of the grid. In mirrored mode the grid
items go
+from right to left instead of left to right. That is, 0,0 is top
right, not
+to left.
+
+@since 1.1 */
+ }
+ get {
+/*@
+Gets the mirrored mode of the grid.
+
+@return @c EINA_TRUE if it's a mirrored grid, @c EINA_FALSE
otherwise.
+@see evas_object_grid_mirrored_set()
+@since 1.1 */
+ }
+ values {
+Eina_Bool mirrored; /*@ the mirrored mode to set */
+ }
+ }
+ size {
+ set {
+/*@
+Set the virtual resolution for the grid
+
+@since 1.1 */
+ }
+ get {
+/*@
+Get the current virtual resolution
+
+@see evas_object_grid_size_set()
+@since 1.1 */
+ }
+ values {
+int w; /*@ The virtual horizontal size (resolution) in integer
units */
+int h; /*@ The virtual vertical size (resolution) in integer units
*/
+ }
+ }
+ children {
+ get {
+/*@
+Get the list of children for the grid.
+
+@note This is a duplicate of the list kept by the grid internally.
+It's up to the user to destroy it when it no longer needs it.
+It's possible to remove objects from the grid when walking this
+list, but these removals won't be reflected on it.
+@since 1.1 */
+return Eina_List * @warn_unused;
+ }
+ }
+ }
+ methods {
+ accessor_new {
+ /*@
+ Get an accessor to get random access to the list of children for the
grid.
+
+ @note Do not remove or delete objects while walking the list.
+ @since 1.1 */
+
+ const;
+ return Eina_Accessor * @warn_unused;
+ }
+ clear {
+ /
Re: [E-devel] [EGIT] [core/elementary] elementary-1.9 01/01: elm_win: Unbreak the ABI break of window type.
Just reading the last few commits that got backported, it seems that 1.9
was all about breaking ABI. That's just great.
--
Tom.
On 12/03/14 03:44, Daniel Juyung Seo wrote:
> seoz pushed a commit to branch elementary-1.9.
>
> http://git.enlightenment.org/core/elementary.git/commit/?id=6ebc1d808bd6e310017b3ab65ec45c27a81960b7
>
> commit 6ebc1d808bd6e310017b3ab65ec45c27a81960b7
> Author: Daniel Juyung Seo
> Date: Wed Mar 12 12:42:59 2014 +0900
>
> elm_win: Unbreak the ABI break of window type.
>
> @fix
> ---
> src/lib/elm_win_common.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/lib/elm_win_common.h b/src/lib/elm_win_common.h
> index b5eb567..3c88278 100644
> --- a/src/lib/elm_win_common.h
> +++ b/src/lib/elm_win_common.h
> @@ -9,7 +9,7 @@
>*/
> typedef enum
> {
> - ELM_WIN_UNKNOWN, /**< Unknown window type. */
> + ELM_WIN_UNKNOWN = -1, /**< Unknown window type. */
> ELM_WIN_BASIC, /**< A normal window. Indicates a normal, top-level
>window. Almost every window will be created with this
>type. */
>
--
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/02: ecore-x: Predefine Ecore_X_Atom and Ecore_X_Icon
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=11d250e5fc1ca1a580260683f918cc36849921af
commit 11d250e5fc1ca1a580260683f918cc36849921af
Author: Chris Michael
Date: Wed Mar 12 08:38:00 2014 +
ecore-x: Predefine Ecore_X_Atom and Ecore_X_Icon
@fix: Fix building Enlightenment without X support
These changes are needed so that we can build Enlightenment without X
support. Many places in the E code reference
Ecore_X_Atom/Ecore_X_Icon. If we build E without X support, these end
up being undefined, causing build to fail, so we need to predefine them.
Signed-off-by: Chris Michael
---
src/lib/ecore_x/Ecore_X.h | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 0d04279..da973c9 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -77,6 +77,12 @@ typedef unsigned int Ecore_X_ID;
#ifndef _ECORE_X_WINDOW_PREDEF
typedef Ecore_X_ID Ecore_X_Window;
typedef Ecore_X_ID Ecore_X_Pixmap;
+typedef Ecore_X_ID Ecore_X_Atom;
+typedef struct _Ecore_X_Icon
+{
+ unsigned int width, height;
+ unsigned int *data;
+} Ecore_X_Icon;
#endif // ifndef _ECORE_X_WINDOW_PREDEF
typedef void *Ecore_X_Visual;
typedef Ecore_X_ID Ecore_X_Drawable;
@@ -85,7 +91,6 @@ typedef Ecore_X_ID Ecore_X_GC;
#else // ifdef HAVE_ECORE_X_XCB
typedef void *Ecore_X_GC;
#endif /* HAVE_ECORE_X_XCB */
-typedef Ecore_X_ID Ecore_X_Atom;
typedef Ecore_X_ID Ecore_X_Colormap;
typedef Ecore_X_ID Ecore_X_Time;
typedef Ecore_X_ID Ecore_X_Cursor;
@@ -115,12 +120,6 @@ typedef struct _Ecore_X_Rectangle
unsigned int width, height;
} Ecore_X_Rectangle;
-typedef struct _Ecore_X_Icon
-{
- unsigned int width, height;
- unsigned int *data;
-} Ecore_X_Icon;
-
typedef enum _Ecore_X_GC_Value_Mask
{
ECORE_X_GC_VALUE_MASK_FUNCTION = (1L << 0),
--
[EGIT] [core/efl] master 02/02: ecore-evas: Predefine Ecore_X_Atom and Ecore_X_Icon
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd28854fdf4f31684800a0efe892634431a61f2f
commit cd28854fdf4f31684800a0efe892634431a61f2f
Author: Chris Michael
Date: Wed Mar 12 08:41:15 2014 +
ecore-evas: Predefine Ecore_X_Atom and Ecore_X_Icon
@fix: Fix building Enlightenment without X support
These changes are needed so that we can build Enlightenment without X
support. Many places in the E code reference
Ecore_X_Atom/Ecore_X_Icon. If we build E without X support, these end
up being undefined, causing build to fail, so we need to predefine them.
Signed-off-by: Chris Michael
---
src/lib/ecore_evas/Ecore_Evas_Types.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/lib/ecore_evas/Ecore_Evas_Types.h
b/src/lib/ecore_evas/Ecore_Evas_Types.h
index b503533..eea8aa7 100644
--- a/src/lib/ecore_evas/Ecore_Evas_Types.h
+++ b/src/lib/ecore_evas/Ecore_Evas_Types.h
@@ -11,6 +11,12 @@
#define _ECORE_X_WINDOW_PREDEF
typedef unsigned int Ecore_X_Window;
typedef unsigned int Ecore_X_Pixmap;
+typedef unsigned int Ecore_X_Atom;
+typedef struct _Ecore_X_Icon
+{
+ unsigned int width, height;
+ unsigned int *data;
+} Ecore_X_Icon;
#endif
#ifndef _ECORE_DIRECTFB_H
--
Re: [E-devel] Eio soname conflicts with another libeio library
Hello, On Wed, Mar 12, 2014 at 4:15 PM, Jan Kaluža wrote: > while packaging libeio library (not the one from Enlightenment) [1], I > have found out that the soname conflicts with Eio library from your > project. I have already asked libeio upstream if they are willing to > solve this problem somehow globally, but they are not. > > They think their libeio is here for longer time and used by more > external projects while Eio is more like internal library. I can't prove > that anyhow, since I don't know the history of these libraries. Their libeio seems to be 5 years old, ours date from July 2010. As for being internal it is not. Eio is a public API part of EFL and to be used by anyone doing asynchronous IO with or without a UI. Except Ephoto and Elementary, I don't think there is any other open source user of it. Most of the user I know of are proprietary application and would not be using Fedora. > My question is if you, as a Eio upstream, would like to fix this > conflict in the library name. We will probably have to rename one of the > libraries in Fedora otherwise [2]. It is something tricky to solve, by now we have already application using it. It is a public and supported API on our side, changing the naming would break existing application on every other distribution. I don't really see a solution to this problem at this stage. Sadly it is almost 3 years to late... > Sorry if this question has been asked already but I was not able to find > it in archive. I think the question was raised maybe once in the past, I may be mistaken, for another distribution. I think the conclusion was to drop that other eio library as it didn't have any application using it in their repository. Regards, -- Cedric BAIL -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] efl-1.9 01/02: Evas filters: Fix 1-D blurs on a single buffer
jpeg pushed a commit to branch efl-1.9.
http://git.enlightenment.org/core/efl.git/commit/?id=79a2c8d503ab9328c7629d53bcdaa79f1240cd34
commit 79a2c8d503ab9328c7629d53bcdaa79f1240cd34
Author: Jean-Philippe Andre
Date: Tue Mar 11 15:11:21 2014 +0900
Evas filters: Fix 1-D blurs on a single buffer
When a blur operation requires a copy-back to the source
buffer, then the render_op must be set to COPY instead of
BLEND. Otherwise the non blurred content will be visible.
@fix
---
src/lib/evas/filters/evas_filter.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index 5a81f89..0a48869 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -962,12 +962,17 @@ evas_filter_command_blur_add(Evas_Filter_Context *ctx,
void *drawctx,
if (copy_back)
{
+int render_op;
+
if (!cmd) goto fail;
if (!copybuf) goto fail;
INF("Add copy %d -> %d", copybuf->id, blur_out->id);
cmd->ENFN->context_color_set(cmd->ENDT, drawctx, 0, 0, 0, 255);
+render_op = cmd->ENFN->context_render_op_get(cmd->ENDT, drawctx);
+cmd->ENFN->context_render_op_set(cmd->ENDT, drawctx, EVAS_RENDER_COPY);
id = evas_filter_command_blend_add(ctx, drawctx, copybuf->id,
blur_out->id, ox, oy, EVAS_FILTER_FILL_MODE_NONE);
cmd->ENFN->context_color_set(cmd->ENDT, drawctx, R, G, B, A);
+cmd->ENFN->context_render_op_set(cmd->ENDT, drawctx, render_op);
if (id < 0) goto fail;
ox = oy = 0;
}
--
[EGIT] [core/efl] efl-1.9 02/02: Evas filters: Fix memory leak when destroying the object
jpeg pushed a commit to branch efl-1.9.
http://git.enlightenment.org/core/efl.git/commit/?id=528489c31ce0842f783270c172f8edaf831d336b
commit 528489c31ce0842f783270c172f8edaf831d336b
Author: Jean-Philippe Andre
Date: Wed Mar 12 14:06:23 2014 +0900
Evas filters: Fix memory leak when destroying the object
The GL buffers set to be freed were released only the async case...
which doesn't make sense since GL is sync.
@fix
Conflicts:
src/lib/evas/filters/evas_filter.c
---
src/lib/evas/filters/evas_filter.c | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/filters/evas_filter.c
b/src/lib/evas/filters/evas_filter.c
index 0a48869..20e701e 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -1694,7 +1694,8 @@ static Eina_Bool
_filter_chain_run(Evas_Filter_Context *ctx)
{
Evas_Filter_Command *cmd;
- Eina_Bool ok = EINA_TRUE;
+ Eina_Bool ok = EINA_FALSE;
+ void *buffer;
ctx->running = EINA_TRUE;
EINA_INLIST_FOREACH(ctx->commands, cmd)
@@ -1711,6 +1712,13 @@ _filter_chain_run(Evas_Filter_Context *ctx)
end:
ctx->running = EINA_FALSE;
+
+ EINA_LIST_FREE(ctx->post_run.buffers_to_free, buffer)
+ {
+if (ctx->gl_engine)
+ ENFN->image_free(ENDT, buffer);
+ }
+
return ok;
}
@@ -1718,17 +1726,10 @@ static void
_filter_thread_run_cb(void *data)
{
Evas_Filter_Context *ctx = data;
- void *buffer;
// TODO: Add return value check and call error cb
_filter_chain_run(ctx);
- EINA_LIST_FREE(ctx->post_run.buffers_to_free, buffer)
- {
-if (ctx->gl_engine)
- ENFN->image_free(ENDT, buffer);
- }
-
if (ctx->post_run.cb)
ctx->post_run.cb(ctx, ctx->post_run.data);
}
@@ -1753,6 +1754,7 @@ evas_filter_run(Evas_Filter_Context *ctx)
}
ret = _filter_chain_run(ctx);
+
if (ctx->post_run.cb)
ctx->post_run.cb(ctx, ctx->post_run.data);
return ret;
--
[E-devel] Eio soname conflicts with another libeio library
Hi, while packaging libeio library (not the one from Enlightenment) [1], I have found out that the soname conflicts with Eio library from your project. I have already asked libeio upstream if they are willing to solve this problem somehow globally, but they are not. They think their libeio is here for longer time and used by more external projects while Eio is more like internal library. I can't prove that anyhow, since I don't know the history of these libraries. My question is if you, as a Eio upstream, would like to fix this conflict in the library name. We will probably have to rename one of the libraries in Fedora otherwise [2]. Sorry if this question has been asked already but I was not able to find it in archive. [1] http://software.schmorp.de/pkg/libeio.html [2] https://fedorahosted.org/fpc/ticket/403#comment:2 Regards, Jan Kaluza -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
