Re: [E-devel] Eolian C generation
On 12/31/2013 10:03 AM, Carsten Haitzler (The Rasterman) wrote:
On Thu, 12 Dec 2013 16:14:34 +0200 daniel.za...@samsung.com
daniel.za...@samsung.com said:
Hi all,
As you maybe know, we are developing a tool (Eolian) that will help
people to add functions to the Eo classes and to generate automatically
bindings. We spoke a lot about the .eo format to describe the classes
but we never spoke about the generator. So is the time.
The solution chosen to generate C code is to have two files:
- the first one is fully auto-generated by Eolian and contains EAPI
legacy functions and Eo code
EAPI Eo_Op... = EO_NOOP;
...
EAPI void
evas_object_image_mmap_set(Evas_Object *eo_obj, const Eina_File *f,
const char *key)
{
eo_do(eo_obj, evas_obj_image_mmap_set(f, key));
}
static void
_eo_evas_object_image_mmap_set(Eo *eo_obj, void *_pd, va_list *list)
{
const Eina_File *f = va_arg(*list, const Eina_File *);
const char *key = va_arg(*list, const char*);
_mmap_set(obj, f, key); *// User function located in the second C file*
}
...
static void
_class_constructor(Eo_Class *klass)
{
const Eo_Op_Func_Description func_desc[] = {
EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
EO_OP_FUNC(EVAS_OBJ_IMAGE_ID(EVAS_OBJ_IMAGE_SUB_ID_MMAP_SET),
_eo_evas_object_image_mmap_set),
...
}
...
- the second file contains the user code. It is not touched by Eolian.
so the user edits the generated file above to fill in
_eo_evas_object_image_mmap_set() for example (eolian generates that function
stub with just enough boilerplate to get them going) right? so it doesnt fully
generate but it also has to update/edit/merge in changes from the eo file.
this
generated file #includes the totally custom user code never touched by
eolian
right? or this eo generated file is NEVER edited by the user and the user has
to write the _mmap_set() func by hand? or does eolian generate these empty
stubs for the user (or update them if params change)? it'd be nice if it could
generate them when they get added to the class with an empty function the
user then has to fill. which one is it? i would definitely vote for eolian
generating at least empty stub functions so things compile (and likely dont
work or do anything useful).
The user edits its own file and implements the functions that are
expected by the generated file.
Creating stub functions implies that we need to parse C code and that's
what we want to prevent.
If you want to create stubs, you have to know a destination file. For
most of the cases, it is easy because all the functions of the class are
defined in a same file. But we have classes (Evas Object, Edje iirc...)
whose user functions are splitted into many files. It would mean you
have to indicate which function you want to create in a certain file.
Imo, it is preferable that things don't compile so that you will not
forget to implement it.
for the func name - static so they dont leak out, ensure the user file is
#included into the eolian generated file so we keep all symbols local and i'd
say start with _ and add _eoimpl_ (eo implementation) just to ensure it wont
clash with anything else.
static void
_eoimpl_mmap_set(Eo *obj, Eina_File *f, const char *key)
{
}
For the moment, the user file includes the generated file. In this
way, we don't change the makefiles (I know, bad reason).
If we do as you suggested, we have to include many files in the case of
scattered functions and put the generated files into the makefiles. The
issue here is how we can know which files have to be included. Maybe as
parameter of Eolian.
With our solution, only one user file includes the generated file but
we will have to set the user functions as extern into the generated file
and to remove the static and that's bad. Except if the main user file
of the class (e.g evas_object_main.c) includes the other user files of
the class and the generated file. And so we will just have to remove
them from the makefiles.
The solution you suggest seems better. Well, I am your minion, so I must
agree with you ;-). Seriously I don't know which way to choose for the
moment.
Concerning the naming conventions, we use for example
_eo_obj_load_dpi_get into the generated file and
_evas_image_load_dpi_get into the user file.
This separation facilitates the generation for the C files. In the
future, when Eo2 is operational, we will be able to switch fast by
invoking Eolian to generate legacy and Eo2.
I think this is the best time to speak about the changes we can make in
the current code to set code conventions:
- Eolian-generated Eo functions have to call user functions. Which
convention for the function name? We decided for the moment to go on the
operation only (_mmap_set).
- Prototypes of user constructor and destructor. Since we are not
supposed to see neither va_list nor parameters (except custom
constructors), we chose to give only the
[EGIT] [apps/terminology] master 01/02: Remove whitespace
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=26474588d1541c6eafba4320b161c0561471a08c
commit 26474588d1541c6eafba4320b161c0561471a08c
Author: Chris Michael devilho...@comcast.net
Date: Wed Jan 1 15:52:03 2014 +
Remove whitespace
Signed-off-by: Chris Michael devilho...@comcast.net
---
src/bin/termio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index b2968cd..e856989 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1900,7 +1900,7 @@ _font_size_set(Evas_Object *obj, int size)
{
Evas_Coord mw = 1, mh = 1;
int gw, gh;
-
+
config-temporary = EINA_TRUE;
config-font.size = size;
gw = sd-grid.w;
--
[EGIT] [apps/terminology] master 02/02: Fix copy/paste error when termio object is deleted.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=81a0d28a3075fedebd221209efe7525ae488d917
commit 81a0d28a3075fedebd221209efe7525ae488d917
Author: Chris Michael devilho...@comcast.net
Date: Wed Jan 1 15:52:21 2014 +
Fix copy/paste error when termio object is deleted.
When we get the evas callback for the termio object being deleted,
then we Do Not want to readd the same callback. Instead we should do
evas_object_event_callback_del_full here.
Signed-off-by: Chris Michael devilho...@comcast.net
---
src/bin/sel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/sel.c b/src/bin/sel.c
index e62300e..d7c9846 100644
--- a/src/bin/sel.c
+++ b/src/bin/sel.c
@@ -492,7 +492,7 @@ static void
_entry_termio_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *info EINA_UNUSED)
{
Entry *en = data;
- if (en-termio) evas_object_event_callback_add
+ if (en-termio) evas_object_event_callback_del_full
(en-termio, EVAS_CALLBACK_DEL, _entry_termio_del_cb, en);
en-termio = NULL;
}
--
[EGIT] [core/enlightenment] master 01/01: bugfix: no more crashes when being a jerk with Navigate menu scrolling
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=8462090f3d7744f8656a3684f13da0c9a8f14075 commit 8462090f3d7744f8656a3684f13da0c9a8f14075 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 14:25:27 2014 -0500 bugfix: no more crashes when being a jerk with Navigate menu scrolling this really only happens if you're TRYING to break things, but don't assume parent menu item is active item since it might not be --- src/modules/fileman/e_mod_menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index b9d1b00..2bd99db 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -1,5 +1,4 @@ -#include e_mod_main.h -#include e_fm_device.h +#include e_mod_main.h include e_fm_device.h static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi); @@ -240,7 +239,7 @@ _e_mod_menu_populate_done(void *data, Eio_File *handler __UNUSED__) mi = e_menu_item_new(m); e_menu_item_label_set(mi, _(No listable items)); dev = e_object_data_get(data); -path = e_object_data_get(E_OBJECT(e_menu_item_active_get())); +path = e_object_data_get(E_OBJECT(m-parent_item)); e_object_data_set(E_OBJECT(mi), eina_stringshare_ref(path)); if (dev (dev[0] == '/')) e_menu_item_callback_set(mi, _e_mod_menu_populate_cb, dev); --
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: bugfix: no more crashes when being a jerk with Navigate menu scrolling
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc648476b3218e889c161f6fc648cafccff6558f commit bc648476b3218e889c161f6fc648cafccff6558f Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 14:25:27 2014 -0500 bugfix: no more crashes when being a jerk with Navigate menu scrolling this really only happens if you're TRYING to break things, but don't assume parent menu item is active item since it might not be --- src/modules/fileman/e_mod_menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index b9d1b00..2bd99db 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -1,5 +1,4 @@ -#include e_mod_main.h -#include e_fm_device.h +#include e_mod_main.h include e_fm_device.h static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi); @@ -240,7 +239,7 @@ _e_mod_menu_populate_done(void *data, Eio_File *handler __UNUSED__) mi = e_menu_item_new(m); e_menu_item_label_set(mi, _(No listable items)); dev = e_object_data_get(data); -path = e_object_data_get(E_OBJECT(e_menu_item_active_get())); +path = e_object_data_get(E_OBJECT(m-parent_item)); e_object_data_set(E_OBJECT(mi), eina_stringshare_ref(path)); if (dev (dev[0] == '/')) e_menu_item_callback_set(mi, _e_mod_menu_populate_cb, dev); --
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: dear $EDITOR, thanks for removing that newline in the includes.
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3fb78796772919a3f968436ac6d9bd8f3ba6e472 commit 3fb78796772919a3f968436ac6d9bd8f3ba6e472 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 14:30:49 2014 -0500 dear $EDITOR, thanks for removing that newline in the includes. I didn't need it, and it didn't break anything. no wait, fuck you. sincerely, zmike --- src/modules/fileman/e_mod_menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 2bd99db..b98306e 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -1,4 +1,5 @@ -#include e_mod_main.h include e_fm_device.h +#include e_mod_main.h +#include e_fm_device.h static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi); --
[EGIT] [core/enlightenment] master 01/01: dear $EDITOR, thanks for removing that newline in the includes.
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7824d319429290a298780aaeabc1915226e12367 commit 7824d319429290a298780aaeabc1915226e12367 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 14:30:49 2014 -0500 dear $EDITOR, thanks for removing that newline in the includes. I didn't need it, and it didn't break anything. no wait, fuck you. sincerely, zmike --- src/modules/fileman/e_mod_menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 2bd99db..b98306e 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -1,4 +1,5 @@ -#include e_mod_main.h include e_fm_device.h +#include e_mod_main.h +#include e_fm_device.h static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item *mi); --
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: bugfix: store opacity in remembers like we do in the other remember edd
discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a64e4bea2c84d78bb2a846831a8ae25a169c88b2 commit a64e4bea2c84d78bb2a846831a8ae25a169c88b2 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 15:39:35 2014 -0500 bugfix: store opacity in remembers like we do in the other remember edd --- src/bin/e_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 7c89f28..d8f8f4c 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -349,6 +349,7 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR); E_CONFIG_VAL(D, T, prop.desktop_file, STR); E_CONFIG_VAL(D, T, prop.offer_resistance, UCHAR); + E_CONFIG_VAL(D, T, prop.opacity, UCHAR); _e_config_color_class_edd = E_CONFIG_DD_NEW(E_Color_Class, E_Color_Class); #undef T --
[EGIT] [core/efl] master 03/03: Fix documentation for efreet_desktop_exec().
kuri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6ea95af025915a3fe20ef7aba5370b3f12dafd48 commit 6ea95af025915a3fe20ef7aba5370b3f12dafd48 Author: Guillaume Friloux k...@efl.so Date: Wed Jan 1 21:39:14 2014 +0100 Fix documentation for efreet_desktop_exec(). --- src/lib/efreet/efreet_desktop.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/efreet/efreet_desktop.h b/src/lib/efreet/efreet_desktop.h index 1c69e5d..fae8bac 100644 --- a/src/lib/efreet/efreet_desktop.h +++ b/src/lib/efreet/efreet_desktop.h @@ -203,8 +203,7 @@ EAPI int efreet_desktop_save_as(Efreet_Desktop *desktop, * @param desktop The desktop file to work with * @param files The files to be substituted into the exec line * @param data The data pointer to pass - * @return Returns the Ecore_Exce for @a desktop - * @brief Parses the @a desktop exec line and returns an Ecore_Exe. + * @brief Parses the @a desktop exec line and runs the command. */ EAPI void efreet_desktop_exec(Efreet_Desktop *desktop, Eina_List *files, void *data); --
[EGIT] [core/enlightenment] master 01/01: bugfix: store opacity in remembers like we do in the other remember edd
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=40e947db158a39071fadc4f70ba3ea5e3e971d05 commit 40e947db158a39071fadc4f70ba3ea5e3e971d05 Author: Mike Blumenkrantz zm...@samsung.com Date: Wed Jan 1 15:39:35 2014 -0500 bugfix: store opacity in remembers like we do in the other remember edd --- src/bin/e_config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 7c89f28..d8f8f4c 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -349,6 +349,7 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR); E_CONFIG_VAL(D, T, prop.desktop_file, STR); E_CONFIG_VAL(D, T, prop.offer_resistance, UCHAR); + E_CONFIG_VAL(D, T, prop.opacity, UCHAR); _e_config_color_class_edd = E_CONFIG_DD_NEW(E_Color_Class, E_Color_Class); #undef T --
[EGIT] [core/efl] master 02/03: Fix documentation for efreet_desktop_environment_get().
kuri pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=defc1d1b1a1272d4562dd6a62cbb7b105af3e126 commit defc1d1b1a1272d4562dd6a62cbb7b105af3e126 Author: Guillaume Friloux k...@efl.so Date: Wed Jan 1 21:28:37 2014 +0100 Fix documentation for efreet_desktop_environment_get(). --- src/lib/efreet/efreet_desktop.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/efreet/efreet_desktop.h b/src/lib/efreet/efreet_desktop.h index fbcce45..1c69e5d 100644 --- a/src/lib/efreet/efreet_desktop.h +++ b/src/lib/efreet/efreet_desktop.h @@ -218,7 +218,8 @@ EAPI void efreet_desktop_environment_set(const char *environment); /** * @return environment the environment name - * @brief sets the global desktop environment name + * @brief gets the global desktop environment name + * (e.g. Enlightenment or Gnome) */ EAPI const char *efreet_desktop_environment_get(void); --
[EGIT] [core/efl] master 01/03: Simplify code of efreet_desktop_environment_set().
kuri pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=42c32b48a6c0170b0f125a1c73242064b670bd2e
commit 42c32b48a6c0170b0f125a1c73242064b670bd2e
Author: Guillaume Friloux k...@efl.so
Date: Wed Jan 1 21:27:19 2014 +0100
Simplify code of efreet_desktop_environment_set().
---
src/lib/efreet/efreet_desktop.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index dab5e56..25e59df 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -386,9 +386,7 @@ efreet_desktop_free(Efreet_Desktop *desktop)
EAPI void
efreet_desktop_environment_set(const char *environment)
{
-if (desktop_environment) eina_stringshare_del(desktop_environment);
-if (environment) desktop_environment = eina_stringshare_add(environment);
-else desktop_environment = NULL;
+ eina_stringshare_replace(desktop_environment, environment);
}
EAPI const char *
--
[EGIT] [enlightenment/modules/forecasts] master 02/02: gitignore update
discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=1fa721b474ea6e8b9d2b2a1f2b72868600afc848 commit 1fa721b474ea6e8b9d2b2a1f2b72868600afc848 Author: discomfitor michael.blumenkra...@gmail.com Date: Wed Jan 1 16:18:19 2014 -0500 gitignore update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f4e3a6..a91aea0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ Makefile Makefile.in aclocal.m4 autom4te.cache/ +compile config.guess config.h config.h.in --
[EGIT] [enlightenment/modules/forecasts] master 01/02: fix image object leak on shutdown
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=e78afd68698aadf5fd46ddc7bf66a5525c1cb017
commit e78afd68698aadf5fd46ddc7bf66a5525c1cb017
Author: discomfitor michael.blumenkra...@gmail.com
Date: Wed Jan 1 16:16:24 2014 -0500
fix image object leak on shutdown
---
src/e_mod_main.c | 12
1 file changed, 12 insertions(+)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 6a39a23..dd27405 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -514,6 +514,18 @@ _forecasts_new(Evas *evas)
static void
_forecasts_free(Forecasts *w)
{
+ char name[60];
+ int i;
+
+ for (i = 0; i FORECASTS; i++)
+ {
+Evas_Object *swallow;
+
+snprintf(name, sizeof(name), e.swallow.day%d.icon, i);
+swallow = edje_object_part_swallow_get(w-forecasts_obj, name);
+if (swallow)
+ evas_object_del(swallow);
+ }
evas_object_del(w-forecasts_obj);
evas_object_del(w-icon_obj);
free(w);
--
Re: [E-devel] [EGIT] [core/elementary] master 01/01: widget, spinner: typo in elm_widget_focus_set()
Hello,
On Tue, Dec 31, 2013 at 7:11 PM, Tom Hacohen tom.haco...@samsung.comwrote:
Hey,
Really bad commit + commit message. You message implies you fixed a typo
in focus_set, however you:
1. Changed 1 - EINA_TRUE.
2. Changed int - Eina_Bool.
3. Changed variable name all around (which is what I assume you meant as
the typo, but is not really a typo).
Please avoid those in the future.
(trying to not be aggressive here)
I agree with Tom's idea. I thought the same with Tom when I saw the commit
message actually.
The same principles holds with other people.
Thanks.
Daniel Juyung Seo (SeoZ)
--
Tom.
On 31/12/13 09:18, Yakov Goldberg wrote:
yakov pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d585e41a818562ce37def341869889c81f10abd7
commit d585e41a818562ce37def341869889c81f10abd7
Author: Yakov Goldberg yako...@samsung.com
Date: Tue Dec 31 11:14:41 2013 +0200
widget, spinner: typo in elm_widget_focus_set()
---
src/lib/elm_spinner.c | 2 +-
src/lib/elm_widget.c | 14 +++---
src/lib/elm_widget.h | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index e5d2f18..42a1d96 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -278,7 +278,7 @@ _entry_toggle_cb(void *data,
elm_layout_signal_emit(data, elm,state,active, elm);
_entry_show(sd);
elm_entry_select_all(sd-ent);
-elm_widget_focus_set(sd-ent, 1);
+elm_widget_focus_set(sd-ent, EINA_TRUE);
sd-entry_visible = EINA_TRUE;
}
}
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index eae2b68..eb62a93 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -3138,16 +3138,16 @@ _elm_widget_signal_callback_del(Eo *obj, void
*_pd EINA_UNUSED, va_list *list)
EAPI void
elm_widget_focus_set(Evas_Object *obj,
- int first)
+ Eina_Bool focus)
{
ELM_WIDGET_CHECK(obj);
- eo_do(obj, elm_wdg_focus_set(first));
+ eo_do(obj, elm_wdg_focus_set(focus));
}
static void
_elm_widget_focus_set(Eo *obj, void *_pd, va_list *list)
{
- int first = va_arg(*list, int);
+ Eina_Bool focus = va_arg(*list, int);
Elm_Widget_Smart_Data *sd = _pd;
@@ -3159,12 +3159,12 @@ _elm_widget_focus_set(Eo *obj, void *_pd,
va_list *list)
eo_do(obj, elm_wdg_on_focus(NULL));
}
- if (first)
+ if (focus)
{
if ((_is_focusable(sd-resize_obj))
(!elm_widget_disabled_get(sd-resize_obj)))
{
- elm_widget_focus_set(sd-resize_obj, first);
+ elm_widget_focus_set(sd-resize_obj, focus);
}
else
{
@@ -3176,7 +3176,7 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list
*list)
if ((_is_focusable(child))
(!elm_widget_disabled_get(child)))
{
- elm_widget_focus_set(child, first);
+ elm_widget_focus_set(child, focus);
break;
}
}
@@ -3192,7 +3192,7 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list
*list)
if ((_is_focusable(child))
(!elm_widget_disabled_get(child)))
{
- elm_widget_focus_set(child, first);
+ elm_widget_focus_set(child, focus);
break;
}
}
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 7a92220..f9484c3 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -645,7 +645,7 @@ EAPI Eina_Bool
elm_widget_focus_list_next_get(const Evas_Object *obj, con
EAPI Evas_Object *elm_widget_focus_next_object_get(const
Evas_Object *obj, Elm_Focus_Direction dir);
EAPI void elm_widget_focus_next_object_set(Evas_Object
*obj, Evas_Object *next, Elm_Focus_Direction dir);
EAPI void elm_widget_parent_highlight_set(Evas_Object
*obj, Eina_Bool highlighted);
-EAPI void elm_widget_focus_set(Evas_Object *obj, int first);
+EAPI void elm_widget_focus_set(Evas_Object *obj, Eina_Bool
focus);
EAPI void elm_widget_focused_object_clear(Evas_Object
*obj);
EAPI Evas_Object *elm_widget_parent_get(const Evas_Object *obj);
EAPI Evas_Object *elm_widget_parent2_get(const Evas_Object *obj);
@@ -1768,10 +1768,10 @@ typedef void * (*list_data_get_func_type)(const
Eina_List * l);
*
* No description supplied by the EAPI.
*
- * @param[in] first
+ * @param[in] focus
*
*/
-#define elm_wdg_focus_set(first)
ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_SET), EO_TYPECHECK(int, first)
+#define
Re: [E-devel] Reminder for closing of the first 1.9 merge window
So the first 2 weeks stablization period has already started. Every one should read this : https://phab.enlightenment.org/w/efl_and_elementary_1_9/ Fix bugs fix bugs! Report bugs report bugs! If anyone reports a bug about elementary please add me as CC or assign the issue to me. Thanks. Daniel Juyung Seo (SeoZ) On Sat, Dec 28, 2013 at 1:04 AM, Stefan Schmidt ste...@datenfreihafen.orgwrote: Hello. According to our revised release schedule for 1.9 I would like to remind you all that the first merge window will close in a few days at the 30th. Make sure you bring in your stuff before so you can concentrate on bug fixing from 30th to 13th. You next chance to merge in some shiny feature is the second and last window. regards Stefan Schmidt -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: [elm_widget] Fix not to load theme for mirroring if smart data is not set
On Tue, Dec 31, 2013 at 9:41 PM, Tom Hacohen tom.haco...@samsung.comwrote: On 31/12/13 11:33, Jaehyun Cho wrote: - elm_widget_mirrored_set(obj, elm_config_mirrored_get()); + priv-is_mirrored = elm_config_mirrored_get(); This looks very wrong and bad practice. What happens if I'll change elm_widget_mirrored_set()? Things will break... Unless you have a really good reason for doing that (which you don't, there's no good reason). I suggest this patch will be amended. Agreed. This is easy to be broken. How about adding a parameter to elm_widget_mirrored_set() not to apply the theme? Thanks. Daniel Juyung Seo (SeoZ) -- Tom. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] elementary-1.8 01/01: [Genlist]: Added NULL check
seoz pushed a commit to branch elementary-1.8.
http://git.enlightenment.org/core/elementary.git/commit/?id=815e7db3a53d674d6712fd84f1b674c406592f53
commit 815e7db3a53d674d6712fd84f1b674c406592f53
Author: Chinmaya Panigrahi chinmaya...@gmail.com
Date: Wed Jan 1 14:11:50 2014 +0900
[Genlist]: Added NULL check
Summary: Added NULL check
Test Plan: elementary_test -to genlist
Reviewers: seoz, singh.amitesh, raster
Reviewed By: raster
Differential Revision: https://phab.enlightenment.org/D432
---
src/lib/elm_genlist.c | 66 +--
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index c432419..3d7214b 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2683,14 +2683,14 @@ static void
_elm_genlist_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd
EINA_UNUSED, va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
- *ret = _elm_genlist_smart_focus_next_enable;
+ if (ret) *ret = _elm_genlist_smart_focus_next_enable;
}
static void
_elm_genlist_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd
EINA_UNUSED, va_list *list)
{
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
- *ret = EINA_FALSE;
+ if (ret) *ret = EINA_FALSE;
}
static void
@@ -5414,7 +5414,7 @@ _items_count(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
unsigned int *ret = va_arg(*list, unsigned int *);
Elm_Genlist_Smart_Data *sd = _pd;
- *ret = sd-item_count;
+ if (ret) *ret = sd-item_count;
}
EAPI Elm_Object_Item *
@@ -5445,7 +5445,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
const void *func_data = va_arg(*list, const void *);
Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
Elm_Genlist_Smart_Data *sd = _pd;
- *ret = NULL;
+ if (ret) *ret = NULL;
it = _elm_genlist_item_new
(sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data);
@@ -5475,7 +5475,7 @@ _item_append(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
it-item-before = EINA_FALSE;
_item_queue(sd, it, NULL);
- *ret = (Elm_Object_Item *)it;
+ if (ret) *ret = (Elm_Object_Item *)it;
}
EAPI Elm_Object_Item *
@@ -5506,7 +5506,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
const void *func_data = va_arg(*list, const void *);
Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
Elm_Genlist_Smart_Data *sd = _pd;
- *ret = NULL;
+ if (ret) *ret = NULL;
it = _elm_genlist_item_new
(sd, itc, data, (Elm_Gen_Item *)parent, type, func, func_data);
@@ -5536,7 +5536,7 @@ _item_prepend(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
it-item-before = EINA_TRUE;
_item_queue(sd, it, NULL);
- *ret = (Elm_Object_Item *)it;
+ if (ret) *ret = (Elm_Object_Item *)it;
}
EAPI Elm_Object_Item *
@@ -5570,7 +5570,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
Elm_Gen_Item *after = (Elm_Gen_Item *)after_it;
Elm_Gen_Item *it;
- *ret = NULL;
+ if (ret) *ret = NULL;
ELM_GENLIST_ITEM_CHECK(after_it);
Elm_Genlist_Smart_Data *sd = _pd;
@@ -5602,7 +5602,7 @@ _item_insert_after(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
it-item-before = EINA_FALSE;
_item_queue(sd, it, NULL);
- *ret = (Elm_Object_Item *)it;
+ if (ret) *ret = (Elm_Object_Item *)it;
}
EAPI Elm_Object_Item *
@@ -5635,7 +5635,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
Elm_Gen_Item *before = (Elm_Gen_Item *)before_it;
Elm_Gen_Item *it;
- *ret = NULL;
+ if (ret) *ret = NULL;
ELM_GENLIST_ITEM_CHECK(before_it);
Elm_Genlist_Smart_Data *sd = _pd;
@@ -5666,7 +5666,7 @@ _item_insert_before(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
it-item-before = EINA_TRUE;
_item_queue(sd, it, NULL);
- *ret = (Elm_Object_Item *)it;
+ if (ret) *ret = (Elm_Object_Item *)it;
}
EAPI Elm_Object_Item *
@@ -5699,7 +5699,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
Evas_Smart_Cb func = va_arg(*list, Evas_Smart_Cb);
const void *func_data = va_arg(*list, const void *);
Elm_Object_Item **ret = va_arg(*list, Elm_Object_Item **);
- *ret = NULL;
+ if (ret) *ret = NULL;
Elm_Genlist_Smart_Data *sd = _pd;
@@ -5776,7 +5776,7 @@ _item_sorted_insert(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
_item_queue(sd, it, _elm_genlist_item_list_compare);
- *ret = (Elm_Object_Item *)it;
+ if (ret) *ret = (Elm_Object_Item *)it;
}
EAPI void
@@ -5824,7 +5824,7 @@ _multi_select_get(Eo *obj EINA_UNUSED, void *_pd, va_list
*list)
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Elm_Genlist_Smart_Data *sd = _pd;
- *ret = sd-multi;
+ if (ret) *ret = sd-multi;
}
EAPI void
@@ -5863,7 +5863,7 @@ _multi_select_mode_get(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
Elm_Object_Multi_Select_Mode *ret
[EGIT] [core/elementary] master 01/04: elm_widget: Partial update for widget smart data comments.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2c53db903757a1a9602e07bb009bfa3448cdf961 commit 2c53db903757a1a9602e07bb009bfa3448cdf961 Author: Daniel Juyung Seo seojuyu...@gmail.com Date: Thu Jan 2 08:49:26 2014 +0900 elm_widget: Partial update for widget smart data comments. --- src/lib/elm_widget.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index f9484c3..28d1077 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -434,8 +434,8 @@ typedef struct _Elm_Widget_Smart_Data Eina_Bool can_access : 1; Eina_Bool highlighted : 1; Eina_Bool highlight_root : 1; - Eina_Bool on_translate : 1; - Eina_Bool on_create : 1; + Eina_Bool on_translate : 1; /* This is true when any types of elm translate function is being called. */ + Eina_Bool on_create : 1; /* This is true when the widget is on creation(general widget constructor). */ } Elm_Widget_Smart_Data; /** --
[EGIT] [core/elementary] master 02/04: test_photocam: Unfuck photocam test case by removing absolute image path by raster.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=991c8e03556ab9963b69f0cd8281342bfca01392
commit 991c8e03556ab9963b69f0cd8281342bfca01392
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Thu Jan 2 09:17:16 2014 +0900
test_photocam: Unfuck photocam test case by removing absolute image path by
raster.
Please maintain this manually or push those images to somewhere reachable
by others.
---
src/bin/test_photocam.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c
index 04e9308..40fe8de 100644
--- a/src/bin/test_photocam.c
+++ b/src/bin/test_photocam.c
@@ -240,15 +240,6 @@ void
test_photocam(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *ph, *tb2, *bt, *box;
- // these were just testing - use the select photo browser to select one
- const char *img[5] =
- {
-/home/raster/t1.jpg, // 5 mpixel
-/home/raster/t2.jpg, // 18 mpixel
-/home/raster/t3.jpg, // 39 mpixel
-/home/raster/t4.jpg, // 192 mpixel
-/home/raster/t5.jpg // 466 mpixel
- };
win = elm_win_util_standard_add(photocam, PhotoCam);
elm_win_autodel_set(win, EINA_TRUE);
@@ -285,8 +276,6 @@ test_photocam(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
evas_object_smart_callback_add(ph, scroll,drag,stop, my_ph_drag_stop,
win);
evas_object_smart_callback_add(ph, scroll, my_ph_scroll, win);
- elm_photocam_file_set(ph, img[1]);
-
evas_object_show(ph);
tb2 = elm_table_add(win);
--
[EGIT] [core/elementary] master 03/04: image: Remove unnecessary parameter for elm_obj_image_editable_set.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e3107621027c0dc32aed58c884c95cd389632585
commit e3107621027c0dc32aed58c884c95cd389632585
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Thu Jan 2 09:11:25 2014 +0900
image: Remove unnecessary parameter for elm_obj_image_editable_set.
This parameter was introduced as an internal funciton parameter long ago
and migrated to eo as it was.
But this parameter is not needed. obj pointer is already there.
Thanks to Yakov for the report.
---
src/lib/elm_image.c| 7 +++
src/lib/elm_image_eo.h | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 981b834..79d1b71 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1461,7 +1461,7 @@ elm_image_editable_set(Evas_Object *obj,
Eina_Bool set)
{
ELM_IMAGE_CHECK(obj);
- eo_do(obj, elm_obj_image_editable_set(set, obj));
+ eo_do(obj, elm_obj_image_editable_set(set));
}
/**
@@ -1473,7 +1473,6 @@ _elm_image_smart_editable_set(Eo *obj, void *_pd, va_list
*list)
{
Elm_Image_Smart_Data *sd = _pd;
Eina_Bool edit = va_arg(*list, int);
- Evas_Object *parent = va_arg(*list, Evas_Object *);
if (sd-edje)
{
@@ -1493,14 +1492,14 @@ _elm_image_smart_editable_set(Eo *obj, void *_pd,
va_list *list)
NULL, NULL,
NULL, NULL,
NULL, NULL,
- _elm_image_drag_n_drop_cb, parent);
+ _elm_image_drag_n_drop_cb, obj);
else
elm_drop_target_del
(obj, ELM_SEL_FORMAT_IMAGE,
NULL, NULL,
NULL, NULL,
NULL, NULL,
- _elm_image_drag_n_drop_cb, parent);
+ _elm_image_drag_n_drop_cb, obj);
}
EAPI Eina_Bool
diff --git a/src/lib/elm_image_eo.h b/src/lib/elm_image_eo.h
index f65812f..4a5358a 100644
--- a/src/lib/elm_image_eo.h
+++ b/src/lib/elm_image_eo.h
@@ -289,11 +289,10 @@ enum
* Make the image 'editable'.
*
* @param[in] set
- * @param[in] parent
*
* @see elm_image_editable_set
*/
-#define elm_obj_image_editable_set(set, parent)
ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_EDITABLE_SET), EO_TYPECHECK(Eina_Bool,
set), EO_TYPECHECK(Evas_Object *, parent)
+#define elm_obj_image_editable_set(set)
ELM_OBJ_IMAGE_ID(ELM_OBJ_IMAGE_SUB_ID_EDITABLE_SET), EO_TYPECHECK(Eina_Bool,
set)
/**
* @def elm_obj_image_editable_get
--
[EGIT] [core/elementary] master 04/04: layout: Moved internal smart data member to a correct place.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1a9504780ed944b2bbf382f0de8e4ac08eea09d5
commit 1a9504780ed944b2bbf382f0de8e4ac08eea09d5
Author: Daniel Juyung Seo seojuyu...@gmail.com
Date: Thu Jan 2 09:23:03 2014 +0900
layout: Moved internal smart data member to a correct place.
can_access is used only by layout.
---
src/lib/elm_layout.c| 15 +++
src/lib/elm_widget.h| 1 -
src/lib/elm_widget_layout.h | 1 +
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 9a83f50..56b78b9 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1266,7 +1266,7 @@ _elm_layout_smart_text_set(Eo *obj, void *_pd, va_list
*list)
eo_do(obj, elm_obj_layout_sizing_eval());
if (_elm_config-access_mode == ELM_ACCESS_MODE_ON
- wd-can_access !(sub_d-obj))
+ sd-can_access !(sub_d-obj))
sub_d-obj = _elm_access_edje_object_part_object_register
(obj, elm_layout_edje_get(obj), part);
@@ -2168,15 +2168,14 @@ elm_layout_edje_object_can_access_set(Evas_Object *obj,
}
static void
-_elm_layout_smart_edje_object_can_access_set(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
+_elm_layout_smart_edje_object_can_access_set(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
{
+ Elm_Layout_Smart_Data *sd = _pd;
Eina_Bool can_access = va_arg(*list, int);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
- ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
-
- wd-can_access = !!can_access;
+ sd-can_access = !!can_access;
if (ret) *ret = EINA_TRUE;
}
@@ -2190,12 +2189,12 @@ elm_layout_edje_object_can_access_get(Evas_Object *obj)
}
static void
-_elm_layout_smart_edje_object_can_access_get(Eo *obj, void *_pd EINA_UNUSED,
va_list *list)
+_elm_layout_smart_edje_object_can_access_get(Eo *obj EINA_UNUSED, void *_pd,
va_list *list)
{
+ Elm_Layout_Smart_Data *sd = _pd;
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
- ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
- *ret = wd-can_access;
+ *ret = sd-can_access;
}
static void
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 28d1077..f7170f6 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -431,7 +431,6 @@ typedef struct _Elm_Widget_Smart_Data
* TRUE by
* default */
Eina_Bool still_in : 1;
- Eina_Bool can_access : 1;
Eina_Bool highlighted : 1;
Eina_Bool highlight_root : 1;
Eina_Bool on_translate : 1; /* This is true when any
types of elm translate function is being called. */
diff --git a/src/lib/elm_widget_layout.h b/src/lib/elm_widget_layout.h
index 40b0933..b9c8cf7 100644
--- a/src/lib/elm_widget_layout.h
+++ b/src/lib/elm_widget_layout.h
@@ -86,6 +86,7 @@ typedef struct _Elm_Layout_Smart_Data
Eina_Bool needs_size_calc : 1;
Eina_Bool restricted_calc_w : 1;
Eina_Bool restricted_calc_h : 1;
+ Eina_Bool can_access : 1; /** This is true when all
text(including textblock) parts can be accessible by accessibility. */
} Elm_Layout_Smart_Data;
/**
--
[EGIT] [core/efl] master 01/01: fix map-across-mark patch from sergey in december 2013
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0c1d42bb689fe7e606058b8c4c2109931387f90b
commit 0c1d42bb689fe7e606058b8c4c2109931387f90b
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Jan 2 09:26:34 2014 +0900
fix map-across-mark patch from sergey in december 2013
stable release - cherry-pick me!
of course! eina_hash_direct_add() for the object pointer is using the
poitner to the stack value, not the value itself it points to... this
was bad and just by luck out value was on the stack that grows but
never shrinks and thus never crashes, BUT... it will just break in all
sorts of fun ways. basically it makes the hash useless as the keys in
it are effectively all the SAME value as they point to the same
storage.. but it changes whenever that stack mem gets changed.
---
src/lib/evas/canvas/evas_clip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 20585be..8f74dd6 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -84,7 +84,7 @@ evas_object_child_map_across_mark(Evas_Object *eo_obj,
Evas_Object_Protected_Dat
clear_visited = EINA_TRUE;
}
if (eina_hash_find(visited, eo_obj) == (void *)1) goto end;
- else eina_hash_direct_add(visited, eo_obj, (void *)1);
+ else eina_hash_add(visited, eo_obj, (void *)1);
if ((obj-map-cur.map_parent != map_obj) || force)
{
--
[EGIT] [core/efl] efl-1.8 01/01: fix map-across-mark patch from sergey in december 2013
raster pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=e9eb224a39c767c9922278df55a0948e4b7371a7
commit e9eb224a39c767c9922278df55a0948e4b7371a7
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Jan 2 09:26:34 2014 +0900
fix map-across-mark patch from sergey in december 2013
stable release - cherry-pick me!
of course! eina_hash_direct_add() for the object pointer is using the
poitner to the stack value, not the value itself it points to... this
was bad and just by luck out value was on the stack that grows but
never shrinks and thus never crashes, BUT... it will just break in all
sorts of fun ways. basically it makes the hash useless as the keys in
it are effectively all the SAME value as they point to the same
storage.. but it changes whenever that stack mem gets changed.
Conflicts:
src/lib/evas/canvas/evas_clip.c
---
src/lib/evas/canvas/evas_clip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index a3f7480..d3788a9 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -84,7 +84,7 @@ evas_object_child_map_across_mark(Evas_Object *eo_obj,
Evas_Object_Protected_Dat
clear_visited = EINA_TRUE;
}
if (eina_hash_find(visited, eo_obj) == (void *)1) return;
- else eina_hash_direct_add(visited, eo_obj, (void *)1);
+ else eina_hash_add(visited, eo_obj, (void *)1);
if ((obj-map-cur.map_parent != map_obj) || force)
{
--
[E-devel] New year E Korean diner
Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... See you, -- Cedric BAIL -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] New year E Korean diner
On 01/02/14 10:56, Cedric BAIL wrote: Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... Back from Okinawa, good for me Saturday :-) -- Jérôme Pinot http://ngc891.blogdns.net/ signature.asc Description: Digital signature -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] New year E Korean diner
On Thu, Jan 2, 2014 at 11:08 AM, Jérôme Pinot ngc...@gmail.com wrote: On 01/02/14 10:56, Cedric BAIL wrote: Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... Back from Okinawa, good for me Saturday :-) Oops I am not available on those 3 days. Enjoy the party! How about having a hackathon next time? :) Daniel Juyung Seo (SeoZ) -- Jérôme Pinot http://ngc891.blogdns.net/ -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] ePeriodique 0.5
Hi, I updated ePeriodique, the EFL periodic table, to be compatible with the new elementary 1.8 theme. Website (with screenshots): http://eperiodique.sourceforge.net/ Direct download: http://sourceforge.net/projects/eperiodique/files/0.5/eperiodique-0.5.tar.bz2/download Blog note about the migration 1.7-1.8 : http://ngc891.blogdns.net/?p=350 -- Jérôme Pinot http://ngc891.blogdns.net/ -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas/common - more elaborated compuatation in interpolation.
read the code please. divide is already there.
-Regards, Hermet-
-Original Message-
From: Iván Brianosachi...@gmail.com
To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net;
Cc: g...@lists.enlightenment.org;
Sent: 2014-01-01 (수) 00:33:42
Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: evas/common - more
elaborated compuatation in interpolation.
On Tue, Dec 31, 2013 at 6:19 AM, ChunEon Park hermet@hermet.pe.kr wrote:
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0d33d30accdafc5b057de0d01a7ccd5f78f35e73
commit 0d33d30accdafc5b057de0d01a7ccd5f78f35e73
Author: ChunEon Park hermet@hermet.pe.kr
Date: Tue Dec 31 18:19:41 2013 +0900
evas/common - more elaborated compuatation in interpolation.
we should not +1 in divide but only do it when the quotient is zero.
Then why divide?
---
src/lib/evas/common/evas_map_image.c 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/common/evas_map_image.c
b/src/lib/evas/common/evas_map_image.c
index c3f3e37..793abf3 100644
--- a/src/lib/evas/common/evas_map_image.c
+++ b/src/lib/evas/common/evas_map_image.c
@@ -38,9 +38,10 @@ _interp(int x1, int x2, int p, FPc u1, FPc u2)
FPc u;
x2 -= x1;
+ if (x2 == 0) x2 = 1;
p -= x1;
u = u2 - u1;
- u = (u * p) / (x2 + 1);
+ u = ((u * p) / x2);
// FIXME: do z persp
return u1 + u;
}
@@ -49,8 +50,9 @@ static inline DATA32
_interp_col(int x1, int x2, int p, DATA32 col1, DATA32 col2)
{
x2 -= x1;
+ if (x2 == 0) x2 = 1;
p -= x1;
- p = (p 8) / (x2 + 1);
+ p = ((p 8) / x2);
// FIXME: do z persp
return INTERP_256(p, col2, col1);
}
--
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas/common - more elaborated compuatation in interpolation.
mathmatical problem. previous fomula is incorrect if i'm correct. -Regards, Hermet- -Original Message- From: Tom Hacohentom.haco...@samsung.com To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: Sent: 2014-01-01 (수) 00:38:16 Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: evas/common - more elaborated compuatation in interpolation. On 31/12/13 15:33, Iván Briano wrote: On Tue, Dec 31, 2013 at 6:19 AM, ChunEon Park hermet@hermet.pe.kr wrote: hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0d33d30accdafc5b057de0d01a7ccd5f78f35e73 commit 0d33d30accdafc5b057de0d01a7ccd5f78f35e73 Author: ChunEon Park hermet@hermet.pe.kr Date: Tue Dec 31 18:19:41 2013 +0900 evas/common - more elaborated compuatation in interpolation. we should not +1 in divide but only do it when the quotient is zero. Then why divide? Also, your commit message describes what you did, not why you did it. -- Tom. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] New year E Korean diner
i can join on THIS weekend. -Regards, Hermet- -Original Message- From: Daniel Juyung Seoseojuyu...@gmail.com To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: Sent: 2014-01-02 (목) 11:35:34 Subject: Re: [E-devel] New year E Korean diner On Thu, Jan 2, 2014 at 11:08 AM, Jérôme Pinot ngc891@gmail.com wrote: On 01/02/14 10:56, Cedric BAIL wrote: Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... Back from Okinawa, good for me Saturday :-) Oops I am not available on those 3 days. Enjoy the party! How about having a hackathon next time? :) Daniel Juyung Seo (SeoZ) -- Jérôme Pinot http://ngc891.blogdns.net/ -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] efl-1.8 01/01: ibusimmodule: support CAPS LOCK and NUM LOCK
jihoon pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=c5a18f87e9684b749542cf4bb432dc71044065ca
commit c5a18f87e9684b749542cf4bb432dc71044065ca
Author: Jihoon Kim jihoon48@samsung.com
Date: Tue Dec 31 18:07:36 2013 +0900
ibusimmodule: support CAPS LOCK and NUM LOCK
When ibus immodule was used, caps lock and num lock had been not working.
---
src/modules/ecore_imf/ibus/ibus_imcontext.c | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c
b/src/modules/ecore_imf/ibus/ibus_imcontext.c
index 0f8dcbb..009c8d6 100644
--- a/src/modules/ecore_imf/ibus/ibus_imcontext.c
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c
@@ -117,6 +117,22 @@ _ecore_imf_modifier_to_ibus_modifier(unsigned int modifier)
return state;
}
+static unsigned int
+_ecore_imf_locks_to_ibus_modifier(unsigned int locks)
+{
+ unsigned int state = 0;
+
+ /** Num lock is pressed */
+ if (locks ECORE_IMF_KEYBOARD_LOCK_NUM)
+ state |= IBUS_MOD2_MASK;
+
+ /** Caps lock is pressed */
+ if (locks ECORE_IMF_KEYBOARD_LOCK_CAPS)
+ state |= IBUS_LOCK_MASK;
+
+ return state;
+}
+
static void
_ecore_imf_ibus_key_event_put(int keysym, int state)
{
@@ -288,7 +304,8 @@ ecore_imf_context_ibus_filter_event(Ecore_IMF_Context *ctx,
Ecore_IMF_Event_Type
keycode = ecore_x_keysym_keycode_get(ev-key);
keysym = XStringToKeysym(ev-key);
- state = _ecore_imf_modifier_to_ibus_modifier(ev-modifiers) |
IBUS_RELEASE_MASK;
+ state = _ecore_imf_modifier_to_ibus_modifier(ev-modifiers) |
+ _ecore_imf_locks_to_ibus_modifier(ev-locks) |
IBUS_RELEASE_MASK;
if (_sync_mode_use)
{
@@ -318,7 +335,9 @@ ecore_imf_context_ibus_filter_event(Ecore_IMF_Context *ctx,
Ecore_IMF_Event_Type
keycode = ecore_x_keysym_keycode_get(ev-key);
keysym = XStringToKeysym(ev-key);
- state = _ecore_imf_modifier_to_ibus_modifier(ev-modifiers);
+ state = _ecore_imf_modifier_to_ibus_modifier(ev-modifiers) |
+ _ecore_imf_locks_to_ibus_modifier(ev-locks);
+
if (_sync_mode_use)
{
retval =
ibus_input_context_process_key_event(ibusimcontext-ibuscontext,
--
[EGIT] [core/efl] efl-1.8 01/01: ximmodule: fix issue the cursor of preedit shows the in front of preedit string
jihoon pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=3d39c1649907a2c8ab2e0ea02e5724a145549964
commit 3d39c1649907a2c8ab2e0ea02e5724a145549964
Author: Jihoon Kim jihoon48@samsung.com
Date: Thu Dec 5 16:06:39 2013 +0900
ximmodule: fix issue the cursor of preedit shows the in front of preedit
string
Before fixing this issue, the cursor of preedit appears the in front of
preedit string.
The cursor of preedit string will appear in the proper position.
---
src/modules/ecore_imf/xim/ecore_imf_xim.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c
b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index 7243b42..a6d22ff 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -962,6 +962,8 @@ _ecore_imf_xim_preedit_draw_call(XIC xic EINA_UNUSED,
DBG(ctx=%p, imf_context_data=%p, ctx, imf_context_data);
EINA_SAFETY_ON_NULL_RETURN(imf_context_data);
+ imf_context_data-preedit_cursor = call_data-caret;
+
preedit_bufs = eina_ustrbuf_new();
if (imf_context_data-preedit_chars)
{
--
Re: [E-devel] New year E Korean diner
On Thu, Jan 2, 2014 at 1:18 PM, ChunEon Park her...@naver.com wrote: i can join on THIS weekend. :-P -Regards, Hermet- -Original Message- From: Daniel Juyung Seoseojuyu...@gmail.com To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: Sent: 2014-01-02 (목) 11:35:34 Subject: Re: [E-devel] New year E Korean diner On Thu, Jan 2, 2014 at 11:08 AM, Jérôme Pinot ngc891@gmail.com wrote: On 01/02/14 10:56, Cedric BAIL wrote: Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... Back from Okinawa, good for me Saturday :-) Oops I am not available on those 3 days. Enjoy the party! How about having a hackathon next time? :) Daniel Juyung Seo (SeoZ) -- Jérôme Pinot http://ngc891.blogdns.net/ -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Cedric BAIL -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: scimimmodule: code refinement related to key modifier and lock
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a37bf01a531318840b66f31f3f5deb904815ce12
commit a37bf01a531318840b66f31f3f5deb904815ce12
Author: Jihoon Kim jihoon48@samsung.com
Date: Thu Jan 2 15:00:51 2014 +0900
scimimmodule: code refinement related to key modifier and lock
---
src/modules/ecore_imf/scim/scim_imcontext.cpp | 54 +--
1 file changed, 42 insertions(+), 12 deletions(-)
diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp
b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 0bd4433..9b61d57 100644
--- a/src/modules/ecore_imf/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
@@ -403,6 +403,44 @@ window_to_screen_geometry_get(Ecore_X_Window client_win,
int *x, int *y)
*y = sum_y;
}
+static unsigned int
+_ecore_imf_modifier_to_scim_mask(unsigned int modifiers)
+{
+ unsigned int mask = 0;
+
+ /** Control is pressed */
+ if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_CTRL)
+ mask |= SCIM_KEY_ControlMask;
+
+ /** Alt is pressed */
+ if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALT)
+ mask |= SCIM_KEY_AltMask;
+
+ /** Shift is pressed */
+ if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_SHIFT)
+ mask |= SCIM_KEY_ShiftMask;
+
+ /** AltGr is pressed */
+ if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALTGR)
+ mask |= SCIM_KEY_Mod5Mask;
+
+ return mask;
+}
+
+static unsigned int
+_ecore_imf_lock_to_scim_mask(unsigned int locks)
+{
+ unsigned int mask = 0;
+
+ if (locks ECORE_IMF_KEYBOARD_LOCK_CAPS)
+ mask |= SCIM_KEY_CapsLockMask;
+
+ if (locks ECORE_IMF_KEYBOARD_LOCK_NUM)
+ mask |= SCIM_KEY_NumLockMask;
+
+ return mask;
+}
+
/* Public functions */
/**
* isf_imf_context_new
@@ -1253,24 +1291,16 @@ isf_imf_context_filter_event(Ecore_IMF_Context *ctx,
Ecore_IMF_Event_Type type,
{
Ecore_IMF_Event_Key_Down *ev = (Ecore_IMF_Event_Key_Down *)event;
scim_string_to_key(key, ev-key);
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) key.mask
|=SCIM_KEY_ShiftMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_CTRL) key.mask
|=SCIM_KEY_ControlMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALT) key.mask
|=SCIM_KEY_AltMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALTGR) key.mask
|=SCIM_KEY_Mod5Mask;
-if (ev-locks ECORE_IMF_KEYBOARD_LOCK_CAPS) key.mask
|=SCIM_KEY_CapsLockMask;
-if (ev-locks ECORE_IMF_KEYBOARD_LOCK_NUM) key.mask
|=SCIM_KEY_NumLockMask;
+key.mask |= _ecore_imf_modifier_to_scim_mask(ev-modifiers);
+key.mask |= _ecore_imf_lock_to_scim_mask(ev-locks);
}
else if (type == ECORE_IMF_EVENT_KEY_UP)
{
Ecore_IMF_Event_Key_Up *ev = (Ecore_IMF_Event_Key_Up *)event;
scim_string_to_key(key, ev-key);
key.mask = SCIM_KEY_ReleaseMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) key.mask
|=SCIM_KEY_ShiftMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_CTRL) key.mask
|=SCIM_KEY_ControlMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALT) key.mask
|=SCIM_KEY_AltMask;
-if (ev-modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALTGR) key.mask
|=SCIM_KEY_Mod5Mask;
-if (ev-locks ECORE_IMF_KEYBOARD_LOCK_CAPS) key.mask
|=SCIM_KEY_CapsLockMask;
-if (ev-locks ECORE_IMF_KEYBOARD_LOCK_NUM) key.mask
|=SCIM_KEY_NumLockMask;
+key.mask |= _ecore_imf_modifier_to_scim_mask(ev-modifiers);
+key.mask |= _ecore_imf_lock_to_scim_mask(ev-locks);
}
else
{
--
[EGIT] [core/efl] master 01/01: scimimmodule: support super key (between ctrl and alt key)
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d6d8a910fe08c894877d2180e4b56e1e0746d06a commit d6d8a910fe08c894877d2180e4b56e1e0746d06a Author: Jihoon Kim jihoon48@samsung.com Date: Thu Jan 2 15:08:01 2014 +0900 scimimmodule: support super key (between ctrl and alt key) --- src/modules/ecore_imf/scim/scim_imcontext.cpp | 4 1 file changed, 4 insertions(+) diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp index 9b61d57..88ca99a 100644 --- a/src/modules/ecore_imf/scim/scim_imcontext.cpp +++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp @@ -420,6 +420,10 @@ _ecore_imf_modifier_to_scim_mask(unsigned int modifiers) if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_SHIFT) mask |= SCIM_KEY_ShiftMask; + /** Win (between Ctrl and Alt) is pressed */ + if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_WIN) + mask |= SCIM_KEY_SuperMask; + /** AltGr is pressed */ if (modifiers ECORE_IMF_KEYBOARD_MODIFIER_ALTGR) mask |= SCIM_KEY_Mod5Mask; --
[EGIT] [apps/terminology] master 01/01: make wallpaper (and other options) apply to current term (splits/tabs)
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=31c99d6127fbc21acd4e3644cda1ae64b97df3cf
commit 31c99d6127fbc21acd4e3644cda1ae64b97df3cf
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Jan 2 15:54:46 2014 +0900
make wallpaper (and other options) apply to current term (splits/tabs)
---
src/bin/options.c | 17 +
src/bin/options_wallpaper.c | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/bin/options.c b/src/bin/options.c
index 2829a91..f0e55f6 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -92,6 +92,20 @@ _cb_opdt_hide_done(void *data, Evas_Object *obj EINA_UNUSED,
const char *sig EIN
edje_object_signal_emit(saved_bg, optdetails,show, terminology);
}
+static void
+_cb_opdt_hide_done2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
+{
+ if (op_del_timer)
+ {
+ecore_timer_del(op_del_timer);
+op_del_timer = NULL;
+ }
+ _cb_op_del_delay(NULL);
+ edje_object_signal_callback_del(saved_bg, optdetails,hide,done,
+ terminology,
+ _cb_opdt_hide_done2);
+}
+
void
options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
void (*donecb) (void *data), void *donedata)
@@ -209,6 +223,9 @@ options_toggle(Evas_Object *win, Evas_Object *bg,
Evas_Object *term,
edje_object_signal_callback_del(bg, optdetails,hide,done,
terminology,
_cb_opdt_hide_done);
+edje_object_signal_callback_add(bg, optdetails,hide,done,
+terminology,
+_cb_opdt_hide_done2, term);
elm_object_focus_set(op_frame, EINA_FALSE);
elm_object_focus_set(op_opbox, EINA_FALSE);
elm_object_focus_set(op_toolbar, EINA_FALSE);
diff --git a/src/bin/options_wallpaper.c b/src/bin/options_wallpaper.c
index 7b9afcc..5a66fa8 100644
--- a/src/bin/options_wallpaper.c
+++ b/src/bin/options_wallpaper.c
@@ -438,7 +438,7 @@ _renew_gengrid_backgrounds(Evas_Object *term)
}
void
-options_wallpaper(Evas_Object *opbox, Evas_Object *term EINA_UNUSED)
+options_wallpaper(Evas_Object *opbox, Evas_Object *term)
{
Evas_Object *frame, *o;
--
Re: [E-devel] New year E Korean diner
On Thu, 2 Jan 2014 13:18:41 +0900 (KST) ChunEon Park her...@naver.com said: i can join on THIS weekend. good work hermet! :) -Regards, Hermet- -Original Message- From: Daniel Juyung Seoseojuyu...@gmail.com To: Enlightenment developer listenlightenment-devel@lists.sourceforge.net; Cc: Sent: 2014-01-02 (목) 11:35:34 Subject: Re: [E-devel] New year E Korean diner On Thu, Jan 2, 2014 at 11:08 AM, Jérôme Pinot ngc891@gmail.com wrote: On 01/02/14 10:56, Cedric BAIL wrote: Hello everyone and happy new year, For those who are around Seoul next weekend, I think it would be nice to schedule a little diner there. So please vote : https://phab.enlightenment.org/V6 . Place is likely to be Gangnam or Itaewon... Back from Okinawa, good for me Saturday :-) Oops I am not available on those 3 days. Enjoy the party! How about having a hackathon next time? :) Daniel Juyung Seo (SeoZ) -- Jérôme Pinot http://ngc891.blogdns.net/ -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eina: make eina_binbuf_free and eina_strbuff_free accept NULL.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=37c1c4e9f662bbb81a11700bd8055d0fbcc933f0
commit 37c1c4e9f662bbb81a11700bd8055d0fbcc933f0
Author: Cedric BAIL cedric.b...@samsung.com
Date: Thu Jan 2 12:11:38 2014 +0900
eina: make eina_binbuf_free and eina_strbuff_free accept NULL.
We do follow free() logic here and accept NULL for all eina_*_free()
functions.
This patch just do so for Eina_Binbuf and Eina_Strbuf.
---
src/lib/eina/eina_binbuf_template_c.x | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/eina/eina_binbuf_template_c.x
b/src/lib/eina/eina_binbuf_template_c.x
index 7e0c539..3dfae42 100644
--- a/src/lib/eina/eina_binbuf_template_c.x
+++ b/src/lib/eina/eina_binbuf_template_c.x
@@ -77,6 +77,8 @@ _FUNC_EXPAND(manage_new_length)(_STRBUF_DATA_TYPE *str,
size_t length)
EAPI void
_FUNC_EXPAND(free)(_STRBUF_STRUCT_NAME *buf)
{
+ if (!buf) return ;
+
EINA_MAGIC_CHECK_STRBUF(buf);
EINA_MAGIC_SET(buf, EINA_MAGIC_NONE);
eina_strbuf_common_free(buf);
--
