[EGIT] [core/enlightenment] master 01/01: e menu - an extra object ref causes menus to never be freed
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6289eba6a440998ea67193ab983981cd0c31164f commit 6289eba6a440998ea67193ab983981cd0c31164f Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jun 10 21:32:01 2015 +0900 e menu - an extra object ref causes menus to never be freed this has been in e for ages - someone not noticed, but this fixes visual artifacts of left over menus on the top-left. this extra ref really makes no sense. it's not like this ref is then accomoanied by a matching unref somewhere else (after much debugging). @fix --- src/bin/e_menu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 5e5de41..f47e47c 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1851,7 +1851,6 @@ _e_menu_unrealize(E_Menu *m) evas_object_pass_events_set(m-comp_object, 1); evas_object_hide(m-comp_object); E_FREE_FUNC(m-comp_object, evas_object_del); -e_object_ref(E_OBJECT(m)); return; } if (m-comp_object) --
[EGIT] [core/efl] master 01/02: Edje_entry: Fix control + (x, a, y, z, m, c) not working issue.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0dd76d7ea80fc00dbdac7fcc1ff1d860d9f4d86d
commit 0dd76d7ea80fc00dbdac7fcc1ff1d860d9f4d86d
Author: shilpa.singh shilpa.si...@samsung.com
Date: Wed Jun 10 13:04:11 2015 +0100
Edje_entry: Fix control + (x,a,y,z,m,c) not working issue.
Summary:
When caps lock is On and we press control + (x,a,y,z,m,c) none of
these operations work issue fix.
@fix
Test Plan:
1. Caps lock On
2. Input some text
3. Press ctrl+a, ctrl+c etc:-
4. Select, copy, cut etc:- operations does not work
Reviewers: tasn
Subscribers: raster, rajeshps, govi, poornima.srinivasan, navnbeet,
subodh6129, cedric
Differential Revision: https://phab.enlightenment.org/D2633
---
src/lib/edje/edje_entry.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 9c5c332..e0b508d 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -1684,14 +1684,14 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
_edje_emit(ed, entry,key,end, rp-part-name);
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
- else if ((control) (!shift) (!strcmp(ev-key, v)))
+ else if ((control) (!shift) (!strcmp(ev-keyname, v)))
{
_compose_seq_reset(en);
_edje_emit(ed, entry,paste,request, rp-part-name);
_edje_emit(ed, entry,paste,request,3, rp-part-name);
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
- else if ((control) (!strcmp(ev-key, a)))
+ else if ((control) (!strcmp(ev-keyname, a)))
{
_compose_seq_reset(en);
if (shift)
@@ -1705,19 +1705,19 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
}
- else if ((control) (((!shift) !strcmp(ev-key, c)) ||
!strcmp(ev-key, Insert)))
+ else if ((control) (((!shift) !strcmp(ev-keyname, c)) ||
!strcmp(ev-key, Insert)))
{
_compose_seq_reset(en);
_edje_emit(ed, entry,copy,notify, rp-part-name);
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
- else if ((control) (!shift) ((!strcmp(ev-key, x) ||
(!strcmp(ev-key, m)
+ else if ((control) (!shift) ((!strcmp(ev-keyname, x) ||
(!strcmp(ev-keyname, m)
{
_compose_seq_reset(en);
_edje_emit(ed, entry,cut,notify, rp-part-name);
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
- else if ((control) (!strcmp(ev-key, z)))
+ else if ((control) (!strcmp(ev-keyname, z)))
{
_compose_seq_reset(en);
if (shift)
@@ -1732,7 +1732,7 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
}
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
- else if ((control) (!shift) (!strcmp(ev-key, y)))
+ else if ((control) (!shift) (!strcmp(ev-keyname, y)))
{
_compose_seq_reset(en);
// redo
--
[EGIT] [core/efl] master 02/02: Eina debug: Fix shadow warning.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f1519f3334eabced1d29202ce6fa7f95de4d9525
commit f1519f3334eabced1d29202ce6fa7f95de4d9525
Author: Tom Hacohen t...@stosb.com
Date: Wed Jun 10 13:07:12 2015 +0100
Eina debug: Fix shadow warning.
This is especially obviously wrong, beacuse the original parameter is not
even used.
---
src/lib/eina/eina_debug_monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_debug_monitor.c
b/src/lib/eina/eina_debug_monitor.c
index bf94871..c9a19fd 100644
--- a/src/lib/eina/eina_debug_monitor.c
+++ b/src/lib/eina/eina_debug_monitor.c
@@ -135,7 +135,7 @@ _eina_debug_collect_bt(pthread_t pth)
// way. this is an alternative to using external debuggers so we can get
// users or developers to get useful information about an app at all times
static void *
-_eina_debug_monitor(void *data EINA_UNUSED)
+_eina_debug_monitor(void *_data EINA_UNUSED)
{
int bts = 0, ret, max_fd;
double t0, t;
--
[EGIT] [core/efl] master 01/01: ecore: null cb function is unacceptable.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=be0c2f5a317cda9ff836c680af11ea5d8aa76294
commit be0c2f5a317cda9ff836c680af11ea5d8aa76294
Author: ChunEon Park chuneon.p...@samsung.com
Date: Wed Jun 10 17:45:28 2015 +0900
ecore: null cb function is unacceptable.
@fix
---
src/lib/ecore/ecore.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 298e685..f94584d 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -448,7 +448,8 @@ EAPI Eina_Bool
ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
{
Ecore_Fork_Cb *fcb;
-
+
+ if (!func) return EINA_FALSE;
fcb = calloc(1, sizeof(Ecore_Fork_Cb));
if (!fcb) return EINA_FALSE;
fcb-func = func;
--
[EGIT] [core/efl] efl-1.14 01/01: ecore: null cb function is unacceptable.
hermet pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=54886daace9d5fc264c8d8b3c32bec240fadd460
commit 54886daace9d5fc264c8d8b3c32bec240fadd460
Author: ChunEon Park chuneon.p...@samsung.com
Date: Wed Jun 10 17:45:28 2015 +0900
ecore: null cb function is unacceptable.
@fix
---
src/lib/ecore/ecore.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 298e685..f94584d 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -448,7 +448,8 @@ EAPI Eina_Bool
ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
{
Ecore_Fork_Cb *fcb;
-
+
+ if (!func) return EINA_FALSE;
fcb = calloc(1, sizeof(Ecore_Fork_Cb));
if (!fcb) return EINA_FALSE;
fcb-func = func;
--
[EGIT] [core/efl] master 01/01: evas/render2: Put evas_render2_th_main.c in EXTRA_DIST to ship it in the tarball
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e644fd6a8c050a6dd5b08ba1a84c598c01a27c97 commit e644fd6a8c050a6dd5b08ba1a84c598c01a27c97 Author: Stefan Schmidt ste...@osg.samsung.com Date: Wed Jun 10 10:08:39 2015 +0200 evas/render2: Put evas_render2_th_main.c in EXTRA_DIST to ship it in the tarball We are not able to put it in SOURCES as it is not possible to compile this as standalone object out of the context it is included in. --- src/Makefile_Evas.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index de4626b..a3f4777 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -162,6 +162,9 @@ lib/evas/canvas/evas_map.c \ lib/evas/canvas/evas_gl.c \ lib/evas/canvas/evas_out.c +EXTRA_DIST += \ +lib/evas/canvas/render2/evas_render2_th_main.c + # Cache lib_evas_libevas_la_SOURCES += \ lib/evas/cache/evas_cache_image.c \ --
[EGIT] [tools/erigo] master 02/02: Clean egui json files
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=150d77b0d3e5561010d1aa36ed340c386180d0df
commit 150d77b0d3e5561010d1aa36ed340c386180d0df
Author: Yakov Goldberg yako...@samsung.com
Date: Wed Jun 10 17:04:30 2015 +0300
Clean egui json files
---
examples/demo_project/demo.egui| 6 +-
examples/example.egui | 6 +-
src/bin/gui/egui_layout.json | 29 +
src/tests/data/demo.egui | 25 +
src/tests/data/test_widgets.egui | 5 +
src/tests/data/test_widgets_modify_cb.egui | 5 +
6 files changed, 14 insertions(+), 62 deletions(-)
diff --git a/examples/demo_project/demo.egui b/examples/demo_project/demo.egui
index 168e857..3d45015 100644
--- a/examples/demo_project/demo.egui
+++ b/examples/demo_project/demo.egui
@@ -32,11 +32,7 @@
Evas.Object.size_hint_weight:[1, 1],
Efl.Gfx.Base.visible:[true],
Efl.Gfx.Base.size:[383, 442],
-Elm.Win.autodel:[true]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Elm.Win.autodel:[true],
Elm.Win.type:[ELM_WIN_BASIC]
},
Contains:[elm_layout1]
diff --git a/examples/example.egui b/examples/example.egui
index dde9db4..d2080fa 100644
--- a/examples/example.egui
+++ b/examples/example.egui
@@ -26,11 +26,7 @@
Efl.Gfx.Base.visible:[true],
Efl.Gfx.Base.size:[514, 665],
Elm.Win.title:[elm_win1],
-Elm.Win.autodel:[true]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Elm.Win.autodel:[true],
Elm.Win.type:[ELM_WIN_BASIC]
},
Contains:[elm_bg1, elm_box1]
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index 6b6b5bd..763bc1a 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -122,10 +122,7 @@
Elm.Win.autodel:[true],
Efl.Gfx.Base.size:[400, 400],
Elm.Win.icon_object:[gvc_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
+Efl.Gfx.Base.visible:[true],
Elm.Win.name:[Graph],
Elm.Win.type:[ELM_WIN_BASIC]
},
@@ -173,11 +170,7 @@
Efl.Gfx.Base.size:[300, 450],
Elm.Win.modal:[true],
Elm.Win.icon_object:[fs_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Efl.Gfx.Base.visible:[true],
Elm.Win.type:[ELM_WIN_BASIC]
},
Contains:[bg2, fs_table]
@@ -371,11 +364,7 @@
Efl.Gfx.Base.size:[640, 480],
Elm.Win.modal:[true],
Efl.Gfx.Base.visible:[true],
-Elm.Win.icon_object:[rm_logo]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Elm.Win.icon_object:[rm_logo],
Elm.Win.type:[ELM_WIN_BASIC]
},
Callbacks:
@@ -668,11 +657,7 @@
Efl.Gfx.Base.size:[640, 480],
Elm.Win.modal:[true],
Elm.Win.icon_object:[settings_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Efl.Gfx.Base.visible:[true],
Elm.Win.type:[ELM_WIN_BASIC]
},
Callbacks:
@@ -881,11 +866,7 @@
Elm.Win.title:[Erigo - No project],
Elm.Win.icon_object:[main_logo],
Efl.Gfx.Base.visible:[true],
-Efl.Gfx.Base.size:[1108, 837]
- },
- Methods:
- {
-Elm.Win.name:[null],
+Efl.Gfx.Base.size:[1108, 837],
Elm.Win.type:[ELM_WIN_BASIC]
},
Contains:[canvas_bg, main_box]
diff --git a/src/tests/data/demo.egui b/src/tests/data/demo.egui
index a266dad..a65dadb 100644
--- a/src/tests/data/demo.egui
+++ b/src/tests/data/demo.egui
@@ -122,10 +122,7 @@
Elm.Win.autodel:[true],
Efl.Gfx.Base.size:[400, 400],
Elm.Win.icon_object:[gvc_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
+Efl.Gfx.Base.visible:[true],
Elm.Win.name:[Graph],
Elm.Win.type:[ELM_WIN_BASIC]
},
@@ -173,10 +170,7 @@
Efl.Gfx.Base.size:[300, 450],
Elm.Win.modal:[true],
Elm.Win.icon_object:[fs_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
+Efl.Gfx.Base.visible:[true],
Elm.Win.name:[null],
Elm.Win.type:[ELM_WIN_BASIC]
},
@@ -371,10 +365,7 @@
Efl.Gfx.Base.size:[640, 480],
Elm.Win.modal:[true],
Efl.Gfx.Base.visible:[true],
-Elm.Win.icon_object:[rm_logo]
- },
- Methods:
- {
+Elm.Win.icon_object:[rm_logo],
Elm.Win.name:[null],
Elm.Win.type:[ELM_WIN_BASIC]
},
@@ -668,10 +659,7 @@
Efl.Gfx.Base.size:[640, 480],
Elm.Win.modal:[true],
Elm.Win.icon_object:[settings_logo],
-Efl.Gfx.Base.visible:[true]
- },
- Methods:
- {
+
[EGIT] [core/efl] master 01/01: ector, ecore, eio, emotion: convert some docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7d40ec0ad96b1621c95d3424355f6435d4c39c2e
commit 7d40ec0ad96b1621c95d3424355f6435d4c39c2e
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed Jun 10 14:34:54 2015 +0100
ector,ecore,eio,emotion: convert some docs
---
src/lib/ecore/ecore_idle_exiter.eo | 2 +-
src/lib/ector/ector_generic_surface.eo | 10 ++--
src/lib/ector/ector_renderer_generic_base.eo | 46 +--
src/lib/eio/eio_model.eo | 40
src/lib/emotion/emotion_object.eo| 69 +---
5 files changed, 80 insertions(+), 87 deletions(-)
diff --git a/src/lib/ecore/ecore_idle_exiter.eo
b/src/lib/ecore/ecore_idle_exiter.eo
index 6e52f62..8e79177 100644
--- a/src/lib/ecore/ecore_idle_exiter.eo
+++ b/src/lib/ecore/ecore_idle_exiter.eo
@@ -3,7 +3,7 @@ class Ecore.Idle.Exiter (Eo.Base)
eo_prefix: ecore_idle_exiter;
methods {
constructor {
- /*@ Constructor. */
+ [[Constructor.]]
legacy: null;
params {
@in func: Ecore_Task_Cb;
diff --git a/src/lib/ector/ector_generic_surface.eo
b/src/lib/ector/ector_generic_surface.eo
index e8540fb..a391ea0 100644
--- a/src/lib/ector/ector_generic_surface.eo
+++ b/src/lib/ector/ector_generic_surface.eo
@@ -4,19 +4,19 @@ abstract Ector.Generic.Surface (Eo.Base)
methods {
@property size {
set {
-/*@ Changes the size of the given Evas object. */
+[[Changes the size of the given Evas object.]]
}
get {
-/*@ Retrieves the (rectangular) size of the given Evas object. */
+[[Retrieves the (rectangular) size of the given Evas object.]]
}
values {
-w: int; /*@ in */
-h: int; /*@ in */
+w: int;
+h: int;
}
}
@property reference_point {
set {
- /*@ This define where is (0,0) in pixels coordinate inside the
surface */
+[[This define where is (0,0) in pixels coordinate inside the
surface]]
}
values {
x: int;
diff --git a/src/lib/ector/ector_renderer_generic_base.eo
b/src/lib/ector/ector_renderer_generic_base.eo
index 3e82ed3..2a490f2 100644
--- a/src/lib/ector/ector_renderer_generic_base.eo
+++ b/src/lib/ector/ector_renderer_generic_base.eo
@@ -24,45 +24,41 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
}
@property visibility {
set {
-/*@ Makes the given Ector renderer visible or invisible. */
+[[Makes the given Ector renderer visible or invisible.]]
}
get {
-/*@ Retrieves whether or not the given Ector renderer is visible.
*/
+[[Retrieves whether or not the given Ector renderer is visible.]]
}
values {
- v: bool; /*@ @c EINA_TRUE if to make the object visible, @c
EINA_FALSE otherwise */
+ v: bool; [[true if to make the object visible, false otherwise]]
}
}
@property color {
set {
-/*@
-Sets the general/main color of the given Ector renderer to the
given
-one.
+[[Sets the general/main color of the given Ector renderer to the
+ given one.
-@note These color values are expected to be premultiplied by @p a.
-
-@ingroup Ector_Renderer_Group_Basic */
+ These color values are expected to be premultiplied by alpha.
+]]
}
get {
-/*@
-Retrieves the general/main color of the given Ector renderer.
-
-Retrieves the main color's RGB component (and alpha channel)
-values, bwhich range from 0 to 255/b. For the alpha channel,
-which defines the object's transparency level, 0 means totally
-transparent, while 255 means opaque. These color values are
-premultiplied by the alpha value.
+[[Retrieves the general/main color of the given Ector renderer.
-@note Use @c NULL pointers on the components you're not interested
-in: they'll be ignored by the function.
+ Retrieves the main color's RGB component (and alpha channel)
+ values, which range from 0 to 255. For the alpha channel,
+ which defines the object's transparency level, 0 means totally
+ transparent, while 255 means opaque. These color values are
+ premultiplied by the alpha value.
-@ingroup Ector_Renderer_Group_Basic */
+ Use null pointers on the components you're not interested in,
+ they'll be ignored by the function.
+]]
}
values {
-r: int; /*@ The red component of the given color. */
-g: int; /*@ The green component of the
[EGIT] [core/efl] master 01/01: Evas canvas: Fix Eolian warnings (migrate types).
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d10f9733ac7b9f5dc59607d2f61b4b70c3d9c787
commit d10f9733ac7b9f5dc59607d2f61b4b70c3d9c787
Author: Tom Hacohen t...@stosb.com
Date: Wed Jun 10 15:32:22 2015 +0100
Evas canvas: Fix Eolian warnings (migrate types).
---
src/lib/evas/Evas_Common.h | 117 -
src/lib/evas/canvas/evas_canvas.eo | 32 +-
src/lib/evas/canvas/evas_types.eot | 110 ++
3 files changed, 126 insertions(+), 133 deletions(-)
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 312c74e..aa82737 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -58,76 +58,6 @@ EAPI extern Evas_Version * evas_version;
*/
/**
- * Identifier of callbacks to be set for Evas canvases or Evas
- * objects.
- *
- * The following figure illustrates some Evas callbacks:
- *
- * @image html evas-callbacks.png
- * @image rtf evas-callbacks.png
- * @image latex evas-callbacks.eps
- *
- * @see evas_object_event_callback_add()
- * @see evas_event_callback_add()
- */
-typedef enum _Evas_Callback_Type
-{
- /*
-* The following events are only for use with Evas objects, with
-* evas_object_event_callback_add():
-*/
- EVAS_CALLBACK_MOUSE_IN, /** Mouse In Event */
- EVAS_CALLBACK_MOUSE_OUT, /** Mouse Out Event */
- EVAS_CALLBACK_MOUSE_DOWN, /** Mouse Button Down Event */
- EVAS_CALLBACK_MOUSE_UP, /** Mouse Button Up Event */
- EVAS_CALLBACK_MOUSE_MOVE, /** Mouse Move Event */
- EVAS_CALLBACK_MOUSE_WHEEL, /** Mouse Wheel Event */
- EVAS_CALLBACK_MULTI_DOWN, /** Multi-touch Down Event */
- EVAS_CALLBACK_MULTI_UP, /** Multi-touch Up Event */
- EVAS_CALLBACK_MULTI_MOVE, /** Multi-touch Move Event */
- EVAS_CALLBACK_FREE, /** Object Being Freed (Called after Del) */
- EVAS_CALLBACK_KEY_DOWN, /** Key Press Event */
- EVAS_CALLBACK_KEY_UP, /** Key Release Event */
- EVAS_CALLBACK_FOCUS_IN, /** Focus In Event */
- EVAS_CALLBACK_FOCUS_OUT, /** Focus Out Event */
- EVAS_CALLBACK_SHOW, /** Show Event */
- EVAS_CALLBACK_HIDE, /** Hide Event */
- EVAS_CALLBACK_MOVE, /** Move Event */
- EVAS_CALLBACK_RESIZE, /** Resize Event */
- EVAS_CALLBACK_RESTACK, /** Restack Event */
- EVAS_CALLBACK_DEL, /** Object Being Deleted (called before Free) */
- EVAS_CALLBACK_HOLD, /** Events go on/off hold */
- EVAS_CALLBACK_CHANGED_SIZE_HINTS, /** Size hints changed event */
- EVAS_CALLBACK_IMAGE_PRELOADED, /** Image has been preloaded */
-
- /*
-* The following events are only for use with Evas canvases, with
-* evas_event_callback_add():
-*/
- EVAS_CALLBACK_CANVAS_FOCUS_IN, /** Canvas got focus as a whole */
- EVAS_CALLBACK_CANVAS_FOCUS_OUT, /** Canvas lost focus as a whole */
- EVAS_CALLBACK_RENDER_FLUSH_PRE, /** Called just before rendering is
updated on the canvas target */
- EVAS_CALLBACK_RENDER_FLUSH_POST, /** Called just after rendering is
updated on the canvas target */
- EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, /** Canvas object got focus */
- EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, /** Canvas object lost focus */
- EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, /** Canvas viewport resized @since
1.15 */
-
- /*
-* More Evas object event types - see evas_object_event_callback_add():
-*/
- EVAS_CALLBACK_IMAGE_UNLOADED, /** Image data has been unloaded (by some
mechanism in Evas that throw out original image data) */
-
- EVAS_CALLBACK_RENDER_PRE, /** Called just before rendering starts on the
canvas target @since 1.2 */
- EVAS_CALLBACK_RENDER_POST, /** Called just after rendering stops on the
canvas target @since 1.2 */
-
- EVAS_CALLBACK_IMAGE_RESIZE, /** Image size is changed @since 1.8 */
- EVAS_CALLBACK_DEVICE_CHANGED, /** Devices added, removed or changed on
canvas @since 1.8 */
-
- EVAS_CALLBACK_AXIS_UPDATE, /** Input device changed value on some axis
@since 1.13 */
- EVAS_CALLBACK_LAST /** kept as last element/sentinel -- not really an
event */
-} Evas_Callback_Type; /** The types of events triggering a callback */
-
-/**
* @def EVAS_CALLBACK_PRIORITY_BEFORE
* Slightly more prioritized than default.
* @since 1.1
@@ -160,49 +90,6 @@ typedef enum _Evas_Callback_Type
*/
typedef Eo_Callback_Priority Evas_Callback_Priority;
-/**
- * Flags for Mouse Button events
- */
-typedef enum _Evas_Button_Flags
-{
- EVAS_BUTTON_NONE = 0, /** No extra mouse button data */
- EVAS_BUTTON_DOUBLE_CLICK = (1 0), /** This mouse button press was the
2nd press of a double click */
- EVAS_BUTTON_TRIPLE_CLICK = (1 1) /** This mouse button press was the
3rd press of a triple click */
-} Evas_Button_Flags; /** Flags for Mouse Button events */
-
-/**
- * Flags for Events
- */
-typedef enum _Evas_Event_Flags
-{
- EVAS_EVENT_FLAG_NONE = 0, /** No fancy flags set */
- EVAS_EVENT_FLAG_ON_HOLD = (1 0), /** This event is being delivered but
should be put on hold
[EGIT] [core/efl] master 01/01: Efl model: Fix Eolian warnings (and migrate types).
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e8dd532854b64dbab3772b6426e07327b9268705
commit e8dd532854b64dbab3772b6426e07327b9268705
Author: Tom Hacohen t...@stosb.com
Date: Wed Jun 10 15:52:33 2015 +0100
Efl model: Fix Eolian warnings (and migrate types).
---
src/lib/efl/Efl_Model_Common.h | 54 ---
src/lib/efl/interfaces/efl_model_base.eo | 75
2 files changed, 38 insertions(+), 91 deletions(-)
diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index bd9ab62..ce1ed3b 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -6,60 +6,6 @@ extern C {
#endif
/**
- * @enum _Efl_Model_Load_Status
- * XXX/TODO/FIXME: Remove this enum (and possibly other data) from here
- * as soon as eolian translates these data types in .eo's.
- */
-enum _Efl_Model_Load_Status
- {
- EFL_MODEL_LOAD_STATUS_ERROR = 0,
- EFL_MODEL_LOAD_STATUS_LOADING_PROPERTIES = (1 0),
- EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN = (1 1),
- EFL_MODEL_LOAD_STATUS_LOADING = (1 0) | (1 1),
-
- EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES = (1 2),
- EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN = (1 3),
- EFL_MODEL_LOAD_STATUS_LOADED = (1 2) | (1 3),
-
- EFL_MODEL_LOAD_STATUS_UNLOADING = (1 4),
- EFL_MODEL_LOAD_STATUS_UNLOADED = (1 5)
- };
-/**
- * @typedef Efl_Model_Load_Status
- */
-typedef enum _Efl_Model_Load_Status Efl_Model_Load_Status;
-
-/**
- * @struct _Efl_Model_Load
- * Structure to hold Efl_Model_Load_Status enum
- * (and possible other data) to avoid ABI break.
- */
-struct _Efl_Model_Load
- {
- Efl_Model_Load_Status status;
- /* add more data below here if necessary */
- };
-
-/**
- * @typedef Efl_Model_Load
- */
-typedef struct _Efl_Model_Load Efl_Model_Load;
-
-/**
- * @struct _Efl_Model_Property_Event
- */
-struct _Efl_Model_Property_Event
-{
- const Eina_Array *changed_properties; /** array of property name */
- const Eina_Array *invalidated_properties; /** array of property name */
-};
-
-/**
- * @typedef Efl_Model_Property_Event
- */
-typedef struct _Efl_Model_Property_Event Efl_Model_Property_Event;
-
-/**
* @struct _Efl_Model_Children_Event
* Every time a child id added the event
* EFL_MODEL_EVENT_CHILD_ADDED is dispatched
diff --git a/src/lib/efl/interfaces/efl_model_base.eo
b/src/lib/efl/interfaces/efl_model_base.eo
index dbda997..a7c6160 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -1,26 +1,27 @@
-/*
- * enum Efl_Model_Load_Status
- * {
- *error = 0, /*@ Error in Load Model *
- *properties = (1 0), /*@ properties load in progress *
- *children = (1 1), /*@ children load in progress *
- *loading= (1 0) | (1 1), /*@ children and properties load in
progress *
- *
- *loaded_properties = (1 2), /*@ Model as ready to fetch properties *
- *loaded_children = (1 3), /*@ Model as ready to fetch children *
- *loaded = (1 2) | (1 3), /*@ Model as ready to fetch properties and
children *
- *
- *unloading = (1 4), /*@ Model Unload in progress *
- *unloaded = (1 5) /*@ Model Unloaded *
- * }
- *
- *
- * struct Efl_Model_Property_Event
- * {
- * changed_properties: Eina_Array* const(char)*; /*@ List of changed
properties *
- * invalidated_properties: Eina_Array* const(char)*; /*@ Removed properties
identified by name *
- * }
- */
+enum Efl.Model.Load_Status {
+ error = 0,
+ loading_properties = (1 0),
+ loading_children = (1 1),
+ loading = (1 0) | (1 1),
+
+ loaded_properties = (1 2),
+ loaded_children = (1 3),
+ loaded = (1 2) | (1 3),
+
+ unloading = (1 4),
+ unloaded = (1 5)
+}
+
+struct Efl.Model.Property_Event {
+ changed_properties: arrayconst(char) * *; [[List of changed properties]]
+ invalidated_properties: arrayconst(char) * *; [[Removed properties
identified by name]]
+}
+
+struct Efl.Model.Load {
+ [[Structure to hold Efl_Model_Load_Status enum (and possible other data)
to avoid ABI break.]]
+
+ status: Efl.Model.Load_Status;
+}
interface Efl.Model.Base ()
{
@@ -41,7 +42,7 @@ interface Efl.Model.Base ()
@see efl_model_load
@since 1.14 */
- return: Efl_Model_Load_Status;
+ return: Efl.Model.Load_Status;
}
}
@property properties {
@@ -59,7 +60,7 @@ interface Efl.Model.Base ()
@see EFL_MODEL_EVENT_PROPERTIES_CHANGE
@since 1.14 */
-return: Efl_Model_Load_Status;
+return: Efl.Model.Load_Status;
}
values {
properties: const(arrayconst(char*)*); /*@ array of current
properties */
@@ -86,7 +87,7 @@ interface Efl.Model.Base ()
@see EFL_MODEL_EVENT_PROPERTIES_CHANGE
@since 1.14 */
-
[EGIT] [core/efl] master 01/01: Evas: Fix abi break in Evas_Callback_Type
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2605eb3c1524764c2bd5edef7bb08d914651cc75 commit 2605eb3c1524764c2bd5edef7bb08d914651cc75 Author: Tom Hacohen t...@stosb.com Date: Wed Jun 10 15:36:28 2015 +0100 Evas: Fix abi break in Evas_Callback_Type You are not allowed to insert elements into an enum, except for at the end!!! Spank spank spank. Was introduced in: 86751fdbaf28796736876e23b86f26480e22de52 --- src/lib/evas/canvas/evas_types.eot | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot index ffa4e35..262f7cd 100644 --- a/src/lib/evas/canvas/evas_types.eot +++ b/src/lib/evas/canvas/evas_types.eot @@ -186,21 +186,13 @@ enum Evas.Callback_Type changed_size_hints, [[Size hints changed event]] image_preloaded, [[Image has been preloaded]] - /* -* The following events are only for use with Evas canvases, with -* evas_event_callback_add(): -*/ canvas_focus_in, [[Canvas got focus as a whole]] canvas_focus_out, [[Canvas lost focus as a whole]] render_flush_pre, [[Called just before rendering is updated on the canvas target]] render_flush_post, [[Called just after rendering is updated on the canvas target]] canvas_object_focus_in, [[Canvas object got focus]] canvas_object_focus_ouT, [[Canvas object lost focus]] - canvas_viewport_resize, [[Canvas viewport resized @since 1.15]] - /* -* More Evas object event types - see evas_object_event_callback_add(): -*/ image_unloaded, [[Image data has been unloaded (by some mechanism in Evas that throw out original image data)]] render_pre, [[Called just before rendering starts on the canvas target @since 1.2]] @@ -210,6 +202,8 @@ enum Evas.Callback_Type device_changed, [[Devices added, removed or changed on canvas @since 1.8]] axis_update, [[Input device changed value on some axis @since 1.13]] + + canvas_viewport_resize, [[Canvas viewport resized @since 1.15]] last [[kept as last element/sentinel -- not really an event]] } --
[EGIT] [core/efl] master 02/03: Edje object: Fix some Eolian warnings regarding callbacks.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f716d700084c8a0431710bdfd41930010f62b917
commit f716d700084c8a0431710bdfd41930010f62b917
Author: Tom Hacohen t...@stosb.com
Date: Wed Jun 10 17:07:14 2015 +0100
Edje object: Fix some Eolian warnings regarding callbacks.
---
src/lib/edje/edje_object.eo | 22 +++---
src/lib/edje/edje_types.eot | 8
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 6f6506e..d606582 100755
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -213,7 +213,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
This function sets the callback to be called when the text
changes. */
}
values {
-func: Edje_Text_Change_Cb; /*@ The callback function to handle the
text change */
+func: Edje.Text.Change_Cb; /*@ The callback function to handle the
text change */
data: void *; /*@ The data associated to the callback function. */
}
}
@@ -311,7 +311,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
Edje object is deleted (or file is set to a new file). */
}
values {
-func: Edje_Item_Provider_Cb; /*@ The function to call (or NULL to
disable) to get item objects */
+func: Edje.Item_Provider_Cb; /*@ The function to call (or NULL to
disable) to get item objects */
data: void *; /*@ The data pointer to pass to the @p func callback
*/
}
}
@@ -342,7 +342,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@see edje_object_message_send() */
}
values {
-func: Edje_Message_Handler_Cb; /*@ The function to handle messages
@b coming from @p obj */
+func: Edje.Message_Handler_Cb; /*@ The function to handle messages
@b coming from @p obj */
data: void *; /*@ Auxiliary data to be passed to @p func */
}
}
@@ -529,7 +529,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
return: void *;
params {
@in part: const(char)*; /*@ The part name */
-@in func: Edje_Markup_Filter_Cb; /*@ The function callback to
remove */
+@in func: Edje.Markup_Filter_Cb; /*@ The function callback to
remove */
@in data: void *; /*@ The data passed to the callback function */
}
}
@@ -622,7 +622,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in emission: const(char)*; /*@ The emission string. */
@in source: const(char)*; /*@ The source string. */
-@in func: Edje_Signal_Cb; /*@ The callback function. */
+@in func: Edje.Signal_Cb; /*@ The callback function. */
@in data: void *; /*@ The callback function. */
}
}
@@ -757,7 +757,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
return: void *;
params {
@in part: const(char)*; /*@ The part name */
-@in func: Edje_Text_Filter_Cb; /*@ The function callback to remove
*/
+@in func: Edje.Text.Filter_Cb; /*@ The function callback to remove
*/
@in data: void *; /*@ The data passed to the callback function */
}
}
@@ -1400,7 +1400,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
return: void *;
params {
@in part: const(char)*; /*@ The part name */
-@in func: Edje_Text_Filter_Cb; /*@ The function callback to remove
*/
+@in func: Edje.Text.Filter_Cb; /*@ The function callback to remove
*/
}
}
part_drag_dir_get @const {
@@ -1510,7 +1510,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in emission: const(char)*; /*@ The signal's emission string */
@in source: const(char)*; /*@ The signal's source string */
-@in func: Edje_Signal_Cb; /*@ The callback function to be executed
when the signal is
+@in func: Edje.Signal_Cb; /*@ The callback function to be executed
when the signal is
emitted. */
@in data: void *; /*@ A pointer to data to pass in to @p func. */
}
@@ -1673,7 +1673,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
-@in func: Edje_Markup_Filter_Cb; /*@ The callback function that
will act as markup filter */
+@in func: Edje.Markup_Filter_Cb; /*@ The callback function that
will act as markup filter */
@in data: void *; /*@ User provided data to pass to the filter
function */
}
}
@@ -2244,7 +2244,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
params {
@in part: const(char)*; /*@ The part name */
-@in
[EGIT] [core/efl] master 01/01: elua: bind recent eolian APIs to eolian lua api
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=944e9eb5b019e60789ebc63608f774a8086e5e47
commit 944e9eb5b019e60789ebc63608f774a8086e5e47
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed Jun 10 17:30:17 2015 +0100
elua: bind recent eolian APIs to eolian lua api
---
src/bindings/luajit/eolian.lua | 157 -
1 file changed, 154 insertions(+), 3 deletions(-)
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 02aae3f..2abd3b2 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -23,6 +23,8 @@ ffi.cdef [[
typedef struct _Eolian_Variable Eolian_Variable;
typedef struct _Eolian_Struct_Type_Field Eolian_Struct_Type_Field;
typedef struct _Eolian_Enum_Type_Field Eolian_Enum_Type_Field;
+typedef struct _Eolian_Declaration Eolian_Declaration;
+typedef struct _Eolian_Documentation Eolian_Documentation;
typedef struct _Eolian_Value Eolian_Value;
typedef enum
@@ -166,6 +168,15 @@ ffi.cdef [[
EOLIAN_UNOP_BNOT, /* ~ int */
} Eolian_Unary_Operator;
+typedef enum {
+EOLIAN_DECL_UNKNOWN = -1,
+EOLIAN_DECL_CLASS,
+EOLIAN_DECL_ALIAS,
+EOLIAN_DECL_STRUCT,
+EOLIAN_DECL_ENUM,
+EOLIAN_DECL_VAR
+} Eolian_Declaration_Type;
+
Eina_Bool eolian_file_parse(const char *filepath);
Eina_Iterator *eolian_all_eo_file_paths_get(void);
Eina_Iterator *eolian_all_eot_file_paths_get(void);
@@ -194,6 +205,7 @@ ffi.cdef [[
Eolian_Class_Type eolian_class_type_get(const Eolian_Class *klass);
Eina_Iterator *eolian_all_classes_get(void);
const char *eolian_class_description_get(const Eolian_Class *klass);
+const Eolian_Documentation *eolian_class_documentation_get(const
Eolian_Class *klass);
const char *eolian_class_legacy_prefix_get(const Eolian_Class *klass);
const char *eolian_class_eo_prefix_get(const Eolian_Class *klass);
const char *eolian_class_data_type_get(const Eolian_Class *klass);
@@ -206,6 +218,7 @@ ffi.cdef [[
const Eolian_Function *eolian_class_function_get_by_name(const
Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type);
const char *eolian_function_legacy_get(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
const char *eolian_function_description_get(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
+const Eolian_Documentation *eolian_function_documentation_get(const
Eolian_Function *function_id, Eolian_Function_Type f_type);
Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
Eina_Bool eolian_function_is_auto(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
Eina_Bool eolian_function_is_empty(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
@@ -220,12 +233,14 @@ ffi.cdef [[
const Eolian_Expression *eolian_parameter_default_value_get(const
Eolian_Function_Parameter *param);
const char *eolian_parameter_name_get(const Eolian_Function_Parameter
*param);
const char *eolian_parameter_description_get(const
Eolian_Function_Parameter *param);
+const Eolian_Documentation *eolian_parameter_documentation_get(const
Eolian_Function_Parameter *param);
Eina_Bool eolian_parameter_is_nonull(const Eolian_Function_Parameter
*param_desc);
Eina_Bool eolian_parameter_is_nullable(const Eolian_Function_Parameter
*param_desc);
Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter
*param_desc);
const Eolian_Type *eolian_function_return_type_get(const Eolian_Function
*function_id, Eolian_Function_Type ftype);
const Eolian_Expression *eolian_function_return_default_value_get(const
Eolian_Function *foo_id, Eolian_Function_Type ftype);
const char *eolian_function_return_comment_get(const Eolian_Function
*foo_id, Eolian_Function_Type ftype);
+const Eolian_Documentation *eolian_function_return_documentation_get(const
Eolian_Function *foo_id, Eolian_Function_Type ftype);
Eina_Bool eolian_function_return_is_warn_unused(const Eolian_Function
*foo_id, Eolian_Function_Type ftype);
Eina_Bool eolian_function_object_is_const(const Eolian_Function
*function_id);
Eina_Bool eolian_type_is_extern(const Eolian_Type *tp);
@@ -247,6 +262,7 @@ ffi.cdef [[
const char *eolian_event_name_get(const Eolian_Event *event);
const Eolian_Type *eolian_event_type_get(const Eolian_Event *event);
const char *eolian_event_description_get(const Eolian_Event *event);
+const Eolian_Documentation *eolian_event_documentation_get(const
Eolian_Event *event);
Eolian_Object_Scope eolian_event_scope_get(const Eolian_Event *event);
const char *eolian_event_c_name_get(const Eolian_Event *event);
Eina_Bool eolian_class_ctor_enable_get(const Eolian_Class *klass);
@@ -265,14 +281,17 @@
[EGIT] [core/efl] master 02/02: eolian: add new __undefined_type builtin to silence warnings
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=660e23fd75b40f09dfaba099b25121bf9d7e834e
commit 660e23fd75b40f09dfaba099b25121bf9d7e834e
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed Jun 10 16:42:12 2015 +0100
eolian: add new __undefined_type builtin to silence warnings
---
src/bin/eolian/types_generator.c | 8
src/lib/eolian/database_validate.c | 2 ++
src/tests/eolian/data/typedef.eo | 2 ++
src/tests/eolian/eolian_parsing.c | 2 ++
4 files changed, 14 insertions(+)
diff --git a/src/bin/eolian/types_generator.c b/src/bin/eolian/types_generator.c
index 3bdd5d3..5979aa9 100644
--- a/src/bin/eolian/types_generator.c
+++ b/src/bin/eolian/types_generator.c
@@ -217,6 +217,14 @@ types_header_generate(const char *eo_filename, Eina_Strbuf
*buf, Eina_Bool full)
if (!tp || eolian_type_is_extern(tp))
continue;
+if (eolian_type_type_get(tp) == EOLIAN_TYPE_ALIAS)
+ {
+ const Eolian_Type *btp = eolian_type_base_type_get(tp);
+ if (eolian_type_type_get(btp) == EOLIAN_TYPE_REGULAR)
+ if (!strcmp(eolian_type_full_name_get(btp), __undefined_type))
+ continue;
+ }
+
Eina_Strbuf *tbuf = _type_generate(tp, full);
if (tbuf)
{
diff --git a/src/lib/eolian/database_validate.c
b/src/lib/eolian/database_validate.c
index b1f1a9f..c5d3609 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -51,6 +51,8 @@ _validate_type(const Eolian_Type *tp)
int id = eo_lexer_keyword_str_to_id(tp-full_name);
if (id)
return eo_lexer_is_type_keyword(id);
+ if (!strcmp(tp-full_name, __undefined_type))
+ return EINA_TRUE;
/* user defined */
tpp = eolian_type_base_type_get(tp);
if (!tpp)
diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index 65036eb..71bebb8 100644
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -3,6 +3,8 @@ type List_Objects: own(listEo **); /* A little more complex */
type @extern Evas.Pants: float; /* not generated */
+type Undef: __undefined_type; /* not generated */
+
enum Enum.Bar
{
legacy: bar;
diff --git a/src/tests/eolian/eolian_parsing.c
b/src/tests/eolian/eolian_parsing.c
index f5e441b..76438cd 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -397,6 +397,8 @@ START_TEST(eolian_typedef)
fail_if(strcmp(type_name, List_Objects));
/* not generated extern, skip */
fail_if(!eina_iterator_next(iter, (void**)atype));
+ /* not generated undefined type, skip */
+ fail_if(!eina_iterator_next(iter, (void**)atype));
fail_if(eina_iterator_next(iter, (void**)atype));
eolian_shutdown();
--
[EGIT] [core/efl] master 01/01: elua: remove unused code from lualian
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1d6c60738c74f5bc7a6be1944a5d2462dd9c05c9
commit 1d6c60738c74f5bc7a6be1944a5d2462dd9c05c9
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Wed Jun 10 17:33:14 2015 +0100
elua: remove unused code from lualian
---
src/scripts/elua/modules/lualian.lua | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/scripts/elua/modules/lualian.lua
b/src/scripts/elua/modules/lualian.lua
index 3689939..72c07f6 100644
--- a/src/scripts/elua/modules/lualian.lua
+++ b/src/scripts/elua/modules/lualian.lua
@@ -352,10 +352,9 @@ local Property = Method:clone {
}
local Event = Node:clone {
-__ctor = function(self, ename, etype, edesc, ecname)
+__ctor = function(self, ename, etype, ecname)
self.ename = ename
self.etype = etype
-self.edesc = edesc
self.ecname = ecname
end,
@@ -647,8 +646,7 @@ local gen_contents = function(klass)
local evs = {}
local events = klass:events_get():to_array()
for i, v in ipairs(events) do
-evs[#evs + 1] = Event(v:name_get(), v:type_get(), v:description_get(),
-v:c_name_get())
+evs[#evs + 1] = Event(v:name_get(), v:type_get(), v:c_name_get())
end
return cnt, evs
end
--
[EGIT] [core/efl] master 01/01: elua: unexpose old documentation api from eolian bindings
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cf2e94e11b9d74aadad880bce51c242897b1e5bb commit cf2e94e11b9d74aadad880bce51c242897b1e5bb Author: Daniel Kolesa d.kol...@osg.samsung.com Date: Wed Jun 10 17:35:31 2015 +0100 elua: unexpose old documentation api from eolian bindings --- src/bindings/luajit/eolian.lua | 63 -- 1 file changed, 63 deletions(-) diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 2abd3b2..452cb75 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -204,7 +204,6 @@ ffi.cdef [[ Eina_Iterator *eolian_class_namespaces_get(const Eolian_Class *klass); Eolian_Class_Type eolian_class_type_get(const Eolian_Class *klass); Eina_Iterator *eolian_all_classes_get(void); -const char *eolian_class_description_get(const Eolian_Class *klass); const Eolian_Documentation *eolian_class_documentation_get(const Eolian_Class *klass); const char *eolian_class_legacy_prefix_get(const Eolian_Class *klass); const char *eolian_class_eo_prefix_get(const Eolian_Class *klass); @@ -217,7 +216,6 @@ ffi.cdef [[ const char *eolian_function_full_c_name_get(const Eolian_Function *function_id); const Eolian_Function *eolian_class_function_get_by_name(const Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type); const char *eolian_function_legacy_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); -const char *eolian_function_description_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); const Eolian_Documentation *eolian_function_documentation_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function *function_id, Eolian_Function_Type f_type); Eina_Bool eolian_function_is_auto(const Eolian_Function *function_id, Eolian_Function_Type f_type); @@ -232,14 +230,12 @@ ffi.cdef [[ const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param); const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param); const char *eolian_parameter_name_get(const Eolian_Function_Parameter *param); -const char *eolian_parameter_description_get(const Eolian_Function_Parameter *param); const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param); Eina_Bool eolian_parameter_is_nonull(const Eolian_Function_Parameter *param_desc); Eina_Bool eolian_parameter_is_nullable(const Eolian_Function_Parameter *param_desc); Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc); const Eolian_Type *eolian_function_return_type_get(const Eolian_Function *function_id, Eolian_Function_Type ftype); const Eolian_Expression *eolian_function_return_default_value_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); -const char *eolian_function_return_comment_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); const Eolian_Documentation *eolian_function_return_documentation_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); Eina_Bool eolian_function_return_is_warn_unused(const Eolian_Function *foo_id, Eolian_Function_Type ftype); Eina_Bool eolian_function_object_is_const(const Eolian_Function *function_id); @@ -261,7 +257,6 @@ ffi.cdef [[ Eina_Iterator *eolian_class_events_get(const Eolian_Class *klass); const char *eolian_event_name_get(const Eolian_Event *event); const Eolian_Type *eolian_event_type_get(const Eolian_Event *event); -const char *eolian_event_description_get(const Eolian_Event *event); const Eolian_Documentation *eolian_event_documentation_get(const Eolian_Event *event); Eolian_Object_Scope eolian_event_scope_get(const Eolian_Event *event); const char *eolian_event_c_name_get(const Eolian_Event *event); @@ -280,17 +275,14 @@ ffi.cdef [[ Eina_Iterator *eolian_type_struct_fields_get(const Eolian_Type *tp); const Eolian_Struct_Type_Field *eolian_type_struct_field_get(const Eolian_Type *tp, const char *field); const char *eolian_type_struct_field_name_get(const Eolian_Struct_Type_Field *fl); -const char *eolian_type_struct_field_description_get(const Eolian_Struct_Type_Field *fl); const Eolian_Documentation *eolian_type_struct_field_documentation_get(const Eolian_Struct_Type_Field *fl); const Eolian_Type *eolian_type_struct_field_type_get(const Eolian_Struct_Type_Field *fl); Eina_Iterator *eolian_type_enum_fields_get(const Eolian_Type *tp); const Eolian_Enum_Type_Field *eolian_type_enum_field_get(const Eolian_Type *tp, const char *field); const char *eolian_type_enum_field_name_get(const Eolian_Enum_Type_Field *fl); -const char
[EGIT] [tools/edi] master 01/02: editor: Fix crash opening empty files
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=4af09363316acaa57e711fb7d064c7d988afba5d
commit 4af09363316acaa57e711fb7d064c7d988afba5d
Author: Andy Williams a...@andywilliams.me
Date: Wed Jun 10 23:32:15 2015 +0100
editor: Fix crash opening empty files
---
elm_code/src/lib/widget/elm_code_widget_text.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/elm_code/src/lib/widget/elm_code_widget_text.c
b/elm_code/src/lib/widget/elm_code_widget_text.c
index b7b131e..0ae2595 100644
--- a/elm_code/src/lib/widget/elm_code_widget_text.c
+++ b/elm_code/src/lib/widget/elm_code_widget_text.c
@@ -70,6 +70,9 @@ _elm_code_widget_line_text_column_width_to_position(Eo *obj,
Elm_Code_Widget_Dat
static unsigned int
_elm_code_widget_line_text_column_width_get(Eo *obj, Elm_Code_Widget_Data *pd,
Elm_Code_Line *line)
{
+ if (!line)
+ return 0;
+
return _elm_code_widget_line_text_column_width_to_position(obj, pd, line,
line-length) - 1;
}
--
[EGIT] [core/efl] master 01/01: Evas GL: Fix coverity CID 1304559, 1304560
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cb11a67595815dc09fa615b3c81ee67e45b08e57
commit cb11a67595815dc09fa615b3c81ee67e45b08e57
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Thu Jun 11 08:39:43 2015 +0900
Evas GL: Fix coverity CID 1304559, 1304560
Summary:
CID 1304559: Logically dead code
The dead code is only valid for GLES backend, so move if statement
to be used for GLES backend only.
CID 1304560: Bad bit shift operation
When calculating depth bit, bit shifting could be done with negative values.
@fix
Test Plan: Local tests
Reviewers: jpeg
Reviewed By: jpeg
Subscribers: wonsik, cedric
Differential Revision: https://phab.enlightenment.org/D2654
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index f374301..5c1ecf5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -887,11 +887,6 @@ _context_ext_check(EVGL_Context *ctx)
egl_image_supported = 1;
if (EXTENSION_SUPPORT_EGL(EGL_KHR_gl_texture_2D_image))
texture_image_supported = 1;
-#else
- fbo_supported = 1;
- egl_image_supported = 0;
- texture_image_supported = 0;
-#endif
if (egl_image_supported)
{
@@ -900,6 +895,11 @@ _context_ext_check(EVGL_Context *ctx)
else
ctx-pixmap_image_supported = 1;
}
+#else
+ fbo_supported = 1;
+ egl_image_supported = 0;
+ texture_image_supported = 0;
+#endif
ctx-extension_checked = 1;
@@ -1355,7 +1355,8 @@ try_again:
(native_win_stencil != stencil_bit) ||
(native_win_msaa != msaa_samples)))
{
- depth_bit = (1 ((native_win_depth / 8) - 1));
+ if (native_win_depth 8) depth_bit = 0;
+ else depth_bit = (1 ((native_win_depth / 8) - 1));
depth_size = native_win_depth;
stencil_bit = native_win_stencil;
msaa_samples = native_win_msaa;
--
[EGIT] [core/efl] master 01/01: Evas GL: Make INF message more explicit
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=142626c00a36b67a803d084decb126bcacc8fca4
commit 142626c00a36b67a803d084decb126bcacc8fca4
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Thu May 21 09:54:19 2015 +0900
Evas GL: Make INF message more explicit
Direct rendering is actually quite hard to enable, so make the
message very explicit for elm_glview users. Thanks zmike for
reporting this msg.
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 5c1ecf5..3ea9c36 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1341,8 +1341,9 @@ try_again:
const char *s2[] = { , :stencil1, :stencil2,
:stencil4, :stencil8, :stencil16 };
const char *s3[] = { , :msaa_low, :msaa_mid,
:msaa_high };
INF(Can not enable direct rendering with depth %d, stencil
%d
- and MSAA %d. When using Elementary GLView, try to set
- the accel_preference to \opengl%s%s%s\.,
+ and MSAA %d. When using Elementary GLView, try to call
+ elm_config_accel_preference_set(\opengl%s%s%s\)
before
+ creating any window.,
depth_size, stencil_bit, msaa_samples,
s1[cfg-depth_bits], s2[cfg-stencil_bits],
s3[cfg-multisample_bits]);
}
--
[EGIT] [core/efl] master 01/01: evas - eo canvas events - move viewport to last to match enums in legacy
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4730afdba07d8879516de5323ba28f1115800680 commit 4730afdba07d8879516de5323ba28f1115800680 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jun 11 10:51:47 2015 +0900 evas - eo canvas events - move viewport to last to match enums in legacy --- src/lib/evas/canvas/evas_callbacks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 59850f6..07d682a 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -68,13 +68,13 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS EVAS_CANVAS_EVENT_RENDER_FLUSH_POST, EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN, EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, - EVAS_CANVAS_EVENT_VIEWPORT_RESIZE, EVAS_OBJECT_EVENT_IMAGE_UNLOADED, EVAS_CANVAS_EVENT_RENDER_PRE, EVAS_CANVAS_EVENT_RENDER_POST, EVAS_OBJECT_EVENT_IMAGE_RESIZE, EVAS_CANVAS_EVENT_DEVICE_CHANGED, - EVAS_CANVAS_EVENT_AXIS_UPDATE + EVAS_CANVAS_EVENT_AXIS_UPDATE, + EVAS_CANVAS_EVENT_VIEWPORT_RESIZE }; typedef struct --
[EGIT] [core/efl] master 01/03: Edje object: Fix Eolian warnings (and migrate types).
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=24eaad059e88d0e9c65967cae59c32abd6338a7a
commit 24eaad059e88d0e9c65967cae59c32abd6338a7a
Author: Tom Hacohen t...@stosb.com
Date: Wed Jun 10 16:56:43 2015 +0100
Edje object: Fix Eolian warnings (and migrate types).
Also add an eot file for general edje types.
---
src/Makefile_Edje.am| 9 +--
src/lib/edje/Edje_Common.h | 65 ++---
src/lib/edje/edje_object.eo | 46 +---
src/lib/edje/edje_types.eot | 43 ++
4 files changed, 76 insertions(+), 87 deletions(-)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 15a8fed..e42f3c4 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -5,9 +5,13 @@ edje_eolian_files = \
lib/edje/edje_object.eo \
lib/edje/edje_edit.eo
+edje_eolian_type_files = \
+lib/edje/edje_types.eot
+
edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c)
edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \
-$(edje_eolian_files:%.eo=%.eo.legacy.h)
+$(edje_eolian_files:%.eo=%.eo.legacy.h) \
+$(edje_eolian_type_files:%.eot=%.eot.h)
BUILT_SOURCES += \
$(edje_eolian_c) \
@@ -19,7 +23,8 @@ CLEANFILES += \
edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
edjeeolianfiles_DATA = \
- $(edje_eolian_files)
+ $(edje_eolian_files) \
+ $(edje_eolian_type_files)
EXTRA_DIST += \
${edjeeolianfiles_DATA}
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index d067486..4aa3da2 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -1,3 +1,5 @@
+#include edje_types.eot.h
+
/**
* @internal
*
@@ -993,20 +995,6 @@ typedef enum _Edje_Text_Filter_Type
} Edje_Text_Filter_Type;
/**
- * @typedef Edje_Text_Autocapital_Type
- *
- * All Text auto capital mode type values
- *
- */
-typedef enum _Edje_Text_Autocapital_Type
-{
- EDJE_TEXT_AUTOCAPITAL_TYPE_NONE,/** None mode value */
- EDJE_TEXT_AUTOCAPITAL_TYPE_WORD,/** Word mode value */
- EDJE_TEXT_AUTOCAPITAL_TYPE_SENTENCE,/** Sentence mode value */
- EDJE_TEXT_AUTOCAPITAL_TYPE_ALLCHARACTER /** All characters mode value */
-} Edje_Text_Autocapital_Type;
-
-/**
* @typedef Edje_Input_Panel_Lang
*
*/
@@ -1447,24 +1435,6 @@ typedef void (*Edje_Text_Change_Cb) (void
*data, Evas_Object *obj, c
*/
/**
- * @typedef Edje_Cursor
- *
- * All available cursor states
- *
- */
-typedef enum _Edje_Cursor
-{
- EDJE_CURSOR_MAIN,/* Main cursor state*/
- EDJE_CURSOR_SELECTION_BEGIN, /* Selection begin cursor state */
- EDJE_CURSOR_SELECTION_END, /* Selection end cursor state */
- EDJE_CURSOR_PREEDIT_START, /* Pre-edit start cursor state */
- EDJE_CURSOR_PREEDIT_END, /* Pre-edit end cursor starge */
- EDJE_CURSOR_USER,/* User cursor state*/
- EDJE_CURSOR_USER_EXTRA, /* User extra cursor state */
- // more later
-} Edje_Cursor;
-
-/**
* @}
*/
@@ -1547,19 +1517,6 @@ typedef enum _Edje_Aspect_Control
*/
/**
- * @typedef Edje_Drag_Dir
- *
- * Dragable properties values
- */
-typedef enum _Edje_Drag_Dir
-{
- EDJE_DRAG_DIR_NONE = 0, /* Not dragable value */
- EDJE_DRAG_DIR_X = 1, /* X dragable value */
- EDJE_DRAG_DIR_Y = 2, /* Y dragable value */
- EDJE_DRAG_DIR_XY = 3 /* X and Y dragable value */
-} Edje_Drag_Dir;
-
-/**
* @}
*/
@@ -1740,21 +1697,6 @@ EAPI Eina_List *edje_text_class_list(void);
* @{
*/
-typedef enum _Edje_Load_Error
-{
- EDJE_LOAD_ERROR_NONE = 0, /** No error happened, the loading was
successful */
- EDJE_LOAD_ERROR_GENERIC = 1, /** A generic error happened during the
loading */
- EDJE_LOAD_ERROR_DOES_NOT_EXIST = 2, /** The file pointed to did not exist
*/
- EDJE_LOAD_ERROR_PERMISSION_DENIED = 3, /** Permission to read the given
file was denied */
- EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4, /** Resource allocation
failed during the loading */
- EDJE_LOAD_ERROR_CORRUPT_FILE = 5, /** The file pointed to was corrupt */
- EDJE_LOAD_ERROR_UNKNOWN_FORMAT = 6, /** The file pointed to had an unknown
format */
- EDJE_LOAD_ERROR_INCOMPATIBLE_FILE = 7, /** The file pointed to is
incompatible, i.e., it doesn't match the library's current version's format */
- EDJE_LOAD_ERROR_UNKNOWN_COLLECTION = 8, /** The group/collection set to
load from was @b not found in the file */
- EDJE_LOAD_ERROR_RECURSIVE_REFERENCE = 9 /** The group/collection set to
load from had brecursive references/b on its components */
-} Edje_Load_Error; /** Edje file loading error codes one can get - see
edje_load_error_str() too. */
-
-
/**
* Get a list of groups in an edje mapped file
* @param f The mapped
