date:20151209

[EGIT] [core/efl] master 01/01: edje: calc - remove pointer comparison while finding part desc

2015-12-09 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit c892a1cb714fed496cbf5568c4d43880b6fb67b2
Author: Amitesh Singh 
Date:   Wed Dec 9 15:46:41 2015 +0530

edje: calc - remove pointer comparison while finding part desc

Only strcmp comparision is realiable.
@fix
---
 src/lib/edje/edje_calc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index b0742cf..c06e3ac 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -460,8 +460,7 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
  {
 d = ep->other.desc[i];
 
-if (d->state.name && (d->state.name == state_name ||
-  !strcmp(d->state.name, state_name)))
+if (d->state.name && (!strcmp(d->state.name, state_name)))
   {
  if (!approximate)
{

--

[EGIT] [core/efl] master 01/01: Evas text: Fix Evas Text truncated text case.

2015-12-09 Thread Youngbok Shin

herdsman pushed a commit to branch master.

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

commit 20ef85e307818c7c92927688ee6fd5d9dec1ee8f
Author: Youngbok Shin 
Date:   Wed Dec 9 09:50:33 2015 +0200

Evas text: Fix Evas Text truncated text case.

Summary:
Evas Text only concerns about a advance of each text item.
When a width of last character is bigger than its advance, the last 
character can be truncated.
And the different line size calculation caused different aligning between 
Evas Text and Evas Textblock.
So, the width of last character will be considered in Evas Text just like 
Evas Textblock.
@fix

Test Plan:
The following text shows how the size calculation is different between Evas 
Textblock and Text.
Get native size from Evas Textblock and get width(geometry) of Evas Text.
You can see the width of Evas Text is bigger than native size of Evas 
Textblock.
(adv > width)
こんにちは。

The following text will be truncated without this patch.
(adv < width)
ନୂଁ

Reviewers: woohyun, tasn, herdsman

Subscribers: jpeg, cedric

Differential Revision: https://phab.enlightenment.org/D3004
---
 src/lib/evas/canvas/evas_object_text.c | 33 ++---
 src/tests/evas/evas_test_text.c| 65 ++
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_text.c 
b/src/lib/evas/canvas/evas_object_text.c
index ff3e761..46b2039 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -54,7 +54,7 @@ struct _Evas_Text_Data
   Evas_Object_Text_Item*ellipsis_end;
   Evas_Coordw, h;
   int   advance;
-  int   advance_without_ellipsis;
+  int   width_without_ellipsis;
   Eina_Bool ellipsis;
} last_computed;
 
@@ -348,9 +348,9 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj,
 }
 
 static Evas_Coord
-_evas_object_text_horiz_advance_without_ellipsis_get(const Evas_Text_Data *o)
+_evas_object_text_horiz_width_without_ellipsis_get(const Evas_Text_Data *o)
 {
-   return o->last_computed.advance_without_ellipsis;
+   return o->last_computed.width_without_ellipsis;
 }
 
 static Evas_Coord
@@ -685,7 +685,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, 
Evas_Text_Data *o, Eina_Unicode *t
 {
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, 
EVAS_OBJECT_CLASS);
EvasBiDiStrIndex *v_to_l = NULL;
-   Evas_Coord advance = 0;
+   Evas_Coord advance = 0, width = 0;
size_t pos, visual_pos;
int len = eina_unicode_strlen(text);
int l = 0, r = 0;
@@ -754,6 +754,8 @@ _evas_object_text_layout(Evas_Object *eo_obj, 
Evas_Text_Data *o, Eina_Unicode *t
 
if (text)
  {
+const Evas_Object_Text_Item *last_it = NULL;
+
 while (len > 0)
   {
  Evas_Font_Instance *script_fi = NULL;
@@ -791,15 +793,22 @@ _evas_object_text_layout(Evas_Object *eo_obj, 
Evas_Text_Data *o, Eina_Unicode *t
   pos += run_len;
   script_len -= run_len;
   len -= run_len;
+
+  if (it->w > 0)
+last_it = it;
}
   }
+
+width = advance;
+if (last_it)
+  width += last_it->w - last_it->adv;
  }
-   o->last_computed.advance_without_ellipsis = advance;
+   o->last_computed.width_without_ellipsis = width;
 
_evas_object_text_pad_get(eo_obj, o, , , NULL, NULL);
 
/* Handle ellipsis */
-   if (pos && (o->cur.ellipsis >= 0.0) && (advance + l + r > 
obj->cur->geometry.w) && (obj->cur->geometry.w > 0))
+   if (pos && (o->cur.ellipsis >= 0.0) && (width + l + r > 
obj->cur->geometry.w) && (obj->cur->geometry.w > 0))
  {
 Evas_Coord ellip_frame = obj->cur->geometry.w;
 Evas_Object_Text_Item *start_ellip_it = NULL, *end_ellip_it = NULL;
@@ -821,7 +830,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, 
Evas_Text_Data *o, Eina_Unicode *t
   start_ellip_it = _layout_ellipsis_item_new(obj, o);
}
  o->last_computed.ellipsis_start = start_ellip_it;
- ellip_frame -= start_ellip_it->adv;
+ ellip_frame -= start_ellip_it->w;
   }
 if (o->cur.ellipsis != 1)
   {
@@ -837,18 +846,18 @@ _evas_object_text_layout(Evas_Object *eo_obj, 
Evas_Text_Data *o, Eina_Unicode *t
   end_ellip_it = _layout_ellipsis_item_new(obj, o);
}
  o->last_computed.ellipsis_end = end_ellip_it;
- ellip_frame -= end_ellip_it->adv;
+ ellip_frame -= end_ellip_it->w;
   }
 
 /* The point where we should start from, going for the full
  * ellip frame. */
-Evas_Coord ellipsis_coord =

[EGIT] [core/efl] master 01/01: edje: calc - add curly braces to avoid ambiguous 'if'

2015-12-09 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 4cebfc526fb845ea1484763f190bd99786722232
Author: Amitesh Singh 
Date:   Wed Dec 9 15:55:59 2015 +0530

edje: calc - add curly braces to avoid ambiguous 'if'

merge two if conditions into one also.
---
 src/lib/edje/edje_calc.c | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index c06e3ac..ff2146d 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -432,11 +432,12 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
unsigned int i;
 
/* RTL flag is set, return RTL description */
-   if (edje_object_mirrored_get(ed->obj))
- if (!ep->other.desc_rtl)
-   ep->other.desc_rtl = (Edje_Part_Description_Common **)
- calloc(ep->other.desc_count,
-sizeof (Edje_Part_Description_Common *));
+   if (edje_object_mirrored_get(ed->obj) && !ep->other.desc_rtl)
+ {
+ep->other.desc_rtl = (Edje_Part_Description_Common **)
+   calloc(ep->other.desc_count,
+  sizeof (Edje_Part_Description_Common *));
+ }
 
if (!strcmp(state_name, "default") && state_val == 0.0)
  return _edje_get_description_by_orientation(ed,

--

[EGIT] [core/efl] master 01/01: Evas: Fix build for ubuntu... again

2015-12-09 Thread Jean-Philippe ANDRÉ

jpeg pushed a commit to branch master.

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

commit b6ead19a94663d125e659c1c9ebf49eff40db040
Author: Jean-Philippe Andre 
Date:   Wed Dec 9 16:58:48 2015 +0900

Evas: Fix build for ubuntu... again

See 75fed54f0e4d72b20860
Apparently the proper CFLAGS are not set for SSE compilation.
SSE flags are set only for a specific file (now 2 of them).

As usual, it was worksforme but not for others. This should probably
fix that. Thanks Sub for the report and testing this solution.
---
 src/Makefile_Evas.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index b2d1c7a..3f7dd39 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -263,7 +263,6 @@ lib/evas/canvas/evas_vg_shape.c
 lib_evas_libevas_la_SOURCES += \
 static_libs/draw/draw_alpha_main.c \
 static_libs/draw/draw_main_neon.c \
-static_libs/draw/draw_main_sse2.c \
 static_libs/draw/draw_main.c
 
 # Engine
@@ -373,7 +372,8 @@ lib_evas_libevas_la_CPPFLAGS = 
-I$(top_builddir)/src/lib/efl \
 noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
 
 lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \
-lib/evas/common/evas_op_blend/op_blend_master_sse3.c
+lib/evas/common/evas_op_blend/op_blend_master_sse3.c \
+static_libs/draw/draw_main_sse2.c
 
 lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = 
-I$(top_builddir)/src/lib/efl \
 $(lib_evas_libevas_la_CPPFLAGS) \

--

[EGIT] [core/elementary] master 01/01: Elm entry: fix null item in item provider.

2015-12-09 Thread Daniel Hirt

herdsman pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=3585ee43369e78f91d2250e91c5f647af4262b76

commit 3585ee43369e78f91d2250e91c5f647af4262b76
Author: Daniel Hirt 
Date:   Wed Dec 9 13:38:21 2015 +0200

Elm entry: fix null item in item provider.

Item anchors can have null items likes . That is,
there is no "href". The problem is that Elm Entry segfaults as it
expects a non-null item. I prefer this fix over passing "" from Edje
Entry, and leave the decision to be made by Elm Entry. It will now just
show the error emoticon if there is no "href".

@fix
---
 src/lib/elm_entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b20ed77..923b3ad 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2563,7 +2563,7 @@ _item_get(void *data,
 o = ip->func(ip->data, data, item);
 if (o) return o;
  }
-   if (!strncmp(item, "file://", 7))
+   if (item && !strncmp(item, "file://", 7))
  {
 const char *fname = item + 7;
 

--

[EGIT] [core/enlightenment] master 02/02: modules/geolocation: Add support for new speed and heading properties

2015-12-09 Thread Stefan Schmidt

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=482cc68899cdf5e595c513ce10d4a2ed884d6cf3

commit 482cc68899cdf5e595c513ce10d4a2ed884d6cf3
Author: Stefan Schmidt 
Date:   Wed Aug 5 15:18:53 2015 +0200

modules/geolocation: Add support for new speed and heading properties

Available since Geoclue 2.2.0. Display them in the popup if available.
---
 src/modules/geolocation/e_mod_main.c | 66 +++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/modules/geolocation/e_mod_main.c 
b/src/modules/geolocation/e_mod_main.c
index 5e78f0f..e394808 100644
--- a/src/modules/geolocation/e_mod_main.c
+++ b/src/modules/geolocation/e_mod_main.c
@@ -37,6 +37,8 @@ struct _Instance
Evas_Object *popup_latitude;
Evas_Object *popup_longitude;
Evas_Object *popup_altitude;
+   Evas_Object *popup_speed;
+   Evas_Object *popup_heading;
Evas_Object *popup_accuracy;
Evas_Object *popup_description;
int in_use;
@@ -49,6 +51,8 @@ struct _Instance
double longitude;
double accuracy;
double altitude;
+   double speed;
+   double heading;
const char *description;
 };
 
@@ -83,6 +87,20 @@ popup_update(Instance *inst)
 
e_widget_label_text_set(inst->popup_altitude, buf);
 
+   if (inst->speed != -1.0)
+snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
+   else
+snprintf(buf, sizeof(buf), _("Speed: N/A"));
+
+   e_widget_label_text_set(inst->popup_speed, buf);
+
+   if (inst->heading != -1.0)
+snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
+   else
+snprintf(buf, sizeof(buf), _("Heading: N/A"));
+
+   e_widget_label_text_set(inst->popup_heading, buf);
+
snprintf(buf, sizeof(buf), _("Accuracy:  %.1f m"), inst->accuracy);
e_widget_label_text_set(inst->popup_accuracy, buf);
 }
@@ -136,6 +154,22 @@ popup_new(Instance *inst)
inst->popup_altitude = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_altitude, 1, 1, 0.5);
 
+   if (inst->speed != -1.0)
+snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
+   else
+snprintf(buf, sizeof(buf), _("Speed: N/A"));
+
+   inst->popup_speed = e_widget_label_add(evas, buf);
+   e_widget_list_object_append(list, inst->popup_speed, 1, 1, 0.5);
+
+   if (inst->heading != -1.0)
+snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
+   else
+snprintf(buf, sizeof(buf), _("Heading: N/A"));
+
+   inst->popup_heading = e_widget_label_add(evas, buf);
+   e_widget_list_object_append(list, inst->popup_heading, 1, 1, 0.5);
+
snprintf(buf, sizeof(buf), _("Accuracy:  %.1f m"), inst->accuracy);
inst->popup_accuracy = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_accuracy, 1, 1, 0.5);
@@ -264,6 +298,32 @@ cb_location_prop_altitude_get(void *data EINA_UNUSED, 
Eldbus_Pending *p EINA_UNU
 }
 
 void
+cb_location_prop_speed_get(void *data EINA_UNUSED, Eldbus_Pending *p 
EINA_UNUSED,
+  const char *propname EINA_UNUSED, Eldbus_Proxy 
*proxy EINA_UNUSED,
+  Eldbus_Error_Info *error_info EINA_UNUSED, double 
value)
+{
+   Instance *inst = data;
+   inst->speed = value;
+
+   popup_update(inst);
+
+   DBG("Location property Speed: %f", value);
+}
+
+void
+cb_location_prop_heading_get(void *data EINA_UNUSED, Eldbus_Pending *p 
EINA_UNUSED,
+const char *propname EINA_UNUSED, Eldbus_Proxy 
*proxy EINA_UNUSED,
+Eldbus_Error_Info *error_info EINA_UNUSED, double 
value)
+{
+   Instance *inst = data;
+   inst->heading = value;
+
+   popup_update(inst);
+
+   DBG("Location property Heading: %f", value);
+}
+
+void
 cb_location_prop_description_get(void *data EINA_UNUSED, Eldbus_Pending *p 
EINA_UNUSED,
 const char *propname EINA_UNUSED, Eldbus_Proxy 
*proxy EINA_UNUSED,
 Eldbus_Error_Info *error_info EINA_UNUSED, 
const char *value)
@@ -311,6 +371,8 @@ cb_client_location_updated_signal(void *data, const 
Eldbus_Message *msg)
geo_clue2_location_longitude_propget(inst->location, 
cb_location_prop_longitude_get, inst);
geo_clue2_location_accuracy_propget(inst->location, 
cb_location_prop_accuracy_get, inst);
geo_clue2_location_altitude_propget(inst->location, 
cb_location_prop_altitude_get, inst);
+   geo_clue2_location_speed_propget(inst->location, 
cb_location_prop_speed_get, inst);
+   geo_clue2_location_heading_propget(inst->location, 
cb_location_prop_heading_get, inst);
geo_clue2_location_description_propget(inst->location, 
cb_location_prop_description_get, inst);
 }
 
@@ -397,7 +459,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, 
const char *style)
inst->latitude = 0.0;
inst->longitude = 0.0;
inst->accuracy = 0.0;
-

[EGIT] [core/enlightenment] master 01/02: modules/geolocation: Update xml protocol spec to match the 2.2.0 release

2015-12-09 Thread Stefan Schmidt

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=3549d3967623131181fc6dd5e1761c8a1c2822ab

commit 3549d3967623131181fc6dd5e1761c8a1c2822ab
Author: Stefan Schmidt 
Date:   Wed Aug 5 14:37:05 2015 +0200

modules/geolocation: Update xml protocol spec to match the 2.2.0 release

This add two new properties: speed and heading. Having our eldbus boiler 
code
generated against this new protocol spec file.
---
 src/modules/geolocation/org.freedesktop.GeoClue2.xml | 17 +
 1 file changed, 17 insertions(+)

diff --git a/src/modules/geolocation/org.freedesktop.GeoClue2.xml 
b/src/modules/geolocation/org.freedesktop.GeoClue2.xml
index ab14565..8fe3f35 100644
--- a/src/modules/geolocation/org.freedesktop.GeoClue2.xml
+++ b/src/modules/geolocation/org.freedesktop.GeoClue2.xml
@@ -185,6 +185,23 @@
 
 
 
+
+
+
+
+
+

[EGIT] [tools/erigo] master 02/02: Remove unused code

2015-12-09 Thread Yakov Goldberg

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=d16b0135d571acc8611dc346a611718263ba6931

commit d16b0135d571acc8611dc346a611718263ba6931
Author: Yakov Goldberg 
Date:   Wed Dec 9 15:00:17 2015 +0200

Remove unused code

Remove unused and actually wrong code.
---
 src/bin/gui/editor.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 15423d6..4ebb339 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -1572,9 +1572,6 @@ _drop_target_enter(void *data, Evas_Object *obj)
 static void
 _drop_target_leave(void *data, Evas_Object *obj)
 {
-   /* FIXME: this is temp check in order to avoid segfault. */
-   if (!dnd_is_source() && !dnd_drop_data_get()) return;
-
Gui_Widget *drop_target_wdg = data;
Eo *canvas_drop_target = obj, *drop_target_wdg_eo = NULL;
DnD_Main_Obj_Info *di = NULL;

--

[EGIT] [tools/erigo] master 01/02: Fix border drawing for table drop target

2015-12-09 Thread Yakov Goldberg

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=04324ee1c919ef4d6c6d0122b28f70bcee71c57d

commit 04324ee1c919ef4d6c6d0122b28f70bcee71c57d
Author: Yakov Goldberg 
Date:   Wed Dec 9 13:55:25 2015 +0200

Fix border drawing for table drop target

Fix border drawing issue when table is a drop target,
and dragging object from external source.
---
 src/bin/gui/editor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 46a350e..15423d6 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -2372,7 +2372,7 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, 
Evas_Coord y, Elm_Xdnd_Actio
  /* Put objects to default places */
  if (di->packed)
{
-  eo_do(drop_target_wdg_eo, elm_obj_table_unpack(di->eo_cur));
+  if (di->eo_cur) eo_do(drop_target_wdg_eo, 
elm_obj_table_unpack(di->eo_cur));
   EINA_LIST_FOREACH(lst, l, it)
 {
Gui_Widget_Property *prop = 
obj_container_item_prop_get(it);
@@ -2426,7 +2426,7 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, 
Evas_Coord y, Elm_Xdnd_Actio
  /* Draw borders of the table. */
 _table_borders_draw(drop_target_wdg_eo, max_pack_x, max_pack_y, 
&(di->table_borders));
 
- eo_do(drop_target_wdg_eo, elm_obj_table_pack(di->eo_cur, pack_x, 
pack_y, 1, 1));
+ if (di->eo_cur) eo_do(drop_target_wdg_eo, 
elm_obj_table_pack(di->eo_cur, pack_x, pack_y, 1, 1));
  di->table_pack_x = pack_x;
  di->table_pack_y = pack_y;
  di->packed = EINA_TRUE;

--

[EGIT] [core/enlightenment] master 01/01: modules/geolocation: fix indent not following E coding style

2015-12-09 Thread Stefan Schmidt

stefan pushed a commit to branch master.

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

commit a44a21ffd8ba506c75755243a3c7b02d3ce4690c
Author: Stefan Schmidt 
Date:   Wed Dec 9 15:11:57 2015 +0100

modules/geolocation: fix indent not following E coding style

Fix some wrong indents I just introduced as well as some older ones.
---
 src/modules/geolocation/e_mod_main.c | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/geolocation/e_mod_main.c 
b/src/modules/geolocation/e_mod_main.c
index e394808..e0561af 100644
--- a/src/modules/geolocation/e_mod_main.c
+++ b/src/modules/geolocation/e_mod_main.c
@@ -71,7 +71,7 @@ popup_update(Instance *inst)
 {
char buf[PATH_MAX];
 
-   if(!inst->popup)
+   if (!inst->popup)
  return;
 
snprintf(buf, sizeof(buf), _("Latitude:  %f"), inst->latitude);
@@ -81,23 +81,23 @@ popup_update(Instance *inst)
e_widget_label_text_set(inst->popup_longitude, buf);
 
if (inst->altitude != -DBL_MAX)
-snprintf(buf, sizeof(buf), _("Altitude:  %f"), inst->altitude);
+ snprintf(buf, sizeof(buf), _("Altitude:  %f"), inst->altitude);
else
-snprintf(buf, sizeof(buf), _("Altitude:  N/A"));
+ snprintf(buf, sizeof(buf), _("Altitude:  N/A"));
 
e_widget_label_text_set(inst->popup_altitude, buf);
 
if (inst->speed != -1.0)
-snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
+ snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
else
-snprintf(buf, sizeof(buf), _("Speed: N/A"));
+ snprintf(buf, sizeof(buf), _("Speed: N/A"));
 
e_widget_label_text_set(inst->popup_speed, buf);
 
if (inst->heading != -1.0)
-snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
+ snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
else
-snprintf(buf, sizeof(buf), _("Heading: N/A"));
+ snprintf(buf, sizeof(buf), _("Heading: N/A"));
 
e_widget_label_text_set(inst->popup_heading, buf);
 
@@ -147,25 +147,25 @@ popup_new(Instance *inst)
e_widget_list_object_append(list, inst->popup_longitude, 1, 1, 0.5);
 
if (inst->altitude != -DBL_MAX)
-snprintf(buf, sizeof(buf), _("Altitude:  %f"), inst->altitude);
+ snprintf(buf, sizeof(buf), _("Altitude:  %f"), inst->altitude);
else
-snprintf(buf, sizeof(buf), _("Altitude:  N/A"));
+ snprintf(buf, sizeof(buf), _("Altitude:  N/A"));
 
inst->popup_altitude = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_altitude, 1, 1, 0.5);
 
if (inst->speed != -1.0)
-snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
+ snprintf(buf, sizeof(buf), _("Speed:  %f"), inst->speed);
else
-snprintf(buf, sizeof(buf), _("Speed: N/A"));
+ snprintf(buf, sizeof(buf), _("Speed: N/A"));
 
inst->popup_speed = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_speed, 1, 1, 0.5);
 
if (inst->heading != -1.0)
-snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
+ snprintf(buf, sizeof(buf), _("Heading:  %f"), inst->heading);
else
-snprintf(buf, sizeof(buf), _("Heading: N/A"));
+ snprintf(buf, sizeof(buf), _("Heading: N/A"));
 
inst->popup_heading = e_widget_label_add(evas, buf);
e_widget_list_object_append(list, inst->popup_heading, 1, 1, 0.5);

--

[EGIT] [core/elementary] annotated tag v1.15.3 created (now 1e05d49)

2015-12-09 Thread Enlightenment Git

This is an automated email from the git hooks/post-receive script.

seoz pushed a change to annotated tag v1.15.3
in repository core/elementary.

at  1e05d49   (tag)
   tagging  dd937657a48d0032be2d40f7980a43724eb3faca (commit)
  replaces  v1.15.2
 tagged by  Daniel Juyung Seo
on  Thu Dec 10 01:25:49 2015 +0900

- Log -
v1.15.3

Daniel Juyung Seo (3):
  po: Updated po files.
  release: Update NEWS and bump version for 1.15.3 release
  po: Update po files.

Mike Blumenkrantz (3):
  toolbar: do not change align for "noicon" toolbar items
  deskmirror: unset proxy.source_clip for urgency effects
  border: bring sparklebear theme up-to-date with current efl rendering

---

No new revisions were added by this update.

--

[EGIT] [tools/erigo] master 02/02: Fix showing selection border of zero size

2015-12-09 Thread Yakov Goldberg

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=e153844b7e098a2fdaadd67cbbccc1d3b6a85001

commit e153844b7e098a2fdaadd67cbbccc1d3b6a85001
Author: Yakov Goldberg 
Date:   Wed Dec 9 17:39:09 2015 +0200

Fix showing selection border of zero size

When no widget was selected, there was border of zero size shown.
Plus some other refactoring and cleaning.
---
 src/bin/gui/editor.c | 23 ++-
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index c20e0a7..6c18563 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -473,25 +473,11 @@ _editor_wdg_selected_set(const Gui_Widget *wdg)
const Gui_Widget *old_wdg = _editor_wdg_selected_get();
if ((old_wdg) && (old_wdg == wdg)) return;
 
-   /* Hide previous border*/
-   if (old_wdg)
- {
-   // _wdg_border_draw(old_wdg, EINA_FALSE, BORDER_SELECTION);
- }
-   else
- {
-/* During context call _win_resize() will be called.
- * It will draw border around win, but widget was not selected yet.
- * So need to hide border. */
-//_wdg_border_draw(NULL, EINA_FALSE, BORDER_SELECTION);
- }
-
/* Show new border*/
+   Gui_Context *ctx = _active_context_get();
+   gui_context_data_set(ctx, SELECTED_WDG, (Gui_Widget *) wdg);
if (wdg)
  {
-Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
-gui_context_data_set(ctx, SELECTED_WDG, (Gui_Widget *) wdg);
-
 /* Stack up parent frame */
 const Gui_Widget *main_wdg = wdg_main_wdg_get(wdg);
 Main_Wdg_Info *wi = wdg_data_get(main_wdg, MAIN_WDG_INFO);
@@ -502,11 +488,6 @@ _editor_wdg_selected_set(const Gui_Widget *wdg)
 /* Set focus */
 eo_do(obj, evas_obj_focus_set(EINA_TRUE));
  }
-   else
- {
-gui_context_data_set(_active_context_get(), SELECTED_WDG, NULL);
-_wdg_border_draw(NULL, EINA_TRUE, BORDER_SELECTION);
- }
 }
 
 static void

--

[EGIT] [tools/erigo] master 01/02: Set default path for fileselector in OPEN mode

2015-12-09 Thread Yakov Goldberg

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=322fd329eae7697b2b77c6b3b999aa9823e19239

commit 322fd329eae7697b2b77c6b3b999aa9823e19239
Author: Yakov Goldberg 
Date:   Wed Dec 9 17:03:13 2015 +0200

Set default path for fileselector in OPEN mode

Default path in OPEN mode is last dir used for current project
---
 src/bin/gui/editor.c | 3 ++-
 src/bin/gui/egui_logic.c | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index 4ebb339..c20e0a7 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -483,7 +483,7 @@ _editor_wdg_selected_set(const Gui_Widget *wdg)
 /* During context call _win_resize() will be called.
  * It will draw border around win, but widget was not selected yet.
  * So need to hide border. */
-_wdg_border_draw(NULL, EINA_FALSE, BORDER_SELECTION);
+//_wdg_border_draw(NULL, EINA_FALSE, BORDER_SELECTION);
  }
 
/* Show new border*/
@@ -4457,6 +4457,7 @@ Eina_Bool
 _wdg_border_draw_on_idle(void *data EINA_UNUSED)
 {
const Gui_Widget *wdg = _editor_wdg_selected_get();
+   ERR("%p", wdg);
if (wdg)
  {
 _wdg_border_draw(wdg, EINA_TRUE, BORDER_SELECTION);
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index 78bcfcf..6fea9f5 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -512,6 +512,7 @@ _fs_mode_open(int fs_mode)
   eo_do(fs_win->fs_radio_box, efl_gfx_visible_set(EINA_TRUE));
   eo_do(fs_win->fileselector, 
elm_interface_fileselector_is_save_set(EINA_TRUE));
   fs_path = gui_context_export_path_get(ctx);
+  if (!fs_path) fs_path = gui_context_project_path_get(ctx);
   fs_file = gui_context_export_filename_get(ctx);
   break;
}
@@ -531,6 +532,7 @@ _fs_mode_open(int fs_mode)
}
   case ITEM_OPEN:
{
+  if (ctx) fs_path = gui_context_project_path_get(ctx);
   break;
}
   default:

--

[EGIT] [core/efl] annotated tag v1.15.3 created (now 879f7f1)

2015-12-09 Thread Enlightenment Git

This is an automated email from the git hooks/post-receive script.

seoz pushed a change to annotated tag v1.15.3
in repository core/efl.

at  879f7f1   (tag)
   tagging  469915d4a3edd9b50d345d01ec23a5193e2da938 (commit)
  replaces  v1.15.2
 tagged by  Daniel Juyung Seo
on  Thu Dec 10 01:18:46 2015 +0900

- Log -
v1.15.3

Chidambar Zinnoury (2):
  ecore fb: We shall look for the Ecore_Fb.h header only where needed.
  ecore fb: Unbreak ecore_evas_fb.

Daniel Juyung Seo (2):
  release: Update NEWS and bump version for 1.15.3 release
  po: Update po files.

Derek Foreman (1):
  ecore_x: Remove XPrint usage

Jean-Philippe ANDRÉ (1):
  Evas filters: Fix crash with async sw rendering

Mrunal Sovani (1):
  Ecore_xcb_keymap: Fix memory leak in _ecore_xcb_keymap_finilize

Shinwoo Kim (1):
  ecore: thread - need to null check of function pointer

Stefan Schmidt (1):
  ecore_evas_convert: make sure we add all needed flags and deps for the 
build

Tom Hacohen (1):
  Ecore exe win32: Fix double-free errors.

Vincent Torri (4):
  Evil: set EAPI correctly in pwd.h
  Eina: fix spelling in eina_tmpstr documentation
  Eina: fix eina_file_current_directory_get()
  Eina: fix memory leak in eina_file_open()

Youngbok Shin (1):
  edje: initialize map.zoom values to fix old *.edj compatibility issues.

---

No new revisions were added by this update.

--

[EGIT] [core/efl] master 01/01: Revert "edje: calc - remove pointer comparison while finding part desc"

2015-12-09 Thread Amitesh Singh

ami pushed a commit to branch master.

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

commit 18b66a319211e47265094c9466eda4c816db38e5
Author: Amitesh Singh 
Date:   Wed Dec 9 21:29:42 2015 +0530

Revert "edje: calc - remove pointer comparison while finding part desc"

This reverts commit c892a1cb714fed496cbf5568c4d43880b6fb67b2.
---
 src/lib/edje/edje_calc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index ff2146d..0505580 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -461,7 +461,8 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, 
const char *state_name
  {
 d = ep->other.desc[i];
 
-if (d->state.name && (!strcmp(d->state.name, state_name)))
+if (d->state.name && (d->state.name == state_name ||
+  !strcmp(d->state.name, state_name)))
   {
  if (!approximate)
{

--

[EGIT] [core/efl] master 02/02: ecore-evas-wayland: Fix issue of starting resizing causing size jumps

2015-12-09 Thread Chris Michael

devilhorns pushed a commit to branch master.

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

commit b5f8966fbed5e758d57a29fb079219f8ed96cd46
Author: Chris Michael 
Date:   Wed Dec 9 12:03:53 2015 -0500

ecore-evas-wayland: Fix issue of starting resizing causing size jumps

Previously, when we started to resize an efl app, the size would
"jump" due to framespace being adjusted. This patch fixes that issue
and resize now works as expected.

@fix

Signed-off-by: Chris Michael 
---
 .../engines/wayland/ecore_evas_wayland_common.c| 23 +++---
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 4b090ef..e5ccd88 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -167,8 +167,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data 
EINA_UNUSED, int type EINA_
Ecore_Evas *ee;
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl2_Event_Window_Configure *ev;
-   int nw = 0, nh = 0;
-   int fw = 0, fh = 0;
+   int nw = 0, nh = 0, fy = 0;
Eina_Bool prev_max, prev_full;
 
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -200,21 +199,13 @@ _ecore_evas_wl_common_cb_window_configure(void *data 
EINA_UNUSED, int type EINA_
 
/* NB: We receive window configure sizes based on xdg surface
 * window geometry, so we need to subtract framespace here */
-   evas_output_framespace_get(ee->evas, NULL, NULL, , );
+   evas_output_framespace_get(ee->evas, NULL, , NULL, NULL);
+   nh = (ev->h - fy);
 
-   if (ECORE_EVAS_PORTRAIT(ee))
- {
-nw -= fw;
-nh -= fh;
- }
-   else
- {
-nw -= fh;
-nh -= fw;
- }
-
-   if (ee->prop.fullscreen || (ee->x != ev->x) || (ee->y != ev->y))
- _ecore_evas_wl_common_move(ee, ev->x, ev->y);
+   /* NB: This block commented out for now. Unsure this is really needed.
+* Maximize and moving both seem to work fine without this */
+   /* if (ee->prop.fullscreen || (ee->x != ev->x) || (ee->y != ev->y)) */
+   /*   _ecore_evas_wl_common_move(ee, ev->x, ev->y); */
 
if (ee->prop.fullscreen || (ee->req.w != nw) || (ee->req.h != nh))
  _ecore_evas_wl_common_resize(ee, nw, nh);

--

[EGIT] [website/www-content] master 01/01: Wiki page javascript changed with summary [] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=0652277db9fa7d77fc704a44c7d0891859451e5e

commit 0652277db9fa7d77fc704a44c7d0891859451e5e
Author: Lauro Moura 
Date:   Wed Dec 9 10:09:52 2015 -0800

Wiki page javascript changed with summary [] by Lauro Moura
---
 pages/api/javascript.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/api/javascript.txt b/pages/api/javascript.txt
index d9612b9..1ad1892 100644
--- a/pages/api/javascript.txt
+++ b/pages/api/javascript.txt
@@ -14,7 +14,6 @@ var efl = require('efl');
* [[api/javascript/eio|Eio]] - Async input/output.
* [[api/javascript/eina|Eina]] - Data types and basic abstractions.
* [[api/javascript/eldbus|Eldbus]] - Dbus-integration.
-   * [[api/javascript/eo|Eo]] - Generic object system.
* [[api/javascript/ethumb|Ethumb]] - Generate thumbnail images of files.
 
 = Under the hood =

--

[EGIT] [website/www-content] master 01/01: Wiki page timer changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=bcb1604824c2f29c9fc63be1c47974116459c2ec

commit bcb1604824c2f29c9fc63be1c47974116459c2ec
Author: Lauro Moura 
Date:   Wed Dec 9 11:03:03 2015 -0800

Wiki page timer changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/timer.txt | 89 
 1 file changed, 89 insertions(+)

diff --git a/pages/api/javascript/ecore/timer.txt 
b/pages/api/javascript/ecore/timer.txt
new file mode 100644
index 000..6ea9490
--- /dev/null
+++ b/pages/api/javascript/ecore/timer.txt
@@ -0,0 +1,89 @@
+= Javascript binding API - Ecore Timer =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+ Functions 
+
+=== add(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== addLoop(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== dump(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== getPrecision(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== setPrecision(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [bindings/python/python-efl] master 01/01: print()--

2015-12-09 Thread Kai Huuhko

kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=5d73c59088961ece986c6754615b68d9bbd0475a

commit 5d73c59088961ece986c6754615b68d9bbd0475a
Author: Kai Huuhko 
Date:   Wed Dec 9 21:02:59 2015 +0200

print()--
---
 efl/elementary/cnp_callbacks.pxi | 10 --
 1 file changed, 10 deletions(-)

diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi
index 83b4646..8c49ae7 100644
--- a/efl/elementary/cnp_callbacks.pxi
+++ b/efl/elementary/cnp_callbacks.pxi
@@ -106,7 +106,6 @@ cdef Eina_Bool py_elm_drop_cb(void *data, Evas_Object *obj, 
Elm_Selection_Data *
 :param ev: struct holding information about selected data
 
 """
-print("in drop_cb")
 assert data != NULL, "data is NULL"
 cdef:
 SelectionData sd = SelectionData.__new__(SelectionData)
@@ -136,7 +135,6 @@ cdef Elm_Object_Item *py_elm_xy_item_get_cb(Evas_Object 
*obj, Evas_Coord x, Evas
 :return: object under x,y cords or NULL if not found.
 
 """
-print("in xy_item_get_cb")
 assert obj != NULL, "obj is NULL"
 
 cdef:
@@ -187,7 +185,6 @@ cdef Evas_Object *py_elm_drag_icon_create_cb(
 :return: An object to fill the drag window with or NULL if not needed
 
 """
-print("in drag_icon_create_cb")
 assert data != NULL, "data is NULL"
 
 cdef:
@@ -227,7 +224,6 @@ cdef void py_elm_drag_state_cb(void *data, Evas_Object 
*obj) with gil:
 :param obj: The object where the drag started
 
 """
-print("in drag_state_cb")
 assert data != NULL, "data is NULL"
 
 cdef:
@@ -248,7 +244,6 @@ cdef void py_elm_drag_done_cb(void *data, Evas_Object *obj, 
Eina_Bool accepted)
 :param accepted: TRUE if the dropped-data is accepted on drop
 
 """
-print("in drag_done_cb")
 assert data != NULL, "data is NULL"
 
 cdef:
@@ -269,7 +264,6 @@ cdef void py_elm_drag_accept_cb(void *data, Evas_Object 
*obj, Eina_Bool doaccept
 :param doaccept: A boolean as to if the target accepts the drag or not
 
 """
-print("in drag_accept_cb")
 assert data != NULL, "data is NULL"
 
 cdef:
@@ -292,7 +286,6 @@ cdef void py_elm_drag_pos_cb(void *data, Evas_Object *obj,
 :param y: The Y coordinate relative to the top-left of the object
 
 """
-print("in drag_pos_cb")
 assert data != NULL, "data is NULL"
 
 cdef:
@@ -323,8 +316,6 @@ cdef void py_elm_drag_item_container_pos(
 :param action: The drag action to be done
 
 """
-print("in drag_item_container_pos")
-
 cdef:
 evasObject o = object_from_instance(cont)
 ObjectItem item = _object_item_to_python(it)
@@ -349,7 +340,6 @@ cdef Eina_Bool py_elm_drop_item_container_cb(
 :param yposret: Position relative to item (upper (-1), middle (0), bottom 
(1)
 
 """
-print("in drop_item_container_cb")
 assert obj != NULL, "obj is NULL"
 
 cdef:

--

[EGIT] [website/www-content] master 01/01: Wiki page job changed with summary [] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=72534c2c737589bc2a953ced66d4530d65487a1d

commit 72534c2c737589bc2a953ced66d4530d65487a1d
Author: Lauro Moura 
Date:   Wed Dec 9 11:23:00 2015 -0800

Wiki page job changed with summary [] by Lauro Moura
---
 pages/api/javascript/ecore/job.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pages/api/javascript/ecore/job.txt 
b/pages/api/javascript/ecore/job.txt
index bf4caff..8e709ca 100644
--- a/pages/api/javascript/ecore/job.txt
+++ b/pages/api/javascript/ecore/job.txt
@@ -4,6 +4,8 @@
 
 **DRAFT**
 
+The Job module allows queuing work to be done when 
+
  Constants 
 
 

--

[EGIT] [bindings/python/python-efl] master 01/01: Elementary.dnd: Fix various leftover issues

2015-12-09 Thread Kai Huuhko

kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=75fa5ff2565dec7ae002b33b4f9f12171c9c

commit 75fa5ff2565dec7ae002b33b4f9f12171c9c
Author: Kai Huuhko 
Date:   Wed Dec 9 21:26:29 2015 +0200

Elementary.dnd: Fix various leftover issues
---
 efl/elementary/object.pxi   | 69 +
 examples/elementary/test_dnd.py |  2 +-
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/efl/elementary/object.pxi b/efl/elementary/object.pxi
index 27c91fb..5c5ddad 100644
--- a/efl/elementary/object.pxi
+++ b/efl/elementary/object.pxi
@@ -1669,19 +1669,20 @@ cdef class Object(SmartObject):
 raise RuntimeError("Could not add drop target.")
 
 def drop_target_del(self, Elm_Sel_Format fmt,
-entercb, enterdata, leavecb, leavedata, poscb, posdata, dropcb, 
dropdata):
+entercb=None, enterdata=None, leavecb=None, leavedata=None,
+poscb=None, posdata=None, dropcb=None, dropdata=None):
 """Deletes the drop target status of an object
 
-@param format The formats supported for dropping
-@param entercb The function to call when the object is entered with a 
drag
-@param enterdata The application data to pass to enterdata
-@param leavecb The function to call when the object is left with a drag
-@param leavedata The application data to pass to leavedata
-@param poscb The function to call when the object has a drag over it
-@param posdata The application data to pass to posdata
-@param dropcb The function to call when a drop has occurred
-@param dropdata The application data to pass to dropcb
-@return Returns @c EINA_TRUE, if successful, or @c EINA_FALSE if not.
+:param format: The formats supported for dropping
+:param entercb: The function to call when the object is entered with a 
drag
+:param enterdata: The application data to pass to enterdata
+:param leavecb: The function to call when the object is left with a 
drag
+:param leavedata: The application data to pass to leavedata
+:param poscb: The function to call when the object has a drag over it
+:param posdata: The application data to pass to posdata
+:param dropcb: The function to call when a drop has occurred
+:param dropdata: The application data to pass to dropcb
+:raise RuntimeError: if drop target cannot be deleted
 
 .. versionadded:: 1.17
 
@@ -1717,8 +1718,8 @@ cdef class Object(SmartObject):
 raise RuntimeError("Could not del drop target.")
 
 def drag_start(self, Elm_Sel_Format format,
-data, Elm_Xdnd_Action action, createicon, createdata,
-dragpos, dragdata, acceptcb, acceptdata, dragdone, donecbdata):
+data, Elm_Xdnd_Action action, createicon=None, createdata=None,
+dragpos=None, dragdata=None, acceptcb=None, acceptdata=None, 
dragdone=None, donecbdata=None):
 """Begins a drag given a source object
 
 :param format: The drag formats supported by the data
@@ -1742,23 +1743,37 @@ cdef class Object(SmartObject):
 .. versionadded:: 1.17
 
 """
-if not callable(createicon) \
-or not callable(dragpos) \
-or not callable(acceptcb) \
-or not callable(dragdone):
-raise TypeError("A callback passed is not callable.")
-
-create = (createicon, createdata)
-pos = (dragpos, dragdata)
-accept = (acceptcb, acceptdata)
-done = (dragdone, donecbdata)
+if createicon:
+if not callable(createicon):
+raise TypeError("A callback passed is not callable.")
+create = (createicon, createdata)
+Py_INCREF(create)
+if dragpos:
+if not callable(dragpos):
+raise TypeError("A callback passed is not callable.")
+pos = (dragpos, dragdata)
+Py_INCREF(pos)
+if acceptcb:
+if not callable(acceptcb):
+raise TypeError("A callback passed is not callable.")
+accept = (acceptcb, acceptdata)
+Py_INCREF(accept)
+if dragdone:
+if not callable(dragdone):
+raise TypeError("A callback passed is not callable.")
+done = (dragdone, donecbdata)
+Py_INCREF(done)
 
 if not elm_drag_start(self.obj, format,
 data, action,
-py_elm_drag_icon_create_cb, create,
-py_elm_drag_pos_cb, pos,
-py_elm_drag_accept_cb, accept,
-py_elm_drag_state_cb, done
+py_elm_drag_icon_create_cb if createicon 
is not None else NULL,
+create if createicon is not None else NULL,
+py_elm_drag_pos_cb if dragpos is not None else NULL,
+pos if dragpos is not None else NULL,
+

[EGIT] [website/www-content] master 01/01: Wiki page idle changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=bb57084e577c4a6925536938e85149a1d78b91b8

commit bb57084e577c4a6925536938e85149a1d78b91b8
Author: Lauro Moura 
Date:   Wed Dec 9 10:23:30 2015 -0800

Wiki page idle changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/idle.txt | 74 +
 1 file changed, 74 insertions(+)

diff --git a/pages/api/javascript/ecore/idle.txt 
b/pages/api/javascript/ecore/idle.txt
new file mode 100644
index 000..cea364a
--- /dev/null
+++ b/pages/api/javascript/ecore/idle.txt
@@ -0,0 +1,74 @@
+= Javascript binding API - Ecore Idler =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+
+ Functions 
+
+=== add(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== addEnterer(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== addEntererBefore(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== addExiter(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [core/enlightenment] master 14/18: call ecore_wl2_init() during compositor init

2015-12-09 Thread Mike Blumenkrantz

devilhorns pushed a commit to branch master.

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

commit c22ddd6039a4600fc100387579652d6eeb50cd52
Author: Mike Blumenkrantz 
Date:   Sat Dec 5 13:07:33 2015 -0500

call ecore_wl2_init() during compositor init

ref T2919
---
 src/bin/e_comp_wl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 53c1666..16041c1 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2459,6 +2459,8 @@ _e_comp_wl_compositor_create(void)
return EINA_FALSE;
  }
 
+   ecore_wl2_init();
+
/* set compositor wayland data */
e_comp_wl = e_comp->wl_comp_data = cdata;
 

--

[EGIT] [core/enlightenment] master 09/18: Don't leak eina_iterator in shot module

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=74cd89636b625ae85a7ce211c765852c0fc1f7b6

commit 74cd89636b625ae85a7ce211c765852c0fc1f7b6
Author: Chris Michael 
Date:   Mon Oct 26 10:03:33 2015 -0400

Don't leak eina_iterator in shot module

Signed-off-by: Chris Michael 
---
 src/modules/shot/e_mod_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 60919b0..85d61f7 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -1300,6 +1300,7 @@ _wl_init()
}
   }
  }
+   eina_iterator_free(itr);
 
return ECORE_CALLBACK_RENEW;
 }

--

[EGIT] [core/enlightenment] master 12/18: Fix formatting

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2bdd6762ad66afdaa3d57e2cb7294235b71e3813

commit 2bdd6762ad66afdaa3d57e2cb7294235b71e3813
Author: Chris Michael 
Date:   Mon Oct 26 10:24:28 2015 -0400

Fix formatting

Signed-off-by: Chris Michael 
---
 src/bin/e_comp_wl_input.c | 60 +++
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 7e8f2e9..ec9d2e1 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -20,7 +20,7 @@ _e_comp_wl_input_update_seat_caps(void)
  caps |= WL_SEAT_CAPABILITY_TOUCH;
 
EINA_LIST_FOREACH(e_comp_wl->seat.resources, l, res)
-wl_seat_send_capabilities(res, caps);
+ wl_seat_send_capabilities(res, caps);
 }
 
 static void
@@ -126,9 +126,13 @@ _e_comp_wl_input_cb_keyboard_unbind(struct wl_resource 
*resource)
e_comp_wl->kbd.resources =
  eina_list_remove(e_comp_wl->kbd.resources, resource);
EINA_LIST_FOREACH_SAFE(e_comp_wl->kbd.focused, l, ll, res)
- if (res == resource)
-   e_comp_wl->kbd.focused =
- eina_list_remove_list(e_comp_wl->kbd.focused, l);
+ {
+if (res == resource)
+  {
+ e_comp_wl->kbd.focused =
+   eina_list_remove_list(e_comp_wl->kbd.focused, l);
+  }
+ }
 }
 
 void
@@ -169,8 +173,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, 
struct wl_resource *r
 wl_resource_get_version(resource), id);
if (!res)
  {
-ERR("Could not create keyboard on seat %s: %m",
-e_comp_wl->seat.name);
+ERR("Could not create keyboard on seat %s: %m", e_comp_wl->seat.name);
 wl_client_post_no_memory(client);
 return;
  }
@@ -187,8 +190,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, 
struct wl_resource *r
 
/* send current keymap */
wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
-   e_comp_wl->xkb.fd,
-   e_comp_wl->xkb.size);
+   e_comp_wl->xkb.fd, e_comp_wl->xkb.size);
 
/* if the client owns the focused surface, we need to send an enter */
focused = e_client_focused_get();
@@ -210,23 +212,23 @@ _e_comp_wl_input_cb_touch_unbind(struct wl_resource 
*resource)
 static void
 _e_comp_wl_input_cb_touch_get(struct wl_client *client EINA_UNUSED, struct 
wl_resource *resource, uint32_t id EINA_UNUSED)
 {
-struct wl_resource *res;
+   struct wl_resource *res;
 
 /* try to create pointer resource */
-res = wl_resource_create(client, _touch_interface,
- wl_resource_get_version(resource), id);
-if (!res)
-  {
- ERR("Could not create touch on seat %s: %m",
- e_comp_wl->seat.name);
- wl_client_post_no_memory(client);
- return;
-  }
-
-e_comp_wl->touch.resources =
+   res = wl_resource_create(client, _touch_interface,
+wl_resource_get_version(resource), id);
+   if (!res)
+ {
+ERR("Could not create touch on seat %s: %m",
+e_comp_wl->seat.name);
+wl_client_post_no_memory(client);
+return;
+ }
+
+   e_comp_wl->touch.resources =
  eina_list_append(e_comp_wl->touch.resources, res);
-wl_resource_set_implementation(res, &_e_touch_interface,
-   e_comp->wl_comp_data,
+   wl_resource_set_implementation(res, &_e_touch_interface,
+  e_comp->wl_comp_data,
   _e_comp_wl_input_cb_touch_unbind);
 }
 
@@ -403,8 +405,7 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
/* send updated keymap */
EINA_LIST_FOREACH(e_comp_wl->kbd.resources, l, res)
  wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
- e_comp_wl->xkb.fd,
- e_comp_wl->xkb.size);
+ e_comp_wl->xkb.fd, e_comp_wl->xkb.size);
 
/* update modifiers */
e_comp_wl_input_keyboard_modifiers_update();
@@ -501,23 +502,20 @@ e_comp_wl_input_keyboard_modifiers_serialize(void)
xkb_mod_mask_t mod;
xkb_layout_index_t grp;
 
-   mod = xkb_state_serialize_mods(e_comp_wl->xkb.state,
-  XKB_STATE_DEPRESSED);
+   mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, XKB_STATE_DEPRESSED);
changed |= mod != e_comp_wl->kbd.mod_depressed;
e_comp_wl->kbd.mod_depressed = mod;
 
-   mod = xkb_state_serialize_mods(e_comp_wl->xkb.state,
-  XKB_STATE_MODS_LATCHED);
+   mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, 
XKB_STATE_MODS_LATCHED);
changed |= mod != e_comp_wl->kbd.mod_latched;
e_comp_wl->kbd.mod_latched = mod;
 
-   mod =

[EGIT] [core/enlightenment] master 15/18: create wl client connection during compositor init, use in shot module

2015-12-09 Thread Mike Blumenkrantz

devilhorns pushed a commit to branch master.

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

commit f005ac9bff91870fe6ce6f3b6d2e1011f3eabee5
Author: Mike Blumenkrantz 
Date:   Sat Dec 5 13:09:03 2015 -0500

create wl client connection during compositor init, use in shot module

fixes shot module

ref T2919
---
 src/bin/e_comp_wl.c   | 1 +
 src/bin/e_comp_wl.h   | 1 +
 src/modules/shot/e_mod_main.c | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 16041c1..b44918c 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2584,6 +2584,7 @@ _e_comp_wl_compositor_create(void)
 e_comp_wl_input_keymap_set(rules, model, layout);
  }
 #endif
+   e_comp_wl->wl.client_disp = ecore_wl2_display_connect(NULL);
 
/* setup module idler to load shell mmodule */
ecore_idler_add(_e_comp_wl_cb_module_idle, cdata);
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index a061c5a..e60ae9e 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -101,6 +101,7 @@ struct _E_Comp_Wl_Data
struct
  {
 struct wl_display *disp;
+Ecore_Wl2_Display *client_disp;
 struct wl_registry *registry; // only used for nested wl compositors
 /* struct wl_event_loop *loop; */
 Eina_Inlist *globals;  // only used for nested wl compositors
diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 85d61f7..0174bbb 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -953,7 +953,7 @@ _wl_shot_now(E_Zone *zone, E_Client *ec, const char *params)
 sh = E_CLAMP(sh, 1, ec->zone->y + ec->zone->h - y);
  }
 
-   shm = e_comp_wl->wl.shm ?: ecore_wl2_display_shm_get(ewd);
+   shm = e_comp_wl->wl.shm ?: 
ecore_wl2_display_shm_get(e_comp_wl->wl.client_disp);
 
EINA_LIST_FOREACH(_outputs, l, output)
  {
@@ -1263,8 +1263,8 @@ _wl_init()
struct wl_registry *reg;
void *data;
 
-   reg = e_comp_wl->wl.registry ?: ecore_wl2_display_registry_get(ewd);
-   itr = ecore_wl2_display_globals_get(ewd);
+   reg = e_comp_wl->wl.registry ?: 
ecore_wl2_display_registry_get(e_comp_wl->wl.client_disp);
+   itr = ecore_wl2_display_globals_get(e_comp_wl->wl.client_disp);
EINA_ITERATOR_FOREACH(itr, data)
  {
 global = (Ecore_Wl2_Global *)data;

--

[EGIT] [core/enlightenment] master 04/18: port wayland compositor to use Ecore_Wl2

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=7870721cabfec0abb9ced888b84ba982e3d5b70b

commit 7870721cabfec0abb9ced888b84ba982e3d5b70b
Author: Chris Michael 
Date:   Thu Oct 22 11:55:27 2015 -0400

port wayland compositor to use Ecore_Wl2

Signed-off-by: Chris Michael 
---
 src/bin/e_comp_wl.c | 103 +++-
 1 file changed, 38 insertions(+), 65 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 467072c..53c1666 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -9,6 +9,8 @@
 #define COMPOSITOR_VERSION 3
 
 E_API int E_EVENT_WAYLAND_GLOBAL_ADD = -1;
+E_API Ecore_Wl2_Display *ewd = NULL;
+
 #include "session-recovery-server-protocol.h"
 
 #ifndef EGL_HEIGHT
@@ -69,27 +71,11 @@ _e_comp_wl_focus_check(void)
  e_grabinput_focus(e_comp->ee_win, E_FOCUS_METHOD_PASSIVE);
 }
 
-static void
-_e_comp_wl_log_cb_print(const char *format, va_list args)
-{
-   EINA_LOG_DOM_INFO(e_log_dom, format, args);
-}
-
-static Eina_Bool
-_e_comp_wl_cb_read(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED)
-{
-   /* dispatch pending wayland events */
-   wl_event_loop_dispatch(e_comp_wl->wl.loop, 0);
-
-   return ECORE_CALLBACK_RENEW;
-}
-
-static void
-_e_comp_wl_cb_prepare(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr 
EINA_UNUSED)
-{
-   /* flush pending client events */
-   wl_display_flush_clients(e_comp_wl->wl.disp);
-}
+/* static void */
+/* _e_comp_wl_log_cb_print(const char *format, va_list args) */
+/* { */
+/*EINA_LOG_DOM_INFO(e_log_dom, format, args); */
+/* } */
 
 static Eina_Bool
 _e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
@@ -1601,7 +1587,7 @@ _e_comp_wl_compositor_cb_del(void *data EINA_UNUSED)
  }
 
/* delete fd handler */
-   if (e_comp_wl->fd_hdlr) ecore_main_fd_handler_del(e_comp_wl->fd_hdlr);
+   /* if (e_comp_wl->fd_hdlr) ecore_main_fd_handler_del(e_comp_wl->fd_hdlr); */
 
/* free allocated data structure */
free(e_comp_wl);
@@ -2461,8 +2447,6 @@ static Eina_Bool
 _e_comp_wl_compositor_create(void)
 {
E_Comp_Wl_Data *cdata;
-   const char *name;
-   int fd = 0;
 
/* check for existing compositor. create if needed */
if (e_comp->comp_type == E_PIXMAP_TYPE_NONE)
@@ -2479,24 +2463,25 @@ _e_comp_wl_compositor_create(void)
e_comp_wl = e_comp->wl_comp_data = cdata;
 
/* set wayland log handler */
-   wl_log_set_handler_server(_e_comp_wl_log_cb_print);
+   /* wl_log_set_handler_server(_e_comp_wl_log_cb_print); */
 
-   /* try to create a wayland display */
-   if (!(cdata->wl.disp = wl_display_create()))
+   /* try to create an ecore_wl2 display */
+   ewd = ecore_wl2_display_create(NULL);
+   if (!ewd)
  {
 ERR("Could not create a Wayland display: %m");
-goto disp_err;
+free(cdata);
+return EINA_FALSE;
  }
 
-   /* try to setup wayland socket */
-   if (!(name = wl_display_add_socket_auto(cdata->wl.disp)))
+   cdata->wl.disp = ecore_wl2_display_get(ewd);
+   if (!cdata->wl.disp)
  {
-ERR("Could not create Wayland display socket: %m");
-goto sock_err;
+ERR("Could not create a Wayland display: %m");
+goto disp_err;
  }
 
-   /* set wayland display environment variable */
-   e_env_set("WAYLAND_DISPLAY", name);
+   /* e_env_set("WAYLAND_DISPLAY", name); */
 
/* initialize compositor signals */
wl_signal_init(>signals.surface.create);
@@ -2598,19 +2583,6 @@ _e_comp_wl_compositor_create(void)
  }
 #endif
 
-   /* get the wayland display loop */
-   cdata->wl.loop = wl_display_get_event_loop(cdata->wl.disp);
-
-   /* get the file descriptor of the wayland event loop */
-   fd = wl_event_loop_get_fd(cdata->wl.loop);
-
-   /* create a listener for wayland main loop events */
-   cdata->fd_hdlr =
- ecore_main_fd_handler_add(fd, (ECORE_FD_READ | ECORE_FD_ERROR),
-   _e_comp_wl_cb_read, cdata, NULL, NULL);
-   ecore_main_fd_handler_prepare_callback_set(cdata->fd_hdlr,
-  _e_comp_wl_cb_prepare, cdata);
-
/* setup module idler to load shell mmodule */
ecore_idler_add(_e_comp_wl_cb_module_idle, cdata);
 
@@ -2627,9 +2599,9 @@ input_err:
e_comp_wl_data_manager_shutdown();
 data_err:
 comp_global_err:
-   e_env_unset("WAYLAND_DISPLAY");
-sock_err:
-   wl_display_destroy(cdata->wl.disp);
+   /* e_env_unset("WAYLAND_DISPLAY"); */
+/* sock_err: */
+   ecore_wl2_display_destroy(ewd);
 disp_err:
free(cdata);
return EINA_FALSE;
@@ -2699,12 +2671,10 @@ e_comp_wl_init(void)
 return EINA_FALSE;
  }
 
-   ecore_wl_server_mode_set(1);
-
/* try to init ecore_wayland */
-   if (!ecore_wl_init(NULL))
+   if (!ecore_wl2_init())
  {
-e_error_message_show(_("Enlightenment cannot initialize 
Ecore_Wayland!\n"));
+e_error_message_show(_("Enlightenment cannot initialize

[EGIT] [core/enlightenment] master 07/18: Port shot module to use ecore_wl2 library

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e8d0cc4267364a857aa13036b450f091695d18e

commit 9e8d0cc4267364a857aa13036b450f091695d18e
Author: Chris Michael 
Date:   Mon Oct 26 09:54:53 2015 -0400

Port shot module to use ecore_wl2 library

Signed-off-by: Chris Michael 
---
 src/modules/shot/e_mod_main.c | 35 ---
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index c7b9075..60919b0 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -953,7 +953,7 @@ _wl_shot_now(E_Zone *zone, E_Client *ec, const char *params)
 sh = E_CLAMP(sh, 1, ec->zone->y + ec->zone->h - y);
  }
 
-   shm = e_comp_wl->wl.shm ?: ecore_wl_shm_get();
+   shm = e_comp_wl->wl.shm ?: ecore_wl2_display_shm_get(ewd);
 
EINA_LIST_FOREACH(_outputs, l, output)
  {
@@ -1258,31 +1258,19 @@ static Ecore_Event_Handler *wl_global_handler;
 static Eina_Bool
 _wl_init()
 {
-   Eina_Inlist *globals;
-   Ecore_Wl_Global *global;
+   Eina_Iterator *itr;
+   Ecore_Wl2_Global *global;
struct wl_registry *reg;
+   void *data;
 
-   reg = e_comp_wl->wl.registry ?: ecore_wl_registry_get();
-   if (e_comp_wl->wl.registry)
- globals = e_comp_wl->wl.globals;
-   else
- globals = ecore_wl_globals_get();
-   if (!globals)
+   reg = e_comp_wl->wl.registry ?: ecore_wl2_display_registry_get(ewd);
+   itr = ecore_wl2_display_globals_get(ewd);
+   EINA_ITERATOR_FOREACH(itr, data)
  {
-if (!wl_global_handler)
-  {
- if (e_comp_wl->wl.registry)
-   wl_global_handler = 
ecore_event_handler_add(E_EVENT_WAYLAND_GLOBAL_ADD,
- (Ecore_Event_Handler_Cb)_wl_init, NULL);
- else
-   wl_global_handler = 
ecore_event_handler_add(ECORE_WL_EVENT_INTERFACES_BOUND,
- (Ecore_Event_Handler_Cb)_wl_init, NULL);
-  }
-return ECORE_CALLBACK_RENEW;
- }
-   EINA_INLIST_FOREACH(globals, global)
- {
-if ((!_wl_screenshooter) && (!strcmp(global->interface, 
"screenshooter")))
+global = (Ecore_Wl2_Global *)data;
+
+if ((!_wl_screenshooter) &&
+(!strcmp(global->interface, "screenshooter")))
   {
  _wl_screenshooter =
wl_registry_bind(reg, global->id,
@@ -1312,6 +1300,7 @@ _wl_init()
}
   }
  }
+
return ECORE_CALLBACK_RENEW;
 }
 #endif

--

[EGIT] [core/enlightenment] master 11/18: Port wl_fb module to use Ecore_Wl2 Library

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=7c335dc02f730d7c483c4b3a090cf5e4a006c6f9

commit 7c335dc02f730d7c483c4b3a090cf5e4a006c6f9
Author: Chris Michael 
Date:   Mon Oct 26 10:11:54 2015 -0400

Port wl_fb module to use Ecore_Wl2 Library

Signed-off-by: Chris Michael 
---
 src/modules/wl_fb/e_mod_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c
index f7b5812..cfbdef2 100644
--- a/src/modules/wl_fb/e_mod_main.c
+++ b/src/modules/wl_fb/e_mod_main.c
@@ -1,6 +1,6 @@
 #include "e.h"
 #include 
-#include 
+/* #include  */
 
 E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_FB" };
 
@@ -39,8 +39,8 @@ e_modapi_init(E_Module *m)
e_comp_canvas_init(w, h);
e_comp->pointer = e_pointer_canvas_new(e_comp->ee, EINA_TRUE);
 
-   ecore_wl_init(NULL);
-   ecore_wl_server_mode_set(1);
+   /* ecore_wl_init(NULL); */
+   /* ecore_wl_server_mode_set(1); */
return m;
 }
 

--

[EGIT] [core/enlightenment] master 10/18: Port wl_weekeyboard to use Ecore_Wl2 library

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

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

commit a6553cfca924c52244e142378ea02f24d508e2b1
Author: Chris Michael 
Date:   Mon Oct 26 10:09:02 2015 -0400

Port wl_weekeyboard to use Ecore_Wl2 library

Signed-off-by: Chris Michael 
---
 src/modules/wl_weekeyboard/e_mod_main.c | 28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/modules/wl_weekeyboard/e_mod_main.c 
b/src/modules/wl_weekeyboard/e_mod_main.c
index 4d7293f..060a5a7 100644
--- a/src/modules/wl_weekeyboard/e_mod_main.c
+++ b/src/modules/wl_weekeyboard/e_mod_main.c
@@ -9,7 +9,7 @@ struct weekeyboard
 {
E_Module *module;
Ecore_Evas *ee;
-   Ecore_Wl_Window *win;
+   Ecore_Wl2_Window *win;
Evas_Object *edje_obj;
const char *ee_engine;
char **ignore_keys;
@@ -250,7 +250,7 @@ _wkb_ui_setup(struct weekeyboard *wkb)
 
if (eina_streq(wkb->theme, "default"))
  {
-ecore_wl_screen_size_get(, );
+ecore_wl2_display_screen_size_get(ewd, , );
 DBG("Screen size: w=%d, h=%d", w, h);
 if (w >= 1080)
   w = 1080;
@@ -298,7 +298,7 @@ _wkb_ui_setup(struct weekeyboard *wkb)
 
 edje_object_part_geometry_get(wkb->edje_obj, "background",
   , , , );
-ecore_wl_window_input_region_set(wkb->win, rx, ry, rw, rh);
+ecore_wl2_window_input_region_set(wkb->win, rx, ry, rw, rh);
  }
 
ignore_keys = edje_file_data_get(path, "ignore-keys");
@@ -501,15 +501,18 @@ static const struct wl_input_method_listener 
wkb_im_listener = {
 static Eina_Bool
 _wkb_setup(struct weekeyboard *wkb)
 {
-   Eina_Inlist *globals;
+   Eina_Iterator *itr;
+   Ecore_Wl2_Global *global;
struct wl_registry *registry;
-   Ecore_Wl_Global *global;
struct wl_input_panel_surface *ips;
+   void *data;
 
-   globals = ecore_wl_globals_get();
-   registry = ecore_wl_registry_get();
-   EINA_INLIST_FOREACH(globals, global)
+   registry = e_comp_wl->wl.registry ?: ecore_wl2_display_registry_get(ewd);
+   itr = ecore_wl2_display_globals_get(ewd);
+   EINA_ITERATOR_FOREACH(itr, data)
  {
+global = (Ecore_Wl2_Global *)data;
+
 DBG("interface: <%s>", global->interface);
 if (eina_streq(global->interface, "wl_input_panel"))
   {
@@ -532,6 +535,7 @@ _wkb_setup(struct weekeyboard *wkb)
  DBG("binding wl_output");
   }
  }
+   eina_iterator_free(itr);
 
if ((!wkb->ip) || (!wkb->im) || (!wkb->output))
  return EINA_FALSE;
@@ -541,9 +545,11 @@ _wkb_setup(struct weekeyboard *wkb)
 
/* Set input panel surface */
DBG("Setting up input panel");
-   wkb->win = ecore_evas_wayland_window_get(wkb->ee);
-   ecore_wl_window_type_set(wkb->win, ECORE_WL_WINDOW_TYPE_NONE);
-   wkb->surface = ecore_wl_window_surface_create(wkb->win);
+
+   wkb->win = ecore_evas_wayland_window_get2(wkb->ee);
+   ecore_wl2_window_type_set(wkb->win, ECORE_WL2_WINDOW_TYPE_NONE);
+
+   wkb->surface = ecore_wl2_window_surface_get(wkb->win);
ips = wl_input_panel_get_input_panel_surface(wkb->ip, wkb->surface);
wl_input_panel_surface_set_toplevel(ips, wkb->output,

WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM);

--

[EGIT] [core/enlightenment] master 03/18: remove unused event loop and add external Ecore_Wl2_Display variable

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6906c9b4d95253be0a371760c2adc4173a50bd30

commit 6906c9b4d95253be0a371760c2adc4173a50bd30
Author: Chris Michael 
Date:   Thu Oct 22 11:54:59 2015 -0400

remove unused event loop and add external Ecore_Wl2_Display variable

Signed-off-by: Chris Michael 
---
 src/bin/e_comp_wl.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 7142f4d..a061c5a 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -102,7 +102,7 @@ struct _E_Comp_Wl_Data
  {
 struct wl_display *disp;
 struct wl_registry *registry; // only used for nested wl compositors
-struct wl_event_loop *loop;
+/* struct wl_event_loop *loop; */
 Eina_Inlist *globals;  // only used for nested wl compositors
 struct wl_shm *shm;  // only used for nested wl compositors
 Evas_GL *gl;
@@ -340,6 +340,8 @@ E_API Eina_Bool e_comp_wl_evas_handle_mouse_button(E_Client 
*ec, uint32_t timest
 
 E_API extern int E_EVENT_WAYLAND_GLOBAL_ADD;
 
+E_API extern Ecore_Wl2_Display *ewd;
+
 # ifndef HAVE_WAYLAND_ONLY
 EINTERN void e_comp_wl_xwayland_client_queue(E_Client *ec);
 static inline E_Comp_X_Client_Data *

--

[EGIT] [bindings/python/python-efl] master 01/01: Elementary: Implement drag and drop

2015-12-09 Thread Kai Huuhko

kuuko pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=453c2a123c61c91d4af37c66e212ded6437e7796

commit 453c2a123c61c91d4af37c66e212ded6437e7796
Author: Kai Huuhko 
Date:   Wed Dec 9 20:54:07 2015 +0200

Elementary: Implement drag and drop

Has some issues which we can work on later, should be API stable now.
---
 efl/elementary/cnp_callbacks.pxi  | 176 +++-
 efl/elementary/gengrid_widget.pxi | 162 +-
 efl/elementary/genlist_widget.pxi | 169 ++-
 efl/elementary/object.pxi | 336 ++
 examples/elementary/test_dnd.py   | 255 +++--
 5 files changed, 626 insertions(+), 472 deletions(-)

diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi
index 2e56c95..83b4646 100644
--- a/efl/elementary/cnp_callbacks.pxi
+++ b/efl/elementary/cnp_callbacks.pxi
@@ -18,6 +18,7 @@ cdef extern from "Elementary.h":
 ctypedef void(*Elm_Drag_Done)   (void *data, 
Evas_Object *obj, Eina_Bool accepted)
 ctypedef void(*Elm_Drag_Accept) (void *data, 
Evas_Object *obj, Eina_Bool doaccept)
 ctypedef void(*Elm_Drag_Pos)(void *data, 
Evas_Object *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action)
+ctypedef void(*Elm_Drag_Start)  (void *data, 
Evas_Object *obj)
 ctypedef void(*Elm_Drag_Item_Container_Pos) (void *data, 
Evas_Object *cont, Elm_Object_Item *it, Evas_Coord x, Evas_Coord y, int 
xposret, int yposret, Elm_Xdnd_Action action)
 ctypedef Eina_Bool   (*Elm_Drop_Item_Container_Cb)  (void *data, 
Evas_Object *obj, Elm_Object_Item *it, Elm_Selection_Data *ev, int xposret, int 
yposret)
 
@@ -37,30 +38,22 @@ cdef extern from "Elementary.h":
 
 ctypedef _Elm_Drag_User_Info Elm_Drag_User_Info
 
-ctypedef Eina_Bool  (*Elm_Item_Container_Data_Get_Cb)(
-Evas_Object *obj,
-Elm_Object_Item *it,
-Elm_Drag_User_Info *info)
-
-Eina_Bool elm_drag_item_container_add(Evas_Object *obj, double tm_to_anim, 
double tm_to_drag, Elm_Xy_Item_Get_Cb itemgetcb, Elm_Item_Container_Data_Get_Cb 
data_get)
-Eina_Bool elm_drag_item_container_del(Evas_Object *obj)
-Eina_Bool elm_drop_item_container_add(Evas_Object *obj,
-  Elm_Sel_Format format,
-  Elm_Xy_Item_Get_Cb itemgetcb,
-  Elm_Drag_State entercb, void *enterdata,
-  Elm_Drag_State leavecb, void *leavedata,
-  Elm_Drag_Item_Container_Pos poscb, void *posdata,
-  Elm_Drop_Item_Container_Cb dropcb, void *cbdata)
-Eina_Bool elm_drop_item_container_del(Evas_Object *obj)
+ctypedef Eina_Bool   (*Elm_Item_Container_Data_Get_Cb)(Evas_Object 
*obj, Elm_Object_Item *it, Elm_Drag_User_Info *info)
 
 Eina_Bool   elm_cnp_selection_set(Evas_Object *obj, 
Elm_Sel_Type selection, Elm_Sel_Format format, const void *buf, size_t buflen)
 Eina_Bool   elm_cnp_selection_get(Evas_Object *obj, 
Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata)
 Eina_Bool   elm_object_cnp_selection_clear(Evas_Object *obj, 
Elm_Sel_Type selection)
 voidelm_cnp_selection_loss_callback_set(Evas_Object 
*obj, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data)
-# Eina_Bool   elm_drop_target_add(Evas_Object *obj, 
Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State 
leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb 
dropcb, void *cbdata)
-# Eina_Bool   elm_drop_target_del(Evas_Object *obj)
-# Eina_Bool   elm_drag_start(Evas_Object *obj, Elm_Sel_Format 
format, const char *data, Elm_Xdnd_Action action, Elm_Drag_Icon_Create_Cb 
createicon, void *createdata, Elm_Drag_Pos dragpos, void *dragdata, 
Elm_Drag_Accept acceptcb, void *acceptdata, Elm_Drag_State dragdone, void 
*donecbdata)
-# Eina_Bool   elm_drag_action_set(Evas_Object *obj, 
Elm_Xdnd_Action action)
+Eina_Bool   elm_drop_target_add(Evas_Object *obj, 
Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State 
leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb 
dropcb, void *dropdata)
+Eina_Bool   elm_drop_target_del(Evas_Object *obj, 
Elm_Sel_Format format, Elm_Drag_State entercb, void *enterdata, Elm_Drag_State 
leavecb, void *leavedata, Elm_Drag_Pos poscb, void *posdata, Elm_Drop_Cb 
dropcb, void *dropdata)
+Eina_Bool   elm_drag_start(Evas_Object *obj, Elm_Sel_Format 
format, const char *data, Elm_Xdnd_Action action, Elm_Drag_Icon_Create_Cb 
createicon, void *createdata, Elm_Drag_Pos dragpos, void *dragdata, 
Elm_Drag_Accept acceptcb, void *acceptdata, Elm_Drag_State dragdone, void 
*donecbdata)
+Eina_Bool

[EGIT] [core/enlightenment] master 13/18: Fix formatting

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=21e6d0a145fab93a2b342d7575eb735cfe571c4d

commit 21e6d0a145fab93a2b342d7575eb735cfe571c4d
Author: Chris Michael 
Date:   Mon Oct 26 10:30:23 2015 -0400

Fix formatting

Signed-off-by: Chris Michael 
---
 src/bin/e_comp_wl_data.c | 99 +++-
 1 file changed, 64 insertions(+), 35 deletions(-)

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 2da7de4..54a6f70 100644
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -70,7 +70,7 @@ _e_comp_wl_data_offer_cb_source_destroy(struct wl_listener 
*listener, void *data
E_Comp_Wl_Data_Offer *offer;
 
DBG("Data Offer Source Destroy");
-   offer = container_of(listener, E_Comp_Wl_Data_Offer, 
+   offer = container_of(listener, E_Comp_Wl_Data_Offer,
 source_destroy_listener);
if (!offer) return;
 
@@ -256,14 +256,13 @@ _e_comp_wl_data_device_selection_set(void *data 
EINA_UNUSED, E_Comp_Wl_Data_Sour
if (focus)
  {
 data_device_res =
-   e_comp_wl_data_find_for_client(wl_resource_get_client(focus));
+  e_comp_wl_data_find_for_client(wl_resource_get_client(focus));
 if ((data_device_res) && (source))
   {
  offer_res =
-_e_comp_wl_data_device_data_offer_create(source,
- data_device_res);
+   _e_comp_wl_data_device_data_offer_create(source,
+data_device_res);
  wl_data_device_send_selection(data_device_res, offer_res);
-
   }
 else if (data_device_res)
   wl_data_device_send_selection(data_device_res, NULL);
@@ -302,8 +301,10 @@ _e_comp_wl_data_device_drag_finished(E_Drag *drag, int 
dropped)
 if (e_client_has_xwindow(e_comp_wl->selection.target))
   {
  
ecore_x_client_message32_send(e_client_util_win_get(e_comp_wl->selection.target),
-   ECORE_X_ATOM_XDND_DROP, ECORE_X_EVENT_MASK_NONE,
-   e_comp->cm_selection, 0, ecore_x_current_time_get(), 0, 0);
+   ECORE_X_ATOM_XDND_DROP,
+   ECORE_X_EVENT_MASK_NONE,
+   e_comp->cm_selection, 0,
+   ecore_x_current_time_get(), 0, 0);
   }
 else
 #endif
@@ -319,7 +320,8 @@ _e_comp_wl_data_device_drag_finished(E_Drag *drag, int 
dropped)
 #ifndef HAVE_WAYLAND_ONLY
  if (e_comp_util_has_xwayland())
{
-  ecore_x_selection_owner_set(0, ECORE_X_ATOM_SELECTION_XDND, 
ecore_x_current_time_get());
+  ecore_x_selection_owner_set(0, ECORE_X_ATOM_SELECTION_XDND,
+  ecore_x_current_time_get());
   ecore_x_window_hide(e_comp->cm_selection);
}
 #endif
@@ -340,7 +342,8 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client 
*client, struct wl_resourc
 
DBG("Data Device Drag Start");
 
-   if ((e_comp_wl->kbd.focus) && (e_comp_wl->kbd.focus != origin_resource)) 
return;
+   if ((e_comp_wl->kbd.focus) && (e_comp_wl->kbd.focus != origin_resource))
+ return;
 
if (!(source = wl_resource_get_user_data(source_resource))) return;
e_comp_wl->drag_source = source;
@@ -371,9 +374,10 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client 
*client, struct wl_resourc
  }
 
evas_pointer_canvas_xy_get(e_comp->evas, , );
-   e_comp_wl->drag = e_drag_new(x, y,
-   NULL, 0, NULL, 0, NULL, 
_e_comp_wl_data_device_drag_finished);
-   e_comp_wl->drag->button_mask = 
evas_pointer_button_down_mask_get(e_comp->evas);
+   e_comp_wl->drag = e_drag_new(x, y, NULL, 0, NULL, 0, NULL,
+_e_comp_wl_data_device_drag_finished);
+   e_comp_wl->drag->button_mask =
+ evas_pointer_button_down_mask_get(e_comp->evas);
if (ec)
  e_drag_object_set(e_comp_wl->drag, ec->frame);
e_drag_start(e_comp_wl->drag, x, y);
@@ -381,7 +385,9 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client 
*client, struct wl_resourc
if (e_comp_util_has_xwayland())
  {
 ecore_x_window_show(e_comp->cm_selection);
-ecore_x_selection_owner_set(e_comp->cm_selection, 
ECORE_X_ATOM_SELECTION_XDND, ecore_x_current_time_get());
+ecore_x_selection_owner_set(e_comp->cm_selection,
+ECORE_X_ATOM_SELECTION_XDND,
+ecore_x_current_time_get());
  }
 #endif
if (e_comp_wl->ptr.ec)
@@ -441,7 +447,8 @@ _e_comp_wl_data_manager_cb_device_get(struct wl_client 
*client, struct wl_resour
  }
 
eina_hash_add(e_comp_wl->mgr.data_resources, ,

[EGIT] [core/enlightenment] master 05/18: port e_grabinput to use Ecore_Wl2

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=86d5cfb9397ff5cfd75dfbc92e2bb67619d9af5a

commit 86d5cfb9397ff5cfd75dfbc92e2bb67619d9af5a
Author: Chris Michael 
Date:   Thu Oct 22 11:55:41 2015 -0400

port e_grabinput to use Ecore_Wl2

Signed-off-by: Chris Michael 
---
 src/bin/e_grabinput.c | 55 ++-
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index effe19b..fdc8647 100644
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -37,7 +37,13 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, 
Ecore_Window key_win)
   ecore_x_pointer_ungrab();
 #else
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-  ecore_wl_input_ungrab(ecore_wl_input_get());
+  {
+ Ecore_Wl2_Window *wl_win;
+
+ if ((wl_win = ecore_wl2_display_window_find(ewd, grab_mouse_win)))
+   ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
+  wl_win, 0);
+  }
 #endif
 grab_mouse_win = 0;
  }
@@ -47,8 +53,15 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, 
Ecore_Window key_win)
 if (e_comp->comp_type == E_PIXMAP_TYPE_X)
   ecore_x_keyboard_ungrab();
 #else
+/* TODO */
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-  ecore_wl_input_ungrab(ecore_wl_input_get());
+  {
+ Ecore_Wl2_Window *wl_win;
+
+ if ((wl_win = ecore_wl2_display_window_find(ewd, grab_key_win)))
+   ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
+  wl_win, 0);
+  }
 #endif
 
 grab_key_win = 0;
@@ -69,10 +82,11 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, 
Ecore_Window key_win)
 #else
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
   {
- Ecore_Wl_Window *wl_win;
+ Ecore_Wl2_Window *wl_win;
 
- if ((wl_win = ecore_wl_window_find(mouse_win)))
-   ecore_wl_input_grab(ecore_wl_input_get(), wl_win, 0);
+ if ((wl_win = ecore_wl2_display_window_find(ewd, mouse_win)))
+   ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
+wl_win, 0);
   }
 #endif
 grab_mouse_win = mouse_win;
@@ -98,10 +112,11 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, 
Ecore_Window key_win)
 #else
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
   {
- Ecore_Wl_Window *wl_win;
+ Ecore_Wl2_Window *wl_win;
 
- if ((wl_win = ecore_wl_window_find(key_win)))
-   ecore_wl_input_grab(ecore_wl_input_get(), wl_win, 0);
+ if ((wl_win = ecore_wl2_display_window_find(key_win)))
+   ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
+wl_win, 0);
   }
 #endif
 grab_key_win = key_win;
@@ -122,7 +137,13 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window 
key_win)
   ecore_x_pointer_ungrab();
 #else
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-  ecore_wl_input_ungrab(ecore_wl_input_get());
+  {
+ Ecore_Wl2_Window *wl_win;
+
+ if ((wl_win = ecore_wl2_display_window_find(ewd, mouse_win)))
+   ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
+  wl_win, 0);
+  }
 #endif
 
 grab_mouse_win = 0;
@@ -134,7 +155,13 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window 
key_win)
   ecore_x_keyboard_ungrab();
 #else
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-  ecore_wl_input_ungrab(ecore_wl_input_get());
+  {
+ Ecore_Wl2_Window *wl_win;
+
+ if ((wl_win = ecore_wl2_display_window_find(key_win)))
+   ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
+wl_win, 0);
+  }
 #endif
 
 grab_key_win = 0;
@@ -192,7 +219,7 @@ static void
 _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
 {
 #ifdef HAVE_WAYLAND
-   Ecore_Wl_Window *wl_win;
+   Ecore_Wl2_Window *wl_win;
 #endif
 
/* fprintf(stderr, "focus to %x method %i\n", win, method); */
@@ -212,7 +239,7 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method 
method)
 #ifdef HAVE_WAYLAND
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
   {
- if ((wl_win = ecore_wl_window_find(win)))
+ if ((wl_win = ecore_wl2_display_window_find(ewd, win)))
{
   /* FIXME: Need to add an ecore_wl_window_focus function */
}
@@ -227,7 +254,7 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method 
method)
 #else

[EGIT] [core/enlightenment] master 01/18: Make configure check for Ecore_Wl2 library

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=343886058cdcb1b6af5385f5158d9695e5654cc0

commit 343886058cdcb1b6af5385f5158d9695e5654cc0
Author: Chris Michael 
Date:   Thu Oct 22 11:53:55 2015 -0400

Make configure check for Ecore_Wl2 library

Signed-off-by: Chris Michael 
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b52f4a4..2d00ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,7 +742,7 @@ AC_MSG_CHECKING([whether wayland EGL support is enabled])
 AC_MSG_RESULT([${e_cv_want_wayland_egl}])
 
 if test "x${e_cv_want_wayland_only}" != "xno" ;then
-  PKG_CHECK_MODULES([WAYLAND], [ecore-wayland >= 1.16 wayland-server >= 1.8.0 
wayland-client >= 1.8.0 xkbcommon uuid],
+  PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 wayland-server >= 1.8.0 
wayland-client >= 1.8.0 xkbcommon uuid],
 [
   have_wayland=yes
   AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
@@ -859,7 +859,7 @@ WL_WEEKEYBOARD=false
 define([CHECK_MODULE_WL_WEEKEYBOARD],
 [
if test "x${have_wayland}" = "xyes" ; then
-  AC_E_CHECK_PKG(WL_WEEKEYBOARD, [ eina >= 1.8.0 evas >= 1.8.0 ecore >= 
1.8.0 ecore-evas >= 1.8.0 ecore-wayland >= 1.8.0 edje >= 1.8.0 ], 
[WL_WEEKEYBOARD=true], [WL_WEEKEYBOARD=false])
+  AC_E_CHECK_PKG(WL_WEEKEYBOARD, [ eina >= 1.8.0 evas >= 1.8.0 ecore >= 
1.8.0 ecore-evas >= 1.8.0 ecore-wl2 >= 1.8.0 edje >= 1.8.0 ], 
[WL_WEEKEYBOARD=true], [WL_WEEKEYBOARD=false])
else
   WL_WEEKEYBOARD=false
fi

--

[EGIT] [core/enlightenment] master 06/18: port e_scale to use Ecore_Wl2

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=43140e080d574d773ed5976966d93e9ae790a5f9

commit 43140e080d574d773ed5976966d93e9ae790a5f9
Author: Chris Michael 
Date:   Thu Oct 22 11:55:51 2015 -0400

port e_scale to use Ecore_Wl2

Signed-off-by: Chris Michael 
---
 src/bin/e_scale.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c
index 9c13dec..0a3948b 100644
--- a/src/bin/e_scale.c
+++ b/src/bin/e_scale.c
@@ -27,8 +27,12 @@ e_scale_update(void)
   e_scale = (double)ecore_x_dpi_get() / 
(double)e_config->scale.base_dpi;
 #endif
 #ifdef HAVE_WAYLAND
+/* FIXME: This needs to get the DPI from a given output */
 if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
-  e_scale = (double)ecore_wl_dpi_get() / 
(double)e_config->scale.base_dpi;
+  {
+ e_scale = (double)ecore_wl2_output_dpi_get(NULL) /
+   (double)e_config->scale.base_dpi;
+  }
 #endif
 if (e_scale > e_config->scale.max) e_scale = e_config->scale.max;
 else if (e_scale < e_config->scale.min)

--

[EGIT] [core/enlightenment] master 16/18: Try to init (and error check the init) of ecore_wl2 library before we create a compositor

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=36b6a402c663fd6b6841e4ed2fc61968d4192153

commit 36b6a402c663fd6b6841e4ed2fc61968d4192153
Author: Chris Michael 
Date:   Mon Dec 7 09:25:49 2015 -0500

Try to init (and error check the init) of ecore_wl2 library before we
create a compositor

ref T2919

Signed-off-by: Chris Michael 
---
 src/bin/e_comp_wl.c | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index b44918c..068d8d6 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2459,8 +2459,6 @@ _e_comp_wl_compositor_create(void)
return EINA_FALSE;
  }
 
-   ecore_wl2_init();
-
/* set compositor wayland data */
e_comp_wl = e_comp->wl_comp_data = cdata;
 
@@ -2662,6 +2660,13 @@ _e_comp_wl_gl_init(void *d EINA_UNUSED)
 E_API Eina_Bool
 e_comp_wl_init(void)
 {
+   /* try to init ecore_wayland */
+   if (!ecore_wl2_init())
+ {
+e_error_message_show(_("Enlightenment cannot initialize 
Ecore_Wl2!\n"));
+return EINA_FALSE;
+ }
+
/* set gl available if we have ecore_evas support */
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
@@ -2674,13 +2679,6 @@ e_comp_wl_init(void)
 return EINA_FALSE;
  }
 
-   /* try to init ecore_wayland */
-   if (!ecore_wl2_init())
- {
-e_error_message_show(_("Enlightenment cannot initialize 
Ecore_Wl2!\n"));
-return EINA_FALSE;
- }
-
/* create hash to store clients */
/* clients_win_hash = eina_hash_int64_new(NULL); */
 

--

[EGIT] [core/enlightenment] master 18/18: disable building wl_wl module for now

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

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

commit d15a77040429374e3fb16460d6a1de7dbf2ed5d1
Author: Chris Michael 
Date:   Wed Dec 9 13:28:37 2015 -0500

disable building wl_wl module for now

Signed-off-by: Chris Michael 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2d00ea4..6098d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -793,7 +793,7 @@ WL_WL=false
 define([CHECK_MODULE_WL_WL],
 [
   if test "x${have_wayland}" = "xyes"; then
-WL_WL=true
+WL_WL=false
   else
 WL_WL=false
   fi

--

[EGIT] [core/enlightenment] master 08/18: Fix formatting of wl_weekeyboard module

2015-12-09 Thread Christopher Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6e7ae13f5363b0a55ac825377fb92ae44ff7c1d5

commit 6e7ae13f5363b0a55ac825377fb92ae44ff7c1d5
Author: Chris Michael 
Date:   Mon Oct 26 10:00:29 2015 -0400

Fix formatting of wl_weekeyboard module

Signed-off-by: Chris Michael 
---
 src/modules/wl_weekeyboard/e_mod_main.c | 50 +++--
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/modules/wl_weekeyboard/e_mod_main.c 
b/src/modules/wl_weekeyboard/e_mod_main.c
index c90f0fd..4d7293f 100644
--- a/src/modules/wl_weekeyboard/e_mod_main.c
+++ b/src/modules/wl_weekeyboard/e_mod_main.c
@@ -81,11 +81,14 @@ _wkb_commit_preedit_str(struct weekeyboard *wkb)
  return;
 
wl_input_method_context_cursor_position(wkb->im_ctx, 0, 0);
-   wl_input_method_context_commit_string(wkb->im_ctx, wkb->serial, 
wkb->preedit_str);
+   wl_input_method_context_commit_string(wkb->im_ctx, wkb->serial,
+ wkb->preedit_str);
 
if (wkb->surrounding_text)
  {
-surrounding_text = _wkb_insert_text(wkb->surrounding_text, 
wkb->surrounding_cursor, wkb->preedit_str);
+surrounding_text =
+  _wkb_insert_text(wkb->surrounding_text, wkb->surrounding_cursor,
+   wkb->preedit_str);
 free(wkb->surrounding_text);
 wkb->surrounding_text = surrounding_text;
 wkb->surrounding_cursor += strlen(wkb->preedit_str);
@@ -106,13 +109,16 @@ _wkb_send_preedit_str(struct weekeyboard *wkb, int cursor)
unsigned int index = strlen(wkb->preedit_str);
 
if (wkb->preedit_style)
- wl_input_method_context_preedit_styling(wkb->im_ctx, 0, 
strlen(wkb->preedit_str), wkb->preedit_style);
+ wl_input_method_context_preedit_styling(wkb->im_ctx, 0,
+ strlen(wkb->preedit_str),
+ wkb->preedit_style);
 
if (cursor > 0)
  index = cursor;
 
wl_input_method_context_preedit_cursor(wkb->im_ctx, index);
-   wl_input_method_context_preedit_string(wkb->im_ctx, wkb->serial, 
wkb->preedit_str, wkb->preedit_str);
+   wl_input_method_context_preedit_string(wkb->im_ctx, wkb->serial,
+  wkb->preedit_str, wkb->preedit_str);
 }
 
 static void
@@ -194,7 +200,8 @@ _cb_wkb_on_key_down(void *data, Evas_Object *obj 
EINA_UNUSED, const char *emissi
  {
 _wkb_commit_preedit_str(wkb);
 wl_input_method_context_keysym(wkb->im_ctx, wkb->serial, 0,
-   XKB_KEY_Return, 
WL_KEYBOARD_KEY_STATE_PRESSED, 0);
+   XKB_KEY_Return,
+   WL_KEYBOARD_KEY_STATE_PRESSED, 0);
 goto end;
  }
else if (eina_streq(key, "space"))
@@ -222,12 +229,14 @@ _wkb_ui_setup(struct weekeyboard *wkb)
if (!wkb->edje_obj)
  {
 Evas *evas;
+
 ecore_evas_alpha_set(wkb->ee, EINA_TRUE);
 ecore_evas_title_set(wkb->ee, "Weekeyboard");
 
 evas = ecore_evas_get(wkb->ee);
 wkb->edje_obj = edje_object_add(evas);
-edje_object_signal_callback_add(wkb->edje_obj, "key_down", "*", 
_cb_wkb_on_key_down, wkb);
+edje_object_signal_callback_add(wkb->edje_obj, "key_down", "*",
+_cb_wkb_on_key_down, wkb);
  }
 
// hard coded
@@ -253,7 +262,8 @@ _wkb_ui_setup(struct weekeyboard *wkb)
 DBG("Using default_%d theme", w);
  }
 
-   snprintf(path, PATH_MAX, "%s/%s_%d.edj", e_module_dir_get(wkb->module), 
wkb->theme, w);
+   snprintf(path, PATH_MAX, "%s/%s_%d.edj",
+e_module_dir_get(wkb->module), wkb->theme, w);
INF("Loading edje file: '%s'", path);
 
if (!edje_object_file_set(wkb->edje_obj, path, "main"))
@@ -286,7 +296,8 @@ _wkb_ui_setup(struct weekeyboard *wkb)
  {
 int rx, ry, rw, rh;
 
-edje_object_part_geometry_get(wkb->edje_obj, "background", , , 
, );
+edje_object_part_geometry_get(wkb->edje_obj, "background",
+  , , , );
 ecore_wl_window_input_region_set(wkb->win, rx, ry, rw, rh);
  }
 
@@ -313,7 +324,8 @@ _wkb_im_ctx_surrounding_text(void *data, struct 
wl_input_method_context *im_ctx,
 
EINA_SAFETY_ON_NULL_RETURN(text);
 
-   DBG("im_context = %p text = '%s' cursor = %d anchor = %d", im_ctx, text, 
cursor, anchor);
+   DBG("im_context = %p text = '%s' cursor = %d anchor = %d",
+   im_ctx, text, cursor, anchor);
 
free(wkb->surrounding_text);
 
@@ -399,7 +411,8 @@ _wkb_im_ctx_commit_state(void *data, struct 
wl_input_method_context *im_ctx, uin
wkb->serial = serial;
 
wl_input_method_context_language(im_ctx, wkb->serial, "en");
-   wl_input_method_context_text_direction(im_ctx, wkb->serial, 
WL_TEXT_INPUT_TEXT_DIRECTION_LTR);
+

[EGIT] [website/www-content] master 01/01: Wiki page job changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=f728a2e1849bf220bdee681d110dd9531c5695b0

commit f728a2e1849bf220bdee681d110dd9531c5695b0
Author: Lauro Moura 
Date:   Wed Dec 9 10:26:56 2015 -0800

Wiki page job changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/job.txt | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/pages/api/javascript/ecore/job.txt 
b/pages/api/javascript/ecore/job.txt
new file mode 100644
index 000..bf4caff
--- /dev/null
+++ b/pages/api/javascript/ecore/job.txt
@@ -0,0 +1,26 @@
+= Javascript binding API - Ecore Job =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+
+ Functions 
+
+=== add(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [website/www-content] master 01/01: Wiki page mainloop changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=155328deb4d18c66f3286c0f748137cad7def92d

commit 155328deb4d18c66f3286c0f748137cad7def92d
Author: Lauro Moura 
Date:   Wed Dec 9 10:36:12 2015 -0800

Wiki page mainloop changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/mainloop.txt | 94 +
 1 file changed, 94 insertions(+)

diff --git a/pages/api/javascript/ecore/mainloop.txt 
b/pages/api/javascript/ecore/mainloop.txt
new file mode 100644
index 000..2677d81
--- /dev/null
+++ b/pages/api/javascript/ecore/mainloop.txt
@@ -0,0 +1,94 @@
+= Javascript binding API - Ecore Mainloop =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+   * ''efl.Ecore.Mainloop.CALLBACK_CANCEL''
+   * ''efl.Ecore.Mainloop.CALLBACK_DONE''
+   * ''efl.Ecore.Mainloop.CALLBACK_PASS_ON''
+   * ''efl.Ecore.Mainloop.CALLBACK_RENEW''
+
+ Functions 
+
+=== begin(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== getAnimatorTicked(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== getNested(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== iterate(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== quit(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [website/www-content] master 01/01: Wiki page poller changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=fdc092f51a6a5b98e56fcb239bd8f9f6480ebbb0

commit fdc092f51a6a5b98e56fcb239bd8f9f6480ebbb0
Author: Lauro Moura 
Date:   Wed Dec 9 10:40:53 2015 -0800

Wiki page poller changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/poller.txt | 59 +++
 1 file changed, 59 insertions(+)

diff --git a/pages/api/javascript/ecore/poller.txt 
b/pages/api/javascript/ecore/poller.txt
new file mode 100644
index 000..1f13b49
--- /dev/null
+++ b/pages/api/javascript/ecore/poller.txt
@@ -0,0 +1,59 @@
+= Javascript binding API - Ecore Poller =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+* ''efl.Ecore.Poller.CORE''
+
+ Functions 
+
+=== add(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== getPollInterval() ===
+
+Syntax
+
+
+var interval = efl.Ecore.Poller.getPollInterval();
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== setPollInterval(interval) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * integer
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [website/www-content] master 01/01: Wiki page throttle changed with summary [created] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=ecd74bb51a44a3886c86f16688477f6da3fe6f95

commit ecd74bb51a44a3886c86f16688477f6da3fe6f95
Author: Lauro Moura 
Date:   Wed Dec 9 10:47:57 2015 -0800

Wiki page throttle changed with summary [created] by Lauro Moura
---
 pages/api/javascript/ecore/throttle.txt | 42 +
 1 file changed, 42 insertions(+)

diff --git a/pages/api/javascript/ecore/throttle.txt 
b/pages/api/javascript/ecore/throttle.txt
new file mode 100644
index 000..ea3e4c3
--- /dev/null
+++ b/pages/api/javascript/ecore/throttle.txt
@@ -0,0 +1,42 @@
+= Javascript binding API - Ecore Throttle =
+
+[[api:javascript:ecore|Back to the JS Ecore page]]
+
+**DRAFT**
+
+ Constants 
+
+
+ Functions 
+
+=== adjust(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
+
+=== get(args) ===
+
+Syntax
+
+
+code
+
+
+Parameters
+
+   * parameters
+
+Return value
+
+   * return
\ No newline at end of file

--

[EGIT] [core/enlightenment] master 01/01: fix wl-x11 make/install rules to not include nonexistent DATA files

2015-12-09 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit eb9ba4af6a31d2b8f283ffe9ee93013df7e29938
Author: Mike Blumenkrantz 
Date:   Wed Dec 9 13:50:07 2015 -0500

fix wl-x11 make/install rules to not include nonexistent DATA files
---
 src/modules/Makefile_wl_x11.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/Makefile_wl_x11.mk b/src/modules/Makefile_wl_x11.mk
index e43ce34..1b98221 100644
--- a/src/modules/Makefile_wl_x11.mk
+++ b/src/modules/Makefile_wl_x11.mk
@@ -11,6 +11,6 @@ src_modules_wl_x11_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_wl_x11_module_la_SOURCES = src/modules/wl_x11/e_mod_main.c
 
 PHONIES += wl_x11 install-wl_x11
-wl_x11: $(wl_x11pkg_LTLIBRARIES) $(wl_x11_DATA)
-install-wl_x11: install-wl_x11DATA install-wl_x11pkgLTLIBRARIES
+wl_x11: $(wl_x11pkg_LTLIBRARIES)
+install-wl_x11: install-wl_x11pkgLTLIBRARIES
 endif

--

[EGIT] [website/www-content] master 01/01: Wiki page javascript_tutorial changed with summary [] by Larry de Oliveira Lira Junior

2015-12-09 Thread Larry de Oliveira Lira Junior

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=e7b23d83ca88d1f9fe7bd14bfa2ca0b382e7bf74

commit e7b23d83ca88d1f9fe7bd14bfa2ca0b382e7bf74
Author: Larry de Oliveira Lira Junior 
Date:   Wed Dec 9 13:40:45 2015 -0800

Wiki page javascript_tutorial changed with summary [] by Larry de Oliveira 
Lira Junior
---
 pages/tutorial/javascript_tutorial.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/tutorial/javascript_tutorial.txt 
b/pages/tutorial/javascript_tutorial.txt
index 9f0d371..44e9f22 100644
--- a/pages/tutorial/javascript_tutorial.txt
+++ b/pages/tutorial/javascript_tutorial.txt
@@ -1,5 +1,5 @@
 ~~Title: Javascript Tutorial~~
- Javascript Tutorial 
+ Javascript Tutorial [DRAFT]
 
 These Javascript tutorials describe the basics to compiles and run a 
Javascript example using Elementary in Node.Js
 

--

[EGIT] [website/www-content] master 01/01: Wiki page job changed with summary [] by Lauro Moura

2015-12-09 Thread Lauro Moura

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=0b9d149965be1f2ee87f4023539963ee3b79caa3

commit 0b9d149965be1f2ee87f4023539963ee3b79caa3
Author: Lauro Moura 
Date:   Wed Dec 9 13:49:53 2015 -0800

Wiki page job changed with summary [] by Lauro Moura
---
 pages/api/javascript/ecore/job.txt | 22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pages/api/javascript/ecore/job.txt 
b/pages/api/javascript/ecore/job.txt
index 8e709ca..f37437d 100644
--- a/pages/api/javascript/ecore/job.txt
+++ b/pages/api/javascript/ecore/job.txt
@@ -4,25 +4,33 @@
 
 **DRAFT**
 
-The Job module allows queuing work to be done when 
+The Job module allows queuing work to be done when the current event is dealt 
with.
 
- Constants 
+Jobs are processed by the main loop similarly to events. They also will be 
executed in the order in which they were added.
 
+A good use for them is when you don't want to execute an action immediately, 
but want to give the control back to the main loop so that it will call your 
job callback when jobs start being processed (and if there are other jobs added 
before yours, they will be processed first). This also gives the chance to 
other actions in your program to cancel the job before it is started.
 
- Functions 
+ Functions and methods 
 
-=== add(args) ===
+=== add(callback) ===
 
 Syntax
 
 
-code
+function mycallback() { ... };
+var job = efl.Ecore.Job.add(mycallback);
 
 
 Parameters
 
-   * parameters
+   * callback - A function to be called when the job is handled.
 
 Return value
 
-   * return
\ No newline at end of file
+   * return
+
+=== job.del() ===
+
+Syntax
+
+
\ No newline at end of file

--

[EGIT] [apps/ephoto] master 01/01: Ephoto: Use select mode with control. On DND, don't build icons, only use one under cursor to save resources.

2015-12-09 Thread Stephen Houston

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=bfe51ff0f85981fc9ef8b921d15a9790f57cba18

commit bfe51ff0f85981fc9ef8b921d15a9790f57cba18
Author: Stephen Houston 
Date:   Wed Dec 9 19:01:47 2015 -0600

Ephoto: Use select mode with control.  On DND, don't build icons, only use 
one under cursor to save resources.
---
 src/bin/ephoto_thumb_browser.c | 56 +++---
 1 file changed, 3 insertions(+), 53 deletions(-)

diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index dbdf1b0..0b0de85 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -4,7 +4,7 @@
 #define ZOOM_MIN128
 #define ZOOM_STEP   32
 
-#define TODO_ITEM_MIN_BATCH 16
+#define TODO_ITEM_MIN_BATCH 5
 
 #define FILESEP "file://"
 #define FILESEP_LEN sizeof(FILESEP) - 1
@@ -2020,7 +2020,6 @@ _dnd_drag_data_build(Eina_List **items)
   {
  strcat((char *) drag_data, FILESEP);
  strcat((char *) drag_data, e->path);
- strcat((char *) drag_data, "\n");
   }
  }
  }
@@ -2059,55 +2058,6 @@ _dnd_create_icon(void *data, Evas_Object *win, 
Evas_Coord *xoff,
return icon;
 }
 
-static Eina_List *
-_dnd_icons_get(void *data)
-{
-   Eina_List *l;
-   Eina_List *icons = NULL;
-   Evas_Coord xm, ym;
-
-   evas_pointer_canvas_xy_get(evas_object_evas_get(data), , );
-   Eina_List *items = eina_list_clone(elm_gengrid_selected_items_get(data));
-   Elm_Object_Item *gli = elm_gengrid_at_xy_item_get(data, xm, ym, 0, 0);
-
-   if (gli)
- {
-   void *p = eina_list_search_sorted(items,
-_entry_cmp_grid_alpha_asc, gli);
-
-   if (!p)
-  items = eina_list_append(items, gli);
- }
-
-   EINA_LIST_FOREACH(items, l, gli)
- {
-Evas_Object *o =
-   elm_object_item_part_content_get(gli, "elm.swallow.icon");
-
-if (o)
- {
-int x, y, w, h;
-const char *f, *g;
-
-elm_image_file_get(o, , );
-Evas_Object *ic = elm_icon_add(data);
-
-elm_image_file_set(ic, f, g);
-evas_object_geometry_get(o, , , , );
-evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, 
EVAS_HINT_FILL);
-evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND,
-EVAS_HINT_EXPAND);
-evas_object_move(ic, x, y);
-evas_object_resize(ic, w, h);
-evas_object_show(ic);
-icons = eina_list_append(icons, ic);
- }
- }
-
-   eina_list_free(items);
-   return icons;
-}
-
 static const char *
 _dnd_get_drag_data(Evas_Object *obj, Elm_Object_Item *it, Eina_List **items)
 {
@@ -2142,7 +2092,7 @@ _dnd_item_data_get(Evas_Object *obj, Elm_Object_Item *it,
info->createicon = _dnd_create_icon;
info->createdata = it;
info->dragstart = _dnd_drag_start;
-   info->icons = _dnd_icons_get(obj);
+   info->icons = NULL;
info->dragdone = _dnd_drag_done;
info->data = _dnd_get_drag_data(obj, it, (Eina_List **) & info->donecbdata);
info->acceptdata = info->donecbdata;
@@ -3467,7 +3417,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object 
*parent)
elm_gengrid_align_set(tb->grid, 0.5, 0.0);
elm_gengrid_multi_select_set(tb->grid, EINA_TRUE);
elm_gengrid_multi_select_mode_set(tb->grid,
-   ELM_OBJECT_MULTI_SELECT_MODE_DEFAULT);
+   ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL);
elm_scroller_bounce_set(tb->grid, EINA_FALSE, EINA_TRUE);
evas_object_smart_callback_add(tb->grid, "activated",
_ephoto_thumb_activated, tb);

--

[EGIT] [tools/enventor] master 01/01: Text settings: Add analysis typed text for redoundo feature.

2015-12-09 Thread Mykyta Biliavskyi

nikawhite pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=6aea530622577b3686a7066a1d99422d2f713681

commit 6aea530622577b3686a7066a1d99422d2f713681
Author: Mykyta Biliavskyi 
Date:   Thu Dec 10 10:53:12 2015 +0900

Text settings: Add analysis typed text for redoundo feature.

Added cases:
Analyse auto indention for new lines. It mean, that redo/undo
line creation will finished by one step.
Analyse input symbols speed. In case when user writes somethenigi
and takes a short delay (by default 0.8sec)
between written symbols - redo/undo action will use this delay
as point to create new node in redo/undo queue.
Analyse input symbols on a "words". Ongoing alphabetic symbols
between nonalphabetic symbols known as
"word". Redo/undo action will use for a step a whole "word".

In text setting added addition toggle named "Smart undo/redo".
By default this feature is disabled.

Todo: make this feature work with auto intendation.

Prortotype here: https://phab.enlightenment.org/D1288
---
 src/bin/config_data.c  | 18 +++
 src/bin/main.c |  1 +
 src/bin/text_setting.c | 15 +-
 src/include/config_data.h  |  2 ++
 src/include/text_setting.h |  2 ++
 src/lib/edc_editor.c   | 16 ++
 src/lib/enventor_object.eo |  9 ++
 src/lib/enventor_private.h |  3 ++
 src/lib/enventor_smart.c   | 13 
 src/lib/redoundo.c | 74 +-
 10 files changed, 151 insertions(+), 2 deletions(-)

diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 3205b27..15327a9 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -38,6 +38,7 @@ typedef struct config_s
Eina_Bool console;
Eina_Bool auto_complete;
Eina_Bool view_size_configurable;
+   Eina_Bool smart_undo_redo;
 } config_data;
 
 static config_data *g_cd = NULL;
@@ -178,6 +179,7 @@ config_load(void)
 cd->auto_complete = EINA_TRUE;
 cd->view_size_configurable = EINA_FALSE;
 cd->version = ENVENTOR_CONFIG_VERSION;
+cd->smart_undo_redo = EINA_FALSE;
  }
 
g_cd = cd;
@@ -282,6 +284,8 @@ eddc_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data,
  "view_size_configurable",
  view_size_configurable, EET_T_UCHAR);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "smart_undo_redo",
+smart_undo_redo, EET_T_UCHAR);
 }
 
 void
@@ -732,6 +736,20 @@ config_font_scale_get(void)
return cd->font_scale;
 }
 
+Eina_Bool
+config_smart_undo_redo_get(void)
+{
+   config_data *cd = g_cd;
+   return cd->smart_undo_redo;
+}
+
+void
+config_smart_undo_redo_set(Eina_Bool smart_undo_redo)
+{
+   config_data *cd = g_cd;
+   cd->smart_undo_redo = smart_undo_redo;
+}
+
 void
 config_auto_complete_set(Eina_Bool auto_complete)
 {
diff --git a/src/bin/main.c b/src/bin/main.c
index 3e05691..be0ed0e 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -56,6 +56,7 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_live_view_scale_set(enventor, config_view_scale_get());
enventor_object_auto_indent_set(enventor, config_auto_indent_get());
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
+   enventor_object_smart_undo_redo_set(enventor, config_smart_undo_redo_get());
 
Eina_List *list = eina_list_append(NULL, config_output_path_get());
enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_EDJ, list);
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 111916a..9292b13 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -864,6 +864,11 @@ text_setting_layout_create(Evas_Object *parent)
 config_auto_complete_get());
elm_box_pack_end(box, toggle_autocomp);
 
+   //Toggle (Smart Undo/Redo)
+   Evas_Object *toggle_smart_undo_redo = toggle_create(box, _("Smart 
Undo/Redo"),
+config_smart_undo_redo_get());
+   elm_box_pack_end(box, toggle_smart_undo_redo);
+
//Font Name and Style (Box)
box = elm_box_add(layout);
elm_box_horizontal_set(box, EINA_TRUE);
@@ -953,7 +958,7 @@ text_setting_layout_create(Evas_Object *parent)
tsd->toggle_linenum = toggle_linenum;
tsd->toggle_indent = toggle_indent;
tsd->toggle_autocomp = toggle_autocomp;
-
+   tsd->toggle_smart_undo_redo = toggle_smart_undo_redo;
return layout;
 }
 
@@ -999,6 +1004,7 @@ text_setting_config_set(void)
config_linenumber_set(elm_check_state_get(tsd->toggle_linenum));
config_auto_indent_set(elm_check_state_get(tsd->toggle_indent));
config_auto_complete_set(elm_check_state_get(tsd->toggle_autocomp));
+

[EGIT] [core/enlightenment] master 01/01: e - fix leak added by previous fix for icon theme

2015-12-09 Thread Carsten Haitzler

raster pushed a commit to branch master.

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

commit b5aa0310f9364858ebcee9b56120ceb5d5984d08
Author: Carsten Haitzler (Rasterman) 
Date:   Thu Dec 10 08:06:21 2015 +0900

e - fix leak added by previous fix for icon theme

fixes leak added by a885c8c0402d142efce67fac8f57b8e019e57022

though this is basically unlikely to happen and happens likely just
once for an app... so not a big deal

@fix
---
 src/bin/e_config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 7e30bc0..a24f448 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -75,7 +75,7 @@ _e_config_cb_efreet_cache_update(void *data EINA_UNUSED, int 
type EINA_UNUSED, v
   {
  if (!efreet_icon_theme_find(e_config->icon_theme))
{
-  e_config->icon_theme = eina_stringshare_add("hicolor");
+  eina_stringshare_replace(_config->icon_theme, "hicolor");
   e_config_save_queue();
}
   }

--

[EGIT] [apps/ephoto] master 01/01: Ephoto: Fix cropper math.

2015-12-09 Thread Stephen okra Houston

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=7682ab5665ea54bfbb904e7092158f9d63ae7e7c

commit 7682ab5665ea54bfbb904e7092158f9d63ae7e7c
Author: Stephen okra Houston 
Date:   Wed Dec 9 16:54:45 2015 -0600

Ephoto: Fix cropper math.
---
 src/bin/ephoto_cropper.c | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/bin/ephoto_cropper.c b/src/bin/ephoto_cropper.c
index cd9351c..ee00b64 100644
--- a/src/bin/ephoto_cropper.c
+++ b/src/bin/ephoto_cropper.c
@@ -29,7 +29,8 @@ _calculate_cropper_size(void *data, Evas_Object *obj 
EINA_UNUSED,
int w, h, cw, ch, iw, ih, nw, nh;
double scalew, scaleh;
 
-   evas_object_geometry_get(ec->layout, 0, 0, , );
+   edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
+   "ephoto.swallow.image", 0, 0, , );
edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
"ephoto.swallow.cropper", 0, 0, , );
evas_object_image_size_get(elm_image_object_get(ec->image), , );
@@ -63,8 +64,10 @@ _cropper_changed_width(void *data, Evas_Object *obj 
EINA_UNUSED,
 
mw = elm_slider_value_get(ec->cropw);
 
-   evas_object_geometry_get(ec->layout, , 0, , 0);
-   evas_object_geometry_get(ec->cropper, , 0, , 0);
+   edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
+   "ephoto.swallow.image", , 0, , 0);
+   edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
+   "ephoto.swallow.cropper", , 0, , 0);
evas_object_image_size_get(elm_image_object_get(ec->image), , 0);
 
scalew = (double) mw / (double) iw;
@@ -113,8 +116,10 @@ _cropper_changed_height(void *data, Evas_Object *obj 
EINA_UNUSED,
 
mh = elm_slider_value_get(ec->croph);
 
-   evas_object_geometry_get(ec->layout, 0, , 0, );
-   evas_object_geometry_get(ec->cropper, 0, , 0, );
+   edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
+   "ephoto.swallow.image", 0, , 0, );
+   edje_object_part_geometry_get(elm_layout_edje_get(ec->layout),
+   "ephoto.swallow.cropper", 0, , 0, );
evas_object_image_size_get(elm_image_object_get(ec->image), 0, );
 
scaleh = (double) mh / (double) ih;
@@ -179,7 +184,7 @@ _apply_crop(void *data, Evas_Object *obj EINA_UNUSED,
double scalex, scaley, scalew, scaleh;
unsigned int *idata, *idata_new;
 
-   evas_object_geometry_get(ec->layout, , , , );
+   edje_object_part_geometry_get(edje, "ephoto.swallow.image", , , , );
edje_object_part_geometry_get(edje, "ephoto.swallow.cropper", , , ,
);
evas_object_image_size_get(elm_image_object_get(ec->image), , );
@@ -187,8 +192,8 @@ _apply_crop(void *data, Evas_Object *obj EINA_UNUSED,
idata =
evas_object_image_data_get(elm_image_object_get(ec->image), EINA_FALSE);
 
-   scalex = (double) cx / (double) w;
-   scaley = (double) cy / (double) h;
+   scalex = (double) (cx-x) / (double) w;
+   scaley = (double) (cy-y) / (double) h;
scalew = (double) cw / (double) w;
scaleh = (double) ch / (double) h;
 

--

[EGIT] [website/www-content] master 01/01: Wiki page javascript_tutorial changed with summary [] by Larry de Oliveira Lira Junior

2015-12-09 Thread Larry de Oliveira Lira Junior

WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=deb5710238f0222e135f1f00d467d4b875893bf1

commit deb5710238f0222e135f1f00d467d4b875893bf1
Author: Larry de Oliveira Lira Junior 
Date:   Wed Dec 9 15:15:02 2015 -0800

Wiki page javascript_tutorial changed with summary [] by Larry de Oliveira 
Lira Junior
---
 pages/tutorial/javascript_tutorial.txt | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pages/tutorial/javascript_tutorial.txt 
b/pages/tutorial/javascript_tutorial.txt
index 44e9f22..d5f5a4a 100644
--- a/pages/tutorial/javascript_tutorial.txt
+++ b/pages/tutorial/javascript_tutorial.txt
@@ -3,14 +3,23 @@
 
 These Javascript tutorials describe the basics to compiles and run a 
Javascript example using Elementary in Node.Js
 
-== Prerequisite ==
+=== Prerequisite ===
 
 Before you start you will want basic about how compile a EFL library
 
 * Installed from source: [[docs/efl/start|Get started with EFL]].
 
-== Dependencies ==
+=== Dependencies ===
 
 You will need additional dependencies to Javascript Bindings:
 
 * [[https://nodejs.org|node]] (4.2 or better)
+
+=== Compilation ===
+
+For nodejs add ''//––with-js=nodejs//'' in configure flags to generate node 
files
+
+
+./configure --with-js=nodejs
+
+
\ No newline at end of file

--

[EGIT] [core/elementary] master 01/01: Fix compilation on Windows (and propably also on Mac)

2015-12-09 Thread Vincent Torri

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=2cf3a9d2bef9872181c144e60a0d33c2833af015

commit 2cf3a9d2bef9872181c144e60a0d33c2833af015
Author: Vincent Torri 
Date:   Thu Dec 10 16:06:22 2015 +0900

Fix compilation on Windows (and propably also on Mac)

Reviewers: cedric

Differential Revision: https://phab.enlightenment.org/D3419
---
 src/lib/elm_win.c| 16 
 src/lib/els_cursor.c |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1f982c8..b9fb0cf 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2197,11 +2197,9 @@ _elm_ee_cocoa_win_get(const Ecore_Evas *ee)
engine_name = ecore_evas_engine_name_get(ee);
if (EINA_UNLIKELY(!engine_name)) return NULL;
 
-   if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) ||
-   (!strcmp(engine_name, ELM_SOFTWARE_DDRAW)))
- {
-return ecore_evas_win32_window_get(ee);
- }
+   if (!strcmp(engine_name, "opengl_cocoa") ||
+   !strcmp(engine_name, "gl_cocoa"))
+ return ecore_evas_cocoa_window_get(ee);
 #else
(void)ee;
 #endif
@@ -2219,9 +2217,11 @@ _elm_ee_win32win_get(const Ecore_Evas *ee)
engine_name = ecore_evas_engine_name_get(ee);
if (EINA_UNLIKELY(!engine_name)) return NULL;
 
-   if (!strcmp(engine_name, "opengl_cocoa") ||
-   !strcmp(engine_name, "gl_cocoa"))
- return ecore_evas_cocoa_window_get(ee);
+   if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) ||
+   (!strcmp(engine_name, ELM_SOFTWARE_DDRAW)))
+ {
+return ecore_evas_win32_window_get(ee);
+ }
 #else
(void)ee;
 #endif
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 6800554..3b26209 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -15,6 +15,7 @@
 #ifdef HAVE_ELEMENTARY_COCOA
 # include 
 #endif
+
 #ifdef HAVE_ELEMENTARY_WIN32
 #include 
 #endif
@@ -40,7 +41,7 @@ struct _Cursor_Id
 #elif defined(HAVE_ELEMENTARY_COCOA)
 #  define CURSOR(_name, _id, _cid) {_name, -1, _cid}
 #elif defined(HAVE_ELEMENTARY_WIN32)
-#  define CURSOR(_name, _id, _cid) {_name, 
ECORE_WIN32_CURSOR_X11_SHAPE_##_xid, -1 }
+#  define CURSOR(_name, _id, _cid) {_name, ECORE_WIN32_CURSOR_X11_SHAPE_##_id, 
-1 }
 #else
 #  define CURSOR(_name, _id, _cid) { _name }
 #endif
@@ -505,7 +506,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
cur->win32.cursor = 
ecore_win32_cursor_shaped_new(ECORE_WIN32_CURSOR_SHAPE_ARROW);
 }
   else
-cur->win32.cursor = 
ecore_win32_cursor_x11_shaped_get(cur_id->id);
+cur->win32.cursor = (Ecore_Win32_Cursor 
*)ecore_win32_cursor_x11_shaped_get(cur_id->id);
}
 #endif
   }

--

[EGIT] [core/efl] master 01/01: evas/gl: Update texture when preload is cancelled.

2015-12-09 Thread Minkyoung Kim

jpeg pushed a commit to branch master.

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

commit d63cc52c584e0b3304699bd1822df18c0b446e2b
Author: Minkyoung Kim 
Date:   Thu Dec 10 16:04:57 2015 +0900

evas/gl: Update texture when preload is cancelled.

Summary:
When preload is cancelled before finishing loading,
should reload the image data and update the texture during rendering object.
So, force texture to be updated on first drawing time.
(It should be guaranteed that preload image object is hidden before preload 
done.)

Test Plan: Local tests

Reviewers: jpeg

Reviewed By: jpeg

Subscribers: eunue, jiin.moon, wonsik, cedric, spacegrapher

Differential Revision: https://phab.enlightenment.org/D3416
---
 src/modules/evas/engines/gl_generic/evas_engine.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c 
b/src/modules/evas/engines/gl_generic/evas_engine.c
index 03429d2..d7ea450 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1076,6 +1076,7 @@ eng_image_data_preload_request(void *data, void *image, 
const Eo *target)
 re->window_use(re->software.ob);
 gl_context = re->window_gl_context_get(re->software.ob);
 gim->tex = evas_gl_common_texture_new(gl_context, gim->im, EINA_FALSE);
+im->cache_entry.flags.updated_data = 1;
  }
evas_gl_preload_target_register(gim->tex, (Eo*) target);
 }

--

[EGIT] [core/efl] master 02/04: Evas: Refactor model's savers and loaders.

2015-12-09 Thread perepelits.m

jpeg pushed a commit to branch master.

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

commit 01a32f64c0ffbe2ce048f8eb016d685913558cf5
Author: perepelits.m 
Date:   Thu Dec 10 16:37:30 2015 +0900

Evas: Refactor model's savers and loaders.

Summary:
Move common part to a separated document.
Make code more readable using smaller functions. (from Task T2713)

I did it again because somehow test is passing now. It seems like this test 
suite is unstable.
Please, let me know if there are any errors after running distcheck.

Reviewers: cedric, raster, Hermet, stefan_schmidt

Subscribers: jpeg, artem.popov

Differential Revision: https://phab.enlightenment.org/D3420
---
 src/Makefile_Evas.am   |   4 +-
 ...odel_common.c => evas_model_load_save_common.c} |   2 +-
 ...odel_common.h => evas_model_load_save_common.h} |   0
 .../evas/model_loaders/eet/evas_model_load_eet.c   |   2 -
 .../evas/model_loaders/ply/evas_model_load_ply.c   | 319 +
 .../evas/model_savers/eet/evas_model_save_eet.c|  20 +-
 .../evas/model_savers/obj/evas_model_save_obj.c| 239 +--
 .../evas/model_savers/ply/evas_model_save_ply.c| 121 +---
 8 files changed, 317 insertions(+), 390 deletions(-)

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3f7dd39..d76356d 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -224,8 +224,8 @@ lib/evas/canvas/evas_canvas3d_node_callback.h
 lib_evas_libevas_la_SOURCES += \
 lib/evas/common3d/save_load/evas_model_load.c \
 lib/evas/common3d/save_load/evas_model_save.c \
-lib/evas/common3d/save_load/evas_model_common.c \
-lib/evas/common3d/save_load/evas_model_common.h \
+lib/evas/common3d/save_load/evas_model_load_save_common.c \
+lib/evas/common3d/save_load/evas_model_load_save_common.h \
 modules/evas/model_loaders/eet/evas_model_load_eet.c \
 modules/evas/model_loaders/md2/evas_model_load_md2.c \
 modules/evas/model_loaders/obj/evas_model_load_obj.c \
diff --git a/src/lib/evas/common3d/save_load/evas_model_common.c 
b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
similarity index 99%
rename from src/lib/evas/common3d/save_load/evas_model_common.c
rename to src/lib/evas/common3d/save_load/evas_model_load_save_common.c
index 612bccd..190ba59 100644
--- a/src/lib/evas/common3d/save_load/evas_model_common.c
+++ b/src/lib/evas/common3d/save_load/evas_model_load_save_common.c
@@ -1,4 +1,4 @@
-#include "evas_model_common.h"
+#include "evas_model_load_save_common.h"
 
 # define SAVE_MESH_INDICES_COPY   \
if (header.indices_count)  \
diff --git a/src/lib/evas/common3d/save_load/evas_model_common.h 
b/src/lib/evas/common3d/save_load/evas_model_load_save_common.h
similarity index 100%
rename from src/lib/evas/common3d/save_load/evas_model_common.h
rename to src/lib/evas/common3d/save_load/evas_model_load_save_common.h
diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c 
b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
index f5b1b6b..e049e2c 100644
--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
@@ -127,5 +127,3 @@ evas_model_load_file_eet(Evas_Canvas3D_Mesh *mesh, 
Eina_File *file)
 
_evas_canvas3d_eet_file_free(eet_file);
 }
-
-
diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c 
b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
index 1beef18..971e951 100644
--- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
+++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c
@@ -1,44 +1,4 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include 
-#include "stdio.h"
-#include "evas_common_private.h"
-#include "evas_private.h"
-#include 
-
-/* set value to position [x][y] to array name which have. */
-#define ARRAY_2D(name, x, y, count_y) (*(name + x * count_y + y))
-
-/* Structures for reading data from file. */
-typedef struct _PLY_HeaderPLY_Header;
-
-struct _PLY_Header
-{
-   int vertices_count;
-   int triangles_count;
-   Eina_Bool existence_of_geometries;
-   Eina_Bool existence_of_normals;
-   Eina_Bool existence_of_texcoords;
-   Eina_Bool existence_of_colors;
-};
-
-/* create new header */
-static inline PLY_Header
-_new_ply_header()
-{
-   PLY_Header header;
-
-   header.vertices_count = 0;
-   header.triangles_count = 0;
-   header.existence_of_geometries = EINA_FALSE;
-   header.existence_of_normals = EINA_FALSE;
-   header.existence_of_texcoords = EINA_FALSE;
-   header.existence_of_colors = EINA_FALSE;
-
-   return header;
-}
+#include "evas_model_load_save_common.h"
 
 static inline char *
 _to_next_line(char *current)
@@ -81,8 +41,8 @@ _read_data(float *array, int place, int count, char *current, 
float divider)

[EGIT] [core/efl] master 03/04: evas/gl_common: Reset current texture target with proper value when creating engine gl context.

2015-12-09 Thread Minkyoung Kim

jpeg pushed a commit to branch master.

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

commit fa422dd3d17baa35a71a916d779be10a4cb90a8a
Author: Minkyoung Kim 
Date:   Thu Dec 10 16:40:15 2015 +0900

evas/gl_common: Reset current texture target with proper value when 
creating engine gl context.

Summary:
set current target with default value of GL_TEXTURE_2D.
target should be valid value.

Reviewers: jpeg

Reviewed By: jpeg

Subscribers: wonsik, cedric, spacegrapher

Differential Revision: https://phab.enlightenment.org/D3423
---
 src/modules/evas/engines/gl_common/evas_gl_context.c | 2 ++
 1 file changed, 2 insertions(+)

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 04de885..00445d8 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -691,6 +691,8 @@ evas_gl_common_context_new(void)
   }
  }
 
+   gc->state.current.tex_target = GL_TEXTURE_2D;
+
if (!shared)
  {
 const char *ext;

--

[EGIT] [core/efl] master 01/04: evas_eet: Add Type Safety check

2015-12-09 Thread Pankaj Mittal

jpeg pushed a commit to branch master.

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

commit 1363cd757a8dcdc9adeaf47f781ad038446b2014
Author: Pankaj Mittal 
Date:   Thu Dec 10 16:26:56 2015 +0900

evas_eet: Add Type Safety check

Summary:
The Function _evas_canvas3d_eet_file_free(void) is referenced in  
evas_model_load_file_eet()(file:evas_model_load_eet.c at line 122).
This call is  under condition
if ((eet_file->mesh == NULL) || (eet_file->header == NULL)).
when  either eet_file->mesh or eet_file->header are NULL, dereference of 
the corresponding pointer in function "_evas_canvas3d_eet_file_free()"
will generate Segmentation Fault.

@fix

Reviewers: raster, Hermet, tasn, wonsik, spacegrapher, cedric, jpeg

Subscribers: singh.amitesh, sachin.dev, alok25, yashu21985, mvsovani, cedric

Differential Revision: https://phab.enlightenment.org/D3369
---
 src/lib/evas/canvas/evas_canvas3d_eet.c| 75 ++
 src/lib/evas/include/evas_common_private.h |  3 +
 src/lib/evas/include/evas_private.h|  8 ++-
 .../evas/model_loaders/eet/evas_model_load_eet.c   | 13 ++--
 .../evas/model_savers/eet/evas_model_save_eet.c| 12 ++--
 5 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/src/lib/evas/canvas/evas_canvas3d_eet.c 
b/src/lib/evas/canvas/evas_canvas3d_eet.c
index 281f69d..aed6512 100644
--- a/src/lib/evas/canvas/evas_canvas3d_eet.c
+++ b/src/lib/evas/canvas/evas_canvas3d_eet.c
@@ -2,18 +2,16 @@
 #include "evas_common_private.h"
 #include "evas_private.h"
 
-Evas_Canvas3D_File_Eet* eet_file;
-const char EVAS_CANVAS3D_FILE_CACHE_FILE_ENTRY[] = "evas_3d file";
-Eet_Data_Descriptor *_vec2_descriptor;
-Eet_Data_Descriptor *_vec3_descriptor;
-Eet_Data_Descriptor *_vertex_descriptor;
-Eet_Data_Descriptor *_geometry_descriptor;
-Eet_Data_Descriptor *_color_descriptor;
-Eet_Data_Descriptor *_material_descriptor;
-Eet_Data_Descriptor *_frame_descriptor;
-Eet_Data_Descriptor *_mesh_descriptor;
-Eet_Data_Descriptor *_header_descriptor;
-Eet_Data_Descriptor *_file_descriptor;
+static Eet_Data_Descriptor *_vec2_descriptor = NULL;
+static Eet_Data_Descriptor *_vec3_descriptor = NULL;
+static Eet_Data_Descriptor *_vertex_descriptor = NULL;
+static Eet_Data_Descriptor *_geometry_descriptor = NULL;
+static Eet_Data_Descriptor *_color_descriptor = NULL;
+static Eet_Data_Descriptor *_material_descriptor = NULL;
+static Eet_Data_Descriptor *_frame_descriptor = NULL;
+static Eet_Data_Descriptor *_mesh_descriptor = NULL;
+static Eet_Data_Descriptor *_header_descriptor = NULL;
+static Eet_Data_Descriptor *_file_descriptor = NULL;
 
 Evas_Canvas3D_File_Eet *
 _evas_canvas3d_eet_file_new(void)
@@ -29,8 +27,16 @@ _evas_canvas3d_eet_file_new(void)
return creating_file;
 }
 
+Eet_Data_Descriptor*
+_evas_canvas3d_eet_file_get()
+{
+   if(_file_descriptor == NULL)
+ _evas_canvas3d_eet_file_init();
+
+   return _file_descriptor;
+}
 void
-_evas_canvas3d_eet_file_init(void)
+_evas_canvas3d_eet_file_init()
 {
eina_init();
eet_init();
@@ -153,38 +159,55 @@ _evas_canvas3d_eet_file_init(void)
"mesh", mesh, _mesh_descriptor);
EET_DATA_DESCRIPTOR_ADD_SUB(_file_descriptor, Evas_Canvas3D_File_Eet,
"header", header, _header_descriptor);
-
 }
 
 void
-_evas_canvas3d_eet_descriptor_shutdown(void)
+_evas_canvas3d_eet_descriptor_shutdown()
 {
eet_data_descriptor_free(_geometry_descriptor);
+   _geometry_descriptor = NULL;
eet_data_descriptor_free(_vertex_descriptor);
+   _vertex_descriptor = NULL;
eet_data_descriptor_free(_vec2_descriptor);
+   _vec2_descriptor = NULL;
eet_data_descriptor_free(_vec3_descriptor);
+   _vec3_descriptor = NULL;
eet_data_descriptor_free(_color_descriptor);
+   _color_descriptor = NULL;
eet_data_descriptor_free(_material_descriptor);
+   _material_descriptor = NULL;
eet_data_descriptor_free(_frame_descriptor);
+   _frame_descriptor = NULL;
eet_data_descriptor_free(_mesh_descriptor);
+   _mesh_descriptor = NULL;
eet_data_descriptor_free(_header_descriptor);
+   _header_descriptor = NULL;
eet_data_descriptor_free(_file_descriptor);
+   _file_descriptor = NULL;
 }
 
 void
-_evas_canvas3d_eet_file_free(void)
+_evas_canvas3d_eet_file_free(Evas_Canvas3D_File_Eet* eet_file)
 {
-   free(eet_file->mesh->geometries[0].vertices);
-   free(eet_file->mesh->geometries);
-   free(eet_file->mesh->frames);
-   free(eet_file->mesh->materials[0].colors);
-   free(eet_file->mesh->materials);
-   free(eet_file->mesh);
-   free(eet_file->header->materials);
-   free(eet_file->header->geometries);
-   free(eet_file->header);
-   free(eet_file);
+   if (eet_file->mesh)
+ {
+free(eet_file->mesh->geometries[0].vertices);
+free(eet_file->mesh->geometries);
+free(eet_file->mesh->frames);
+

[EGIT] [core/efl] master 04/04: eina: Adding test case for base64 decode function.

2015-12-09 Thread Srivardhan Hebbar

jpeg pushed a commit to branch master.

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

commit 4103f38eedd3535fc4680d7c1abb1a0f8cc9373d
Author: Srivardhan Hebbar 
Date:   Thu Dec 10 16:44:27 2015 +0900

eina: Adding test case for base64 decode function.

Summary:
Depends on D3381

Signed-off-by: Srivardhan Hebbar 

Reviewers: cedric, jpeg

Subscribers: jpeg

Differential Revision: https://phab.enlightenment.org/D3382
---
 src/tests/eina/eina_test_str.c | 34 +++---
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c
index 03f254c..d13b32b 100644
--- a/src/tests/eina/eina_test_str.c
+++ b/src/tests/eina/eina_test_str.c
@@ -365,13 +365,13 @@ START_TEST(str_strftime)
 }
 END_TEST
 
-START_TEST(str_base64_encode)
+START_TEST(str_base64_encode_decode)
 {
/* All cases are taken from https://en.wikipedia.org/wiki/Base64 */
static const struct {
-  char *str;
-  char *expected;
-  unsigned int len;
+  char *decoded_str;
+  char *encoded_str;
+  int len;
   Eina_Bool not;
} tests[] = {
  { "any carnal pleasure.", "YW55IGNhcm5hbCBwbGVhc3VyZS4=", 20 },
@@ -389,15 +389,35 @@ START_TEST(str_base64_encode)
  { "abc123!?$*&()'-=@~", "YWJjMTIzIT8kKiYoKSctPUB+", 18 }
};
unsigned int i;
+   int len;
+   unsigned char *decoded;
 
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++)
  {
 char *encoded;
 
-encoded = eina_str_base64_encode((unsigned char*) tests[i].str, 
tests[i].len);
-fail_if(strcmp(encoded, tests[i].expected));
+encoded = eina_str_base64_encode((unsigned char*) 
tests[i].decoded_str, tests[i].len);
+fail_if(strcmp(encoded, tests[i].encoded_str));
+
+decoded = eina_str_base64_decode(tests[i].encoded_str, );
+fail_if(memcmp(decoded, tests[i].decoded_str, tests[i].len));
+
+fprintf(stderr, "len = %d, tests[%d].len = %d\n", len, i, 
tests[i].len);
+fail_if(len != tests[i].len);
+
 free(encoded);
+free(decoded);
  }
+
+   //Failure scenarios.
+   decoded = eina_str_base64_decode(NULL, );
+   fail_if(decoded);
+
+   decoded = eina_str_base64_decode("TWFu", NULL);
+   fail_if(memcmp(decoded, "Man", 3));
+
+   decoded = eina_str_base64_decode("abc", );
+   fail_if(decoded);
 }
 END_TEST
 
@@ -440,7 +460,7 @@ eina_test_str(TCase *tc)
tcase_add_test(tc, str_join_len);
tcase_add_test(tc, str_memdup);
tcase_add_test(tc, str_strftime);
-   tcase_add_test(tc, str_base64_encode);
+   tcase_add_test(tc, str_base64_encode_decode);
 #ifdef HAVE_ICONV
tcase_add_test(tc, str_convert);
 #endif

--

[EGIT] [core/efl] master 01/02: ecore-evas-wayland: Move configure acknowledge to render_flush_pre

2015-12-09 Thread Chris Michael

devilhorns pushed a commit to branch master.

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

commit abbfde9d68b7e54d0561f5263f4b8797c8b7aa51
Author: Chris Michael 
Date:   Wed Dec 9 09:38:01 2015 -0500

ecore-evas-wayland: Move configure acknowledge to render_flush_pre

If we acknowledge a configure from xdg during post render, we end up
breaking maximize of EFL clients inside Weston (and perhaps other
compositors). In order to fix that, we will now send the configure ack
post render but pre flush.

@fix

Signed-off-by: Chris Michael 
---
 .../engines/wayland/ecore_evas_wayland_common.c   | 19 ---
 .../engines/wayland/ecore_evas_wayland_egl.c  |  3 +++
 .../engines/wayland/ecore_evas_wayland_private.h  |  1 +
 .../engines/wayland/ecore_evas_wayland_shm.c  |  3 +++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index f0f5f92..4b090ef 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1310,6 +1310,18 @@ _ecore_evas_wl_common_render_pre(void *data, Evas *evas 
EINA_UNUSED, void *event
ecore_evas_manual_render_set(ee, 1);
 }
 
+void
+_ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas EINA_UNUSED, 
void *event EINA_UNUSED)
+{
+   Ecore_Evas *ee = data;
+   Ecore_Evas_Engine_Wl_Data *wdata;
+
+   wdata = ee->engine.data;
+   if (wdata->win->configure_ack)
+ wdata->win->configure_ack(wdata->win->xdg_surface,
+   wdata->win->configure_serial);
+}
+
 void 
 _ecore_evas_wl_common_render_updates(void *data, Evas *evas EINA_UNUSED, void 
*event)
 {
@@ -1342,15 +1354,8 @@ _ecore_evas_wl_common_render_updates(void *data, Evas 
*evas EINA_UNUSED, void *e
 void
 _ecore_evas_wl_common_post_render(Ecore_Evas *ee)
 {
-   Ecore_Evas_Engine_Wl_Data *wdata;
-
LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
-   wdata = ee->engine.data;
-   if (wdata->win->configure_ack)
- wdata->win->configure_ack(wdata->win->xdg_surface,
-   wdata->win->configure_serial);
-
_ecore_evas_idle_timeout_update(ee);
if (ee->func.fn_post_render) ee->func.fn_post_render(ee);
 }
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index b6b0189..6514968 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -236,6 +236,9 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, 
unsigned int parent,
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_PRE,
 _ecore_evas_wl_common_render_pre, ee);
 
+   evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
+   _ecore_evas_wl_common_render_flush_pre, ee);
+
/* FIXME: This needs to be set based on theme & scale */
if (ee->prop.draw_frame)
  evas_output_framespace_set(ee->evas, fx, fy, fw, fh);
diff --git 
a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index 2551c0f..6d6b695 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -75,6 +75,7 @@ int  _ecore_evas_wl_common_pre_render(Ecore_Evas *ee);
 /* int  _ecore_evas_wl_common_render_updates(Ecore_Evas *ee); */
 void _ecore_evas_wl_common_post_render(Ecore_Evas *ee);
 int  _ecore_evas_wl_common_render(Ecore_Evas *ee);
+void _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas 
EINA_UNUSED, void *event EINA_UNUSED);
 void _ecore_evas_wl_common_screen_geometry_get(const Ecore_Evas *ee, int *x, 
int *y, int *w, int *h);
 void _ecore_evas_wl_common_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int 
*ydpi);
 void _ecore_evas_wl_common_render_pre(void *data, Evas *evas EINA_UNUSED, void 
*event);
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index fb1e25b..0592feb 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -232,6 +232,9 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, 
unsigned int parent,
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_PRE,
 _ecore_evas_wl_common_render_pre, ee);
 
+   evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
+   _ecore_evas_wl_common_render_flush_pre,

58 matches

Mail list logo