[EGIT] [core/elementary] master 01/01: [Hover] Fixed the delaying of hover dismiss on continuous mouse clicks

[godly.talias]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=17553e2a3572d943ebe1a0aa72eba8ec29add857

commit 17553e2a3572d943ebe1a0aa72eba8ec29add857
Author: godly.talias 
Date:   Wed Jan 13 15:59:15 2016 +0900

[Hover] Fixed the delaying of hover dismiss on continuous mouse clicks

Summary:
When continous mouse clicks happen hover emits the hide signals continously
to edje. As the embryo program for hiding requires some time to finish the
animation, if within that time another mouse click comes the program gets
invoked again and thus the hiding will get delayed till the mouse clicks 
ends.
This patch fix that issue by adding a flag for emitting signals.

@fix T3006

Signed-off-by: godly.talias 

Test Plan: elementary_test

Reviewers: cedric, conr2d, prince.dubey, shilpasingh, Princekrdubey

Reviewed By: shilpasingh, Princekrdubey

Subscribers: Princekrdubey, divyesh, govi, rajeshps

Maniphest Tasks: T3006

Differential Revision: https://phab.enlightenment.org/D3526
---
 data/themes/edc/elm/hover.edc | 58 +--
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/data/themes/edc/elm/hover.edc b/data/themes/edc/elm/hover.edc
index 75ea813..cce316a 100644
--- a/data/themes/edc/elm/hover.edc
+++ b/data/themes/edc/elm/hover.edc
@@ -1,6 +1,9 @@
 /* TODO: replicate diagonal swallow slots to the other hover styles */
 group { name: "elm/hover/base/default";
data.item: "dismiss" "on";
+   script {
+  public on_dismiss = 0;
+   }
parts {
   part { name: "elm.swallow.offset"; type: SWALLOW;
  description { state: "default" 0.0;
@@ -130,14 +133,22 @@ group { name: "elm/hover/base/default";
programs {
   program { name: "end";
  signal: "mouse,up,*"; source: "base";
- action: SIGNAL_EMIT "elm,action,dismiss" "elm";
+ script {
+if (get_int(on_dismiss) == 0) {
+   emit("elm,action,dismiss", "elm");
+   set_int(on_dismiss, 1);
+}
+ }
   }
   program { name: "hide";
  signal: "elm,action,hide"; source: "elm";
  after: "hidefinished";
   }
   program { name: "hidefinished";
- action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
+ script {
+set_int(on_dismiss, 0);
+emit("elm,action,hide,finished", "elm");
+ }
   }
}
 }
@@ -145,6 +156,9 @@ group { name: "elm/hover/base/default";
 group { name: "elm/hover/base/popout";
data.item: "dismiss" "on";
images.image: "button_normal.png" COMP;
+   script {
+  public on_dismiss = 0;
+   }
parts {
   part { name: "elm.swallow.offset"; type: SWALLOW;
  description { state: "default" 0.0;
@@ -361,7 +375,12 @@ group { name: "elm/hover/base/popout";
programs {
   program { name: "end";
  signal: "mouse,up,*"; source: "base";
- action: SIGNAL_EMIT "elm,action,dismiss" "elm";
+ script {
+if (get_int(on_dismiss) == 0) {
+   emit("elm,action,dismiss", "elm");
+   set_int(on_dismiss, 1);
+}
+ }
   }
   program { name: "show";
  signal: "elm,action,show"; source: "elm";
@@ -376,7 +395,10 @@ group { name: "elm/hover/base/popout";
  after: "hidefinished";
   }
   program { name: "hidefinished";
- action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
+ script {
+set_int(on_dismiss, 0);
+emit("elm,action,hide,finished", "elm");
+ }
   }
   program { name: "leftshow";
  signal: "elm,action,slot,left,show"; source: "elm";
@@ -450,6 +472,7 @@ group { name: "elm/hover/base/hoversel_vertical/default";
script {
   public visible = 0;
   public right = 0;
+  public on_dismiss = 0;
   public topshow2() {
  if (get_int(right) == 0)
 run_program(PROGRAM:"topshow_default");
@@ -644,7 +667,12 @@ group { name: "elm/hover/base/hoversel_vertical/default";
programs {
   program { name: "end";
  signal: "mouse,up,*"; source: "base";
- action: SIGNAL_EMIT "elm,action,dismiss" "elm";
+ script {
+if (get_int(on_dismiss) == 0) {
+   emit("elm,action,dismiss", "elm");
+   set_int(on_dismiss, 1);
+}
+ }
   }
   program { name: "show";
  signal: "elm,action,show"; source: "elm";
@@ -659,7 +687,10 @@ group { name: "elm/hover/base/hoversel_vertical/default";
  after: "hidefinished";
   }
   program { name: "hidefinished";
- action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
+ script {
+set_int(on_dismiss, 0);
+emit("elm,action,hide,finished", "elm");
+ }
   }
   program 

[EGIT] [core/efl] master 04/04: Evas: remove extra if from evas_3d_utils.h

[perepelits.m]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ba31dc71944d209c107f63b383368d0676a783d1

commit ba31dc71944d209c107f63b383368d0676a783d1
Author: perepelits.m 
Date:   Wed Jan 13 13:48:32 2016 +0900

Evas: remove extra if from evas_3d_utils.h

Summary: remove extra if from evas_3d_utils.h according to Coverity 
(CID1339788)

Reviewers: raster, Hermet, cedric

Subscribers: jpeg, artem.popov

Differential Revision: https://phab.enlightenment.org/D3558
---
 src/lib/evas/include/evas_3d_utils.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/evas/include/evas_3d_utils.h 
b/src/lib/evas/include/evas_3d_utils.h
index 9b901b4..b2eb08e 100644
--- a/src/lib/evas/include/evas_3d_utils.h
+++ b/src/lib/evas/include/evas_3d_utils.h
@@ -1746,8 +1746,6 @@ evas_convex_hull_get(float *data, int count, int stride, 
Eina_Inarray *vertex,
   {
  if ((!equivalent_triangle) && (!second_exist_twice) && 
(!triangle_chain) && (if_two < 2))
{
-  if (new_elem2)
-free (new_elem2);
   new_elem2 = malloc(sizeof(Evas_Triangle3));
   evas_triangle3_set(new_elem2, best, , );
   eina_array_push(_elems,  new_elem2);

-- 

[EGIT] [core/efl] master 01/04: Evas render: Fix typo (use & instead of &)

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=81ed0de016dad3fbcf8fac4859e2ccf3dcdaae34

commit 81ed0de016dad3fbcf8fac4859e2ccf3dcdaae34
Author: Jean-Philippe Andre 
Date:   Wed Jan 13 11:10:25 2016 +0900

Evas render: Fix typo (use & instead of &)

Thanks @stefan_schmidt for the report
---
 src/lib/evas/canvas/evas_render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_render.c 
b/src/lib/evas/canvas/evas_render.c
index c9bc480..1952d60 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1990,7 +1990,7 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
   if (bl || br || bt || bb)
 border = EINA_TRUE;
 
-  if (!border && filled & !prev_mask && mask->func->engine_data_get)
+  if (!border && filled && !prev_mask && mask->func->engine_data_get)
 {
/* Fast path (for GL) that avoids creating a map surface, 
render the
 * scaled image in it, when the shaders can just scale on the 
fly. */

-- 

[EGIT] [core/efl] master 02/04: Evas filters: Fix unused variables

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=65715dafc5720df0ceaa47e4c3a21c42c3ac96ef

commit 65715dafc5720df0ceaa47e4c3a21c42c3ac96ef
Author: Jean-Philippe Andre 
Date:   Wed Jan 13 11:11:53 2016 +0900

Evas filters: Fix unused variables

Thanks @stefan_schmidt for the report
---
 src/lib/evas/filters/evas_filter.c | 3 ---
 src/lib/evas/filters/evas_filter_private.h | 1 -
 2 files changed, 4 deletions(-)

diff --git a/src/lib/evas/filters/evas_filter.c 
b/src/lib/evas/filters/evas_filter.c
index 61f2e08..01d8c7f 100644
--- a/src/lib/evas/filters/evas_filter.c
+++ b/src/lib/evas/filters/evas_filter.c
@@ -1280,8 +1280,6 @@ _filter_target_render(Evas_Filter_Context *ctx)
 {
Evas_Filter_Buffer *src, *dst;
void *drawctx, *image = NULL, *surface = NULL;
-   int cx, cy, cw, ch;
-   Eina_Bool use_clip = EINA_FALSE;
 
EINA_SAFETY_ON_FALSE_RETURN_VAL(ctx->target.bufid, EINA_FALSE);
 
@@ -1300,7 +1298,6 @@ _filter_target_render(Evas_Filter_Context *ctx)
 
if (ctx->target.clip_use)
  {
-use_clip = ENFN->context_clip_get(ENDT, drawctx, , , , );
 ENFN->context_clip_set(ENDT, drawctx, ctx->target.cx, ctx->target.cy,
ctx->target.cw, ctx->target.ch);
  }
diff --git a/src/lib/evas/filters/evas_filter_private.h 
b/src/lib/evas/filters/evas_filter_private.h
index 5ad458b..e834423 100644
--- a/src/lib/evas/filters/evas_filter_private.h
+++ b/src/lib/evas/filters/evas_filter_private.h
@@ -131,7 +131,6 @@ struct _Evas_Filter_Context
struct
{
   int bufid;
-  void *context;
   int x, y;
   int cx, cy, cw, ch; // clip
   int r, g, b, a; // clip color

-- 

[EGIT] [core/efl] master 03/04: Edje: enhance embryo stack broken error message

[Shinwoo Kim]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1aafaca172101a0a430ac095ad0d96290ff0d61e

commit 1aafaca172101a0a430ac095ad0d96290ff0d61e
Author: Shinwoo Kim 
Date:   Wed Jan 13 11:55:46 2016 +0900

Edje: enhance embryo stack broken error message

Summary: Enhance embry stack broken error message

Test Plan: Make a run_program run a script

Reviewers: raster, zmike, jpeg

Reviewed By: jpeg

Subscribers: cedric, seoz, jpeg

Differential Revision: https://phab.enlightenment.org/D3528
---
 src/lib/edje/edje_embryo.c  | 18 --
 src/lib/edje/edje_private.h |  2 +-
 src/lib/edje/edje_program.c |  5 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/lib/edje/edje_embryo.c b/src/lib/edje/edje_embryo.c
index c4cba4f..a3fd566 100644
--- a/src/lib/edje/edje_embryo.c
+++ b/src/lib/edje/edje_embryo.c
@@ -,8 +,9 @@ _edje_embryo_script_reset(Edje *ed)
 
 /* this may change in future - thus "test_run" is its name */
 void
-_edje_embryo_test_run(Edje *ed, const char *fname, const char *sig, const char 
*src)
+_edje_embryo_test_run(Edje *ed, Edje_Program *pr, const char *sig, const char 
*src)
 {
+   char fname[128];
Embryo_Function fn;
 
if (!ed) return;
@@ -4455,6 +4456,7 @@ _edje_embryo_test_run(Edje *ed, const char *fname, const 
char *sig, const char *
_edje_embryo_globals_init(ed);
 
//   _edje_embryo_script_reset(ed);
+   snprintf(fname, sizeof(fname), "_p%i", pr->id);
fn = embryo_program_function_find(ed->collection->script, (char *)fname);
if (fn != EMBRYO_FUNCTION_NONE)
  {
@@ -4478,20 +4480,24 @@ _edje_embryo_test_run(Edje *ed, const char *fname, 
const char *sig, const char *
 /* like 0.03 - 0.05 seconds or even more */
 embryo_program_max_cycle_run_set(ed->collection->script, 500);
 if (embryo_program_recursion_get(ed->collection->script) && 
(!ed->collection->script_recursion))
-  ERR("You are running Embryo->EDC->Embryo with script program 
'%s';\nBy the power of Grayskull, your previous Embryo stack is now broken!", 
fname);
+  ERR("You are running Embryo->EDC->Embryo with script program '%s';\n"
+  "A run_program runs the '%d'th program '%s' in the group '%s' of 
file %s;\n"
+  "By the power of Grayskull, your previous Embryo stack is now 
broken!",
+  fname, (fn + 1), pr->name, ed->group, ed->path);
+
 ret = embryo_program_run(ed->collection->script, fn);
 if (ret == EMBRYO_PROGRAM_FAIL)
   {
  ERR("ERROR with embryo script. "
  "OBJECT NAME: '%s', "
  "OBJECT FILE: '%s', "
- "ENTRY POINT: '%s', "
+ "ENTRY POINT: '%s (%s)', "
  "SIGNAL: '%s', "
  "SOURCE: '%s', "
  "ERROR: '%s'",
  ed->collection->part,
  ed->file->path,
- fname,
+ fname, pr->name,
  sig, src,
  
embryo_error_string_get(embryo_program_error_get(ed->collection->script)));
   }
@@ -4500,13 +4506,13 @@ _edje_embryo_test_run(Edje *ed, const char *fname, 
const char *sig, const char *
  ERR("ERROR with embryo script. "
  "OBJECT NAME: '%s', "
  "OBJECT FILE: '%s', "
- "ENTRY POINT: '%s', "
+ "ENTRY POINT: '%s (%s)', "
  "SIGNAL: '%s', "
  "SOURCE: '%s', "
  "ERROR: 'Script exceeded maximum allowed cycle count of %i'",
  ed->collection->part,
  ed->file->path,
- fname,
+ fname, pr->name,
  sig, src,
  embryo_program_max_cycle_run_get(ed->collection->script));
   }
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 29e0c4d..95fb936 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2419,7 +2419,7 @@ char *_edje_text_unescape(const char *text);
 void  _edje_embryo_script_init  (Edje_Part_Collection *edc);
 void  _edje_embryo_script_shutdown  (Edje_Part_Collection *edc);
 void  _edje_embryo_script_reset (Edje *ed);
-void  _edje_embryo_test_run (Edje *ed, const char *fname, 
const char *sig, const char *src);
+void  _edje_embryo_test_run (Edje *ed, Edje_Program *pr, const 
char *sig, const char *src);
 Edje_Var *_edje_var_new (void);
 void  _edje_var_free(Edje_Var *var);
 void  _edje_var_init(Edje *ed);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 0c97e21..1e59ab0 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -927,12 +927,9 @@ low_mem_current:
 
 

[EGIT] [core/efl] master 01/02: Revert "Edje UI mirroring: Fix UI mirroring for GROUP parts."

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=29c8a846763af3c9ce7ce13c810797bbd799c0e3

commit 29c8a846763af3c9ce7ce13c810797bbd799c0e3
Author: Tom Hacohen 
Date:   Tue Jan 12 10:34:22 2016 +

Revert "Edje UI mirroring: Fix UI mirroring for GROUP parts."

The following commit solves it in a better way.

This reverts commit 55b62bbd70e32f5824cbc760bc2f8e49eafa4cdd.
---
 src/lib/edje/edje_calc.c | 22 +-
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 76a32ac..614688b 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -3084,23 +3084,6 @@ _edje_table_recalc_apply(Edje *ed EINA_UNUSED,
 }
 
 static void
-_edje_group_recalc_apply(Edje *ed,
- Edje_Real_Part *ep,
- Edje_Calc_Params *p3 EINA_UNUSED,
- Edje_Part_Description_Common *chosen_desc EINA_UNUSED)
-{
-   Edje_Object *obj = ep->typedata.swallow->swallowed_object;
-
-   edje_object_mirrored_set(obj, edje_object_mirrored_get(ed->obj));
-   if (evas_object_smart_need_recalculate_get(obj))
- {
-eo_do(obj,
-  evas_obj_smart_need_recalculate_set(0),
-  evas_obj_smart_calculate());
- }
-}
-
-static void
 _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, 
Edje_Part_Description_Proxy *chosen_desc, FLOAT_T pos)
 {
Edje_Real_Part *pp;
@@ -4856,13 +4839,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int 
flags, Edje_Calc_Params *sta
  _edje_textblock_recalc_apply(ed, ep, pf, 
(Edje_Part_Description_Text *)chosen_desc);
  break;
 
-   case EDJE_PART_TYPE_GROUP:
- _edje_group_recalc_apply(ed, ep, pf, chosen_desc);
- break;
-
case EDJE_PART_TYPE_EXTERNAL:
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_SWALLOW:
+   case EDJE_PART_TYPE_GROUP:
  /* Nothing special to do for this type of object. */
  break;
 

-- 

[EGIT] [core/efl] master 02/02: Evas textblock: Remove redundant NULL check.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=987fde58a7ed10b6aef7aea069ae1bc129191430

commit 987fde58a7ed10b6aef7aea069ae1bc129191430
Author: Tom Hacohen 
Date:   Tue Jan 12 10:59:52 2016 +

Evas textblock: Remove redundant NULL check.

Detected by smatch.
---
 src/lib/evas/canvas/evas_object_textblock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index b5a17f1..70a9e3a 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -5515,7 +5515,7 @@ _layout_par(Ctxt *c)
 
if (c->ln->items)
  {
-if (c->par && !EINA_INLIST_GET(c->par)->next)
+if (!EINA_INLIST_GET(c->par)->next)
   {
  c->position = (c->position == TEXTBLOCK_POSITION_START) ?
 TEXTBLOCK_POSITION_SINGLE : TEXTBLOCK_POSITION_END;

-- 

[EGIT] [core/efl] master 02/02: Edje UI mirroring: Fix UI mirroring for GROUP parts.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2781eef823ea32abbfb3360ffdb60bf6ba3a460c

commit 2781eef823ea32abbfb3360ffdb60bf6ba3a460c
Author: Tom Hacohen 
Date:   Tue Jan 12 10:39:37 2016 +

Edje UI mirroring: Fix UI mirroring for GROUP parts.

GROUP parts were not mirrored with the rest of the edje object,
this commits fixes that.

This is an improvement of the now reverted
55b62bbd70e32f5824cbc760bc2f8e49eafa4cdd.

Thanks to cedric for the pointer that lead to this commit.

Ref T3021
---
 src/lib/edje/edje_calc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 614688b..0f45460 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -818,6 +818,9 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, 
const char *d1, doubl
   ted->recalc_call = ted->dirty = ted->recalc_hints = 
EINA_TRUE;
   _edje_recalc(ted);
}
+
+ edje_object_mirrored_set(ep->typedata.swallow->swallowed_object,
+   edje_object_mirrored_get(ed->obj));
   }
  }
 

-- 

[EGIT] [core/efl] master 01/02: Evas textblock: slight style fixes.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e64192f446110ac84f68d2dd265342b9b618d325

commit e64192f446110ac84f68d2dd265342b9b618d325
Author: Tom Hacohen 
Date:   Tue Jan 12 10:55:49 2016 +

Evas textblock: slight style fixes.
---
 src/lib/evas/canvas/evas_object_textblock.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index 7039364..b5a17f1 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -3620,8 +3620,11 @@ loop_advance:
 
c->par->h = c->ln->y + c->ln->h;
if (c->ln->w > c->par->w)
- c->par->w = c->ln->w;
+ {
+c->par->w = c->ln->w;
+ }
 
+   /* Calculate new max width */
  {
 Evas_Coord new_wmax = c->ln->w +
c->marginl + c->marginr - (c->o->style_pad.l + c->o->style_pad.r);

-- 

[EGIT] [core/efl] master 01/01: ecore-drm: Call inputs shutdown before eina_shutdown

[Chris Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d50784a086d9e4b6357963bf542ccd872b5a953b

commit d50784a086d9e4b6357963bf542ccd872b5a953b
Author: Chris Michael 
Date:   Mon Jan 11 13:57:23 2016 -0500

ecore-drm: Call inputs shutdown before eina_shutdown

As we end up freeing the input hash inside the
_ecore_drm_inputs_shutdown function, it should be called before we
shutdown eina

@fix

Signed-off-by: Chris Michael 
---
 src/lib/ecore_drm/ecore_drm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/ecore_drm/ecore_drm.c b/src/lib/ecore_drm/ecore_drm.c
index 02dd76e..07b6a4f 100644
--- a/src/lib/ecore_drm/ecore_drm.c
+++ b/src/lib/ecore_drm/ecore_drm.c
@@ -127,6 +127,8 @@ ecore_drm_shutdown(void)
/* if we are still in use, decrement init count and get out */
if (--_ecore_drm_init_count != 0) return _ecore_drm_init_count;
 
+   _ecore_drm_inputs_shutdown();
+
/* close eeze */
eeze_shutdown();
 
@@ -143,8 +145,6 @@ ecore_drm_shutdown(void)
/* shutdown eina */
eina_shutdown();
 
-   _ecore_drm_inputs_shutdown();
-
/* return init count */
return _ecore_drm_init_count;
 }

-- 

[EGIT] [core/efl] master 01/02: edje: convert Edje_Text_Class, Edje_Size_Class data type to public

[Jee-Yong Um]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=bafa65f9b4c1011d6c08c34207f5222e9c0d6892

commit bafa65f9b4c1011d6c08c34207f5222e9c0d6892
Author: Jee-Yong Um 
Date:   Tue Jan 12 14:01:27 2016 -0800

edje: convert Edje_Text_Class, Edje_Size_Class data type to public

Summary:
APIs iterating works through active text classes and size classes were 
added,
but Edje_Text_Class and Edje_Size_Class data type are still concealed.
This patch uncovers those data types so as to allow developers to use them.

Reviewers: jpeg, cedric

Differential Revision: https://phab.enlightenment.org/D3557

Signed-off-by: Cedric BAIL 
---
 src/lib/edje/Edje_Common.h  | 32 
 src/lib/edje/edje_private.h | 18 --
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 30594cc..06211c6 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -42,6 +42,38 @@ struct _Edje_Color_Class
 };
 
 /**
+ * @typedef Edje_Text_Class
+ * Type for edje text class
+ *
+ * @since 1.17
+ */
+typedef struct _Edje_Text_Class Edje_Text_Class;
+
+struct _Edje_Text_Class
+{
+   const char *name;
+   const char *font;
+   Evas_Font_Size  size;
+};
+
+/**
+ * @typedef Edje_Size_Class
+ * Type for edje size class
+ *
+ * @since 1.17
+ */
+typedef struct _Edje_Size_Class Edje_Size_Class;
+
+struct _Edje_Size_Class
+{
+   Eina_Stringshare *name;
+   Evas_Coordminw;
+   Evas_Coordminh;
+   Evas_Coordmaxw;
+   Evas_Coordmaxh;
+};
+
+/**
  * @defgroup Edje_Object_Communication_Interface_Signal Edje Communication 
Interface: Signal
  *
  * @brief Functions that deal with signals.
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 68c3f35..29e0c4d 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -384,8 +384,6 @@ typedef struct _Edje_Calc_Params_Map Edje_Calc_Params_Map;
 typedef struct _Edje_Calc_Params_Physics Edje_Calc_Params_Physics;
 typedef struct _Edje_Pending_Program Edje_Pending_Program;
 typedef struct _Edje_Text_Style Edje_Text_Style;
-typedef struct _Edje_Text_Class Edje_Text_Class;
-typedef struct _Edje_Size_Class Edje_Size_Class;
 typedef struct _Edje_Var Edje_Var;
 typedef struct _Edje_Var_Int Edje_Var_Int;
 typedef struct _Edje_Var_Float Edje_Var_Float;
@@ -1982,22 +1980,6 @@ struct _Edje_Text_Style
} members[32];
 };
 
-struct _Edje_Text_Class
-{
-   const char *name;
-   const char *font;
-   Evas_Font_Size  size;
-};
-
-struct _Edje_Size_Class
-{
-   Eina_Stringshare *name;
-   Evas_Coordminw;
-   Evas_Coordminh;
-   Evas_Coordmaxw;
-   Evas_Coordmaxh;
-};
-
 struct _Edje_Var_Int
 {
int  v;

-- 

[EGIT] [core/efl] master 01/01: Evas GL: Reset current surface for all contexts to null when surface is destroyed

[Dongyeon Kim]

spacegrapher pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d7c2acfa7a2d804a060fb860ca8228852f720f42

commit d7c2acfa7a2d804a060fb860ca8228852f720f42
Author: Dongyeon Kim 
Date:   Mon Jan 11 10:11:58 2016 +0900

Evas GL: Reset current surface for all contexts to null when surface is 
destroyed

When evas gl surface is destroyed, not only the current surface for the 
current context
should be set to NULL, but current surface for all contexts should be reset.
---
 src/modules/evas/engines/gl_common/evas_gl_core.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c 
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index ba3496a..f851d56 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -2081,6 +2081,8 @@ int
 evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
 {
EVGL_Resource *rsc;
+   Eina_List *l;
+   EVGL_Context *ctx;
Eina_Bool dbg;
 
// Check input parameter
@@ -2183,6 +2185,12 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
evgl_engine->surfaces = eina_list_remove(evgl_engine->surfaces, sfc);
LKU(evgl_engine->resource_lock);
 
+   EINA_LIST_FOREACH(evgl_engine->contexts, l, ctx)
+ {
+if (ctx->current_sfc == sfc)
+  ctx->current_sfc = NULL;
+ }
+
free(sfc);
 
_surface_context_list_print();

--