[EGIT] [bindings/python/python-efl] master 02/02: Elm.Toolbar: Add missing event_info to events
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=61b53f24774de8690c6f1e4a8a6e55e30e514714
commit 61b53f24774de8690c6f1e4a8a6e55e30e514714
Author: Kai Huuhko
Date: Tue Mar 24 09:06:49 2015 +0200
Elm.Toolbar: Add missing event_info to events
---
efl/elementary/toolbar.pyx | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/efl/elementary/toolbar.pyx b/efl/elementary/toolbar.pyx
index 47abfca..a89f6ea 100644
--- a/efl/elementary/toolbar.pyx
+++ b/efl/elementary/toolbar.pyx
@@ -1128,17 +1128,17 @@ cdef class Toolbar(LayoutClass):
def callback_clicked_add(self, func, *args, **kwargs):
"""When the user clicks on a toolbar item and becomes selected."""
-self._callback_add("clicked", func, args, kwargs)
+self._callback_add_full("clicked", _cb_object_item_conv, func, args,
kwargs)
def callback_clicked_del(self, func):
-self._callback_del("clicked", func)
+self._callback_del_full("clicked", _cb_object_item_conv, func)
def callback_longpressed_add(self, func, *args, **kwargs):
"""When the toolbar is pressed for a certain amount of time."""
-self._callback_add("longpressed", func, args, kwargs)
+self._callback_add_full("longpressed", _cb_object_item_conv, func,
args, kwargs)
def callback_longpressed_del(self, func):
-self._callback_del("longpressed", func)
+self._callback_del_full("longpressed", _cb_object_item_conv, func)
def callback_language_changed_add(self, func, *args, **kwargs):
"""When the program language changes."""
--
[EGIT] [bindings/python/python-efl] master 01/02: Elm.Naviframe: Add item_pop_cb, missing event_info for events
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=73b54938c696be49098edf1fd54126d18edb8e32
commit 73b54938c696be49098edf1fd54126d18edb8e32
Author: Kai Huuhko
Date: Tue Mar 24 09:05:40 2015 +0200
Elm.Naviframe: Add item_pop_cb, missing event_info for events
---
efl/elementary/naviframe.pxd | 3 ++
efl/elementary/naviframe.pyx | 67 +---
2 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/efl/elementary/naviframe.pxd b/efl/elementary/naviframe.pxd
index 8afc192..a88495b 100644
--- a/efl/elementary/naviframe.pxd
+++ b/efl/elementary/naviframe.pxd
@@ -2,6 +2,8 @@ from efl.evas cimport Evas_Object, Eina_Bool, Eina_List
from object_item cimport Elm_Object_Item
cdef extern from "Elementary.h":
+ctypedef Eina_Bool (*Elm_Naviframe_Item_Pop_Cb)(void *data,
Elm_Object_Item *it)
+
Evas_Object *elm_naviframe_add(Evas_Object *parent)
Elm_Object_Item *elm_naviframe_item_push(Evas_Object *obj, const
char *title_label, Evas_Object *prev_btn, Evas_Object *next_btn, Evas_Object
*content, const char *item_style)
Elm_Object_Item *elm_naviframe_item_insert_before(Evas_Object
*obj, Elm_Object_Item *before, const char *title_label, Evas_Object *prev_btn,
Evas_Object *next_btn, Evas_Object *content, const char *item_style)
@@ -26,3 +28,4 @@ cdef extern from "Elementary.h":
Eina_Boolelm_naviframe_event_enabled_get(const Evas_Object
*obj)
Elm_Object_Item *elm_naviframe_item_simple_push(Evas_Object *obj,
Evas_Object *content)
void elm_naviframe_item_simple_promote(Evas_Object
*obj, Evas_Object *content)
+void elm_naviframe_item_pop_cb_set(Elm_Object_Item
*it, Elm_Naviframe_Item_Pop_Cb func, void *data)
diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx
index 301c03f..4053adf 100644
--- a/efl/elementary/naviframe.pyx
+++ b/efl/elementary/naviframe.pyx
@@ -121,6 +121,28 @@ from object_item cimport _object_item_to_python,
_object_item_list_to_python, \
from efl.utils.deprecated cimport DEPRECATED
+import traceback
+
+cdef object _cb_object_item_conv(void *addr):
+return _object_item_to_python(addr)
+
+cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it):
+cdef:
+ObjectItem item = _object_item_to_python(it)
+object func
+tuple args
+dict kwargs
+bint ret
+
+try:
+func, args, kwargs = item.pop_cb_spec
+ret = func(*args, **kwargs)
+except Exception:
+traceback.print_exc()
+
+return ret
+
+
cdef class NaviframeItem(ObjectItem):
"""
@@ -133,6 +155,7 @@ cdef class NaviframeItem(ObjectItem):
Evas_Object *prev_btn
Evas_Object *next_btn
Evas_Object *item_content
+tuple pop_cb_spec
def __cinit__(self):
self.prev_btn = NULL
@@ -381,30 +404,30 @@ cdef class NaviframeItem(ObjectItem):
elm_naviframe_item_title_enabled_set(self.item, enabled,
transition)
def title_enabled_set(self, enabled, transition):
-"""title_enabled_set(self, enabled, transition)
-
-Enable/Disable the title area with transition effect.
+elm_naviframe_item_title_enabled_set(self.item, enabled, transition)
-:param enabled: if `True`, title area will be visible, hidden
otherwise.
-:type enabled: bool
-:param transition: if `True`, transition effect of the title will be
visible.
-:type transition: bool
+def title_enabled_get(self):
+return bool(elm_naviframe_item_title_enabled_get(self.item))
-.. versionadded:: 1.9
+def pop_cb_set(self, func, *args, **kwargs):
+"""Set a function to be called when the item is going to be popped.
-"""
-elm_naviframe_item_title_enabled_set(self.item, enabled, transition)
+:param func: the callback function.
-def title_enabled_get(self):
-"""
+.. warning::
-:return: `True` if the title is visible.
-:rtype: bool
+Don't set "clicked" callback to the prev button additionally if the
+function does an exact same logic with this ``func``. When hardware
+back key is pressed then both callbacks will be called.
-.. versionadded:: 1.9
+.. versionadded:: 1.14
"""
-return bool(elm_naviframe_item_title_enabled_get(self.item))
+if not callable(func):
+raise ValueError("func must be callable!")
+
+self.pop_cb_spec = (func, args, kwargs)
+elm_naviframe_item_pop_cb_set(self.item, py_elm_naviframe_item_pop_cb,
NULL)
cdef class Naviframe(LayoutClass):
@@ -572,24 +595,24 @@ cdef class Naviframe(LayoutClass):
def callback_transition_finished_add(self, func, *args, **kwargs):
"""When the transition is finished in c
Re: [E-devel] [EGIT] [admin/devs] master 01/01: probie: welcome new probie, thiep
Congratulations Thiep! Thiep is actually one of the best candidates of getting commit access. Rock EFL more, Thiep! Thanks. Daniel Juyung Seo (SeoZ) On Tue, Mar 24, 2015 at 2:36 PM, ChunEon Park wrote: > hermet pushed a commit to branch master. > > > http://git.enlightenment.org/admin/devs.git/commit/?id=c25e712d61a21033957e89c4f6f32702631959c2 > > commit c25e712d61a21033957e89c4f6f32702631959c2 > Author: ChunEon Park > Date: Tue Mar 24 14:36:12 2015 +0900 > > probie: welcome new probie, thiep > --- > probies/thiep/id_rsa.pub | 1 + > probies/thiep/info.txt | 8 > 2 files changed, 9 insertions(+) > > diff --git a/probies/thiep/id_rsa.pub b/probies/thiep/id_rsa.pub > new file mode 100755 > index 000..b1aa051 > --- /dev/null > +++ b/probies/thiep/id_rsa.pub > @@ -0,0 +1 @@ > +ssh-rsa > B3NzaC1yc2EDAQABAAABAQDOK3B3Lfx5ERk6C3qEZliLb2RVNDsCEqUIRRXnp7eA9wcHxQ+cCw0B17ULzyHeN+aH2LPc9U/GmxjD8+iZ+U9rRC/0M6DN89TSa7b9DoMsZsXqtEdXSBn8M+VdUawp4kH7VRd+KtDB4OEWOm957Lf1+DB6FNL2dp3WzzUGWpdzM7W53aUJbtVpgbp2D8tANlYq1bnFJ63QMddAe260paeGhorrC3vGnbnXqc2OjZYm2zUzgnEN6xJ3o4l34Ix6GjOfrpd9fOZVskShgDMkasK+Icyw60wY5j0mLa2ZxmC4cKieSi8Sq3T4AjXzvWKQCZZNGm/WwNqlZIhgzeKIPoQ1 > thiep...@samsung.com > diff --git a/probies/thiep/info.txt b/probies/thiep/info.txt > new file mode 100755 > index 000..07c9869 > --- /dev/null > +++ b/probies/thiep/info.txt > @@ -0,0 +1,8 @@ > +Login:thiep > +IRC Nick: thiep > +Name: Thiep Ha > +Location: Suwon, Korea > +E-Mail: thie...@gmail.com; thiep...@samsung.com > +Contributing: efl, elementary > +Group:Libraries > +Platform: Ubuntu > > -- > > > -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [admin/devs] master 02/02: Merge branch 'master' of git+ssh://git.enlightenment.org/admin/devs
jypark pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=ad6d2f24f68ef78b0a4247b3d00e6ab4e2493093 commit ad6d2f24f68ef78b0a4247b3d00e6ab4e2493093 Merge: bb3f56c c25e712 Author: Ji-Youn Park Date: Tue Mar 24 18:53:47 2015 +0900 Merge branch 'master' of git+ssh://git.enlightenment.org/admin/devs probies/thiep/id_rsa.pub | 1 + probies/thiep/info.txt | 8 2 files changed, 9 insertions(+) --
[EGIT] [admin/devs] master 01/02: remove todo list
jypark pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=bb3f56c300e22732a9b4d29463c17b84b2e52403 commit bb3f56c300e22732a9b4d29463c17b84b2e52403 Author: Ji-Youn Park Date: Tue Mar 24 18:52:36 2015 +0900 remove todo list --- developers/jypark/TODO | 3 --- 1 file changed, 3 deletions(-) diff --git a/developers/jypark/TODO b/developers/jypark/TODO index e3f6c69..a944d56 100644 --- a/developers/jypark/TODO +++ b/developers/jypark/TODO @@ -1,5 +1,2 @@ elm_win & ecore_evas - fix using current ecore size -animation gif - does not run on glbackend. - -animation gif - scale down feature --
[EGIT] [tools/enventor] master 01/01: themes: Apply entry theme extension.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b157b5807d5f59cac6427f177e630b69f2d4eebb commit b157b5807d5f59cac6427f177e630b69f2d4eebb Author: Jaehyun Cho Date: Tue Mar 24 19:52:57 2015 +0900 themes: Apply entry theme extension. Entry theme extension is needed to change font type by text class. --- configure.ac | 1 + data/themes/default/Makefile.am| 5 +- data/themes/default/images/Makefile.am | 4 +- .../images/horizontal_separated_bar_small_glow.png | Bin 0 -> 309 bytes data/themes/default/images/white_bar_vert_glow.png | Bin 0 -> 370 bytes data/themes/default/sounds/Makefile.am | 7 + data/themes/default/sounds/kbd-tap.wav | Bin 0 -> 15668 bytes data/themes/default/sounds/kbd-tap2.wav| Bin 0 -> 20848 bytes data/themes/default/sounds/kbd-tap3.wav| Bin 0 -> 22024 bytes data/themes/default/sounds/kbd-tap4.wav| Bin 0 -> 26784 bytes data/themes/default/sounds/kbd-tap5.wav| Bin 0 -> 22528 bytes data/themes/default/theme_ext.edc | 390 + src/lib/edc_editor.c | 2 + 13 files changed, 406 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4ff97c3..b2c0685 100644 --- a/configure.ac +++ b/configure.ac @@ -126,6 +126,7 @@ data/images/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/images/Makefile +data/themes/default/sounds/Makefile data/templates/Makefile data/color/Makefile data/sounds/Makefile diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am index f2cbff8..02ad5f2 100644 --- a/data/themes/default/Makefile.am +++ b/data/themes/default/Makefile.am @@ -1,9 +1,10 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = images +SUBDIRS = images sounds EDJE_CC = @edje_cc@ -EDJE_FLAGS = -id $(top_srcdir)/data/themes/default/images +EDJE_FLAGS = -id $(top_srcdir)/data/themes/default/images \ +-sd $(top_srcdir)/data/themes/default/sounds filesdir = $(datadir)/$(PACKAGE)/themes files_DATA = enventor.edj diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 29561b6..d1f52af 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -65,4 +65,6 @@ EXTRA_DIST = \ slider_down.png \ save.png \ redo.png \ - undo.png + undo.png \ + white_bar_vert_glow.png \ + horizontal_separated_bar_small_glow.png diff --git a/data/themes/default/images/horizontal_separated_bar_small_glow.png b/data/themes/default/images/horizontal_separated_bar_small_glow.png new file mode 100644 index 000..31ddfee Binary files /dev/null and b/data/themes/default/images/horizontal_separated_bar_small_glow.png differ diff --git a/data/themes/default/images/white_bar_vert_glow.png b/data/themes/default/images/white_bar_vert_glow.png new file mode 100644 index 000..49c6735 Binary files /dev/null and b/data/themes/default/images/white_bar_vert_glow.png differ diff --git a/data/themes/default/sounds/Makefile.am b/data/themes/default/sounds/Makefile.am new file mode 100644 index 000..2a1a6e1 --- /dev/null +++ b/data/themes/default/sounds/Makefile.am @@ -0,0 +1,7 @@ +MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST = \ + kbd-tap.wav \ + kbd-tap2.wav \ + kbd-tap3.wav \ + kbd-tap4.wav \ + kbd-tap5.wav diff --git a/data/themes/default/sounds/kbd-tap.wav b/data/themes/default/sounds/kbd-tap.wav new file mode 100644 index 000..50bbf4c Binary files /dev/null and b/data/themes/default/sounds/kbd-tap.wav differ diff --git a/data/themes/default/sounds/kbd-tap2.wav b/data/themes/default/sounds/kbd-tap2.wav new file mode 100644 index 000..8ca8d0a Binary files /dev/null and b/data/themes/default/sounds/kbd-tap2.wav differ diff --git a/data/themes/default/sounds/kbd-tap3.wav b/data/themes/default/sounds/kbd-tap3.wav new file mode 100644 index 000..849fa1c Binary files /dev/null and b/data/themes/default/sounds/kbd-tap3.wav differ diff --git a/data/themes/default/sounds/kbd-tap4.wav b/data/themes/default/sounds/kbd-tap4.wav new file mode 100644 index 000..eecd4e3 Binary files /dev/null and b/data/themes/default/sounds/kbd-tap4.wav differ diff --git a/data/themes/default/sounds/kbd-tap5.wav b/data/themes/default/sounds/kbd-tap5.wav new file mode 100644 index 000..a2dc79b Binary files /dev/null and b/data/themes/default/sounds/kbd-tap5.wav differ diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index e51a650..5ea427e 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -11,6 +11,72 @@ #define PANEMIN2 16 #define PANEWID 32 +#define ENABLED_TEXTBLOCK_TAGS \ + tag: "em" "+ font_style=Oblique";
[EGIT] [core/efl] master 01/01: ecore_imf: Add NULL check before accessing evas device API
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=56dc26f0b9bd59e7534561ebc450942b0f59b8d8
commit 56dc26f0b9bd59e7534561ebc450942b0f59b8d8
Author: Jihoon Kim
Date: Tue Mar 24 20:33:45 2015 +0900
ecore_imf: Add NULL check before accessing evas device API
---
src/lib/ecore_imf_evas/ecore_imf_evas.c | 34 +++--
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/lib/ecore_imf_evas/ecore_imf_evas.c
b/src/lib/ecore_imf_evas/ecore_imf_evas.c
index 69de93d..1f213d6 100644
--- a/src/lib/ecore_imf_evas/ecore_imf_evas.c
+++ b/src/lib/ecore_imf_evas/ecore_imf_evas.c
@@ -184,9 +184,20 @@ ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down
*evas_event,
imf_event->string = evas_event->string ? evas_event->string :
_ecore_imf_evas_event_empty;
imf_event->compose = evas_event->compose ? evas_event->compose :
_ecore_imf_evas_event_empty;
imf_event->timestamp = evas_event->timestamp;
- imf_event->dev_name = evas_device_name_get(evas_event->dev) ?
evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
- imf_event->dev_class = evas_device_class_get(evas_event->dev);
- imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
+
+ if (evas_event->dev)
+ {
+imf_event->dev_name = evas_device_name_get(evas_event->dev) ?
evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
+imf_event->dev_class = evas_device_class_get(evas_event->dev);
+imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
+ }
+ else
+ {
+imf_event->dev_name = _ecore_imf_evas_event_empty;
+imf_event->dev_class = ECORE_IMF_DEVICE_CLASS_NONE;
+imf_event->dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
+ }
+
_ecore_imf_evas_event_modifiers_wrap(evas_event->modifiers,
&imf_event->modifiers);
_ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks);
}
@@ -212,9 +223,20 @@ ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up
*evas_event,
imf_event->string = evas_event->string ? evas_event->string :
_ecore_imf_evas_event_empty;
imf_event->compose = evas_event->compose ? evas_event->compose :
_ecore_imf_evas_event_empty;
imf_event->timestamp = evas_event->timestamp;
- imf_event->dev_name = evas_device_name_get(evas_event->dev) ?
evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
- imf_event->dev_class = evas_device_class_get(evas_event->dev);
- imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
+
+ if (evas_event->dev)
+ {
+imf_event->dev_name = evas_device_name_get(evas_event->dev) ?
evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
+imf_event->dev_class = evas_device_class_get(evas_event->dev);
+imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
+ }
+ else
+ {
+imf_event->dev_name = _ecore_imf_evas_event_empty;
+imf_event->dev_class = ECORE_IMF_DEVICE_CLASS_NONE;
+imf_event->dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
+ }
+
_ecore_imf_evas_event_modifiers_wrap(evas_event->modifiers,
&imf_event->modifiers);
_ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks);
}
--
[EGIT] [bindings/python/python-efl] master 01/01: Elm.Naviframe: Fix item_pop_cb call
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=9f4eab83b7f789c2237ac02e9f33352499712314 commit 9f4eab83b7f789c2237ac02e9f33352499712314 Author: Kai Huuhko Date: Tue Mar 24 14:48:05 2015 +0200 Elm.Naviframe: Fix item_pop_cb call --- efl/elementary/naviframe.pyx | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx index 4053adf..394dad5 100644 --- a/efl/elementary/naviframe.pyx +++ b/efl/elementary/naviframe.pyx @@ -128,7 +128,7 @@ cdef object _cb_object_item_conv(void *addr): cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it): cdef: -ObjectItem item = _object_item_to_python(it) +NaviframeItem item = _object_item_to_python(it) object func tuple args dict kwargs @@ -136,7 +136,7 @@ cdef Eina_Bool py_elm_naviframe_item_pop_cb(void *data, Elm_Object_Item *it): try: func, args, kwargs = item.pop_cb_spec -ret = func(*args, **kwargs) +ret = func(item, *args, **kwargs) except Exception: traceback.print_exc() @@ -192,12 +192,9 @@ cdef class NaviframeItem(ObjectItem): if isinstance(title_label, unicode): title_label = PyUnicode_AsUTF8String(title_label) self.label = title_label -if prev_btn is not None: -self.prev_btn = prev_btn.obj -if next_btn is not None: -self.next_btn = next_btn.obj -if content is not None: -self.item_content = content.obj +self.prev_btn = prev_btn.obj if prev_btn is not None else NULL +self.next_btn = next_btn.obj if next_btn is not None else NULL +self.item_content = content.obj if content is not None else NULL self.args = args self.kwargs = kwargs --
[EGIT] [tools/enventor] master 01/01: edc_editor: Fix typo.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=42f816e101a2edab8c0c1fd41712b76a649e962f commit 42f816e101a2edab8c0c1fd41712b76a649e962f Author: Jaehyun Cho Date: Tue Mar 24 22:06:59 2015 +0900 edc_editor: Fix typo. --- src/lib/edc_editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 51bd8fe..adf1cb8 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -1038,7 +1038,7 @@ edit_init(Evas_Object *enventor) //EDC Editor Entry Evas_Object *en_edit = elm_entry_add(layout); - elm_object_style_set(en_line, "enventor"); + elm_object_style_set(en_edit, "enventor"); elm_entry_context_menu_disabled_set(en_edit, EINA_TRUE); elm_entry_line_wrap_set(en_edit, ELM_WRAP_NONE); evas_object_smart_callback_add(en_edit, "focused", edit_focused_cb, ed); --
[EGIT] [tools/erigo] master 02/03: Fix warning messages
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=001a109ba71ae82697369cfb9e73a3be51fbc67e
commit 001a109ba71ae82697369cfb9e73a3be51fbc67e
Author: Yakov Goldberg
Date: Tue Mar 24 15:04:35 2015 +0200
Fix warning messages
---
src/bin/egui_gui/dnd.c | 2 +-
src/bin/egui_gui/editor.c | 13 +++--
src/bin/egui_gui/prop_layout.c | 2 +-
src/bin/egui_gui/rmview.c | 8 +++-
src/bin/main.c | 4 +---
src/lib/gui_parser.c | 2 +-
src/lib/gui_widget.c | 4 ++--
7 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/bin/egui_gui/dnd.c b/src/bin/egui_gui/dnd.c
index 9519c0a..efd6f8b 100644
--- a/src/bin/egui_gui/dnd.c
+++ b/src/bin/egui_gui/dnd.c
@@ -535,7 +535,7 @@ drag_stop()
static Target_Info*
_target_info_new(Gui_Widget *wdg, Eo *obj)
{
- Target_Info *ti;
+ Target_Info *ti = NULL;
if (wdg)
{
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index c501ba6..825cbe1 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1186,7 +1186,8 @@ _edc_file_updated(void *data, Ecore_File_Monitor *em
EINA_UNUSED, Ecore_File_Eve
eina_strbuf_append_printf(strbuf, " -dd %s/data", path);
remove(resource_value_get(res));
- system(eina_strbuf_string_get(strbuf));
+ int sys_ret = system(eina_strbuf_string_get(strbuf));
+ (void) sys_ret;
eina_strbuf_free(strbuf);
/* we update the observers only if the invocation is from the
system and not from _widget_prop_add */
if (file_path) observers_invoke(resource_eid_get(res));
@@ -1409,7 +1410,7 @@ _drop_target_main_wdg_enter(void *data, Evas_Object *obj)
Eo *canvas_drop_target = obj;
Eo *canvas = NULL;
Gui_Widget *wdg = data;
- DnD_Info *di;
+ DnD_Info *di = NULL;
/* If wdg == NULL, then canvas is a drop target or we have a error.*/
if (wdg)
{
@@ -1455,7 +1456,7 @@ _drop_target_main_wdg_leave(void *data, Evas_Object *obj)
{
Gui_Widget *wdg = data;
Eo *canvas_drop_target = obj;
- DnD_Info *di;
+ DnD_Info *di = NULL;
if (wdg)
{
di = wdg_data_get(wdg, EDITOR_DND_DATA);
@@ -1592,7 +1593,7 @@ _drop_target_drop(void *data, Evas_Object *obj,
Elm_Selection_Data *ev)
{
Gui_Widget *wdg = data;
Eo *canvas_drop_target = obj;
- DnD_Info *di;
+ DnD_Info *di = NULL;
_wdg_border_draw(NULL, EINA_FALSE, BORDER_DROP_TARGET);
if (wdg)
{
@@ -1998,8 +1999,8 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x,
Evas_Coord y, Elm_Xdnd_Actio
{
Eo *canvas_drop_target = obj;
Gui_Widget *wdg = data;
- DnD_Info *di;
- Eo *wdg_eo;
+ DnD_Info *di = NULL;
+ Eo *wdg_eo = NULL;
Evas_Coord obj_x = 0, obj_y = 0;
/* If wdg == NULL, then canvas is a drop target or we have a error.*/
if (wdg)
diff --git a/src/bin/egui_gui/prop_layout.c b/src/bin/egui_gui/prop_layout.c
index 317f0e9..e0a6dd5 100644
--- a/src/bin/egui_gui/prop_layout.c
+++ b/src/bin/egui_gui/prop_layout.c
@@ -234,7 +234,7 @@ _proplayout_toolbar_clicked(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED
void
proplayout_view_switch(It_Data_Type type)
{
- Elm_Object_Item *it;
+ Elm_Object_Item *it = NULL;
Egui_Layout_Widgets *g = egui_layout_gui_get();
switch (type)
{
diff --git a/src/bin/egui_gui/rmview.c b/src/bin/egui_gui/rmview.c
index ae5b8ac..77663f2 100644
--- a/src/bin/egui_gui/rmview.c
+++ b/src/bin/egui_gui/rmview.c
@@ -363,7 +363,7 @@ _rmview_build(Rmview_Resource_Type type)
Gui_Context *ctx = _active_context_get();
Eo *label, *en, *bt;
const char *header1 = NULL, *header2 = NULL;
- Gui_Resource_Type type_start, type_end, type_itr;
+ Gui_Resource_Type type_start = RESOURCE_SENTINEL, type_end =
RESOURCE_SENTINEL, type_itr;
eo_do(g_rm_win->rm_table, elm_obj_table_clear(EINA_TRUE));
switch (type)
@@ -635,7 +635,7 @@ _rmview_toolbar_clicked(void *data, Evas_Object *obj
EINA_UNUSED, void *event_in
Eina_Bool
_rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
- Gui_Resource_Type res_type;
+ Gui_Resource_Type res_type = RESOURCE_SENTINEL;
const char *alias_str = NULL, *value_str = NULL;
const Gui_Context *ctx = _active_context_get();
eo_do(g_rm_win->rm_alias_entry, alias_str =
elm_obj_widget_part_text_get(NULL));
@@ -649,8 +649,6 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Eve
return EO_CALLBACK_CONTINUE;
}
- Gui_Resource *gui_res;
-
switch (_rmview_toolbar_selected_type)
{
case RMVIEW_IMAGE:
@@ -701,7 +699,7 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj
EINA_UNUSED, const Eo_Eve
return EO_CALLBACK_CONTINUE;
}
- gui_res = gui_context_resource_new((Gui_Context *) ctx, re
[EGIT] [tools/erigo] master 01/03: Clean up: remove unused code.
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=9b7be14ebe6743668f5babfd1631459f2f63859a
commit 9b7be14ebe6743668f5babfd1631459f2f63859a
Author: Yakov Goldberg
Date: Tue Mar 24 13:26:17 2015 +0200
Clean up: remove unused code.
---
src/bin/egui_gui/editor.c | 7 +--
src/lib/database.c| 12
src/lib/database.h| 3 +--
src/lib/ffi_glue.c| 9 -
src/lib/ffi_glue.h| 4
5 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 61eb42e..c501ba6 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -3998,7 +3998,6 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_De
{
const char *entry_data;
eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
-Gui_Session *session = (Gui_Session *)
gui_context_editor_session_get(ctx);
/* Run CONTENT_PACK for table in order to reset with new coordinates.
*/
if (!strcmp(container_class_name, DB_DEF_TABLE_CLASS))
@@ -4019,7 +4018,11 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_De
ci = obj_container_item_new(new_prop, eid);
wdg_obj_container_item_add((Gui_Widget *) wdg, ci,
pfd->it_data->idx);
- manager_widget_content_reset(session, wdg, new_prop, MODE_EDITOR,
NULL);
+
+ _wdg_parent_win_reload(wdg);
+ _editor_wdg_selected_set(wdg);
+ objtree_build(ctx);
+ objtree_item_selected_set(wdg);
}
if (!strcmp(container_class_name, DB_DEF_CONTAINER_CLASS))
diff --git a/src/lib/database.c b/src/lib/database.c
index 0e246fa..e8b7b46 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -47,7 +47,6 @@ struct _Op_Desc
struct _Container_Desc
{
Op_Desc *_op_pack;
- Op_Desc *_op_repack;
Op_Desc *_op_unpack;
Op_Desc *_op_unpack_all;
};
@@ -672,7 +671,6 @@ _op_settings_init(const char *db_path)
eina_hash_add(container_typedef_table, "CONTAINER_PACK", (void *)
(uintptr_t) CONTAINER_PACK);
eina_hash_add(container_typedef_table, "CONTAINER_UNPACK", (void *)
(uintptr_t) CONTAINER_UNPACK);
eina_hash_add(container_typedef_table, "CONTAINER_UNPACK_ALL", (void *)
(uintptr_t) CONTAINER_UNPACK_ALL);
- eina_hash_add(container_typedef_table, "CONTAINER_REPACK", (void *)
(uintptr_t) CONTAINER_REPACK);
/* Get JSON object from DB by path. */
jv = _db_json_object_get(db_path);
@@ -1142,11 +1140,6 @@ db_init(const char *db_path, const char *all_eo_path,
const char *black_list)
container_desc->_op_pack = op_desc;
break;
}
- case CONTAINER_REPACK:
- {
- container_desc->_op_repack = op_desc;
- break;
- }
case CONTAINER_UNPACK:
{
container_desc->_op_unpack = op_desc;
@@ -1633,11 +1626,6 @@ db_container_desc_op_desc_get(const Container_Desc
*container_desc, Container_Be
ret = container_desc->_op_pack;
break;
}
- case CONTAINER_REPACK:
- {
- ret = container_desc->_op_repack;
- break;
- }
case CONTAINER_UNPACK:
{
ret = container_desc->_op_unpack;
diff --git a/src/lib/database.h b/src/lib/database.h
index 16e61e8..337bbef 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -23,8 +23,7 @@ typedef enum
CONTAINER_NONE,
CONTAINER_PACK,
CONTAINER_UNPACK,
- CONTAINER_UNPACK_ALL,
- CONTAINER_REPACK,
+ CONTAINER_UNPACK_ALL
} Container_Behavior_Type;
/* Add all int types before GUI_TYPE_OBJECT, because of typechecking*/
diff --git a/src/lib/ffi_glue.c b/src/lib/ffi_glue.c
index 5ee215c..a1163af 100644
--- a/src/lib/ffi_glue.c
+++ b/src/lib/ffi_glue.c
@@ -182,15 +182,6 @@ manager_widget_content_unset(Gui_Session *session, const
Gui_Widget *wdg, const
return ret;
}
-/* Use to update packing of already packed object. Without unpacking it. */
-Eina_Bool
-manager_widget_content_reset(Gui_Session *session, const Gui_Widget
*container, const Gui_Widget_Property *prop, Action_Mode mode EINA_UNUSED, void
*data EINA_UNUSED)
-{
- const Op_Desc *op_desc =
db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(container)),
CONTAINER_REPACK);
- Eina_Bool ret = _ffi_eo_do_content(session, container, prop, op_desc, NULL);
- return ret;
-}
-
/* this actually "soft" unset. It unpacks only Eo objects, and doesn't affect
internal widget dependancies. */
Eina_Bool
manager_widget_content_unset_all(Gui_Session *session, const Gui_Widg
[EGIT] [tools/erigo] master 03/03: Fix image paths
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=205753e770104a5c4c1a06fe4b989f675bf913a0
commit 205753e770104a5c4c1a06fe4b989f675bf913a0
Author: Yakov Goldberg
Date: Tue Mar 24 15:17:54 2015 +0200
Fix image paths
---
src/bin/egui_gui/editor.c | 5 +
src/bin/egui_gui/egui_logic.c | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 825cbe1..4cbc6c2 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1378,9 +1378,6 @@ _table_borders_draw(Eo *table, int w, int h, Eina_List
**_border_objects)
{
Eina_List *border_objects = *_border_objects;
int i = 0, j = 0;
- char path[100];
- getcwd(path, sizeof(path));
- sprintf(path, "%s/data/images/table_cell_border.png", path);
Eo *o;
EINA_LIST_FREE(border_objects, o)
{
@@ -1396,7 +1393,7 @@ _table_borders_draw(Eo *table, int w, int h, Eina_List
**_border_objects)
eo_do(o, evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND),
evas_obj_size_hint_align_set(EVAS_HINT_FILL,
EVAS_HINT_FILL),
evas_obj_visibility_set(EINA_TRUE),
- efl_file_set(path, NULL));
+
efl_file_set(EGUI_LAYOUT_IMAGES_PATH"/table_cell_border.png", NULL));
eo_do(table, elm_obj_table_pack(o, i, j, 1, 1));
border_objects = eina_list_append(border_objects, o);
}
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 9ff2ae2..0a4795e 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -735,7 +735,7 @@ _factory_item_finalize(Eo *item_box, char *image_name,
const char *egui_class_na
// update of the image icon
Eo *o = eina_list_data_get(lst);
char path[100] = {'\0'};
- sprintf(path, "%s/images/%s", PACKAGE_DATA_DIR, image_name);
+ sprintf(path, "%s/%s", EGUI_LAYOUT_IMAGES_PATH, image_name);
eo_do(o, efl_file_set(path, NULL));
drag_add(item_box, drag_image ? o : NULL, egui_class_name);
--
[EGIT] [core/efl] master 01/01: ecore_drm: Add event of ECORE_DRM_EVENT_SEAT_ADD.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=500e76fd5368034d026aa286b7c01b8076dd1f46
commit 500e76fd5368034d026aa286b7c01b8076dd1f46
Author: Seunghun Lee
Date: Tue Mar 24 10:45:11 2015 -0400
ecore_drm: Add event of ECORE_DRM_EVENT_SEAT_ADD.
Summary: To support multi-seat, ecore_drm need to issue the event to notify
compositor of seat is added.
Test Plan: N/A
Reviewers: zmike, raster, gwanglim, devilhorns
Reviewed By: devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2212
---
src/lib/ecore_drm/Ecore_Drm.h| 2 ++
src/lib/ecore_drm/ecore_drm.c| 1 +
src/lib/ecore_drm/ecore_drm_inputs.c | 26 +++---
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index ff460e3..6378022 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -162,6 +162,8 @@ EAPI extern int ECORE_DRM_EVENT_ACTIVATE;
EAPI extern int ECORE_DRM_EVENT_OUTPUT; /**< @since 1.14 */
+EAPI extern int ECORE_DRM_EVENT_SEAT_ADD; /**< @since 1.14 */
+
/**
* @file
* @brief Ecore functions for dealing with drm, virtual terminals
diff --git a/src/lib/ecore_drm/ecore_drm.c b/src/lib/ecore_drm/ecore_drm.c
index 2ae0766..c2dbfb0 100644
--- a/src/lib/ecore_drm/ecore_drm.c
+++ b/src/lib/ecore_drm/ecore_drm.c
@@ -90,6 +90,7 @@ ecore_drm_init(void)
ECORE_DRM_EVENT_ACTIVATE = ecore_event_type_new();
ECORE_DRM_EVENT_OUTPUT = ecore_event_type_new();
+ ECORE_DRM_EVENT_SEAT_ADD = ecore_event_type_new();
/* return init count */
return _ecore_drm_init_count;
diff --git a/src/lib/ecore_drm/ecore_drm_inputs.c
b/src/lib/ecore_drm/ecore_drm_inputs.c
index d83f229..bfd237c 100644
--- a/src/lib/ecore_drm/ecore_drm_inputs.c
+++ b/src/lib/ecore_drm/ecore_drm_inputs.c
@@ -4,6 +4,8 @@
#include "ecore_drm_private.h"
+EAPI int ECORE_DRM_EVENT_SEAT_ADD = -1;
+
/* local functions */
static int
_cb_open_restricted(const char *path, int flags, void *data)
@@ -59,17 +61,12 @@ _cb_close_restricted(int fd, void *data)
}
static Ecore_Drm_Seat *
-_seat_get(Ecore_Drm_Input *input, const char *seat)
+_seat_create(Ecore_Drm_Input *input, const char *seat)
{
Ecore_Drm_Seat *s;
- Eina_List *l;
-
- /* search for this name in existing seats */
- EINA_LIST_FOREACH(input->dev->seats, l, s)
- if (!strcmp(s->name, seat)) return s;
/* try to allocate space for new seat */
- if (!(s = calloc(1, sizeof(Ecore_Drm_Seat
+ if (!(s = calloc(1, sizeof(Ecore_Drm_Seat
return NULL;
s->input = input;
@@ -78,9 +75,24 @@ _seat_get(Ecore_Drm_Input *input, const char *seat)
/* add this new seat to list */
input->dev->seats = eina_list_append(input->dev->seats, s);
+ ecore_event_add(ECORE_DRM_EVENT_SEAT_ADD, NULL, NULL, NULL);
+
return s;
}
+static Ecore_Drm_Seat *
+_seat_get(Ecore_Drm_Input *input, const char *seat)
+{
+ Ecore_Drm_Seat *s;
+ Eina_List *l;
+
+ /* search for this name in existing seats */
+ EINA_LIST_FOREACH(input->dev->seats, l, s)
+ if (!strcmp(s->name, seat)) return s;
+
+ return _seat_create(input, seat);
+}
+
static void
_device_added(Ecore_Drm_Input *input, struct libinput_device *device)
{
--
[EGIT] [tools/erigo] master 01/01: Add memo bubble to properties which require Activate
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=ea9ebdf2dd84ad93a563fb9a2032038371526991
commit ea9ebdf2dd84ad93a563fb9a2032038371526991
Author: Yakov Goldberg
Date: Mon Mar 23 16:06:15 2015 +0200
Add memo bubble to properties which require Activate
Some entries in Description/Property/COntent Views require user to press
Enter to apply
changes. This patch provides memo bubble for such cases.
---
src/bin/egui_gui/contentview.c | 1 +
src/bin/egui_gui/descview.c | 3 ++-
src/bin/egui_gui/itemview.c | 1 +
src/bin/egui_gui/props_helper.c | 41 +
src/bin/egui_gui/props_helper.h | 4
5 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/src/bin/egui_gui/contentview.c b/src/bin/egui_gui/contentview.c
index ed11cc8..1ecdd32 100644
--- a/src/bin/egui_gui/contentview.c
+++ b/src/bin/egui_gui/contentview.c
@@ -67,6 +67,7 @@ _content_item_content_get(It_Data *it_data)
else
{
eo_do(obj, eo_event_callback_add(ELM_ENTRY_EVENT_ACTIVATED,
_contentview_cbs->content_change_cb_func, NULL));
+ prop_memo_bubble_add(obj, "Press Enter to apply changes");
}
}
else
diff --git a/src/bin/egui_gui/descview.c b/src/bin/egui_gui/descview.c
index 8590d0e..cbe4da5 100644
--- a/src/bin/egui_gui/descview.c
+++ b/src/bin/egui_gui/descview.c
@@ -77,7 +77,8 @@ _description_item_content_get(It_Data *it_data)
else if (!strcmp(it_data->desc, DB_DEF_NAME))
{
Eo *entry = props_entry_add(box, wdg_name_get(it_data->wdg),
GUI_TYPE_STRING);
-eo_do (entry, eo_event_callback_add(ELM_ENTRY_EVENT_ACTIVATED,
_wdg_name_change_cb, it_data->wdg));
+eo_do(entry, eo_event_callback_add(ELM_ENTRY_EVENT_ACTIVATED,
_wdg_name_change_cb, it_data->wdg));
+prop_memo_bubble_add(entry, "Press Enter to apply changes");
elm_object_tooltip_text_set(entry, "Widget name");
}
else if (!strcmp(it_data->desc, DB_DEF_CLASS))
diff --git a/src/bin/egui_gui/itemview.c b/src/bin/egui_gui/itemview.c
index cb02400..a5c7c56 100644
--- a/src/bin/egui_gui/itemview.c
+++ b/src/bin/egui_gui/itemview.c
@@ -99,6 +99,7 @@ _item_list_content_get(void *data, Evas_Object *obj
EINA_UNUSED, const char *par
else
{
eo_do(o, eo_event_callback_add(ELM_ENTRY_EVENT_ACTIVATED,
_view_cbs->item_update_cb_func, NULL));
+ prop_memo_bubble_add(o, "Press Enter to apply changes");
}
}
else
diff --git a/src/bin/egui_gui/props_helper.c b/src/bin/egui_gui/props_helper.c
index 7c2961a..5bb5af5 100644
--- a/src/bin/egui_gui/props_helper.c
+++ b/src/bin/egui_gui/props_helper.c
@@ -564,3 +564,44 @@ props_value_add(Eo *box, const Gui_Widget *wdg, const
Gui_Value *value, const Op
return new_obj;
}
+
+/* Callback deletes a bubble when object is unfocused. */
+static Eina_Bool
+_unfocused_cb(void *data, Eo *obj, const Eo_Event_Description *desc
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ Eo *bubble = data;
+ eo_do(obj, eo_event_callback_del(ELM_LAYOUT_EVENT_UNFOCUSED, _unfocused_cb,
bubble));
+ eo_del(bubble);
+ return EO_CALLBACK_CONTINUE;
+}
+
+/* Callback creates a bubble when object is focused. */
+static Eina_Bool
+_focused_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
+{
+ Evas_Coord x ,y;
+
+ Eo *lbl = elm_label_add(obj);
+ eo_do(lbl, elm_obj_widget_part_text_set(NULL, data));
+ eo_do(lbl, evas_obj_visibility_set(EINA_TRUE));
+
+ Eo *bubble = elm_bubble_add(obj);
+ eo_do(obj, evas_obj_position_get(&x, &y));
+
+ eo_do(bubble, elm_obj_container_content_set(NULL, lbl));
+ eo_do(bubble, evas_obj_size_set(170, 45));
+ eo_do(bubble, evas_obj_color_set(255, 255, 0, 255));
+ eo_do(bubble, evas_obj_position_set(x, y - 35));
+ eo_do(bubble, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(bubble, elm_obj_bubble_pos_set(ELM_BUBBLE_POS_BOTTOM_LEFT));
+
+ eo_do(obj, eo_event_callback_add(ELM_LAYOUT_EVENT_UNFOCUSED, _unfocused_cb,
bubble));
+ return EO_CALLBACK_CONTINUE;
+}
+
+void
+prop_memo_bubble_add(Eo *obj, const char *memo)
+{
+ eo_do(obj, eo_event_callback_add(ELM_LAYOUT_EVENT_FOCUSED, _focused_cb,
memo));
+}
+
diff --git a/src/bin/egui_gui/props_helper.h b/src/bin/egui_gui/props_helper.h
index b1f7b73..f3546f1 100644
--- a/src/bin/egui_gui/props_helper.h
+++ b/src/bin/egui_gui/props_helper.h
@@ -130,4 +130,8 @@ void*
_mempool_cache_data_get(const char *key);
void
_mempool_cache_data_put(const char *key, void *ptr);
+
+/* API to add and show/hide memo bubble when object is focused/unfocused. */
+void
+prop_memo_bubble_add(Eo *obj, const char *memo);
#endif
--
[E-devel] evas_generic_loaders 1.12.0 and poppler > 0.30 support
Hi, In OpenIndiana we currently deliver 1.12.x versions of Enlightenment libraries together with Enlightenment 0.19.3 and terminology. When updating poppler to 0.32.0, it appeared that evas_generic_loaders 1.12.0 only supports poppler < 0.30. The attached patch created by Alexander Pyhalov fixes compilation but it is unclear if runtime issues are to be expected. Do you have any insight on that matter ? Thank you in advance. Best, Aurélien -- --- LARCHER Aurélien | KTH, School of Computer Science and Communication Work: +46 (0) 8 790 71 42 | Lindstedtsvägen 5, Plan 4, 100 44 Stockholm, SWEDEN --- 01-poppler.patch Description: Binary data -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [e16/e16] master 02/02: Fix crash when using mouse wheel in background selector (T2222).
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=7d11396d3e09f17522b809100533b859f2f7febd commit 7d11396d3e09f17522b809100533b859f2f7febd Author: Kim Woelders Date: Mon Mar 23 19:23:55 2015 +0100 Fix crash when using mouse wheel in background selector (T). --- src/backgrounds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backgrounds.c b/src/backgrounds.c index 44e843e..21573a6 100644 --- a/src/backgrounds.c +++ b/src/backgrounds.c @@ -1762,7 +1762,7 @@ CB_BGAreaEvent(DItem * di, int val __UNUSED__, void *data) goto do_slide; do_slide: DialogItemSliderSetVal(dd->bg_sel_slider, dd->bg_sel_sliderval); -CB_BGAreaSlide(NULL, 0, NULL); +CB_BGAreaSlide(d, 0, NULL); break; } } --
[EGIT] [e16/e16] master 01/02: Slightly different fix to pager zoom/focus issue.
kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=45bf0da80df6d0db0de043c8860c238e8fd7c98d
commit 45bf0da80df6d0db0de043c8860c238e8fd7c98d
Author: Kim Woelders
Date: Mon Mar 23 19:27:53 2015 +0100
Slightly different fix to pager zoom/focus issue.
---
src/hiwin.c | 8
src/hiwin.h | 2 +-
src/pager.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/hiwin.c b/src/hiwin.c
index 8df5572..c3b8bd5 100644
--- a/src/hiwin.c
+++ b/src/hiwin.c
@@ -27,7 +27,6 @@
#include "E.h"
#include "cursors.h"
-#include "desktops.h"
#include "eobj.h"
#include "events.h"
#include "ewins.h"
@@ -265,7 +264,7 @@ HiwinSetGeom(Hiwin * phi, int x, int y, int w, int h)
}
void
-HiwinInit(Hiwin * phi, EWin * ewin)
+HiwinInit(Hiwin * phi, EWin * ewin, EObj * parent)
{
if (ewin == phi->ewin)
return;
@@ -281,7 +280,8 @@ HiwinInit(Hiwin * phi, EWin * ewin)
#endif
phi->ewin = ewin;
- EoReparent(phi, EoObj(DesksGetCurrent()), 0, 0);
+ if (parent)
+ EoReparent(phi, parent, 0, 0);
#if USE_COMPOSITE
if (phi->ewin)
@@ -342,7 +342,7 @@ HiwinHide(Hiwin * phi)
if (EoIsShown(phi))
{
GrabPointerRelease();
- HiwinInit(phi, NULL);
+ HiwinInit(phi, NULL, NULL);
EoUnmap(phi);
}
diff --git a/src/hiwin.h b/src/hiwin.h
index 522b010..03f0715 100644
--- a/src/hiwin.h
+++ b/src/hiwin.h
@@ -30,7 +30,7 @@ typedef struct _hiwin Hiwin;
Hiwin *HiwinCreate(void);
voidHiwinSetGeom(Hiwin * phi, int x, int y, int w, int h);
-voidHiwinInit(Hiwin * phi, EWin * ewin);
+voidHiwinInit(Hiwin * phi, EWin * ewin, EObj * parent);
voidHiwinSetCallback(Hiwin * phi,
void (*func) (Win win, XEvent * ev,
void *data), void *data);
diff --git a/src/pager.c b/src/pager.c
index cf0387c..e661058 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -1130,7 +1130,7 @@ PagerHiwinInit(Pager * p, EWin * ewin)
wh = (EoGetH(ewin) * p->dh) / WinGetH(VROOT);
ETranslateCoordinates(p->win, VROOT, 0, 0, &px, &py, NULL);
- HiwinInit(phi, ewin);
+ HiwinInit(phi, ewin, EoObj(EoGetDesk(p->ewin)));
HiwinSetGeom(phi, px + wx, py + wy, ww, wh);
HiwinSetCallback(phi, PagerHiwinEvent, p);
}
--
Re: [E-devel] evas_generic_loaders 1.12.0 and poppler > 0.30 support
Hello, On Tue, Mar 24, 2015 at 5:09 PM, Aurélien Larcher wrote: > In OpenIndiana we currently deliver 1.12.x versions of Enlightenment > libraries together with Enlightenment 0.19.3 and terminology. > When updating poppler to 0.32.0, it appeared that evas_generic_loaders > 1.12.0 only supports poppler < 0.30. > The attached patch created by Alexander Pyhalov fixes compilation but it is > unclear if runtime issues are to be expected. > > Do you have any insight on that matter ? The patch seems ok to me, but it would be better if you could open a differential on phab so that we can actually track this issue and patch correctly. -- Cedric BAIL -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: [Evas: Evas_3D] Fix shader code for using with GL_ES
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ce5a91241966fd2717300be09529e9d017b64c35 commit ce5a91241966fd2717300be09529e9d017b64c35 Author: Dmytro Dadyka Date: Tue Mar 24 10:06:25 2015 -0700 [Evas: Evas_3D] Fix shader code for using with GL_ES Summary: GL_ES variables precision added. Reviewers: cedric, jpeg Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2234 --- .../gl_common/shader_3d/evas_gl_3d_shaders.x | 80 ++ .../evas/engines/gl_common/shader_3d/include.shd | 6 ++ 2 files changed, 86 insertions(+) diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x index c4d328a..fde35e8 100644 --- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x +++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x @@ -2,6 +2,11 @@ * See: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh */ static const char const vertex_color_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4 uMatrixMvp;\n" "varying vec4 vColor;\n" "#ifdef VERTEX_POSITION\n" @@ -41,6 +46,11 @@ static const char const vertex_color_vert_glsl[] = "}\n"; static const char const vertex_color_frag_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "varying vec4vColor;\n" "#ifdef FOG_ENABLED\n" "uniform float uFogFactor;\n" @@ -58,6 +68,11 @@ static const char const vertex_color_frag_glsl[] = "}\n"; static const char const diffuse_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4 uMatrixMvp;\n" "#ifdef VERTEX_POSITION\n" "attribute vec4 aPosition0;\n" @@ -99,6 +114,11 @@ static const char const diffuse_vert_glsl[] = "}\n"; static const char const diffuse_frag_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "#ifdef NEED_TEX_COORD\n" "varying vec2 vTexCoord;\n" "#endif //TEX_COORD\n" @@ -137,6 +157,11 @@ static const char const diffuse_frag_glsl[] = "}\n"; static const char const flat_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4 uMatrixMvp;\n" "uniform mat3 uMatrixNormal;\n" "uniform mat4 uMatrixModelview;\n" @@ -260,6 +285,11 @@ static const char const flat_vert_glsl[] = "}\n"; static const char const flat_frag_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "varying vec2 vFactor;\n" "#ifdef NEED_TEX_COORD\n" "varying vec2 vTexCoord;\n" @@ -408,6 +438,11 @@ static const char const flat_frag_glsl[] = "}\n"; static const char const phong_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4 uMatrixMvp;\n" "uniform mat3 uMatrixNormal;\n" "uniform mat4 uMatrixModelview;\n" @@ -499,6 +534,11 @@ static const char const phong_vert_glsl[] = "}\n"; static const char const phong_frag_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "varying vec3vLightVector;\n" "varying vec3vLightHalfVector;\n" "varying vec3vNormal;\n" @@ -684,6 +724,11 @@ static const char const phong_frag_glsl[] = "}\n"; static const char const normal_map_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4 uMatrixMvp;\n" "uniform mat3 uMatrixNormal;\n" "uniform mat4 uMatrixModelview;\n" @@ -832,6 +877,11 @@ static const char const normal_map_vert_glsl[] = "}\n"; static const char const normal_map_frag_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "varying vec3vLightVector;\n" "varying vec3vLightHalfVector;\n" "uniform sampler2D uTextureNormal0;\n" @@ -1050,6 +1100,11 @@ static const char const normal_map_frag_glsl[] = "}\n"; static const char const shadow_map_vert_glsl[] = + "#ifdef GL_ES\n" + "precision mediump float;\n" + "precision mediump int;\n" + "precision lowp sampler2D;\n" + "#endif\n" "uniform mat4
[EGIT] [core/efl] master 03/05: [Evas: Evas_3D] Refactor shader system: refactored diffuse shade mode.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f95136f13901a43385697e477a099cc44c84fc5a
commit f95136f13901a43385697e477a099cc44c84fc5a
Author: Dmytro Dadyka
Date: Tue Mar 24 10:50:31 2015 -0700
[Evas: Evas_3D] Refactor shader system: refactored diffuse shade mode.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2229
---
.../engines/gl_common/shader_3d/diffuse_frag.shd | 52 --
.../engines/gl_common/shader_3d/diffuse_vert.shd | 49 +++-
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 24 +-
3 files changed, 27 insertions(+), 98 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
index 7b6dc2b..b08bf40 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
@@ -1,47 +1,11 @@
-#ifdef NEED_TEX_COORD
-varying vec2 vTexCoord;
-#endif //TEX_COORD
-
-#ifdef FOG_ENABLED
-uniform float uFogFactor;
-uniform vec4 uFogColor;
-#endif //FOG_ENABLED
-
-#ifdef DIFFUSE
-uniform vec4uMaterialDiffuse;
-
-#ifdef DIFFUSE_TEXTURE
-uniform sampler2D uTextureDiffuse0;
-#endif //DIFFUSE_TEXTURE
-
-#ifdef DIFFUSE_TEXTURE_BLEND
-uniform sampler2D uTextureDiffuse1;
-uniform float uTextureDiffuseWeight;
-#endif //DIFFUSE_TEXTURE_BLEND
-
-#endif //DIFFUSE
+FRAGMENT_SHADER_USE_TEX_COORD
+FRAGMENT_SHADER_USE_FOG
+FRAGMENT_SHADER_USE_DIFFUSE_TERM
void main() {
-
-#ifdef DIFFUSE_TEXTURE_BLEND
- gl_FragColor = (texture2D(uTextureDiffuse0, vTexCoord) *
- uTextureDiffuseWeight + texture2D(uTextureDiffuse1, vTexCoord) *
- (1.0 - uTextureDiffuseWeight)) * uMaterialDiffuse;
-#else
-
-#ifdef DIFFUSE_TEXTURE
- gl_FragColor = texture2D(uTextureDiffuse0, vTexCoord) * uMaterialDiffuse;
-#else
- gl_FragColor = uMaterialDiffuse;
-#endif //DIFFUSE_TEXTURE
-
-#endif //DIFFUSE_TEXTURE_BLEND
-
-#ifdef FOG_ENABLED
- float z = gl_FragCoord.z / gl_FragCoord.w;
- float fogFactor = exp2( -uFogFactor * uFogFactor * z * z * 1.44);
- fogFactor = clamp(fogFactor, 0.0, 1.0);
- gl_FragColor = mix(uFogColor, gl_FragColor, fogFactor);
-#endif //FOG_ENABLED
-
+ vec4 color;
+ FRAGMENT_SHADER_TEXTURE_BLEND(DIFFUSE, Diffuse)
+ gl_FragColor = color;
+ FRAGMENT_SHADER_FOG_APPLY
}
+
diff --git a/src/modules/evas/engines/gl_common/shader_3d/diffuse_vert.shd
b/src/modules/evas/engines/gl_common/shader_3d/diffuse_vert.shd
index 2b62b82..1a68155 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/diffuse_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/diffuse_vert.shd
@@ -1,52 +1,13 @@
uniform mat4 uMatrixMvp;
-#ifdef VERTEX_POSITION
-attribute vec4 aPosition0;
-#endif //VERTEX_POSITION
-
-#ifdef VERTEX_POSITION_BLEND
-attribute vec4 aPosition1;
-uniform float uPositionWeight;
-#endif //VERTEX_POSITION_BLEND
-
-#ifdef VERTEX_TEXCOORD
-attribute vec4 aTexCoord0;
-#endif //VERTEX_TEXCOORD
-
-#ifdef VERTEX_TEXCOORD_BLEND
-attribute vec4 aTexCoord1;
-uniform float uTexCoordWeight;
-#endif //VERTEX_TEXCOORD_BLEND
-
-#ifdef NEED_TEX_COORD
-varying vec2 vTexCoord;
-#endif //NEED_TEX_COORD
+VERTEX_SHADER_USE_POSITION
+VERTEX_SHADER_USE_TEXCOORD
+VERTEX_SHADER_NEED_TEX_COORD
void main()
{
-
-#ifdef VERTEX_POSITION_BLEND
- vec4 position = aPosition0 * uPositionWeight +
- aPosition1 * (1.0 - uPositionWeight);
- position = vec4(position.xyz, 1.0);
-#else
-
-#ifdef VERTEX_POSITION
- vec4 position = vec4(aPosition0.xyz, 1.0);
-#endif // VERTEX_POSITION
-
-#endif //VERTEX_POSITION_BLEND
-
-#ifdef VERTEX_TEXCOORD_BLEND
- vTexCoord = aTexCoord0.st * uTexCoordWeight +
- aTexCoord1.st * (1.0 - uTexCoordWeight);
-#else
-
-#ifdef VERTEX_TEXCOORD
- vTexCoord = aTexCoord0.st;
-#endif //VERTEX_TEXCOORD
-
-#endif //VERTEX_TEXCOORD_BLEND
+ VERTEX_SHADER_POSITION
+ VERTEX_SHADER_TEXCOORD
gl_Position = uMatrixMvp * position;
}
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index b8a5edb..40c7749 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -94,7 +94,7 @@ static const char const diffuse_vert_glsl[] =
"#endif //NEED_TEX_COORD\n"
"void main()\n"
"{\n"
- "#ifdef VERTEX_POSITION_BLEND\n"
+ " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n"
@@ -103,7 +103,7 @@ static const char const diffuse_vert_glsl[] =
" vec4 position = vec4(aPosition0.xyz, 1.0);\n"
"#endif // VERTEX_POSITION\n"
"#endif //VERTEX_POSITION_BLEND\n"
- "#ifdef VERTEX_TEXCOORD_BLEND\n"
[EGIT] [core/efl] master 05/05: [Evas: Evas_3D] Refactor shader system: refactored normal map shade mode.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=06978b210bf37430532cf6a4662c9a4be03397d0
commit 06978b210bf37430532cf6a4662c9a4be03397d0
Author: Dmytro Dadyka
Date: Tue Mar 24 10:50:40 2015 -0700
[Evas: Evas_3D] Refactor shader system: refactored normal map shade mode.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2232
---
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 66
.../gl_common/shader_3d/normal_map_frag.shd| 168 ++---
.../gl_common/shader_3d/normal_map_vert.shd| 79 ++
3 files changed, 57 insertions(+), 256 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index ed9780b..8377e39 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -844,7 +844,7 @@ static const char const normal_map_vert_glsl[] =
"#endif //VERTEX_TANGENT\n"
"void main()\n"
"{\n"
- "#ifdef VERTEX_POSITION_BLEND\n"
+ " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n"
@@ -853,7 +853,7 @@ static const char const normal_map_vert_glsl[] =
" vec4 position = vec4(aPosition0.xyz, 1.0);\n"
"#endif // VERTEX_POSITION\n"
"#endif //VERTEX_POSITION_BLEND\n"
- "#ifdef VERTEX_NORMAL_BLEND\n"
+ " #ifdef VERTEX_NORMAL_BLEND\n"
" vec3 normal = aNormal0.xyz * uNormalWeight +\n"
" aNormal1.xyz * (1.0 - uNormalWeight);\n"
"#else\n"
@@ -869,7 +869,7 @@ static const char const normal_map_vert_glsl[] =
" vec3 tangent = aTangent0.xyz;\n"
"#endif //VERTEX_TANGENT\n"
"#endif //VERTEX_TANGENT_BLEND\n"
- "#ifdef VERTEX_TEXCOORD_BLEND\n"
+ " #ifdef VERTEX_TEXCOORD_BLEND\n"
" vTexCoord = aTexCoord0.st * uTexCoordWeight +\n"
" aTexCoord1.st * (1.0 - uTexCoordWeight);\n"
"#else\n"
@@ -909,6 +909,16 @@ static const char const normal_map_frag_glsl[] =
"varying vec4 vLightPosition;\n"
"uniform sampler2D uShadowMap;\n"
"float shadow;\n"
+ "float pcf(vec4 lpos, float size)\n"
+ " {\n"
+ " vec3 smcoord = lpos.xyz / lpos.w * 0.5 + 0.5;\n"
+ " float i, j, randx, randy, shadow;\n"
+ " shadow = 0.0;\n"
+ " for (i = -4.0; i < 4.0; i++)\n"
+ " for (j = -4.0; j < 4.0; j++)\n"
+ " shadow += float(smcoord.z <= texture2D(uShadowMap, smcoord.xy +
vec2(i / 8.0, j / 8.0)*size).x);\n"
+ " return shadow / 64.0;\n"
+ "}\n"
"#endif //SHADOWED\n"
"#ifdef NORMAL_TEXTURE_BLEND\n"
"uniform sampler2D uTextureNormal1;\n"
@@ -1018,14 +1028,15 @@ static const char const normal_map_frag_glsl[] =
" if (factor > 0.0)\n"
" {\n"
"#ifdef DIFFUSE\n"
- "#ifdef DIFFUSE_TEXTURE_BLEND\n"
- "color = texture2D(uTextureDiffuse0, vTexCoord) *
uTextureDiffuseWeight +\n"
- "texture2D(uTextureDiffuse1, vTexCoord) * (1.0 -
uTextureDiffuseWeight);\n"
+ "\n"
+ "#ifdef DIFFUSE_TEXTURE_BLEND\n"
+ " color = texture2D(uTextureDiffuse0, vTexCoord) * uTextureDiffuseWeight
+\n"
+ " texture2D(uTextureDiffuse1, vTexCoord) * (1.0 -
uTextureDiffuseWeight);\n"
"#else\n"
- "#ifdef DIFFUSE_TEXTURE\n"
- "color = texture2D(uTextureDiffuse0, vTexCoord);\n"
+ "#ifdef DIFFUSE_TEXTURE\n"
+ " color = texture2D(uTextureDiffuse0, vTexCoord);\n"
"#else\n"
- "color = uMaterialDiffuse;\n"
+ " color = uMaterialDiffuse;\n"
"#endif //DIFFUSE_TEXTURE\n"
"#endif //DIFFUSE_TEXTURE_BLEND\n"
"gl_FragColor = uLightDiffuse * color * factor;\n"
@@ -1037,14 +1048,15 @@ static const char const normal_map_frag_glsl[] =
"if (factor > 0.0)\n"
" {\n"
" factor = pow(factor, uMaterialShininess);\n"
- "#ifdef SPECULAR_TEXTURE_BLEND\n"
- " color = texture2D(uTextureSpecular0, vTexCoord) *
uTextureSpecularWeight +\n"
- " texture2D(uTextureSpecular1, vTexCoord) * (1.0 -
uTextureSpecularWeight);\n"
+ " \n"
+ "#ifdef SPECULAR_TEXTURE_BLEND\n"
+ " color = texture2D(uTextureSpecular0, vTexCoord) *
uTextureSpecularWeight +\n"
+ " texture2D(uTextureSpecular1, vTexCoord) * (1.0 -
uTextureSpecularWeight);\n"
"#else\n"
- "#ifdef SPECULAR_TEXTURE\n"
- " color = texture2D(uTextureSpecular0, vTexCoord);\n"
+ "#ifdef SPECULAR_TEXTURE\n"
+ " color = texture2D(uTextureSpecular0, vTexCoord);\n"
"#else\n"
- " color = uMaterialSpecular;\n"
+ " color = uMaterialSpecular;\n"
"#endif //SPECULAR_TEXTURE\n"
"#endif //SPECULAR_TEXTURE_BLEND\n"
" gl_FragColor += uLightSpecular * color * factor;
[EGIT] [core/efl] master 01/05: [Evas: Evas_3D] Refactor shader system: refactored flat shade mode.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8110ec94f496ff0c5a01268d4edbce1bb275e597
commit 8110ec94f496ff0c5a01268d4edbce1bb275e597
Author: Dmytro Dadyka
Date: Tue Mar 24 10:49:25 2015 -0700
[Evas: Evas_3D] Refactor shader system: refactored flat shade mode.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2224
---
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 83 +-
.../evas/engines/gl_common/shader_3d/flat_frag.shd | 170 ++---
.../evas/engines/gl_common/shader_3d/flat_vert.shd | 80 ++
.../evas/engines/gl_common/shader_3d/include.shd | 3 +-
4 files changed, 72 insertions(+), 264 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index fde35e8..40ad124 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -252,7 +252,7 @@ static const char const flat_vert_glsl[] =
"}\n"
"void main()\n"
"{\n"
- "#ifdef VERTEX_POSITION_BLEND\n"
+ " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n"
@@ -261,7 +261,7 @@ static const char const flat_vert_glsl[] =
" vec4 position = vec4(aPosition0.xyz, 1.0);\n"
"#endif // VERTEX_POSITION\n"
"#endif //VERTEX_POSITION_BLEND\n"
- "#ifdef VERTEX_NORMAL_BLEND\n"
+ " #ifdef VERTEX_NORMAL_BLEND\n"
" vec3 normal = aNormal0.xyz * uNormalWeight +\n"
" aNormal1.xyz * (1.0 - uNormalWeight);\n"
"#else\n"
@@ -269,7 +269,7 @@ static const char const flat_vert_glsl[] =
" vec3 normal = aNormal0.xyz;\n"
"#endif //VERTEX_NORMAL\n"
"#endif //VERTEX_NORMAL_BLEND\n"
- "#ifdef VERTEX_TEXCOORD_BLEND\n"
+ " #ifdef VERTEX_TEXCOORD_BLEND\n"
" vTexCoord = aTexCoord0.st * uTexCoordWeight +\n"
" aTexCoord1.st * (1.0 - uTexCoordWeight);\n"
"#else\n"
@@ -279,9 +279,9 @@ static const char const flat_vert_glsl[] =
"#endif //VERTEX_TEXCOORD_BLEND\n"
" gl_Position = uMatrixMvp * position;\n"
" vertexFlat(position, normal);\n"
- "#ifdef SHADOWED\n"
+ " #ifdef SHADOWED\n"
" vLightPosition = uMatrixLight * position;\n"
- "#endif\n"
+ "#endif //SHADOWED\n"
"}\n";
static const char const flat_frag_glsl[] =
@@ -302,6 +302,16 @@ static const char const flat_frag_glsl[] =
"varying vec4 vLightPosition;\n"
"uniform sampler2D uShadowMap;\n"
"float shadow;\n"
+ "float pcf(vec4 lpos, float size)\n"
+ " {\n"
+ " vec3 smcoord = lpos.xyz / lpos.w * 0.5 + 0.5;\n"
+ " float i, j, randx, randy, shadow;\n"
+ " shadow = 0.0;\n"
+ " for (i = -4.0; i < 4.0; i++)\n"
+ " for (j = -4.0; j < 4.0; j++)\n"
+ " shadow += float(smcoord.z <= texture2D(uShadowMap, smcoord.xy +
vec2(i / 8.0, j / 8.0)*size).x);\n"
+ " return shadow / 64.0;\n"
+ "}\n"
"#endif //SHADOWED\n"
"#ifdef DIFFUSE\n"
"uniform vec4uMaterialDiffuse;\n"
@@ -347,44 +357,34 @@ static const char const flat_frag_glsl[] =
"uniform float uTextureEmissionWeight;\n"
"#endif //EMISSION_TEXTURE_BLEND\n"
"#endif //EMISSION\n"
- "#ifdef SHADOWED\n"
- "float pcf(vec4 lpos, float size)\n"
- "{\n"
- " vec3 smcoord = lpos.xyz / lpos.w * 0.5 + 0.5;\n"
- " float i, j, randx, randy, shadow;\n"
- " shadow = 0.0;\n"
- " for (i = -4.0; i < 4.0; i++)\n"
- " for (j = -4.0; j < 4.0; j++)\n"
- "shadow += float(smcoord.z <= texture2D(uShadowMap, smcoord.xy
+vec2(i / 8.0, j / 8.0)*size).x);\n"
- " return shadow / 64.0;\n"
- "}\n"
- "#endif //SHADOWED\n"
"void fragmentFlat()\n"
"{\n"
" vec4 color;\n"
"#ifdef DIFFUSE\n"
- "#ifdef DIFFUSE_TEXTURE_BLEND\n"
- "color = texture2D(uTextureDiffuse0, vTexCoord) *
uTextureDiffuseWeight +\n"
- "texture2D(uTextureDiffuse1, vTexCoord) * (1.0 -
uTextureDiffuseWeight);\n"
- "color *= uMaterialDiffuse;\n"
+ " \n"
+ "#ifdef DIFFUSE_TEXTURE_BLEND\n"
+ " color = texture2D(uTextureDiffuse0, vTexCoord) * uTextureDiffuseWeight
+\n"
+ " texture2D(uTextureDiffuse1, vTexCoord) * (1.0 -
uTextureDiffuseWeight);\n"
+ " color *= uMaterialDiffuse;\n"
"#else\n"
"#ifdef DIFFUSE_TEXTURE\n"
- "color = texture2D(uTextureDiffuse0, vTexCoord) *
uMaterialDiffuse;\n"
+ " color = texture2D(uTextureDiffuse0, vTexCoord) * uMaterialDiffuse;\n"
"#else\n"
- "color = uMaterialDiffuse;\n"
+ " color = uMaterialDiffuse;\n"
"#endif //DIFFUSE_TEXTURE\n"
"#endif //DIFFUSE_TEXTURE_BLEND\n"
- "gl_FragColor = uLightDiffuse * color * vFactor.x;\n"
+ " gl_FragColor = uLightDiff
[EGIT] [core/efl] master 02/05: [Evas: Evas_3D] Refactor shader system: refactored vertex color shade mode.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ffa7de039ca0a34202f0b5cb4f39edf1f3892c7c
commit ffa7de039ca0a34202f0b5cb4f39edf1f3892c7c
Author: Dmytro Dadyka
Date: Tue Mar 24 10:50:25 2015 -0700
[Evas: Evas_3D] Refactor shader system: refactored vertex color shade mode.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2228
---
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 5 ++--
.../evas/engines/gl_common/shader_3d/include.shd | 10 +++
.../gl_common/shader_3d/vertex_color_frag.shd | 14 ++
.../gl_common/shader_3d/vertex_color_vert.shd | 32 ++
4 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index 40ad124..b8a5edb 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -25,7 +25,7 @@ static const char const vertex_color_vert_glsl[] =
"#endif //VERTEX_COLOR_BLEND\n"
"void main()\n"
"{\n"
- "#ifdef VERTEX_POSITION_BLEND\n"
+ " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n"
@@ -59,9 +59,10 @@ static const char const vertex_color_frag_glsl[] =
"void main()\n"
"{\n"
" gl_FragColor = vColor;\n"
+ " \n"
"#ifdef FOG_ENABLED\n"
" float z = gl_FragCoord.z / gl_FragCoord.w;\n"
- " float fogFactor = exp2( -uFogFactor * uFogFactor * z * z * 1.44);\n"
+ " float fogFactor = exp2(-uFogFactor * uFogFactor * z * z * 1.44);\n"
" fogFactor = clamp(fogFactor, 0.0, 1.0);\n"
" gl_FragColor = mix(uFogColor, gl_FragColor, fogFactor);\n"
"#endif //FOG_ENABLED\n"
diff --git a/src/modules/evas/engines/gl_common/shader_3d/include.shd
b/src/modules/evas/engines/gl_common/shader_3d/include.shd
index 5028021..aea3c8f 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/include.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/include.shd
@@ -148,6 +148,16 @@ uniform float uTexCoordWeight;
`#endif //VERTEX_TEXCOORD_BLEND'
)
+define(`VERTEX_SHADER_USE_COLOR',
+`#ifdef VERTEX_COLOR'
+attribute vec4 aColor0;
+`#endif //VERTEX_COLOR'
+
+`#ifdef VERTEX_COLOR_BLEND'
+attribute vec4 aColor1;
+uniform float uColorWeight;
+`#endif //VERTEX_COLOR_BLEND')
+
define(`VERTEX_SHADER_POSITION',
`#ifdef VERTEX_POSITION_BLEND'
vec4 position = aPosition0 * uPositionWeight +
diff --git a/src/modules/evas/engines/gl_common/shader_3d/vertex_color_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/vertex_color_frag.shd
index 9b0c023..24fb237 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/vertex_color_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/vertex_color_frag.shd
@@ -1,20 +1,10 @@
varying vec4vColor;
-#ifdef FOG_ENABLED
-uniform float uFogFactor;
-uniform vec4 uFogColor;
-#endif //FOG_ENABLED
+FRAGMENT_SHADER_USE_FOG
void main()
{
gl_FragColor = vColor;
-
-#ifdef FOG_ENABLED
- float z = gl_FragCoord.z / gl_FragCoord.w;
- float fogFactor = exp2( -uFogFactor * uFogFactor * z * z * 1.44);
- fogFactor = clamp(fogFactor, 0.0, 1.0);
- gl_FragColor = mix(uFogColor, gl_FragColor, fogFactor);
-#endif //FOG_ENABLED
-
+ FRAGMENT_SHADER_FOG_APPLY
}
diff --git a/src/modules/evas/engines/gl_common/shader_3d/vertex_color_vert.shd
b/src/modules/evas/engines/gl_common/shader_3d/vertex_color_vert.shd
index 560baad..6daeacf 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/vertex_color_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/vertex_color_vert.shd
@@ -1,38 +1,12 @@
uniform mat4 uMatrixMvp;
varying vec4 vColor;
-#ifdef VERTEX_POSITION
-attribute vec4 aPosition0;
-#endif //VERTEX_POSITION
-
-#ifdef VERTEX_POSITION_BLEND
-attribute vec4 aPosition1;
-uniform float uPositionWeight;
-#endif //VERTEX_POSITION_BLEND
-
-#ifdef VERTEX_COLOR
-attribute vec4 aColor0;
-#endif //VERTEX_COLOR
-
-#ifdef VERTEX_COLOR_BLEND
-attribute vec4 aColor1;
-uniform float uColorWeight;
-#endif //VERTEX_COLOR_BLEND
+VERTEX_SHADER_USE_POSITION
+VERTEX_SHADER_USE_COLOR
void main()
{
-
-#ifdef VERTEX_POSITION_BLEND
- vec4 position = aPosition0 * uPositionWeight +
- aPosition1 * (1.0 - uPositionWeight);
- position = vec4(position.xyz, 1.0);
-#else
-
-#ifdef VERTEX_POSITION
- vec4 position = vec4(aPosition0.xyz, 1.0);
-#endif // VERTEX_POSITION
-
-#endif //VERTEX_POSITION_BLEND
+ VERTEX_SHADER_POSITION
#ifdef VERTEX_COLOR_BLEND
vec4 color = aColor0 * uColorWeight + aColor1 * (1.0 - uColorWeight);
--
[EGIT] [core/efl] master 04/05: [Evas: Evas_3D] Refactor shader system: refactored color pick shade mode.
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=02da66541f1f35c777297470fc49182227eac501
commit 02da66541f1f35c777297470fc49182227eac501
Author: Dmytro Dadyka
Date: Tue Mar 24 10:50:36 2015 -0700
[Evas: Evas_3D] Refactor shader system: refactored color pick shade mode.
Reviewers: cedric, jpeg
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2230
---
.../engines/gl_common/shader_3d/color_pick_vert.shd | 21 ++---
.../gl_common/shader_3d/evas_gl_3d_shaders.x| 2 +-
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
b/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
index 472866f..62de54f 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/color_pick_vert.shd
@@ -1,27 +1,10 @@
uniform mat4 uMatrixMvp;
-#ifdef VERTEX_POSITION
-attribute vec4 aPosition0;
-#endif //VERTEX_POSITION
-
-#ifdef VERTEX_POSITION_BLEND
-attribute vec4 aPosition1;
-uniform float uPositionWeight;
-#endif //VERTEX_POSITION_BLEND
+VERTEX_SHADER_USE_POSITION
void main()
{
-#ifdef VERTEX_POSITION_BLEND
- vec4 position = aPosition0 * uPositionWeight +
- aPosition1 * (1.0 - uPositionWeight);
- position = vec4(position.xyz, 1.0);
-#else
-
-#ifdef VERTEX_POSITION
- vec4 position = vec4(aPosition0.xyz, 1.0);
-#endif // VERTEX_POSITION
-
-#endif //VERTEX_POSITION_BLEND
+ VERTEX_SHADER_POSITION
gl_Position = uMatrixMvp * position;
}
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index 40c7749..ed9780b 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -1214,7 +1214,7 @@ static const char const color_pick_vert_glsl[] =
"#endif //VERTEX_POSITION_BLEND\n"
"void main()\n"
"{\n"
- "#ifdef VERTEX_POSITION_BLEND\n"
+ " #ifdef VERTEX_POSITION_BLEND\n"
" vec4 position = aPosition0 * uPositionWeight +\n"
" aPosition1 * (1.0 - uPositionWeight);\n"
" position = vec4(position.xyz, 1.0);\n"
--
[EGIT] [core/efl] master 01/01: Evas GL: Add missed GLES 3.0 functions.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=49b95b9c6ce2539aeeb2d4393a8b3c43c0372035 commit 49b95b9c6ce2539aeeb2d4393a8b3c43c0372035 Author: mythri.venugopal Date: Tue Mar 24 11:22:01 2015 -0700 Evas GL: Add missed GLES 3.0 functions. Summary: Initialise glVertexAttribDivisor & glVertexAttribIPointer EvasGL function pointers. Reviewers: wonsik, spacegrapher, jpeg Reviewed By: jpeg Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2236 --- src/modules/evas/engines/gl_common/evas_gl_api.c | 4 1 file changed, 4 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c index fa28846..8a04c21 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_api.c +++ b/src/modules/evas/engines/gl_common/evas_gl_api.c @@ -5331,10 +5331,12 @@ _normal_gles3_api_get(Evas_GL_API *funcs) ORD(glUniformMatrix3x4fv); ORD(glUniformMatrix4x3fv); ORD(glUnmapBuffer); + ORD(glVertexAttribDivisor); ORD(glVertexAttribI4i); ORD(glVertexAttribI4iv); ORD(glVertexAttribI4ui); ORD(glVertexAttribI4uiv); + ORD(glVertexAttribIPointer); ORD(glWaitSync); #undef ORD @@ -5618,10 +5620,12 @@ _debug_gles3_api_get(Evas_GL_API *funcs) ORD(glUniformMatrix3x4fv); ORD(glUniformMatrix4x3fv); ORD(glUnmapBuffer); + ORD(glVertexAttribDivisor); ORD(glVertexAttribI4i); ORD(glVertexAttribI4iv); ORD(glVertexAttribI4ui); ORD(glVertexAttribI4uiv); + ORD(glVertexAttribIPointer); ORD(glWaitSync); #undef ORD --
[EGIT] [core/efl] master 01/02: Evas 3D: Add forgotten changes after generation of shaders
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c4cd274ad9dd04f23e7c3291f5a6609415015122 commit c4cd274ad9dd04f23e7c3291f5a6609415015122 Author: Jean-Philippe ANDRE Date: Tue Mar 24 11:45:32 2015 -0700 Evas 3D: Add forgotten changes after generation of shaders --- .../evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x index 8377e39..26501a6 100644 --- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x +++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x @@ -144,9 +144,10 @@ static const char const diffuse_frag_glsl[] = "#ifdef DIFFUSE_TEXTURE_BLEND\n" " color = texture2D(uTextureDiffuse0, vTexCoord) * uTextureDiffuseWeight +\n" " texture2D(uTextureDiffuse1, vTexCoord) * (1.0 - uTextureDiffuseWeight);\n" + " color *= uMaterialDiffuse;\n" "#else\n" "#ifdef DIFFUSE_TEXTURE\n" - " color = texture2D(uTextureDiffuse0, vTexCoord);\n" + " color = texture2D(uTextureDiffuse0, vTexCoord) * uMaterialDiffuse;\n" "#else\n" " color = uMaterialDiffuse;\n" "#endif //DIFFUSE_TEXTURE\n" @@ -1032,9 +1033,10 @@ static const char const normal_map_frag_glsl[] = "#ifdef DIFFUSE_TEXTURE_BLEND\n" " color = texture2D(uTextureDiffuse0, vTexCoord) * uTextureDiffuseWeight +\n" " texture2D(uTextureDiffuse1, vTexCoord) * (1.0 - uTextureDiffuseWeight);\n" + " color *= uMaterialDiffuse;\n" "#else\n" "#ifdef DIFFUSE_TEXTURE\n" - " color = texture2D(uTextureDiffuse0, vTexCoord);\n" + " color = texture2D(uTextureDiffuse0, vTexCoord) * uMaterialDiffuse;\n" "#else\n" " color = uMaterialDiffuse;\n" "#endif //DIFFUSE_TEXTURE\n" @@ -1052,9 +1054,10 @@ static const char const normal_map_frag_glsl[] = "#ifdef SPECULAR_TEXTURE_BLEND\n" " color = texture2D(uTextureSpecular0, vTexCoord) * uTextureSpecularWeight +\n" " texture2D(uTextureSpecular1, vTexCoord) * (1.0 - uTextureSpecularWeight);\n" + " color *= uMaterialSpecular;\n" "#else\n" "#ifdef SPECULAR_TEXTURE\n" - " color = texture2D(uTextureSpecular0, vTexCoord);\n" + " color = texture2D(uTextureSpecular0, vTexCoord) * uMaterialSpecular;\n" "#else\n" " color = uMaterialSpecular;\n" "#endif //SPECULAR_TEXTURE\n" @@ -1073,9 +1076,10 @@ static const char const normal_map_frag_glsl[] = "#ifdef AMBIENT_TEXTURE_BLEND\n" " color = texture2D(uTextureAmbient0, vTexCoord) * uTextureAmbientWeight +\n" " texture2D(uTextureAmbient1, vTexCoord) * (1.0 - uTextureAmbientWeight);\n" + " color *= uMaterialAmbient;\n" "#else\n" "#ifdef AMBIENT_TEXTURE\n" - " color = texture2D(uTextureAmbient0, vTexCoord);\n" + " color = texture2D(uTextureAmbient0, vTexCoord) * uMaterialAmbient;\n" "#else\n" " color = uMaterialAmbient;\n" "#endif //AMBIENT_TEXTURE\n" @@ -1090,9 +1094,10 @@ static const char const normal_map_frag_glsl[] = "#ifdef EMISSION_TEXTURE_BLEND\n" " color = texture2D(uTextureEmission0, vTexCoord) * uTextureEmissionWeight +\n" " texture2D(uTextureEmission1, vTexCoord) * (1.0 - uTextureEmissionWeight);\n" + " color *= uMaterialEmission;\n" "#else\n" "#ifdef EMISSION_TEXTURE\n" - " color = texture2D(uTextureEmission0, vTexCoord);\n" + " color = texture2D(uTextureEmission0, vTexCoord) * uMaterialEmission;\n" "#else\n" " color = uMaterialEmission;\n" "#endif //EMISSION_TEXTURE\n" --
[EGIT] [core/efl] master 02/02: Evas 3D: Print SHADERS instead of SHADERS_3D at compile time
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad3f4fa5bcdfa2cf971bd4f738c223bea8a7648e commit ad3f4fa5bcdfa2cf971bd4f738c223bea8a7648e Author: Jean-Philippe ANDRE Date: Tue Mar 24 11:47:29 2015 -0700 Evas 3D: Print SHADERS instead of SHADERS_3D at compile time This is just a cosmetic change. --- src/Makefile_Evas.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index d992380..7e417b0 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -778,7 +778,7 @@ BUILT_SOURCES += \ modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh $(GL_SHADERS_3D_GEN) - @echo " SHADERS_3D $@" + @echo " SHADERS $@" @$^ --
[EGIT] [core/efl] master 01/01: ecore-drm: Use better output names
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f0d0533c42ac5dc633e90a018f8ec459c852ba7e
commit f0d0533c42ac5dc633e90a018f8ec459c852ba7e
Author: Chris Michael
Date: Tue Mar 24 15:34:04 2015 -0400
ecore-drm: Use better output names
Summary: As there are various DVI and HDMI output names, update the
output connector types area to be more accurate so we get better
output names
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_output.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index 3fcc703..fc2cd5e 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -17,9 +17,9 @@
static const char *conn_types[] =
{
- "None", "VGA", "DVI", "DVI", "DVI",
- "Composite", "TV", "LVDS", "CTV", "DIN",
- "DP", "HDMI", "HDMI", "TV", "eDP",
+ "None", "VGA", "DVI-I", "DVI-D", "DVI-A",
+ "Composite", "S-Video", "LVDS", "Component", "DIN",
+ "DP", "HDMI-A", "HDMI-B", "TV", "eDP",
};
EAPI int ECORE_DRM_EVENT_OUTPUT = 0;
--
[EGIT] [core/elementary] master 01/01: [elm_datetime] Corrected the logic for datetime values comparison.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=43ead671618b867e8887d35beeec1063bab7ec35
commit 43ead671618b867e8887d35beeec1063bab7ec35
Author: Subodh Kumar
Date: Wed Mar 25 07:00:44 2015 +0900
[elm_datetime] Corrected the logic for datetime values comparison.
Summary:
Datetime value should be compared earlier to avoid unnecessary code
execution.
Also added logic for single field comparion which will avoid to compare all
fields when field limit is set.
Signed Off By: Seongjun Yim
Signed Off By: Hyunseok Yang
Signed Off By: Subodh Kumar
Test Plan: NA
Reviewers: shilpasingh, raster
Reviewed By: shilpasingh, raster
Subscribers: poornima.srinivasan, govi, rajeshps
Differential Revision: https://phab.enlightenment.org/D2202
---
src/lib/elm_datetime.c | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 6948e45..28f61fa 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -593,6 +593,20 @@ _date_cmp(struct tm *time1,
return EINA_TRUE;
}
+static Eina_Bool
+_field_cmp(Elm_Datetime_Field_Type field_type,
+ struct tm *time1,
+ struct tm *time2)
+{
+ DATETIME_TM_ARRAY(timearr1, time1);
+ DATETIME_TM_ARRAY(timearr2, time2);
+
+ if (*timearr1[field_type] != *timearr2[field_type])
+ return EINA_FALSE;
+ else
+ return EINA_TRUE;
+}
+
// validates curr_time/min_limt/max_limit according to the newly set value
static void
_validate_datetime_limits(struct tm *time1,
@@ -1003,7 +1017,7 @@ _elm_datetime_field_limit_set(Eo *obj, Elm_Datetime_Data
*sd, Elm_Datetime_Field
_apply_field_limits(obj);
- if (!_date_cmp(&old_time, &sd->curr_time))
+ if (!_field_cmp(fieldtype, &old_time, &sd->curr_time))
evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
}
@@ -1019,11 +1033,9 @@ _elm_datetime_value_get(Eo *obj EINA_UNUSED,
Elm_Datetime_Data *sd, struct tm *c
EOLIAN static Eina_Bool
_elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd, const struct tm
*newtime)
{
- struct tm old_time;
-
EINA_SAFETY_ON_NULL_RETURN_VAL(newtime, EINA_FALSE);
- old_time = sd->curr_time;
+ if (_date_cmp(&sd->curr_time, newtime)) return EINA_TRUE;
sd->curr_time = *newtime;
// apply default field restrictions for curr_time
_apply_range_restrictions(&sd->curr_time);
@@ -1032,8 +1044,7 @@ _elm_datetime_value_set(Eo *obj, Elm_Datetime_Data *sd,
const struct tm *newtime
_validate_datetime_limits(&sd->max_limit, &sd->curr_time, EINA_TRUE);
_apply_field_limits(obj);
- if (!_date_cmp(&old_time, &sd->curr_time))
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
return EINA_TRUE;
}
@@ -1054,6 +1065,7 @@ _elm_datetime_value_min_set(Eo *obj, Elm_Datetime_Data
*sd, const struct tm *min
EINA_SAFETY_ON_NULL_RETURN_VAL(mintime, EINA_FALSE);
+ if (_date_cmp(&sd->min_limit, mintime)) return EINA_TRUE;
sd->min_limit = *mintime;
old_time = sd->curr_time;
// apply default field restrictions for min_limit
@@ -1085,6 +1097,7 @@ _elm_datetime_value_max_set(Eo *obj, Elm_Datetime_Data
*sd, const struct tm *max
EINA_SAFETY_ON_NULL_RETURN_VAL(maxtime, EINA_FALSE);
+ if (_date_cmp(&sd->max_limit, maxtime)) return EINA_TRUE;
sd->max_limit = *maxtime;
old_time = sd->curr_time;
// apply default field restrictions for max_limit
--
[EGIT] [core/efl] master 01/01: evas: fix use after free.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dd6db2b603685bb9a5c05d025f6587e5b8657581
commit dd6db2b603685bb9a5c05d025f6587e5b8657581
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index b8076a0..ff415ba 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -770,9 +770,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = &im->im->cache_entry;
evas_gl_common_image_alloc_ensure(im);
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = &im->im->cache_entry;
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.13 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=3ab85b3106fbbcdb46aaf90b4e6169cab9467922
commit 3ab85b3106fbbcdb46aaf90b4e6169cab9467922
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 0bd990a..3c279ac 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -763,9 +763,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = &im->im->cache_entry;
evas_gl_common_image_alloc_ensure(im);
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = &im->im->cache_entry;
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.11 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.11.
http://git.enlightenment.org/core/efl.git/commit/?id=831406e7128cde5583bb266c054826aace68fbbc
commit 831406e7128cde5583bb266c054826aace68fbbc
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 21b9498..6b858e0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -769,8 +769,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = (Image_Entry *)(im->im);
evas_gl_common_image_alloc_ensure(im);
+
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = (Image_Entry *)(im->im);
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.12 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.12.
http://git.enlightenment.org/core/efl.git/commit/?id=274f0d7cbf12c6a0a7d3b3e8b328a98e575cb4a5
commit 274f0d7cbf12c6a0a7d3b3e8b328a98e575cb4a5
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 1192bbe..29ddaa5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -763,8 +763,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = (Image_Entry *)(im->im);
evas_gl_common_image_alloc_ensure(im);
+
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = (Image_Entry *)(im->im);
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.10 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.10.
http://git.enlightenment.org/core/efl.git/commit/?id=df7dbfa5419053a8c1b62ef65e0c3c3cee3bbaa4
commit df7dbfa5419053a8c1b62ef65e0c3c3cee3bbaa4
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index d579ada..0bd9c99 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -758,8 +758,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = (Image_Entry *)(im->im);
evas_gl_common_image_alloc_ensure(im);
+
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = (Image_Entry *)(im->im);
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.9 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.9.
http://git.enlightenment.org/core/efl.git/commit/?id=32ecb77191741bd6f1a90f902397bcb5f27dc341
commit 32ecb77191741bd6f1a90f902397bcb5f27dc341
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index daa9752..39cf844 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -661,8 +661,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = (Image_Entry *)(im->im);
evas_gl_common_image_alloc_ensure(im);
+
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = (Image_Entry *)(im->im);
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.8 01/01: evas: fix use after free.
cedric pushed a commit to branch efl-1.8.
http://git.enlightenment.org/core/efl.git/commit/?id=f7a971db13793f4049d875a24cade7433bb99ec6
commit f7a971db13793f4049d875a24cade7433bb99ec6
Author: Cedric BAIL
Date: Tue Mar 24 23:09:28 2015 +0100
evas: fix use after free.
Thanks to Thanatermesis for tracking this in T2135.
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 169b486..7b30f52 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -660,8 +660,11 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc,
Evas_GL_Image *im)
{
Image_Entry *ie;
if (!im->im) return;
- ie = (Image_Entry *)(im->im);
evas_gl_common_image_alloc_ensure(im);
+
+ // alloc ensure can change im->im, so only get the local variable later.
+ ie = (Image_Entry *)(im->im);
+
/*
if ((im->cs.space == EVAS_COLORSPACE_YCBCR422P601_PL) ||
(im->cs.space == EVAS_COLORSPACE_YCBCR422P709_PL))
--
[EGIT] [core/efl] efl-1.13 01/01: evil: fix access to a file mapping object
cedric pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=3521cd1fc2ce0dcea8663613aa7249722e139548
commit 3521cd1fc2ce0dcea8663613aa7249722e139548
Author: Vincent Torri
Date: Fri Mar 20 08:16:20 2015 +0100
evil: fix access to a file mapping object
Patch from Jorge Luis Zapatta (turran), a bit modified
by me
@fix
Signed-off-by: Cedric BAIL
---
src/lib/evil/evil_mman.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evil/evil_mman.c b/src/lib/evil/evil_mman.c
index cecb550..8d6dcdb 100644
--- a/src/lib/evil/evil_mman.c
+++ b/src/lib/evil/evil_mman.c
@@ -103,7 +103,7 @@ mmap(void *addr EVIL_UNUSED,
if (protect & (PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ))
acs = FILE_MAP_EXECUTE;
#endif
- else if ((protect & (PAGE_READWRITE | PAGE_READONLY)) == (PAGE_READWRITE |
PAGE_READONLY))
+ else if (protect & (PAGE_READWRITE | PAGE_READONLY))
acs = FILE_MAP_READ;
else
{
--
[EGIT] [core/elementary] master 01/03: [elm_datetime] Fix to parse the POSIX locale format properly.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=88fc9ec20c5c0ca1f871565df99a7875473068e0
commit 88fc9ec20c5c0ca1f871565df99a7875473068e0
Author: Subodh Kumar
Date: Wed Mar 25 07:06:03 2015 +0900
[elm_datetime] Fix to parse the POSIX locale format properly.
Summary:
In POSIX, some format include extra character like dash, hash, etc, which
gives unexpected behaviour.
Fix to filter out those character.
Signed Off By: Seongjun Yim
Signed Off By: Subodh Kumar
@fix
Test Plan:
1. Set datetime as POSIX locale.
2. Check the datetime behaviour in elementary_test.
Reviewers: raster, shilpasingh
Reviewed By: shilpasingh
Subscribers: poornima.srinivasan, govi, rajeshps
Differential Revision: https://phab.enlightenment.org/D2203
---
src/lib/elm_datetime.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 28f61fa..d2a7a7c 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -259,6 +259,11 @@ _parse_format(Evas_Object *obj,
{
if (fmt_parsing)
{
+ if (cur == '_' || cur == '-' || cur == '0' || cur == '^' || cur
== '#')
+ {
+ fmt_ptr++;
+ continue;
+ }
fmt_parsing = EINA_FALSE;
for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++)
{
--
[EGIT] [core/elementary] master 02/03: [elm_datetime] Fix to consider second field while comparing datetime values.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=40ff4a11fccb4d4e5dc78ee5eb171c693c53cd31
commit 40ff4a11fccb4d4e5dc78ee5eb171c693c53cd31
Author: Subodh Kumar
Date: Wed Mar 25 07:09:23 2015 +0900
[elm_datetime] Fix to consider second field while comparing datetime values.
Summary:
Some app like calendar, they heavily depend on the value of datetime,so to
ensure accuracy
second field is considered while comparing datetime values.
@fix
Test Plan: NA
Reviewers: shilpasingh, raster
Reviewed By: shilpasingh, raster
Subscribers: poornima.srinivasan, govi, rajeshps
Differential Revision: https://phab.enlightenment.org/D2204
---
src/lib/elm_datetime.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index d2a7a7c..dd1826c 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -46,7 +46,8 @@
&(tmptr)->tm_mon, \
&(tmptr)->tm_mday, \
&(tmptr)->tm_hour, \
- &(tmptr)->tm_min}
+ &(tmptr)->tm_min, \
+ &(tmptr)->tm_sec}
// default limits for individual fields
static Format_Map mapping[ELM_DATETIME_TYPE_COUNT] = {
@@ -589,7 +590,7 @@ _date_cmp(struct tm *time1,
DATETIME_TM_ARRAY(timearr1, time1);
DATETIME_TM_ARRAY(timearr2, time2);
- for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT - 1; idx++)
+ for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++)
{
if (*timearr1[idx] != *timearr2[idx])
return EINA_FALSE;
--
[EGIT] [core/elementary] master 03/03: elm - fix warnings after patches to datetime
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9cf57e111b66fe8c4e0834cfcd08fc7d6d3b503a
commit 9cf57e111b66fe8c4e0834cfcd08fc7d6d3b503a
Author: Carsten Haitzler (Rasterman)
Date: Wed Mar 25 07:14:08 2015 +0900
elm - fix warnings after patches to datetime
---
src/lib/elm_datetime.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index dd1826c..f1c9f0c 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -582,13 +582,13 @@ _max_days_get(int year,
}
static Eina_Bool
-_date_cmp(struct tm *time1,
- struct tm *time2)
+_date_cmp(const struct tm *time1,
+ const struct tm *time2)
{
unsigned int idx;
- DATETIME_TM_ARRAY(timearr1, time1);
- DATETIME_TM_ARRAY(timearr2, time2);
+ const DATETIME_TM_ARRAY(timearr1, time1);
+ const DATETIME_TM_ARRAY(timearr2, time2);
for (idx = 0; idx < ELM_DATETIME_TYPE_COUNT; idx++)
{
--
[EGIT] [core/elementary] master 01/01: tooltip: Corrected namespacing for tooltip label style.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=906b3361695ac81adcea977f7ee025f6ce906d3a
commit 906b3361695ac81adcea977f7ee025f6ce906d3a
Author: Amitesh Singh
Date: Wed Mar 25 07:23:07 2015 +0900
tooltip: Corrected namespacing for tooltip label style.
Summary:
namespacing is wrong for tooltip label. Although we still support old theme
but it should be removed in EFL 2.0.
Test Plan: elementary_test -to tooltip
Reviewers: seoz, Hermet, raster
Reviewed By: raster
Subscribers: kimcinoo, sachin.dev, seoz
Differential Revision: https://phab.enlightenment.org/D2120
---
data/themes/edc/elm/tooltip.edc | 4 +++-
src/lib/els_tooltip.c | 23 +++
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/data/themes/edc/elm/tooltip.edc b/data/themes/edc/elm/tooltip.edc
index 4094b20..f84e076 100644
--- a/data/themes/edc/elm/tooltip.edc
+++ b/data/themes/edc/elm/tooltip.edc
@@ -1,4 +1,6 @@
-group { name: "elm/label/base/tooltip";
+group { name: "elm/label/base/tooltip/default";
+ alias: "elm/label/base/tooltip"; //XXX: Remove it in EFL 2.0
+ alias: "elm/label/base/tooltip/transparent";
styles {
style { name: "tooltip_style";
base: "font="FN" font_size=10 color=#ff style=shadow,bottom
shadow_color=#0080 wrap=word text_class=bubble";
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 6bf2b6d..811c698 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -730,25 +730,40 @@ _elm_tooltip_obj_free_cb(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj, voi
_elm_tooltip_unset(tt);
}
+static void
+_tooltip_label_style_set(Evas_Object *obj, Evas_Object *label)
+{
+ ELM_TOOLTIP_GET_OR_RETURN(tt, obj);
+ char buf[100] = {0};
+
+ sprintf(buf, "tooltip/%s", tt->style);
+ if (!elm_object_style_set(label, buf))
+ {
+WRN("Failed to set tooltip label style: %s, reverting to old style",
+buf);
+elm_object_style_set(label, "tooltip"); //XXX: remove it in EFL 2.0
+ }
+}
+
static Evas_Object *
-_elm_tooltip_label_create(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *tooltip)
+_elm_tooltip_label_create(void *data, Evas_Object *obj, Evas_Object *tooltip)
{
Evas_Object *label = elm_label_add(tooltip);
if (!label)
return NULL;
- elm_object_style_set(label, "tooltip");
+ _tooltip_label_style_set(obj, label);
elm_object_text_set(label, data);
return label;
}
static Evas_Object *
-_elm_tooltip_trans_label_create(void *data, Evas_Object *obj EINA_UNUSED,
Evas_Object *tooltip)
+_elm_tooltip_trans_label_create(void *data, Evas_Object *obj, Evas_Object
*tooltip)
{
Evas_Object *label = elm_label_add(tooltip);
const char **text = data;
if (!label)
return NULL;
- elm_object_style_set(label, "tooltip");
+ _tooltip_label_style_set(obj, label);
elm_object_domain_translatable_text_set(label, text[0], text[1]);
return label;
}
--
[EGIT] [core/elementary] master 01/01: elm_toolbar: add toolbar item size calculation and setting min values for fixed items
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2304de9d22527f5cf060bd50c8856b34c6fcf588
commit 2304de9d22527f5cf060bd50c8856b34c6fcf588
Author: taehyub
Date: Wed Mar 25 07:47:33 2015 +0900
elm_toolbar: add toolbar item size calculation and setting min values for
fixed items
Summary:
In case of the toolbar item size is fixed, the size of toolbar item became
finger size.
so, after signal emission in _inform_item_number(),
edje_object_size_min_restricted_calc() and evas_object_size_hint_min_set()
function are added.
Test Plan: change edc for supporting fixed toolbar item and run examples of
toolbar in elementary_test
Reviewers: woohyun, seoz, Hermet, raster
Reviewed By: raster
Differential Revision: https://phab.enlightenment.org/D2184
---
src/lib/elm_toolbar.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index ad3b5c2..e62276d 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1299,6 +1299,7 @@ _inform_item_number(Evas_Object *obj)
char buf[sizeof("elm,number,item,") + 4];
static int scount = 0;
int count = 0;
+ Evas_Coord mw, mh;
EINA_INLIST_FOREACH(sd->items, it)
{
@@ -1313,7 +1314,16 @@ _inform_item_number(Evas_Object *obj)
EINA_INLIST_FOREACH(sd->items, it)
{
if (!it->separator && !it->object)
- edje_object_signal_emit(VIEW(it), buf, "elm");
+ {
+ edje_object_signal_emit(VIEW(it), buf, "elm");
+ edje_object_message_signal_process(VIEW(it));
+
+ mw = mh = -1;
+ elm_coords_finger_size_adjust(1, &mw, 1, &mh);
+
+ edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw,
mh);
+ evas_object_size_hint_min_set(VIEW(it), mw, mh);
+ }
}
}
}
--
[E-devel] Weekly news from the automated build and QA front
Hello. Summary: o Some of the disappeared coverity isses from last week are back, but not all of them. This should give everyone an overview over what has happened in the last week on the QA front. The numbers in parentheses reflect the values from last week to give you a trend. CI: o Overall build statistic: 12.16% (8.95%) failed. https://build.enlightenment.org/ clang scan-build: o EFL scan-build reports N/A (N/A) issues. https://build.enlightenment.org/job/nightly_efl_clang_x86_64/lastSuccessfu lBuild/artifact/scan-build/build/ o Elementary scan-build reports 79 (79) issues. https://build.enlightenment.org/job/nightly_elm_clang_x86_64/lastSuccessfulBuild/artifact/scan-build/build Unit tests: o 474 (463) unit tests for efl and none failing Coverage: o EFL total coverage is at 35.8% (35.8%) lines and 39.2% (39.2%) functions https://build.enlightenment.org/view/Test%20Coverage/ Coverity: o EFL: Outstanding defects 121 (45) with a density of 0.17 (0.06) o Elm: Outstanding defects 0 (0) with a density of 0 (0) o Evas Generic Loaders: Outstanding defects 2 (2) with a density of 0.02 (0.02) o Emotion Generic Players: Outstanding defects 0 (0) with a density of 0 (0) o Enlightenment: Outstanding defects 22 (22) with a density of 0.08 (0.08) o Terminology: Outstanding defects 1 (1) with a density of 0.01 (0.01) Phab: o Total bug count: 612 (597) https://phab.enlightenment.org/maniphest/report/burn/ o Pending patch reviews: 70 (68) regards Stefan Schmidt -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [admin/devs] master 01/01: probie: welcome new probie, thiep
Thanks. Lets rock it. -- Thiep Ha > On Mar 24, 2015, at 4:48 PM, Daniel Juyung Seo wrote: > > Congratulations Thiep! > Thiep is actually one of the best candidates of getting commit access. > Rock EFL more, Thiep! > > Thanks. > > Daniel Juyung Seo (SeoZ) > > > On Tue, Mar 24, 2015 at 2:36 PM, ChunEon Park > wrote: > >> hermet pushed a commit to branch master. >> >> >> http://git.enlightenment.org/admin/devs.git/commit/?id=c25e712d61a21033957e89c4f6f32702631959c2 >> >> commit c25e712d61a21033957e89c4f6f32702631959c2 >> Author: ChunEon Park >> Date: Tue Mar 24 14:36:12 2015 +0900 >> >>probie: welcome new probie, thiep >> --- >> probies/thiep/id_rsa.pub | 1 + >> probies/thiep/info.txt | 8 >> 2 files changed, 9 insertions(+) >> >> diff --git a/probies/thiep/id_rsa.pub b/probies/thiep/id_rsa.pub >> new file mode 100755 >> index 000..b1aa051 >> --- /dev/null >> +++ b/probies/thiep/id_rsa.pub >> @@ -0,0 +1 @@ >> +ssh-rsa >> B3NzaC1yc2EDAQABAAABAQDOK3B3Lfx5ERk6C3qEZliLb2RVNDsCEqUIRRXnp7eA9wcHxQ+cCw0B17ULzyHeN+aH2LPc9U/GmxjD8+iZ+U9rRC/0M6DN89TSa7b9DoMsZsXqtEdXSBn8M+VdUawp4kH7VRd+KtDB4OEWOm957Lf1+DB6FNL2dp3WzzUGWpdzM7W53aUJbtVpgbp2D8tANlYq1bnFJ63QMddAe260paeGhorrC3vGnbnXqc2OjZYm2zUzgnEN6xJ3o4l34Ix6GjOfrpd9fOZVskShgDMkasK+Icyw60wY5j0mLa2ZxmC4cKieSi8Sq3T4AjXzvWKQCZZNGm/WwNqlZIhgzeKIPoQ1 >> thiep...@samsung.com >> diff --git a/probies/thiep/info.txt b/probies/thiep/info.txt >> new file mode 100755 >> index 000..07c9869 >> --- /dev/null >> +++ b/probies/thiep/info.txt >> @@ -0,0 +1,8 @@ >> +Login:thiep >> +IRC Nick: thiep >> +Name: Thiep Ha >> +Location: Suwon, Korea >> +E-Mail: thie...@gmail.com; thiep...@samsung.com >> +Contributing: efl, elementary >> +Group:Libraries >> +Platform: Ubuntu >> >> -- > -- > Dive into the World of Parallel Programming The Go Parallel Website, sponsored > by Intel and developed in partnership with Slashdot Media, is your hub for all > things parallel software development, from weekly thought leadership blogs to > news, videos, case studies, tutorials and more. Take a look and join the > conversation now. http://goparallel.sourceforge.net/ > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 01/01: Tests: Fix custom smart event callbacks' tests
kuuko pushed a commit to branch master.
http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=a119c3ccdb8cc8ed7b6581cce0daddd72023ee42
commit a119c3ccdb8cc8ed7b6581cce0daddd72023ee42
Author: Kai Huuhko
Date: Wed Mar 25 05:53:38 2015 +0200
Tests: Fix custom smart event callbacks' tests
Custom events always get event_info since commit
fcc93216f9b7179f4af13b29ddde848fcc94f19f
---
tests/evas/test_06_object_smart.py | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/evas/test_06_object_smart.py
b/tests/evas/test_06_object_smart.py
index b672f87..2a15ba8 100644
--- a/tests/evas/test_06_object_smart.py
+++ b/tests/evas/test_06_object_smart.py
@@ -50,7 +50,7 @@ class SmartObjectTest(unittest.TestCase):
def testCallbackSimple(self):
self.expected_cbs = 2
-def _event1_cb(obj):
+def _event1_cb(obj, event_info):
self.expected_cbs -= 1
self.obj.callback_add("event1", _event1_cb)
self.obj.move(1, 1) # should fire "event1"
@@ -60,7 +60,7 @@ class SmartObjectTest(unittest.TestCase):
self.assertEqual(self.expected_cbs, 0)
def testCallbackArgs(self):
-def _event1_cb(obj, arg1, arg2, arg3, mykarg2, mykarg1):
+def _event1_cb(obj, event_info, arg1, arg2, arg3, mykarg2, mykarg1):
self.assertEqual(arg1, 11)
self.assertEqual(arg2, 22)
self.assertEqual(arg3, "arg3")
@@ -72,9 +72,9 @@ class SmartObjectTest(unittest.TestCase):
self.obj.move(0, 0)
def testCallbackMulti(self):
-def _event1_cb1(obj):
+def _event1_cb1(obj, event_info):
self.expected_cbs += 1
-def _event1_cb2(obj):
+def _event1_cb2(obj, event_info):
self.expected_cbs += 10
self.expected_cbs = 0
@@ -98,7 +98,7 @@ class SmartObjectTest(unittest.TestCase):
self.assertEqual(self.expected_cbs, 0)
def testCallbackLots(self):
-def _event1_cb(obj):
+def _event1_cb(obj, event_info):
self.expected_cbs -= 1
self.expected_cbs = 2
@@ -113,7 +113,7 @@ class SmartObjectTest(unittest.TestCase):
self.assertEqual(self.expected_cbs, 0)
def testCallbackLots2(self):
-def _event1_cb(obj):
+def _event1_cb(obj, event_info):
self.expected_cbs -= 1
self.expected_cbs = 1
@@ -128,20 +128,20 @@ class SmartObjectTest(unittest.TestCase):
self.assertEqual(self.expected_cbs, 0)
def testCallbackWrongDel1(self):
-def _event1_cb(obj):
+def _event1_cb(obj, event_info):
pass
self.assertRaises(ValueError, self.obj.callback_del, "event1",
_event1_cb)
def testCallbackWrongDel2(self):
-def _event1_cb(obj):
+def _event1_cb(obj, event_info):
pass
self.obj.callback_add("event1", _event1_cb)
self.obj.callback_add("event1", _event1_cb)
self.obj.callback_del("event1", _event1_cb)
self.obj.callback_del("event1", _event1_cb)
self.assertRaises(ValueError, self.obj.callback_del, "event1",
_event1_cb)
-
-
+
+
if __name__ == '__main__':
unittest.main(verbosity=2)
evas.shutdown()
--
[EGIT] [core/efl] master 01/01: ecore_idler: + null check.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e56548aa33000561f1970abd48bfc03f05019415
commit e56548aa33000561f1970abd48bfc03f05019415
Author: ChunEon Park
Date: Wed Mar 25 14:42:44 2015 +0900
ecore_idler: + null check.
like timer, animator we do check the idler validation
and prevert crash there just in user misusage case.
@fix
---
src/lib/ecore/ecore_idler.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 5faed54..a874717 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -87,6 +87,7 @@ static void *
_ecore_idler_del(Ecore_Idler *obj)
{
Ecore_Idler_Data *idler = eo_data_scope_get(obj, MY_CLASS);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(idler, NULL);
EINA_SAFETY_ON_TRUE_RETURN_VAL(idler->delete_me, NULL);
idler->delete_me = 1;
idlers_delete_me = 1;
--
[EGIT] [core/efl] efl-1.13 01/01: ecore_idler: + null check.
hermet pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=a22e1a2b9f29e9101a54e3efbf287d1cae5f948a
commit a22e1a2b9f29e9101a54e3efbf287d1cae5f948a
Author: ChunEon Park
Date: Wed Mar 25 14:42:44 2015 +0900
ecore_idler: + null check.
like timer, animator we do check the idler validation
and prevert crash there just in user misusage case.
@fix
---
src/lib/ecore/ecore_idler.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/ecore/ecore_idler.c b/src/lib/ecore/ecore_idler.c
index 5faed54..a874717 100644
--- a/src/lib/ecore/ecore_idler.c
+++ b/src/lib/ecore/ecore_idler.c
@@ -87,6 +87,7 @@ static void *
_ecore_idler_del(Ecore_Idler *obj)
{
Ecore_Idler_Data *idler = eo_data_scope_get(obj, MY_CLASS);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(idler, NULL);
EINA_SAFETY_ON_TRUE_RETURN_VAL(idler->delete_me, NULL);
idler->delete_me = 1;
idlers_delete_me = 1;
--
