[EGIT] [core/elementary] master 02/02: Eolian: Integration of Win Access Object
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6f72529b5b1fae6be29a619d6864cc6af15d2ade
commit 6f72529b5b1fae6be29a619d6864cc6af15d2ade
Author: Daniel Zaoui
Date: Thu Apr 3 08:52:20 2014 +0300
Eolian: Integration of Win Access Object
---
src/lib/Makefile.am | 4 +++
src/lib/elm_atspi_object.c | 59 +++-
src/lib/elm_win_access_object.eo | 12
3 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e38583f..8efafee 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -693,6 +693,8 @@ BUILT_SOURCES = \
elm_web.eo.h \
elm_widget_access_object.eo.c \
elm_widget_access_object.eo.h \
+ elm_win_access_object.eo.c \
+ elm_win_access_object.eo.h \
elm_win.eo.c \
elm_win.eo.h
@@ -780,6 +782,7 @@ EXTRA_DIST += \
elm_video.eo \
elm_web.eo \
elm_widget_access_object.eo \
+elm_win_access_object.eo \
elm_win.eo
nodist_includesunstable_HEADERS = \
@@ -866,5 +869,6 @@ nodist_includesunstable_HEADERS = \
elm_video.eo.h \
elm_web.eo.h \
elm_widget_access_object.eo.h \
+ elm_win_access_object.eo.h \
elm_win.eo.h
diff --git a/src/lib/elm_atspi_object.c b/src/lib/elm_atspi_object.c
index 9a9e179..68cc3d4 100644
--- a/src/lib/elm_atspi_object.c
+++ b/src/lib/elm_atspi_object.c
@@ -582,8 +582,7 @@ _elm_app_access_object_elm_atspi_object_parent_get(Eo *obj
EINA_UNUSED, void *_p
// elm_win wrapper
-const Eo_Class *elm_atspi_win_obj_class_get(void) EINA_CONST;
-#define ELM_ATSPI_WIN_CLASS elm_atspi_win_obj_class_get()
+#include "elm_win_access_object.eo.h"
static void
_win_focused(void *data, Evas_Object *eo EINA_UNUSED, void *event_info
EINA_UNUSED)
@@ -599,10 +598,10 @@ _win_unfocused(void *data, Evas_Object *eo EINA_UNUSED,
void *event_info EINA_UN
eo_do(ao,
eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED,
NULL, NULL));
}
-static void
-_win_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_win_access_object_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
- eo_do_super(obj, ELM_ATSPI_WIN_CLASS, eo_constructor());
+ eo_do_super(obj, ELM_WIN_ACCESS_OBJECT_CLASS, eo_constructor());
Evas_Object *evobj = NULL;
eo_do(obj, elm_atspi_obj_object_get(&evobj));
@@ -611,59 +610,33 @@ _win_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list
*list EINA_UNUSED)
evas_object_smart_callback_add(evobj, "unfocused", _win_unfocused, obj);
}
-static void
-_win_destructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_win_access_object_eo_base_destructor(Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Atspi_Object *root = _elm_atspi_root_object_get();
eo_do(root, eo_event_callback_call(ELM_ATSPI_OBJECT_EVENT_CHILD_REMOVED,
obj, NULL));
- eo_do_super(obj, ELM_ATSPI_WIN_CLASS, eo_destructor());
+ eo_do_super(obj, ELM_WIN_ACCESS_OBJECT_CLASS, eo_destructor());
}
-static void
-_win_name_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static const char*
+_elm_win_access_object_elm_atspi_object_name_get(Eo *obj, void *_pd
EINA_UNUSED)
{
- EO_PARAMETER_GET(const char **, ret, list);
Evas_Object *evobj = NULL;
eo_do(obj, elm_atspi_obj_object_get(&evobj));
- EINA_SAFETY_ON_NULL_RETURN(evobj);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(evobj, NULL);
- if (ret) *ret = elm_win_title_get(evobj);
+ return elm_win_title_get(evobj);
}
-static void
-_win_parent_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
+EOLIAN static Elm_Atspi_Object*
+_elm_win_access_object_elm_atspi_object_parent_get(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED)
{
- EO_PARAMETER_GET(Elm_Atspi_Object **, ret, list);
- if (ret) *ret = _elm_atspi_root_object_get();
+ return _elm_atspi_root_object_get();
}
-static void
-_win_class_constructor(Eo_Class *klass)
-{
- const Eo_Op_Func_Description func_desc[] = {
-EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _win_constructor),
-EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _win_destructor),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_NAME_GET),
_win_name_get),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_PARENT_GET),
_win_parent_get),
-EO_OP_FUNC_SENTINEL
- };
- eo_class_funcs_set(klass, func_desc);
-}
-
-static const Eo_Class_Description win_class_desc = {
- EO_VERSION,
- "Elm_Win_Access_Object",
- EO_CLASS_TYPE_REGULAR,
- EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
- NULL,
- 0,
-
[EGIT] [core/elementary] master 01/02: Eolian: Integration of App Access Object
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e3dddb8bdeac9ff0b745c16fba3e6da99d57953b
commit e3dddb8bdeac9ff0b745c16fba3e6da99d57953b
Author: Daniel Zaoui
Date: Thu Apr 3 08:42:02 2014 +0300
Eolian: Integration of App Access Object
---
src/lib/Makefile.am | 4 +++
src/lib/elm_app_access_object.eo | 13
src/lib/elm_atspi_object.c | 67 ++--
3 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fe81000..e38583f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -545,6 +545,8 @@ BUILT_SOURCES = \
elm_access.eo.h \
elm_actionslider.eo.c \
elm_actionslider.eo.h \
+ elm_app_access_object.eo.c \
+ elm_app_access_object.eo.h \
elm_app_client.eo.c \
elm_app_client.eo.h \
elm_app_client_view.eo.c \
@@ -704,6 +706,7 @@ EXTRA_DIST += \
elm_hover.eo \
elm_access.eo \
elm_actionslider.eo \
+elm_app_access_object.eo \
elm_app_client.eo \
elm_app_client_view.eo \
elm_app_server.eo \
@@ -789,6 +792,7 @@ nodist_includesunstable_HEADERS = \
elm_access.eo.h \
elm_hover.eo.h \
elm_actionslider.eo.h \
+ elm_app_access_object.eo.h \
elm_app_client.eo.h \
elm_app_client_view.eo.h \
elm_app_server.eo.h \
diff --git a/src/lib/elm_app_access_object.eo b/src/lib/elm_app_access_object.eo
new file mode 100644
index 000..5184a94
--- /dev/null
+++ b/src/lib/elm_app_access_object.eo
@@ -0,0 +1,13 @@
+class Elm_App_Access_Object (Elm_Atspi_Object)
+{
+ data:null;
+ implements {
+ Eo_Base::constructor;
+ Elm_Atspi_Object::name::get;
+ Elm_Atspi_Object::parent::get;
+ Elm_Atspi_Object::role::get;
+ Elm_Atspi_Object::children::get;
+ }
+
+}
+
diff --git a/src/lib/elm_atspi_object.c b/src/lib/elm_atspi_object.c
index a5d6d94..9a9e179 100644
--- a/src/lib/elm_atspi_object.c
+++ b/src/lib/elm_atspi_object.c
@@ -534,12 +534,11 @@
_elm_widget_access_object_elm_interface_atspi_component_focus_grab(Eo *obj, void
#include "elm_widget_access_object.eo.c"
/// Elm_Atspi_App base class
-#define ELM_ATSPI_APP_CLASS elm_atspi_app_obj_class_get()
+#include "elm_app_access_object.eo.h"
-static void
-_app_children_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static Eina_List*
+_elm_app_access_object_elm_atspi_object_children_get(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED)
{
- EO_PARAMETER_GET(Eina_List **, ret, list);
Eina_List *l, *accs = NULL;
Elm_Atspi_Object *aobj;
Evas_Object *win;
@@ -552,66 +551,34 @@ _app_children_get(Eo *obj EINA_UNUSED, void *_pd
EINA_UNUSED, va_list *list)
accs = eina_list_append(accs, aobj);
}
- if (ret) *ret = accs;
+ return accs;
}
-static void
-_app_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_elm_app_access_object_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
{
eo_do_super(obj, ELM_ATSPI_OBJ_CLASS, eo_constructor());
}
-static void
-_app_name_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
-{
- EO_PARAMETER_GET(const char **, name, list);
- if (name) *name = elm_app_name_get();
-}
-
-static void
-_app_role_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
+EOLIAN static const char*
+_elm_app_access_object_elm_atspi_object_name_get(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED)
{
- EO_PARAMETER_GET(AtspiRole *, ret, list);
- if (ret) *ret = ATSPI_ROLE_APPLICATION;
+ return elm_app_name_get();
}
-static void
-_app_parent_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list
EINA_UNUSED)
+EOLIAN static AtspiRole
+_elm_app_access_object_elm_atspi_object_role_get(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED)
{
- EO_PARAMETER_GET(Elm_Atspi_Object **, ret, list);
- if (ret) *ret = NULL;
+ return ATSPI_ROLE_APPLICATION;
}
-static void
-_app_class_constructor(Eo_Class *klass)
+EOLIAN static Elm_Atspi_Object*
+_elm_app_access_object_elm_atspi_object_parent_get(Eo *obj EINA_UNUSED, void
*_pd EINA_UNUSED)
{
- const Eo_Op_Func_Description func_desc[] = {
-EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _app_constructor),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_NAME_GET),
_app_name_get),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ROLE_GET),
_app_role_get),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_PARENT_GET),
_app_parent_get),
-EO_OP_FUNC(ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_
[E-devel] Korea e dinner
Hello, As most of you know by now, I will move to France for some time in a little bit more than a week or so. So let's have a farewell Korea e dinner on Saturday 12 ! So what time (late afternoon? Dinner? ) and where? Cedric Bail -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Error when running make check
Cedric Bail On Apr 2, 2014 11:32 PM, "Tom Hacohen" wrote: > > Does anyone else get this after running make check? (All the tests seem > to be running fine) > > make[5]: execvp: /bin/sh: Argument list too long > Makefile:28022: recipe for target 'test-suite.log' failed > make[5]: *** [test-suite.log] Error 127 > Makefile:28128: recipe for target 'check-TESTS' failed > make[4]: *** [check-TESTS] Error 2 > Makefile:28345: recipe for target 'check-am' failed > make[3]: *** [check-am] Error 2 > Makefile:27915: recipe for target 'check-recursive' failed > make[2]: *** [check-recursive] Error 1 > Makefile:28348: recipe for target 'check' failed > make[1]: *** [check] Error 2 > Makefile:1850: recipe for target 'check-recursive' failed > make: *** [check-recursive] Error 1 Yes, it's a bug in automake check macro. Configure is live patching src /Makefile, but for whatever reason it doesn't work for you. > > -- > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: unbreak edje multisense after eolian changes to ecore_audio
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=653aebb47db5a9bc232ea07145fe36c74534ee3e
commit 653aebb47db5a9bc232ea07145fe36c74534ee3e
Author: Carsten Haitzler (Rasterman)
Date: Thu Apr 3 08:06:04 2014 +0900
unbreak edje multisense after eolian changes to ecore_audio
fixes break in 70b39368e61e6740e741f8ff34bb0c1bddbaaacd
---
src/lib/edje/edje_multisense.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index e4e7b62..07653a1 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -202,11 +202,11 @@ _edje_multisense_internal_sound_sample_play(Edje *ed,
const char *sample_name, c
ecore_audio_obj_name_set(snd_id_str),
ecore_audio_obj_in_speed_set(speed),
ecore_audio_obj_vio_set(&eet_data->vio, eet_data,
_free),
-eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED,
_play_finished, NULL));
+eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED,
_play_finished, NULL));
if (!out)
{
out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL,
-
eo_event_callback_add(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL, _out_fail, NULL));
+
eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail,
NULL));
if (out) outs++;
}
if (!out)
@@ -266,12 +266,12 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const
char *tone_name, const
eo_do(in, ecore_audio_obj_name_set("tone"));
eo_do(in, eo_base_data_set(ECORE_AUDIO_ATTR_TONE_FREQ,
&tone->value, NULL));
eo_do(in, ecore_audio_obj_in_length_set(duration));
- eo_do(in, eo_event_callback_add(ECORE_AUDIO_EV_IN_STOPPED,
_play_finished, NULL));
+ eo_do(in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED,
_play_finished, NULL));
if (!out)
{
out = eo_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL,
-
eo_event_callback_add(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL, _out_fail, NULL));
+
eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail,
NULL));
if (out) outs++;
}
--
[E-devel] mem module
Hi, perhaps the mem module is the only monitoring module still left in legacy subversion. As Wido sent a patch for it in the users mailing list, can someone put it in enlightenment/core/modules so I can commit the patch? -- Massimo Maiurana Ragusa (RG) -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/diskio] master 01/01: Updated to build with e19, patch by Wido.
maxerba pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/diskio.git/commit/?id=5696b89468f08b16c556619e889174a4e2168313
commit 5696b89468f08b16c556619e889174a4e2168313
Author: maxerba
Date: Wed Apr 2 22:22:20 2014 +0200
Updated to build with e19, patch by Wido.
---
src/e_mod_config.c | 4 ++--
src/e_mod_main.c | 2 +-
src/e_mod_main.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/e_mod_config.c b/src/e_mod_config.c
index 2a019a2..dd7badd 100644
--- a/src/e_mod_config.c
+++ b/src/e_mod_config.c
@@ -17,7 +17,7 @@ static int _basic_apply(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
/* External Functions */
E_Config_Dialog *
-e_int_config_diskio_module(E_Container *con, Config_Item *ci)
+e_int_config_diskio_module(E_Comp *comp, Config_Item *ci)
{
E_Config_Dialog *cfd = NULL;
E_Config_Dialog_View *v = NULL;
@@ -38,7 +38,7 @@ e_int_config_diskio_module(E_Container *con, Config_Item *ci)
snprintf(buf, sizeof(buf), "%s/e-module-diskio.edj",
diskio_conf->module->dir);
/* create new config dialog */
- cfd = e_config_dialog_new(con, "DiskIO Module", "DiskIO",
+ cfd = e_config_dialog_new(NULL, D_("DiskIO Module"), "DiskIO",
"_e_module_diskio_cfg_dlg", buf, 0, v, ci);
e_dialog_resizable_set(cfd->dia, 1);
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 0d668c1..0691666 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -509,5 +509,5 @@ _diskio_cb_menu_configure(void *data, E_Menu *mn,
E_Menu_Item *mi)
if (!inst) return;
if (!diskio_conf) return;
if (diskio_conf->cfd) return;
- e_int_config_diskio_module(mn->zone->container, inst->conf_item);
+ e_int_config_diskio_module(mn->zone->comp, inst->conf_item);
}
diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index fa7a29b..af2476b 100644
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -61,7 +61,7 @@ EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
/* Function for calling the modules config dialog */
-E_Config_Dialog *e_int_config_diskio_module(E_Container *con, Config_Item *ci);
+E_Config_Dialog *e_int_config_diskio_module(E_Comp *comp, Config_Item *ci);
extern Config *diskio_conf;
--
Re: [E-devel] Terminology Configuration Enhancement
On Wed, Apr 2, 2014 at 12:49 AM, Carsten Haitzler wrote: > On Wed, 2 Apr 2014 00:21:26 +0300 "Alex-P. Natsios" > said: > >> If i were you i would already send it through phab so we can have a >> proper discussion over it. >> Make sure to add billiob as a reviewer, even if it ends up not getting >> accepted having it on phab with a proper discussion underneath is >> better imho (esp if you need to make changes or rework it). > > yup. phab. we have a whole code review/submission thing. Thanks, guys. I'll put it into phab tonight. -J -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: unify comp object stacking
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=95a8fed0bf69bbcbe1f11e35be202cef4dc5c93b
commit 95a8fed0bf69bbcbe1f11e35be202cef4dc5c93b
Author: Mike Blumenkrantz
Date: Wed Apr 2 14:16:34 2014 -0400
unify comp object stacking
these were nearly identical, and sooner or later there was going to be an
unfortunate c/p error
---
src/bin/e_comp_object.c | 152 +++-
1 file changed, 34 insertions(+), 118 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 2101990..3face43 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -988,37 +988,38 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj,
int layer)
e_comp_shape_queue(cw->comp);
}
+typedef void (*E_Comp_Object_Stack_Func)(Evas_Object *obj, Evas_Object *stack);
+
static void
-_e_comp_intercept_stack_above(void *data, Evas_Object *obj, Evas_Object *above)
+_e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack,
E_Comp_Object_Stack_Func stack_cb)
{
- E_Comp_Object *cw2 = NULL, *cw = data;
+ E_Comp_Object *cw2 = NULL;
E_Client *ecstack;
short layer;
- Evas_Object *o = above;
+ Evas_Object *o = stack;
+ Eina_Bool raising = stack_cb == evas_object_stack_above;
- EINA_SAFETY_ON_TRUE_RETURN(obj == above);
- if (evas_object_below_get(obj) == above) return;
if (cw->ec->layer_block)
{
/* obey compositor effects! */
-if (cw->ec->layer == evas_object_layer_get(obj))
- evas_object_data_set(obj, "client_restack", (void*)1);
-evas_object_stack_above(obj, above);
-if (cw->ec->layer == evas_object_layer_get(obj))
- evas_object_data_del(obj, "client_restack");
+if (cw->ec->layer == evas_object_layer_get(cw->smart_obj))
+ evas_object_data_set(cw->smart_obj, "client_restack", (void*)1);
+stack_cb(cw->smart_obj, stack);
+if (cw->ec->layer == evas_object_layer_get(cw->smart_obj))
+ evas_object_data_del(cw->smart_obj, "client_restack");
return;
}
/* assume someone knew what they were doing during client init */
if (cw->ec->new_client)
layer = cw->ec->layer;
else
- layer = evas_object_layer_get(above);
+ layer = evas_object_layer_get(stack);
ecstack = e_client_below_get(cw->ec);
if (layer != e_comp_canvas_layer_map_to(cw->layer))
{
/* some FOOL is trying to restack a layer marker */
-if (obj == cw->comp->layers[cw->layer].obj) return;
-evas_object_layer_set(obj, layer);
+if (cw->smart_obj == cw->comp->layers[cw->layer].obj) return;
+evas_object_layer_set(cw->smart_obj, layer);
/* we got our layer wrangled, return now! */
if (layer != e_comp_canvas_layer_map_to(cw->layer)) return;
}
@@ -1038,7 +1039,7 @@ _e_comp_intercept_stack_above(void *data, Evas_Object
*obj, Evas_Object *above)
* - find a stacking client
*/
o = evas_object_above_get(o);
-if ((!o) || (o == obj)) break;
+if ((!o) || (o == cw->smart_obj)) break;
if (evas_object_layer_get(o) != layer)
{
/* reached the top client layer somehow
@@ -1066,128 +1067,43 @@ _e_comp_intercept_stack_above(void *data, Evas_Object
*obj, Evas_Object *above)
_e_comp_object_layers_remove(cw);
if (cw2)
{
-if (o == above)
- _e_comp_object_layers_add(cw, cw2, NULL, 0);
-else if (o == obj)
- _e_comp_object_layers_add(cw, NULL, NULL, 0);
-else
- _e_comp_object_layers_add(cw, NULL, cw2, 0);
+if (o == stack) //if stacking above, cw2 is above; else cw2 is below
+ _e_comp_object_layers_add(cw, raising ? cw2 : NULL, raising ? NULL :
cw2, 0);
+else if (o == cw->smart_obj) //prepend (lower) if not stacking above
+ _e_comp_object_layers_add(cw, NULL, NULL, !raising);
+else //if no stacking objects found, either raise or lower
+ _e_comp_object_layers_add(cw, raising ? NULL : cw2, raising ? cw2 :
NULL, 0);
}
else
_e_comp_object_layers_add(cw, NULL, NULL, 0);
/* set restack if stacking has changed */
if (cw->ec->new_client || (ecstack->frame != o))
- evas_object_data_set(obj, "client_restack", (void*)1);
- evas_object_stack_above(obj, above);
+ evas_object_data_set(cw->smart_obj, "client_restack", (void*)1);
+ stack_cb(cw->smart_obj, stack);
if (cw->comp->layers[cw->layer].obj)
- if (evas_object_below_get(obj) == cw->comp->layers[cw->layer].obj)
+ if (evas_object_below_get(cw->smart_obj) ==
cw->comp->layers[cw->layer].obj)
{
CRI("STACKING ERROR!!!");
}
if (cw->ec->new_client || (ecstack->frame != o))
- evas_object_data_del(obj, "client_restack");
+ evas_object_data_del(cw->smart_obj, "client_restack");
e_comp_shape_queue(cw->comp);
}
[EGIT] [core/enlightenment] master 01/02: fix frame size calc check to account for themes with 0 height
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b9e6a624eff68bd506db98fb03c53fecb2f59835
commit b9e6a624eff68bd506db98fb03c53fecb2f59835
Author: Mike Blumenkrantz
Date: Wed Apr 2 12:31:33 2014 -0400
fix frame size calc check to account for themes with 0 height
---
src/bin/e_comp_object.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 1b82b9a..d4195ae 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1261,7 +1261,7 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
return;
}
evas_object_move(cw->smart_obj, cw->ec->x, cw->ec->y);
- if (cw->frame_object && (cw->ec->h == cw->ec->client.h))
+ if (cw->frame_object && (cw->ec->h == cw->ec->client.h) && (cw->ec->w ==
cw->ec->client.w))
CRI("ACK!");
evas_object_resize(cw->smart_obj, cw->ec->w, cw->ec->h);
if ((cw->w < 1) || (cw->h < 1))
--
[EGIT] [core/enlightenment] master 02/02: comp docs part 1: comp objects
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=cfe26ff8387833af821cd33ccbf43f92c3e86c47
commit cfe26ff8387833af821cd33ccbf43f92c3e86c47
Author: Mike Blumenkrantz
Date: Wed Apr 2 13:06:28 2014 -0400
comp docs part 1: comp objects
---
src/bin/e_comp_object.c | 126 +---
1 file changed, 120 insertions(+), 6 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index d4195ae..2101990 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -20,10 +20,14 @@
cw = NULL
#define INTERNAL_ENTRY E_Comp_Object *cw; cw = evas_object_smart_data_get(obj);
+/* enable for lots of client size info in console output */
#if 1
# define e_util_size_debug_set(x, y)
#endif
+/* enable along with display-specific damage INF calls to enable render tracing
+ * SLOW!
+ */
#if 0
#define RENDER_DEBUG(...) INF(__VA_ARGS__)
#else
@@ -64,8 +68,8 @@ typedef struct _E_Comp_Object
Evas_Object *effect_obj; // effects object
unsigned int layer; //e_comp_canvas_layer_map(cw->ec->layer)
Eina_List *obj_mirror; // extra mirror objects
- Eina_Tiler *updates;
- Eina_Tiler *pending_updates;
+ Eina_Tiler *updates; //render update regions
+ Eina_Tiler *pending_updates; //render update regions which are
about to render
unsigned int update_count; // how many updates have happened to
this obj
@@ -111,6 +115,7 @@ static Evas_Smart *_e_comp_smart = NULL;
/* sekrit functionzzz */
EINTERN void e_client_focused_set(E_Client *ec);
+/* emitted every time a new noteworthy comp object is added */
EAPI int E_EVENT_COMP_OBJECT_ADD = -1;
static void
@@ -152,11 +157,15 @@ _e_comp_shaped_check(int w, int h, const Eina_Rectangle
*rects, int num)
/
+/* add a client to the layer-client list */
static void
_e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above,
E_Comp_Object *below, Eina_Bool prepend)
{
E_Comp_Object *layer_cw = NULL;
+ /* try to get the internal data for the layer;
+* will return NULL for fake layers (eg. wayland)
+*/
if (cw->comp->layers[cw->layer].obj)
layer_cw = evas_object_smart_data_get(cw->comp->layers[cw->layer].obj);
if (layer_cw == cw) layer_cw = NULL;
@@ -219,6 +228,7 @@ _e_comp_object_shadow(E_Comp_Object *cw)
evas_object_smart_callback_call(cw->smart_obj, "shadow_change", cw->ec);
}
+/* trigger e_binding from an edje signal on a client frame */
static void
_e_comp_object_cb_signal_bind(void *data, Evas_Object *obj EINA_UNUSED, const
char *emission, const char *source)
{
@@ -234,6 +244,7 @@ _e_comp_object_cb_signal_bind(void *data, Evas_Object *obj
EINA_UNUSED, const ch
/
+/* handle evas mouse-in events on client object */
static void
_e_comp_object_cb_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
@@ -243,6 +254,7 @@ _e_comp_object_cb_mouse_in(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EIN
e_client_mouse_in(cw->ec, ev->output.x, ev->output.y);
}
+/* handle evas mouse-out events on client object */
static void
_e_comp_object_cb_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
@@ -252,6 +264,7 @@ _e_comp_object_cb_mouse_out(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj EI
e_client_mouse_out(cw->ec, ev->output.x, ev->output.y);
}
+/* handle evas mouse wheel events on client object */
static void
_e_comp_object_cb_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event_info)
{
@@ -265,6 +278,7 @@ _e_comp_object_cb_mouse_wheel(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj
e_client_mouse_wheel(cw->ec, &ev->output, &ev2);
}
+/* handle evas mouse down events on client object */
static void
_e_comp_object_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
@@ -278,6 +292,7 @@ _e_comp_object_cb_mouse_down(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj E
e_client_mouse_down(cw->ec, ev->button, &ev->output, &ev2);
}
+/* handle evas mouse up events on client object */
static void
_e_comp_object_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
@@ -291,6 +306,7 @@ _e_comp_object_cb_mouse_up(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EIN
e_client_mouse_up(cw->ec, ev->button, &ev->output, &ev2);
}
+/* handle evas mouse movement events on client object */
static void
_e_comp_object_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
{
@@ -303,6 +319,7 @@ _e_comp_object_cb_mouse_move(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj E
}
/
+/* helper funct
Re: [E-devel] Terminology Configuration Enhancement
Settings > Helpers and disable all/make it empty shouldn't start anything, but still highlights On Wed, Apr 2, 2014 at 8:55 AM, Bertrand Jacquin wrote: > Hi, > > On 2014-04-01 23:11, Jason Cook wrote: >> Hi all, >> >> I have added a configuration option to terminology that allows the >> user to turn off the 'Active Links' functionality, meaning that paths >> and URLs won't start blinking when beneath the mouse cursor, nor will >> they be active if clicked. Does the community consider this >> configuration option valuable enough for inclusion into the source? > > This is something I dream about. That auto xdg-open of selected files is > really annoying me when doing a lot of (file/directory) text copy and > paste during the whole day. > > URL link open is useful when xdg-open is really annoying and make me > curse on Terminoly. > > Thanks Jason > > -- > ___ > 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 -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 11/32: ecore_evas: add a tool that can convert file using Evas internal loaders and savers.
On Tue, Apr 1, 2014 at 10:01 AM, Cedric BAIL wrote: > cedric pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=a086a4f089138ddaf1f14602328def619e9df202 > > commit a086a4f089138ddaf1f14602328def619e9df202 > Author: Cedric BAIL > Date: Wed Mar 12 18:00:41 2014 +0900 > > ecore_evas: add a tool that can convert file using Evas internal loaders > and savers. few comments: - would be great to allow keys alongside with filenames so we get to/from eet (and edje?) - create a log domain otherwise it's hard to filter if you use the global domain. Say you added some debug for this later and want to see only that debug, then you have hard time to filter -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [misc/entrance] master 01/09: entrance: free the pools correctly
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=219c01fa635a7df79fb66f357171aac9045d0d0b
commit 219c01fa635a7df79fb66f357171aac9045d0d0b
Author: Marcel Hollerbach
Date: Wed Apr 2 10:22:19 2014 +0200
entrance: free the pools correctly
---
src/daemon/entrance_server.c | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/daemon/entrance_server.c b/src/daemon/entrance_server.c
index 77a09d3..b144dfc 100644
--- a/src/daemon/entrance_server.c
+++ b/src/daemon/entrance_server.c
@@ -14,7 +14,7 @@ static Eina_Bool
_entrance_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event
EINA_UNUSED)
{
Entrance_Event eev;
- char *buf;
+ Entrance_Image *img;
PT("server client connected\n");
PT("Sending users\n");
@@ -43,13 +43,17 @@ _entrance_server_add(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event E
eev.event.conf_gui.background_pool =
entrance_image_system_backgrounds();
eev.event.conf_gui.icon_pool = entrance_image_system_icons();
entrance_event_send(&eev);
-EINA_LIST_FREE(eev.event.conf_gui.background_pool, buf)
+EINA_LIST_FREE(eev.event.conf_gui.background_pool, img)
{
-eina_stringshare_del(buf);
+eina_stringshare_del(img->path);
+eina_stringshare_del(img->group);
+free(img);
}
-EINA_LIST_FREE(eev.event.conf_gui.icon_pool, buf)
+EINA_LIST_FREE(eev.event.conf_gui.icon_pool, img)
{
-eina_stringshare_del(buf);
+eina_stringshare_del(img->path);
+eina_stringshare_del(img->group);
+free(img);
}
}
return ECORE_CALLBACK_RENEW;
--
[EGIT] [misc/entrance] master 07/09: entrance: Select the correct Background for the user
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=21f208f48fade5662037f4b90a237639269a2a97 commit 21f208f48fade5662037f4b90a237639269a2a97 Author: Marcel Hollerbach Date: Wed Apr 2 16:20:40 2014 +0200 entrance: Select the correct Background for the user --- src/bin/entrance_conf_user.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/entrance_conf_user.c b/src/bin/entrance_conf_user.c index 6cc4553..192d44e 100644 --- a/src/bin/entrance_conf_user.c +++ b/src/bin/entrance_conf_user.c @@ -60,7 +60,8 @@ _entrance_conf_user_bg_fill_cb(void *data, Elm_Object_Item *it) const char *bg_path, *bg_group; cbg = data; - entrance_gui_background_get(&bg_path, &bg_group); + bg_path = _entrance_int_conf_user->bg.path; + bg_group = _entrance_int_conf_user->bg.group; if (((cbg->path) && (bg_path) && (!strcmp(cbg->path, bg_path))) || ((!cbg->path) && (!bg_path))) @@ -312,8 +313,8 @@ _entrance_conf_user_build_cb(Evas_Object *t, Entrance_Login *eu) _entrance_conf_user_icon_sel, o); entrance_fill(gl, entrance_conf_background_fill_get(), - l, _entrance_conf_user_bg_fill_cb, - _entrance_conf_user_bg_sel, o); + l, _entrance_conf_user_icon_fill_cb, + _entrance_conf_user_icon_sel, o); LIST_FILL(entrance_gui_icon_pool_get()); LIST_FILL(entrance_gui_theme_icons()); --
[EGIT] [misc/entrance] master 02/09: entrance: Updated the entrance_conf.c
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=cf5c4cf46a598925bcd9549e04f141903c3871b4
commit cf5c4cf46a598925bcd9549e04f141903c3871b4
Author: Marcel Hollerbach
Date: Wed Apr 2 12:18:47 2014 +0200
entrance: Updated the entrance_conf.c
- backgrounds are hold in pools, no need to generate them there
- New Textes for the Items are used
- Lets use the thumb style in the settings pane
- There is a macro to get Entrance_Image structs to
Entrance_Conf_Background struct (in lists)
---
src/bin/entrance_conf.c | 121 +++-
src/bin/entrance_conf.h | 16 ++-
2 files changed, 63 insertions(+), 74 deletions(-)
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 4d0623f..979c6a0 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -76,7 +76,44 @@ _entrance_conf_end(Evas_Object *win)
_entrance_conf->current = NULL;
}
-static void
+void
+entrance_conf_background_title_gen(Entrance_Conf_Background *cbg)
+{
+ char buf[PATH_MAX];
+ char *group_suffix = NULL, *result;
+ const char *filename = NULL;
+
+ if (cbg->path)
+ {
+filename = ecore_file_file_get(cbg->path);
+ }
+
+ if (cbg->group)
+ {
+group_suffix = ecore_file_file_get(cbg->group);
+ }
+
+ if ((group_suffix) && (filename))
+ {
+snprintf(buf, sizeof(buf), "%s - %s", filename, group_suffix);
+ }
+ else if (group_suffix)
+ {
+snprintf(buf, sizeof(buf), "%s", group_suffix);
+ }
+ else if(filename)
+ {
+snprintf(buf, sizeof(buf), "%s", filename);
+ }
+ else
+ {
+snprintf(buf, sizeof(buf), "None");
+ }
+
+ cbg->name = eina_stringshare_add(buf);
+}
+
+ static void
_entrance_conf_promote(Entrance_Conf_Module *conf)
{
elm_naviframe_item_promote(conf->item);
@@ -126,12 +163,15 @@ _entrance_conf_bg_content_get(void *data, Evas_Object
*obj, const char *part)
cbg = data;
if (part && !strcmp("elm.swallow.icon", part))
{
-o = elm_image_add(obj);
-elm_image_file_set(o, cbg->path, cbg->group);
-elm_image_smooth_set(o, EINA_FALSE);
-evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
-evas_object_show(o);
+if (cbg->path || cbg->group)
+ {
+ o = elm_image_add(obj);
+ elm_image_file_set(o, cbg->path, cbg->group);
+ elm_image_smooth_set(o, EINA_FALSE);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND,
+ EVAS_HINT_EXPAND);
+ evas_object_show(o);
+ }
}
return o;
}
@@ -160,7 +200,7 @@ entrance_conf_init(void)
PT("conf init\n");
_entrance_conf = calloc(1, sizeof(Entrance_Int_Conf));
_entrance_conf->background_fill =
- entrance_fill_new("default",
+ entrance_fill_new("thumb",
_entrance_conf_bg_text_get,
_entrance_conf_bg_content_get,
_entrance_conf_bg_state_get,
@@ -305,71 +345,6 @@ entrance_conf_changed(void)
}
}
-Eina_List *
-entrance_conf_backgrounds_get(Evas_Object *obj, const char *user)
-{
- Evas_Object *o, *edj;
- Eina_List *list, *l, *nl = NULL;
- Entrance_Conf_Background *cbg;
- const char *str;
- const char *path;
- char buf[PATH_MAX];
- Eina_Iterator *it;
-
- o = entrance_gui_theme_get(obj, "entrance/background");
- edj = elm_layout_edje_get(o);
- edje_object_file_get(edj, &path, NULL);
- list = entrance_gui_stringlist_get(edje_object_data_get(edj, "items"));
- EINA_LIST_FOREACH(list, l, str)
- {
-cbg = calloc(1, sizeof(Entrance_Conf_Background));
-snprintf(buf, sizeof(buf),
- "entrance/background/%s", str);
-
-cbg->path = eina_stringshare_add(path);
-cbg->group = eina_stringshare_add(buf);
-cbg->name = eina_stringshare_add(str);
-nl = eina_list_append(nl, cbg);
- }
- entrance_gui_stringlist_free(list);
- evas_object_del(o);
-
- it = eina_file_ls(PACKAGE_DATA_DIR"/backgrounds");
- EINA_ITERATOR_FOREACH(it, str)
- {
-int len;
-len = strlen(str);
-if (len < 4) continue;
-if (!strcmp(&str[len-4], ".edj"))
- {
- cbg = calloc(1, sizeof(Entrance_Conf_Background));
- snprintf(buf, sizeof(buf),
- "entrance/background/%s", str);
- cbg->path = str;
- /* TODO use entrance/desktop/background or e/desktop/background */
- cbg->group = eina_stringshare_add("e/desktop/background");
- {
- char *name, *p;
- name = strrchr(str, '/');
- if (name)
-{
- name++;
-
[EGIT] [misc/entrance] master 05/09: entrance: Delete the pools if there are new ones !
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=cfb822dbcbb2bfb03bf5a6303c736d85b11705b3
commit cfb822dbcbb2bfb03bf5a6303c736d85b11705b3
Author: Marcel Hollerbach
Date: Wed Apr 2 12:27:41 2014 +0200
entrance: Delete the pools if there are new ones !
---
src/bin/entrance_gui.c | 25 ++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index c137afd..423f640 100755
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -458,9 +458,28 @@ entrance_gui_xsessions_get(void)
void
entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
{
- _gui->background_pool = conf->background_pool;
- _gui->icon_pool = conf->icon_pool;
- //TODO free the pool if there was one before!
+ if (_gui->background_pool)
+ {
+Entrance_Image *img;
+EINA_LIST_FREE(_gui->background_pool, img)
+ {
+ eina_stringshare_del(img->path);
+ eina_stringshare_del(img->group);
+ free(img);
+ }
+_gui->background_pool = conf->background_pool;
+ }
+ if (_gui->icon_pool)
+ {
+Entrance_Image *img;
+EINA_LIST_FREE(_gui->icon_pool, img)
+ {
+ eina_stringshare_del(img->path);
+ eina_stringshare_del(img->group);
+ free(img);
+ }
+_gui->icon_pool = conf->icon_pool;
+ }
if (_gui->bg.path != conf->bg.path)
{
if ((conf->bg.path) && (*conf->bg.path))
--
[EGIT] [misc/entrance] master 03/09: entrance: Updated the general Settings
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=bd7d06b2c4f58d3fb1d420d0c0a93d96118a4501
commit bd7d06b2c4f58d3fb1d420d0c0a93d96118a4501
Author: Marcel Hollerbach
Date: Wed Apr 2 12:22:50 2014 +0200
entrance: Updated the general Settings
- There is a toolbar on the left side
- Added placeholder for themeselector and graphical log
- Backgrounds are displayed from the pools !
---
src/bin/entrance_conf_main.c | 248 ---
1 file changed, 164 insertions(+), 84 deletions(-)
diff --git a/src/bin/entrance_conf_main.c b/src/bin/entrance_conf_main.c
index cf295d3..9cf2efb 100644
--- a/src/bin/entrance_conf_main.c
+++ b/src/bin/entrance_conf_main.c
@@ -8,6 +8,7 @@ typedef struct Entrance_Int_Conf_Main_
const char *path;
const char *group;
} bg;
+ Evas_Object *display_area;
const char *theme;
const char *elm_profile;
Eina_Bool vkbd_enabled : 1;
@@ -55,15 +56,17 @@ _entrance_conf_bg_fill_cb(void *data, Elm_Object_Item *it)
cbg = data;
entrance_gui_background_get(&bg_path, &bg_group);
- if ((cbg->path)
- && (cbg->group)
- && (bg_path)
- && (bg_group)
- && (!strcmp(cbg->path, bg_path))
- && (!strcmp(cbg->group, bg_group)))
+ if (((cbg->path) && (bg_path)
+ && (!strcmp(cbg->path, bg_path))) ||
+ ((!cbg->path) && (!bg_path)))
{
-elm_genlist_item_selected_set(it, EINA_TRUE);
-return EINA_TRUE;
+if (((cbg->group) && (bg_group)
+ && (!strcmp(cbg->group, bg_group))) ||
+((!cbg->group) && (!bg_group)))
+ {
+ elm_gengrid_item_selected_set(it, EINA_TRUE);
+ return EINA_TRUE;
+ }
}
return EINA_FALSE;
}
@@ -73,12 +76,6 @@ _entrance_conf_bg_sel(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void
{
Entrance_Conf_Background *cbg;
cbg = elm_object_item_data_get(event_info);
- if (!elm_layout_file_set(_entrance_int_conf_main->bg.preview,
- cbg->path, cbg->group))
- {
-PT("Error on loading ");
-fprintf(stderr, "%s %s\n", cbg->path, cbg->group);
- }
_entrance_int_conf_main->bg.path = cbg->path;
_entrance_int_conf_main->bg.group = cbg->group;
entrance_conf_changed();
@@ -105,68 +102,43 @@ _entrance_conf_scale_changed(void *data EINA_UNUSED,
Evas_Object *obj, void *eve
entrance_conf_changed();
}
+static void
+_entrance_conf_toolbar_click(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *o = data, *old;
-static Evas_Object *
-_entrance_conf_main_build(Evas_Object *obj)
+ Eina_List *childs =
elm_box_children_get(_entrance_int_conf_main->display_area);
+ old = eina_list_data_get(childs);
+ elm_box_unpack(_entrance_int_conf_main->display_area, old);
+
+ evas_object_hide(old);
+
+ elm_box_pack_end(_entrance_int_conf_main->display_area, o);
+ evas_object_show(o);
+}
+
+static Evas_Object*
+_entrance_conf_main_general(Evas_Object *obj)
{
- Evas_Object *t, *bx, *hbx, *o, *gl;
- Eina_List *l;
- int j = 0;
+ Evas_Object *t, *o;
+ /* General */
t = elm_table_add(obj);
- elm_table_padding_set(t, 5 , 5);
+ elm_table_padding_set(t, 0, 0);
evas_object_size_hint_weight_set(t, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
- /* Background */
- o = elm_label_add(t);
- elm_object_text_set(o, "Background");
- evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
- evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_table_pack(t, o, 0, j, 1, 1);
- evas_object_show(o);
- ++j;
-
- hbx = elm_box_add(t);
- elm_box_horizontal_set(hbx, EINA_TRUE);
- elm_table_pack(t, hbx, 0, j, 2, 3);
- evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, EVAS_HINT_FILL);
- gl = elm_genlist_add(hbx);
- elm_scroller_bounce_set(gl, EINA_FALSE, EINA_TRUE);
- evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(hbx, gl);
- evas_object_show(gl);
- bx = elm_box_add(hbx);
- elm_box_pack_end(hbx, bx);
- evas_object_show(bx);
- o = elm_layout_add(hbx);
- _entrance_int_conf_main->bg.preview = o;
- elm_box_pack_end(bx, o);
- 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_show(o);
- o = evas_object_rectangle_add(hbx);
- evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_size_hint_min_set(o, 256, 0);
- elm_box_pack_end(bx, o);
- evas_object_show(o);
- evas_object_show(hbx);
- j += 3;
- l = entrance_conf_backgrounds_get(gl, NULL);
- entrance_fill(gl, entrance_conf_background_fill_get(),
-
[EGIT] [misc/entrance] master 09/09: entrance: select item 0 as standart
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=a5bf4a988e8aa3bfdb839acaf4c8b9aa34fea9e7 commit a5bf4a988e8aa3bfdb839acaf4c8b9aa34fea9e7 Author: Marcel Hollerbach Date: Wed Apr 2 17:54:43 2014 +0200 entrance: select item 0 as standart --- src/bin/entrance_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c index 3254f1d..37a1a9d 100644 --- a/src/bin/entrance_conf.c +++ b/src/bin/entrance_conf.c @@ -55,6 +55,8 @@ _entrance_conf_build(Evas_Object *naviframe, Evas_Object *segment) if (!_entrance_conf->current) _entrance_conf_promote(conf); } + itc = elm_segment_control_item_get(segment, 0); + elm_segment_control_item_selected_set(itc, EINA_TRUE); } static void --
[EGIT] [misc/entrance] master 06/09: entrance: Use the algo from gui_update also for the user background !
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=ad00fd25dfe971aff71d8c2c735b52d978e19c29
commit ad00fd25dfe971aff71d8c2c735b52d978e19c29
Author: Marcel Hollerbach
Date: Wed Apr 2 16:00:04 2014 +0200
entrance: Use the algo from gui_update also for the user background !
---
src/bin/entrance_gui.c | 84 ++
1 file changed, 50 insertions(+), 34 deletions(-)
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index 423f640..519d4be 100755
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -561,6 +561,51 @@ entrance_gui_vkbd_enabled_get(void)
return _gui->vkbd_enabled;
}
+static Evas_Object *
+_entrance_gui_background_obj_get(Evas_Object *par, const char *path, const
char *group)
+{
+ Evas_Object *bg = NULL;
+ if (group)
+ {
+if (path)
+ {
+ bg = elm_layout_add(par);
+ if (!elm_layout_file_set(bg, path, group))
+ {
+ evas_object_del(bg);
+ return NULL;
+ }
+ }
+else
+ {
+ bg = entrance_gui_theme_get(par,
+ "entrance/background/default");
+ }
+ }
+ else if (path)
+ {
+if (eina_str_has_extension(path,".edj"))
+ {
+ bg = elm_layout_add(par);
+ if (!elm_layout_file_set(bg, path, "entrance/background/default"))
+ {
+ evas_object_del(bg);
+ return NULL;
+ }
+ }
+else
+ {
+ bg = elm_bg_add(par);
+ if (!elm_bg_file_set(bg, path, NULL))
+ {
+ evas_object_del(bg);
+ return NULL;
+ }
+ }
+ }
+ return bg;
+}
+
void
entrance_gui_user_bg_set(const char *path, const char *group)
{
@@ -568,12 +613,12 @@ entrance_gui_user_bg_set(const char *path, const char
*group)
Entrance_Screen *screen;
Evas_Object *o;
+ PT("User Background - %s %s", path, group);
EINA_LIST_FOREACH(_gui->screens, l, screen)
{
-if (path && group)
+if (path || group)
{
- o = elm_layout_add(screen->background);
- elm_layout_file_set(o, path, group);
+ o = _entrance_gui_background_obj_get(screen->transition, path,
group);
elm_object_part_content_set(screen->transition,
"entrance.wallpaper.user.start", o);
evas_object_show(o);
@@ -599,38 +644,9 @@ _entrance_gui_update(void)
if (_gui->changed & ENTRANCE_CONF_WALLPAPER)
{
PT("Set background %s - %s\n", _gui->bg.path, _gui->bg.group);
- if (_gui->bg.group)
- {
- if (_gui->bg.path)
-{
- bg = elm_layout_add(screen->transition);
- success = elm_layout_file_set(bg, _gui->bg.path,
_gui->bg.group);
-}
- else
-{
- bg = entrance_gui_theme_get(screen->transition,
- "entrance/background/default");
- if (bg)
- success = EINA_TRUE;
-}
- }
- else if (_gui->bg.path)
- {
- if (eina_str_has_extension(_gui->bg.path,".edj"))
-{
- bg = elm_layout_add(screen->transition);
- success = elm_layout_file_set(bg, _gui->bg.path,
"entrance/background/default");
-}
- else
-{
- bg = elm_bg_add(screen->transition);
- success = elm_bg_file_set(bg, _gui->bg.path, NULL);
-}
- }
- if (!success)
+ bg = _entrance_gui_background_obj_get(screen->transition,
_gui->bg.path, _gui->bg.group);
+ if (!bg)
{
- if (bg)
-evas_object_del(bg);
const char *path;
const char *group;
if ((_gui->bg.group) || (_gui->bg.path))
--
[EGIT] [misc/entrance] master 08/09: entrance: warn --;
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=7b0dd225bf16c1a7018bd2c5360516253e543dde
commit 7b0dd225bf16c1a7018bd2c5360516253e543dde
Author: Marcel Hollerbach
Date: Wed Apr 2 16:24:08 2014 +0200
entrance: warn --;
---
src/bin/entrance_conf.c | 3 +--
src/bin/entrance_gui.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/bin/entrance_conf.c b/src/bin/entrance_conf.c
index 979c6a0..3254f1d 100644
--- a/src/bin/entrance_conf.c
+++ b/src/bin/entrance_conf.c
@@ -80,8 +80,7 @@ void
entrance_conf_background_title_gen(Entrance_Conf_Background *cbg)
{
char buf[PATH_MAX];
- char *group_suffix = NULL, *result;
- const char *filename = NULL;
+ const char *group_suffix = NULL, *filename = NULL;
if (cbg->path)
{
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index 519d4be..4b2d215 100755
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -640,7 +640,6 @@ _entrance_gui_update(void)
EINA_LIST_FOREACH(_gui->screens, l, screen)
{
Evas_Object *bg = NULL;
-Eina_Bool success = EINA_FALSE;
if (_gui->changed & ENTRANCE_CONF_WALLPAPER)
{
PT("Set background %s - %s\n", _gui->bg.path, _gui->bg.group);
--
[EGIT] [misc/entrance] master 04/09: entrance: Updated the user settings
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/misc/entrance.git/commit/?id=573efe360070018b1a1a91c394f78a1410f58ba5
commit 573efe360070018b1a1a91c394f78a1410f58ba5
Author: Marcel Hollerbach
Date: Wed Apr 2 12:24:43 2014 +0200
entrance: Updated the user settings
- A User can now set a Background and a Icon file !
- Images are displayed from pools
---
src/bin/entrance_conf_user.c | 181 +--
1 file changed, 140 insertions(+), 41 deletions(-)
diff --git a/src/bin/entrance_conf_user.c b/src/bin/entrance_conf_user.c
index 97ed8d8..6cc4553 100644
--- a/src/bin/entrance_conf_user.c
+++ b/src/bin/entrance_conf_user.c
@@ -5,7 +5,6 @@ typedef struct Entrance_Int_Conf_User_
Entrance_Login *orig;
struct
{
-Evas_Object *preview;
const char *path;
const char *group;
} bg;
@@ -39,17 +38,21 @@ _entrance_conf_user_bg_sel(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
{
Entrance_Conf_Background *cbg;
cbg = elm_object_item_data_get(event_info);
- if (!elm_layout_file_set(_entrance_int_conf_user->bg.preview,
- cbg->path, cbg->group))
- {
-PT("Error on loading ");
-fprintf(stderr, "%s %s\n", cbg->path, cbg->group);
- }
_entrance_int_conf_user->bg.path = cbg->path;
_entrance_int_conf_user->bg.group = cbg->group;
entrance_conf_changed();
}
+static void
+_entrance_conf_user_icon_sel(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info)
+{
+ Entrance_Conf_Background *cbg;
+ cbg = elm_object_item_data_get(event_info);
+ _entrance_int_conf_user->image.path = cbg->path;
+ _entrance_int_conf_user->image.group = cbg->group;
+ entrance_conf_changed();
+}
+
static Eina_Bool
_entrance_conf_user_bg_fill_cb(void *data, Elm_Object_Item *it)
{
@@ -57,17 +60,41 @@ _entrance_conf_user_bg_fill_cb(void *data, Elm_Object_Item
*it)
const char *bg_path, *bg_group;
cbg = data;
- bg_path = _entrance_int_conf_user->orig->bg.path;
- bg_group = _entrance_int_conf_user->orig->bg.group;
- if ((cbg->path)
- && (cbg->group)
- && (bg_path)
- && (bg_group)
- && (!strcmp(cbg->path, bg_path))
- && (!strcmp(cbg->group, bg_group)))
+ entrance_gui_background_get(&bg_path, &bg_group);
+ if (((cbg->path) && (bg_path)
+ && (!strcmp(cbg->path, bg_path))) ||
+ ((!cbg->path) && (!bg_path)))
{
-elm_genlist_item_selected_set(it, EINA_TRUE);
-return EINA_TRUE;
+if (((cbg->group) && (bg_group)
+ && (!strcmp(cbg->group, bg_group))) ||
+((!cbg->group) && (!bg_group)))
+ {
+ elm_gengrid_item_selected_set(it, EINA_TRUE);
+ return EINA_TRUE;
+ }
+ }
+ return EINA_FALSE;
+}
+
+static Eina_Bool
+_entrance_conf_user_icon_fill_cb(void *data, Elm_Object_Item *it)
+{
+ Entrance_Conf_Background *cbg;
+ const char *bg_path, *bg_group;
+ cbg = data;
+ bg_path = _entrance_int_conf_user->orig->image.path;
+ bg_group = _entrance_int_conf_user->orig->image.group;
+ if (((cbg->path) && (bg_path)
+ && (!strcmp(cbg->path, bg_path))) ||
+ ((!cbg->path) && (!bg_path)))
+ {
+if (((cbg->group) && (bg_group)
+ && (!strcmp(cbg->group, bg_group))) ||
+((!cbg->group) && (!bg_group)))
+ {
+ elm_gengrid_item_selected_set(it, EINA_TRUE);
+ return EINA_TRUE;
+ }
}
return EINA_FALSE;
}
@@ -179,51 +206,120 @@ static void
_entrance_conf_user_build_cb(Evas_Object *t, Entrance_Login *eu)
{
Evas_Object *o, *gl, *bx, *hbx;
- Eina_List *l;
+ Eina_List *l = NULL, *tmp = NULL, *node = NULL;
+ Entrance_Conf_Background *img;
int j = 0;
+ hbx = elm_box_add(t);
+ evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_horizontal_set(hbx, EINA_TRUE);
+ elm_table_pack(t, hbx, 0, j, 2, 1);
+ evas_object_show(hbx);
+ ++j;
+
/* Background */
+ bx = elm_box_add(t);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(hbx, bx);
+ evas_object_show(bx);
+
o = elm_label_add(t);
elm_object_text_set(o, "Background");
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_table_pack(t, o, 0, j, 1, 1);
+ elm_box_pack_end(bx, o);
evas_object_show(o);
- ++j;
- hbx = elm_box_add(t);
- elm_box_horizontal_set(hbx, EINA_TRUE);
- elm_table_pack(t, hbx, 0, j, 2, 1);
- ++j;
- evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(hbx, EVAS_HINT_FILL, EVAS_HINT_FILL);
- gl =
[EGIT] [core/enlightenment] master 01/01: fix client layer marker detection/usage in wayland
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3f2efbc5485a0b4d8e67ab570db24ad76a7c22e6
commit 3f2efbc5485a0b4d8e67ab570db24ad76a7c22e6
Author: Mike Blumenkrantz
Date: Wed Apr 2 11:07:22 2014 -0400
fix client layer marker detection/usage in wayland
this is the correct fix for D687
---
src/bin/e_comp_object.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index b1832e8..1b82b9a 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -969,6 +969,9 @@ _e_comp_intercept_stack_above(void *data, Evas_Object *obj,
Evas_Object *above)
cw2 = evas_object_data_get(o, "comp_obj");
while (!cw2)
{
+/* check for non-client layer object */
+if (!e_util_strcmp(evas_object_name_get(o), "layer_obj"))
+ break;
/* find an existing client to use for layering
* by walking up the object stack
*
@@ -1014,7 +1017,7 @@ _e_comp_intercept_stack_above(void *data, Evas_Object
*obj, Evas_Object *above)
}
else
_e_comp_object_layers_add(cw, NULL, NULL, 0);
- if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+ if (cw->ec->new_client || (ecstack->frame != o))
evas_object_data_set(obj, "client_restack", (void*)1);
evas_object_stack_above(obj, above);
if (cw->comp->layers[cw->layer].obj)
@@ -1022,7 +1025,7 @@ _e_comp_intercept_stack_above(void *data, Evas_Object
*obj, Evas_Object *above)
{
CRI("STACKING ERROR!!!");
}
- if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+ if (cw->ec->new_client || (ecstack->frame != o))
evas_object_data_del(obj, "client_restack");
e_comp_shape_queue(cw->comp);
}
@@ -1064,6 +1067,9 @@ _e_comp_intercept_stack_below(void *data, Evas_Object
*obj, Evas_Object *below)
cw2 = evas_object_data_get(o, "comp_obj");
while (!cw2)
{
+/* check for non-client layer object */
+if (!e_util_strcmp(evas_object_name_get(o), "layer_obj"))
+ break;
/* find an existing client to use for layering
* by walking up the object stack
*
@@ -1109,7 +1115,7 @@ _e_comp_intercept_stack_below(void *data, Evas_Object
*obj, Evas_Object *below)
}
else
_e_comp_object_layers_add(cw, NULL, NULL, 0);
- if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+ if (cw->ec->new_client || (ecstack->frame != o))
evas_object_data_set(obj, "client_restack", (void*)1);
evas_object_stack_below(obj, below);
if (cw->comp->layers[cw->layer].obj)
@@ -1117,7 +1123,7 @@ _e_comp_intercept_stack_below(void *data, Evas_Object
*obj, Evas_Object *below)
{
CRI("STACKING ERROR!!!");
}
- if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+ if (cw->ec->new_client || (ecstack->frame != o))
evas_object_data_del(obj, "client_restack");
e_comp_shape_queue(cw->comp);
}
--
[E-devel] Error when running make check
Does anyone else get this after running make check? (All the tests seem to be running fine) make[5]: execvp: /bin/sh: Argument list too long Makefile:28022: recipe for target 'test-suite.log' failed make[5]: *** [test-suite.log] Error 127 Makefile:28128: recipe for target 'check-TESTS' failed make[4]: *** [check-TESTS] Error 2 Makefile:28345: recipe for target 'check-am' failed make[3]: *** [check-am] Error 2 Makefile:27915: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 Makefile:28348: recipe for target 'check' failed make[1]: *** [check] Error 2 Makefile:1850: recipe for target 'check-recursive' failed make: *** [check-recursive] Error 1 -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: e border frames now correctly identify modal dialogs as dialogs
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2befdb318092b5223f01793293a1c4e7bcf4e942
commit 2befdb318092b5223f01793293a1c4e7bcf4e942
Author: Mike Blumenkrantz
Date: Wed Apr 2 10:30:51 2014 -0400
e border frames now correctly identify modal dialogs as dialogs
---
data/themes/edc/border.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index 1e80ef0..a66625b 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -896,6 +896,7 @@ group { name: "e/widgets/border/sparkle/border";
}
group { name: "e/widgets/border/dialog/border";
+ alias: "e/widgets/border/modal/border";
inherit: "e/widgets/border/default/border";
parts {
part { name: "max1";
--
[EGIT] [core/efl] master 01/01: Ecore X: Correctly handle autogen generated ecore_x_version.h
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a3c15be81ed222a72359e71876ecda4e307fc62a commit a3c15be81ed222a72359e71876ecda4e307fc62a Author: Tom Hacohen Date: Wed Apr 2 14:54:16 2014 +0100 Ecore X: Correctly handle autogen generated ecore_x_version.h This is by no means a built_source, and it should not be cleaned. Fixes T1148. --- src/Makefile_Ecore_X.am | 6 -- 1 file changed, 6 deletions(-) diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index 0b6d390..fcb4bb4 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -102,12 +102,6 @@ lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@ lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@ lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ -MAINTAINERCLEANFILES += \ -$(top_builddir)/src/lib/ecore_x/ecore_x_version.h - -BUILT_SOURCES += \ -$(top_builddir)/src/lib/ecore_x/ecore_x_version.h - if HAVE_ECORE_X_XCB MAINTAINERCLEANFILES += \ $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h \ --
[EGIT] [core/efl] master 01/01: Ecore audio: Fix casting of int to void *.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a77c614c7f605a1a519887368f80714cdd542273
commit a77c614c7f605a1a519887368f80714cdd542273
Author: Tom Hacohen
Date: Wed Apr 2 14:34:47 2014 +0100
Ecore audio: Fix casting of int to void *.
When doing that, intptr_t shoud be used as well.
---
src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 8ba55ad..60f6348 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -99,7 +99,7 @@ EOLIAN static void*
_ecore_audio_in_tone_eo_base_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data
*obj, const char *key)
{
if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
- return (void *)obj->freq;
+ return (void *) (intptr_t) obj->freq;
} else {
void *ret = NULL;
eo_do_super(eo_obj, MY_CLASS, eo_base_data_get(key, &ret));
--
[EGIT] [core/enlightenment] master 01/01: remove unused comp object variable use and function call in show helper
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=597aec171033dd96e041fa344b0ecee97b665d50
commit 597aec171033dd96e041fa344b0ecee97b665d50
Author: Seunghun Lee
Date: Wed Apr 2 09:27:13 2014 -0400
remove unused comp object variable use and function call in show helper
Reviewers: zmike
Differential Revision: https://phab.enlightenment.org/D686
---
src/bin/e_comp_object.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 9c5fce0..b1832e8 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1226,7 +1226,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
static void
_e_comp_intercept_show_helper(E_Comp_Object *cw)
{
- int w = 0, h = 0, pw, ph;
+ int w = 0, h = 0;
if (cw->ec->sticky)
e_comp_object_signal_emit(cw->smart_obj, "e,state,sticky", "e");
@@ -1264,7 +1264,6 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
EC_CHANGED(cw->ec);
return;
}
- e_pixmap_size_get(cw->ec->pixmap, &pw, &ph);
if (!e_pixmap_size_get(cw->ec->pixmap, &w, &h))
e_pixmap_clear(cw->ec->pixmap);
--
[EGIT] [website/www] master 02/02: Add Manjaro community edition to distribution listing
leif pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=8dc80b8ad4e0c04bfffc68b9f128bd3a416dd66d commit 8dc80b8ad4e0c04bfffc68b9f128bd3a416dd66d Author: Leif Middelschulte Date: Wed Apr 2 15:14:07 2014 +0200 Add Manjaro community edition to distribution listing --- public_html/p/download/en-body | 1 + 1 file changed, 1 insertion(+) diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index 6c7b138..fd438b4 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -206,6 +206,7 @@ http://www.pclinuxos.com/>PCLinuxOS http://www.sabayon.org/>Sabayon http://www.yellowdoglinux.com/>Yellow Dog + http://manjaro.org/>Manjaro (community edition) --
[EGIT] [website/www] master 01/02: Remove moon os. It seems dead.
leif pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=dd112fc87e027e5acc68d359ccc9afa43bcc6c28 commit dd112fc87e027e5acc68d359ccc9afa43bcc6c28 Author: Leif Middelschulte Date: Wed Apr 2 15:12:39 2014 +0200 Remove moon os. It seems dead. --- public_html/p/download/en-body | 1 - 1 file changed, 1 deletion(-) diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index 2f61809..6c7b138 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -202,7 +202,6 @@ http://www.elivecd.org/>Elive http://humanitye17linux.wordpress.com>HUMANity http://macpup.org/>Macpup - http://moonos.org/>MoonOS http://www.pentoo.ch/>Pentoo http://www.pclinuxos.com/>PCLinuxOS http://www.sabayon.org/>Sabayon --
[EGIT] [core/efl] master 04/07: Eolian: Integration of Ecore Audio In Sndfile
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6295d77a3c7d20c94a5d460692be30139784935b
commit 6295d77a3c7d20c94a5d460692be30139784935b
Author: Yossi Kantor
Date: Wed Mar 26 18:30:35 2014 +0200
Eolian: Integration of Ecore Audio In Sndfile
---
src/Makefile_Ecore_Audio.am | 10 +-
src/lib/ecore_audio/ecore_audio_in_sndfile.eo| 15 +++
src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c | 139 ++-
src/lib/ecore_audio/ecore_audio_obj_in_sndfile.h | 3 +
4 files changed, 57 insertions(+), 110 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index f5efa95..d3e2d67 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -8,13 +8,16 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio_in.eo.c \
lib/ecore_audio/ecore_audio_in.eo.h \
lib/ecore_audio/ecore_audio_out.eo.c \
- lib/ecore_audio/ecore_audio_out.eo.h
+ lib/ecore_audio/ecore_audio_out.eo.h \
+ lib/ecore_audio/ecore_audio_in_sndfile.eo.c \
+ lib/ecore_audio/ecore_audio_in_sndfile.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio.eo \
lib/ecore_audio/ecore_audio_in.eo \
- lib/ecore_audio/ecore_audio_out.eo
+ lib/ecore_audio/ecore_audio_out.eo \
+ lib/ecore_audio/ecore_audio_in_sndfile.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -33,7 +36,8 @@ lib/ecore_audio/ecore_audio_protected.h
nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio.eo.h \
lib/ecore_audio/ecore_audio_in.eo.h \
-lib/ecore_audio/ecore_audio_out.eo.h
+lib/ecore_audio/ecore_audio_out.eo.h \
+
lib/ecore_audio/ecore_audio_in_sndfile.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
new file mode 100644
index 000..296a3e3
--- /dev/null
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -0,0 +1,15 @@
+class Ecore_Audio_In_Sndfile (Ecore_Audio_In)
+{
+ eo_prefix: ecore_audio_obj_in_sndfile;
+ implements {
+ Eo_Base::constructor;
+ Eo_Base::destructor;
+ Ecore_Audio::source::set;
+ Ecore_Audio::source::get;
+ Ecore_Audio::format::set;
+ Ecore_Audio::format::get;
+ Ecore_Audio::vio_set;
+ Ecore_Audio_In::seek;
+ Ecore_Audio_In::read_internal;
+ }
+}
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
index 4f8e711..d18908d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c
@@ -14,64 +14,42 @@
#include "ecore_audio_private.h"
#include
-EAPI Eo_Op ECORE_AUDIO_OBJ_IN_SNDFILE_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS
#define MY_CLASS_NAME "Ecore_Audio_In_Sndfile"
extern SF_VIRTUAL_IO vio_wrapper;
-struct _Ecore_Audio_Sndfile
+struct _Ecore_Audio_In_Sndfile_Data
{
SNDFILE *handle;
SF_INFO sfinfo;
};
-typedef struct _Ecore_Audio_Sndfile Ecore_Audio_Sndfile;
+typedef struct _Ecore_Audio_In_Sndfile_Data Ecore_Audio_In_Sndfile_Data;
-static void _sndfile_read(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static ssize_t
+_ecore_audio_in_sndfile_ecore_audio_in_read_internal(Eo *eo_obj EINA_UNUSED,
Ecore_Audio_In_Sndfile_Data *obj, void *data, size_t len)
{
- Ecore_Audio_Sndfile *obj = _pd;
- int read;
- void *data = va_arg(*list, void *);
- size_t len = va_arg(*list, size_t);
- ssize_t *ret = va_arg(*list, ssize_t *);
-
- read = sf_read_float(obj->handle, data, len/4)*4;
-
- if (ret)
-*ret = read;
+ return sf_read_float(obj->handle, data, len/4)*4;
}
-static void _seek(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static double
+_ecore_audio_in_sndfile_ecore_audio_in_seek(Eo *eo_obj EINA_UNUSED,
Ecore_Audio_In_Sndfile_Data *obj, double offs, int mode)
{
- Ecore_Audio_Sndfile *obj = _pd;
sf_count_t count, pos;
- double offs = va_arg(*list, double);
- int mode = va_arg(*list, int);
- double *ret = va_arg(*list, double *);
-
count = offs * obj->sfinfo.samplerate;
pos = sf_seek(obj->handle, count, mode);
- if (ret)
-*ret = (double)pos / obj->sfinfo.samplerate;
+ return (double)pos / obj->sfinfo.samplerate;
}
-static void _source_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_in_sndfile_ecore_audi
[EGIT] [core/efl] master 06/07: Eolian: Integration of Ecore Audio Out Pulse
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7876846f016b3e1d3a4104723361763f2697eb3b
commit 7876846f016b3e1d3a4104723361763f2697eb3b
Author: Yossi Kantor
Date: Thu Mar 27 13:34:01 2014 +0200
Eolian: Integration of Ecore Audio Out Pulse
---
src/Makefile_Ecore_Audio.am | 10 ++-
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 100 ++--
src/lib/ecore_audio/ecore_audio_obj_out_pulse.h | 6 +-
src/lib/ecore_audio/ecore_audio_out_pulse.eo| 15
4 files changed, 48 insertions(+), 83 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 68ef281..2696d9b 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -12,7 +12,9 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio_in_sndfile.eo.c \
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
lib/ecore_audio/ecore_audio_out_sndfile.eo.c \
- lib/ecore_audio/ecore_audio_out_sndfile.eo.h
+ lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
+ lib/ecore_audio/ecore_audio_out_pulse.eo.c \
+ lib/ecore_audio/ecore_audio_out_pulse.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
@@ -20,7 +22,8 @@ ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio_in.eo \
lib/ecore_audio/ecore_audio_out.eo \
lib/ecore_audio/ecore_audio_in_sndfile.eo \
- lib/ecore_audio/ecore_audio_out_sndfile.eo
+ lib/ecore_audio/ecore_audio_out_sndfile.eo \
+ lib/ecore_audio/ecore_audio_out_pulse.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -41,7 +44,8 @@ nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio_in.eo.h \
lib/ecore_audio/ecore_audio_out.eo.h \
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
-
lib/ecore_audio/ecore_audio_out_sndfile.eo.h
+
lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
+
lib/ecore_audio/ecore_audio_out_pulse.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
index f94f499..8e7fc6d 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_pulse.c
@@ -20,19 +20,9 @@
extern pa_mainloop_api functable;
-EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_PULSE_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_PULSE_CLASS
#define MY_CLASS_NAME "Ecore_Audio_Out_Pulse"
-EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY =
- EO_EVENT_DESCRIPTION("context,ready", "Called when the output is ready for
playback.");
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY
(&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY))
-EAPI const Eo_Event_Description _ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL =
- EO_EVENT_DESCRIPTION("context,fail", "Called when context fails.");
-#define ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL
(&(_ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_FAIL))
-
-
struct _Ecore_Audio_Pulse_Class {
pa_mainloop_api *api;
pa_context *context;
@@ -45,14 +35,15 @@ static struct _Ecore_Audio_Pulse_Class class_vars = {
.api = &functable,
};
-struct _Ecore_Audio_Pulse
+struct _Ecore_Audio_Out_Pulse_Data
{
char *foo;
};
-typedef struct _Ecore_Audio_Pulse Ecore_Audio_Pulse;
+typedef struct _Ecore_Audio_Out_Pulse_Data Ecore_Audio_Out_Pulse_Data;
-static void _volume_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static void
+_ecore_audio_out_pulse_ecore_audio_volume_set(Eo *eo_obj,
Ecore_Audio_Out_Pulse_Data *_pd EINA_UNUSED, double volume)
{
Eo *in;
pa_stream *stream;
@@ -61,8 +52,6 @@ static void _volume_set(Eo *eo_obj, void *_pd EINA_UNUSED,
va_list *list)
pa_cvolume pa_volume;
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_OUT_CLASS);
- double volume = va_arg(*list, double);
-
if (volume < 0)
volume = 0;
@@ -158,28 +147,26 @@ static Eina_Bool _input_attach_internal(Eo *eo_obj, Eo
*in)
static Eina_Bool _delayed_attach_cb(void *data, Eo *eo_obj, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Eo *in = data;
- eo_do(eo_obj, eo_event_callback_del(ECORE_AUDIO_EV_OUT_PULSE_CONTEXT_READY,
_delayed_attach_cb, in));
+ eo_do(eo_obj,
eo_event_callback_del(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_READY,
_delayed_attach_cb, in));
_input_attach_internal(eo_obj, in);
return EINA_TRUE;
}
-static void _input_attach(Eo *eo_obj, void *_p
[EGIT] [core/efl] master 05/07: Eolian: Integration of Ecore Audio Out Sndfile
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=88860a209e1bb7dd292f58ab653e496a8b44e3b6
commit 88860a209e1bb7dd292f58ab653e496a8b44e3b6
Author: Yossi Kantor
Date: Thu Mar 27 11:53:26 2014 +0200
Eolian: Integration of Ecore Audio Out Sndfile
---
src/Makefile_Ecore_Audio.am | 10 +-
src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c | 127 ++
src/lib/ecore_audio/ecore_audio_obj_out_sndfile.h | 3 +
src/lib/ecore_audio/ecore_audio_out_sndfile.eo| 13 +++
4 files changed, 54 insertions(+), 99 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index d3e2d67..68ef281 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -10,14 +10,17 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio_out.eo.c \
lib/ecore_audio/ecore_audio_out.eo.h \
lib/ecore_audio/ecore_audio_in_sndfile.eo.c \
- lib/ecore_audio/ecore_audio_in_sndfile.eo.h
+ lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
+ lib/ecore_audio/ecore_audio_out_sndfile.eo.c \
+ lib/ecore_audio/ecore_audio_out_sndfile.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio.eo \
lib/ecore_audio/ecore_audio_in.eo \
lib/ecore_audio/ecore_audio_out.eo \
- lib/ecore_audio/ecore_audio_in_sndfile.eo
+ lib/ecore_audio/ecore_audio_in_sndfile.eo \
+ lib/ecore_audio/ecore_audio_out_sndfile.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -37,7 +40,8 @@ nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio.eo.h \
lib/ecore_audio/ecore_audio_in.eo.h \
lib/ecore_audio/ecore_audio_out.eo.h \
-
lib/ecore_audio/ecore_audio_in_sndfile.eo.h
+
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
+
lib/ecore_audio/ecore_audio_out_sndfile.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
index 282c22a..d1ca3b5 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c
@@ -14,28 +14,26 @@
#include "ecore_audio_private.h"
#include
-EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_SNDFILE_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS
#define MY_CLASS_NAME "Ecore_Audio_Out_Sndfile"
extern SF_VIRTUAL_IO vio_wrapper;
-struct _Ecore_Audio_Sndfile
+struct _Ecore_Audio_Out_Sndfile_Data
{
SNDFILE *handle;
SF_INFO sfinfo;
Ecore_Audio_Vio *vio;
};
-typedef struct _Ecore_Audio_Sndfile Ecore_Audio_Sndfile;
+typedef struct _Ecore_Audio_Out_Sndfile_Data Ecore_Audio_Out_Sndfile_Data;
static Eina_Bool _write_cb(void *data)
{
Eo *eo_obj = data;
Eo *in;
- Ecore_Audio_Sndfile *obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS);
+ Ecore_Audio_Out_Sndfile_Data *obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS);
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_OUT_CLASS);
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_CLASS);
@@ -61,22 +59,16 @@ static Eina_Bool _write_cb(void *data)
return EINA_TRUE;
}
-static void _input_attach(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_out_sndfile_ecore_audio_out_input_attach(Eo *eo_obj,
Ecore_Audio_Out_Sndfile_Data *obj, Eo *in)
{
- Ecore_Audio_Sndfile *obj = _pd;
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_CLASS);
Ecore_Audio_Output *out_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_OUT_CLASS);
Eina_Bool ret2;
- Eo *in = va_arg(*list, Eo *);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
- if (ret)
-*ret = EINA_FALSE;
-
eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_attach(in, &ret2));
if (!ret2)
-return;
+return EINA_FALSE;
eo_do(in, ecore_audio_obj_in_samplerate_get(&obj->sfinfo.samplerate));
eo_do(in, ecore_audio_obj_in_channels_get(&obj->sfinfo.channels));
@@ -87,32 +79,24 @@ static void _input_attach(Eo *eo_obj, void *_pd, va_list
*list)
eina_stringshare_del(ea_obj->source);
ea_obj->source = NULL;
eo_do_super(eo_obj, MY_CLASS, ecore_audio_obj_out_input_detach(in, NULL));
-return;
+return EINA_FALSE;
}
- if (ret)
-*ret = EINA_TRUE;
-
if (ea_obj->paused)
-return;
+return EINA_TRUE;
if (out_obj->inputs) {
[EGIT] [core/efl] master 01/07: Eolian: Integration of Ecore Audio
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=eb2821bca0eb6e67e8c2bfe345f923bc419bbfa5
commit eb2821bca0eb6e67e8c2bfe345f923bc419bbfa5
Author: Yossi Kantor
Date: Wed Mar 26 10:17:38 2014 +0200
Eolian: Integration of Ecore Audio
---
src/Makefile_Ecore_Audio.am | 15 +++-
src/lib/ecore_audio/ecore_audio.eo| 132 ++
src/lib/ecore_audio/ecore_audio_obj.c | 107 +--
src/lib/ecore_audio/ecore_audio_obj.h | 4 +-
4 files changed, 167 insertions(+), 91 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 35a414c..737485b 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -2,6 +2,17 @@ if HAVE_ECORE_AUDIO
### Library
+BUILT_SOURCES += \
+ lib/ecore_audio/ecore_audio.eo.c \
+ lib/ecore_audio/ecore_audio.eo.h
+
+ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
+ecore_audioeolianfiles_DATA = \
+ lib/ecore_audio/ecore_audio.eo
+
+EXTRA_DIST += \
+ ${ecore_audioeolianfiles_DATA}
+
lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
installed_ecoreaudiomainheadersdir = $(includedir)/ecore-audio-@VMAJ@
@@ -13,7 +24,9 @@ lib/ecore_audio/ecore_audio_obj_out.h \
lib/ecore_audio/ecore_audio_obj_in_tone.h \
lib/ecore_audio/ecore_audio_protected.h
-
+nodist_installed_ecoreaudiomainheaders_DATA = \
+lib/ecore_audio/ecore_audio.eo.h
+
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
lib/ecore_audio/ecore_audio_obj.c \
diff --git a/src/lib/ecore_audio/ecore_audio.eo
b/src/lib/ecore_audio/ecore_audio.eo
new file mode 100644
index 000..6c2d705
--- /dev/null
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -0,0 +1,132 @@
+class Ecore_Audio (Eo_Base)
+{
+ eo_prefix: ecore_audio_obj;
+ data: Ecore_Audio_Object;
+ properties {
+ name {
+ set {
+/*@
+Set the name of the object
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the name of the object
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+const char *name;
+ }
+ }
+ paused {
+ set {
+/*@
+Set the pause state of the object
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the pause state of the object
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+Eina_Bool paused; /*ret EINA_TRUE if object is paused, EINA_FALSE
if not*/
+ }
+ }
+ volume {
+ set {
+/*@
+Set the volume of the object
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the volume of the object
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+double volume; /*The volume*/
+ }
+ }
+ source {
+ set {
+/*@
+Set the source of the object
+
+What sources are supported depends on the actual object. For
example,
+the libsndfile class accepts WAV, OGG, FLAC files as source.
+
+@since 1.8 */
+legacy null;
+return Eina_Bool; /*EINA_TRUE if the source was set correctly
(i.e. the file was opened), EINA_FALSE otherwise*/
+ }
+ get {
+/*@
+Get the source of the object
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+const char *source; /*The source to set to (i.e. file, URL,
device)*/
+ }
+ }
+ format {
+ set {
+/*@
+Set the format of the object
+
+What formats are supported depends on the actual object. Default is
+ECORE_AUDIO_FORMAT_AUTO
+
+@since 1.8 */
+legacy null;
+return Eina_Bool; /*EINA_TRUE if the format was supported,
EINA_FALSE otherwise*/
+ }
+ get {
+/*@
+Get the format of the object
+
+After setting the source if the format was ECORE_AUDIO_FORMAT_AUTO
this
+function will now return the actual format.
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+Ecore_Audio_Format format; /*The format of the object*/
+ }
+ }
+ }
+ methods {
+ vio_set {
+ /*@
+ Set the virtual IO functions
+
+ @since 1.8 */
+ params
[EGIT] [core/efl] master 07/07: Eolian: Integration of Ecore Audio In Tone
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=07da26add95398a7c8b060c0bdf2aba0d65c03a0
commit 07da26add95398a7c8b060c0bdf2aba0d65c03a0
Author: Yossi Kantor
Date: Thu Mar 27 14:05:41 2014 +0200
Eolian: Integration of Ecore Audio In Tone
---
src/Makefile_Ecore_Audio.am | 10 ++-
src/lib/ecore_audio/ecore_audio_in_tone.eo| 12 +++
src/lib/ecore_audio/ecore_audio_obj_in_tone.c | 108 ++
src/lib/ecore_audio/ecore_audio_obj_in_tone.h | 4 +-
4 files changed, 45 insertions(+), 89 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 2696d9b..1f2d3f2 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -14,7 +14,9 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio_out_sndfile.eo.c \
lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
lib/ecore_audio/ecore_audio_out_pulse.eo.c \
- lib/ecore_audio/ecore_audio_out_pulse.eo.h
+ lib/ecore_audio/ecore_audio_out_pulse.eo.h \
+ lib/ecore_audio/ecore_audio_in_tone.eo.c \
+ lib/ecore_audio/ecore_audio_in_tone.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
@@ -23,7 +25,8 @@ ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio_out.eo \
lib/ecore_audio/ecore_audio_in_sndfile.eo \
lib/ecore_audio/ecore_audio_out_sndfile.eo \
- lib/ecore_audio/ecore_audio_out_pulse.eo
+ lib/ecore_audio/ecore_audio_out_pulse.eo \
+ lib/ecore_audio/ecore_audio_in_tone.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -45,7 +48,8 @@ nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio_out.eo.h \
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
-
lib/ecore_audio/ecore_audio_out_pulse.eo.h
+
lib/ecore_audio/ecore_audio_out_pulse.eo.h \
+
lib/ecore_audio/ecore_audio_in_tone.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo
b/src/lib/ecore_audio/ecore_audio_in_tone.eo
new file mode 100644
index 000..6b3e489
--- /dev/null
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -0,0 +1,12 @@
+class Ecore_Audio_In_Tone (Ecore_Audio_In)
+{
+ eo_prefix: ecore_audio_obj_in_tone;
+ implements {
+ Eo_Base::constructor;
+ Eo_Base::data_set;
+ Eo_Base::data_get;
+ Ecore_Audio_In::length::set;
+ Ecore_Audio_In::seek;
+ Ecore_Audio_In::read_internal;
+ }
+}
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 3d97134..8ba55ad 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -14,30 +14,23 @@
#include "ecore_audio_private.h"
#include
-EAPI Eo_Op ECORE_AUDIO_OBJ_IN_TONE_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_IN_TONE_CLASS
#define MY_CLASS_NAME "Ecore_Audio_In_Tone"
-struct _Ecore_Audio_Tone
+struct _Ecore_Audio_In_Tone_Data
{
int freq;
int phase;
};
-typedef struct _Ecore_Audio_Tone Ecore_Audio_Tone;
+typedef struct _Ecore_Audio_In_Tone_Data Ecore_Audio_In_Tone_Data;
-static void _tone_read(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static ssize_t
+_ecore_audio_in_tone_ecore_audio_in_read_internal(Eo *eo_obj,
Ecore_Audio_In_Tone_Data *obj, void *data, size_t len)
{
- int i, remain;
- Ecore_Audio_Tone *obj = _pd;
+ size_t i, remain;
Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_IN_CLASS);
-
- void *data = va_arg(*list, void *);
- int len = va_arg(*list, int);
- int *ret = va_arg(*list, int *);
-
float *val = data;
remain = in_obj->length * in_obj->samplerate * 4 - obj->phase * 4;
@@ -50,20 +43,15 @@ static void _tone_read(Eo *eo_obj, void *_pd, va_list *list)
obj->phase += i;
- if (ret)
-*ret = remain;
+ return remain;
}
-static void _seek(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static double
+_ecore_audio_in_tone_ecore_audio_in_seek(Eo *eo_obj, Ecore_Audio_In_Tone_Data
*obj, double offs, int mode)
{
int tmp;
- Ecore_Audio_Tone *obj = _pd;
Ecore_Audio_Input *in_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_IN_CLASS);
- double offs = va_arg(*list, double);
- int mode = va_arg(*list, int);
- double *ret = va_arg(*list, double *);
-
switch (mode) {
case SEEK_SET:
tmp = offs * in_obj->samplerate;
@@ -82,32 +70,2
[EGIT] [core/efl] master 03/07: Eolian: Integration of Ecore Audio Out
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=70b39368e61e6740e741f8ff34bb0c1bddbaaacd
commit 70b39368e61e6740e741f8ff34bb0c1bddbaaacd
Author: Yossi Kantor
Date: Wed Mar 26 18:01:36 2014 +0200
Eolian: Integration of Ecore Audio Out
---
src/Makefile_Ecore_Audio.am | 10 ++-
src/lib/ecore_audio/ecore_audio_obj_out.c | 100 ++
src/lib/ecore_audio/ecore_audio_obj_out.h | 3 +
src/lib/ecore_audio/ecore_audio_out.eo| 42 +
src/tests/ecore/ecore_test_ecore_audio.c | 2 +-
5 files changed, 71 insertions(+), 86 deletions(-)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 6124f34..f5efa95 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -6,12 +6,15 @@ BUILT_SOURCES += \
lib/ecore_audio/ecore_audio.eo.c \
lib/ecore_audio/ecore_audio.eo.h \
lib/ecore_audio/ecore_audio_in.eo.c \
- lib/ecore_audio/ecore_audio_in.eo.h
+ lib/ecore_audio/ecore_audio_in.eo.h \
+ lib/ecore_audio/ecore_audio_out.eo.c \
+ lib/ecore_audio/ecore_audio_out.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
lib/ecore_audio/ecore_audio.eo \
- lib/ecore_audio/ecore_audio_in.eo
+ lib/ecore_audio/ecore_audio_in.eo \
+ lib/ecore_audio/ecore_audio_out.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -29,7 +32,8 @@ lib/ecore_audio/ecore_audio_protected.h
nodist_installed_ecoreaudiomainheaders_DATA = \
lib/ecore_audio/ecore_audio.eo.h \
-lib/ecore_audio/ecore_audio_in.eo.h
+lib/ecore_audio/ecore_audio_in.eo.h \
+lib/ecore_audio/ecore_audio_out.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio_obj_out.c
b/src/lib/ecore_audio/ecore_audio_obj_out.c
index b269411..40d1600 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_out.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_out.c
@@ -14,8 +14,6 @@
#include "ecore_audio_private.h"
-EAPI Eo_Op ECORE_AUDIO_OBJ_OUT_BASE_ID = EO_NOOP;
-
#define MY_CLASS ECORE_AUDIO_OBJ_OUT_CLASS
#define MY_CLASS_NAME "Ecore_Audio_Out"
@@ -51,23 +49,17 @@ static Eina_Bool _write_cb(void *data)
return EINA_TRUE;
}
-static void _input_attach(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_out_input_attach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
{
- Ecore_Audio_Output *obj = _pd;
Ecore_Audio_Input *in;
Ecore_Audio_Object *ea_obj = eo_data_scope_get(eo_obj,
ECORE_AUDIO_OBJ_CLASS);
- Eo *input = va_arg(*list, Eo *);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS);
- if (ret)
-*ret = EINA_FALSE;
-
if (in->output == eo_obj)
-return;
+return EINA_FALSE;
if (in->output) eo_do(in->output, ecore_audio_obj_out_input_detach(input,
NULL));
in->output = eo_obj;
@@ -81,25 +73,18 @@ static void _input_attach(Eo *eo_obj, void *_pd, va_list
*list)
obj->write_idler = ecore_idler_add(_write_cb, eo_obj);
- if (ret)
-*ret = EINA_TRUE;
+ return EINA_TRUE;
}
-static void _input_detach(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static Eina_Bool
+_ecore_audio_out_input_detach(Eo *eo_obj, Ecore_Audio_Output *obj, Eo *input)
{
- Ecore_Audio_Output *obj = _pd;
Ecore_Audio_Input *in;
- Eo *input = va_arg(*list, Eo *);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
in = eo_data_scope_get(input, ECORE_AUDIO_OBJ_IN_CLASS);
- if (ret)
-*ret = EINA_FALSE;
-
if (in->output != eo_obj)
-return;
+return EINA_FALSE;
in->output = NULL;
@@ -109,18 +94,13 @@ static void _input_detach(Eo *eo_obj, void *_pd, va_list
*list)
obj->inputs = eina_list_remove(obj->inputs, input);
- if (ret)
-*ret = EINA_TRUE;
+ return EINA_TRUE;
}
-static void _inputs_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static Eina_List *
+_ecore_audio_out_inputs_get(Eo *eo_obj EINA_UNUSED, Ecore_Audio_Output *obj)
{
- const Ecore_Audio_Output *obj = _pd;
-
- Eina_List **inputs = va_arg(*list, Eina_List **);
-
- if (inputs)
-*inputs = obj->inputs;
+ return obj->inputs;
}
static void _free_vio(Ecore_Audio_Object *ea_obj)
@@ -132,14 +112,11 @@ static void _free_vio(Ecore_Audio_Object *ea_obj)
ea_obj->vio = NULL;
}
-static void _vio_set(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static void
+_ecore_audio_out_ecore_audio_vio_set(Eo *eo_obj, Ecore_Audio_Output *_pd
EINA_UNUSED, Ecore_Audio_Vio *vio, void *data, eo_base_data_free_
[EGIT] [core/efl] master 02/07: Eolian: Integration of Ecore Audio In
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2c8bc8df52d7d5774475e01c4c296145c1581f13
commit 2c8bc8df52d7d5774475e01c4c296145c1581f13
Author: Yossi Kantor
Date: Wed Mar 26 17:01:08 2014 +0200
Eolian: Integration of Ecore Audio In
---
src/Makefile.am | 3 +-
src/Makefile_Ecore_Audio.am | 10 +-
src/lib/ecore_audio/ecore_audio.eo | 7 +-
src/lib/ecore_audio/ecore_audio_in.eo | 205
src/lib/ecore_audio/ecore_audio_obj_in.c| 236 +---
src/lib/ecore_audio/ecore_audio_obj_in.h| 6 +-
src/lib/ecore_audio/ecore_audio_obj_out_pulse.c | 2 +-
src/lib/ecore_audio/ecore_audio_protected.h | 2 -
src/tests/ecore/ecore_test_ecore_audio.c| 8 +-
9 files changed, 278 insertions(+), 201 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 58270c7..60d4b3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,8 @@ BUILT_SOURCES =
EOLIAN_FLAGS = \
-I$(srcdir)/lib/eo \
-I$(srcdir)/lib/evas/canvas \
- -I$(srcdir)/lib/edje
+ -I$(srcdir)/lib/edje \
+ -I$(srcdir)/lib/ecore_audio
DIST_SUBDIRS =
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 737485b..6124f34 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -4,11 +4,14 @@ if HAVE_ECORE_AUDIO
BUILT_SOURCES += \
lib/ecore_audio/ecore_audio.eo.c \
- lib/ecore_audio/ecore_audio.eo.h
+ lib/ecore_audio/ecore_audio.eo.h \
+ lib/ecore_audio/ecore_audio_in.eo.c \
+ lib/ecore_audio/ecore_audio_in.eo.h
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = \
- lib/ecore_audio/ecore_audio.eo
+ lib/ecore_audio/ecore_audio.eo \
+ lib/ecore_audio/ecore_audio_in.eo
EXTRA_DIST += \
${ecore_audioeolianfiles_DATA}
@@ -25,7 +28,8 @@ lib/ecore_audio/ecore_audio_obj_in_tone.h \
lib/ecore_audio/ecore_audio_protected.h
nodist_installed_ecoreaudiomainheaders_DATA = \
-lib/ecore_audio/ecore_audio.eo.h
+lib/ecore_audio/ecore_audio.eo.h \
+lib/ecore_audio/ecore_audio_in.eo.h
lib_ecore_audio_libecore_audio_la_SOURCES = \
lib/ecore_audio/ecore_audio.c \
diff --git a/src/lib/ecore_audio/ecore_audio.eo
b/src/lib/ecore_audio/ecore_audio.eo
index 6c2d705..4f85787 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -116,6 +116,7 @@ class Ecore_Audio (Eo_Base)
Set the virtual IO functions
@since 1.8 */
+ legacy null;
params {
Ecore_Audio_Vio *vio; /*The @ref Ecore_Audio_Vio struct with the
function callbacks*/
void *data; /*User data to pass to the VIO functions*/
@@ -125,8 +126,10 @@ class Ecore_Audio (Eo_Base)
}
implements {
Eo_Base::constructor;
- virtual::source;
- virtual::format;
+ virtual::source::get;
+ virtual::source::set;
+ virtual::format::get;
+ virtual::format::set;
virtual::vio_set;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo
b/src/lib/ecore_audio/ecore_audio_in.eo
new file mode 100644
index 000..3b8f683
--- /dev/null
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -0,0 +1,205 @@
+class Ecore_Audio_In (Ecore_Audio)
+{
+ eo_prefix: ecore_audio_obj_in;
+ data: Ecore_Audio_Input;
+ properties {
+ speed {
+ set {
+/*@
+Set the playback speed of the input.
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the playback speed of the input.
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+double speed; /*The speed, 1.0 is the default*/
+ }
+ }
+ samplerate {
+ set {
+/*@
+Set the sample-rate of the input
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the he sample-rate of the input
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+int samplerate; /*The samplerate in Hz*/
+ }
+ }
+ channels {
+ set {
+/*@
+Set the amount of channels the input has
+
+@since 1.8 */
+legacy null;
+ }
+ get {
+/*@
+Get the amount of channels the input has
+
+@since 1.8 */
+legacy null;
+ }
+ values {
+int chann
Re: [E-devel] Terminology Configuration Enhancement
Hi, On 2014-04-01 23:11, Jason Cook wrote: > Hi all, > > I have added a configuration option to terminology that allows the > user to turn off the 'Active Links' functionality, meaning that paths > and URLs won't start blinking when beneath the mouse cursor, nor will > they be active if clicked. Does the community consider this > configuration option valuable enough for inclusion into the source? This is something I dream about. That auto xdg-open of selected files is really annoying me when doing a lot of (file/directory) text copy and paste during the whole day. URL link open is useful when xdg-open is really annoying and make me curse on Terminoly. Thanks Jason -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: add hand1 cursor theme element and ensure elm cursor code actually works
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b1040a688b9b8cc028f6f2bebf65a6bb51486901
commit b1040a688b9b8cc028f6f2bebf65a6bb51486901
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 2 20:48:32 2014 +0900
add hand1 cursor theme element and ensure elm cursor code actually works
this adds a hand1 sample cursor theme/image so the theme can find
cursors, (more should be added later), and now actually makes the elm
cursor handling properly set the cursor and update the hotx/y as
needed by tracking the hot swallow object. this relies on a fix in efl
as well.
---
data/themes/Makefile.am | 2 +
data/themes/default.edc | 1 +
data/themes/edc/elm/cursor.edc| 101 ++
data/themes/img/pointer_hand1.png | Bin 0 -> 1382 bytes
src/bin/test_cursor.c | 2 +-
src/lib/els_cursor.c | 61 ---
6 files changed, 148 insertions(+), 19 deletions(-)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2139b9b..444ea83 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -103,6 +103,7 @@ edc/elm/clock.edc \
edc/elm/colorsel.edc \
edc/elm/conform.edc \
edc/elm/ctxpopup.edc \
+edc/elm/cursor.edc \
edc/elm/datetime.edc \
edc/elm/dayselector.edc \
edc/elm/diskselector.edc \
@@ -508,6 +509,7 @@ img/pointer_entry_bar.png \
img/pointer_glow.png \
img/pointer_mono.png \
img/pointer.png \
+img/pointer_hand1.png \
img/ring_shadow.png \
img/ring_white_blue_glow.png \
img/ring_white_middle.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 09a26c5..953de8b 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -68,6 +68,7 @@ collections {
#include "edc/elm/clock.edc"
#include "edc/elm/gengrid.edc"
#include "edc/elm/hover.edc"
+#include "edc/elm/cursor.edc"
// desktop in general
#include "edc/wallpaper.edc"
diff --git a/data/themes/edc/elm/cursor.edc b/data/themes/edc/elm/cursor.edc
new file mode 100644
index 000..ea7bc11
--- /dev/null
+++ b/data/themes/edc/elm/cursor.edc
@@ -0,0 +1,101 @@
+// cursors available:
+//
+// "x"
+// "arrow"
+// "based_arrow_down"
+// "based_arrow_up"
+// "boat"
+// "bogosity"
+// "bottom_left_corner"
+// "bottom_right_corner"
+// "bottom_side"
+// "bottom_tee"
+// "box_spiral"
+// "center_ptr"
+// "circle"
+// "clock"
+// "coffee_mug"
+// "cross"
+// "cross_reverse"
+// "crosshair"
+// "diamond_cross"
+// "dot"
+// "dot_box_mask"
+// "double_arrow"
+// "draft_large"
+// "draft_small"
+// "draped_box"
+// "exchange"
+// "fleur"
+// "gobbler"
+// "gumby"
+// "hand1" *DONE*
+// "hand2"
+// "heart"
+// "icon"
+// "iron_cross"
+// "left_ptr"
+// "left_side"
+// "left_tee"
+// "leftbutton"
+// "ll_angle"
+// "lr_angle"
+// "man"
+// "middlebutton"
+// "mouse"
+// "pencil"
+// "pirate"
+// "plus"
+// "question_arrow"
+// "right_ptr"
+// "right_side"
+// "right_tee"
+// "rightbutton"
+// "rtl_logo"
+// "sailboat"
+// "sb_down_arrow"
+// "sb_h_double_arrow"
+// "sb_left_arrow"
+// "sb_right_arrow"
+// "sb_up_arrow"
+// "sb_v_double_arrow"
+// "shuttle"
+// "sizing"
+// "spider"
+// "spraycan"
+// "star"
+// "target"
+// "tcross"
+// "top_left_arrow"
+// "top_left_corner"
+// "top_right_corner"
+// "top_side"
+// "top_tee"
+// "trek"
+// "ul_angle"
+// "umbrella"
+// "ur_angle"
+// "watch"
+// "xterm"
+
+group { name: "elm/cursor/hand1/default";
+ images.image: "pointer_hand1.png" COMP;
+ parts {
+ part { name: "base"; mouse_events: 0; scale: 1;
+ description { state: "default" 0.0;
+FIXED_SIZE(32, 32)
+image.normal: "pointer_hand1.png";
+ }
+ }
+ part { name: "elm.content.hotspot"; type: SWALLOW;
+ description { state: "default" 0.0;
+visible: 0;
+rel1.relative: (26/32) (9/32);
+rel1.to: "base";
+rel2.to: "base";
+rel2.relative: (26/32) (9/32);
+rel2.offset: 0 0;
+ }
+ }
+ }
+}
diff --git a/data/themes/img/pointer_hand1.png
b/data/themes/img/pointer_hand1.png
new file mode 100644
index 000..68f356d
Binary files /dev/null and b/data/themes/img/pointer_hand1.png differ
diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index afd8659..499e9d5 100644
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -299,7 +299,7 @@ test_cursor3(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
o = elm_button_add(win);
elm_object_cursor_set(o, ELM_CURSOR_HAND1);
-// elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
+ elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
elm_object_text_set(o, "hand1");
elm_box_pack_end(bx, o);
evas_object_show(o);
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index ab77853..da74f10 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -133,7 +133,7 @@ static const int
[EGIT] [core/efl] master 01/01: ecore-evas - fix object cursor to not delete the same cursor when set
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=165efe2254ecd352011d28a351cd874c6eb0a181
commit 165efe2254ecd352011d28a351cd874c6eb0a181
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 2 20:29:03 2014 +0900
ecore-evas - fix object cursor to not delete the same cursor when set
this fixes a misbehavior with ecore evas object cursors when you set
one, the old one is deleted, but if the old is the same, the new one
you set gets deleted, rather than just updated.
@fix
---
.../ecore_evas/engines/cocoa/ecore_evas_cocoa.c| 61 +-
.../ecore_evas/engines/drm/ecore_evas_drm.c| 39 --
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 37 -
.../engines/psl1ght/ecore_evas_psl1ght.c | 37 -
.../ecore_evas/engines/sdl/ecore_evas_sdl.c| 37 -
.../engines/wayland/ecore_evas_wayland_common.c| 42 +--
.../ecore_evas/engines/win32/ecore_evas_win32.c| 47 +++--
src/modules/ecore_evas/engines/x/ecore_evas_x.c| 29 ++
8 files changed, 206 insertions(+), 123 deletions(-)
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 6722f71..88e3ba1 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -338,36 +338,45 @@ _ecore_evas_object_cursor_del(void *data, Evas *e,
Evas_Object *obj, void *event
static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int
hot_x, int hot_y)
{
- int x, y;
- DBG("Cursor Set");
- if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
+ int x, y;
+ Evas_Object *old;
+ DBG("Cursor Set");
- if (obj == NULL)
-{
- ee->prop.cursor.object = NULL;
- ee->prop.cursor.layer = 0;
- ee->prop.cursor.hot.x = 0;
- ee->prop.cursor.hot.y = 0;
- return;
-}
-
- ee->prop.cursor.object = obj;
- ee->prop.cursor.layer = layer;
- ee->prop.cursor.hot.x = hot_x;
- ee->prop.cursor.hot.y = hot_y;
-
- evas_pointer_output_xy_get(ee->evas, &x, &y);
- evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+ old = ee->prop.cursor.object;
+ if (obj == NULL)
+ {
+ee->prop.cursor.object = NULL;
+ee->prop.cursor.layer = 0;
+ee->prop.cursor.hot.x = 0;
+ee->prop.cursor.hot.y = 0;
+goto end;
+ }
+
+ ee->prop.cursor.object = obj;
+ ee->prop.cursor.layer = layer;
+ ee->prop.cursor.hot.x = hot_x;
+ ee->prop.cursor.hot.y = hot_y;
+
+ if (obj != old)
+ {
+evas_pointer_output_xy_get(ee->evas, &x, &y);
+evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+evas_object_pass_events_set(ee->prop.cursor.object, 1);
+if (evas_pointer_inside_get(ee->evas))
+ evas_object_show(ee->prop.cursor.object);
+evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
+ _ecore_evas_object_cursor_del, ee);
+ }
evas_object_move(ee->prop.cursor.object,
x - ee->prop.cursor.hot.x,
y - ee->prop.cursor.hot.y);
-
- evas_object_pass_events_set(ee->prop.cursor.object, 1);
-
- if (evas_pointer_inside_get(ee->evas))
-evas_object_show(ee->prop.cursor.object);
-
- evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
_ecore_evas_object_cursor_del, ee);
+end:
+ if ((old) && (obj != old))
+ {
+evas_object_event_callback_del_full
+ (old, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
+evas_object_del(old);
+ }
}
static int
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 fc8bd6c..9e6904d 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -577,34 +577,43 @@ static void
_ecore_evas_drm_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer,
int hot_x, int hot_y)
{
int x, y;
-
- if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
-
- if (!obj)
+ Evas_Object *old;
+
+ old = ee->prop.cursor.object;
+ if (obj == NULL)
{
ee->prop.cursor.object = NULL;
ee->prop.cursor.layer = 0;
ee->prop.cursor.hot.x = 0;
ee->prop.cursor.hot.y = 0;
-return;
+goto end;
}
-
+
ee->prop.cursor.object = obj;
ee->prop.cursor.layer = layer;
ee->prop.cursor.hot.x = hot_x;
ee->prop.cursor.hot.y = hot_y;
-
- evas_pointer_output_xy_get(ee->evas, &x, &y);
- evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+
+ if (obj != old)
+ {
+evas_pointer_output_xy_get(ee->evas, &x, &y);
+evas_object_layer_set(ee->prop.cursor.object, ee->prop.cur
[EGIT] [core/efl] efl-1.9 01/01: ecore-evas - fix object cursor to not delete the same cursor when set
raster pushed a commit to branch efl-1.9.
http://git.enlightenment.org/core/efl.git/commit/?id=fef45870b0a65a838cc0248c3a4ea1baeda25c94
commit fef45870b0a65a838cc0248c3a4ea1baeda25c94
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 2 20:29:03 2014 +0900
ecore-evas - fix object cursor to not delete the same cursor when set
this fixes a misbehavior with ecore evas object cursors when you set
one, the old one is deleted, but if the old is the same, the new one
you set gets deleted, rather than just updated.
@fix
Conflicts:
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
---
.../ecore_evas/engines/cocoa/ecore_evas_cocoa.c| 61 +-
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 37 -
.../engines/psl1ght/ecore_evas_psl1ght.c | 37 -
.../ecore_evas/engines/sdl/ecore_evas_sdl.c| 37 -
.../engines/wayland/ecore_evas_wayland_common.c| 42 +--
.../ecore_evas/engines/win32/ecore_evas_win32.c| 47 +++--
src/modules/ecore_evas/engines/x/ecore_evas_x.c| 29 ++
7 files changed, 182 insertions(+), 108 deletions(-)
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index d54737e..8f81a23 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -338,36 +338,45 @@ _ecore_evas_object_cursor_del(void *data, Evas *e,
Evas_Object *obj, void *event
static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int
hot_x, int hot_y)
{
- int x, y;
- DBG("Cursor Set");
- if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
+ int x, y;
+ Evas_Object *old;
+ DBG("Cursor Set");
- if (obj == NULL)
-{
- ee->prop.cursor.object = NULL;
- ee->prop.cursor.layer = 0;
- ee->prop.cursor.hot.x = 0;
- ee->prop.cursor.hot.y = 0;
- return;
-}
-
- ee->prop.cursor.object = obj;
- ee->prop.cursor.layer = layer;
- ee->prop.cursor.hot.x = hot_x;
- ee->prop.cursor.hot.y = hot_y;
-
- evas_pointer_output_xy_get(ee->evas, &x, &y);
- evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+ old = ee->prop.cursor.object;
+ if (obj == NULL)
+ {
+ee->prop.cursor.object = NULL;
+ee->prop.cursor.layer = 0;
+ee->prop.cursor.hot.x = 0;
+ee->prop.cursor.hot.y = 0;
+goto end;
+ }
+
+ ee->prop.cursor.object = obj;
+ ee->prop.cursor.layer = layer;
+ ee->prop.cursor.hot.x = hot_x;
+ ee->prop.cursor.hot.y = hot_y;
+
+ if (obj != old)
+ {
+evas_pointer_output_xy_get(ee->evas, &x, &y);
+evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+evas_object_pass_events_set(ee->prop.cursor.object, 1);
+if (evas_pointer_inside_get(ee->evas))
+ evas_object_show(ee->prop.cursor.object);
+evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
+ _ecore_evas_object_cursor_del, ee);
+ }
evas_object_move(ee->prop.cursor.object,
x - ee->prop.cursor.hot.x,
y - ee->prop.cursor.hot.y);
-
- evas_object_pass_events_set(ee->prop.cursor.object, 1);
-
- if (evas_pointer_inside_get(ee->evas))
-evas_object_show(ee->prop.cursor.object);
-
- evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
_ecore_evas_object_cursor_del, ee);
+end:
+ if ((old) && (obj != old))
+ {
+evas_object_event_callback_del_full
+ (old, EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
+evas_object_del(old);
+ }
}
static int
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index aba3127..0521c34 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -425,32 +425,43 @@ static void
_ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int
hot_x, int hot_y)
{
int x, y;
-
- if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
-
- if (!obj)
+ Evas_Object *old;
+
+ old = ee->prop.cursor.object;
+ if (obj == NULL)
{
ee->prop.cursor.object = NULL;
ee->prop.cursor.layer = 0;
ee->prop.cursor.hot.x = 0;
ee->prop.cursor.hot.y = 0;
-return;
+goto end;
}
-
+
ee->prop.cursor.object = obj;
ee->prop.cursor.layer = layer;
ee->prop.cursor.hot.x = hot_x;
ee->prop.cursor.hot.y = hot_y;
- evas_pointer_output_xy_get(ee->evas, &x, &y);
- evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.layer);
+
+ if (obj != old)
+ {
+evas_pointer_output_xy_get(ee->evas, &x, &y);
+evas_object_layer_set(ee->prop.cursor.object, ee->prop.cursor.l
[EGIT] [core/efl] master 02/02: Eolian: remove Eo API defined in evas_private.h
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2de5aaefac082cacb35aefd0907118b1fce9626f
commit 2de5aaefac082cacb35aefd0907118b1fce9626f
Author: Daniel Zaoui
Date: Wed Apr 2 14:23:26 2014 +0300
Eolian: remove Eo API defined in evas_private.h
We don't need it more because Eolian generates it already.
---
src/lib/evas/include/evas_private.h | 10 --
1 file changed, 10 deletions(-)
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 9650805..f5c0700 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -278,16 +278,6 @@ struct _Evas_Smart_Interfaces_Array
const Evas_Smart_Interface **array;
};
-/**
- * @def evas_obj_smart_attach
- *
- * Attach a given smart data to a given smart object.
- *
- * @param[in] s in
- *
- */
-#define evas_obj_smart_attach(s)
EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ATTACH), EO_TYPECHECK(Evas_Smart *, s)
-
struct _Evas_Smart
{
DATA32magic;
--
[EGIT] [core/enlightenment] master 01/01: wl pointer configure: fix typo
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=26d3075e3decdeb24de4b484c1fcf02b2fe1d420 commit 26d3075e3decdeb24de4b484c1fcf02b2fe1d420 Author: Gwanglim Lee Date: Wed Apr 2 10:39:07 2014 +0100 wl pointer configure: fix typo Summary: ews->geometry.y needs to be set. Test Plan: N/A Reviewers: raster, devilhorns, zmike Reviewed By: devilhorns CC: cedric Differential Revision: https://phab.enlightenment.org/D688 --- src/bin/e_comp_wl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 7a4a7d2..cb38939 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2289,7 +2289,7 @@ _e_comp_wl_pointer_configure(E_Wayland_Surface *ews, Evas_Coord x, Evas_Coord y, /* configure the surface geometry */ ews->geometry.x = x; - ews->geometry.h = h; + ews->geometry.y = y; ews->geometry.w = w; ews->geometry.h = h; ews->geometry.changed = EINA_TRUE; --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: oops - printfs snuck in. remove
You commented out some code, you didn't just remove printfs.
--
Tom.
On 02/04/14 10:08, Carsten Haitzler wrote:
> raster pushed a commit to branch master.
>
> http://git.enlightenment.org/core/elementary.git/commit/?id=db52ed774171f712465d1d24afeb178ba508f4bc
>
> commit db52ed774171f712465d1d24afeb178ba508f4bc
> Author: Carsten Haitzler (Rasterman)
> Date: Wed Apr 2 18:09:55 2014 +0900
>
> oops - printfs snuck in. remove
> ---
> src/bin/test_cursor.c | 2 +-
> src/lib/els_cursor.c | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
> index 499e9d5..afd8659 100644
> --- a/src/bin/test_cursor.c
> +++ b/src/bin/test_cursor.c
> @@ -299,7 +299,7 @@ test_cursor3(void *data EINA_UNUSED, Evas_Object *obj
> EINA_UNUSED, void *event_i
>
> o = elm_button_add(win);
> elm_object_cursor_set(o, ELM_CURSOR_HAND1);
> - elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
> +// elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
> elm_object_text_set(o, "hand1");
> elm_box_pack_end(bx, o);
> evas_object_show(o);
> diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
> index a8d2a46..ab77853 100644
> --- a/src/lib/els_cursor.c
> +++ b/src/lib/els_cursor.c
> @@ -234,8 +234,6 @@ _elm_cursor_set(Elm_Cursor *cur)
>ELM_OBJECT_LAYER_CURSOR, cur->hot_x,
>cur->hot_y);
> #ifdef HAVE_ELEMENTARY_X
> -printf("A set %i\n", cur->x.cursor);
> -printf("A win = %x\n", cur->x.win);
> if (cur->x.win)
> ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
> #endif
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: oops - printfs snuck in. remove
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=db52ed774171f712465d1d24afeb178ba508f4bc
commit db52ed774171f712465d1d24afeb178ba508f4bc
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 2 18:09:55 2014 +0900
oops - printfs snuck in. remove
---
src/bin/test_cursor.c | 2 +-
src/lib/els_cursor.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 499e9d5..afd8659 100644
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -299,7 +299,7 @@ test_cursor3(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
o = elm_button_add(win);
elm_object_cursor_set(o, ELM_CURSOR_HAND1);
- elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
+// elm_object_cursor_theme_search_enabled_set(o, EINA_TRUE);
elm_object_text_set(o, "hand1");
elm_box_pack_end(bx, o);
evas_object_show(o);
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index a8d2a46..ab77853 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -234,8 +234,6 @@ _elm_cursor_set(Elm_Cursor *cur)
ELM_OBJECT_LAYER_CURSOR, cur->hot_x,
cur->hot_y);
#ifdef HAVE_ELEMENTARY_X
-printf("A set %i\n", cur->x.cursor);
-printf("A win = %x\n", cur->x.win);
if (cur->x.win)
ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
#endif
--
[EGIT] [core/efl] master 01/01: Evas textblock: Minor code cleanup.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e5234cf75542febc3b429f4069916f88c0f5fe0
commit 8e5234cf75542febc3b429f4069916f88c0f5fe0
Author: Tom Hacohen
Date: Wed Apr 2 10:06:57 2014 +0100
Evas textblock: Minor code cleanup.
Moved a global variable into a local scope, as it's no longer needed
globally.
---
src/lib/evas/canvas/evas_object_textblock.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index c977434..785d687 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -4325,13 +4325,10 @@ _layout_get_mixedwrap(Ctxt *c,
Evas_Object_Textblock_Format *fmt,
breaks);
}
-/* Should be moved inside _layout_ellipsis_item_new once we fix the hack in
- * textblock render */
-static const Eina_Unicode _ellip_str[2] = { 0x2026, '\0' };
-
static Evas_Object_Textblock_Text_Item *
_layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it)
{
+ const Eina_Unicode _ellip_str[2] = { 0x2026, '\0' };
Evas_Object_Textblock_Text_Item *ellip_ti;
Evas_Script_Type script;
Evas_Font_Instance *script_fi = NULL, *cur_fi;
--
[EGIT] [core/elementary] master 01/01: fix x cursors broken by recent eo based fixes... to eolian changes
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2f389423d56a7d2a857577ec2db6196b89436703
commit 2f389423d56a7d2a857577ec2db6196b89436703
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 2 18:06:02 2014 +0900
fix x cursors broken by recent eo based fixes... to eolian changes
---
src/lib/els_cursor.c | 42 +-
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index cf6c5d4..a8d2a46 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -234,6 +234,8 @@ _elm_cursor_set(Elm_Cursor *cur)
ELM_OBJECT_LAYER_CURSOR, cur->hot_x,
cur->hot_y);
#ifdef HAVE_ELEMENTARY_X
+printf("A set %i\n", cur->x.cursor);
+printf("A win = %x\n", cur->x.win);
if (cur->x.win)
ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
#endif
@@ -339,30 +341,36 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
cur->use_engine = EINA_TRUE;
}
- if ((cur->use_engine) && (eo_isa(cur->eventarea, ELM_OBJ_WIN_CLASS)))
+ if (cur->use_engine)
{
-#ifdef HAVE_ELEMENTARY_X
-cur->x.win = elm_win_xwindow_get(cur->eventarea);
-if (cur->x.win)
- {
- struct _Cursor_Id *cur_id;
-
- cur_id = bsearch(&(cur->cursor_name), _cursors, _cursors_count,
- sizeof(struct _Cursor_Id), _elm_cursor_strcmp);
+Evas_Object *top;
- if (!cur_id)
+top = elm_widget_top_get(cur->owner);
+if ((top) && (eo_isa(top, ELM_OBJ_WIN_CLASS)))
+ {
+#ifdef HAVE_ELEMENTARY_X
+ cur->x.win = elm_win_xwindow_get(top);
+ if (cur->x.win)
{
- INF("X cursor couldn't be found: %s. Using default.",
- cur->cursor_name);
- cur->x.cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_X);
+ struct _Cursor_Id *cur_id;
+
+ cur_id = bsearch(&(cur->cursor_name), _cursors,
_cursors_count,
+ sizeof(struct _Cursor_Id),
_elm_cursor_strcmp);
+
+ if (!cur_id)
+{
+ INF("X cursor couldn't be found: %s. Using default.",
+ cur->cursor_name);
+ cur->x.cursor =
ecore_x_cursor_shape_get(ECORE_X_CURSOR_X);
+}
+ else
+cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
}
- else
-cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
- }
#endif
#ifdef HAVE_ELEMENTARY_WAYLAND
-cur->wl.win = elm_win_wl_window_get(cur->eventarea);
+ cur->wl.win = elm_win_wl_window_get(top);
#endif
+ }
}
}
--
[EGIT] [core/elementary] master 01/01: autotools: fix build when Ecore_Drm is enable.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=364f35aec2c36fe09ba4ec06e4e9431a4aaf216d commit 364f35aec2c36fe09ba4ec06e4e9431a4aaf216d Author: Cedric BAIL Date: Wed Apr 2 17:00:16 2014 +0900 autotools: fix build when Ecore_Drm is enable. --- src/bin/Makefile.am | 5 + src/edje_externals/Makefile.am | 1 + src/lib/Makefile.am | 2 ++ src/modules/datetime_input_ctxpopup/Makefile.am | 1 + 4 files changed, 9 insertions(+) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 98b20fc..3ef146c 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ +@ELEMENTARY_DRM_CFLAGS@ \ @EVIL_CFLAGS@ bin_PROGRAMS = \ @@ -145,6 +146,7 @@ elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_LIBS@ \ @ELEMENTARY_WEB_LIBS@ \ + @ELEMENTARY_DRM_LIBS@ \ @my_libs@ elementary_test_CFLAGS = elementary_test_LDFLAGS = @@ -159,6 +161,7 @@ elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_LIBS@ \ @ELEMENTARY_WEB_LIBS@ \ + @ELEMENTARY_DRM_LIBS@ \ @my_libs@ elementary_config_LDFLAGS = @@ -173,6 +176,7 @@ elementary_codegen_LDADD = \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_LIBS@ \ @ELEMENTARY_WEB_LIBS@ \ + @ELEMENTARY_DRM_LIBS@ \ @my_libs@ elementary_codegen_LDFLAGS = @@ -200,6 +204,7 @@ elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_LIBS@ \ @ELEMENTARY_WEB_LIBS@ \ + @ELEMENTARY_DRM_LIBS@ \ @my_libs@ elementary_quicklaunch_LDFLAGS = diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am index dccc93d..c5884f7 100644 --- a/src/edje_externals/Makefile.am +++ b/src/edje_externals/Makefile.am @@ -18,6 +18,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ +@ELEMENTARY_DRM_CFLAGS@ \ @EVIL_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index aab7716..fe81000 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -32,6 +32,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ +@ELEMENTARY_DRM_CFLAGS@ \ @EVIL_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD @@ -514,6 +515,7 @@ libelementary_la_LIBADD = \ @ELEMENTARY_WEB_LIBS@ \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_WAYLAND_LIBS@ \ +@ELEMENTARY_DRM_LIBS@ \ @EVIL_LIBS@ \ @LTLIBINTL@ diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am index 6d0deed..6439017 100644 --- a/src/modules/datetime_input_ctxpopup/Makefile.am +++ b/src/modules/datetime_input_ctxpopup/Makefile.am @@ -22,6 +22,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ +@ELEMENTARY_DRM_CFLAGS@ \ @EVIL_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD --
[EGIT] [core/efl] master 01/01: evas: always allocate an image.data pixels buffers even YUV content.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b517ed81d5de08cf5bdb7dc8499c28f0859561f1
commit b517ed81d5de08cf5bdb7dc8499c28f0859561f1
Author: Cedric BAIL
Date: Wed Apr 2 16:40:59 2014 +0900
evas: always allocate an image.data pixels buffers even YUV content.
fix T1146.
---
src/lib/evas/common/evas_image_main.c | 20
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/common/evas_image_main.c
b/src/lib/evas/common/evas_image_main.c
index 7770c90..f5b87f3 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -109,7 +109,7 @@ static const Evas_Cache2_Image_Func
_evas_common_image_func2 =
};
#endif
-static inline size_t
+static inline int
_evas_common_rgba_image_surface_size(unsigned int w, unsigned int h,
Evas_Colorspace cspace)
{
#define PAGE_SIZE (4 * 1024)
@@ -119,13 +119,12 @@ _evas_common_rgba_image_surface_size(unsigned int w,
unsigned int h, Evas_Colors
#else
# define ALIGN_TO_PAGE(Siz) Siz
#endif
- size_t siz;
+ int siz;
switch (cspace)
{
case EVAS_COLORSPACE_GRY8: siz = w * h * sizeof(DATA8); break;
case EVAS_COLORSPACE_AGRY88: siz = w * h * sizeof(DATA16); break;
- case EVAS_COLORSPACE_ARGB: siz = w * h * sizeof(DATA32); break;
case EVAS_COLORSPACE_ETC1:
// Need to round width and height independently
w += 2; h += 2; // We do duplicate border in ETC1 to have better
rendering on GPU.
@@ -133,7 +132,7 @@ _evas_common_rgba_image_surface_size(unsigned int w,
unsigned int h, Evas_Colors
(h / 4 + (h % 4 ? 1 : 0)) * 8;
break;
default:
- return -1;
+ case EVAS_COLORSPACE_ARGB: siz = w * h * sizeof(DATA32); break;
}
if (siz < PAGE_SIZE) return siz;
@@ -146,7 +145,7 @@ _evas_common_rgba_image_surface_size(unsigned int w,
unsigned int h, Evas_Colors
static void *
_evas_common_rgba_image_surface_mmap(unsigned int w, unsigned int h,
Evas_Colorspace cspace)
{
- size_t siz;
+ int siz;
#if defined (HAVE_SYS_MMAN_H) && (!defined (_WIN32))
void *r = MAP_FAILED;
#endif
@@ -157,6 +156,8 @@ _evas_common_rgba_image_surface_mmap(unsigned int w,
unsigned int h, Evas_Colors
#ifndef MAP_HUGETLB
# define MAP_HUGETLB 0
#endif
+ if (siz < 0)
+ return NULL;
if (siz < PAGE_SIZE)
return malloc(siz);
@@ -177,6 +178,7 @@ _evas_common_rgba_image_surface_mmap(unsigned int w,
unsigned int h, Evas_Colors
static void
_evas_common_rgba_image_surface_munmap(void *data, unsigned int w, unsigned
int h, Evas_Colorspace cspace)
{
+ if (!data) return ;
#if defined (HAVE_SYS_MMAN_H) && (!defined (_WIN32))
size_t siz;
@@ -456,10 +458,12 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie,
unsigned int w, unsigned
_evas_common_rgba_image_surface_munmap(im->image.data,
ie->allocated.w,
ie->allocated.h,
ie->space);
+ im->image.data = NULL;
#ifdef SURFDBG
surfs = eina_list_remove(surfs, ie);
#endif
}
+
im->image.data = _evas_common_rgba_image_surface_mmap(w, h, ie->space);
if (!im->image.data) return -1;
ie->allocated.w = w;
@@ -468,13 +472,13 @@ _evas_common_rgba_image_surface_alloc(Image_Entry *ie,
unsigned int w, unsigned
surfs = eina_list_append(surfs, ie);
#endif
#ifdef HAVE_VALGRIND
- size_tsiz = 0;
+ intsiz = 0;
siz = _evas_common_rgba_image_surface_size(w, h, ie->space);
# ifdef VALGRIND_MAKE_READABLE
- VALGRIND_MAKE_READABLE(im->image.data, siz);
+ if (siz > 0) VALGRIND_MAKE_READABLE(im->image.data, siz);
# else
# ifdef VALGRIND_MAKE_MEM_DEFINED
- VALGRIND_MAKE_MEM_DEFINED(im->image.data, siz);
+ if (siz > 0) VALGRIND_MAKE_MEM_DEFINED(im->image.data, siz);
# endif
# endif
#endif
--
[EGIT] [core/efl] master 01/01: Eolian: fix warnings.
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f2b857dcb3607611b2faf65c8afcdb57c19d7e36
commit f2b857dcb3607611b2faf65c8afcdb57c19d7e36
Author: Daniel Zaoui
Date: Wed Apr 2 10:08:27 2014 +0300
Eolian: fix warnings.
---
src/bin/eolian/legacy_generator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/eolian/legacy_generator.c
b/src/bin/eolian/legacy_generator.c
index 2129307..8f605f9 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -58,10 +58,10 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
func_lpref = eolian_function_data_get(funcid, EOLIAN_LEGACY_GET);
if (!rettype)
{
- const Eina_List *l = eolian_parameters_list_get(funcid);
+ l = eolian_parameters_list_get(funcid);
if (eina_list_count(l) == 1)
{
- void* data = eina_list_data_get(l);
+ data = eina_list_data_get(l);
eolian_parameter_information_get((Eolian_Function_Parameter)data, NULL,
&rettype, NULL, NULL);
var_as_ret = EINA_TRUE;
}
--
[EGIT] [core/efl] master 04/06: Eolian: Integration of Ecore Animator
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=387c3433947e21dc7f191f72ebcb8861588210c6
commit 387c3433947e21dc7f191f72ebcb8861588210c6
Author: Yossi Kantor
Date: Mon Mar 24 13:23:14 2014 +0200
Eolian: Integration of Ecore Animator
---
src/Makefile_Ecore.am | 10 ++--
src/lib/ecore/Ecore_Eo.h| 4 +-
src/lib/ecore/ecore_anim.c | 102 ++--
src/lib/ecore/ecore_animator.eo | 27 +++
src/lib/ecore/ecore_timer.eo| 1 +
5 files changed, 64 insertions(+), 80 deletions(-)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 8e10b39..857e8d1 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -13,7 +13,9 @@ BUILT_SOURCES += \
lib/ecore/ecore_idle_enterer.eo.c \
lib/ecore/ecore_idle_enterer.eo.h \
lib/ecore/ecore_idle_exiter.eo.c \
- lib/ecore/ecore_idle_exiter.eo.h
+ lib/ecore/ecore_idle_exiter.eo.h \
+ lib/ecore/ecore_animator.eo.c \
+ lib/ecore/ecore_animator.eo.h
ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecoreeolianfiles_DATA = \
@@ -22,7 +24,8 @@ ecoreeolianfiles_DATA = \
lib/ecore/ecore_job.eo \
lib/ecore/ecore_idler.eo \
lib/ecore/ecore_idle_enterer.eo \
- lib/ecore/ecore_idle_exiter.eo
+ lib/ecore/ecore_idle_exiter.eo \
+ lib/ecore/ecore_animator.eo
EXTRA_DIST += \
${ecoreeolianfiles_DATA}
@@ -43,7 +46,8 @@ nodist_installed_ecoremainheaders_DATA = \
lib/ecore/ecore_job.eo.h \
lib/ecore/ecore_idler.eo.h \
lib/ecore/ecore_idle_enterer.eo.h \
-lib/ecore/ecore_idle_exiter.eo.h
+lib/ecore/ecore_idle_exiter.eo.h \
+lib/ecore/ecore_animator.eo.h
lib_ecore_libecore_la_SOURCES = \
lib/ecore/ecore.c \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index fedacdf..38e8c93 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -75,6 +75,8 @@ enum
*
* @{
*/
+#include "ecore_animator.eo.h"
+#if 0
#define ECORE_ANIMATOR_CLASS ecore_animator_class_get()
const Eo_Class *ecore_animator_class_get(void) EINA_CONST;
@@ -114,7 +116,7 @@ enum
*
*/
#define ecore_animator_timeline_constructor(runtime, func, data)
ECORE_ANIMATOR_ID(ECORE_ANIMATOR_SUB_ID_TIMELINE_CONSTRUCTOR),
EO_TYPECHECK(double, runtime), EO_TYPECHECK(Ecore_Timeline_Cb, func),
EO_TYPECHECK(const void *, data)
-
+#endif
/**
* @}
*/
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 3a7323c..892359f 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -18,9 +18,7 @@
if (!eo_isa((obj), ECORE_ANIMATOR_CLASS)) \
return
-EAPI Eo_Op ECORE_ANIMATOR_BASE_ID = EO_NOOP;
-
-struct _Ecore_Animator_Private_Data
+struct _Ecore_Animator_Data
{
EINA_INLIST;
Ecore_Animator *obj;
@@ -37,13 +35,13 @@ struct _Ecore_Animator_Private_Data
Eina_Bool just_added : 1;
};
-typedef struct _Ecore_Animator_Private_Data Ecore_Animator_Private_Data;
+typedef struct _Ecore_Animator_Data Ecore_Animator_Data;
static Eina_Bool _ecore_animator_run(void *data);
static Eina_Bool _ecore_animator(void *data);
static int animators_delete_me = 0;
-static Ecore_Animator_Private_Data *animators = NULL;
+static Ecore_Animator_Data *animators = NULL;
static double animators_frametime = 1.0 / 30.0;
static Ecore_Animator_Source src = ECORE_ANIMATOR_SOURCE_TIMER;
@@ -103,7 +101,7 @@ _end_tick(void)
static Eina_Bool
_do_tick(void)
{
- Ecore_Animator_Private_Data *animator;
+ Ecore_Animator_Data *animator;
EINA_INLIST_FOREACH(animators, animator)
{
@@ -126,14 +124,14 @@ _do_tick(void)
}
if (animators_delete_me)
{
-Ecore_Animator_Private_Data *l;
+Ecore_Animator_Data *l;
for (l = animators; l; )
{
animator = l;
- l = (Ecore_Animator_Private_Data *)EINA_INLIST_GET(l)->next;
+ l = (Ecore_Animator_Data *)EINA_INLIST_GET(l)->next;
if (animator->delete_me)
{
- animators = (Ecore_Animator_Private_Data *)
+ animators = (Ecore_Animator_Data *)
eina_inlist_remove(EINA_INLIST_GET(animators),
EINA_INLIST_GET(animator));
@@ -158,7 +156,7 @@ _do_tick(void)
static Eina_Bool
_ecore_animator_add(Ecore_Animator *obj,
-Ecore_Animator_Private_Data *animator,
+Ecore_Animator_Data *animator,
Ecore_Task_Cb func,
const void *data)
[EGIT] [core/efl] master 03/06: Eolian: Integration of Ecore Idle Exiter
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b05a323877bc88efb7e636a04c41e3a558c59c6c
commit b05a323877bc88efb7e636a04c41e3a558c59c6c
Author: Yossi Kantor
Date: Mon Mar 24 10:29:39 2014 +0200
Eolian: Integration of Ecore Idle Exiter
---
src/Makefile_Ecore.am | 10 +++--
src/lib/ecore/Ecore_Eo.h | 3 ++
src/lib/ecore/ecore_idle_exiter.c | 81 +++---
src/lib/ecore/ecore_idle_exiter.eo | 17
4 files changed, 49 insertions(+), 62 deletions(-)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 27ea8cd..8e10b39 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -11,7 +11,9 @@ BUILT_SOURCES += \
lib/ecore/ecore_idler.eo.c \
lib/ecore/ecore_idler.eo.h \
lib/ecore/ecore_idle_enterer.eo.c \
- lib/ecore/ecore_idle_enterer.eo.h
+ lib/ecore/ecore_idle_enterer.eo.h \
+ lib/ecore/ecore_idle_exiter.eo.c \
+ lib/ecore/ecore_idle_exiter.eo.h
ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecoreeolianfiles_DATA = \
@@ -19,7 +21,8 @@ ecoreeolianfiles_DATA = \
lib/ecore/ecore_poll.eo \
lib/ecore/ecore_job.eo \
lib/ecore/ecore_idler.eo \
- lib/ecore/ecore_idle_enterer.eo
+ lib/ecore/ecore_idle_enterer.eo \
+ lib/ecore/ecore_idle_exiter.eo
EXTRA_DIST += \
${ecoreeolianfiles_DATA}
@@ -39,7 +42,8 @@ nodist_installed_ecoremainheaders_DATA = \
lib/ecore/ecore_poll.eo.h \
lib/ecore/ecore_job.eo.h \
lib/ecore/ecore_idler.eo.h \
-lib/ecore/ecore_idle_enterer.eo.h
+lib/ecore/ecore_idle_enterer.eo.h \
+lib/ecore/ecore_idle_exiter.eo.h
lib_ecore_libecore_la_SOURCES = \
lib/ecore/ecore.c \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index 3491591..fedacdf 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -315,6 +315,8 @@ enum
/**
*
*/
+#include "ecore_idle_exiter.eo.h"
+#if 0
#define ECORE_IDLE_EXITER_CLASS ecore_idle_exiter_class_get()
const Eo_Class *ecore_idle_exiter_class_get(void) EINA_CONST;
@@ -341,6 +343,7 @@ enum
*/
#define ecore_idle_exiter_constructor(func, data)
ECORE_IDLE_EXITER_ID(ECORE_IDLE_EXITER_SUB_ID_CONSTRUCTOR),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#endif
/**
* @}
*/
diff --git a/src/lib/ecore/ecore_idle_exiter.c
b/src/lib/ecore/ecore_idle_exiter.c
index e18aacb..bf9b015 100644
--- a/src/lib/ecore/ecore_idle_exiter.c
+++ b/src/lib/ecore/ecore_idle_exiter.c
@@ -13,9 +13,7 @@
#define MY_CLASS_NAME "Ecore_Idle_Exiter"
-EAPI Eo_Op ECORE_IDLE_EXITER_BASE_ID = EO_NOOP;
-
-struct _Ecore_Idle_Exiter_Private_Data
+struct _Ecore_Idle_Exiter_Data
{
EINA_INLIST;
Ecore_Idle_Exiter *obj;
@@ -25,10 +23,10 @@ struct _Ecore_Idle_Exiter_Private_Data
Eina_Bool delete_me : 1;
};
-typedef struct _Ecore_Idle_Exiter_Private_Data Ecore_Idle_Exiter_Private_Data;
+typedef struct _Ecore_Idle_Exiter_Data Ecore_Idle_Exiter_Data;
-static Ecore_Idle_Exiter_Private_Data *idle_exiters = NULL;
-static Ecore_Idle_Exiter_Private_Data *idle_exiter_current = NULL;
+static Ecore_Idle_Exiter_Data *idle_exiters = NULL;
+static Ecore_Idle_Exiter_Data *idle_exiter_current = NULL;
static int idle_exiters_delete_me = 0;
static void *
@@ -59,12 +57,9 @@ ecore_idle_exiter_add(Ecore_Task_Cb func,
return ie;
}
-static void
-_idle_exiter_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_ecore_idle_exiter_constructor(Eo *obj, Ecore_Idle_Exiter_Data *ie,
Ecore_Task_Cb func, const void *data)
{
- Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
- const void *data = va_arg(*list, const void *);
-
_ecore_lock();
if (EINA_UNLIKELY(!eina_main_loop_is()))
{
@@ -72,7 +67,6 @@ _idle_exiter_constructor(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
EINA_MAIN_LOOP_CHECK_RETURN;
}
- Ecore_Idle_Exiter_Private_Data *ie = _pd;
ie->obj = obj;
eo_do_super(obj, MY_CLASS, eo_constructor());
@@ -88,12 +82,12 @@ _idle_exiter_constructor(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
ie->func = func;
ie->data = (void *)data;
- idle_exiters = (Ecore_Idle_Exiter_Private_Data
*)eina_inlist_append(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
+ idle_exiters = (Ecore_Idle_Exiter_Data
*)eina_inlist_append(EINA_INLIST_GET(idle_exiters), EINA_INLIST_GET(ie));
_ecore_unlock();
}
-static void
-_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
+EOLIAN static void
+_ecore_idle_exiter_eo_base_co
[EGIT] [core/efl] master 05/06: Eolian: Integration of Ecore Parent
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=86ec4e28bcab9d562c6624e1a51a8be960110061
commit 86ec4e28bcab9d562c6624e1a51a8be960110061
Author: Yossi Kantor
Date: Mon Mar 24 13:56:18 2014 +0200
Eolian: Integration of Ecore Parent
---
src/Makefile_Ecore.am | 10 +++---
src/lib/ecore/ecore.c | 14 +-
src/lib/ecore/ecore_parent.eo | 4
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 857e8d1..d6c7731 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -15,7 +15,9 @@ BUILT_SOURCES += \
lib/ecore/ecore_idle_exiter.eo.c \
lib/ecore/ecore_idle_exiter.eo.h \
lib/ecore/ecore_animator.eo.c \
- lib/ecore/ecore_animator.eo.h
+ lib/ecore/ecore_animator.eo.h \
+ lib/ecore/ecore_parent.eo.c \
+ lib/ecore/ecore_parent.eo.h
ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecoreeolianfiles_DATA = \
@@ -25,7 +27,8 @@ ecoreeolianfiles_DATA = \
lib/ecore/ecore_idler.eo \
lib/ecore/ecore_idle_enterer.eo \
lib/ecore/ecore_idle_exiter.eo \
- lib/ecore/ecore_animator.eo
+ lib/ecore/ecore_animator.eo \
+ lib/ecore/ecore_parent.eo
EXTRA_DIST += \
${ecoreeolianfiles_DATA}
@@ -47,7 +50,8 @@ nodist_installed_ecoremainheaders_DATA = \
lib/ecore/ecore_idler.eo.h \
lib/ecore/ecore_idle_enterer.eo.h \
lib/ecore/ecore_idle_exiter.eo.h \
-lib/ecore/ecore_animator.eo.h
+lib/ecore/ecore_animator.eo.h \
+lib/ecore/ecore_parent.eo.h
lib_ecore_libecore_la_SOURCES = \
lib/ecore/ecore.c \
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 0468c92..10a18cd 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -1070,16 +1070,4 @@ ecore_memory_state_set(Ecore_Memory_State state)
ecore_event_add(ECORE_EVENT_MEMORY_STATE, NULL, NULL, NULL);
}
-
-static const Eo_Class_Description parent_class_desc = {
- EO_VERSION,
- "Ecore_Parent",
- EO_CLASS_TYPE_REGULAR,
- EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
- NULL,
- 0,
- NULL,
- NULL
-};
-
-EO_DEFINE_CLASS(ecore_parent_class_get, &parent_class_desc, EO_BASE_CLASS,
NULL);
+#include "ecore_parent.eo.c"
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo
new file mode 100644
index 000..0809b51
--- /dev/null
+++ b/src/lib/ecore/ecore_parent.eo
@@ -0,0 +1,4 @@
+class Ecore_Parent (Eo_Base)
+{
+ data: null;
+}
\ No newline at end of file
--
[EGIT] [core/efl] master 01/06: Eolian: Explicit generation of either method or property in implemented functions
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=277c3e2ef38606678b6c52ed1841ab1b74c962bc
commit 277c3e2ef38606678b6c52ed1841ab1b74c962bc
Author: Yossi Kantor
Date: Mon Mar 24 13:21:28 2014 +0200
Eolian: Explicit generation of either method or property in implemented
functions
---
src/bin/eolian/eo1_generator.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/bin/eolian/eo1_generator.c b/src/bin/eolian/eo1_generator.c
index fa3804e..1b4887e 100644
--- a/src/bin/eolian/eo1_generator.c
+++ b/src/bin/eolian/eo1_generator.c
@@ -694,10 +694,16 @@ eo1_source_end_generate(const char *classname,
Eina_Strbuf *buf)
goto end;
}
+/* e.g event_freeze can be a property or a method. If a type is
explicit (property SET/GET),
+ * we assume it can't be a method.
+ */
+if ((in_meth && in_prop) && (ftype == SET || ftype == GET)) in_meth =
NULL;
+
if (in_meth)
{
_template_fill(str_func, tmpl_impl_str, impl_class, funcname,
EINA_FALSE);
eo1_bind_func_generate(classname, in_meth, UNRESOLVED, str_bodyf,
impl_class);
+ continue;
}
if (in_prop)
--
[EGIT] [core/efl] master 06/06: Eolian/Generator: don't generate legacy if legacy_prefix is "null".
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bddee1554ff12c776fedaeb664d8469eecb12718
commit bddee1554ff12c776fedaeb664d8469eecb12718
Author: Daniel Zaoui
Date: Wed Apr 2 09:24:30 2014 +0300
Eolian/Generator: don't generate legacy if legacy_prefix is "null".
For new classes that don't need legacy, instead of setting legacy null
for all the functions, legacy_prefix can be set to "null" to not
generate legacy.
However, if, for example, only one function among 50 need legacy, you
can specify it by setting for this function the legacy token.
---
src/bin/eolian/legacy_generator.c | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/bin/eolian/legacy_generator.c
b/src/bin/eolian/legacy_generator.c
index 2ac85df..2129307 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -41,6 +41,14 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
Eina_Bool var_as_ret = EINA_FALSE;
Eina_Bool add_star = EINA_FALSE;
char tmpstr[0xFF];
+ const Eina_List *l;
+ void *data;
+ Eina_Strbuf *flags = NULL;
+ int leg_param_idx = 1; /* Index of the parameter inside the legacy
function. It begins from 1 since obj is the first. */
+
+ Eina_Strbuf *fbody = eina_strbuf_new();
+ Eina_Strbuf *fparam = eina_strbuf_new();
+ Eina_Strbuf *descparam = eina_strbuf_new();
rettype = eolian_function_return_type_get(funcid, ftype);
if (ftype == GET)
@@ -67,11 +75,7 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
}
func_lpref = (func_lpref) ? func_lpref : eolian_function_data_get(funcid,
EOLIAN_LEGACY);
- if (func_lpref && !strcmp(func_lpref, "null")) return;
-
- Eina_Strbuf *fbody = eina_strbuf_new();
- Eina_Strbuf *fparam = eina_strbuf_new();
- Eina_Strbuf *descparam = eina_strbuf_new();
+ if (func_lpref && !strcmp(func_lpref, "null")) goto end;
if (func_lpref)
{
@@ -80,7 +84,9 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
}
else
{
-func_lpref = (func_lpref) ? func_lpref :
eolian_class_legacy_prefix_get(classname);
+func_lpref = eolian_class_legacy_prefix_get(classname);
+if (func_lpref && !strcmp(func_lpref, "null")) goto end;
+
if (!func_lpref) func_lpref = classname;
sprintf (tmpstr, "%s%s", eolian_function_name_get(funcid), suffix);
_template_fill(fbody, tmpl_eapi_funcdef, func_lpref, tmpstr,
EINA_FALSE);
@@ -104,11 +110,6 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
eina_strbuf_replace_all(fbody, "@#desc", eina_strbuf_string_get(linedesc));
eina_strbuf_free(linedesc);
- const Eina_List *l;
- void *data;
- Eina_Strbuf *flags = NULL;
- int leg_param_idx = 1; /* Index of the parameter inside the legacy
function. It begins from 1 since obj is the first. */
-
EINA_LIST_FOREACH(eolian_property_keys_list_get(funcid), l, data)
{
const char *pname;
@@ -184,6 +185,7 @@ _eapi_decl_func_generate(const char *classname,
Eolian_Function funcid, Eolian_F
eina_strbuf_replace_all(fbody, "@#flags",
(eolian_function_return_is_warn_unused(funcid, ftype)) ? "
EINA_WARN_UNUSED_RESULT" : "");
eina_strbuf_append(buf, eina_strbuf_string_get(fbody));
+end:
eina_strbuf_free(flags);
eina_strbuf_free(fbody);
eina_strbuf_free(fparam);
@@ -245,6 +247,7 @@ _eapi_func_generate(const char *classname, Eolian_Function
funcid, Eolian_Functi
else
{
func_lpref = eolian_class_legacy_prefix_get(classname);
+if (func_lpref && !strcmp(func_lpref, "null")) goto end;
if (func_lpref) eina_strbuf_replace_all(fbody, "@#eapi_prefix",
func_lpref);
else
--
[EGIT] [core/efl] master 02/06: Eolian: Integration of Ecore Idle Enterer
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=353612388672805346dbbe473180808ded94ae47
commit 353612388672805346dbbe473180808ded94ae47
Author: Yossi Kantor
Date: Mon Mar 24 10:09:18 2014 +0200
Eolian: Integration of Ecore Idle Enterer
---
src/Makefile_Ecore.am | 10 ++--
src/lib/ecore/Ecore_Eo.h| 3 ++
src/lib/ecore/ecore_idle_enterer.c | 95 ++---
src/lib/ecore/ecore_idle_enterer.eo | 24 ++
4 files changed, 60 insertions(+), 72 deletions(-)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 60e425a..27ea8cd 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -9,14 +9,17 @@ BUILT_SOURCES += \
lib/ecore/ecore_job.eo.c \
lib/ecore/ecore_job.eo.h \
lib/ecore/ecore_idler.eo.c \
- lib/ecore/ecore_idler.eo.h
+ lib/ecore/ecore_idler.eo.h \
+ lib/ecore/ecore_idle_enterer.eo.c \
+ lib/ecore/ecore_idle_enterer.eo.h
ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecoreeolianfiles_DATA = \
lib/ecore/ecore_timer.eo \
lib/ecore/ecore_poll.eo \
lib/ecore/ecore_job.eo \
- lib/ecore/ecore_idler.eo
+ lib/ecore/ecore_idler.eo \
+ lib/ecore/ecore_idle_enterer.eo
EXTRA_DIST += \
${ecoreeolianfiles_DATA}
@@ -35,7 +38,8 @@ nodist_installed_ecoremainheaders_DATA = \
lib/ecore/ecore_timer.eo.h \
lib/ecore/ecore_poll.eo.h \
lib/ecore/ecore_job.eo.h \
-lib/ecore/ecore_idler.eo.h
+lib/ecore/ecore_idler.eo.h \
+lib/ecore/ecore_idle_enterer.eo.h
lib_ecore_libecore_la_SOURCES = \
lib/ecore/ecore.c \
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h
index a175ca7..3491591 100644
--- a/src/lib/ecore/Ecore_Eo.h
+++ b/src/lib/ecore/Ecore_Eo.h
@@ -270,6 +270,8 @@ enum
/**
*
*/
+#include "ecore_idle_enterer.eo.h"
+#if 0
#define ECORE_IDLE_ENTERER_CLASS ecore_idle_enterer_class_get()
const Eo_Class *ecore_idle_enterer_class_get(void) EINA_CONST;
@@ -309,6 +311,7 @@ enum
*/
#define ecore_idle_enterer_before_constructor(func, data)
ECORE_IDLE_ENTERER_ID(ECORE_IDLE_ENTERER_SUB_ID_BEFORE_CONSTRUCTOR),
EO_TYPECHECK(Ecore_Task_Cb, func), EO_TYPECHECK(const void *, data)
+#endif
/**
*
*/
diff --git a/src/lib/ecore/ecore_idle_enterer.c
b/src/lib/ecore/ecore_idle_enterer.c
index bf8d48e..102f5bb 100644
--- a/src/lib/ecore/ecore_idle_enterer.c
+++ b/src/lib/ecore/ecore_idle_enterer.c
@@ -13,9 +13,7 @@
#define MY_CLASS_NAME "Ecore_Idle_Enterer"
-EAPI Eo_Op ECORE_IDLE_ENTERER_BASE_ID = EO_NOOP;
-
-struct _Ecore_Idle_Enterer_Private_Data
+struct _Ecore_Idle_Enterer_Data
{
EINA_INLIST;
Ecore_Idle_Enterer *obj;
@@ -24,10 +22,10 @@ struct _Ecore_Idle_Enterer_Private_Data
int references;
Eina_Booldelete_me : 1;
};
-typedef struct _Ecore_Idle_Enterer_Private_Data
Ecore_Idle_Enterer_Private_Data;
+typedef struct _Ecore_Idle_Enterer_Data Ecore_Idle_Enterer_Data;
-static Ecore_Idle_Enterer_Private_Data *idle_enterers = NULL;
-static Ecore_Idle_Enterer_Private_Data *idle_enterer_current = NULL;
+static Ecore_Idle_Enterer_Data *idle_enterers = NULL;
+static Ecore_Idle_Enterer_Data *idle_enterer_current = NULL;
static int idle_enterers_delete_me = 0;
static void *
@@ -41,7 +39,7 @@ _ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
static Eina_Bool
_ecore_idle_enterer_add(Ecore_Idle_Enterer *obj,
-Ecore_Idle_Enterer_Private_Data *ie,
+Ecore_Idle_Enterer_Data *ie,
Ecore_Task_Cb func,
const void *data)
{
@@ -87,17 +85,13 @@ ecore_idle_enterer_add(Ecore_Task_Cb func,
return ie;
}
-static void
-_idle_enterer_after_constructor(Eo *obj, void *_pd, va_list *list)
+EOLIAN static void
+_ecore_idle_enterer_after_constructor(Eo *obj, Ecore_Idle_Enterer_Data *ie,
Ecore_Task_Cb func, const void *data)
{
- Ecore_Task_Cb func = va_arg(*list, Ecore_Task_Cb);
- const void *data = va_arg(*list, const void *);
-
_ecore_lock();
- Ecore_Idle_Enterer_Private_Data *ie = _pd;
if (!_ecore_idle_enterer_add(obj, ie, func, data)) goto unlock;
- idle_enterers = (Ecore_Idle_Enterer_Private_Data
*)eina_inlist_append(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
+ idle_enterers = (Ecore_Idle_Enterer_Data
*)eina_inlist_append(EINA_INLIST_GET(idle_enterers), EINA_INLIST_GET(ie));
unlock:
_ecore_unlock();
@@ -123,24 +117,20 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
return ie;
}
-static void
-_idle_enterer_before_co
[EGIT] [core/efl] master 01/01: tests: Add a case for ellipsis in complex markup text.
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9128ac82a0c0b6081d0065891d746768be21ccd5 commit 9128ac82a0c0b6081d0065891d746768be21ccd5 Author: Youngbok Shin Date: Wed Apr 2 15:57:16 2014 +0900 tests: Add a case for ellipsis in complex markup text. Summary: Evas textblock can't cut off text properly when it has separated items. Reviewers: tasn, woohyun, raster Reviewed By: raster CC: cedric, herdsman Differential Revision: https://phab.enlightenment.org/D667 --- src/tests/evas/evas_test_textblock.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 8b23393..44ad205 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -1740,6 +1740,17 @@ START_TEST(evas_textblock_wrapping) evas_object_textblock_size_formatted_get(tb, &w, &h); fail_if((w > (nw / 2)) || (h != nh)); + evas_object_textblock_text_markup_set(tb, "aa" + "aa" + "aa" + "aa" + "aa"); + evas_textblock_cursor_format_prepend(cur, "+ ellipsis=1.0"); + evas_object_textblock_size_native_get(tb, &nw, &nh); + evas_object_resize(tb, nw / 2, nh); + evas_object_textblock_size_formatted_get(tb, &w, &h); + fail_if((w > (nw / 2)) || (h != nh)); + evas_object_textblock_text_markup_set(tb, "aab"); evas_textblock_cursor_format_prepend(cur, "+ ellipsis=1.0 wrap=word"); evas_object_textblock_size_native_get(tb, &nw, &nh); --
