[EGIT] [core/enlightenment] master 01/01: fix pager segv... set active_pd to null if we are emptying pd's!
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d77faef91b794be9c074399ebe1055ea3c103ec5
commit d77faef91b794be9c074399ebe1055ea3c103ec5
Author: Carsten Haitzler (Rasterman)
Date: Wed Sep 25 12:59:17 2013 +0900
fix pager segv... set active_pd to null if we are emptying pd's!
---
src/modules/pager/e_mod_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 196f10e..feaba8b 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -373,6 +373,7 @@ _pager_fill(Pager *p, E_Gadcon *gc)
static void
_pager_empty(Pager *p)
{
+ p->active_pd = NULL;
while (p->desks)
{
_pager_desk_free(p->desks->data);
--
[EGIT] [core/efl] master 01/01: fix if obj->layer is null during shutdown
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b5472db51d4dcefecf50c5d98956b87f6f652492
commit b5472db51d4dcefecf50c5d98956b87f6f652492
Author: Carsten Haitzler (Rasterman)
Date: Wed Sep 25 13:05:41 2013 +0900
fix if obj->layer is null during shutdown
---
src/lib/evas/canvas/evas_clip.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 70134eb..76cddc0 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -390,14 +390,17 @@ _clip_unset(Eo *eo_obj, void *_pd, va_list *list
EINA_UNUSED)
}
EINA_COW_STATE_WRITE_END(obj->cur->clipper, state_write, cur);
- if (obj->cur->clipper->cur->visible)
+ if ((obj->cur->clipper->cur) && (obj->cur->clipper->cur->visible))
{
- Evas_Public_Data *e = obj->cur->clipper->layer->evas;
- evas_damage_rectangle_add(e->evas,
-obj->cur->clipper->cur->geometry.x
+ e->framespace.x,
-obj->cur->clipper->cur->geometry.y
+ e->framespace.y,
-obj->cur->clipper->cur->geometry.w,
-
obj->cur->clipper->cur->geometry.h);
+ if (obj->cur->clipper->layer)
+{
+ Evas_Public_Data *e = obj->cur->clipper->layer->evas;
+ evas_damage_rectangle_add(e->evas,
+
obj->cur->clipper->cur->geometry.x + e->framespace.x,
+
obj->cur->clipper->cur->geometry.y + e->framespace.y,
+
obj->cur->clipper->cur->geometry.w,
+
obj->cur->clipper->cur->geometry.h);
+}
}
}
evas_object_change(obj->cur->clipper->object, obj->cur->clipper);
--
[EGIT] [website/www] master 01/01: add e-dev-day to e.org
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=18eb3228be9f65256eac1789caf4526a9fa2d301 commit 18eb3228be9f65256eac1789caf4526a9fa2d301 Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 15:48:19 2013 +0900 add e-dev-day to e.org --- public_html/p/index/en-body | 17 + 1 file changed, 17 insertions(+) diff --git a/public_html/p/index/en-body b/public_html/p/index/en-body index 267325d..4999422 100644 --- a/public_html/p/index/en-body +++ b/public_html/p/index/en-body @@ -51,6 +51,23 @@ + + + + Enlightenment Developer Day + October 20, 2013 + + https://phab.enlightenment.org/phame/live/3/post/enlightenment_developer_day_2013/> + Enlightenment Developer Day, 2013 + + Is on again. Please come and enjoy in the festivities. Please + https://phab.enlightenment.org/w/enlightenment_developer_day_2013/> + see the Wiki Page + + For more details. + + + --
[EGIT] [website/www] master 01/01: clean text in dev day
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=18e75730e43928fe31509bcece2566339bdfd7f6 commit 18e75730e43928fe31509bcece2566339bdfd7f6 Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 15:52:52 2013 +0900 clean text in dev day --- public_html/p/index/en-body | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public_html/p/index/en-body b/public_html/p/index/en-body index 4999422..2d9dca0 100644 --- a/public_html/p/index/en-body +++ b/public_html/p/index/en-body @@ -60,11 +60,12 @@ https://phab.enlightenment.org/phame/live/3/post/enlightenment_developer_day_2013/> Enlightenment Developer Day, 2013 - Is on again. Please come and enjoy in the festivities. Please + is on again in Edinburgh, Scotland. Please come and enjoy in the + festivities. Please https://phab.enlightenment.org/w/enlightenment_developer_day_2013/> - see the Wiki Page + see the Wiki Page - For more details. + for more details. --
[EGIT] [website/www] master 01/01: move dev day to top.
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=4869b85ef28553dea982a5bc228208a621c07908 commit 4869b85ef28553dea982a5bc228208a621c07908 Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 15:54:19 2013 +0900 move dev day to top. --- public_html/p/index/en-body | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/public_html/p/index/en-body b/public_html/p/index/en-body index 2d9dca0..eaaa8e0 100644 --- a/public_html/p/index/en-body +++ b/public_html/p/index/en-body @@ -1,3 +1,21 @@ + + + Enlightenment Developer Day + October 20, 2013 + + https://phab.enlightenment.org/phame/live/3/post/enlightenment_developer_day_2013/> +Enlightenment Developer Day, 2013 + + is on again in Edinburgh, Scotland. Please come and enjoy in the + festivities. Please + https://phab.enlightenment.org/w/enlightenment_developer_day_2013/> +see the Wiki Page + + for more details. + + + + @@ -51,24 +69,6 @@ - - - - Enlightenment Developer Day - October 20, 2013 - - https://phab.enlightenment.org/phame/live/3/post/enlightenment_developer_day_2013/> - Enlightenment Developer Day, 2013 - - is on again in Edinburgh, Scotland. Please come and enjoy in the - festivities. Please - https://phab.enlightenment.org/w/enlightenment_developer_day_2013/> - see the Wiki Page - - for more details. - - - --
[EGIT] [core/efl] master 01/01: evas gl engine - simplify and optimise pipe region intersection checks.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d4861504127c8a2d7375b076c18c22086914e94c
commit d4861504127c8a2d7375b076c18c22086914e94c
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 26 19:19:50 2013 +0900
evas gl engine - simplify and optimise pipe region intersection checks.
---
.../evas/engines/gl_common/evas_gl_context.c | 30 +-
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index ea8194c..951cfbe 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1166,37 +1166,31 @@ static int
pipe_region_intersects(Evas_Engine_GL_Context *gc, int n,
int x, int y, int w, int h)
{
- int i, rx, ry, rw, rh, ii;
+ int i, rx, ry, rw, rh, end;
+ const GLshort *v;
rx = gc->pipe[n].region.x;
ry = gc->pipe[n].region.y;
rw = gc->pipe[n].region.w;
rh = gc->pipe[n].region.h;
- if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
- return 0;
+ if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 0;
// a hack for now. map pipes use their whole bounding box for intersects
// which at worst case reduces to old pipeline flushes, but cheaper than
// full quad region or triangle intersects right now
if (gc->pipe[n].region.type == RTYPE_MAP) return 1;
-
- for (i = 0,
-ii = 0;
-
-i < gc->pipe[n].array.num;
-
-i += (3 * 2),
-ii += (3 * 3 * 2))
+ end = gc->pipe[n].array.num;
+ v = gc->pipe[n].array.vertex;
+ for (i = 0; i < end; i += (3 * 3 * 2))
{ // tri 1...
// 0, 1, 2 < top left
// 3, 4, 5 < top right
-// 6. 7, 8 < bottom left
-rx = gc->pipe[n].array.vertex[ii + 0];
-ry = gc->pipe[n].array.vertex[ii + 1];
-rw = gc->pipe[n].array.vertex[ii + 3] - rx;
-rh = gc->pipe[n].array.vertex[ii + 7] - ry;
-if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
- return 1;
+// 6, 7, 8 < bottom left
+rx = v[i + 0];
+ry = v[i + 1];
+rw = v[i + 3] - rx;
+rh = v[i + 7] - ry;
+if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 1;
}
return 0;
}
--
[EGIT] [core/efl] master 01/01: Revert "evas gl engine - simplify and optimise pipe region intersection checks."
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0732fef6ec9e5e5ce8d626637b366ee58625e686
commit 0732fef6ec9e5e5ce8d626637b366ee58625e686
Author: Carsten Haitzler (Rasterman)
Date: Fri Sep 27 17:57:41 2013 +0900
Revert "evas gl engine - simplify and optimise pipe region intersection
checks."
This reverts commit d4861504127c8a2d7375b076c18c22086914e94c.
---
.../evas/engines/gl_common/evas_gl_context.c | 30 +-
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 951cfbe..ea8194c 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1166,31 +1166,37 @@ static int
pipe_region_intersects(Evas_Engine_GL_Context *gc, int n,
int x, int y, int w, int h)
{
- int i, rx, ry, rw, rh, end;
- const GLshort *v;
+ int i, rx, ry, rw, rh, ii;
rx = gc->pipe[n].region.x;
ry = gc->pipe[n].region.y;
rw = gc->pipe[n].region.w;
rh = gc->pipe[n].region.h;
- if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 0;
+ if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
+ return 0;
// a hack for now. map pipes use their whole bounding box for intersects
// which at worst case reduces to old pipeline flushes, but cheaper than
// full quad region or triangle intersects right now
if (gc->pipe[n].region.type == RTYPE_MAP) return 1;
- end = gc->pipe[n].array.num;
- v = gc->pipe[n].array.vertex;
- for (i = 0; i < end; i += (3 * 3 * 2))
+
+ for (i = 0,
+ii = 0;
+
+i < gc->pipe[n].array.num;
+
+i += (3 * 2),
+ii += (3 * 3 * 2))
{ // tri 1...
// 0, 1, 2 < top left
// 3, 4, 5 < top right
-// 6, 7, 8 < bottom left
-rx = v[i + 0];
-ry = v[i + 1];
-rw = v[i + 3] - rx;
-rh = v[i + 7] - ry;
-if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 1;
+// 6. 7, 8 < bottom left
+rx = gc->pipe[n].array.vertex[ii + 0];
+ry = gc->pipe[n].array.vertex[ii + 1];
+rw = gc->pipe[n].array.vertex[ii + 3] - rx;
+rh = gc->pipe[n].array.vertex[ii + 7] - ry;
+if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
+ return 1;
}
return 0;
}
--
[EGIT] [apps/terminology] master 01/01: pass distcheck
raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=075f8d1f2ee78ec997943901e0931930c42f88ea commit 075f8d1f2ee78ec997943901e0931930c42f88ea Author: Carsten Haitzler (Rasterman) Date: Sun Sep 29 00:42:34 2013 +0900 pass distcheck --- data/themes/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index cec2b6a..2ba7d14 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -17,7 +17,7 @@ solarized.edj \ solarized_light.edj \ mustang.edj -EXTRA_DIST = default.edc mild.edc black.edc solarized.edc mustang.edc default_colors.in.edc +EXTRA_DIST = default.edc mild.edc black.edc mustang.edc default_colors.in.edc default.edj: Makefile default.edc $(EDJE_CC) $(EDJE_FLAGS) \ --
[EGIT] [core/efl] master 02/02: update po's
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad89985d41af1a53d8c8b129544ba808df50b5d7 commit ad89985d41af1a53d8c8b129544ba808df50b5d7 Author: Carsten Haitzler (Rasterman) Date: Mon Sep 30 23:31:37 2013 +0900 update po's --- po/ca.po| 2 +- po/cs.po| 2 +- po/de.po| 2 +- po/el.po| 2 +- po/eo.po| 2 +- po/es.po| 2 +- po/fr.po| 2 +- po/gl.po| 2 +- po/it.po| 2 +- po/ja.po| 2 +- po/ko.po| 2 +- po/lt.po| 2 +- po/nl.po| 2 +- po/pt.po| 2 +- po/ru.po| 2 +- po/sl.po| 2 +- po/sr.po| 2 +- po/zh_CN.po | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/ca.po b/po/ca.po index 5a31a21..5f4e5d1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2013-02-01 09:52+0100\n" "Last-Translator: Joan Coll \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index cac87d2..155fc80 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2012-12-13 12:06+0100\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" diff --git a/po/de.po b/po/de.po index d841426..1822d1d 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" diff --git a/po/el.po b/po/el.po index 025f893..b342be9 100644 --- a/po/el.po +++ b/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2012-12-01 18:26+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" diff --git a/po/eo.po b/po/eo.po index 63b3d42..f5e7a62 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2013-02-21 15:24+\n" "Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index f093f35..661d427 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2013-01-04 23:53+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" diff --git a/po/fr.po b/po/fr.po index c441871..c508ef1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2013-02-05 22:51+\n" "Last-Translator: ilLogict \n" "Language-Team: Enlightenment French Team \n" "Language-Team: http://trasno.net/ \n" diff --git a/po/it.po b/po/it.po index f469f07..bbeeb65 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-08-15 03:49+0900\n" +"POT-Creation-Date: 2013-09-30 14:26+0900\n" "PO-Revision-Date: 2013-01-05 20:49+0100\n" "Last-Translator: Massimo Maiurana \n" "Language-Team: none\n" diff --git a/po/ja.po b/po/
[EGIT] [core/efl] master 01/02: evas - improve textblock logic to reduce num of layouts when used - faster
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a4a285089f48c1c303aa389324f778eaefe9e3a8
commit a4a285089f48c1c303aa389324f778eaefe9e3a8
Author: Carsten Haitzler (Rasterman)
Date: Mon Sep 30 23:29:54 2013 +0900
evas - improve textblock logic to reduce num of layouts when used - faster
when using genlist and the edje item objects, there seem to be a lot
of excess textblock layouts happening. i was seeing about 12 layouts per tb
part in the edje before this patch. with this it's down to about 3.
---
src/lib/evas/canvas/evas_object_textblock.c | 235 +---
1 file changed, 182 insertions(+), 53 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 291ef8e..e0aff4d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -69,6 +69,9 @@
EAPI Eo_Op EVAS_OBJ_TEXTBLOCK_BASE_ID = EO_NOOP;
+//#define LYDBG(f, args...) printf(f, ##args)
+#define LYDBG(f, args...)
+
#define MY_CLASS EVAS_OBJ_TEXTBLOCK_CLASS
#define MY_CLASS_NAME "Evas_Object_Textblock"
@@ -495,7 +498,7 @@ struct _Evas_Object_Textblock
const char *repch;
const char *bidi_delimiters;
struct {
- int w, h;
+ int w, h, oneline_h;
Eina_Boolvalid : 1;
} formatted, native;
Eina_Bool redraw : 1;
@@ -532,11 +535,9 @@ static int evas_object_textblock_is_opaque(Evas_Object
*eo_obj,
static int evas_object_textblock_was_opaque(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-
static void evas_object_textblock_coords_recalc(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
-
static void evas_object_textblock_scale_update(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj,
void *type_private_data);
@@ -560,7 +561,7 @@ static const Evas_Object_Func object_func =
evas_object_textblock_was_opaque,
NULL,
NULL,
- evas_object_textblock_coords_recalc,
+ NULL, /*evas_object_textblock_coords_recalc, <- disable - not useful. */
evas_object_textblock_scale_update,
NULL,
NULL,
@@ -5104,6 +5105,7 @@ _layout(const Evas_Object *eo_obj, int w, int h, int
*w_ret, int *h_ret)
Ctxt ctxt, *c;
int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0;
+ LYDBG("ZZ: layout %p %4ix%4i | w=%4i | last_w=%4i --- '%s'\n", eo_obj, w,
h, obj->cur->geometry.w, o->last_w, o->markup_text);
/* setup context */
c = &ctxt;
c->obj = (Evas_Object *)eo_obj;
@@ -5269,6 +5271,7 @@ _layout(const Evas_Object *eo_obj, int w, int h, int
*w_ret, int *h_ret)
o->style_pad.t = style_pad_t;
o->style_pad.b = style_pad_b;
_paragraphs_clear(eo_obj, c->paragraphs);
+LYDBG("ZZ: ... layout #2\n");
_layout(eo_obj, w, h, w_ret, h_ret);
}
}
@@ -5287,8 +5290,19 @@ _relayout(const Evas_Object *eo_obj)
_layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
&o->formatted.w, &o->formatted.h);
o->formatted.valid = 1;
+ o->formatted.oneline_h = 0;
o->last_w = obj->cur->geometry.w;
+ LYDBG("ZZ: - layout %p @ %ix%i = %ix%i\n", eo_obj,
obj->cur->geometry.w, obj->cur->geometry.h, o->formatted.w, o->formatted.h);
o->last_h = obj->cur->geometry.h;
+ if ((o->paragraphs) && (!EINA_INLIST_GET(o->paragraphs)->next) &&
+ (o->paragraphs->lines) &&
(!EINA_INLIST_GET(o->paragraphs->lines)->next))
+ {
+if (obj->cur->geometry.h < o->formatted.h)
+ {
+ LYDBG("ZZ: 1 line only... lasth == formatted h (%i)\n",
o->formatted.h);
+ o->formatted.oneline_h = o->formatted.h;
+ }
+ }
o->changed = 0;
o->content_changed = 0;
o->format_changed = EINA_FALSE;
@@ -5312,8 +5326,14 @@ _find_layout_item_line_match(Evas_Object *eo_obj,
Evas_Object_Textblock_Node_Tex
Evas_Object_Textblock_Paragraph *found_par;
Evas_Object_Textblock_Line *ln;
Evas_Object_Textblock *o = eo_data_scope_get(eo_obj, MY_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
- if (!o->formatted.valid) _relayout(eo_obj);
+ evas_object_textblock_coords_recalc(eo_obj, obj, obj->private_d
[EGIT] [core/elementary] master 01/02: remove ifdef from glsl in glview shader - ifdefs not universally supported
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=54883cb7fb0c42f37615f1485e554d947b42c369
commit 54883cb7fb0c42f37615f1485e554d947b42c369
Author: Carsten Haitzler (Rasterman)
Date: Wed Sep 11 08:53:02 2013 +0900
remove ifdef from glsl in glview shader - ifdefs not universally supported
---
src/bin/test_glview.c| 3 ---
src/bin/test_glview_simple.c | 3 ---
2 files changed, 6 deletions(-)
diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index 6381ef4..f9e01f8 100644
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -327,9 +327,6 @@ static const char vertex_shader[] =
"}\n";
static const char fragment_shader[] =
- "#ifdef GL_ES\n"
- "precision mediump float;\n"
- "#endif\n"
"uniform vec4 color;\n"
"uniform vec3 light;\n"
"varying vec3 rotated_normal;\n"
diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index 438a6fa..2db4a35 100644
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -70,9 +70,6 @@ init_shaders(GLData *gld)
"}\n";
GLbyte fShaderStr[] =
- "#ifdef GL_ES \n"
- "precision mediump float; \n"
- "#endif \n"
"void main() \n"
"{\n"
" gl_FragColor = vec4 ( 1.0, 0.0, 0.0, 1.0 );\n"
--
[EGIT] [core/elementary] master 02/02: genlist - fix homogenous to NOT go (un)realizing every item on queue
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fa002c0313df3cb10d3f56c1dfc09c539a157e35
commit fa002c0313df3cb10d3f56c1dfc09c539a157e35
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 1 12:54:28 2013 +0900
genlist - fix homogenous to NOT go (un)realizing every item on queue
---
src/lib/elm_genlist.c | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 860e868..f713dce 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4475,8 +4475,22 @@ _item_block_recalc(Item_Block *itb,
if (!it->item->mincalcd) changed = EINA_TRUE;
if (changed)
{
- _item_realize(it, in, EINA_TRUE);
- _elm_genlist_item_unrealize(it, EINA_TRUE);
+ Eina_Bool doit = EINA_TRUE;
+
+ if (itb->sd->homogeneous)
+ {
+if ((it->group) && (itb->sd->group_item_height ==
0))
+ doit = EINA_TRUE;
+else if (itb->sd->item_height == 0)
+ doit = EINA_TRUE;
+else
+ doit = EINA_FALSE;
+ }
+ if (doit)
+ {
+_item_realize(it, in, EINA_TRUE);
+_elm_genlist_item_unrealize(it, EINA_TRUE);
+ }
}
}
else
--
[EGIT] [core/efl] master 01/02: evas - try cleanup pipe_region_intersects again.. this time without bugs.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e383e3096d22d4be63373e8a0e48aa9662748a58
commit e383e3096d22d4be63373e8a0e48aa9662748a58
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 1 15:23:04 2013 +0900
evas - try cleanup pipe_region_intersects again.. this time without bugs.
---
.../evas/engines/gl_common/evas_gl_context.c | 31 +-
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index ea8194c..4f875c5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1166,37 +1166,32 @@ static int
pipe_region_intersects(Evas_Engine_GL_Context *gc, int n,
int x, int y, int w, int h)
{
- int i, rx, ry, rw, rh, ii;
-
+ int rx, ry, rw, rh, ii, end;
+ const GLshort *v;
+
rx = gc->pipe[n].region.x;
ry = gc->pipe[n].region.y;
rw = gc->pipe[n].region.w;
rh = gc->pipe[n].region.h;
- if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
- return 0;
+ if (!RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 0;
// a hack for now. map pipes use their whole bounding box for intersects
// which at worst case reduces to old pipeline flushes, but cheaper than
// full quad region or triangle intersects right now
if (gc->pipe[n].region.type == RTYPE_MAP) return 1;
- for (i = 0,
-ii = 0;
-
-i < gc->pipe[n].array.num;
-
-i += (3 * 2),
-ii += (3 * 3 * 2))
+ v = gc->pipe[n].array.vertex;
+ end = gc->pipe[n].array.num * 3;
+ for (ii = 0; ii < end; ii += (3 * 3 * 2))
{ // tri 1...
// 0, 1, 2 < top left
// 3, 4, 5 < top right
-// 6. 7, 8 < bottom left
-rx = gc->pipe[n].array.vertex[ii + 0];
-ry = gc->pipe[n].array.vertex[ii + 1];
-rw = gc->pipe[n].array.vertex[ii + 3] - rx;
-rh = gc->pipe[n].array.vertex[ii + 7] - ry;
-if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh))
- return 1;
+// 6, 7, 8 < bottom left
+rx = v[ii + 0];
+ry = v[ii + 1];
+rw = v[ii + 3] - rx;
+rh = v[ii + 7] - ry;
+if (RECTS_INTERSECT(x, y, w, h, rx, ry, rw, rh)) return 1;
}
return 0;
}
--
[EGIT] [core/efl] master 02/02: evas - clean up tiler code a lot and remove old commented out stuff
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=32514b72717f555870ad09efd6d58972b0fbd90f
commit 32514b72717f555870ad09efd6d58972b0fbd90f
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 1 20:44:48 2013 +0900
evas - clean up tiler code a lot and remove old commented out stuff
---
src/lib/evas/common/evas_tiler.c | 641 +--
1 file changed, 76 insertions(+), 565 deletions(-)
diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c
index 9147db3..b9f982a 100644
--- a/src/lib/evas/common/evas_tiler.c
+++ b/src/lib/evas/common/evas_tiler.c
@@ -1,5 +1,7 @@
#include "evas_common_private.h"
-#ifdef EVAS_RECT_SPLIT
+
+#define FUZZ 32
+#define MAXREG 24
static inline void rect_list_node_pool_set_max(int max);
static inline void rect_list_node_pool_flush(void);
@@ -18,10 +20,6 @@ static inline void rect_list_add_split_strict(list_t *rects,
list_node_t *node);
static inline list_node_t *rect_list_add_split_fuzzy(list_t *rects,
list_node_t *node, int accepted_error);
static inline void rect_list_merge_rects(list_t *rects, list_t *to_merge, int
accepted_error);
static inline void rect_list_add_split_fuzzy_and_merge(list_t *rects,
list_node_t *node, int split_accepted_error, int merge_accepted_error);
-static inline void rect_print(const rect_t r);
-#if 0
-static inline void rect_list_print(const list_t rects);
-#endif
static const list_node_t list_node_zeroed = { NULL };
static const list_t list_zeroed = { NULL, NULL };
@@ -43,12 +41,9 @@ rect_list_node_pool_set_max(int max)
diff = list_node_pool.len - max;
for (; diff > 0 && list_node_pool.node; diff--)
{
-list_node_t *node;
-
-node = list_node_pool.node;
+list_node_t *node = list_node_pool.node;
list_node_pool.node = node->next;
list_node_pool.len--;
-
free(node);
}
@@ -60,12 +55,9 @@ rect_list_node_pool_flush(void)
{
while (list_node_pool.node)
{
-list_node_t *node;
-
-node = list_node_pool.node;
+list_node_t *node = list_node_pool.node;
list_node_pool.node = node->next;
list_node_pool.len--;
-
free(node);
}
}
@@ -75,12 +67,9 @@ rect_list_node_pool_get(void)
{
if (list_node_pool.node)
{
-list_node_t *node;
-
-node = list_node_pool.node;
+list_node_t *node = list_node_pool.node;
list_node_pool.node = node->next;
list_node_pool.len--;
-
return node;
}
else return (list_node_t *)malloc(sizeof(rect_node_t));
@@ -102,53 +91,15 @@ static inline void
rect_init(rect_t *r, int x, int y, int w, int h)
{
r->area = w * h;
-
r->left = x;
r->top = y;
-
r->right = x + w;
r->bottom = y + h;
-
r->width = w;
r->height = h;
}
static inline void
-rect_print(const rect_t r)
-{
- INF("", r.left, r.top, r.width, r.height);
-}
-
-#if 0
-static inline void
-rect_list_print(const list_t rects)
-{
- list_node_t *node;
- int len;
-
- len = 0;
- for (node = rects.head; node; node = node->next) len++;
-
- putchar('[');
- for (node = rects.head; node; node = node->next)
- {
- rect_print(((rect_node_t *)node)->rect);
- if (node->next)
- {
-putchar(',');
-if (len < 4) putchar(' ');
-else
- {
- putchar('\n');
- putchar(' ');
- }
- }
- }
- putchar(']');
-}
-#endif
-
-static inline void
rect_list_append_node(list_t *rects, list_node_t *node)
{
if (rects->tail)
@@ -166,12 +117,9 @@ rect_list_append_node(list_t *rects, list_node_t *node)
static inline void
rect_list_append(list_t *rects, const rect_t r)
{
- rect_node_t *rect_node;
-
- rect_node = (rect_node_t *)rect_list_node_pool_get();
+ rect_node_t *rect_node = (rect_node_t *)rect_list_node_pool_get();
rect_node->rect = r;
rect_node->_lst = list_node_zeroed;
-
rect_list_append_node(rects, (list_node_t *)rect_node);
}
@@ -179,7 +127,6 @@ static inline void
rect_list_append_xywh(list_t *rects, int x, int y, int w, int h)
{
rect_t r;
-
rect_init(&r, x, y, w, h);
rect_list_append(rects, r);
}
@@ -187,9 +134,7 @@ rect_list_append_xywh(list_t *rects, int x, int y, int w,
int h)
static inline void
rect_list_concat(list_t *rects, list_t *other)
{
- if (!other->head)
- return;
-
+ if (!other->head) return;
if (rects->tail)
{
rects->tail->next = other->head;
@@ -206,9 +151,9 @@ rect_list_concat(list_t *rects, list_t *other)
static inline list_node_t *
rect_list_unlink_next(list_t *rects, list_node_t *parent_node)
{
-list_node_t *node;
-
-if (parent_node)
+ list_node_t *node;
+
+ if
[EGIT] [core/efl] master 01/01: evas - fix deadlock in preload that we seemm to never have hit before...
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=48a3f299b00554fe2be209af492574e3126344eb
commit 48a3f299b00554fe2be209af492574e3126344eb
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 2 16:32:33 2013 +0900
evas - fix deadlock in preload that we seemm to never have hit before...
---
src/lib/evas/common/evas_image_scalecache.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/evas/common/evas_image_scalecache.c
b/src/lib/evas/common/evas_image_scalecache.c
index 4c83ae6..8b08877 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -658,7 +658,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
*/
if ((dst_region_w == 0) || (dst_region_h == 0) ||
(src_region_w == 0) || (src_region_h == 0)) return EINA_FALSE;
- LKL(im->cache.lock);
if ((src_region_w == dst_region_w) && (src_region_h == dst_region_h))
{
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB)
@@ -673,7 +672,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
evas_common_image_colorspace_normalize(im);
//noscales++;
-LKU(im->cache.lock);
if (im->image.data)
{
return cb_sample(im, dst, dc,
@@ -684,6 +682,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
}
return EINA_FALSE;
}
+ LKL(im->cache.lock);
LKL(cache_lock);
sci = _sci_find(im, dc, smooth,
src_region_x, src_region_y, src_region_w, src_region_h,
--
[EGIT] [core/efl] master 01/01: evas - more deadlocks found. fixed.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6a2aafeac36379bb1163bb48d992d035e89366a1
commit 6a2aafeac36379bb1163bb48d992d035e89366a1
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 2 17:06:26 2013 +0900
evas - more deadlocks found. fixed.
---
src/lib/evas/common/evas_image_scalecache.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/common/evas_image_scalecache.c
b/src/lib/evas/common/evas_image_scalecache.c
index 8b08877..490d3c8 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -682,7 +682,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
}
return EINA_FALSE;
}
- LKL(im->cache.lock);
LKL(cache_lock);
sci = _sci_find(im, dc, smooth,
src_region_x, src_region_y, src_region_w, src_region_h,
@@ -702,7 +701,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
evas_common_image_colorspace_normalize(im);
//misses++;
-LKU(im->cache.lock);
if (im->image.data)
{
if (smooth)
@@ -720,6 +718,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
}
return EINA_FALSE;
}
+ LKL(im->cache.lock);
if (sci->populate_me)
{
int size, osize, used;
@@ -781,6 +780,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
ct = evas_common_draw_context_new();
evas_common_draw_context_set_render_op(ct,
_EVAS_RENDER_COPY);
}
+ LKU(im->cache.lock);
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB)
{
#ifdef EVAS_CSERVE2
@@ -790,6 +790,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
#endif
evas_cache_image_load_data(&im->cache_entry);
}
+ LKL(im->cache.lock);
evas_common_image_colorspace_normalize(im);
if (im->image.data)
{
@@ -908,6 +909,7 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
}
else
{
+LKU(im->cache.lock);
if (im->cache_entry.space == EVAS_COLORSPACE_ARGB)
{
#ifdef EVAS_CSERVE2
@@ -919,7 +921,6 @@ evas_common_rgba_image_scalecache_do_cbs(Image_Entry *ie,
RGBA_Image *dst,
}
evas_common_image_colorspace_normalize(im);
//misses++;
-LKU(im->cache.lock);
if (im->image.data)
{
if (smooth)
--
[EGIT] [themes/dark] master 01/01: finally finish off gengrid for dark.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=064acfe754033b939da7e8a384bf93887fcf87c4
commit 064acfe754033b939da7e8a384bf93887fcf87c4
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 2 19:34:56 2013 +0900
finally finish off gengrid for dark.
---
edje/dark.edc| 5 +-
edje/edc/elm/gengrid.edc | 981 +++
edje/edc/elm/genlist.edc | 4 +-
edje/edc/elm/list.edc| 2 +-
edje/edc/elm/spinner.edc | 3 +-
5 files changed, 989 insertions(+), 6 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 1d25516..75921cc 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -1,5 +1,7 @@
#include "macros.edc"
+externals.external: "elm";
+
collections {
#include "colorclasses.edc"
#include "fonts.edc"
@@ -65,8 +67,7 @@ collections {
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
-// XXX: make it same as genlist (gengrid), EXCEPT for grid items use a bevel
out box, not horiz curved bevel. that's it.
-//#include "edc/elm/gengrid.edc"
+#include "edc/elm/gengrid.edc"
#include "edc/elm/hover.edc"
// desktop in general
diff --git a/edje/edc/elm/gengrid.edc b/edje/edc/elm/gengrid.edc
new file mode 100644
index 000..3d75d04
--- /dev/null
+++ b/edje/edc/elm/gengrid.edc
@@ -0,0 +1,981 @@
+group { name: "elm/gengrid/item/group_index/default";
+ inherit: "elm/genlist/item/group_index/default";
+}
+
+group { name: "elm/gengrid/item/default/default";
+ data.item: "selectraise" "on";
+ data.item: "texts" "elm.text";
+ data.item: "contents" "elm.swallow.icon elm.swallow.end";
+#define IMGP() \
+ images.image: "bevel_dark_out.png" COMP; \
+ images.image: "shadow_rounded_horiz.png" COMP; \
+ images.image: "vgrad_med_dark.png" COMP; \
+ images.image: "bevel_out.png" COMP; \
+ images.image: "shine.png" COMP;
+ IMGP()
+ parts {
+//---
+#define BASEP() \
+ part { name: "event"; type: RECT; \
+ description { state: "default" 0.0; \
+color: 0 0 0 0; \
+ } \
+ description { state: "disabled" 0.0; \
+inherit: "default" 0.0; \
+visible: 0; \
+ } \
+ } \
+ part { name: "base"; type: RECT; mouse_events: 0; \
+ description { state: "default" 0.0; \
+color: 64 64 64 255; \
+color_class: "list_item_base"; \
+ } \
+ description { state: "odd" 0.0; \
+color: 56 56 56 255; \
+color_class: "list_item_base_odd"; \
+ } \
+ } \
+ program { \
+ signal: "elm,state,odd"; source: "elm"; \
+ action: STATE_SET "odd" 1.0; \
+ target: "base"; \
+ } \
+ program { \
+ signal: "elm,state,even"; source: "elm"; \
+ action: STATE_SET "default" 0.0; \
+ target: "base"; \
+ } \
+ part { name: "bevel"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+image.normal: "bevel_dark_out.png"; \
+image.border: 2 2 2 2; \
+image.middle: 0; \
+fill.smooth: 0; \
+ } \
+ } \
+ part { name: "sel_shadow"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+image.normal: "shadow_rounded_horiz.png"; \
+image.border: 0 0 9 9; \
+rel1.offset: 0 -4; \
+rel2.offset: -1 5; \
+fill.smooth: 0; \
+visible: 0; \
+ } \
+ description { state: "selected" 0.0; \
+inherit: "default" 0.0; \
+visible: 1; \
+ } \
+ } \
+ part { name: "sel_base"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+image.normal: "vgrad_med_dark.png"; \
+fill.smooth: 0; \
+visible: 0; \
+TILED_HORIZ(120) \
+ } \
+ description { state: "selected" 0.0; \
+inherit: "default" 0.0; \
+visible: 1; \
+ } \
+ } \
+ part { name: "sel_bevel"; mouse_events: 0; \
+ description { state: "default" 0.0; \
+image.normal: "bevel_out.png"; \
+image.border: 2 2 2 2; \
+image.middle: 0; \
+fill.smooth: 0; \
+visible: 0; \
+ } \
+ desc
[EGIT] [core/elementary] master 01/01: genlist - fix homogenouse mode after previous fix to stop realizing all
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d99960707be969d0e6c124bf0807c74acaab3726
commit d99960707be969d0e6c124bf0807c74acaab3726
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 4 15:00:26 2013 +0900
genlist - fix homogenouse mode after previous fix to stop realizing all
---
src/lib/elm_genlist.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index f713dce..bdccdb7 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4491,6 +4491,24 @@ _item_block_recalc(Item_Block *itb,
_item_realize(it, in, EINA_TRUE);
_elm_genlist_item_unrealize(it, EINA_TRUE);
}
+ else
+ {
+if (it->group)
+ {
+ it->item->w = it->item->minw =
+ sd->group_item_width;
+ it->item->h = it->item->minh =
+ sd->group_item_height;
+ }
+else
+ {
+ it->item->w = it->item->minw =
+ sd->item_width;
+ it->item->h = it->item->minh =
+ sd->item_height;
+ }
+it->item->mincalcd = EINA_TRUE;
+ }
}
}
else
@@ -4512,6 +4530,7 @@ _item_block_recalc(Item_Block *itb,
it->item->h = it->item->minh =
sd->item_height;
}
+ it->item->mincalcd = EINA_TRUE;
}
else
{
--
[EGIT] [core/enlightenment] master 01/01: check if class string is valid first, then make sure buffer is 0 terminated
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1c92e22eb2748d1557f5fe4a11f62de58ec2659b
commit 1c92e22eb2748d1557f5fe4a11f62de58ec2659b
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 4 16:48:21 2013 +0900
check if class string is valid first, then make sure buffer is 0 terminated
i got a segv in an strncpy... but the bt missed telling me anything
other than it was in _e_border_eval(). gdb wouldn't help.
Thread 1 (Thread 0xb7859780 (LWP 1377)):
No symbol table info available.
No locals.
No symbol table info available.
No locals.
at /usr/include/i386-linux-gnu/bits/string3.h:121
buf = '\000'
s =
event =
pnd =
rem_change = 1
send_event = 1
since this is the only strncpy, i can only conclude that something is
fishy about the src or dest buffer, and i can only guess that the
strncpy is directly in e_border.c (though it could have come from an
inline func or macro form eina etc.)... but it's the best guess i have.
the strncpy will have problems if bd->client.icccm.class > 4096 in
size. buf will not be nul terminated then:
The strncpy() function is similar, except that at most n bytes of
src
are copied. Warning: If there is no null byte among the first n
bytes
of src, the string placed in dest will not be null-terminated.
as per manpage. so there was a lurking bug with a non 0 terminated
buffer. also added check for bd->client.icccm.class as it could be
null...
---
src/bin/e_border.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 8f3f1a6..8afc399 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -8963,11 +8963,12 @@ _e_border_eval(E_Border *bd)
snprintf(buf, sizeof(buf), "%s.desktop",
bd->client.icccm.class);
bd->desktop = efreet_util_desktop_file_id_find(buf);
}
- if (!bd->desktop)
+ if ((!bd->desktop) && (bd->client.icccm.class))
{
- char buf[4096] = {0}, *s;
+ char buf[4096], *s;
- strncpy(buf, bd->client.icccm.class, sizeof(buf));
+ strncpy(buf, bd->client.icccm.class, sizeof(buf) - 1);
+ buf[sizeof(buf) - 1] = 0;
s = buf;
eina_str_tolower(&s);
if (strcmp(s, bd->client.icccm.class))
--
[EGIT] [themes/dark] master 01/01: popup done. and yes... this breaks popup theme api.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=7c24a05745212e4a7b1f9ed50e9f0d88b1923e27
commit 7c24a05745212e4a7b1f9ed50e9f0d88b1923e27
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 4 22:38:34 2013 +0900
popup done. and yes... this breaks popup theme api.
---
edje/dark.edc | 3 +-
edje/edc/elm/button.edc | 30 +--
edje/edc/elm/gengrid.edc| 3 +
edje/edc/elm/popup.edc | 451
edje/edc/elm/scroller.edc | 2 +
edje/img/rounded_square.png | Bin 0 -> 883 bytes
6 files changed, 472 insertions(+), 17 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 75921cc..59e0d3a 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -61,8 +61,7 @@ collections {
// XXX: needs design work (naviframe)
//#include "edc/elm/naviframe.edc"
#include "edc/elm/panel.edc"
-// XXX: needs design work (popup), but edc needs to also scale up and down but
not be so fat when scale is down/finger size smaller
-//#include "edc/elm/popup.edc"
+#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index cc7a034..cae568f 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -234,7 +234,7 @@ group { name: "elm/button/base/default";
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "elm,action,click" "";
}
- program { name: "button_text_visible";
+ program { name: "button_text_visible";
signal: "elm,state,text,visible"; source: "elm";
script {
new m = get_int(btmode);
@@ -242,7 +242,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_text_hidden";
+ program { name: "button_text_hidden";
signal: "elm,state,text,hidden"; source: "elm";
script {
new m = get_int(btmode);
@@ -250,7 +250,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_icon_visible";
+ program { name: "button_icon_visible";
signal: "elm,state,icon,visible"; source: "elm";
script {
new m = get_int(btmode);
@@ -258,7 +258,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_icon_hidden";
+ program { name: "button_icon_hidden";
signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
script {
@@ -267,7 +267,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_state_disabled";
+ program { name: "button_state_disabled";
signal: "elm,state,disabled"; source: "elm";
script {
new m = get_int(btmode);
@@ -275,7 +275,7 @@ group { name: "elm/button/base/default";
eval_mode(m);
}
}
- program { name: "button_state_enabled";
+ program { name: "button_state_enabled";
signal: "elm,state,enabled"; source: "elm";
script {
new m = get_int(btmode);
@@ -550,7 +550,7 @@ group { name: "elm/button/base/anchor";
action: SIGNAL_EMIT "elm,action,press" "";
after: "button_click_anim";
}
- program { name: "button_click_anim";
+ program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
target: "base";
target: "bar2";
@@ -561,7 +561,7 @@ group { name: "elm/button/base/anchor";
action: SIGNAL_EMIT "elm,action,unpress" "";
after: "button_unclick_anim";
}
- program { name: "button_unclick_anim";
+ program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
target: "base";
target: "bar2";
@@ -575,7 +575,7 @@ group { name: "elm/button/base/anchor";
target: "text2";
after: "button_unpressed_anim";
}
- program { name: "button_unpressed_anim";
+ program { name: "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
[EGIT] [core/elementary] master 01/01: popup - this BREAKS THEME API. i know. it is needed:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=7b7c2275c9b1eaa6b58b2bc253000d436526978a
commit 7b7c2275c9b1eaa6b58b2bc253000d436526978a
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 4 22:39:30 2013 +0900
popup - this BREAKS THEME API. i know. it is needed:
namespacing wrong for popup theme elements. you cant sensibly have the
transparent popup test work without namespacing the style with an
extra popup/stylename. since its breaking also naming of swallows for
actionbtns wasnty namespaced. WRONG!
so yes - i know this breaks theme api. live with it. its needed. like
with elm_player.
---
src/lib/elc_popup.c | 79 +
1 file changed, 43 insertions(+), 36 deletions(-)
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index dfc586f..cf03a2f 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -315,7 +315,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
Elm_Popup_Item *it;
unsigned int i = 0;
Eina_List *elist;
- char buf[128];
+ char buf[1024], style[1024];
Eina_Bool int_ret;
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
@@ -331,34 +331,29 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
//FIXME: theme set seems corrupted.
//if (elm_widget_parent_get(sd->notify) != obj)
- elm_widget_style_set(sd->notify, elm_widget_style_get(obj));
+ snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
+ elm_widget_style_set(sd->notify, style);
if (sd->action_area)
{
-snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
-if (!elm_layout_theme_set(sd->action_area, "popup", buf,
- elm_widget_style_get(obj)))
+snprintf(buf, sizeof(buf), "buttons%i", sd->button_count);
+if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
CRITICAL("Failed to set layout!");
for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
{
if (!sd->buttons[i]) continue;
- elm_object_style_set(sd->buttons[i]->btn, buf);
+ elm_object_style_set(sd->buttons[i]->btn, style);
}
}
- if (!elm_layout_theme_set(sd->content_area, "popup", "content",
- elm_widget_style_get(obj)))
+ if (!elm_layout_theme_set(sd->content_area, "popup", "content", style))
CRITICAL("Failed to set layout!");
if (sd->text_content_obj)
- {
-snprintf(buf, sizeof(buf), "popup/%s", elm_widget_style_get(obj));
-elm_object_style_set(sd->text_content_obj, buf);
- }
+ elm_object_style_set(sd->text_content_obj, style);
else if (sd->items)
{
EINA_LIST_FOREACH(sd->items, elist, it)
{
- if (!elm_layout_theme_set
- (VIEW(it), "popup", "item", elm_widget_style_get(obj)))
+ if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
CRITICAL("Failed to set layout!");
else
{
@@ -572,9 +567,9 @@ _button_remove(Evas_Object *obj,
{
sd->buttons[i] = sd->buttons[i + 1];
- snprintf(buf, sizeof(buf), "actionbtn%d", pos + 1);
+ snprintf(buf, sizeof(buf), "elm.swallow.content.button%i", pos +
1);
elm_object_part_content_unset(sd->action_area, buf);
- snprintf(buf, sizeof(buf), "actionbtn%d", pos);
+ snprintf(buf, sizeof(buf), "elm.swallow.content.button%i", pos);
elm_object_part_content_set
(sd->action_area, buf, sd->buttons[i]->btn);
}
@@ -591,9 +586,11 @@ _button_remove(Evas_Object *obj,
}
else
{
-snprintf(buf, sizeof(buf), "buttons%u", sd->button_count);
-if (!elm_layout_theme_set
-(sd->action_area, "popup", buf, elm_widget_style_get(obj)))
+char style[1024];
+
+snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
+snprintf(buf, sizeof(buf), "buttons%i", sd->button_count);
+if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
CRITICAL("Failed to set layout!");
}
}
@@ -621,6 +618,8 @@ _restack_cb(void *data __UNUSED__,
static void
_list_add(Evas_Object *obj)
{
+ char style[1024];
+
ELM_POPUP_DATA_GET(obj, sd);
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
@@ -637,7 +636,9 @@ _list_add(Evas_Object *obj)
elm_table_pack(sd->tbl, sd->spacer,
[EGIT] [core/efl] master 01/01: configure - wayland macro required for any kind of autogen.sh... not good.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7b512356b39f26becde195b9d850c880f8643ea6
commit 7b512356b39f26becde195b9d850c880f8643ea6
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 5 18:30:23 2013 +0900
configure - wayland macro required for any kind of autogen.sh... not good.
---
configure.ac | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 21a4d94..f616e0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,7 +1007,14 @@ AC_ARG_ENABLE([wayland],
if test "${want_wayland}" = "yes"; then
EFL_PKG_CHECK_STRICT([wayland-client])
- WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
+dnl This is a problem. unless you somehow have this macro defined
+dnl magically... you cant do dev on efl. configure is totally broken.
+dnl you end up with something like:
+dnl
+dnl ./configure: line 25508: syntax error near unexpected token
`'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
+dnl ./configure: line 25508:
`WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
+
+dnl
WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
fi
# Fb
--
[EGIT] [core/elementary] master 01/01: write down the breaks.
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=45e66737b9efe689b5b7b7d47d5612e3549e4d04 commit 45e66737b9efe689b5b7b7d47d5612e3549e4d04 Author: Carsten Haitzler (Rasterman) Date: Sat Oct 5 19:06:05 2013 +0900 write down the breaks. --- ChangeLog | 9 + NEWS | 2 ++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8a070fc..a9ab155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1666,8 +1666,17 @@ It makes fileselector navigate folder using double tap instead of single tap. 2013-10-02 Ryuan Choi (ryuan) + * fileselector: Add "activated" smart callback. It can be used to execute a file activated by double-clicking or pressing Enter key. 2013-10-03 ChunEon Park (Hermet) + * Focus: update the focus highlight style when theme is changed. + +2013-10-04 Carsten Haitzler (The Rasterman) + +* Break popup theme - it was poorly namespaced, unable to +handle styles at all (so styles were broken with the given +namespace). + diff --git a/NEWS b/NEWS index 6355743..e40f674 100644 --- a/NEWS +++ b/NEWS @@ -294,6 +294,8 @@ Fixes: * Fix fileselector only send "selected" signal without selection when file path is typed on the path entry. * Fix spinner arrow key focus movement bug. * Fix the layout to swallow the contents again when theme is changed. + * elm_player breaks theme due to poor namespacing + * elm_popup breaks theme due to poor namespacing Removals: --
[EGIT] [themes/dark] master 02/02: enable naviframe include.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=22e901780d93d7b60e02edc2e5cf710f848ea226
commit 22e901780d93d7b60e02edc2e5cf710f848ea226
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 5 21:32:29 2013 +0900
enable naviframe include.
---
edje/dark.edc | 2 +-
edje/edc/elm/actionslider.edc | 6 +++---
edje/edc/elm/button.edc | 24 ++---
edje/edc/elm/calendar.edc | 8 +++
edje/edc/elm/check.edc| 4 ++--
edje/edc/elm/clock.edc| 16 +++---
edje/edc/elm/ctxpopup.edc | 4 ++--
edje/edc/elm/dayselector.edc | 44 +-
edje/edc/elm/diskselector.edc | 49 +++
edje/edc/elm/flipselector.edc | 35 ---
edje/edc/elm/focus.edc| 4 ++--
edje/edc/elm/genlist.edc | 8 +++
edje/edc/elm/hover.edc| 12 +--
edje/edc/elm/layout.edc | 6 +++---
edje/edc/elm/menu.edc | 16 +++---
edje/edc/elm/panel.edc| 2 +-
edje/edc/elm/radio.edc| 2 +-
edje/edc/elm/slider.edc | 32 ++--
edje/edc/elm/slideshow.edc| 32 ++--
edje/edc/elm/spinner.edc | 12 +--
20 files changed, 140 insertions(+), 178 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 59e0d3a..89c5d90 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -59,7 +59,7 @@ collections {
// XXX: support multi progress (progressbar)
#include "edc/elm/progress.edc"
// XXX: needs design work (naviframe)
-//#include "edc/elm/naviframe.edc"
+#include "edc/elm/naviframe.edc"
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
diff --git a/edje/edc/elm/actionslider.edc b/edje/edc/elm/actionslider.edc
index e444e20..eb4f4bc 100644
--- a/edje/edc/elm/actionslider.edc
+++ b/edje/edc/elm/actionslider.edc
@@ -207,7 +207,7 @@ group { name: "elm/actionslider/base/default";
programs {
program {
signal: "mouse,up,1"; source: "elm.drag_button";
- action: SIGNAL_EMIT "elm.drag_button,mouse,up" "";
+ action: SIGNAL_EMIT "elm.drag_button,mouse,up" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
@@ -217,7 +217,7 @@ group { name: "elm/actionslider/base/default";
}
program {
signal: "mouse,down,1*"; source: "elm.drag_button";
- action: SIGNAL_EMIT "elm.drag_button,mouse,down" "";
+ action: SIGNAL_EMIT "elm.drag_button,mouse,down" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
@@ -227,7 +227,7 @@ group { name: "elm/actionslider/base/default";
}
program {
signal: "mouse,move"; source: "elm.drag_button_base";
- action: SIGNAL_EMIT "elm.drag_button,mouse,move" "";
+ action: SIGNAL_EMIT "elm.drag_button,mouse,move" "elm";
}
program {
signal: "elm,state,disabled"; source: "elm";
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index cae568f..49dff06 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -203,7 +203,7 @@ group { name: "elm/button/base/default";
programs {
program {
signal: "mouse,down,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,press" "";
+ action: SIGNAL_EMIT "elm,action,press" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
@@ -212,7 +212,7 @@ group { name: "elm/button/base/default";
}
program { name: "button_unclick";
signal: "mouse,up,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,unpress" "";
+ action: SIGNAL_EMIT "elm,action,unpress" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
@@ -232,7 +232,7 @@ group { name: "elm/button/base/default";
}
program {
signal: "mouse,clicked,1"; source: "event";
- action: SIGNAL_EMIT "elm,action,click" "";
+ action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { name: "button_text_visible";
signal: "elm,state,text,visible"; source: "elm";
@@ -547,7 +547,7 @@ group { name: "e
[EGIT] [themes/dark] master 01/02: add naviframe .. start on it. not finished.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=483bb395dfa2de3978e3e3b59aadcd115da45c06
commit 483bb395dfa2de3978e3e3b59aadcd115da45c06
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 5 21:32:02 2013 +0900
add naviframe .. start on it. not finished.
---
edje/edc/elm/naviframe.edc | 1033
1 file changed, 1033 insertions(+)
diff --git a/edje/edc/elm/naviframe.edc b/edje/edc/elm/naviframe.edc
new file mode 100644
index 000..7ee276f
--- /dev/null
+++ b/edje/edc/elm/naviframe.edc
@@ -0,0 +1,1033 @@
+#if 0
+group { name: "elm/naviframe/item/basic/default";
+ parts {
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "access.title"; type: RECT; repeat_events: 1;
+ description { state: "default" 0.0;
+fixed: 1 1;
+color: 0 0 0 0;
+ }
+ }
+ part { name: "elm.swallow.prev_btn"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+ description { state: "hidden" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+ }
+ part { name: "elm.swallow.next_btn"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+ description { state: "hidden" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+ }
+ part { name: "elm.swallow.icon"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "elm.text.title"; type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+ }
+ }
+ part { name: "elm.text.subtitle"; type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: "elm,state,visible"; source: "elm";
+ }
+ program {
+ signal: "elm,state,title,show"; source: "elm";
+ }
+ program {
+ signal: "elm,state,title,hide"; source: "elm";
+ }
+ program {
+ signal: "elm,state,title_label,show"; source: "elm";
+ }
+ program {
+ signal: "elm,state,title_label,hide"; source: "elm";
+ }
+ program {
+ signal: "elm,state,prev_btn,show"; source: "elm";
+ }
+ program {
+ signal: "elm,state,prev_btn,hide"; source: "elm";
+ }
+ program {
+ signal: "elm,state,next_btn,show"; source: "elm";
+ }
+ program {
+ signal: "elm,state,next_btn,hide"; source: "elm";
+ }
+
+// action: SIGNAL_EMIT "elm,action,title,clicked" "elm";
+
+ /* current page is being pushed: [previous]<[current] */
+ program {
+ signal: "elm,state,cur,pushed"; source: "elm";
+ after: "pushed2";
+ }
+ program { name: "pushed2";
+ action: SIGNAL_EMIT "elm,action,pushed,finished" "elm";
+ }
+
+ /* current page is being popped: [current]>[next] */
+ program {
+ signal: "elm,state,cur,popped"; source: "elm";
+ after: "popped2";
+ }
+ program { name: "popped2";
+ action: SIGNAL_EMIT "elm,action,popped,finished" "elm";
+ }
+
+ /* new page is being pushed: [current]<[next] */
+ program {
+ signal: "elm,state,new,pushed"; source: "elm";
+ after: "pushed3";
+ }
+ program { name: "pushed3";
+ action: SIGNAL_EMIT "elm,action,show,finished" "elm";
+ }
+
+ /* previous page is being pushed: [previous]>[current] */
+ program {
+ signal: "elm,state,prev,popped"; source: "elm";
+ after: "popped3";
+ }
+ program { name: "popped3";
+ action: SIGNAL_EMIT "elm,action,show,finished" "elm";
+ }
+ }
+}
+
+group { name: "elm/naviframe/item/overlap/default";
+ alias: "elm/naviframe/item/overlap/pager";
+}
+#endif
+
+#if 0
+group { name: "elm/naviframe/item/basic/default";
+ alias: "elm/naviframe/item/basic/pager"; /**< this was remained for the
backward compatibility */
+
+ images {
+ image: "naviframe-base.jpg" COMP;
+ }
+
+ script {
+ public notitle = 0;
+ public nopre
[EGIT] [core/elementary] master 01/01: fix up namespace for many signal while keeping old versions for compat
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f9adb79740555c8e39e9d32ff2a755693dbea8dc
commit f9adb79740555c8e39e9d32ff2a755693dbea8dc
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 5 21:35:27 2013 +0900
fix up namespace for many signal while keeping old versions for compat
---
src/lib/elc_ctxpopup.c | 4 ++--
src/lib/elc_naviframe.c| 8
src/lib/elm_actionslider.c | 6 +++---
src/lib/elm_button.c | 6 +++---
src/lib/elm_check.c| 6 +++---
src/lib/elm_clock.c| 16
src/lib/elm_dayselector.c | 19 ++-
src/lib/elm_diskselector.c | 2 +-
src/lib/elm_genlist.c | 27 ---
src/lib/elm_hover.c| 5 +++--
src/lib/elm_menu.c | 10 +-
src/lib/elm_radio.c| 2 +-
src/lib/elm_slider.c | 16 +++-
src/lib/elm_slideshow.c| 31 ++-
src/lib/elm_thumb.c| 6 +++---
src/lib/elm_win.c | 4 ++--
16 files changed, 101 insertions(+), 67 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index e4a675b..32ad8a4 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1137,13 +1137,13 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
CRITICAL("Failed to set layout!");
elm_layout_signal_callback_add
- (obj, "elm,action,hide,finished", "", _hide_finished_cb, obj);
+ (obj, "elm,action,hide,finished", "*", _hide_finished_cb, obj);
//Background
priv->bg = edje_object_add(evas_object_evas_get(obj));
elm_widget_theme_object_set(obj, priv->bg, "ctxpopup", "bg", "default");
edje_object_signal_callback_add
- (priv->bg, "elm,action,click", "", _bg_clicked_cb, obj);
+ (priv->bg, "elm,action,click", "*", _bg_clicked_cb, obj);
evas_object_stack_below(priv->bg, obj);
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index e6509f4..4f35439 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1183,13 +1183,13 @@ _item_new(Evas_Object *obj,
_on_item_size_hints_changed, obj);
elm_object_signal_callback_add
- (VIEW(it), "elm,action,show,finished", "", _on_item_show_finished, it);
+ (VIEW(it), "elm,action,show,finished", "*", _on_item_show_finished, it);
elm_object_signal_callback_add
- (VIEW(it), "elm,action,pushed,finished", "", _on_item_push_finished, it);
+ (VIEW(it), "elm,action,pushed,finished", "*", _on_item_push_finished, it);
elm_object_signal_callback_add
- (VIEW(it), "elm,action,popped,finished", "", _on_item_pop_finished, it);
+ (VIEW(it), "elm,action,popped,finished", "*", _on_item_pop_finished, it);
elm_object_signal_callback_add
- (VIEW(it), "elm,action,title,clicked", "", _on_item_title_clicked, it);
+ (VIEW(it), "elm,action,title,clicked", "*", _on_item_title_clicked, it);
_item_style_set(it, item_style);
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index c2eb002..4459764 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -407,13 +407,13 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
evas_object_color_set(priv->drag_button_base, 0, 0, 0, 0);
edje_object_signal_callback_add
- (wd->resize_obj, "elm.drag_button,mouse,up", "",
+ (wd->resize_obj, "elm.drag_button,mouse,up", "*",
_drag_button_up_cb, obj);
edje_object_signal_callback_add
- (wd->resize_obj, "elm.drag_button,mouse,down", "",
+ (wd->resize_obj, "elm.drag_button,mouse,down", "*",
_drag_button_down_cb, obj);
edje_object_signal_callback_add
- (wd->resize_obj, "elm.drag_button,mouse,move", "",
+ (wd->resize_obj, "elm.drag_button,mouse,move", "*",
_drag_button_move_cb, obj);
if (!elm_layout_theme_set
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 758d253..ddbe165 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -292,13 +292,13 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED,
va_list *list EINA_UNUSED)
elm_widget_sub_object_parent_add(obj);
edje_object_signal_callback_add
- (wd->resize_obj, "elm,action,click", "",
+ (wd->resize_obj, "elm,action,click", "*",
_on_clicked_signal, obj);
edje_object_signal_callback_add
- (wd->resize_obj, "elm,action,press", "",
+ (wd->resize_obj, "elm,ac
[EGIT] [apps/terminology] master 01/01: theme - sync stripe imagery with dark in e17/elm theme and remove the pulse
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=0f615122e585edf872d189d5ab7f09297d8748b7
commit 0f615122e585edf872d189d5ab7f09297d8748b7
Author: Carsten Haitzler (Rasterman)
Date: Sun Oct 6 20:42:37 2013 +0900
theme - sync stripe imagery with dark in e17/elm theme and remove the pulse
---
data/themes/default.edc | 201 +--
data/themes/images/sl_stripe.png | Bin 322 -> 1024 bytes
2 files changed, 4 insertions(+), 197 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index eb5c030..5900d67 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1394,10 +1394,8 @@ collections {
// bottomfull:
// |##|
// |##|
-#define PATCOL 51 153 255 128
-#define PATCOL2 51 153 255 144
+#define PATCOL 255 255 255 25
#define OUTCOL 51 153 255 128
-#define OUTCOL2 51 153 255 255
group { name: "terminology/selection";
images {
@@ -1419,11 +1417,7 @@ collections {
color: PATCOL;
image.normal: "sl_stripe.png";
fill.size.relative: 0.0 0.0;
- fill.size.offset: 40 40;
-}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: PATCOL2;
+ fill.size.offset: 240 240;
}
}
part { name: "background_middle";
@@ -1433,11 +1427,7 @@ collections {
color: PATCOL;
image.normal: "sl_stripe.png";
fill.size.relative: 0.0 0.0;
- fill.size.offset: 40 40;
-}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: PATCOL2;
+ fill.size.offset: 240 240;
}
}
part { name: "background_bottom";
@@ -1447,11 +1437,7 @@ collections {
color: PATCOL;
image.normal: "sl_stripe.png";
fill.size.relative: 0.0 0.0;
- fill.size.offset: 40 40;
-}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: PATCOL2;
+ fill.size.offset: 240 240;
}
}
@@ -1564,10 +1550,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
image.border: 0 0 4 4;
fill.smooth: 0;
}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: OUTCOL2;
-}
}
part { name: "0.right";
mouse_events: 0;
@@ -1588,10 +1570,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
image.border: 0 0 4 4;
fill.smooth: 0;
}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: OUTCOL2;
-}
}
part { name: "0.top";
mouse_events: 0;
@@ -1611,10 +1589,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
image.normal: "sl_htop.png";
fill.smooth: 0;
}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: OUTCOL2;
-}
}
part { name: "0.bottom";
mouse_events: 0;
@@ -1634,10 +1608,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
image.normal: "sl_hbottom.png";
fill.smooth: 0;
}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: OUTCOL2;
-}
}
program { name: "oneline";
signal: "mode,oneline";
@@ -1668,10 +1638,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
image.border: 0 0 4 4;
fill.smooth: 0;
}
-description { state: "pulse" 0.0;
- inherit: "default" 0.0;
- color: OUTCOL2;
-}
}
part { name: "1.right";
mouse_events: 0;
@@ -1692,10 +1658,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3
[EGIT] [apps/terminology] master 01/01: theme selector - massively improve theme preview to actually preview
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=b0cca8b0dfac1776f0b226b4d3958c075a7365b9
commit b0cca8b0dfac1776f0b226b4d3958c075a7365b9
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 9 22:51:15 2013 +0900
theme selector - massively improve theme preview to actually preview
---
src/bin/Makefile.am | 1 +
src/bin/options_theme.c | 21 +++--
src/bin/options_themepv.c | 226 ++
src/bin/options_themepv.h | 1 +
4 files changed, 240 insertions(+), 9 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b18e440..5516b82 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -25,6 +25,7 @@ options_font.c options_font.h \
options_helpers.c options_helpers.h \
options_video.c options_video.h \
options_theme.c options_theme.h \
+options_themepv.c options_themepv.h \
options_wallpaper.c options_wallpaper.h \
sel.c sel.h \
termio.c termio.h \
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index 8903d2b..81239df 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -5,6 +5,7 @@
#include "termio.h"
#include "options.h"
#include "options_theme.h"
+#include "options_themepv.h"
#include "utils.h"
#include "main.h"
@@ -37,19 +38,21 @@ static Evas_Object *
_cb_op_theme_content_get(void *data, Evas_Object *obj, const char *part)
{
Theme *t = data;
- char buf[4096];
if (!strcmp(part, "elm.swallow.icon"))
{
Evas_Object *o;
- snprintf(buf, sizeof(buf), "%s/themes/%s", elm_app_data_dir_get(),
t->name);
-o = edje_object_add(evas_object_evas_get(obj));
- if (!edje_object_file_set(o, buf, "terminology/background"))
- return NULL;
-
-evas_object_size_hint_min_set(o,
- 96 * elm_config_scale_get(),
- 40 * elm_config_scale_get());
+char buf[4096];
+Config *config = termio_config_get(t->term);
+
+if (config)
+ {
+ snprintf(buf, sizeof(buf), "%s/themes/%s",
+ elm_app_data_dir_get(), t->name);
+ o = options_theme_preview_add(obj, config, buf,
+ 128 * elm_config_scale_get(),
+ 64 * elm_config_scale_get());
+ }
return o;
}
diff --git a/src/bin/options_themepv.c b/src/bin/options_themepv.c
new file mode 100644
index 000..d5e7c8a
--- /dev/null
+++ b/src/bin/options_themepv.c
@@ -0,0 +1,226 @@
+#include "private.h"
+
+#include
+#include "config.h"
+#include "termio.h"
+#include "termpty.h"
+#include "options.h"
+#include "options_themepv.h"
+#include "utils.h"
+#include "main.h"
+#include "col.h"
+
+static void
+_row_set(Evas_Object *o, int y, const char *txt)
+{
+ Evas_Textgrid_Cell *tc;
+ int x, tw, th;
+ const char *s;
+ int fg, bg;
+
+ evas_object_textgrid_size_get(o, &tw, &th);
+ if (y >= th) return;
+ tc = evas_object_textgrid_cellrow_get(o, y);
+ if (!tc) return;
+ fg = COL_DEF;
+ bg = COL_INVIS;
+ for (s = txt, x = 0; x < tw; x++)
+ {
+unsigned int codepoint = ' ';
+
+if ((s) && (*s == 0))
+ {
+ s = NULL;
+ codepoint = ' ';
+ }
+else if (s)
+ {
+ while ((*s <= 0x02) && (*s != 0))
+ {
+ if (*s == 0x01)
+{
+ s++;
+ if (((*s) >= 0x01) && (*s <= 0x0a)) fg = (*s -
0x01);
+ else if (((*s) >= 0x11) && (*s <= 0x1a)) fg = 12 + (*s
- 0x11);
+}
+ else if (*s == 0x02)
+{
+ s++;
+ if (((*s) >= 0x01) && (*s <= 0x0a)) bg = (*s -
0x01);
+ else if (((*s) >= 0x11) && (*s <= 0x1a)) bg = 12 + (*s
- 0x11);
+}
+ s++;
+ }
+ if (*s != 0) codepoint = *s;
+ else s = NULL;
+ }
+
+tc[x].fg_extended = 0;
+tc[x].bg_extended = 0;
+tc[x].underline = 0;
+tc[x].strikethrough = 0;
+#if defined(SUPPORT_DBLWIDTH)
+tc[x].double_width = 0;
+#endif
+tc[x].fg_extended = 0;
+tc[x].bg_extended = 0;
+
+tc[x].fg = fg;
+tc[x].bg = bg;
+tc[x].codepoint = codepoint;
+if (s) s++;
+ }
+ evas_object_textgrid_cellrow_set(o, y, tc);
+ evas_object_textgrid_update_add(o, 0, y, tw, 1);
[EGIT] [apps/terminology] master 01/01: theme options - make sure current theme is hilighted.
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=240365b3eabc540784545bbf51be5bc4ebe55cad
commit 240365b3eabc540784545bbf51be5bc4ebe55cad
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 10 00:28:18 2013 +0900
theme options - make sure current theme is hilighted.
---
src/bin/options_theme.c | 32 +---
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index 81239df..eb077af 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -87,6 +87,7 @@ options_theme(Evas_Object *opbox, Evas_Object *term)
Eina_List *files;
char buf[4096], *file;
Theme *t;
+ Config *config = termio_config_get(term);
options_theme_clear();
@@ -123,13 +124,30 @@ options_theme(Evas_Object *opbox, Evas_Object *term)
EINA_LIST_FREE(files, file)
{
-t = calloc(1, sizeof(Theme));
-t->name = eina_stringshare_add(file);
-t->term = term;
-t->item = elm_genlist_item_append(o, it_class, t, NULL,
- ELM_GENLIST_ITEM_NONE,
- _cb_op_theme_sel, t);
-themes = eina_list_append(themes, t);
+const char *ext = strchr(file, '.');
+
+if ((config) && (!file[0] != '.') &&
+((ext) && (!strcasecmp(".edj", ext
+ {
+ t = calloc(1, sizeof(Theme));
+ t->name = eina_stringshare_add(file);
+ t->term = term;
+ t->item = elm_genlist_item_append(o, it_class, t, NULL,
+ ELM_GENLIST_ITEM_NONE,
+ _cb_op_theme_sel, t);
+ if (t->item)
+ {
+ themes = eina_list_append(themes, t);
+ if ((config->theme) &&
+ (!strcmp(config->theme, t->name)))
+elm_genlist_item_selected_set(t->item, EINA_TRUE);
+ }
+ else
+ {
+ eina_stringshare_del(t->name);
+ free(t);
+ }
+ }
free(file);
}
--
[EGIT] [core/efl] master 02/06: configure - wayland macro required for any kind of autogen.sh... not good.
antognolli pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=82e1fef6ed43dd511af3a502a0ba8f0207202987
commit 82e1fef6ed43dd511af3a502a0ba8f0207202987
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 5 18:30:23 2013 +0900
configure - wayland macro required for any kind of autogen.sh... not good.
---
configure.ac | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 44b14c1..d720310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,7 +1007,14 @@ AC_ARG_ENABLE([wayland],
if test "${want_wayland}" = "yes"; then
EFL_PKG_CHECK_STRICT([wayland-client])
- WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
+dnl This is a problem. unless you somehow have this macro defined
+dnl magically... you cant do dev on efl. configure is totally broken.
+dnl you end up with something like:
+dnl
+dnl ./configure: line 25508: syntax error near unexpected token
`'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
+dnl ./configure: line 25508:
`WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
+
+dnl
WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
fi
# Fb
--
[EGIT] [core/efl] master 01/01: ecore-con - followup commit to curl dynamic load - support win and osx names
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8ed6324a31a3f07cee3c604ccf410d9a4d7048df
commit 8ed6324a31a3f07cee3c604ccf410d9a4d7048df
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 11 08:13:35 2013 +0900
ecore-con - followup commit to curl dynamic load - support win and osx names
---
src/lib/ecore_con/ecore_con_url.c | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_con/ecore_con_url.c
b/src/lib/ecore_con/ecore_con_url.c
index 959ca94..4e4c19d 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -247,9 +247,26 @@ _c_init(void)
if (_c_fail) return EINA_FALSE;
_c = calloc(1, sizeof(Ecore_Con_Curl));
if (!_c) goto error;
- _c->mod = eina_module_new("libcurl.so.4");
+
+#define LOAD(x) \
+ if (!_c->mod) { \
+ if ((_c->mod = eina_module_new(x))) { \
+ if (!eina_module_load(_c->mod)) { \
+eina_module_free(_c->mod); \
+_c->mod = NULL; \
+ } \
+ } \
+ }
+#if defined(_WIN32) || defined(__CYGWIN__)
+ LOAD("libcurl.dll"); // try 1
+ LOAD("curllib.dll"); // if fail try 2
+#elif defined(__APPLE__) && defined(__MACH__)
+ LOAD("libcurl.4.dylib"); // try 1
+ LOAD("libcurl.so.4"); // if fail try 2
+#else
+ LOAD("libcurl.so.4"); // try only
+#endif
if (!_c->mod) goto error;
- if (!eina_module_load(_c->mod)) goto error;
#define SYM(x) if (!(_c->x = eina_module_symbol_get(_c->mod, #x))) goto error
SYM(curl_global_init);
--
[EGIT] [themes/dark] master 01/01: add bug note in theme edc
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=a7a444680bdc6b8750cd089097ee4ca1ae7aeae0
commit a7a444680bdc6b8750cd089097ee4ca1ae7aeae0
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 11 18:21:02 2013 +0900
add bug note in theme edc
---
edje/dark.edc | 1 +
edje/edc/elm/button.edc| 2 ++
edje/edc/elm/naviframe.edc | 45 +
3 files changed, 48 insertions(+)
diff --git a/edje/dark.edc b/edje/dark.edc
index 89c5d90..480acb2 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -63,6 +63,7 @@ collections {
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
+// XXX: min size calc problems - too wide!
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index 49dff06..71d91a4 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -1,4 +1,6 @@
group { name: "elm/button/base/default";
+ alias: "elm/button/base/naviframe/back_btn/default";
+ alias: "elm/button/base/naviframe/back_btn/pager";
images.image: "button_normal.png" COMP;
images.image: "button_clicked.png" COMP;
#define ICON 1
diff --git a/edje/edc/elm/naviframe.edc b/edje/edc/elm/naviframe.edc
index 7ee276f..0ce957e 100644
--- a/edje/edc/elm/naviframe.edc
+++ b/edje/edc/elm/naviframe.edc
@@ -113,9 +113,54 @@ group { name: "elm/naviframe/item/basic/default";
group { name: "elm/naviframe/item/overlap/default";
alias: "elm/naviframe/item/overlap/pager";
+// same as elm/naviframe/item/basic/default content
}
#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#if 0
group { name: "elm/naviframe/item/basic/default";
alias: "elm/naviframe/item/basic/pager"; /**< this was remained for the
backward compatibility */
--
[EGIT] [apps/terminology] master 01/01: warning--
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=8eba17574229d6a0229ef7f65ee622650f24ed6b
commit 8eba17574229d6a0229ef7f65ee622650f24ed6b
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 12 14:18:08 2013 +0900
warning--
---
src/bin/options_theme.c | 2 +-
src/bin/options_themepv.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index eb077af..84e06e9 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -52,8 +52,8 @@ _cb_op_theme_content_get(void *data, Evas_Object *obj, const
char *part)
o = options_theme_preview_add(obj, config, buf,
128 * elm_config_scale_get(),
64 * elm_config_scale_get());
+ return o;
}
-return o;
}
return NULL;
diff --git a/src/bin/options_themepv.c b/src/bin/options_themepv.c
index d5e7c8a..49daa8a 100644
--- a/src/bin/options_themepv.c
+++ b/src/bin/options_themepv.c
@@ -97,7 +97,6 @@ options_theme_preview_add(Evas_Object *parent, Config
*config, const char *file,
{
Evas_Object *o, *oo, *obase, *oe, *obg;
Evas *evas;
- int tw, th;
Evas_Coord ww, hh, y;
obase = elm_grid_add(parent);
--
[EGIT] [apps/terminology] master 01/01: make theme auto-reload emit signals to configure stuff properly!
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=cc0f075b2742b767c63a29fb34d7137288953976
commit cc0f075b2742b767c63a29fb34d7137288953976
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 12 14:31:03 2013 +0900
make theme auto-reload emit signals to configure stuff properly!
---
src/bin/main.c | 63 ++---
src/bin/utils.c | 7 +++
2 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index b8260e9..41a1b2f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1998,32 +1998,8 @@ main_term_free(Term *term)
}
static void
-main_term_bg_redo(Term *term)
+main_term_bg_config(Term *term)
{
- Evas_Object *o;
-
- if (term->tabcount_spacer)
- {
-evas_object_del(term->tabcount_spacer);
-term->tabcount_spacer = NULL;
- }
- evas_object_del(term->base);
- evas_object_del(term->bg);
-
- term->base = o = edje_object_add(evas_object_evas_get(term->wn->win));
- theme_apply(o, term->config, "terminology/core");
-
- theme_auto_reload_enable(o);
- evas_object_show(o);
-
- term->bg = o = edje_object_add(evas_object_evas_get(term->wn->win));
- evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
- theme_apply(o, term->config, "terminology/background");
-
- theme_auto_reload_enable(o);
- evas_object_show(o);
-
if (term->config->translucent)
{
edje_object_signal_emit(term->bg, "translucent,on", "terminology");
@@ -2089,6 +2065,39 @@ main_term_bg_redo(Term *term)
}
}
+static void
+main_term_bg_redo(Term *term)
+{
+ Evas_Object *o;
+
+ if (term->tabcount_spacer)
+ {
+evas_object_del(term->tabcount_spacer);
+term->tabcount_spacer = NULL;
+ }
+ evas_object_del(term->base);
+ evas_object_del(term->bg);
+
+ term->base = o = edje_object_add(evas_object_evas_get(term->wn->win));
+ theme_apply(o, term->config, "terminology/core");
+
+ theme_auto_reload_enable(o);
+ evas_object_data_set(o, "theme_reload_func", main_term_bg_config);
+ evas_object_data_set(o, "theme_reload_func_data", term);
+ evas_object_show(o);
+
+ term->bg = o = edje_object_add(evas_object_evas_get(term->wn->win));
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ theme_apply(o, term->config, "terminology/background");
+
+ theme_auto_reload_enable(o);
+ evas_object_data_set(o, "theme_reload_func", main_term_bg_config);
+ evas_object_data_set(o, "theme_reload_func_data", term);
+ evas_object_show(o);
+ main_term_bg_config(term);
+}
+
static Term *
main_term_new(Win *wn, Config *config, const char *cmd,
Eina_Bool login_shell, const char *cd,
@@ -2112,6 +2121,8 @@ main_term_new(Win *wn, Config *config, const char *cmd,
theme_apply(o, term->config, "terminology/core");
theme_auto_reload_enable(o);
+ evas_object_data_set(o, "theme_reload_func", main_term_bg_config);
+ evas_object_data_set(o, "theme_reload_func_data", term);
evas_object_show(o);
term->bg = o = edje_object_add(evas_object_evas_get(wn->win));
@@ -2126,6 +2137,8 @@ main_term_new(Win *wn, Config *config, const char *cmd,
}
theme_auto_reload_enable(o);
+ evas_object_data_set(o, "theme_reload_func", main_term_bg_config);
+ evas_object_data_set(o, "theme_reload_func_data", term);
evas_object_show(o);
if (term->config->translucent)
diff --git a/src/bin/utils.c b/src/bin/utils.c
index 027254e..67fb71c 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -43,7 +43,14 @@ theme_reload(Evas_Object *edje)
static void
theme_reload_cb(void *data EINA_UNUSED, Evas_Object *obj, const char *emission
EINA_UNUSED, const char *source EINA_UNUSED)
{
+ void (*func) (void *d);
+ void *func_data;
+
theme_reload(obj);
+ func = evas_object_data_get(obj, "theme_reload_func");
+ func_data = evas_object_data_get(obj, "theme_reload_func_data");
+ printf("%p %p\n", func, func_data);
+ if (func) func(func_data);
}
void
--
[EGIT] [core/efl] master 01/01: edje_cc - CEEEEEEEEEEEEDRIIIIIIIIC! realloc+lookup bug workaround!
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f3e3739e7c1ed0c03d3cfe30248ca962c7b538e9 commit f3e3739e7c1ed0c03d3cfe30248ca962c7b538e9 Author: Carsten Haitzler (Rasterman) Date: Sun Oct 13 02:07:28 2013 +0900 edje_cc - CDRC! realloc+lookup bug workaround! need i say more. this is a q1uick workaround a bug that is a result of realloc moving memory around and thus lookups becoming broken. --- src/bin/edje/edje_cc_handlers.c | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 7548f15..e6a3c66 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -71,7 +71,7 @@ * @ref sec_collections_group "Group" * *@ref sec_collections_group_script "Script" - *@ref sec_collections_group_limits "Limits" + *@ref sec_collections_group_imits "Limits" *@ref sec_toplevel_data "Data" *@ref sec_collections_group_parts "Parts" * @@ -5509,8 +5509,19 @@ st_collections_group_parts_part_description_limit(void) pc = eina_list_data_get(eina_list_last(edje_collections)); count = pc->limits.parts_count++; -pc->limits.parts = realloc(pc->limits.parts, - pc->limits.parts_count * sizeof (Edje_Part_Limit)); +// XXX: the data_queue_part_lookup uses a pointer TO the +// int id to fill in with the name in the parts[] array +// BUT... we REALLOC it.. which means this memory can +// be reloacted on realloc... so the lookups are invalid. +// +// as a QUICK fix this will just over-allocate a big big blob +// so we can queue a lot of limit lookups +// OLD code fix sometime +//pc->limits.parts = realloc(pc->limits.parts, +// pc->limits.parts_count * sizeof (Edje_Part_Limit)); +// temporary over-alloc of 128 slots to fix realloc + lookup bug +if (!pc->limits.parts) + pc->limits.parts = malloc(128 * sizeof (Edje_Part_Limit)); data_queue_part_lookup(pc, current_part->name, &(pc->limits.parts[count].part)); } --
[EGIT] [core/efl] master 01/01: 1 char editing messup - revert it.
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6732ab15afb47d80c16bd5eb903b01e15a120b08 commit 6732ab15afb47d80c16bd5eb903b01e15a120b08 Author: Carsten Haitzler (Rasterman) Date: Sun Oct 13 11:38:13 2013 +0900 1 char editing messup - revert it. --- src/bin/edje/edje_cc_handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index e6a3c66..dc01352 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -71,7 +71,7 @@ * @ref sec_collections_group "Group" * *@ref sec_collections_group_script "Script" - *@ref sec_collections_group_imits "Limits" + *@ref sec_collections_group_limits "Limits" *@ref sec_toplevel_data "Data" *@ref sec_collections_group_parts "Parts" * --
[EGIT] [apps/terminology] master 01/01: make url link disappear on focus change ANd ensure it stays invisible then
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=6ea8622ecc4bd6aa0287a7638a9f4a4190fafc38
commit 6ea8622ecc4bd6aa0287a7638a9f4a4190fafc38
Author: Carsten Haitzler (Rasterman)
Date: Sun Oct 13 15:55:43 2013 +0900
make url link disappear on focus change ANd ensure it stays invisible then
---
src/bin/termio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index ebfe46b..8ab7027 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -572,13 +572,13 @@ _smart_mouseover_apply(Evas_Object *obj)
Termio *sd = evas_object_smart_data_get(obj);
if (!sd) return;
- if ((sd->mouse.cx < 0) || (sd->mouse.cy < 0))
+ if ((sd->mouse.cx < 0) || (sd->mouse.cy < 0) ||
+ (sd->link.suspend) || (!evas_object_focus_get(obj)))
{
_remove_links(sd, obj);
return;
}
-
s = _termio_link_find(obj, sd->mouse.cx, sd->mouse.cy,
&x1, &y1, &x2, &y2);
if (!s)
@@ -3182,7 +3182,6 @@ _smart_cb_mouse_out(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
sd->mouse.cx = -1;
sd->mouse.cy = -1;
sd->link.suspend = EINA_FALSE;
-_remove_links(sd, obj);
}
else
{
@@ -3192,6 +3191,7 @@ _smart_cb_mouse_out(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
sd->mouse.cx = cx;
sd->mouse.cy = cy;
}
+ _remove_links(sd, obj);
}
static void
--
[EGIT] [core/efl] master 01/01: evas - small buglet. image size of up to but NOT including 32768 are valid
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a01ba5718d73d5102f3bf602d7799d28c0546c93 commit a01ba5718d73d5102f3bf602d7799d28c0546c93 Author: Carsten Haitzler (Rasterman) Date: Mon Oct 14 12:41:28 2013 +0900 evas - small buglet. image size of up to but NOT including 32768 are valid --- src/lib/evas/canvas/evas_object_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 00c1cf6..5b2ef93 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1258,8 +1258,8 @@ _image_size_set(Eo *eo_obj, void *_pd, va_list *list) _evas_object_image_cleanup(eo_obj, obj, o); if (w < 1) w = 1; if (h < 1) h = 1; - if (w > 32768) return; - if (h > 32768) return; + if (w >= 32768) return; + if (h >= 32768) return; if ((w == o->cur->image.w) && (h == o->cur->image.h)) return; --
[EGIT] [themes/dark] master 01/01: naviframe done now for dark.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=b49ff9f9eb8fa21b0a4d353aeabe47c323ce2eda
commit b49ff9f9eb8fa21b0a4d353aeabe47c323ce2eda
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 14 16:28:33 2013 +0900
naviframe done now for dark.
---
edje/dark.edc |1 -
edje/edc/elm/button.edc|2 +-
edje/edc/elm/naviframe.edc | 1386 +++-
edje/img/shadow_vert.png | Bin 0 -> 118 bytes
mock-18.xcf.gz | Bin 613251 -> 613251 bytes
5 files changed, 473 insertions(+), 916 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 480acb2..2513de6 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -58,7 +58,6 @@ collections {
#include "edc/elm/layout.edc"
// XXX: support multi progress (progressbar)
#include "edc/elm/progress.edc"
-// XXX: needs design work (naviframe)
#include "edc/elm/naviframe.edc"
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
diff --git a/edje/edc/elm/button.edc b/edje/edc/elm/button.edc
index 71d91a4..6ec4056 100644
--- a/edje/edc/elm/button.edc
+++ b/edje/edc/elm/button.edc
@@ -117,7 +117,7 @@ group { name: "elm/button/base/default";
part { name: "sizer.content"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-fixed: 1 1;
+//fixed: 1 1;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
diff --git a/edje/edc/elm/naviframe.edc b/edje/edc/elm/naviframe.edc
index 0ce957e..a9633d4 100644
--- a/edje/edc/elm/naviframe.edc
+++ b/edje/edc/elm/naviframe.edc
@@ -1,1078 +1,636 @@
-#if 0
group { name: "elm/naviframe/item/basic/default";
+ images.image: "vgrad_med_dark.png" COMP;
+ images.image: "bevel_out.png" COMP;
+ images.image: "shine.png" COMP;
+ images.image: "bevel_dark_out.png" COMP;
+ images.image: "shadow_vert.png" COMP;
parts {
- part { name: "elm.swallow.content"; type: SWALLOW;
- description { state: "default" 0.0;
- }
- }
- part { name: "access.title"; type: RECT; repeat_events: 1;
- description { state: "default" 0.0;
-fixed: 1 1;
-color: 0 0 0 0;
- }
- }
- part { name: "elm.swallow.prev_btn"; type: SWALLOW;
- description { state: "default" 0.0;
- }
- description { state: "hidden" 0.0;
-inherit: "default" 0.0;
-visible: 0;
- }
- }
- part { name: "elm.swallow.next_btn"; type: SWALLOW;
+ // this set of limits and bottoms is evil - but it's a nasty construct
+ // allowing EITHER the title and subtitle texts OR the prev/next button
+ // swallows to control the lower bounds of the naviframe title, depending
+ // on which is taller
+#define BOTTOMMAX() \
+ part { name: "limit0"; type: SPACER; \
+ description { state: "default" 0.0; \
+rel1.to_y: "title3"; \
+rel1.relative: 0.0 1.0; \
+rel2.to_y: "elm.swallow.next_btn"; \
+rel2.offset: -1 0; \
+align: 0.5 1.0; \
+fixed: 0 1; \
+limit: HEIGHT; \
+ } \
+ } \
+ part { name: "limit1"; type: SPACER; \
+ description { state: "default" 0.0; \
+rel1.to_y: "elm.swallow.next_btn"; \
+rel1.relative: 0.0 1.0; \
+rel2.to_y: "title3"; \
+rel2.offset: -1 0; \
+align: 0.5 1.0; \
+fixed: 0 1; \
+limit: HEIGHT; \
+ } \
+ } \
+ part { name: "bottom0"; type: SPACER; \
+ description { state: "default" 0.0; \
+rel1.to_y: "limit1"; \
+rel1.relative: 0.0 1.0; \
+rel2.to_y: "limit0"; \
+rel2.offset: -1 0; \
+align: 0.5 1.0; \
+fixed: 0 1; \
+limit: HEIGHT; \
+ } \
+ description { state: "other" 0.0; \
+inherit: "default" 0.0; \
+rel1.to_y: "limit0"; \
+rel2.to_y: "limit1"; \
+ } \
+ } \
+ program { name: "pbot0"; \
+ signal: "limit,height,zero"; source: "bottom0"; \
+ script { \
+new st[31], Float:vl; \
+get_state(PART:"bottom0", st, 30, vl); \
+if (st[0] == 'd') set_state(PART:"bottom0", "other", 1.0); \
+else set_state(PART:"bottom0", "default", 1.0); \
+ } \
+ } \
+ part {
[EGIT] [themes/dark] master 01/01: reviewed layouts... a bit.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=a27ca10cb7554cf40ec5a284f82df7c82d1039f7
commit a27ca10cb7554cf40ec5a284f82df7c82d1039f7
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 14 16:44:44 2013 +0900
reviewed layouts... a bit.
---
edje/dark.edc | 3 +-
edje/edc/elm/layout.edc | 188 +++-
2 files changed, 75 insertions(+), 116 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 2513de6..334dcf3 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -54,7 +54,6 @@ collections {
#include "edc/elm/map.edc"
#include "edc/elm/index.edc"
#include "edc/elm/calendar.edc"
-// XXX: review (layout)
#include "edc/elm/layout.edc"
// XXX: support multi progress (progressbar)
#include "edc/elm/progress.edc"
@@ -62,7 +61,7 @@ collections {
#include "edc/elm/panel.edc"
#include "edc/elm/popup.edc"
#include "edc/elm/border.edc"
-// XXX: min size calc problems - too wide!
+// XXX: min size calc problems - too wide! ... err ok on my 32bit box... eh?
#include "edc/elm/spinner.edc"
#include "edc/elm/menu.edc"
#include "edc/elm/clock.edc"
diff --git a/edje/edc/elm/layout.edc b/edje/edc/elm/layout.edc
index 3f5b56e..902d82b 100644
--- a/edje/edc/elm/layout.edc
+++ b/edje/edc/elm/layout.edc
@@ -1,8 +1,7 @@
/* application with a main content area with a back button and title area */
group { name: "elm/layout/application/content-back";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
to_y: "title_clipper";
@@ -11,8 +10,7 @@ group { name: "elm/layout/application/content-back";
}
}
}
- part { name: "title_clipper";
- type: RECT;
+ part { name: "title_clipper"; type: RECT;
description { state: "default" 0.0;
visible: 1;
rel1.to_y: "back";
@@ -24,8 +22,7 @@ group { name: "elm/layout/application/content-back";
rel2.relative: 1.0 0.0;
}
}
- part { name: "back_clipper";
- type: RECT;
+ part { name: "back_clipper"; type: RECT;
clip_to: "title_clipper";
description { state: "default" 0.0;
visible: 1;
@@ -34,8 +31,7 @@ group { name: "elm/layout/application/content-back";
visible: 0;
}
}
- part { name: "back";
- type: EXTERNAL;
+ part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
description { state: "default" 0.0;
@@ -54,38 +50,32 @@ group { name: "elm/layout/application/content-back";
}
programs {
program {
-signal: "clicked";
-source: "back";
+signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
program {
-signal: "elm,back,hide";
-source: "elm";
+signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
program {
-signal: "elm,back,show";
-source: "elm";
+signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
program {
-signal: "elm,title,hide";
-source: "elm";
+signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
program {
-signal: "elm,title,show";
-source: "elm";
+signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
}
- part { name: "elm.swallow.end";
- type: SWALLOW;
+ part { name: "elm.swallow.end"; type: SWALLOW;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
@@ -99,9 +89,8 @@ group { name: "elm/layout/application/content-back";
}
}
}
-
[EGIT] [core/elementary] master 01/01: fix signal callback handling to listen to * for namespacing change to elm
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c852516803a274d0158299cab14921ebf4450841
commit c852516803a274d0158299cab14921ebf4450841
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 14 17:34:26 2013 +0900
fix signal callback handling to listen to * for namespacing change to elm
---
src/lib/elm_flipselector.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 023bdd6..3728090 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -565,13 +565,13 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
CRITICAL("Failed to set layout!");
elm_layout_signal_callback_add
- (obj, "elm,action,up,start", "", _signal_val_up_start, obj);
+ (obj, "elm,action,up,start", "*", _signal_val_up_start, obj);
elm_layout_signal_callback_add
- (obj, "elm,action,up,stop", "", _signal_val_change_stop, obj);
+ (obj, "elm,action,up,stop", "*", _signal_val_change_stop, obj);
elm_layout_signal_callback_add
- (obj, "elm,action,down,start", "", _signal_val_down_start, obj);
+ (obj, "elm,action,down,start", "*", _signal_val_down_start, obj);
elm_layout_signal_callback_add
- (obj, "elm,action,down,stop", "", _signal_val_change_stop, obj);
+ (obj, "elm,action,down,stop", "*", _signal_val_change_stop, obj);
priv->first_interval = FLIP_FIRST_INTERVAL;
--
[EGIT] [themes/dark] master 01/01: flipselector cleaned up a bit.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=c30a34a33c73cb6cfafa22ee224bb8748cb23415
commit c30a34a33c73cb6cfafa22ee224bb8748cb23415
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 14 17:40:53 2013 +0900
flipselector cleaned up a bit.
---
edje/dark.edc | 2 +-
edje/edc/elm/flipselector.edc | 186 --
edje/edc/elm/naviframe.edc| 1 -
3 files changed, 89 insertions(+), 100 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 334dcf3..a86f9f0 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -9,6 +9,7 @@ collections {
// elm
#include "edc/elm/bg.edc"
#include "edc/elm/button.edc"
+// XXX: mobile mode needs invbisible scrollers... make signals that do this
#include "edc/elm/scroller.edc"
// XXX: (entry) need to do magnifier etc...
#include "edc/elm/entry.edc"
@@ -48,7 +49,6 @@ collections {
#include "edc/elm/tooltip.edc"
#include "edc/elm/colorsel.edc"
#include "edc/elm/segment_control.edc"
-// XXX: needs design work (flipselector)
#include "edc/elm/flipselector.edc"
#include "edc/elm/notify.edc"
#include "edc/elm/map.edc"
diff --git a/edje/edc/elm/flipselector.edc b/edje/edc/elm/flipselector.edc
index 41a4397..9087f67 100644
--- a/edje/edc/elm/flipselector.edc
+++ b/edje/edc/elm/flipselector.edc
@@ -2,18 +2,17 @@
#define FLIP_PICKER_MAX_LEN_STR "50"
group { name: "elm/flipselector/base/default";
- images {
- image: "flip_base_shad.png" COMP;
- image: "flip_shad.png" COMP;
- image: "sym_up_light_normal.png" COMP;
- image: "sym_down_light_normal.png" COMP;
- image: "sym_up_dark_normal.png" COMP;
- image: "sym_down_dark_normal.png" COMP;
- image: "shine.png" COMP;
- }
- data {
- item: "max_len" FLIP_PICKER_MAX_LEN_STR;
- }
+ images.image: "flip_shad.png" COMP;
+ images.image: "sym_up_light_normal.png" COMP;
+ images.image: "sym_down_light_normal.png" COMP;
+ images.image: "sym_up_dark_normal.png" COMP;
+ images.image: "sym_down_dark_normal.png" COMP;
+ images.image: "shine.png" COMP;
+ images.image: "win_shadow.png" COMP;
+ images.image: "bevel_out.png" COMP;
+
+ data.item: "max_len" FLIP_PICKER_MAX_LEN_STR;
+
//FIXME: quick successive clicks on, say, up, lead to nastiness
script {
public cur, prev, next, lock;
@@ -153,29 +152,26 @@ group { name: "elm/flipselector/base/default";
}
}
parts {
- part { name: "base_shadow";
- mouse_events: 0;
+ part { name: "base_shadow"; mouse_events: 0;
description { state: "default" 0.0;
-rel1 { offset: -4 -4; to: "base"; }
-rel2 { offset: 3 6; to: "base"; }
-image {
- normal: "flip_base_shad.png";
- border: 10 10 10 10;
-}
+image.normal: "win_shadow.png";
+image.border: 14 14 14 14;
+image.middle: 0;
+rel1.to: "base";
+rel1.offset: -7 -3;
+rel2.to: "base";
+rel2.offset: 6 11;
fill.smooth: 0;
}
}
- part { name: "base";
- type: RECT;
+ part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
-rel1.offset: 6 4;
-rel2.offset: -6 -7;
+rel1.offset: 6 6;
+rel2.offset: -7 -7;
}
}
- part { name: "bottom";
- type: RECT;
- mouse_events: 1;
+ part { name: "bottom"; type: RECT;
description { state: "default" 0.0;
rel1 { to: "base"; relative: 0.0 0.5; }
rel2.to: "base";
@@ -185,9 +181,7 @@ group { name: "elm/flipselector/base/default";
visible: 0;
}
}
- part { name: "top";
- type: RECT;
- mouse_events: 1;
+ part { name: "top"; type: RECT;
description { state: "default" 0.0;
rel1.to: "base";
rel2 { to: "base"; relative: 1.0 0.5; }
@@ -204,21 +198,23 @@ group { name: "elm/flipselector/base/default";
description { state: "default" 0.0;
rel1.to: "bottom";
rel2.to: "bottom";
-color: 80 79 79 255;
+color: 72 72 72 255;
}
}
- part { name: "bottom_text_prev";
- type: TEXT;
+ part { name: "
[EGIT] [themes/dark] master 01/01: leave diskselector for elm 1.9 or later - needs a rewrite in its layout
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=d48a343a5436d54afe310ce290ab36a22ac3e209
commit d48a343a5436d54afe310ce290ab36a22ac3e209
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 14 17:41:52 2013 +0900
leave diskselector for elm 1.9 or later - needs a rewrite in its layout
---
edje/dark.edc | 1 -
1 file changed, 1 deletion(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index a86f9f0..a7e3c89 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -38,7 +38,6 @@ collections {
#include "edc/elm/win.edc"
#include "edc/elm/inwin.edc"
#include "edc/elm/slideshow.edc"
-// XXX: fix gfx (diskselector)
#include "edc/elm/diskselector.edc"
// XXX: fix gfx (ctxpopup) - use bubble look used for tooltips, bubble etc.
#include "edc/elm/ctxpopup.edc"
--
[EGIT] [core/efl] master 01/01: ecore-file - remove ifdefs for HAVE_CULR since ecore-con "always" has it
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ea9963f469c5de5d0b1e6707fa82ce9e57fe29c7
commit ea9963f469c5de5d0b1e6707fa82ce9e57fe29c7
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 09:16:26 2013 +0900
ecore-file - remove ifdefs for HAVE_CULR since ecore-con "always" has it
now that it's runtime dlopen'ed etc. ecore-con "always" has url
support via curl so ecore-file needs to assume that this can always
work and this just use ecore-con-url anyway.
---
src/lib/ecore_file/ecore_file_download.c | 24
1 file changed, 24 deletions(-)
diff --git a/src/lib/ecore_file/ecore_file_download.c
b/src/lib/ecore_file/ecore_file_download.c
index 92a701b..e8fdf4c 100644
--- a/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
@@ -26,7 +26,6 @@ struct _Ecore_File_Download_Job
Ecore_File_Download_Progress_Cb progress_cb;
};
-#ifdef HAVE_CURL
Ecore_File_Download_Job *_ecore_file_download_curl(const char *url, const char
*dst,
Ecore_File_Download_Completion_Cb completion_cb,
Ecore_File_Download_Progress_Cb progress_cb,
@@ -35,7 +34,6 @@ Ecore_File_Download_Job *_ecore_file_download_curl(const char
*url, const char *
static Eina_Bool _ecore_file_download_url_complete_cb(void *data, int type,
void *event);
static Eina_Bool _ecore_file_download_url_progress_cb(void *data, int type,
void *event);
-#endif
static Ecore_Event_Handler *_url_complete_handler = NULL;
static Ecore_Event_Handler *_url_progress_download = NULL;
@@ -54,10 +52,8 @@ ecore_file_download_init(void)
ecore_con_shutdown();
return 0;
}
-#ifdef HAVE_CURL
_url_complete_handler =
ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE,
_ecore_file_download_url_complete_cb, NULL);
_url_progress_download =
ecore_event_handler_add(ECORE_CON_EVENT_URL_PROGRESS,
_ecore_file_download_url_progress_cb, NULL);
-#endif
return 1;
}
@@ -77,7 +73,6 @@ ecore_file_download_shutdown(void)
ecore_con_shutdown();
}
-# ifdef HAVE_CURL
static Eina_Bool
_ecore_file_download_headers_foreach_cb(const Eina_Hash *hash EINA_UNUSED,
const void *key, void *data, void *fdata)
{
@@ -86,7 +81,6 @@ _ecore_file_download_headers_foreach_cb(const Eina_Hash *hash
EINA_UNUSED, const
return EINA_TRUE;
}
-# endif
static Eina_Bool
_ecore_file_download(const char *url,
@@ -131,7 +125,6 @@ _ecore_file_download(const char *url,
else
return EINA_FALSE;
}
-#ifdef HAVE_CURL
else if ((!strncmp(url, "http://";, 7)) || (!strncmp(url, "https://";, 8)) ||
(!strncmp(url, "ftp://";, 6)))
{
@@ -148,18 +141,6 @@ _ecore_file_download(const char *url,
return EINA_FALSE;
}
}
-#else
- else if ((!strncmp(url, "http://";, 7)) || (!strncmp(url, "https://";, 8)) ||
-(!strncmp(url, "ftp://";, 6)))
- {
-(void)completion_cb;
-(void)progress_cb;
-(void)data;
-(void)job_ret;
-(void)headers;
-return EINA_FALSE;
- }
-#endif
else
{
return EINA_FALSE;
@@ -251,15 +232,12 @@ EAPI Eina_Bool
ecore_file_download_protocol_available(const char *protocol)
{
if (!strncmp(protocol, "file://", 7)) return EINA_TRUE;
-#ifdef HAVE_CURL
else if (!strncmp(protocol, "http://";, 7)) return EINA_TRUE;
else if (!strncmp(protocol, "ftp://";, 6)) return EINA_TRUE;
-#endif
return EINA_FALSE;
}
-# ifdef HAVE_CURL
static int
_ecore_file_download_url_compare_job(const void *data1, const void *data2)
{
@@ -391,9 +369,7 @@ ecore_file_download_abort(Ecore_File_Download_Job *job)
if (job->completion_cb)
job->completion_cb(ecore_con_url_data_get(job->url_con), job->dst, 1);
-#ifdef HAVE_CURL
ecore_con_url_free(job->url_con);
-#endif
_job_list = eina_list_remove(_job_list, job);
fclose(job->file);
free(job->dst);
--
[EGIT] [core/efl] master 01/01: Revert "eina: fix CID 1106340: Logically dead code (DEADCODE) reported by coverity."
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f93329d11950969228bef067f278041b2644b793
commit f93329d11950969228bef067f278041b2644b793
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 10:35:10 2013 +0900
Revert "eina: fix CID 1106340: Logically dead code (DEADCODE) reported by
coverity."
This reverts commit 1c1b48ca64c4d13cfd3677cde1ee99e4cf6c2c15.
this commit is causing all sorts of hell and crashes, hangs and what
not. like:
Thread 1 (Thread 0x7feb7389e780 (LWP 7149)):
No symbol table info available.
No symbol table info available.
at lib/eina/eina_inlist.c:422
l = 0xf38a50
__FUNCTION__ = "eina_inlist_demote"
#3 0x7feb6a809867 in
_eina_chained_mempool_alloc_in (
pool=pool@entry=0x8650a0, p=p@entry=0xf38a50)
at modules/eina/mp/chained_pool/eina_chained_mempool.c:197
mem = 0xf3a690
#4 0x7feb6a809dff in eina_chained_mempool_malloc
(data=0x8650a0,
size=)
at modules/eina/mp/chained_pool/eina_chained_mempool.c:300
pool = 0x8650a0
p = 0xf38a50
mem =
#5 0x7feb6a7e451f in
eina_mempool_malloc (size=40, mp=)
at lib/eina/eina_inline_mempool.x:103
No locals.
#6 _eina_list_mempool_list_new (list=0x7feb5402a510)
at lib/eina/eina_list.c:199
No locals.
#7 eina_list_append (list=0x7feb5402a510, data=0xf41720)
at lib/eina/eina_list.c:534
l =
__FUNCTION__ = "eina_list_append"
#8 0x00445d1a in
e_bindings_signal_add (ctxt=,
sig=0x947e6c "mouse,clicked,[12]", src=0x92248c "e.event.close",
mod=E_BINDING_MODIFIER_NONE, any_mod=1, action=0x93479c
"window_close",
params=0x0) at e_bindings.c:1036
binding = 0xf41720
#9 0x004469d4 in e_bindings_init () at
e_bindings.c:68
ebs = 0x947df0
ebm =
ebw =
ebe =
ebk =
eba =
l = 0x9532e0
#10
0x00437516 in main (argc=, argv=)
at e_main.c:941
safe_mode = 0 '\000'
after_restart = 1 '\001'
waslocked = 0 '\000'
t =
tstart =
s =
buff =
"1381800872.3", '\000'
action = {__sigaction_handler = {
sa_handler = 0x4fca00 ,
sa_sigaction = 0x4fca00
}, sa_mask = {__val = {
0 }}, sa_flags = -1073741820,
sa_restorer = 0x0}
__FUNCTION__ = "main"
Detaching from program:
/usr/local/bin/enlightenment, process 7149
---
src/lib/eina/eina_inline_lock_posix.x | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_inline_lock_posix.x
b/src/lib/eina/eina_inline_lock_posix.x
index 3d90929..2e5b038 100644
--- a/src/lib/eina/eina_inline_lock_posix.x
+++ b/src/lib/eina/eina_inline_lock_posix.x
@@ -608,11 +608,10 @@ eina_spinlock_take(Eina_Spinlock *spinlock)
{
if (errno == EBUSY) sched_yield();
else if (errno == EDEADLK) return EINA_LOCK_DEADLOCK;
- else return EINA_LOCK_FAIL;
}
} while (t != 0);
- return EINA_LOCK_SUCCEED;
+ return t ? EINA_LOCK_FAIL : EINA_LOCK_SUCCEED;
#else
return eina_lock_take(spinlock);
#endif
--
[EGIT] [core/efl] master 01/01: Revert "ecore_evas: window does not go back to normal state if you set iconified to EINA_FALSE."
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e309967384a28ccd8f463d63a91b06d2dcc4f8aa
commit e309967384a28ccd8f463d63a91b06d2dcc4f8aa
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 10:45:37 2013 +0900
Revert "ecore_evas: window does not go back to normal state if you set
iconified to EINA_FALSE."
This reverts commit 9bfb730ff57da3d8789f80256abedcbc19e98bfe.
wrong! on deiconify this will now FORCE a ACTIVATE request to the wm
(which asks the wm to focus the window/hilight it and make it active.
might switch desktops or whatever). this is wrong. de-icoifying a
windows does NOT mean ALSO activating it!. the log message also doesnt
say what "go back to normal state"... means do they expect/INSIST
windows MUSt be focused after de-iconification? that's wrong as it's a
window management FOCUS policy, not something to do in the lib.
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 20538dd..627dd15 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -2738,10 +2738,7 @@ _ecore_evas_x_iconified_set(Ecore_Evas *ee, int on)
if (on)
ecore_x_icccm_iconic_request_send(ee->prop.window, edata->win_root);
else
- {
- ecore_evas_activate(ee);
- ecore_evas_show(ee);
- }
+ ecore_evas_show(ee);
}
static void
--
[EGIT] [core/elementary] master 01/01: elm - entry magnifier - should be elm namespaced.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=fce12cf2e21dc36914295a2a33f16a0d6e59eb23
commit fce12cf2e21dc36914295a2a33f16a0d6e59eb23
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 13:00:25 2013 +0900
elm - entry magnifier - should be elm namespaced.
---
data/themes/widgets/entry.edc | 6 +++---
src/lib/elm_entry.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc
index baec9d6..af440dc 100644
--- a/data/themes/widgets/entry.edc
+++ b/data/themes/widgets/entry.edc
@@ -1566,7 +1566,7 @@ group { name: "elm/entry/magnifier/default";
visible: 0;
}
}
- part { name: "swallow";
+ part { name: "elm.swallow.content";
type: SWALLOW;
mouse_events: 0;
scale: 1;
@@ -1610,7 +1610,7 @@ group { name: "elm/entry/magnifier/default";
source: "elm";
action: STATE_SET "default" 0.0;
target: "bg";
- target: "swallow";
+ target: "elm.swallow.content";
target: "outline";
}
program { name: "magnifier_hide";
@@ -1618,7 +1618,7 @@ group { name: "elm/entry/magnifier/default";
source: "elm";
action: STATE_SET "hidden" 0.0;
target: "bg";
- target: "swallow";
+ target: "elm.swallow.content";
target: "outline";
}
}
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 8f8fa34..b259dca 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1340,7 +1340,7 @@ _magnifier_create(void *data)
sd->mgf_clip = evas_object_rectangle_add(evas_object_evas_get(data));
evas_object_color_set(sd->mgf_clip, 255, 255, 255, 255);
- edje_object_part_swallow(sd->mgf_bg, "swallow", sd->mgf_clip);
+ edje_object_part_swallow(sd->mgf_bg, "elm.swallow.content", sd->mgf_clip);
if (sd->scroll)
{
--
[EGIT] [core/efl] master 01/01: evas - fix textblock handling of effects for shadows and so on in some cases
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=aba7e9892e395433a2f0f2bdc40c387a75422e51
commit aba7e9892e395433a2f0f2bdc40c387a75422e51
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 16:04:40 2013 +0900
evas - fix textblock handling of effects for shadows and so on in some cases
---
src/lib/evas/canvas/evas_object_textblock.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 021f59a..ed2f879 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10934,8 +10934,12 @@ evas_object_textblock_render(Evas_Object *eo_obj
EINA_UNUSED,
switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC)
{
case EVAS_TEXT_STYLE_SHADOW:
+ shad_dst = 1;
+ haveshad = 1;
+ break;
case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
shad_dst = 1;
+ shad_sz = 2;
haveshad = 1;
break;
case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
@@ -11032,7 +11036,7 @@ evas_object_textblock_render(Evas_Object *eo_obj
EINA_UNUSED,
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
if (!ti) continue;
-if (ti->parent.format->style == EVAS_TEXT_STYLE_GLOW)
+if ((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) ==
EVAS_TEXT_STYLE_GLOW)
{
for (j = 0; j < 5; j++)
{
@@ -11061,9 +11065,9 @@ evas_object_textblock_render(Evas_Object *eo_obj
EINA_UNUSED,
ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
if (!ti) continue;
-if ((ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE) ||
- (ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
- (ti->parent.format->style ==
EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
+if (((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) ==
EVAS_TEXT_STYLE_OUTLINE) ||
+((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) ==
EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
+((ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC) ==
EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
{
COLOR_SET(outline);
DRAW_TEXT(-1, 0);
--
[EGIT] [apps/terminology] master 01/01: alpha shadow image now has more fidelity at scaled up sizes = less banding
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=5b1cc34ff9dd805bbf2a035d881850b8d436ba68
commit 5b1cc34ff9dd805bbf2a035d881850b8d436ba68
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 17:29:34 2013 +0900
alpha shadow image now has more fidelity at scaled up sizes = less banding
---
data/themes/default.edc | 16
data/themes/images/bg_shadow.png | Bin 15393 -> 18100 bytes
data/themes/images/bg_shadow2.png | Bin 0 -> 69166 bytes
data/themes/images/bg_shadow3.png | Bin 0 -> 163566 bytes
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 5aba3cf..0833228 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -179,7 +179,6 @@ collections {
image: "bg_shine.png" COMP;
image: "bg_glint.png" COMP;
image: "bg_glow_in.png" COMP;
-image: "bg_shadow.png" COMP;
image: "bg_led_glow.png" COMP;
image: "bg_led_base.png" COMP;
image: "bg_led.png" COMP;
@@ -189,6 +188,11 @@ collections {
image: "pm_fill.png" COMP;
image: "cr_glow.png" COMP;
}
+ set { name: "bg_shadow";
+image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
+image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
+image { image: "bg_shadow3.png" COMP; size: 400 300 9 9; }
+ }
sounds {
sample { name: "bell" LOSSY 64;
source: "bell.wav";
@@ -200,7 +204,7 @@ collections {
part { name: "shadow";
mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bg_shadow.png";
+ image.normal: "bg_shadow";
fill.smooth: 0;
visible: 0;
}
@@ -2482,16 +2486,20 @@ target: "0.clip"; target: "1.clip"; target: "2.clip";
target: "3.clip"; target:
images {
image: "pm_overlay.png" COMP;
image: "pm_fill.png" COMP;
-image: "bg_shadow.png" COMP;
image: "inset_shadow.png" COMP;
}
+ set { name: "bg_shadow";
+image { image: "bg_shadow.png" COMP; size: 0 0 200 150; }
+image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
+image { image: "bg_shadow3.png" COMP; size: 400 300 9 9; }
+ }
parts {
// background and shadows
part { name: "shadow";
mouse_events: 0;
description { state: "default" 0.0;
- image.normal: "bg_shadow.png";
+ image.normal: "bg_shadow";
fill.smooth: 0;
}
}
diff --git a/data/themes/images/bg_shadow.png b/data/themes/images/bg_shadow.png
index 1257d82..f0fc89d 100644
Binary files a/data/themes/images/bg_shadow.png and
b/data/themes/images/bg_shadow.png differ
diff --git a/data/themes/images/bg_shadow2.png
b/data/themes/images/bg_shadow2.png
new file mode 100644
index 000..5072168
Binary files /dev/null and b/data/themes/images/bg_shadow2.png differ
diff --git a/data/themes/images/bg_shadow3.png
b/data/themes/images/bg_shadow3.png
new file mode 100644
index 000..a20e276
Binary files /dev/null and b/data/themes/images/bg_shadow3.png differ
--
[EGIT] [themes/dark] master 03/03: typo in XXX .. fix.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=15347b540f030470d4ce04e8b1da59823b6b121a
commit 15347b540f030470d4ce04e8b1da59823b6b121a
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 19:16:15 2013 +0900
typo in XXX .. fix.
---
edje/dark.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index ad2fffa..b307254 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -11,7 +11,7 @@ collections {
#include "edc/elm/button.edc"
// XXX: mobile mode needs invbisible scrollers... make signals that do this
#include "edc/elm/scroller.edc"
-// XXX: modile mode needs different entry setup
+// XXX: mobile mode needs different entry setup
#include "edc/elm/entry.edc"
#include "edc/elm/frame.edc"
#include "edc/elm/label.edc"
--
[EGIT] [themes/dark] master 02/03: focus - clean up focus. the dots didnt work simple. glowing outline now
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=07aaf6fce1bba13c5b47e6b2673fcb0bd7690bc3
commit 07aaf6fce1bba13c5b47e6b2673fcb0bd7690bc3
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 19:15:08 2013 +0900
focus - clean up focus. the dots didnt work simple. glowing outline now
---
edje/edc/elm/focus.edc| 267 +++---
edje/img/box_glow.png | Bin 0 -> 470 bytes
edje/img/box_outline.png | Bin 0 -> 115 bytes
edje/img/corner_glow_1.png| Bin 524 -> 0 bytes
edje/img/corner_glow_2.png| Bin 533 -> 0 bytes
edje/img/corner_glow_3.png| Bin 513 -> 0 bytes
edje/img/corner_glow_4.png| Bin 505 -> 0 bytes
edje/img/corner_glow_hi_1.png | Bin 181 -> 0 bytes
edje/img/corner_glow_hi_2.png | Bin 183 -> 0 bytes
edje/img/corner_glow_hi_3.png | Bin 183 -> 0 bytes
edje/img/corner_glow_hi_4.png | Bin 181 -> 0 bytes
edje/img/dots_glow_bottom.png | Bin 247 -> 0 bytes
edje/img/dots_glow_left.png | Bin 245 -> 0 bytes
edje/img/dots_glow_right.png | Bin 242 -> 0 bytes
edje/img/dots_glow_top.png| Bin 250 -> 0 bytes
mock-18.xcf.gz| Bin 613251 -> 613251 bytes
16 files changed, 41 insertions(+), 226 deletions(-)
diff --git a/edje/edc/elm/focus.edc b/edje/edc/elm/focus.edc
index b748a08..4e9563b 100644
--- a/edje/edc/elm/focus.edc
+++ b/edje/edc/elm/focus.edc
@@ -1,16 +1,6 @@
group { name: "elm/focus_highlight/top/default";
- images.image: "dots_glow_left.png" COMP;
- images.image: "dots_glow_right.png" COMP;
- images.image: "dots_glow_top.png" COMP;
- images.image: "dots_glow_bottom.png" COMP;
- images.image: "corner_glow_1.png" COMP;
- images.image: "corner_glow_2.png" COMP;
- images.image: "corner_glow_3.png" COMP;
- images.image: "corner_glow_4.png" COMP;
- images.image: "corner_glow_hi_1.png" COMP;
- images.image: "corner_glow_hi_2.png" COMP;
- images.image: "corner_glow_hi_3.png" COMP;
- images.image: "corner_glow_hi_4.png" COMP;
+ images.image: "box_glow.png" COMP;
+ images.image: "box_outline.png" COMP;
data.item: "animate" "on";
script {
public s_x, s_y, s_w, s_h; /* source */
@@ -74,8 +64,8 @@ group { name: "elm/focus_highlight/top/default";
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "c1";
-rel2.to: "c4";
+rel1.to: "glow";
+rel2.to: "glow";
color: 255 255 255 0;
}
description { state: "visible" 0.0;
@@ -83,179 +73,28 @@ group { name: "elm/focus_highlight/top/default";
color: 255 255 255 255;
}
}
- part { name: "dl"; mouse_events: 0;
+ part { name: "glow"; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
-image.normal: "dots_glow_left.png";
-rel1.to: "c1";
-rel1.relative: 1.0 1.0;
-rel1.offset: -17 -11;
-rel2.to: "c3";
-rel2.relative: 1.0 0.0;
-rel2.offset: -9 10;
-fill.size.relative: 1.0 0.0;
-fill.size.offset: 0 32;
-step: 0 8;
- }
- }
- part { name: "dr"; mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
-image.normal: "dots_glow_right.png";
-rel1.to: "c2";
-rel1.relative: 0.0 1.0;
-rel1.offset: 8 -11;
-rel2.to: "c4";
-rel2.relative: 0.0 0.0;
-rel2.offset: 16 10;
-fill.size.relative: 1.0 0.0;
-fill.size.offset: 0 32;
-step: 0 8;
- }
- }
- part { name: "dt"; mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
-image.normal: "dots_glow_top.png";
-rel1.to: "c1";
-rel1.relative: 1.0 1.0;
-rel1.offset: -11 -17;
-rel2.to: "c2";
-rel2.relative: 0.0 1.0;
-rel2.offset: 10 -9;
-fill.size.relative: 0.0 1.0;
-fill.size.offset: 32 0;
-step: 8 0;
- }
- }
- part { name: "db"; mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
-image.normal: "dots_glow_bottom.png";
-rel1.to: "c3";
-rel1.relative: 1.0 0.0;
-r
[EGIT] [themes/dark] master 01/03: add in entry magnifier and handles as per XXX todo.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=e4447433c03dfaab27f1ef0b75b4739462bf01ef
commit e4447433c03dfaab27f1ef0b75b4739462bf01ef
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 18:38:40 2013 +0900
add in entry magnifier and handles as per XXX todo.
---
edje/dark.edc | 2 +-
edje/edc/elm/entry.edc| 160 ++
edje/img/frame_rounded.png| Bin 0 -> 1850 bytes
edje/img/handle_pick_up_left.png | Bin 0 -> 1348 bytes
edje/img/handle_pick_up_right.png | Bin 0 -> 1367 bytes
mock-01.xcf.gz| Bin 3547326 -> 3567840 bytes
6 files changed, 161 insertions(+), 1 deletion(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index a7e3c89..ad2fffa 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -11,7 +11,7 @@ collections {
#include "edc/elm/button.edc"
// XXX: mobile mode needs invbisible scrollers... make signals that do this
#include "edc/elm/scroller.edc"
-// XXX: (entry) need to do magnifier etc...
+// XXX: modile mode needs different entry setup
#include "edc/elm/entry.edc"
#include "edc/elm/frame.edc"
#include "edc/elm/label.edc"
diff --git a/edje/edc/elm/entry.edc b/edje/edc/elm/entry.edc
index 9da38be..239287d 100644
--- a/edje/edc/elm/entry.edc
+++ b/edje/edc/elm/entry.edc
@@ -468,6 +468,9 @@ group { name: "elm/entry/base/default";
scale: 1;
entry_mode: EDITABLE;
select_mode: DEFAULT;
+// XXX: set BLOCK_HANDLE ONLY if in mobile mode...
+// select_mode: BLOCK_HANDLE;
+
// select_mode: EXPLICIT;
cursor_mode: BEFORE;
multiline: 1;
@@ -477,6 +480,8 @@ group { name: "elm/entry/base/default";
source4: "elm/entry/cursor/default"; // cursorover
// source5: "elm/entry/anchor/default"; // anchor under
source6: "elm/entry/anchor/default"; // anchor over
+ source7: "elm/entry/handler/start/default";
+ source8: "elm/entry/handler/end/default";
description { state: "default" 0.0;
/* we gotta use 0 0 here, because of scrolled entries */
fixed: 0 0;
@@ -920,6 +925,161 @@ group { name: "elm/entry/base-password/default";
}
}
+group { name: "elm/entry/magnifier/default";
+ images.image: "frame_rounded.png" COMP;
+ parts {
+ part { name: "bg"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: 10 10;
+rel1.to: "over";
+rel2.offset: -11 -11;
+rel2.to: "over";
+color: 48 48 48 255;
+ }
+ description { state: "hidden" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+rel1.offset: 10 10;
+rel1.to: "over";
+rel2.offset: -11 -11;
+rel2.to: "over";
+ }
+ description { state: "hidden" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+ }
+ part { name: "over"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+min: 128 64;
+image.normal: "frame_rounded.png";
+image.border: 14 14 14 14;
+image.middle: 0;
+fill.smooth: 0;
+ }
+ description { state: "hidden" 0.0;
+inherit: "default" 0.0;
+visible: 0;
+ }
+ }
+ }
+ programs {
+ program { name: "magnifier_show";
+ signal: "elm,action,show,magnifier"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.content";
+ target: "bg";
+ target: "over";
+ }
+ program { name: "magnifier_hide";
+ signal: "elm,action,hide,magnifier"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ target: "elm.swallow.content";
+ target: "bg";
+ target: "over";
+ }
+ }
+}
+
+group { name: "elm/entry/handler/start/default";
+ images.image: "handle_pick_up_left.png" COMP;
+ parts {
+ part { name: "base"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+min: 21 27; // 42 54
+image.normal: "handle_pick_up_left.png";
+align: (29/42) (11/54)
[EGIT] [apps/terminology] master 01/01: lets reduce the theme color strings in size since there are so many - memory
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=aef3d275d2cfc0c1db78039bc9484910e5051f78
commit aef3d275d2cfc0c1db78039bc9484910e5051f78
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 15 22:32:35 2013 +0900
lets reduce the theme color strings in size since there are so many - memory
---
data/themes/default.edc | 84 ++---
data/themes/default_colors.in.edc | 688 +++---
data/themes/mustang.edc | 34 +-
src/bin/col.c | 4 +-
4 files changed, 405 insertions(+), 405 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 0833228..bab182e 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -122,52 +122,52 @@ collections {
group { name: "terminology/background";
#ifdef SOLARIZED
color_classes {
- color_class { name: "color-0"; color: S_base0; }
- color_class { name: "color-1"; color: S_base02; }
- color_class { name: "color-2"; color: S_red; }
- color_class { name: "color-3"; color: S_green; }
- color_class { name: "color-4"; color: S_yellow; }
- color_class { name: "color-5"; color: S_blue; }
- color_class { name: "color-6"; color: S_magenta; }
- color_class { name: "color-7"; color: S_cyan; }
- color_class { name: "color-8"; color: S_base2; }
- color_class { name: "color-11"; color: S_base0; }
+ color_class { name: "c0"; color: S_base0; }
+ color_class { name: "c1"; color: S_base02; }
+ color_class { name: "c2"; color: S_red; }
+ color_class { name: "c3"; color: S_green; }
+ color_class { name: "c4"; color: S_yellow; }
+ color_class { name: "c5"; color: S_blue; }
+ color_class { name: "c6"; color: S_magenta; }
+ color_class { name: "c7"; color: S_cyan; }
+ color_class { name: "c8"; color: S_base2; }
+ color_class { name: "c11"; color: S_base0; }
- color_class { name: "color-13"; color: S_base03; }
- color_class { name: "color-14"; color: S_orange; }
- color_class { name: "color-15"; color: S_base01; }
- color_class { name: "color-16"; color: S_base00; }
- color_class { name: "color-17"; color: S_base0; }
- color_class { name: "color-18"; color: S_violet; }
- color_class { name: "color-19"; color: S_base1; }
- color_class { name: "color-20"; color: S_base3; }
+ color_class { name: "c13"; color: S_base03; }
+ color_class { name: "c14"; color: S_orange; }
+ color_class { name: "c15"; color: S_base01; }
+ color_class { name: "c16"; color: S_base00; }
+ color_class { name: "c17"; color: S_base0; }
+ color_class { name: "c18"; color: S_violet; }
+ color_class { name: "c19"; color: S_base1; }
+ color_class { name: "c20"; color: S_base3; }
- color_class { name: "color-25"; color: S_base03; }
- color_class { name: "color-26"; color: S_orange; }
- color_class { name: "color-27"; color: S_base01; }
- color_class { name: "color-28"; color: S_base00; }
- color_class { name: "color-29"; color: S_base0; }
- color_class { name: "color-30"; color: S_violet; }
- color_class { name: "color-31"; color: S_base1; }
- color_class { name: "color-32"; color: S_base3; }
+ color_class { name: "c25"; color: S_base03; }
+ color_class { name: "c26"; color: S_orange; }
+ color_class { name: "c27"; color: S_base01; }
+ color_class { name: "c28"; color: S_base00; }
+ color_class { name: "c29"; color: S_base0; }
+ color_class { name: "c30"; color: S_violet; }
+ color_class { name: "c31"; color: S_base1; }
+ color_class { name: "c32"; color: S_base3; }
- color_class { name: "256color-0"; color: S_base02; } // COL_BLACK
- color_class { name: "256color-1"; color: S_red; } // COL_RED
- color_class { name: "256color-2"; color: S_green; } // COL_GREEN
- color_class { name: "256color-3"; color: S_yellow; } // COL_YELLOW
- color_class { name: "256color-4"; color: S_blue; } // COL_BLUE
- color_class { name: "256color-5"; color: S_ma
[EGIT] [core/elementary] master 01/01: ctxpopup - fix double show emit.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b281aaaf86996fe5893c92de31f508d64f4ba404
commit b281aaaf86996fe5893c92de31f508d64f4ba404
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 16 20:17:57 2013 +0900
ctxpopup - fix double show emit.
---
src/lib/elc_ctxpopup.c| 6 --
src/lib/elm_widget_ctxpopup.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 4431cfa..5c3727b 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -520,7 +520,9 @@ _show_signals_emit(Evas_Object *obj,
if (!sd->visible) return;
if ((sd->list) && (!sd->list_visible)) return;
+ if (sd->emitted) return;
+ sd->emitted = EINA_TRUE;
switch (dir)
{
case ELM_CTXPOPUP_DIRECTION_UP:
@@ -989,13 +991,13 @@ _on_show(void *data __UNUSED__,
if (!sd->content) return;
+ sd->emitted = EINA_FALSE;
sd->visible = EINA_TRUE;
evas_object_show(sd->bg);
evas_object_show(sd->arrow);
- edje_object_signal_emit(sd->bg, "elm,state,show", "elm");
- elm_layout_signal_emit(obj, "elm,state,show", "elm");
+ _show_signals_emit(obj, sd->dir);
elm_layout_sizing_eval(obj);
diff --git a/src/lib/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h
index 11f3992..bdd5921 100644
--- a/src/lib/elm_widget_ctxpopup.h
+++ b/src/lib/elm_widget_ctxpopup.h
@@ -51,6 +51,7 @@ struct _Elm_Ctxpopup_Smart_Data
Eina_Bool list_visible : 1;
Eina_Bool horizontal : 1;
Eina_Bool finished : 1;
+ Eina_Bool emitted : 1;
Eina_Bool visible : 1;
};
--
[EGIT] [core/elementary] master 01/01: tooltips - fix show to be at end just to be cleaner.
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f85321cf18dce00beff5ff80e99cf26bbd61a7b0 commit f85321cf18dce00beff5ff80e99cf26bbd61a7b0 Author: Carsten Haitzler (Rasterman) Date: Wed Oct 16 21:29:22 2013 +0900 tooltips - fix show to be at end just to be cleaner. --- src/lib/els_tooltip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c index 5fd02cd..9bb8e01 100644 --- a/src/lib/els_tooltip.c +++ b/src/lib/els_tooltip.c @@ -318,7 +318,6 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt) if (win) ecore_x_window_shape_input_rectangle_set(win, 0, 0, 0, 0); #endif - evas_object_show(tt->tt_win); } str = edje_object_data_get(tt->tooltip, "pad_x"); @@ -529,6 +528,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt) edje_object_message_send(tt->tooltip, EDJE_MESSAGE_FLOAT_SET, 1, msg); } #undef FDIF + if (tt->tt_win) evas_object_show(tt->tt_win); } static void --
[EGIT] [core/efl] master 02/03: evas - gl - dont allocate image and/or texture until needed on native unset
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7d7f548afcfcb0a69fe1694b7c68f36cecc74d89
commit 7d7f548afcfcb0a69fe1694b7c68f36cecc74d89
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 16 17:20:14 2013 +0900
evas - gl - dont allocate image and/or texture until needed on native unset
---
src/modules/evas/engines/gl_cocoa/evas_engine.c | 7 ++-
src/modules/evas/engines/gl_common/evas_gl_common.h | 1 +
src/modules/evas/engines/gl_common/evas_gl_image.c | 15 ++-
src/modules/evas/engines/gl_sdl/evas_engine.c | 5 +
src/modules/evas/engines/gl_x11/evas_engine.c | 6 ++
src/modules/evas/engines/wayland_egl/evas_engine.c | 6 ++
6 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 83c2968..702e751 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -453,6 +453,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
if (!im->im->image.data)
evas_cache_image_load_data(&im->im->cache_entry);
+evas_gl_common_image_alloc_ensure(im);
im_new = evas_gl_common_image_new_from_copied_data
(im->gc, im->im->cache_entry.w, im->im->cache_entry.h,
im->im->image.data,
@@ -523,6 +524,7 @@ eng_image_colorspace_set(void *data, void *image, int
cspace)
/* FIXME: can move to gl_common */
if (im->cs.space == cspace) return;
eng_window_use(re->win);
+ evas_gl_common_image_alloc_ensure(im);
evas_cache_image_colorspace(&im->im->cache_entry, cspace);
switch (cspace)
{
@@ -676,7 +678,8 @@ eng_image_size_set(void *data, void *image, int w, int h)
w &= ~0x1;
break;
}
-
+
+ evas_gl_common_image_alloc_ensure(im_old);
if ((im_old->im) &&
((int)im_old->im->cache_entry.w == w) &&
((int)im_old->im->cache_entry.h == h))
@@ -744,6 +747,7 @@ eng_image_data_get(void *data, void *image, int to_write,
DATA32 **image_data, i
}
eng_window_use(re->win);
error = evas_cache_image_load_data(&im->im->cache_entry);
+ evas_gl_common_image_alloc_ensure(im);
switch (im->cs.space)
{
case EVAS_COLORSPACE_ARGB:
@@ -795,6 +799,7 @@ eng_image_data_put(void *data, void *image, DATA32
*image_data)
im = image;
if (im->native.data) return image;
eng_window_use(re->win);
+ evas_gl_common_image_alloc_ensure(im);
if ((im->tex) && (im->tex->pt) && (im->tex->pt->dyn.data))
{
if (im->tex->pt->dyn.data == image_data)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index def6425..df01664 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -715,6 +715,7 @@ void
evas_gl_common_texture_nv12_update(Evas_GL_Texture *tex, DATA8
Evas_GL_Texture *evas_gl_common_texture_nv12tiled_new(Evas_Engine_GL_Context
*gc, DATA8 **rows, unsigned int w, unsigned int h);
void evas_gl_common_texture_nv12tiled_update(Evas_GL_Texture
*tex, DATA8 **row, unsigned int w, unsigned int h);
+void evas_gl_common_image_alloc_ensure(Evas_GL_Image *im);
void evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc);
void evas_gl_common_image_ref(Evas_GL_Image *im);
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 769b65a..2317790 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -1,6 +1,14 @@
#include "evas_gl_private.h"
void
+evas_gl_common_image_alloc_ensure(Evas_GL_Image *im)
+{
+ if (!im->im) return;
+ im->im = (RGBA_Image *)evas_cache_image_size_set(&im->im->cache_entry,
+im->w, im->h);
+}
+
+void
evas_gl_common_image_all_unload(Evas_Engine_GL_Context *gc)
{
Eina_List *l;
@@ -332,6 +340,7 @@ evas_gl_common_image_alpha_set(Evas_GL_Image *im, int alpha)
if (im->alpha == alpha) return im;
im->alpha = alpha;
if (!im->im) return im;
+ evas_gl_common_image_alloc_ensure(im);
evas_cache_image_load_data(&im->im->cache_entry);
im->im->cache_entry.flags.alpha = alpha ? 1 : 0;
@@ -395,14 +404,15 @@ evas_gl_common_image_native_disable(Evas_GL_Image *im)
im->tex = NULL;
}
im->tex_only = 0;
-
im->im = (RGBA_Image
*)evas_cache_image_empty(evas_common_image_cache_get());
im->im->cache_entry.flags.alpha = i
[EGIT] [core/efl] master 03/03: async render -> alpha set. if not visible dont WAIT. do it now.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=06c3c0cd0c0e2af7279470ab5b3fd3100e1499db
commit 06c3c0cd0c0e2af7279470ab5b3fd3100e1499db
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 17 00:00:05 2013 +0900
async render -> alpha set. if not visible dont WAIT. do it now.
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 627dd15..69e0709 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -2284,10 +2284,15 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
{
if (ee->in_async_render)
{
- ee->delayed.alpha = alpha;
- ee->delayed.alpha_changed = EINA_TRUE;
- return;
+ if (ee->visible)
+ {
+ ee->delayed.alpha = alpha;
+ ee->delayed.alpha_changed = EINA_TRUE;
+ return;
+ }
}
+if (ee->in_async_render)
+evas_sync(ee->evas);
_alpha_do(ee, alpha);
}
else if (!strcmp(ee->driver, "opengl_x11"))
--
[EGIT] [core/efl] master 01/03: Revert "efreet: Use eina_file_mkstemp"
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ed0e8b8df1b751e0c9f46e5f2a3fdfa1364a8659
commit ed0e8b8df1b751e0c9f46e5f2a3fdfa1364a8659
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 16 13:38:40 2013 +0900
Revert "efreet: Use eina_file_mkstemp"
This reverts commit bd5a5e7fce3931476bbc68a156be28e58f5d7ef8.
sorry about this... all fine eina mkstemp use and all... but this
*BREAKS EFREET*! ibar icons stop working (vanish). efreet no longer
issues a desktop file update event to e etc. etc. etc. ... so let's
keep code that works for now even if it uses mkstemp and not eina...
:) working is better. :)
---
src/bin/efreet/efreet_desktop_cache_create.c | 30
src/bin/efreet/efreetd.c | 28 --
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c
b/src/bin/efreet/efreet_desktop_cache_create.c
index fe67da1..2fc6e91 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -223,9 +223,9 @@ main(int argc, char **argv)
int lockfd = -1, tmpfd;
int changed = 0;
int i;
-char path_name[PATH_MAX] = { '\0' };
-Eina_Tmpstr *file = NULL;
-Eina_Tmpstr *util_file = NULL;
+char file[PATH_MAX] = { '\0' };
+char util_file[PATH_MAX] = { '\0' };
+mode_t um;
if (!eina_init()) goto eina_error;
_efreet_desktop_cache_log_dom =
@@ -273,11 +273,11 @@ main(int argc, char **argv)
if (!efreet_init()) goto efreet_error;
/* create homedir */
-snprintf(path_name, sizeof(path_name), "%s/efreet",
efreet_cache_home_get());
-if (!ecore_file_exists(path_name))
+snprintf(file, sizeof(file), "%s/efreet", efreet_cache_home_get());
+if (!ecore_file_exists(file))
{
-if (!ecore_file_mkpath(path_name)) goto efreet_error;
-efreet_setowner(path_name);
+if (!ecore_file_mkpath(file)) goto efreet_error;
+efreet_setowner(file);
}
/* lock process, so that we only run one copy of this program */
@@ -296,13 +296,21 @@ main(int argc, char **argv)
}
/* create cache */
-tmpfd = eina_file_mkstemp("efreet_desktop_cache_XX", &file);
+snprintf(file, sizeof(file), "%s.XX", efreet_desktop_cache_file());
+/* set secure umask for temporary files */
+um = umask(0077);
+tmpfd = mkstemp(file);
+umask(um);
if (tmpfd < 0) goto error;
close(tmpfd);
ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
if (!ef) goto error;
-tmpfd = eina_file_mkstemp("efreet_desktop_util_cache_XX", &util_file);
+snprintf(util_file, sizeof(util_file), "%s.XX",
efreet_desktop_util_cache_file());
+/* set secure umask for temporary files */
+um = umask(0077);
+tmpfd = mkstemp(util_file);
+umask(um);
if (tmpfd < 0) goto error;
close(tmpfd);
util_ef = eet_open(util_file, EET_FILE_MODE_READ_WRITE);
@@ -442,8 +450,6 @@ main(int argc, char **argv)
printf("%c\n", c);
}
-eina_tmpstr_del(file);
-eina_tmpstr_del(util_file);
EINA_LIST_FREE(systemdirs, dir)
eina_stringshare_del(dir);
eina_list_free(extra_dirs);
@@ -455,8 +461,6 @@ main(int argc, char **argv)
close(lockfd);
return 0;
error:
-eina_tmpstr_del(file);
-eina_tmpstr_del(util_file);
IF_FREE(dir);
edd_error:
if (old_file_ids)
diff --git a/src/bin/efreet/efreetd.c b/src/bin/efreet/efreetd.c
index 414bb2c..18fc500 100644
--- a/src/bin/efreet/efreetd.c
+++ b/src/bin/efreet/efreetd.c
@@ -26,22 +26,29 @@ quit(void)
int
main(int argc, char *argv[])
{
+ char path[PATH_MAX];
FILE *log;
- int fd;
+ mode_t um;
- if (!eina_init()) return 1;
-
- fd = eina_file_mkstemp("efreetd_XX", NULL);
- if (fd < 0)
+ strcpy(path, "/tmp/efreetd_XX");
+ um = umask(0077);
+ if (mkstemp(path) < 0)
{
-EINA_LOG_ERR("mkstemp");
-goto eina_error;
+perror("mkstemp");
+umask(um);
+return 1;
+ }
+ umask(um);
+ if (chmod(path, 0700) < 0)
+ {
+perror("chmod");
+return 1;
}
- log = fdopen(fd, "wb");
- if (!log)
-goto eina_error;
+ log = fopen(path, "wb");
+ if (!log) return 1;
+ if (!eina_init()) return 1;
eina_log_print_cb_set(eina_log_print_cb_file, log);
efreetd_log_dom = eina_log_domain_register("efreetd",
EFREETD_DEFAULT_LOG_COLOR);
@@ -84,7 +91,6 @@ ecore_error:
if (efreetd_log_dom >= 0)
eina_log_domain_unregister(efreetd_log_dom);
efreetd_log_dom = -1;
-eina_error:
eina_shutdown();
return 1;
}
--
[EGIT] [themes/dark] master 01/02: contextpopup and tooltip fix. done.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=2a3c567ae1b0d4a065e66a06f86cb0c9174945e3
commit 2a3c567ae1b0d4a065e66a06f86cb0c9174945e3
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 16 21:31:04 2013 +0900
contextpopup and tooltip fix. done.
---
edje/dark.edc | 1 -
edje/edc/elm/ctxpopup.edc | 481 ++
edje/edc/elm/tooltip.edc | 133 +
3 files changed, 199 insertions(+), 416 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index b307254..f16965a 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -39,7 +39,6 @@ collections {
#include "edc/elm/inwin.edc"
#include "edc/elm/slideshow.edc"
#include "edc/elm/diskselector.edc"
-// XXX: fix gfx (ctxpopup) - use bubble look used for tooltips, bubble etc.
#include "edc/elm/ctxpopup.edc"
#include "edc/elm/multibuttonentry.edc"
#include "edc/elm/dayselector.edc"
diff --git a/edje/edc/elm/ctxpopup.edc b/edje/edc/elm/ctxpopup.edc
index 5df13e8..d244398 100644
--- a/edje/edc/elm/ctxpopup.edc
+++ b/edje/edc/elm/ctxpopup.edc
@@ -1,367 +1,199 @@
///
group { name: "elm/ctxpopup/bg/noblock";
parts {
- part { name: "ctxpopup_bg";
- type: RECT;
- mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
}
}
+
group { name: "elm/ctxpopup/bg/default";
parts {
- part { name: "ctxpopup_bg";
- type: RECT;
- mouse_events: 1;
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
-color: 0 0 0 100;
+color: 0 0 0 192;
}
}
}
programs {
- program { name: "clicked_event";
- signal: "mouse,clicked,1";
- source: "ctxpopup_bg";
+ program {
+ signal: "mouse,clicked,1"; source: "base";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { name: "show";
- signal: "elm,state,show";
- source: "elm";
+ program {
+ signal: "elm,state,show"; source: "elm";
action: STATE_SET "visible" 0.0;
- target: "ctxpopup_bg";
- transition: LINEAR 0.25;
+ transition: LINEAR 0.2;
+ target: "base";
}
- program { name: "hide";
- signal: "elm,state,hide";
- source: "elm";
+ program {
+ signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "ctxpopup_bg";
- transition: LINEAR 0.25;
+ transition: LINEAR 0.3;
+ target: "base";
}
}
}
group { name: "elm/ctxpopup/base/default";
- images {
- image: "vgrad_med_darker.png" COMP;
- image: "led_square_shading.png" COMP;
- image: "led_square_shadow.png" COMP;
- }
+ images.image: "tooltip-base.png" COMP;
parts {
- part { name: "arrow_area_left";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
+ part { name: "base";
+ clip_to: "clip";
description { state: "default" 0.0;
-visible: 0;
-min: 20 0;
-fixed: 1 0;
-align: 1 0.5;
-rel1 {
- to_y: "base";
-}
-rel2 {
- relative:0 1;
- to:"base";
-}
+image.normal: "tooltip-base.png";
+image.border: 7 7 6 8;
+image.middle: SOLID;
}
}
- part { name: "arrow_area_right";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ clip_to: "clip";
description { state: "default" 0.0;
-visible: 0;
-min: 20 0;
-fixed: 1 1;
-align: 0 0.5;
-rel1 {
- relative: 1 0;
- to:"base";
-}
-rel2 {
- to_y: "base";
-}
+rel1 { to:"base"; offset: 8 6; }
+rel2 { to:"base"; offset:
[EGIT] [themes/dark] master 02/02: double progress looks nicer now.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=6c789ffc92742592a77a3d5927bc0d35ad234b85
commit 6c789ffc92742592a77a3d5927bc0d35ad234b85
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 17 12:59:35 2013 +0900
double progress looks nicer now.
---
edje/edc/elm/progress.edc | 68 ++
edje/img/inset_bar_horiz_glow_base_double.png | Bin 13825 -> 3235 bytes
edje/img/inset_bar_horiz_glow_inv_base_double.png | Bin 15274 -> 3213 bytes
edje/img/inset_bar_vert_glow_base_double.png | Bin 17543 -> 3817 bytes
edje/img/inset_bar_vert_glow_inv_base_double.png | Bin 17747 -> 3775 bytes
5 files changed, 4 insertions(+), 64 deletions(-)
diff --git a/edje/edc/elm/progress.edc b/edje/edc/elm/progress.edc
index a9fc46e..d8be3d3 100644
--- a/edje/edc/elm/progress.edc
+++ b/edje/edc/elm/progress.edc
@@ -1262,6 +1262,7 @@ group { name: "elm/progressbar/horizontal/double";
}
}
part { name: "bar1";
+ insert_after: "barend";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -1274,6 +1275,7 @@ group { name: "elm/progressbar/horizontal/double";
image.normal: "inset_bar_horiz_glow_base_double.png";
image.border: 0 72 0 0;
image.border_scale_by: 0.25; image.border_scale: 1;
+color: 51 153 255 128;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
@@ -1285,36 +1287,6 @@ group { name: "elm/progressbar/horizontal/double";
image.border: 72 0 0 0;
}
}
- part { name: "light1";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
-max: 36 11;
-rel1.to_x: "bar1";
-rel1.to_y: "bar1";
-rel1.relative: 0.0 (26/96);
-rel2.to_x: "barend1";
-rel2.to_y: "bar1";
-rel2.relative: 0.2 ((26+44)/96);
-align: 1.0 0.0;
-image.normal: "inset_bar_horiz_glow_light.png";
-image.border: 0 20 0 0;
-image.border_scale_by: 0.25; image.border_scale: 1;
-color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
-inherit: "default" 0.0;
-rel1.to_x: "barend1";
-rel1.to_y: "bar1";
-rel1.relative: 0.8 (26/96);
-rel2.to_x: "bar1";
-rel2.to_y: "bar1";
-rel2.relative: 1.0 ((26+44)/96);
-align: 0.0 0.0;
-image.normal: "inset_bar_horiz_glow_inv_light.png";
-image.border: 20 0 0 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -1325,7 +1297,6 @@ group { name: "elm/progressbar/horizontal/double";
target: "barend";
target: "barend1";
target: "light";
- target: "light1";
}
program
{ name: "inverted-off";
@@ -1336,7 +1307,6 @@ group { name: "elm/progressbar/horizontal/double";
target: "barend";
target: "barend1";
target: "light";
- target: "light1";
}
}
}
@@ -1381,6 +1351,7 @@ group { name: "elm/progressbar/vertical/double";
}
}
part { name: "bar1";
+ insert_after: "barend";
clip_to: "fract_clip";
scale: 1;
description { state: "default" 0.0;
@@ -1393,6 +1364,7 @@ group { name: "elm/progressbar/vertical/double";
image.normal: "inset_bar_vert_glow_base_double.png";
image.border: 0 0 0 72;
image.border_scale_by: 0.25; image.border_scale: 1;
+color: 51 153 255 128;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
@@ -1404,36 +1376,6 @@ group { name: "elm/progressbar/vertical/double";
image.border: 0 0 72 0;
}
}
- part { name: "light1";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
-max: 11 36;
-rel1.to_y: "bar1";
-rel1.to_x: "bar1";
-rel1.relative: (26/96) 0.0;
-rel2.to_y: "barend1";
-rel2.to_x: "bar1";
-rel2.relative: ((26+44)/96) 0.2;
-align: 0.0 1.0;
-image.normal: "inset_bar_v
[EGIT] [themes/dark] master 01/01: remove xxx for multi-progress
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=3331938b49b6bee6a8fd39852ff1c96aadd66e05
commit 3331938b49b6bee6a8fd39852ff1c96aadd66e05
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 17 13:01:55 2013 +0900
remove xxx for multi-progress
---
edje/dark.edc | 1 -
1 file changed, 1 deletion(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index f16965a..7b1aa62 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -53,7 +53,6 @@ collections {
#include "edc/elm/index.edc"
#include "edc/elm/calendar.edc"
#include "edc/elm/layout.edc"
-// XXX: support multi progress (progressbar)
#include "edc/elm/progress.edc"
#include "edc/elm/naviframe.edc"
#include "edc/elm/panel.edc"
--
[EGIT] [themes/dark] master 01/01: re-sync e parts of dark theme with e theme now.
raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=3f41924d879670a93a3c694d8fe433ca0ac38207
commit 3f41924d879670a93a3c694d8fe433ca0ac38207
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 17 16:08:42 2013 +0900
re-sync e parts of dark theme with e theme now.
---
edje/dark.edc | 1 +
edje/edc/border.edc| 303 +---
edje/edc/button.edc| 2 +-
edje/edc/comp.edc | 67 +
edje/edc/comp_effects.edc | 497 +
edje/edc/evrything.edc | 1 +
edje/edc/gadman.edc| 6 +-
edje/edc/ibar-ibox.edc | 19 +-
edje/edc/illume.edc| 2 +
edje/edc/menu.edc | 18 +-
edje/edc/pager.edc | 7 +-
edje/edc/randr.edc | 100 ++-
edje/edc/shelf.edc | 8 +-
edje/edc/tasks.edc | 34 ++-
edje/img/vgrad_med_dark_sparkle.png| Bin 0 -> 3698 bytes
edje/img/vgrad_med_lighter_sparkle.png | Bin 0 -> 5483 bytes
16 files changed, 927 insertions(+), 138 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index 7b1aa62..9bd438a 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -67,6 +67,7 @@ collections {
// desktop in general
#include "edc/comp.edc"
+#include "edc/comp_effects.edc"
#include "edc/background.edc"
#include "edc/shelf.edc"
#include "edc/border.edc"
diff --git a/edje/edc/border.edc b/edje/edc/border.edc
index 59ec1f0..a0ca40a 100644
--- a/edje/edc/border.edc
+++ b/edje/edc/border.edc
@@ -19,14 +19,21 @@ group { name: "e/widgets/border/default/border";
images.image: "sym_up_light_selected.png" COMP;
images.image: "glow_round_corners_small.png" COMP;
images.image: "knob_round_small_busy.png" COMP;
+ images.image: "screen_circular_shadow.png" COMP;
+ images.image: "win_shadow.png" COMP;
+ data.item: "shadow" "1";
parts {
- part { name: "client_clip"; type: RECT;
+ part { name: "client_clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to_y: "e.swallow.client";
rel2.to_y: "e.swallow.client";
}
+ description { state: "hidden" 0.0;
+inherit: "default";
+visible: 0;
+ }
}
- part { name: "e.swallow.client"; type: SWALLOW;
+ part { name: "e.swallow.client"; type: SWALLOW; mouse_events: 0;
clip_to: "client_clip";
description { state: "default" 0.0;
rel1.relative: 0.0 1.0;
@@ -38,16 +45,14 @@ group { name: "e/widgets/border/default/border";
inherit: "default" 0.0;
rel2.relative: 1.0 1.0;
rel2.offset: -1 -1;
-rel2.to_y: "bottom";
}
description { state: "max" 0.0;
inherit: "default" 0.0;
rel2.relative: 1.0 1.0;
rel2.offset: -1 -1;
-rel2.to_y: "bottom";
}
}
- part { name: "top";
+ part { name: "top"; mouse_events: 0;
description { state: "default" 0.0;
color_class: "border_top";
image.normal: "vgrad_med_lighter.png";
@@ -71,7 +76,7 @@ group { name: "e/widgets/border/default/border";
fill.smooth: 0;
}
}
- part { name: "e.text.title"; type: TEXT;
+ part { name: "e.text.title"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
description { state: "default" 0.0;
@@ -97,7 +102,7 @@ group { name: "e/widgets/border/default/border";
visible: 0;
}
}
- part { name: "title2"; type: TEXT;
+ part { name: "title2"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SOFT_SHADOW BOTTOM;
description { state: "default" 0.0;
@@ -141,7 +146,7 @@ group { name: "e/widgets/border/default/border";
rel2.relative: 1.0 0.85;
}
}
- part { name: "e.swallow.icon"; type: SWALLOW;
+ part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "icon";
rel1.relative: 0.15 0.15;
@@ -150,7 +155,7 @@ group { name: "e/widgets/border/default/border";
rel2.offset: 0 0;
}
}
- part { name: "busy_cl
[EGIT] [core/elementary] master 02/02: dark chglog+news
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d3193328d5588e797397bfd1522f0ab3522ec24c commit d3193328d5588e797397bfd1522f0ab3522ec24c Author: Carsten Haitzler (Rasterman) Date: Thu Oct 17 16:36:44 2013 +0900 dark chglog+news --- ChangeLog | 5 + NEWS | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7cba68f..285dc57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1703,3 +1703,8 @@ 2013-10-17 Ryuan Choi (ryuan) * fileselector : Add support multi-selection. + +2013-10-17 Carsten Haitzler (The Rasterman) + +* Default theme is now dark. + diff --git a/NEWS b/NEWS index 7c21ff0..fc17a2e 100644 --- a/NEWS +++ b/NEWS @@ -101,6 +101,7 @@ Additions: Improvements: + * Default theme is now dark (matching Enlightenment). * Toolbar widget is now a scrollable widget. * Entry widget is now a scrollable layout. * Fileselector entry widget is now an elm layout. --
[EGIT] [core/elementary] master 01/01: fix uninitialized memory usage in naviframe
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=30071dfe1540e4eea05ceb4cc784cbdbc9f6ae3f
commit 30071dfe1540e4eea05ceb4cc784cbdbc9f6ae3f
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 17 22:17:02 2013 +0900
fix uninitialized memory usage in naviframe
---
src/lib/elc_naviframe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 32f1f79..6d026ac 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -63,7 +63,7 @@ static void
_prev_page_focus_recover(Elm_Naviframe_Item *it)
{
Evas_Object *newest;
- unsigned int order;
+ unsigned int order = 0;
newest = elm_widget_newest_focus_order_get(VIEW(it), &order, EINA_TRUE);
if (newest)
--
[EGIT] [core/efl] master 01/01: ecore-evas - handle mouse out then in due to click-to-focus passive grabs
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a3aa1ed7f047fde6c1e2bb87bd2b7431ef9b7b27
commit a3aa1ed7f047fde6c1e2bb87bd2b7431ef9b7b27
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 18 19:23:38 2013 +0900
ecore-evas - handle mouse out then in due to click-to-focus passive grabs
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 188
1 file changed, 129 insertions(+), 59 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 7140ca6..20ed6e2 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -54,6 +54,8 @@ struct _Ecore_Evas_Engine_Data_X11 {
Ecore_X_Pixmap mask;
Ecore_X_GC gc;
Ecore_X_XRegion *damages;
+ Ecore_Timer *outdelay;
+ Ecore_X_Event_Mouse_Out out_ev;
Ecore_X_Sync_Counter sync_counter;
Ecore_X_Window leader;
Ecore_X_Sync_Counter netwm_sync_counter;
@@ -1036,48 +1038,89 @@ _ecore_evas_x_event_client_message(void *data
EINA_UNUSED, int type EINA_UNUSED,
}
static Eina_Bool
+_fake_out(void *data)
+{
+ Ecore_Evas *ee = data;
+ Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
+ Ecore_X_Event_Mouse_Out *e = &(edata->out_ev);
+
+ edata->outdelay = NULL;
+
+ ecore_event_evas_modifier_lock_update(ee->evas, e->modifiers);
+ _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time);
+ if (e->mode == ECORE_X_EVENT_MODE_GRAB)
+ evas_event_feed_mouse_cancel(ee->evas, e->time, NULL);
+ evas_event_feed_mouse_out(ee->evas, e->time, NULL);
+ if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
+ if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
+ ee->in = EINA_FALSE;
+ return EINA_FALSE;
+}
+
+static Eina_Bool
_ecore_evas_x_event_mouse_in(void *data EINA_UNUSED, int type EINA_UNUSED,
void *event)
{
Ecore_Evas *ee;
Ecore_X_Event_Mouse_In *e;
+ Ecore_Evas_Engine_Data_X11 *edata;
e = event;
ee = ecore_event_window_match(e->win);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on
event */
if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
-/*{ */
-/* time_t t; */
-/* char *ct; */
-
-/* const char *modes[] = { */
-/*"MODE_NORMAL", */
-/*"MODE_WHILE_GRABBED", */
-/*"MODE_GRAB", */
-/*"MODE_UNGRAB" */
-/* }; */
-/* const char *details[] = { */
-/*"DETAIL_ANCESTOR", */
-/*"DETAIL_VIRTUAL", */
-/*"DETAIL_INFERIOR", */
-/*"DETAIL_NON_LINEAR", */
-/*"DETAIL_NON_LINEAR_VIRTUAL", */
-/*"DETAIL_POINTER", */
-/*"DETAIL_POINTER_ROOT", */
-/*"DETAIL_DETAIL_NONE" */
-/* }; */
-/* t = time(NULL); */
-/* ct = ctime(&t); */
-/* ct[strlen(ct) - 1] = 0; */
-/* printf("@@ ->IN 0x%x 0x%x %s md=%s dt=%s\n", */
-/* e->win, e->event_win, */
-/* ct, */
-/* modes[e->mode], */
-/* details[e->detail]); */
-/*} */
+ edata = ee->engine.data;
+/*
+{
+ time_t t;
+ char *ct;
+
+ const char *modes[] = {
+"MODE_NORMAL",
+"MODE_WHILE_GRABBED",
+"MODE_GRAB",
+"MODE_UNGRAB"
+ };
+ const char *details[] = {
+"DETAIL_ANCESTOR",
+"DETAIL_VIRTUAL",
+"DETAIL_INFERIOR",
+"DETAIL_NON_LINEAR",
+"DETAIL_NON_LINEAR_VIRTUAL",
+"DETAIL_POINTER",
+"DETAIL_POINTER_ROOT",
+"DETAIL_DETAIL_NONE"
+ };
+ t = time(NULL);
+ ct = ctime(&t);
+ ct[strlen(ct) - 1] = 0;
+ printf("@@ ->IN 0x%x 0x%x %s md=%s dt=%s\n",
+ e->win, e->event_win,
+ ct,
+ modes[e->mode],
+ details[e->detail]);
+}
+ */
// disable. causes more problems than it fixes
// if ((e->mode == ECORE_X_EVENT_MODE_GRAB) ||
// (e->mode == ECORE_X_EVENT_MODE_UNGRAB))
// return 0;
+
+ // handle click to focus passive buton grab side-effects
+ if ((e->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
+ (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) &&
+ (edata->outdelay))
+ {
+ecore_timer_del(edata->outdelay);
+edata->outdelay = NULL;
+return 0;
+ }
+ if (edata->outdelay)
+ {
+ecore_timer_del(edata->outdelay);
+edata->outdelay = NULL;
+_fake_out(ee);
+ }
+
/* if (e->mode != ECORE_X_EVENT_MODE
[EGIT] [core/enlightenment] master 02/02: fix unsafe list removal while walking it
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a4b70e791a81f00fa2bb1025de2d0ef6ad9c8712
commit a4b70e791a81f00fa2bb1025de2d0ef6ad9c8712
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 18 21:39:53 2013 +0900
fix unsafe list removal while walking it
---
src/bin/e_pointer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 11c0f0b..021f565 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -178,11 +178,11 @@ e_pointer_type_pop(E_Pointer *p,
void *obj,
const char *type)
{
- Eina_List *l;
+ Eina_List *l, *l_next;
E_Pointer_Stack *stack;
if (!p) return;
- EINA_LIST_FOREACH(p->stack, l, stack)
+ EINA_LIST_FOREACH_SAFE(p->stack, l, l_next, stack)
{
if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type
{
--
[EGIT] [core/enlightenment] master 01/02: gfix focus display in click-to-focus with keyboard triggered menus
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=19da294e8df6658b2961e3a3f4e7cd3e00d6c45b
commit 19da294e8df6658b2961e3a3f4e7cd3e00d6c45b
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 18 19:49:05 2013 +0900
gfix focus display in click-to-focus with keyboard triggered menus
---
src/bin/e_menu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 9e09781..3e5aa62 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1245,7 +1245,7 @@ e_menu_idler_before(void)
{
if (_e_menu_win)
{
- e_grabinput_release(0, _e_menu_win);
+ e_grabinput_release(_e_menu_win, _e_menu_win);
_e_menu_win = 0;
_mouse_up_feed(evas_object_evas_get(_e_menu_event_rect), 0);
E_FREE_FUNC(_e_menu_event_rect, evas_object_del);
@@ -2009,7 +2009,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
if (!_e_menu_win)
{
_e_menu_win = e_comp_get(zone)->ee_win;
-if (!e_grabinput_get(0, 0, _e_menu_win))
+if (!e_grabinput_get(_e_menu_win, 0, _e_menu_win))
{
_e_menu_win = 0;
return;
--
[EGIT] [core/enlightenment] master 01/02: clock - use system timerfd change event in ecore and fix eio monitor of tz
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fdbb4525a257031a28980727d0c2885351d62399
commit fdbb4525a257031a28980727d0c2885351d62399
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 22 07:53:57 2013 +0100
clock - use system timerfd change event in ecore and fix eio monitor of tz
this now uses the system ecore timedate change event instead of a
local timerfd. centralized implementation now.
also it fixes yhe eio monitor to ALSO monitor /etc as well to detect
changes to timzesone and filter down to the files needed.
---
src/modules/clock/e_mod_main.c | 95 --
1 file changed, 37 insertions(+), 58 deletions(-)
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index b234de1..db5956c 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -3,9 +3,6 @@
#include
#include
-#ifdef HAVE_SYS_TIMERFD_H
-# include
-#endif
/* actual module specifics */
typedef struct _Instance Instance;
@@ -41,6 +38,7 @@ static void _clock_popup_free(Instance *inst);
static Eio_Monitor *clock_tz_monitor = NULL;
static Eio_Monitor *clock_tz2_monitor = NULL;
+static Eio_Monitor *clock_tzetc_monitor = NULL;
static Eina_List *clock_eio_handlers = NULL;
Config *clock_config = NULL;
@@ -49,9 +47,6 @@ static E_Config_DD *conf_item_edd = NULL;
static Eina_List *clock_instances = NULL;
static E_Action *act = NULL;
static Ecore_Timer *update_today = NULL;
-#ifdef HAVE_SYS_TIMERFD_H
-static Ecore_Fd_Handler *timerfd_handler = NULL;
-#endif
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
@@ -808,38 +803,49 @@ _e_mod_action_cb_mouse(E_Object *obj __UNUSED__, const
char *params, E_Binding_E
}
static Eina_Bool
-_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event
__UNUSED__)
+_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event)
{
- e_int_clock_instances_redo(EINA_TRUE);
- return ECORE_CALLBACK_RENEW;
-}
+ Eio_Monitor_Event *ev = event;
-static Eina_Bool
-_clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event
__UNUSED__)
-{
- eio_monitor_del(clock_tz_monitor);
- clock_tz_monitor = eio_monitor_add("/etc/localtime");
- eio_monitor_del(clock_tz2_monitor);
- clock_tz2_monitor = eio_monitor_add("/etc/timezone");
- return ECORE_CALLBACK_RENEW;
+ if ((ev->monitor == clock_tz_monitor) ||
+ (ev->monitor == clock_tz2_monitor) ||
+ (ev->monitor == clock_tzetc_monitor))
+ {
+if ((ev->filename) &&
+((!strcmp(ev->filename, "/etc/localtime")) ||
+ (!strcmp(ev->filename, "/etc/timezone"
+ {
+ e_int_clock_instances_redo(EINA_TRUE);
+ }
+ }
+ return ECORE_CALLBACK_PASS_ON;
}
-#ifdef HAVE_SYS_TIMERFD_H
static Eina_Bool
-_clock_fd_update(void *d __UNUSED__, Ecore_Fd_Handler *fdh)
+_clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event)
{
- char buf[64];
+ Eio_Monitor_Event *ev = event;
- if (read(ecore_main_fd_handler_fd_get(fdh), buf, sizeof(buf)) < 0)
+ if ((ev->monitor == clock_tz_monitor) ||
+ (ev->monitor == clock_tz2_monitor) ||
+ (ev->monitor == clock_tzetc_monitor))
{
-close(ecore_main_fd_handler_fd_get(fdh));
-timerfd_handler = ecore_main_fd_handler_del(timerfd_handler);
-return EINA_FALSE;
+eio_monitor_del(clock_tz_monitor);
+clock_tz_monitor = eio_monitor_add("/etc/localtime");
+eio_monitor_del(clock_tz2_monitor);
+clock_tz2_monitor = eio_monitor_add("/etc/timezone");
+eio_monitor_del(clock_tzetc_monitor);
+clock_tzetc_monitor = eio_monitor_add("/etc");
}
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_clock_time_update(void *d __UNUSED__, int type __UNUSED__, void *event
__UNUSED__)
+{
e_int_clock_instances_redo(EINA_TRUE);
- return EINA_TRUE;
+ return ECORE_CALLBACK_PASS_ON;
}
-#endif
/* module setup */
EAPI E_Module_Api e_modapi =
@@ -891,6 +897,7 @@ e_modapi_init(E_Module *m)
clock_config->module = m;
clock_tz_monitor = eio_monitor_add("/etc/localtime");
clock_tz2_monitor = eio_monitor_add("/etc/timezone");
+ clock_tzetc_monitor = eio_monitor_add("/etc");
E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_ERROR,
_clock_eio_error, NULL);
E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_FILE_CREATED,
_clock_eio_update, NULL);
E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_FILE_MODIFIED,
_clock_eio_update, NULL);
@@ -898,37 +905,10 @@ e_modapi_init(E_Module *m)
E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_SELF_DELETED,
_clock_e
[EGIT] [core/enlightenment] master 02/02: connman - tenatively add remove api - needs hooking into ui for "forget"
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5f60606ffe456b063cc8c6391ec11bcf6179a3ff
commit 5f60606ffe456b063cc8c6391ec11bcf6179a3ff
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 22 07:54:38 2013 +0100
connman - tenatively add remove api - needs hooking into ui for "forget"
---
src/modules/connman/E_Connman.h | 2 ++
src/modules/connman/e_connman.c | 48 +++--
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/modules/connman/E_Connman.h b/src/modules/connman/E_Connman.h
index 272233b..3e58d46 100644
--- a/src/modules/connman/E_Connman.h
+++ b/src/modules/connman/E_Connman.h
@@ -69,6 +69,7 @@ struct Connman_Service
{
Eldbus_Pending *connect;
Eldbus_Pending *disconnect;
+Eldbus_Pending *remov;
void *data;
} pending;
};
@@ -93,6 +94,7 @@ typedef void (*Econnman_Simple_Cb)(void *data, const char
*error);
bool econnman_service_connect(struct Connman_Service *cs, Econnman_Simple_Cb
cb, void *data);
bool econnman_service_disconnect(struct Connman_Service *cs,
Econnman_Simple_Cb cb, void *data);
+bool econnman_service_remove(struct Connman_Service *cs, Econnman_Simple_Cb
cb, void *data);
void econnman_powered_set(struct Connman_Manager *cm, Eina_Bool powered);
diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c
index 29649a9..b0113bd 100644
--- a/src/modules/connman/e_connman.c
+++ b/src/modules/connman/e_connman.c
@@ -247,6 +247,11 @@ static void _service_free(struct Connman_Service *cs)
eldbus_pending_cancel(cs->pending.disconnect);
free(cs->pending.data);
}
+ if (cs->pending.remov)
+ {
+eldbus_pending_cancel(cs->pending.remov);
+free(cs->pending.data);
+ }
free(cs->name);
_eina_str_array_clean(cs->security);
@@ -294,6 +299,7 @@ static void _service_connection_cb(void *data, const
Eldbus_Message *msg,
cd->cs->pending.connect = NULL;
cd->cs->pending.disconnect = NULL;
+ cd->cs->pending.remov = NULL;
cd->cs->pending.data = NULL;
free(cd);
@@ -306,10 +312,10 @@ bool econnman_service_connect(struct Connman_Service *cs,
EINA_SAFETY_ON_NULL_RETURN_VAL(cs, false);
- if (cs->pending.connect || cs->pending.disconnect)
+ if (cs->pending.connect || cs->pending.disconnect || cs->pending.remov)
{
-ERR("Pending connection: connect=%p disconnect=%p",
cs->pending.connect,
-cs->pending.disconnect);
+ERR("Pending connection: connect=%p disconnect=%p remov=%p",
cs->pending.connect,
+cs->pending.disconnect, cs->pending.remov);
return false;
}
@@ -336,10 +342,10 @@ bool econnman_service_disconnect(struct Connman_Service
*cs,
EINA_SAFETY_ON_NULL_RETURN_VAL(cs, false);
- if (cs->pending.connect || cs->pending.disconnect)
+ if (cs->pending.connect || cs->pending.disconnect || cs->pending.remov)
{
-ERR("Pending connection: connect=%p disconnect=%p",
cs->pending.connect,
-cs->pending.disconnect);
+ERR("Pending connection: connect=%p disconnect=%p remov=%p",
cs->pending.connect,
+cs->pending.disconnect, cs->pending.remov);
return false;
}
@@ -359,6 +365,36 @@ fail:
return false;
}
+bool econnman_service_remove(struct Connman_Service *cs,
+ Econnman_Simple_Cb cb, void *data)
+{
+ struct connection_data *cd;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(cs, false);
+
+ if (cs->pending.connect || cs->pending.disconnect || cs->pending.remov)
+ {
+ERR("Pending connection: connect=%p disconnect=%p remov=%p",
cs->pending.connect,
+cs->pending.disconnect, cs->pending.remov);
+return false;
+ }
+
+ cd = calloc(1, sizeof(*cd));
+ EINA_SAFETY_ON_NULL_GOTO(cd, fail);
+
+ cd->cs = cs;
+ cd->cb = cb;
+ cd->user_data = data;
+
+ cs->pending.connect = eldbus_proxy_call(cs->service_iface, "Remove",
+ _service_connection_cb, cd,
+ -1, "");
+ return true;
+
+fail:
+ return false;
+}
+
static struct Connman_Service *_manager_find_service_stringshared(
struct Connman_Manager *cm, const char *path)
{
--
[EGIT] [core/efl] master 01/01: for ecore system time changed - use a real time in the future, not time 0
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7736a96c4f5c7f53f721b0d659264d18dd4a1134 commit 7736a96c4f5c7f53f721b0d659264d18dd4a1134 Author: Carsten Haitzler (Rasterman) Date: Tue Oct 22 08:11:00 2013 +0100 for ecore system time changed - use a real time in the future, not time 0 for ECORE_EVENT_SYSTEM_TIMEDATE_CHANGED we use a timerfd on linux (and also support talking to systemd) to detet time/date changes. the timerfd was set up to go off at the absolute time of 0. since that is almost always... in the past.. lets set a REAL time in the future. (almost end of time) --- src/lib/ecore/ecore_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 3a6210d..045ccb1 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -803,6 +803,7 @@ detect_time_changes_start(void) if (realtime_fd < 0) return; memset(&its, 0, sizeof(its)); + its.it_value.tv_sec += 0xfff0; // end of time - 0xf if (timerfd_settime(realtime_fd, TFD_TIMER_ABSTIME | TFD_TIMER_CANCELON_SET, &its, NULL) < 0) --
[EGIT] [core/enlightenment] master 01/01: backlight - fix dimming if normal level less than dim level
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1c5aa36ee95a9e33e3a41f8f32d2f1bbe13aab1c
commit 1c5aa36ee95a9e33e3a41f8f32d2f1bbe13aab1c
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 22 11:26:59 2013 +0100
backlight - fix dimming if normal level less than dim level
if dim level is set to 20% but normal level has been moved to 10%...
when we dim dont RAISE bl level to 20% - do nothing if dim > normal.
---
src/bin/e_backlight.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
index 4dfb894..aeaf103 100644
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@@ -241,8 +241,11 @@ e_backlight_level_get(E_Zone *zone __UNUSED__)
EAPI void
e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
{
+ E_Backlight_Mode pmode;
+
// zone == NULL == everything
if (e_config->backlight.mode == mode) return;
+ pmode = e_config->backlight.mode;
e_config->backlight.mode = mode;
if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
{
@@ -254,7 +257,10 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
}
else if (e_config->backlight.mode == E_BACKLIGHT_MODE_DIM)
{
-e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
+if ((pmode != E_BACKLIGHT_MODE_NORMAL) ||
+((pmode == E_BACKLIGHT_MODE_NORMAL) &&
+ (e_config->backlight.normal > e_config->backlight.dim)))
+ e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
}
else if (e_config->backlight.mode == E_BACKLIGHT_MODE_MAX)
e_backlight_level_set(zone, 1.0, -1.0);
--
[EGIT] [core/elementary] master 01/02: scrollable - try using a job for move events for scrollinh instead of animator
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=7a7ea7d61e8a321dcd2046d07a0473e57a87d8b2
commit 7a7ea7d61e8a321dcd2046d07a0473e57a87d8b2
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 21 21:04:01 2013 +0900
scrollable - try using a job for move events for scrollinh instead of
animator
---
src/lib/elm_interface_scrollable.c | 39 +-
src/lib/elm_interface_scrollable.h | 3 ++-
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 5441bdb..30f19d1 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1446,9 +1446,10 @@
_elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_animator)
+ if (sid->down.hold_active)
{
-ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
+sid->down.hold_active = EINA_FALSE;
+ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
@@ -1768,9 +1769,10 @@ _elm_scroll_content_region_show_internal(Evas_Object
*obj,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_animator)
+ if (sid->down.hold_active)
{
-ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
+sid->down.hold_active = EINA_FALSE;
+ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -1879,7 +1881,7 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
if (sid->down.now || sid->down.momentum_animator ||
sid->down.bounce_x_animator || sid->down.bounce_y_animator ||
- sid->down.hold_animator || sid->down.onhold_animator ||
+ sid->down.hold_active || sid->down.onhold_animator ||
sid->scrollto.x.animator || sid->scrollto.y.animator)
return;
@@ -2582,9 +2584,10 @@ _elm_scroll_mouse_up_event_cb(void *data,
}
}
}
-if (sid->down.hold_animator)
+if (sid->down.hold_active)
{
- ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
+ sid->down.hold_active = EINA_FALSE;
+ ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
@@ -2667,9 +2670,9 @@ _elm_scroll_mouse_down_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_animator)
+ if (sid->down.hold_active)
{
-ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
+ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -2865,12 +2868,14 @@
_elm_scroll_down_coord_eval(Elm_Scrollable_Smart_Interface_Data *sid,
_elm_config->thumbscroll_border_friction;
}
-static Eina_Bool
-_elm_scroll_hold_animator(void *data)
+static void
+_elm_scroll_hold_job(void *data)
{
Elm_Scrollable_Smart_Interface_Data *sid = data;
Evas_Coord ox = 0, oy = 0, fx = 0, fy = 0;
+ sid->down.hold_active = EINA_FALSE;
+
fx = sid->down.hold_x;
fy = sid->down.hold_y;
@@ -2977,8 +2982,6 @@ _elm_scroll_hold_animator(void *data)
#endif
eo_do(sid->obj, elm_scrollable_interface_content_pos_set(ox, oy,
EINA_TRUE));
-
- return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
@@ -3276,9 +3279,11 @@ _elm_scroll_mouse_move_event_cb(void *data,
sid->down.hold_x = x;
sid->down.hold_y = y;
- if (!sid->down.hold_animator)
- sid->down.hold_animator =
- ecore_animator_add(_elm_scroll_hold_animator, sid);
+ if (!sid->down.hold_job)
+ ecore_job_del(sid->down.hold_job);
+ sid->down.hold_job =
+ ecore_job_add(_elm_scroll_hold_job, sid);
+ sid->down.hold_active = EINA_TRUE;
}
else
{
@@ -4573,7 +4578,7 @@ _elm_scroll_interface_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
eo_do(obj, elm_scrollable_interface_content_set(NULL));
if (!sid->extern_pan) evas_object_del(sid->pan_obj);
- if (sid->down.hold_animator) ecore_animator_del(sid->down.hold_animator);
+ if (sid->down.hold_job) ecore_job_del(sid-&
[EGIT] [core/elementary] master 02/02: elm scroller - also allow animator still to ALSO drive scroll for smoothing
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e52ddca9b0d424c5e1dfeeec501f4a95544e3dbb
commit e52ddca9b0d424c5e1dfeeec501f4a95544e3dbb
Author: Carsten Haitzler (Rasterman)
Date: Tue Oct 22 11:01:00 2013 +0100
elm scroller - also allow animator still to ALSO drive scroll for smoothing
---
src/lib/elm_interface_scrollable.c | 22 +-
src/lib/elm_interface_scrollable.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 30f19d1..0a21041 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1449,6 +1449,7 @@
_elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
if (sid->down.hold_active)
{
sid->down.hold_active = EINA_FALSE;
+ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -1772,6 +1773,7 @@ _elm_scroll_content_region_show_internal(Evas_Object *obj,
if (sid->down.hold_active)
{
sid->down.hold_active = EINA_FALSE;
+ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
@@ -2587,6 +2589,7 @@ _elm_scroll_mouse_up_event_cb(void *data,
if (sid->down.hold_active)
{
sid->down.hold_active = EINA_FALSE;
+ ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -2672,6 +2675,7 @@ _elm_scroll_mouse_down_event_cb(void *data,
}
if (sid->down.hold_active)
{
+ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
@@ -2875,7 +2879,7 @@ _elm_scroll_hold_job(void *data)
Evas_Coord ox = 0, oy = 0, fx = 0, fy = 0;
sid->down.hold_active = EINA_FALSE;
-
+
fx = sid->down.hold_x;
fy = sid->down.hold_y;
@@ -2985,6 +2989,18 @@ _elm_scroll_hold_job(void *data)
}
static Eina_Bool
+_elm_scroll_hold_animator(void *data)
+{
+ Elm_Scrollable_Smart_Interface_Data *sid = data;
+
+ if (!sid->down.hold_job)
+ ecore_job_del(sid->down.hold_job);
+ sid->down.hold_job =
+ ecore_job_add(_elm_scroll_hold_job, sid);
+ return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
_elm_scroll_on_hold_animator(void *data)
{
double t, td;
@@ -3279,6 +3295,9 @@ _elm_scroll_mouse_move_event_cb(void *data,
sid->down.hold_x = x;
sid->down.hold_y = y;
+ if (!sid->down.hold_animator)
+ sid->down.hold_animator =
+ ecore_animator_add(_elm_scroll_hold_animator, sid);
if (!sid->down.hold_job)
ecore_job_del(sid->down.hold_job);
sid->down.hold_job =
@@ -4579,6 +4598,7 @@ _elm_scroll_interface_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
if (!sid->extern_pan) evas_object_del(sid->pan_obj);
if (sid->down.hold_job) ecore_job_del(sid->down.hold_job);
+ if (sid->down.hold_animator) ecore_animator_del(sid->down.hold_animator);
if (sid->down.onhold_animator)
ecore_animator_del(sid->down.onhold_animator);
if (sid->down.momentum_animator)
ecore_animator_del(sid->down.momentum_animator);
if (sid->down.bounce_x_animator)
ecore_animator_del(sid->down.bounce_x_animator);
diff --git a/src/lib/elm_interface_scrollable.h
b/src/lib/elm_interface_scrollable.h
index 5b03313..49865c1 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -1120,6 +1120,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
int hdir, vdir;
Ecore_Job *hold_job;
+ Ecore_Animator *hold_animator;
Ecore_Animator *onhold_animator;
Ecore_Animator *momentum_animator;
Ecore_Animator *bounce_x_animator;
--
[EGIT] [core/enlightenment] master 01/01: remove not connect. tnks gustavo
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ab3930c66aaec78c7793d017bb9b2cbefc7568bb commit ab3930c66aaec78c7793d017bb9b2cbefc7568bb Author: Carsten Haitzler (Rasterman) Date: Tue Oct 22 15:55:00 2013 +0100 remove not connect. tnks gustavo --- src/modules/connman/e_connman.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c index b0113bd..a17fcda 100644 --- a/src/modules/connman/e_connman.c +++ b/src/modules/connman/e_connman.c @@ -386,9 +386,9 @@ bool econnman_service_remove(struct Connman_Service *cs, cd->cb = cb; cd->user_data = data; - cs->pending.connect = eldbus_proxy_call(cs->service_iface, "Remove", - _service_connection_cb, cd, - -1, ""); + cs->pending.remov = eldbus_proxy_call(cs->service_iface, "Remove", + _service_connection_cb, cd, + -1, ""); return true; fail: --
[EGIT] [core/enlightenment] master 01/01: suspend/resume handler in clock - fix and use handler that doesnt need eio ev
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=221631ef192342d4d70c490b1716e1b513e63f34 commit 221631ef192342d4d70c490b1716e1b513e63f34 Author: Carsten Haitzler (Rasterman) Date: Wed Oct 23 10:03:56 2013 +0100 suspend/resume handler in clock - fix and use handler that doesnt need eio ev --- src/modules/clock/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index db5956c..86625c8 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -904,7 +904,7 @@ e_modapi_init(E_Module *m) E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_FILE_DELETED, _clock_eio_update, NULL); E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_SELF_DELETED, _clock_eio_update, NULL); E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_SELF_RENAME, _clock_eio_update, NULL); - E_LIST_HANDLER_APPEND(clock_eio_handlers, E_EVENT_SYS_RESUME, _clock_eio_update, NULL); + E_LIST_HANDLER_APPEND(clock_eio_handlers, E_EVENT_SYS_RESUME, _clock_time_update, NULL); E_LIST_HANDLER_APPEND(clock_eio_handlers, ECORE_EVENT_SYSTEM_TIMEDATE_CHANGED, _clock_time_update, NULL); e_gadcon_provider_register(&_gadcon_class); --
[EGIT] [core/elementary] master 01/02: Revert "elm scroller - also allow animator still to ALSO drive scroll for smoothing"
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=135d7272468ded8e87e981bc3f1aff23c20d7647
commit 135d7272468ded8e87e981bc3f1aff23c20d7647
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 25 03:59:55 2013 +0100
Revert "elm scroller - also allow animator still to ALSO drive scroll for
smoothing"
This reverts commit e52ddca9b0d424c5e1dfeeec501f4a95544e3dbb.
This reverts commit 7a7ea7d61e8a321dcd2046d07a0473e57a87d8b2.
---
src/lib/elm_interface_scrollable.c | 41 --
src/lib/elm_interface_scrollable.h | 2 --
2 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 0a21041..5441bdb 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1446,11 +1446,9 @@
_elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_active)
+ if (sid->down.hold_animator)
{
-sid->down.hold_active = EINA_FALSE;
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
-ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
@@ -1770,11 +1768,9 @@ _elm_scroll_content_region_show_internal(Evas_Object
*obj,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_active)
+ if (sid->down.hold_animator)
{
-sid->down.hold_active = EINA_FALSE;
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
-ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -1883,7 +1879,7 @@ _elm_scroll_wanted_region_set(Evas_Object *obj)
if (sid->down.now || sid->down.momentum_animator ||
sid->down.bounce_x_animator || sid->down.bounce_y_animator ||
- sid->down.hold_active || sid->down.onhold_animator ||
+ sid->down.hold_animator || sid->down.onhold_animator ||
sid->scrollto.x.animator || sid->scrollto.y.animator)
return;
@@ -2586,11 +2582,9 @@ _elm_scroll_mouse_up_event_cb(void *data,
}
}
}
-if (sid->down.hold_active)
+if (sid->down.hold_animator)
{
- sid->down.hold_active = EINA_FALSE;
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
- ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
@@ -2673,10 +2667,9 @@ _elm_scroll_mouse_down_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
- if (sid->down.hold_active)
+ if (sid->down.hold_animator)
{
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);
-ELM_SAFE_FREE(sid->down.hold_job, ecore_job_del);
_elm_scroll_drag_stop(sid);
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
@@ -2872,14 +2865,12 @@
_elm_scroll_down_coord_eval(Elm_Scrollable_Smart_Interface_Data *sid,
_elm_config->thumbscroll_border_friction;
}
-static void
-_elm_scroll_hold_job(void *data)
+static Eina_Bool
+_elm_scroll_hold_animator(void *data)
{
Elm_Scrollable_Smart_Interface_Data *sid = data;
Evas_Coord ox = 0, oy = 0, fx = 0, fy = 0;
- sid->down.hold_active = EINA_FALSE;
-
fx = sid->down.hold_x;
fy = sid->down.hold_y;
@@ -2986,17 +2977,7 @@ _elm_scroll_hold_job(void *data)
#endif
eo_do(sid->obj, elm_scrollable_interface_content_pos_set(ox, oy,
EINA_TRUE));
-}
-static Eina_Bool
-_elm_scroll_hold_animator(void *data)
-{
- Elm_Scrollable_Smart_Interface_Data *sid = data;
-
- if (!sid->down.hold_job)
- ecore_job_del(sid->down.hold_job);
- sid->down.hold_job =
- ecore_job_add(_elm_scroll_hold_job, sid);
return ECORE_CALLBACK_RENEW;
}
@@ -3297,12 +3278,7 @@ _elm_scroll_mouse_move_event_cb(void *data,
sid->down.hold_y = y;
if (!sid->down.hold_animator)
sid->down.hold_animator =
- ecore_animator_add(_elm_scroll_hold_animator, sid);
- if (!sid->down.hold_job)
- ecore_job_del(sid->down.hold_job);
- sid->down.hold_job =
- ecore_job_add(_elm_scroll_hold_job, sid);
- sid->down.hold_active = EINA_TRUE;
+ ecore_animator_ad
[EGIT] [core/elementary] master 02/02: elm scroller - try a simpler approach - animator queues idle enterer
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4b2ed935085ccac27dcac0c1cae6e931dbb45e41
commit 4b2ed935085ccac27dcac0c1cae6e931dbb45e41
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 25 04:36:28 2013 +0100
elm scroller - try a simpler approach - animator queues idle enterer
this allows the idle enterer to pick up all prior stored events like
move coords etc. just before going idle (and rendering).
---
src/lib/elm_interface_scrollable.c | 33 -
src/lib/elm_interface_scrollable.h | 1 +
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 5441bdb..8ed1e71 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1452,6 +1452,11 @@
_elm_scroll_bounce_eval(Elm_Scrollable_Smart_Interface_Data *sid)
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
+ if (sid->down.hold_enterer)
+ {
+ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
+ }
+
eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&mx, &my));
eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py));
@@ -1775,6 +1780,10 @@ _elm_scroll_content_region_show_internal(Evas_Object
*obj,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
+ if (sid->down.hold_enterer)
+ {
+ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
+ }
if (sid->down.momentum_animator)
{
ELM_SAFE_FREE(sid->down.momentum_animator, ecore_animator_del);
@@ -2588,6 +2597,10 @@ _elm_scroll_mouse_up_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
+if (sid->down.hold_enterer)
+ {
+ ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
+ }
if (sid->down.scroll)
{
ev->event_flags |= EVAS_EVENT_FLAG_ON_SCROLL;
@@ -2674,6 +2687,10 @@ _elm_scroll_mouse_down_event_cb(void *data,
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
+ if (sid->down.hold_enterer)
+ {
+ELM_SAFE_FREE(sid->down.hold_enterer, ecore_idle_enterer_del);
+ }
if (sid->down.momentum_animator)
{
ELM_SAFE_FREE(sid->down.momentum_animator, ecore_animator_del);
@@ -2866,11 +2883,13 @@
_elm_scroll_down_coord_eval(Elm_Scrollable_Smart_Interface_Data *sid,
}
static Eina_Bool
-_elm_scroll_hold_animator(void *data)
+_elm_scroll_hold_enterer(void *data)
{
Elm_Scrollable_Smart_Interface_Data *sid = data;
Evas_Coord ox = 0, oy = 0, fx = 0, fy = 0;
+ sid->down.hold_enterer = NULL;
+
fx = sid->down.hold_x;
fy = sid->down.hold_y;
@@ -2978,6 +2997,17 @@ _elm_scroll_hold_animator(void *data)
eo_do(sid->obj, elm_scrollable_interface_content_pos_set(ox, oy,
EINA_TRUE));
+ return EINA_FALSE;
+}
+
+static Eina_Bool
+_elm_scroll_hold_animator(void *data)
+{
+ Elm_Scrollable_Smart_Interface_Data *sid = data;
+
+ if (sid->down.hold_enterer) ecore_idle_enterer_del(sid->down.hold_enterer);
+ sid->down.hold_enterer =
+ ecore_idle_enterer_before_add(_elm_scroll_hold_enterer, sid);
return ECORE_CALLBACK_RENEW;
}
@@ -4573,6 +4603,7 @@ _elm_scroll_interface_del(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
eo_do(obj, elm_scrollable_interface_content_set(NULL));
if (!sid->extern_pan) evas_object_del(sid->pan_obj);
+ if (sid->down.hold_enterer) ecore_idle_enterer_del(sid->down.hold_enterer);
if (sid->down.hold_animator) ecore_animator_del(sid->down.hold_animator);
if (sid->down.onhold_animator)
ecore_animator_del(sid->down.onhold_animator);
if (sid->down.momentum_animator)
ecore_animator_del(sid->down.momentum_animator);
diff --git a/src/lib/elm_interface_scrollable.h
b/src/lib/elm_interface_scrollable.h
index 98fa9b5..da1b21a 100644
--- a/src/lib/elm_interface_scrollable.h
+++ b/src/lib/elm_interface_scrollable.h
@@ -1119,6 +1119,7 @@ struct _Elm_Scrollable_Smart_Interface_Data
Evas_Coord locked_x, locked_y;
int hdir, vdir;
+ Ecore_Idle_Enterer *hold_enterer;
Ecore_Animator *hold_animator;
Ecore_Animator *onhold_animator;
Ecore_Animator *momentum_animator;
--
[EGIT] [core/elementary] master 01/01: elm button theme - ensure only event part gets events
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d37c10987e70a8cf37245f55de9064e0f03afe56
commit d37c10987e70a8cf37245f55de9064e0f03afe56
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 25 22:15:44 2013 +0900
elm button theme - ensure only event part gets events
---
data/themes/edc/elm/button.edc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index 6ec4056..f3852b7 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -64,7 +64,7 @@ group { name: "elm/button/base/default";
}
}
parts {
- part { name: "base";
+ part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "button_normal.png";
image.border: 4 4 3 5;
@@ -733,7 +733,7 @@ group { name: "elm/button/base/media_player/prev/default";
visible: 1;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.offset: 3 1;
rel2.offset: -4 -2;
@@ -1134,7 +1134,7 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
visible: 1;
}
}
- part { name: "shine"; repeat_events: 1;
+ part { name: "shine"; mouse_events: 0;
insert_before: "event";
description { state: "default" 0.0;
fixed: 1 1;
--
[EGIT] [apps/terminology] master 01/01: maybe speed up term scroll byt skipping compare work
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=8585c3e9c273181d1d55b9495019cd8b0c220438
commit 8585c3e9c273181d1d55b9495019cd8b0c220438
Author: Carsten Haitzler (Rasterman)
Date: Fri Oct 25 23:37:10 2013 +0900
maybe speed up term scroll byt skipping compare work
since nothing useful is actually done unless either oldc or newc have
a media char - then try return/skip early. might speed up by 2-5%...
(i see 4.05 vs 4.15 or so cat times for a test case).
---
src/bin/termpty.c | 3 ++-
src/bin/termpty.h | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 89b0b34..fe7b4f9 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -1436,7 +1436,8 @@ _handle_block_codepoint_overwrite(Termpty *ty, int oldc,
int newc)
{
Termblock *tb;
int ido = 0, idn = 0;
-
+
+ if (!((oldc | newc) & 0x8000)) return;
if (oldc & 0x8000) ido = (oldc >> 18) & 0x1fff;
if (newc & 0x8000) idn = (newc >> 18) & 0x1fff;
if (((oldc & 0x8000) && (newc & 0x8000)) && (idn == ido)) return;
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index 13203b5..c5e4672 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -149,18 +149,18 @@ struct _Termcell
struct _Termsave
{
+ unsigned int gen : 8;
unsigned int comp : 1;
unsigned int z: 1;
- unsigned int gen : 8;
unsigned int w: 22;
Termcell cell[1];
};
struct _Termsavecomp
{
+ unsigned int gen : 8;
unsigned int comp : 1;
unsigned int z: 1;
- unsigned int gen : 8;
unsigned int w: 22; // compressed size in bytes
unsigned int wout; // output width in Termcells
};
--
[EGIT] [core/efl] master 01/01: evas gl engine related - fix elm image example 01 (T182).
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c4a45c75b15a3bcfb8bfd089a02cdaff3b7102f0
commit c4a45c75b15a3bcfb8bfd089a02cdaff3b7102f0
Author: Carsten Haitzler (Rasterman)
Date: Sat Oct 26 21:09:17 2013 +0900
evas gl engine related - fix elm image example 01 (T182).
this fixes https://phab.enlightenment.org/T182 as it is an issue with a
surface alloc overwriting an already allocated surface entirely inside
the general software image infra.
---
src/lib/evas/common/evas_image_main.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/lib/evas/common/evas_image_main.c
b/src/lib/evas/common/evas_image_main.c
index 38aac78..b9d64ce 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -571,16 +571,18 @@ _evas_common_rgba_image_dirty(Image_Entry *ie_dst, const
Image_Entry *ie_src)
evas_common_rgba_image_scalecache_dirty((Image_Entry *)ie_src);
evas_common_rgba_image_scalecache_dirty(ie_dst);
evas_cache_image_load_data(&src->cache_entry);
- if (_evas_common_rgba_image_surface_alloc(&dst->cache_entry,
- src->cache_entry.w,
src->cache_entry.h))
+ if (!evas_cache_image_pixels(ie_dst))
{
+if (_evas_common_rgba_image_surface_alloc(&dst->cache_entry,
+ src->cache_entry.w,
src->cache_entry.h))
+ {
#ifdef EVAS_CSERVE2
-// if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src);
-if (ie_src->data1) ERR("Shouldn't reach this point since we are using
cache2.");
+ // if (ie_src->data1) evas_cserve2_image_free((Image_Entry*)
ie_src);
+ if (ie_src->data1) ERR("Shouldn't reach this point since we are
using cache2.");
#endif
-return 1;
+ return 1;
+ }
}
-
#ifdef EVAS_CSERVE2
// if (ie_src->data1) evas_cserve2_image_free((Image_Entry*) ie_src);
if (ie_src->data1) ERR("Shouldn't reach this point since we are using
cache2.");
--
[EGIT] [core/elementary] master 01/01: add another example to ignores
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=88e58ba5ab18b260a499828c052acb084499a6f4 commit 88e58ba5ab18b260a499828c052acb084499a6f4 Author: Carsten Haitzler (Rasterman) Date: Sat Oct 26 23:51:10 2013 +0900 add another example to ignores --- src/examples/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/examples/.gitignore b/src/examples/.gitignore index 2789245..971ef8e 100644 --- a/src/examples/.gitignore +++ b/src/examples/.gitignore @@ -105,3 +105,4 @@ /prefs_example_03.epb /web_example_01 /web_example_02 +/track_example_01 --
[EGIT] [website/www] master 01/01: no longer e dev day
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=db4abec84be497c5afa11ac8c0605fdae280dbb7 commit db4abec84be497c5afa11ac8c0605fdae280dbb7 Author: Carsten Haitzler (Rasterman) Date: Sun Oct 27 19:26:07 2013 +0900 no longer e dev day --- public_html/p/index/en-body | 18 -- 1 file changed, 18 deletions(-) diff --git a/public_html/p/index/en-body b/public_html/p/index/en-body index eaaa8e0..267325d 100644 --- a/public_html/p/index/en-body +++ b/public_html/p/index/en-body @@ -1,21 +1,3 @@ - - - Enlightenment Developer Day - October 20, 2013 - - https://phab.enlightenment.org/phame/live/3/post/enlightenment_developer_day_2013/> -Enlightenment Developer Day, 2013 - - is on again in Edinburgh, Scotland. Please come and enjoy in the - festivities. Please - https://phab.enlightenment.org/w/enlightenment_developer_day_2013/> -see the Wiki Page - - for more details. - - - - --
[EGIT] [core/efl] master 01/01: evas - cover corner case for native surface shared refs on obj delete
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9f690ba390fe0922df10cdefe07db8680d5a088f
commit 9f690ba390fe0922df10cdefe07db8680d5a088f
Author: Carsten Haitzler (Rasterman)
Date: Mon Oct 28 10:26:32 2013 +0900
evas - cover corner case for native surface shared refs on obj delete
---
src/lib/evas/canvas/evas_object_image.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 5b2ef93..5178e1b 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2625,12 +2625,23 @@ _image_video_surface_caps_get(Eo *eo_obj EINA_UNUSED,
void *_pd, va_list *list)
*caps = (!o->video_surface ? 0 : o->pixels->video_caps);
}
+static void
+_on_image_native_surface_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj, void *einfo EINA_UNUSED)
+{
+ evas_object_image_native_surface_set(obj, NULL);
+}
+
EAPI void
evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface
*surf)
{
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
+ evas_object_event_callback_del_full
+ (eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL);
+ if (surf) // We need to unset native surf on del to remove shared hash refs
+ evas_object_event_callback_add
+ (eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL);
eo_do(eo_obj, evas_obj_image_native_surface_set(surf));
}
--
[EGIT] [core/efl] master 02/02: evas - gif loader rewrite (clean up code, document it a lot AND fix bugs)
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=309e287b7c5ca4fb505d7756748d01da5c0fc203
commit 309e287b7c5ca4fb505d7756748d01da5c0fc203
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 30 18:16:09 2013 +0900
evas - gif loader rewrite (clean up code, document it a lot AND fix bugs)
after several days of beating head on desk, i gave up trying to find
the exact cause of some gifs not rendering right as animated gifs due
to the loader. it had something to do with dispose mode handling and
which frame it was applied to. i noticed the structure made it also
hard to fix, so this re-structures the entire thing with cleaner code,
less code AND more comments, with a limited memory cache (512k) for
previous frames per image (to avoid eating up huge memory blobs for
big/long animations - though at the expense of cpu), and with some
notes for future fixes - like fixing the "load 2 copies of the same
animated gif" issue... that's another day.
this does fix https://phab.enlightenment.org/T443 along with many
other things.
---
src/modules/evas/loaders/gif/evas_image_load_gif.c | 1416 +---
1 file changed, 602 insertions(+), 814 deletions(-)
diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c
b/src/modules/evas/loaders/gif/evas_image_load_gif.c
index 6c2c634..3f2ef53 100644
--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c
@@ -8,315 +8,210 @@
#include
-#ifndef MIN
-# define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
-typedef struct _Gif_Frame Gif_Frame;
-
-typedef enum _Frame_Load_Type
-{
- LOAD_FRAME_NONE = 0,
- LOAD_FRAME_INFO = 1,
- LOAD_FRAME_DATA = 2,
- LOAD_FRAME_DATA_INFO = 3
-} Frame_Load_Type;
-
-struct _Gif_Frame
-{
- struct {
- /* Image descriptor */
- intx;
- inty;
- intw;
- inth;
- intinterlace;
- } image_des;
-
- struct {
- /* Graphic Control*/
- intdisposal;
- inttransparent;
- intdelay;
- intinput;
- } frame_info;
- int bg_val;
-};
+typedef struct _Frame_Info Frame_Info;
+typedef struct _Loader_Info Loader_Info;
-typedef struct _Evas_Loader_Internal Evas_Loader_Internal;
-struct _Evas_Loader_Internal
+struct _Loader_Info
{
Eina_File *f;
Evas_Image_Load_Opts *opts;
Evas_Image_Animated *animated;
};
-static Eina_Bool evas_image_load_specific_frame(Eina_File *f, const
Evas_Image_Load_Opts *opts, Evas_Image_Property *prop, Evas_Image_Animated
*animated, int frame_index, int *error);
+struct _Frame_Info
+{
+ int x, y, w, h;
+ unsigned short delay; // delay time in 1/100ths of a sec
+ short transparent : 10; // -1 == not, anything else == index
+ short dispose : 6; // 0, 1, 2, 3 (others invalid)
+ short interlace : 1; // interlaced or not
+};
-#define byte2_to_int(a,b) (((b)<<8)|(a))
+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#define LOADERR(x) \
+do { \
+ *error = (x); \
+ goto on_error; \
+} while (0)
+#define PIX(_x, _y) rows[yin + _y][xin + _x]
+#define CMAP(_v) cmap->Colors[_v]
+#define PIXLK(_p) ARGB_JOIN(0xff, CMAP(_p).Red, CMAP(_p).Green, CMAP(_p).Blue)
-#define FRAME_MAX 1024
+// utility funcs...
-/* find specific frame in image entry */
-static Eina_Bool
-_find_frame(Evas_Image_Animated *animated, int frame_index, Image_Entry_Frame
**frame)
+// brute force find frame index - gifs are normally saml so ok for now
+static Image_Entry_Frame *
+_find_frame(Evas_Image_Animated *animated, int index)
{
Eina_List *l;
- Image_Entry_Frame *hit_frame = NULL;
+ Image_Entry_Frame *frame;
- if (!animated->frames) return EINA_FALSE;
-
- EINA_LIST_FOREACH(animated->frames, l, hit_frame)
+ if (!animated->frames) return NULL;
+ EINA_LIST_FOREACH(animated->frames, l, frame)
{
-if (hit_frame->index == frame_index)
- {
- *frame = hit_frame;
- return EINA_TRUE;
- }
+if (frame->index == index) return frame;
}
- return EINA_FALSE;
+ return NULL;
}
-static Eina_Bool
-_find_close_frame(Evas_Image_Animated *animated, int frame_index,
Image_Entry_Frame **frame)
-{
- Eina_Bool hit = EINA_FALSE;
- int i;
-
- i = frame_index -1;
-
- if (!animated->frames) return EINA_FALSE;
-
- for (; i > 0; i--)
-{
- hit = _find_frame(animated, i, frame);
- if (hit)
- return EINA_TRUE;
-}
- return EINA_FALSE;
-}
-
-static Eina_Bool
-_evas_image_skip_frame(GifFileType *gif, int frame)
+// fill in am image with a specific rgba color value
+static void
+_fill_image(DATA32 *data, int rowpix, DATA32 val, int x, int y, int w, int h)
{
- int remain_frame = 0;
- GifRecordType rec;
-
- if (!gif) return EINA_FALS
[EGIT] [core/efl] master 01/02: evas - animated images. fix leak in not freeing the list of frames itself
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6c28aff7a0ac5c917d03f9f275ce3aa0dd749d1c
commit 6c28aff7a0ac5c917d03f9f275ce3aa0dd749d1c
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 30 18:08:10 2013 +0900
evas - animated images. fix leak in not freeing the list of frames itself
---
src/lib/evas/common/evas_image_main.c | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/common/evas_image_main.c
b/src/lib/evas/common/evas_image_main.c
index b9d64ce..1492d80 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -291,16 +291,13 @@ _evas_common_rgba_image_delete(Image_Entry *ie)
if (ie->animated.frames)
{
-Eina_List *l;
Image_Entry_Frame *frame;
-EINA_LIST_FOREACH(ie->animated.frames, l, frame)
+
+EINA_LIST_FREE(ie->animated.frames, frame)
{
- if (frame)
- {
-if (frame->data) free(frame->data);
-if (frame->info) free(frame->info);
-free (frame);
- }
+ if (frame->data) free(frame->data);
+ if (frame->info) free(frame->info);
+ free(frame);
}
}
if (ie->f && !ie->flags.given_mmap) eina_file_close(ie->f);
--
[EGIT] [core/elementary] master 01/01: compliance/licensing - clarify, fix formatting and point to tldrlegal.com
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c6a09bf72778d48d0d93e92ef58f73e77c913291 commit c6a09bf72778d48d0d93e92ef58f73e77c913291 Author: Carsten Haitzler (Rasterman) Date: Wed Oct 30 19:28:16 2013 +0900 compliance/licensing - clarify, fix formatting and point to tldrlegal.com --- COMPLIANCE | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/COMPLIANCE b/COMPLIANCE index 0b6593a..1d98aee 100644 --- a/COMPLIANCE +++ b/COMPLIANCE @@ -29,18 +29,19 @@ F.A.Q. Q. Where is the licensing information? A. See the COPYING file here in this directory. This is the proper legal -information you will need. +information you will need. It covers all of elementary, EXCEPT the +theme which is public domain (the text files only - images are not). Q. Do I need to make the source public of libraries or applications that I build on top of Elementary? -A. No. Even the default theme is public domain, whihc means you can +A. No. Even the default theme is public domain, which means you can make your own by copying it and starting from there, and you may license your copied variation any way you like. Q. Do I need to provide the source for Elementary? A. Yes. In general you do. If you are shipping any of the binaries or -libraries that are produced, you must provide the EXACT source code -used to build those binaries. So stick to doing this and you'll be fine. +libraries built from Elementary, you must provide the EXACT source code +used to build those binaries. Q. If I have to provide source, how should I do this? A. The best way is to provide a reference in an "about" dialog in the @@ -65,3 +66,8 @@ source code, provide them as part of the user interface in full (e.g. in a dialog), or as files in the filesystem, on actual printed material (manuals, papers) that accompany the product or in CD, DVD etc. media. + +Q. Is there a simpler list of do's and don'ts i can use? +A. Yes. See http://www.tldrlegal.com. specifically: + +http://www.tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1) --
[EGIT] [core/efl] master 01/01: compliance/licensing - clarify, fix formatting and point to tldrlegal.com
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b3debcc3e1651e41c419db422b465d9070c180b4 commit b3debcc3e1651e41c419db422b465d9070c180b4 Author: Carsten Haitzler (Rasterman) Date: Wed Oct 30 19:27:26 2013 +0900 compliance/licensing - clarify, fix formatting and point to tldrlegal.com --- COMPLIANCE | 24 ++-- COPYING| 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/COMPLIANCE b/COMPLIANCE index 1ee0023..ecd0c34 100644 --- a/COMPLIANCE +++ b/COMPLIANCE @@ -16,14 +16,16 @@ The simple advice files as printed material with your product and/or in a dialog (e.g. an "about" dialog) in your product user interface. 2. Provide a URL from which to be able to download "tar files" with -ALL of the source of EFL exactly as it was when used to compile the -binaries for your product that ships EFL. Keep this URL valid for the -lifetime of the product. +ALL of the source of this software exactly as it was when used to compile the +binaries for your product. Keep this URL valid for the lifetime of the product. 3. Unless you are doing PS3 (PSl1ght) development any libraries or applications you write that use EFL are yours and you do not need to -make the source available. +make the source available. That means if you link to EFL dynamically. +If you copy in EFL source into your application or library or +statically link, then you will need to provide full source of whatever +statically links or copies any of this software into yours. 4. If you made changes to EFL it would be appreciated if you -interacted with us (see http://www.enlightenment.org ) and provided the +interacted with us (see http://www.enlightenment.org) and provided the changes you made in patch form BEFORE you ship a product, so they may be reviewed to see if you have made any mistakes and perhaps have created problems you do not know of yet. @@ -44,7 +46,7 @@ relevant. Q. Do I need to provide the source for EFL? A. Yes. In general you do. If you are shipping any of the binaries or libraries that are produced, you must provide the EXACT source code -used to build those binaries. So stick to doing this and you'll be fine. +used to build those binaries. Q. If I have to provide source, how should I do this? A. The best way is to provide a reference in an "about" dialog in the @@ -69,3 +71,13 @@ source code, provide them as part of the user interface in full (e.g. in a dialog), or as files in the filesystem, on actual printed material (manuals, papers) that accompany the product or in CD, DVD etc. media. + +Q. Is there a simpler list of do's and don'ts i can use? +A. Yes. See http://www.tldrlegal.com. specifically: + +http://www.tldrlegal.com/license/bsd-2-clause-license-(freebsd) +http://www.tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1) +http://www.tldrlegal.com/license/gnu-general-public-license-v2-(gpl-2) +http://www.tldrlegal.com/license/zlib-libpng-license-(zlib) + +Then match this up with the licensing listed in COPYING. diff --git a/COPYING b/COPYING index 3aa431f..80f87c3 100644 --- a/COPYING +++ b/COPYING @@ -20,7 +20,7 @@ evas:licenses/COPYING.BSD embryo: licenses/COPYING.SMALL ecore: licenses/COPYING.BSD eio: licenses/COPYING.LGPL -eldbus: licenses/COPYING.LGPL +eldbus: licenses/COPYING.LGPL efreet: licenses/COPYING.BSD eeze:licenses/COPYING.BSD ephysics:licenses/COPYING.BSD --
[EGIT] [core/elementary] master 01/01: remove +x bit from .c file!
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=10dcfbea60e2ca19dce87f53244573b565355c89 commit 10dcfbea60e2ca19dce87f53244573b565355c89 Author: Carsten Haitzler (Rasterman) Date: Wed Oct 30 21:28:01 2013 +0900 remove +x bit from .c file! --- src/bin/test_image.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/bin/test_image.c b/src/bin/test_image.c old mode 100755 new mode 100644 --
[EGIT] [apps/terminology] master 01/01: unbreak inlined media being unparented when tab selector is used
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=5958eff3380552febfe4dba397ee04dae9ae31d8
commit 5958eff3380552febfe4dba397ee04dae9ae31d8
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 31 16:07:05 2013 +0900
unbreak inlined media being unparented when tab selector is used
82f4d3546a78a8f0280ac912816e86f6b2c77404 introduced this bug (oct 20
2013 - discomfitor). now missing a _smart_apply() causes the bug. why
- not sure.
---
src/bin/termio.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index cc234d3..4168566 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -4489,6 +4489,8 @@ termio_mouseover_suspend_pushpop(Evas_Object *obj, int
dir)
{
if (sd->anim) ecore_animator_del(sd->anim);
sd->anim = NULL;
+_smart_apply(obj);
+//evas_object_smart_callback_call(obj, "changed", NULL);
}
else
_smart_update_queue(obj, sd);
--
[EGIT] [apps/terminology] master 01/01: oops - i thought i committed this - remove commented out code from prev commit
raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=476915c5cfa355ec4bd24c9b327b594aa2eb119e commit 476915c5cfa355ec4bd24c9b327b594aa2eb119e Author: Carsten Haitzler (Rasterman) Date: Thu Oct 31 16:10:55 2013 +0900 oops - i thought i committed this - remove commented out code from prev commit --- src/bin/termio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index 4168566..d54d496 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -4490,7 +4490,6 @@ termio_mouseover_suspend_pushpop(Evas_Object *obj, int dir) if (sd->anim) ecore_animator_del(sd->anim); sd->anim = NULL; _smart_apply(obj); -//evas_object_smart_callback_call(obj, "changed", NULL); } else _smart_update_queue(obj, sd); --
[EGIT] [core/elementary] master 02/02: elm theme - add some api's to expose info so e can use elm's theme stuff
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=37fe9cc77144fe42e054a082ed58a4c52a961d35
commit 37fe9cc77144fe42e054a082ed58a4c52a961d35
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 31 23:22:18 2013 +0900
elm theme - add some api's to expose info so e can use elm's theme stuff
---
src/lib/elm_theme.c | 119
src/lib/elm_theme.h | 75 +
2 files changed, 194 insertions(+)
diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index 02fd673..65f09d1 100644
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -767,3 +767,122 @@ elm_theme_data_get(Elm_Theme *th, const char *key)
if (!th) th = &(theme_default);
return _elm_theme_data_find(th, key);
}
+
+EAPI const char *
+elm_theme_group_path_find(Elm_Theme *th, const char *group)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(group, NULL);
+ if (!th) th = &(theme_default);
+ return _elm_theme_group_file_find(th, group);
+}
+
+static Eina_List *
+_file_find_append(Eina_List *list, const char *home, const char *f)
+{
+ char buf[PATH_MAX];
+
+ if ((f[0] == '/') || ((f[0] == '.') && (f[1] == '/')) ||
+ ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')) ||
+ ((isalpha(f[0])) && (f[1] == ':')))
+ {
+list = eina_list_append(list, eina_stringshare_add(f));
+ }
+ else if (((f[0] == '~') && (f[1] == '/')))
+ {
+snprintf(buf, sizeof(buf), "%s/%s", home, f + 2);
+list = eina_list_append(list, eina_stringshare_add(buf));
+ }
+ else
+ {
+snprintf(buf, sizeof(buf), "%s/"ELEMENTARY_BASE_DIR"/themes/%s.edj",
home, f);
+list = eina_list_append(list, eina_stringshare_add(buf));
+snprintf(buf, sizeof(buf), "%s/themes/%s.edj", _elm_data_dir, f);
+list = eina_list_append(list, eina_stringshare_add(buf));
+ }
+ return list;
+}
+
+EAPI Eina_List *
+elm_theme_group_base_list(Elm_Theme *th, const char *base)
+{
+ Eina_List *list = NULL, *files = NULL, *coll, *l;
+ int len;
+ Eina_Stringshare *c, *c2, *f;
+ static const char *home = NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(base, NULL);
+ if (!th) th = &(theme_default);
+
+ // XXX: look results up in a hash for speed
+ len = strlen(base);
+ if (!home) // get homedir once only
+ {
+home = getenv("HOME");
+if (!home) home = "";
+ }
+ // go through overlay, themes and extensions in that order and build list
+ EINA_LIST_FOREACH(th->overlay, l, f)
+ files = _file_find_append(files, home, f);
+ EINA_LIST_FOREACH(th->themes, l, f)
+ files = _file_find_append(files, home, f);
+ EINA_LIST_FOREACH(th->extension, l, f)
+ files = _file_find_append(files, home, f);
+ // go through all possible theme files and find collections that match
+ EINA_LIST_FREE(files, f)
+ {
+coll = edje_file_collection_list(f);
+EINA_LIST_FREE(coll, c)
+ {
+ if (!strncmp(c, base, len)) // if base == start of collection str
+ {
+ EINA_LIST_FOREACH(list, l, c2) // check if already in list
+{
+ if (!strcmp(c, c2)) break;
+}
+ if (!l) // if not already in list append shared str to list
+{
+ c2 = eina_stringshare_add(c);
+ list = eina_list_append(list, c2);
+}
+ }
+ eina_stringshare_del(c);
+ }
+ }
+ // sort the list nicely at the end
+ list = eina_list_sort(list, 0, EINA_COMPARE_CB(strcmp));
+ // XXX: store results in hash for fast lookup...
+ return list;
+}
+
+EAPI const char *
+elm_theme_system_dir_get(void)
+{
+ static char *path = NULL;
+ char buf[PATH_MAX];
+
+ if (path) return path;
+ if (!path)
+ {
+snprintf(buf, sizeof(buf), "%s/themes", _elm_data_dir);
+path = strdup(buf);
+ }
+ return path;
+}
+
+EAPI const char *
+elm_theme_user_dir_get(void)
+{
+ static char *path = NULL;
+ char buf[PATH_MAX];
+
+ if (path) return path;
+ if (!path)
+ {
+char *home = getenv("HOME");
+if (!home) home = "";
+
+snprintf(buf, sizeof(buf), "%s/"ELEMENTARY_BASE_DIR"/themes", home);
+path = strdup(buf);
+ }
+ return path;
+}
+
diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h
index 10c5f6a..268dd6f 100644
--- a/src/lib/elm_theme.h
+++ b/src/lib/elm_theme.h
@@ -432,5 +432,80 @@ EAPI Elm_Theme *elm_object_theme_get(const
Evas_Object *obj);
EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key);
[EGIT] [core/enlightenment] master 01/03: module version sanity check -> make sure module versions match EXACTLY.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7f78ae9e53b1548f372e476e0b61967630f96f64
commit 7f78ae9e53b1548f372e476e0b61967630f96f64
Author: Carsten Haitzler (Rasterman)
Date: Wed Oct 30 12:07:42 2013 +0900
module version sanity check -> make sure module versions match EXACTLY.
if compile time headers (module version) does not match e's version
then modules likely may fail; to work right - so make sure they match
exactly (for release purposes)
---
src/bin/e_module.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index aa92878..9b9041a 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -351,11 +351,11 @@ e_module_new(const char *name)
m->error = 1;
goto init_done;
}
- if (m->api->version < E_MODULE_API_VERSION)
+ if (m->api->version != E_MODULE_API_VERSION)
{
snprintf(body, sizeof(body),
_("Module API ErrorError initializing Module: %s"
- "It requires a minimum module API version of: %i."
+ "It requires a module API version of: %i."
"The module API advertized by Enlightenment is: %i."),
_(m->api->name), m->api->version, E_MODULE_API_VERSION);
--
[EGIT] [core/enlightenment] master 02/03: make emotion as well as elm requirements, ecore-imf is not used anymore.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6eca480e761447fc18e1b7e576658dcb1f969671
commit 6eca480e761447fc18e1b7e576658dcb1f969671
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 31 16:58:26 2013 +0900
make emotion as well as elm requirements, ecore-imf is not used anymore.
---
configure.ac | 53 ++--
src/bin/Makefile.am | 4 +--
src/bin/e_main.c | 28 ++---
src/bin/e_widget_filepreview.c | 10 +---
src/bin/e_win.c | 11 -
src/modules/Makefile_conf2.am| 4 +--
src/modules/Makefile_teamwork.am | 6 ++---
src/modules/teamwork/e_mod_tw.c | 24 +-
8 files changed, 17 insertions(+), 123 deletions(-)
diff --git a/configure.ac b/configure.ac
index 06eabd3..d86e216 100644
--- a/configure.ac
+++ b/configure.ac
@@ -533,6 +533,8 @@ PKG_CHECK_MODULES(E, [
eina >= ${efl_version}
eldbus >= ${efl_version}
eio >= ${efl_version}
+ elementary >= ${efl_version}
+ emotion >= ${efl_version}
$eeze_mount
$udisks_mount
$device_backend
@@ -551,51 +553,14 @@ efreet >= ${efl_version} \
efreet-mime >= ${efl_version} \
efreet-trash >= ${efl_version} \
eina >= ${efl_version} \
-eldbus \
+eldbus >= ${efl_version} \
eio >= ${efl_version} \
+elementary >= ${efl_version} \
+emotion >= ${efl_version} \
$udisks_mount \
$eeze_mount \
$device_backend"
-
-want_elementary=auto
-have_elementary=no
-AC_ARG_ENABLE(elementary,
- AC_HELP_STRING([--enable-elementary], [enable Elementary support
@<:@default=detect@:>@]),
- [want_elementary=$enableval],
- [want_elementary=auto]
-)
-if test "x$want_elementary" != "xno"; then
- PKG_CHECK_MODULES(ELM, [elementary >= ${efl_version}],
- [have_elementary=yes], [have_elementary=no])
- if test "x$want_elementary" = "xyes" -a "x$have_elementary" = "xno"; then
- AC_MSG_ERROR([Elementary support requested but it was not found])
- fi
- if test "x$have_elementary" = "xyes"; then
- AC_DEFINE([HAVE_ELEMENTARY], 1, "Have Elementary support")
- requirements_e="${requirements_e} elementary > 1.6.9.0"
- fi
-fi
-
-want_emotion=auto
-have_emotion=no
-AC_ARG_ENABLE(emotion,
- AC_HELP_STRING([--enable-emotion], [enable emotion support
@<:@default=detect@:>@]),
- [want_emotion=$enableval],
- [want_emotion=auto]
-)
-if test "x$want_emotion" != "xno"; then
- PKG_CHECK_MODULES(EMOTION, [emotion >= ${efl_version}],
- [have_emotion=yes], [have_emotion=no])
- if test "x$want_emotion" = "xyes" -a "x$have_emotion" = "xno"; then
- AC_MSG_ERROR([emotion support requested but it was not found])
- fi
- if test "x$have_emotion" = "xyes"; then
- AC_DEFINE([HAVE_EMOTION], 1, "Have emotion support")
- requirements_e="${requirements_e} emotion >= ${efl_version}"
- fi
-fi
-
PKG_CHECK_MODULES(E_OPEN, [
eina >= ${efl_version}
ecore >= ${efl_version}
@@ -603,10 +568,8 @@ PKG_CHECK_MODULES(E_OPEN, [
efreet-mime >= ${efl_version}
])
-AC_E_CHECK_PKG(ECORE_IMF, [ ecore-imf >= ${efl_version} ecore-imf-evas >=
${efl_version} ], [], [:])
-
-e_libs="$E_LIBS $LIBINTL $fnmatch_libs $ECORE_IMF_LIBS $execinfo_libs"
-e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS $ECORE_IMF_CFLAGS"
+e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs"
+e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS"
e_configflags="-DUSE_E_CONFIG_H"
AC_SUBST(e_libs)
@@ -894,7 +857,7 @@ AC_E_OPTIONAL_MODULE([fileman], true)
AC_E_OPTIONAL_MODULE([fileman_opinfo], true)
AC_E_OPTIONAL_MODULE([wizard], true)
AC_E_OPTIONAL_MODULE([conf], true)
-AC_E_OPTIONAL_MODULE([conf2], $have_elementary)
+AC_E_OPTIONAL_MODULE([conf2], true)
AC_E_OPTIONAL_MODULE([conf_comp], true)
AC_E_OPTIONAL_MODULE([conf_wallpaper2], true)
AC_E_OPTIONAL_MODULE([conf_theme], true, true)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7717312..92110bd 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
@cf_cflags@ \
@VALGRIND_CFLAGS@ \
@EDJE_DEF@ \
-@ELM_CFLAGS@ \
-@EMOTION_CFLAGS@ \
@WAYLAND_CFLAGS@ \
@WAYLAND_EGL_CFLAGS@ \
-DE_BINDIR=\"$(bindir)\" \
@@ -386,7 +384,7 @@ e_main.c \
$(enlightenment_src)
enlightenment_LDFLAGS = -export-dynamic
-enlightenment_LDADD = @e_libs@ @ELM_LIBS@ @EMOTION_LIBS@ @dlopen_libs@
@cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
+enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
@WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
enlightenment_imc_SOURCES = \
e.h \
diff --git a/src/bin/e_main.c b/src/bin/e
[EGIT] [core/elementary] master 01/02: sync elm theme with e17 theme changes made.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=88d7ebc6fd1161d7975f3b6dd3e400e867c691a9
commit 88d7ebc6fd1161d7975f3b6dd3e400e867c691a9
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 31 22:19:03 2013 +0900
sync elm theme with e17 theme changes made.
---
data/themes/edc/battery.edc | 2 ++
data/themes/edc/music_control.edc | 55 ---
2 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/data/themes/edc/battery.edc b/data/themes/edc/battery.edc
index d190376..3ef55a5 100644
--- a/data/themes/edc/battery.edc
+++ b/data/themes/edc/battery.edc
@@ -224,6 +224,7 @@ group { name: "e/modules/battery/main";
color_class: "module_label";
text { font: "Sans"; size: 6;
min: 0 1;
+ fit: 1 1;
text_class: "module_small";
}
}
@@ -242,6 +243,7 @@ group { name: "e/modules/battery/main";
color_class: "module_label";
text { font: "Sans"; size: 6;
min: 0 1;
+ fit: 1 1;
text_class: "module_small";
}
}
diff --git a/data/themes/edc/music_control.edc
b/data/themes/edc/music_control.edc
index f00d243..bdf3cb7 100644
--- a/data/themes/edc/music_control.edc
+++ b/data/themes/edc/music_control.edc
@@ -29,6 +29,14 @@ group { name: "modules/music-control/popup";
images.image: "icon_next.png" COMP;
images.image: "icon_pause.png" COMP;
images.image: "icon_play.png" COMP;
+ styles {
+ style { name: "music_control_metadata_style";
+ base: "font="FN" font_size=10 align=left text_class=tb_plain
color=# style=shadow,bottom shadow_color=#0080";
+ tag: "title" "+ font_size=12 font="FNBD" text_class=tb_big";
+ tag: "tag" "+ font_size=8 color=#888f";
+ tag: "br" "\n";
+ }
+ }
script {
public message(Msg_Type:type, id, ...) {
new txt[128];
@@ -37,31 +45,57 @@ group { name: "modules/music-control/popup";
}
}
parts {
+ part { name: "cover_bg";
+ description { state: "default" 0;
+min: 90 90;
+rel1.relative: 0.0 0.0;
+rel2.relative: 0.35 1.0;
+image.normal: "music_control_icon.png";
+ }
+ }
+ part { name: "cover_swallow"; type: SWALLOW;
+ description { state: "default" 0;
+rel1.to: "cover_bg";
+rel2.to: "cover_bg";
+ }
+ }
part { name: "player_name"; type: TEXT;
description { state: "default" 0;
text.size: 12;
text.text: "Music player";
text.font: FN;
-rel1.relative: 0.0 0.0;
+rel1.relative: 1.0 0.0;
rel2.relative: 1.0 0.0;
-rel2.offset: 0 16;
+rel2.offset: 0 12;
}
}
- part { name: "previous_btn";
+ part { name: "metadata"; type: TEXTBLOCK;
description { state: "default" 0;
-aspect: 1.0 1.0; aspect_preference: BOTH;
+text {
+ style: "music_control_metadata_style";
+ text: "Song Title";
+ align: 0.0 0.0;
+}
rel1.to: "player_name";
rel1.relative: 0.0 1.0;
-rel2.relative: 0.33 1.0;
+rel1.offset: 3 0;
+ }
+ }
+ part { name: "previous_btn";
+ description { state: "default" 0;
+max: 32 32;
+aspect: 1.0 1.0; aspect_preference: BOTH;
+align: 0.1 1.0;
+rel1.relative: 0.35 0.0;
image.normal: "icon_prev.png";
}
}
part { name: "play_btn";
description { state: "default" 0;
+max: 32 32;
aspect: 1.0 1.0; aspect_preference: BOTH;
-rel1.to: "player_name";
-rel1.relative: 0.33 1.0;
-rel2.relative: 0.66 1.0;
+align: 0.5 1.0;
+rel1.relative: 0.35 0.0;
image.normal: "icon_pause.png";
}
description { state: "play" 0.0;
@@ -71,10 +105,11 @@ group { name: "modules/music-control/popup";
}
part { name: "next_btn";
description { state: "default" 0;
+max: 32 32;
aspect: 1.0 1.0; aspect_preference: BOTH;
+align: 0.9 1.0;
+rel1.relative: 0.35 0.0;
rel1.to: "player_name";
-rel1.relative: 0.66 1.0;
-rel2.relative: 1.0 1.0;
image.normal: "icon_next.png";
}
}
--
[EGIT] [core/elementary] master 01/01: add @since 1.8 for new elm theme api's
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1cab45a47b6a3de31d5fcf24101c23eed5fb593a commit 1cab45a47b6a3de31d5fcf24101c23eed5fb593a Author: Carsten Haitzler (Rasterman) Date: Fri Nov 1 10:56:02 2013 +0900 add @since 1.8 for new elm theme api's --- src/lib/elm_theme.h | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h index 268dd6f..b4467d9 100644 --- a/src/lib/elm_theme.h +++ b/src/lib/elm_theme.h @@ -450,6 +450,7 @@ EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key); * If group is NULL, then nothing can be looked up, so it is a non-sensical * request. * + * @since 1.8 * @ingroup Theme */ EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group); @@ -471,6 +472,7 @@ EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group); * stringshared string to be freed with eina_stringshare_del(). Not doing so * may result in a leak. * + * @since 1.8 * @ingroup Theme */ EAPI Eina_List *elm_theme_group_base_list(Elm_Theme *th, const char *base); @@ -485,6 +487,7 @@ EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group); * that wishes toiterate over the files in this folder and display them, for * example a theme selector. * + * @since 1.8 * @ingroup Theme */ EAPI const char *elm_theme_system_dir_get(void); @@ -502,6 +505,7 @@ EAPI const char *elm_theme_system_dir_get(void); * User themes are always looked for before system themes. The user theme * directory is normally expected to be writable by the user. * + * @since 1.8 * @ingroup Theme */ EAPI const char *elm_theme_user_dir_get(void); --
[EGIT] [core/enlightenment] master 01/01: elm integration improvement - copy themes over, fix includes and null config
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a1d1e4055924cf2369804239a5b7c212d9257ccd
commit a1d1e4055924cf2369804239a5b7c212d9257ccd
Author: Carsten Haitzler (Rasterman)
Date: Fri Nov 1 15:53:05 2013 +0900
elm integration improvement - copy themes over, fix includes and null config
provide a config upgrade path to version 13 which nulls/frees out
theme config (save memory - but more housekeeping), and that also
copeis ofer all files in ~/.e/e/themes to ~/.elementary/themes so you
don't lose themes you personally have and deletes the old e theme dir
if this succeeds.
also remove all #includes of Elementary.h and Emotion.h from single c
files as they are requirements now and in e.h
also remove theme path vars and code as theme path is no longer used.
---
src/bin/e.h| 2 ++
src/bin/e_config.c | 42 ++
src/bin/e_config.h | 4 +--
src/bin/e_init.c | 1 -
src/bin/e_main.c | 20 ---
src/bin/e_theme.c | 1 -
src/bin/e_utils.c | 1 -
src/bin/e_widget_filepreview.c | 1 -
src/bin/e_win.c| 2 --
src/modules/conf2/e_mod_main.h | 2 --
src/modules/conf_paths/e_int_config_paths.c| 24 ++---
src/modules/conf_theme/e_int_config_theme.c| 10 +-
src/modules/conf_theme/e_int_config_theme_import.c | 1 -
src/modules/conf_theme/e_mod_main.c| 1 -
src/modules/teamwork/e_mod_tw.c| 1 -
15 files changed, 58 insertions(+), 55 deletions(-)
diff --git a/src/bin/e.h b/src/bin/e.h
index 4ecc03c..95d0d8a 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -98,6 +98,7 @@ void *alloca (size_t);
# endif
# include
+# include
# include
# include
# include
@@ -116,6 +117,7 @@ void *alloca (size_t);
# include
# include
# include
+# include
# ifdef HAVE_HAL
# include
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index e08fe03..3ccd865 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1221,6 +1221,48 @@ e_config_load(void)
break;
}
}
+CONFIG_VERSION_CHECK(13)
+ {
+ E_Config_Theme *et;
+ E_Path_Dir *epd;
+ char buf[PATH_MAX], buf2[PATH_MAX], *f;
+ Eina_List *files;
+ Eina_Bool fail = EINA_FALSE;
+
+ CONFIG_VERSION_UPDATE_INFO(13);
+ // empty out theme elements of config
+ eina_stringshare_del(e_config->init_default_theme);
+ e_config->init_default_theme = NULL;
+ EINA_LIST_FREE(e_config->themes, et)
+ {
+ if (et->category) eina_stringshare_del(et->category);
+ if (et->file) eina_stringshare_del(et->file);
+ E_FREE(et);
+ }
+ EINA_LIST_FREE(e_config->path_append_themes, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ // copy all of ~/.e/e/themes/* into ~/.elementary/themes
+ // and delete original data in ~/.e/e/themes
+ ecore_file_mkpath(elm_theme_user_dir_get());
+ snprintf(buf, sizeof(buf), "%s/themes", e_user_dir_get());
+ files = ecore_file_ls(buf);
+ EINA_LIST_FREE(files, f)
+ {
+ snprintf(buf, sizeof(buf), "%s/themes/%s",
+ e_user_dir_get(), f);
+ snprintf(buf2, sizeof(buf2), "%s/%s",
+ elm_theme_user_dir_get(), f);
+ if (!ecore_file_cp(buf, buf2)) fail = EINA_TRUE;
+ }
+ if (!fail)
+ {
+ snprintf(buf, sizeof(buf), "%s/themes", e_user_dir_get());
+ ecore_file_recursive_rm(buf);
+ }
+ }
}
if (!e_config->remember_internal_fm_windows)
e_config->remember_internal_fm_windows =
!!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index b339be4..9fb334d 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -48,7 +48,7 @@ typedef enum
/* increment this whenever a new set of config values are added but the users
* config doesn't need to be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 12
+#define E_CONFIG_FILE_GENERATION 13
#define E_CONFIG_FILE_VERSION((E_CONFIG_FILE_EPOCH * 100) +
E_CONFIG_FILE_GENERATION)
[EGIT] [core/elementary] master 01/01: elm access - if we disable apis then disable the tests too - unbreak build
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d8b3cdb28f5334f9429959109af4b960bf414097
commit d8b3cdb28f5334f9429959109af4b960bf414097
Author: Carsten Haitzler (Rasterman)
Date: Sat Nov 2 10:48:12 2013 +0900
elm access - if we disable apis then disable the tests too - unbreak build
---
src/bin/test.c| 14 +++---
src/bin/test_access.c | 3 +++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/bin/test.c b/src/bin/test.c
index 963f386..4a8f472 100755
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -10,9 +10,9 @@
int _log_domain = -1;
/* all tests prototypes */
-void test_access(void *data, Evas_Object *obj, void *event_info);
-void test_access2(void *data, Evas_Object *obj, void *event_info);
-void test_access3(void *data, Evas_Object *obj, void *event_info);
+//void test_access(void *data, Evas_Object *obj, void *event_info);
+//void test_access2(void *data, Evas_Object *obj, void *event_info);
+//void test_access3(void *data, Evas_Object *obj, void *event_info);
void test_bg_plain(void *data, Evas_Object *obj, void *event_info);
void test_bg_image(void *data, Evas_Object *obj, void *event_info);
void test_bg_options(void *data, Evas_Object *obj, void *event_info);
@@ -458,7 +458,7 @@ my_win_main(const char *autorun, Eina_Bool test_win_only)
evas_object_show(lb);
/* This label will not be read out */
- elm_access_object_unregister(lb);
+// elm_access_object_unregister(lb);
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
@@ -802,9 +802,9 @@ add_tests:
ADD_TEST(NULL, "Miscellaneous", "Icon Desktops", test_icon_desktops);
ADD_TEST(NULL, "Miscellaneous", "Floating Objects", test_floating);
ADD_TEST(NULL, "Miscellaneous", "Configuration", test_config);
- ADD_TEST(NULL, "Miscellaneous", "Accessibility", test_access);
- ADD_TEST(NULL, "Miscellaneous", "Accessibility2", test_access2);
- ADD_TEST(NULL, "Miscellaneous", "Accessibility3", test_access3);
+// ADD_TEST(NULL, "Miscellaneous", "Accessibility", test_access);
+// ADD_TEST(NULL, "Miscellaneous", "Accessibility2", test_access2);
+// ADD_TEST(NULL, "Miscellaneous", "Accessibility3", test_access3);
//--//
ADD_TEST(NULL, "Application client/server", "Task switcher",
test_task_switcher);
diff --git a/src/bin/test_access.c b/src/bin/test_access.c
index 82c44cb..b0753ad 100644
--- a/src/bin/test_access.c
+++ b/src/bin/test_access.c
@@ -4,6 +4,7 @@
#include
#ifndef ELM_LIB_QUICKLAUNCH
+#if 0
static void
_cleanup_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info EINA_UNUSED)
{
@@ -401,3 +402,5 @@ test_access3(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
evas_object_show(win);
}
#endif
+
+#endif
--
[EGIT] [core/efl] master 01/01: ecore-wl - add ecore_wl_window_surface_id_get so we can unbreak elm
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=298f4af7fa324ae78822329b755ee06f6d127a86
commit 298f4af7fa324ae78822329b755ee06f6d127a86
Author: Carsten Haitzler (Rasterman)
Date: Sat Nov 2 11:44:15 2013 +0900
ecore-wl - add ecore_wl_window_surface_id_get so we can unbreak elm
---
src/lib/ecore_wayland/Ecore_Wayland.h | 3 ++-
src/lib/ecore_wayland/ecore_wl_window.c | 10 ++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h
b/src/lib/ecore_wayland/Ecore_Wayland.h
index f58d41f..d4efec9 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -572,7 +572,8 @@ EAPI void ecore_wl_window_parent_set(Ecore_Wl_Window *win,
Ecore_Wl_Window *pare
EAPI int ecore_wl_window_id_get(Ecore_Wl_Window *win);
EAPI void ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title);
EAPI void ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char
*class_name);
-
+EAPI int ecore_wl_window_surface_id_get(Ecore_Wl_Window *win);
+
EAPI Ecore_Wl_Input *ecore_wl_window_keyboard_get(Ecore_Wl_Window *win);
/**
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 9b732d1..b0f66dd 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -689,6 +689,16 @@ ecore_wl_window_id_get(Ecore_Wl_Window *win)
}
/* @since 1.8 */
+EAPI int
+ecore_wl_window_surface_id_get(Ecore_Wl_Window *win)
+{
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+ if (!win) return 0;
+ return win->surface_id;
+}
+
+/* @since 1.8 */
EAPI void
ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
{
--
[EGIT] [core/elementary] master 02/02: unbreak wayland elm build more - use get_surface_id api
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=24b10c0c7647765176a3c3a24eb21243f84e3023
commit 24b10c0c7647765176a3c3a24eb21243f84e3023
Author: Carsten Haitzler (Rasterman)
Date: Sat Nov 2 11:51:50 2013 +0900
unbreak wayland elm build more - use get_surface_id api
---
src/lib/elm_win.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 95f4812..cbd0357 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -5469,7 +5469,7 @@ _window_id_get(Eo *obj EINA_UNUSED, void *_pd
EINA_UNUSED, va_list *list)
#if HAVE_ELEMENTARY_WAYLAND
if (sd->wl.win)
{
- *ret = (Ecore_Window)sd->wl.win->surface_id;
+ *ret = (Ecore_Window)ecore_wl_window_surface_id_get(sd->wl.win);
return;
}
if (sd->parent)
@@ -5477,7 +5477,7 @@ _window_id_get(Eo *obj EINA_UNUSED, void *_pd
EINA_UNUSED, va_list *list)
Ecore_Wl_Window *parent;
parent = elm_win_wl_window_get(sd->parent);
- if (parent) *ret = (Ecore_Window)parent->surface_id;
+ if (parent) *ret =
(Ecore_Window)ecore_wl_window_surface_id_get(parent);
return;
}
#endif
--
[EGIT] [core/elementary] master 01/02: wayland support - unbreak build since structs are now private
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2af35a78b82080598f6bf74839c5114e57e4846b commit 2af35a78b82080598f6bf74839c5114e57e4846b Author: Carsten Haitzler (Rasterman) Date: Sat Nov 2 11:38:57 2013 +0900 wayland support - unbreak build since structs are now private --- src/lib/elm_cnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index 806b962..93d039b 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -2967,7 +2967,7 @@ _wl_elm_widget_window_get(Evas_Object *obj) win = ecore_evas_wayland_window_get(ee); } - if (win) return win->id; + if (win) return ecore_wl_window_id_get(win); return 0; } --
