Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog

[David Seikel]

On Wed, 31 Aug 2016 12:10:10 +0900 Carsten Haitzler (The Rasterman)
 wrote:

> On Wed, 31 Aug 2016 10:22:46 +1000 David Seikel 
> said:
> 
> > On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The Rasterman)
> >  wrote:
> > 
> > > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin
> > >  said:
> > > 
> > > > beber pushed a commit to branch master.
> > > > 
> > > > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb
> > > >
> > > > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb
> > > > Author: Bertrand Jacquin 
> > > > Date:   Sun Aug 28 17:11:48 2016 +0100
> > > > 
> > > > MINOR: config: Remove raster dead blog
> > > 
> > > it's not actually dead. it just has no content atm. i fixed the
> > > url to be right it just is a 0 byte return atm as i installed a
> > > cms but still have work to do on the site and haven't filled it
> > > with content yet :)
> > 
> > But but butt, it's at least a few days old already, it should be
> > bursting at the seams, full of great content, and excessive bling by
> > now!  :-P
> 
> i wish it were... have so many things to do. :)

So maybe now you might understand why my SledjHamr site isn't as pretty
and full of great content as YOU want?  Building an entire world takes
time, they tend to be full of lots and lots and lots of fiddly little
details.  :-P

-- 
A big old stinking pile of genius that no one wants
coz there are too many silver coated monkeys in the world.


signature.asc
Description: PGP signature
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog

[The Rasterman]

On Wed, 31 Aug 2016 10:22:46 +1000 David Seikel  said:

> On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The Rasterman)
>  wrote:
> 
> > On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin
> >  said:
> > 
> > > beber pushed a commit to branch master.
> > > 
> > > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb
> > >
> > > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb
> > > Author: Bertrand Jacquin 
> > > Date:   Sun Aug 28 17:11:48 2016 +0100
> > > 
> > > MINOR: config: Remove raster dead blog
> > 
> > it's not actually dead. it just has no content atm. i fixed the url
> > to be right it just is a 0 byte return atm as i installed a cms but
> > still have work to do on the site and haven't filled it with content
> > yet :)
> 
> But but butt, it's at least a few days old already, it should be
> bursting at the seams, full of great content, and excessive bling by
> now!  :-P

i wish it were... have so many things to do. :)

-- 
- Codito, ergo sum - "I code, therefore I am" --
The Rasterman (Carsten Haitzler)ras...@rasterman.com


--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] Input event changes

[Jean-Philippe André]

Hi,

On 30 August 2016 at 09:43, Carsten Haitzler  wrote:

> On Tue, 30 Aug 2016 09:35:38 +0900 (KST) Hermet Park 
> said:
>
> > broken here.
> > launch enventor -> touch the window title. (make it focused) :)
>
> the b0rker is in the house :)
> 
>

Well the above issue was just an ERR message printed out because elm is not
careful and calls evas_object_event_callback_add/del on NULL objects. So
nothing harmful here.

On the other hand, some guys pointed out major issues in ephoto on IRC.
Thanks for the help there! It should be fixed now.

Regards,

-- 
Jean-Philippe André
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 01/01: evas events: Fix repeated calls to mouse callbacks

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit f88a4b8308a45889960eb842ff0300ce9079d755
Author: Jean-Philippe Andre 
Date:   Wed Aug 31 11:33:20 2016 +0900

evas events: Fix repeated calls to mouse callbacks

After my many input events changes, a same object callback
could be called multiple times in a row because both mouse
and multi events were sent. As such, the multi event had no
direct effect (no callback called) but it reset the object's
last event type. This allowed the mouse event callbacks to be
called again.

Note that I haven't tested multi touch yet :(

Very good catch by @bu5hm4n!

Fixes T4462
Fixes T4467
---
 src/lib/evas/canvas/evas_callbacks.c | 32 
 src/lib/evas/canvas/evas_events.c| 18 --
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/lib/evas/canvas/evas_callbacks.c 
b/src/lib/evas/canvas/evas_callbacks.c
index 7fd6ff1..7842e7c 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -42,9 +42,9 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, 
EVAS_CALLBACK_LAST,
   EFL_EVENT_POINTER_UP,
   EFL_EVENT_POINTER_MOVE,
   EFL_EVENT_POINTER_WHEEL,
-  EFL_EVENT_POINTER_DOWN,
-  EFL_EVENT_POINTER_UP,
-  EFL_EVENT_POINTER_MOVE,
+  EFL_EVENT_FINGER_DOWN,
+  EFL_EVENT_FINGER_UP,
+  EFL_EVENT_FINGER_MOVE,
   EVAS_OBJECT_EVENT_FREE,
   EFL_EVENT_KEY_DOWN,
   EFL_EVENT_KEY_UP,
@@ -299,7 +299,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, 
Evas_Object_Protected_Data
 const Efl_Event_Description *efl_event_desc)
 {
/* MEM OK */
-   const Evas_Button_Flags mask = EVAS_BUTTON_DOUBLE_CLICK | 
EVAS_BUTTON_TRIPLE_CLICK;
+   const Evas_Button_Flags CLICK_MASK = EVAS_BUTTON_DOUBLE_CLICK | 
EVAS_BUTTON_TRIPLE_CLICK;
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
Evas_Public_Data *e;
 
@@ -328,10 +328,10 @@ evas_object_event_callback_call(Evas_Object *eo_obj, 
Evas_Object_Protected_Data
if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
  {
 flags = efl_input_pointer_button_flags_get(event_info);
-if (flags & mask)
+if (flags & CLICK_MASK)
   {
  if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 
1))
-   efl_input_pointer_button_flags_set(event_info, flags & ~mask);
+   efl_input_pointer_button_flags_set(event_info, flags & 
~CLICK_MASK);
   }
 obj->last_mouse_down_counter = e->last_mouse_down_counter;
  }
@@ -344,8 +344,24 @@ evas_object_event_callback_call(Evas_Object *eo_obj, 
Evas_Object_Protected_Data
 
efl_event_callback_legacy_call(eo_obj, efl_event_desc, event_info);
 
-   if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
- efl_input_pointer_button_flags_set(event_info, flags);
+   /* multi events with finger 0 - only for eo callbacks */
+   if (type == EVAS_CALLBACK_MOUSE_DOWN)
+ {
+if (_evas_object_callback_has_by_type(obj, EVAS_CALLBACK_MULTI_DOWN))
+  efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_DOWN, event_info);
+efl_input_pointer_button_flags_set(event_info, flags);
+ }
+   else if (type == EVAS_CALLBACK_MOUSE_UP)
+ {
+if (_evas_object_callback_has_by_type(obj, EVAS_CALLBACK_MULTI_UP))
+  efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_UP, event_info);
+efl_input_pointer_button_flags_set(event_info, flags);
+ }
+   else if (type == EVAS_CALLBACK_MOUSE_MOVE)
+ {
+if (_evas_object_callback_has_by_type(obj, EVAS_CALLBACK_MULTI_MOVE))
+  efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_MOVE, event_info);
+ }
 
 nothing_here:
if (!obj->no_propagate)
diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index 1238d51..63e4573 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -441,8 +441,6 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, 
Evas *eo_e,
 _evas_event_havemap_adjust_f(eo_child, child, >cur, 
child->mouse_grabbed);
 evas_object_event_callback_call(eo_child, child, 
EVAS_CALLBACK_MOUSE_DOWN, evt,
 event_id, EFL_EVENT_POINTER_DOWN);
-evas_object_event_callback_call(eo_child, child, 
EVAS_CALLBACK_MULTI_DOWN, evt,
-event_id, EFL_EVENT_FINGER_DOWN);
 if (e->delete_me) break;
 if (obj->pointer_mode == 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
 

[EGIT] [apps/epour] master 01/02: Fix state and status updates

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/epour.git/commit/?id=e7e2766b698a8d863218506e99b5e705fca68dc4

commit e7e2766b698a8d863218506e99b5e705fca68dc4
Author: Kai Huuhko 
Date:   Wed Aug 31 04:40:01 2016 +0300

Fix state and status updates
---
 epour/gui/__init__.py | 46 +++---
 epour/session.py  |  6 ++
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/epour/gui/__init__.py b/epour/gui/__init__.py
index 2293f3b..e0d13f2 100644
--- a/epour/gui/__init__.py
+++ b/epour/gui/__init__.py
@@ -190,16 +190,16 @@ class MainInterface(object):
 def torrent_paused_resumed_cb(a):
 h = a.handle
 if not h.is_valid():
-log.debug("State changed for invalid handle.")
+log.debug("Paused state changed for invalid handle.")
 return
 
 info_hash = str(h.info_hash())
 if info_hash not in self.torrentitems:
-log.debug("%s state changed but not in list", str(info_hash))
+log.debug("Paused state for %s changed but not in list of gui 
items", str(info_hash))
 return
 
 torrent = self._session.torrents[info_hash]
-torrent.state = h.status(0).state
+torrent.status = h.status(0)
 
 self.torrentitems[info_hash].fields_update(
 "elm.swallow.icon", ELM_GENLIST_ITEM_FIELD_CONTENT
@@ -229,20 +229,20 @@ class MainInterface(object):
 session.alert_manager.callback_add(
 "state_changed_alert", state_changed_cb)
 
-# def state_update_alert_cb(a):
-# statuses = a.status
-# for status in statuses:
-# info_hash = str(status.info_hash)
+def state_update_alert_cb(a):
+statuses = a.status
+for status in statuses:
+info_hash = str(status.info_hash)
 
-# if info_hash not in self.torrentitems:
-# return
+if info_hash not in self.torrentitems:
+return
 
-# self.torrentitems[info_hash].fields_update(
-# "*", ELM_GENLIST_ITEM_FIELD_TEXT
-# )
+self.torrentitems[info_hash].fields_update(
+"*", ELM_GENLIST_ITEM_FIELD_TEXT
+)
 
-# session.alert_manager.callback_add(
-# "state_update_alert", state_update_alert_cb)
+session.alert_manager.callback_add(
+"state_update_alert", state_update_alert_cb)
 
 def torrent_finished_cb(a):
 msg = _("Torrent {} has finished downloading.").format(
@@ -262,11 +262,11 @@ class MainInterface(object):
 def run_mainloop(self):
 self.win.show()
 
-self.timer = Timer(1.0, self.update)
-self.win.on_del_add(lambda x: self.timer.delete())
-self.win.callback_withdrawn_add(lambda x: self.timer.freeze())
-self.win.callback_iconified_add(lambda x: self.timer.freeze())
-self.win.callback_normal_add(lambda x: self.timer.thaw())
+# self.timer = Timer(1.0, self.update)
+# self.win.on_del_add(lambda x: self.timer.delete())
+# self.win.callback_withdrawn_add(lambda x: self.timer.freeze())
+# self.win.callback_iconified_add(lambda x: self.timer.freeze())
+# self.win.callback_normal_add(lambda x: self.timer.thaw())
 elm.run()
 
 def stop_mainloop(self):
@@ -274,9 +274,8 @@ class MainInterface(object):
 
 def update(self):
 #log.debug("Torrent list TICK")
-for v in self.tlist.realized_items_get():
-v.fields_update("*", ELM_GENLIST_ITEM_FIELD_TEXT)
-self._session.post_torrent_updates(64)
+# for v in self.tlist.realized_items_get():
+# v.fields_update("*", ELM_GENLIST_ITEM_FIELD_TEXT)
 return True
 
 def _torrent_item_tooltip_cb(self, gl, it, tooltip, session, torrent):
@@ -483,6 +482,7 @@ class TorrentClass(GenlistItemClass):
 return
 
 status = torrent.status
+state = torrent.state
 ic = Icon(obj)
 try:
 if status.paused:
@@ -511,7 +511,7 @@ class TorrentClass(GenlistItemClass):
 pass
 except RuntimeError:
 log.debug("Setting torrent ic failed")
-ic.tooltip_text_set(self.state_str[torrent.state])
+ic.tooltip_text_set(self.state_str[state])
 ic.size_hint_aspect_set(EVAS_ASPECT_CONTROL_VERTICAL, 1, 1)
 return ic
 
diff --git a/epour/session.py b/epour/session.py
index 469f6f3..311d1f5 100644
--- a/epour/session.py
+++ b/epour/session.py
@@ -173,6 +173,12 @@ class Session(lt.session):
 
 self.periodic_save_timer = Timer(15.0, periodic_save_func)
 
+def status_updates_timer_cb():
+self.post_torrent_updates(64)
+return True
+
+  

[EGIT] [apps/epour] master 02/02: Add i2p proxy type to proxy settings

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/epour.git/commit/?id=8b7f4a9e5514bc34a96ff3954bbcc4b4e5ef95c9

commit 8b7f4a9e5514bc34a96ff3954bbcc4b4e5ef95c9
Author: Kai Huuhko 
Date:   Wed Aug 31 04:41:09 2016 +0300

Add i2p proxy type to proxy settings
---
 epour/gui/Preferences.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epour/gui/Preferences.py b/epour/gui/Preferences.py
index 1d5608d..1590212 100644
--- a/epour/gui/Preferences.py
+++ b/epour/gui/Preferences.py
@@ -302,6 +302,7 @@ class ProxyGroup(Frame):
 lt.proxy_type.socks5_pw.name: lt.proxy_type.socks5_pw,
 lt.proxy_type.http.name: lt.proxy_type.http,
 lt.proxy_type.http_pw.name: lt.proxy_type.http_pw,
+lt.proxy_type.i2p_proxy.name: lt.proxy_type.i2p_proxy,
 }
 
 def __init__(self, parent, title, rfunc, wfunc):

-- 

[EGIT] [core/efl] master 01/01: elm widget: remove meaningless brackets

[WooHyun Jung]

woohyun pushed a commit to branch master.

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

commit 9452acd126fd1d30b27748a70e84c2b802bf9f31
Author: WooHyun Jung 
Date:   Wed Aug 31 09:36:52 2016 +0900

elm widget: remove meaningless brackets
---
 src/lib/elementary/elm_widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 618c735..1b7a94c 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -298,7 +298,7 @@ _obj_mouse_down(void *data,
 
ELM_WIDGET_DATA_GET(data, sd);
Evas_Event_Mouse_Down *ev = event_info;
-   if ((ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)) return;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
top = elm_widget_top_get(data);
if (top && efl_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_hide(top);

-- 

Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog

[David Seikel]

On Wed, 31 Aug 2016 09:13:30 +0900 Carsten Haitzler (The Rasterman)
 wrote:

> On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin
>  said:
> 
> > beber pushed a commit to branch master.
> > 
> > http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb
> >
> > commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb
> > Author: Bertrand Jacquin 
> > Date:   Sun Aug 28 17:11:48 2016 +0100
> > 
> > MINOR: config: Remove raster dead blog
> 
> it's not actually dead. it just has no content atm. i fixed the url
> to be right it just is a 0 byte return atm as i installed a cms but
> still have work to do on the site and haven't filled it with content
> yet :)

But but butt, it's at least a few days old already, it should be
bursting at the seams, full of great content, and excessive bling by
now!  :-P

-- 
A big old stinking pile of genius that no one wants
coz there are too many silver coated monkeys in the world.


signature.asc
Description: PGP signature
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [website/planet] master 01/01: MINOR: config: Remove raster dead blog

[The Rasterman]

On Sun, 28 Aug 2016 09:13:46 -0700 Bertrand Jacquin  said:

> beber pushed a commit to branch master.
> 
> http://git.enlightenment.org/website/planet.git/commit/?id=6f0e0476ac73b19c57dcca2d4e589730585dddcb
>
> commit 6f0e0476ac73b19c57dcca2d4e589730585dddcb
> Author: Bertrand Jacquin 
> Date:   Sun Aug 28 17:11:48 2016 +0100
> 
> MINOR: config: Remove raster dead blog

it's not actually dead. it just has no content atm. i fixed the url to be right
it just is a 0 byte return atm as i installed a cms but still have work to do
on the site and haven't filled it with content yet :)

> ---
>  conf/config.ini | 5 -
>  1 file changed, 5 deletions(-)
> 
> diff --git a/conf/config.ini b/conf/config.ini
> index d1bfefa..f2090f9 100644
> --- a/conf/config.ini
> +++ b/conf/config.ini
> @@ -97,11 +97,6 @@ name = ~Deon Thomas
>  user = thanatermesis
>  name = ~Thanatermesis
>  
> -[http://www.rasterman.com/rss.xml]
> -user = raster
> -name = ~Carsten Haitzler
> -face = yes
> -
>  [http://www.ravenlock.us/blog/?feed=rss2]
>  user = ravenlock
>  name = ~Eric Schuele
> 
> -- 
> 
> 


-- 
- Codito, ergo sum - "I code, therefore I am" --
The Rasterman (Carsten Haitzler)ras...@rasterman.com


--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/efl] master 01/01: efreet - fix mime file path messing with short paths like /

[The Rasterman]

On Tue, 30 Aug 2016 13:37:34 +0100 Tom Hacohen  said:

> Has this been reverted already? (The unrelated changes)
> 
> Or should I do it?

well the changes there don't hurt anything if you look at them. they would
avoid crashes if null params were passed in so i see removing them as worse
than doing nothing. i have no idea how they got there. i hadn't touched any gl
engine stuff in the few days i was working on this mime stuff.

> On 27/08/16 01:48, Carsten Haitzler (The Rasterman) wrote:
> > On Fri, 26 Aug 2016 14:15:46 + Mike Blumenkrantz
> >  said:
> >
> >> I just noticed this while doing some bisecting...was it intentional that
> >> you included undocumented evas engine changes in your efreet commit?
> >
> > wtf? i... what? i haven't even opened evas_gl_cocoa_main.m in like...
> > months and months - i think i edited then once before 1.18 release to fix a
> > bug... wtf? how? i didn't touch these! i haven't been looking at anything
> > in evas engines for a while... certainly not int he last week or 2.
> >
> > WTH?
> >
> >> On Tue, Jul 5, 2016 at 3:29 AM Carsten Haitzler 
> >> wrote:
> >>
> >>> raster pushed a commit to branch master.
> >>>
> >>>
> >>> http://git.enlightenment.org/core/efl.git/commit/?id=2ca5075193e27dbc30f26e478019719a5360cc84
> >>>
> >>> commit 2ca5075193e27dbc30f26e478019719a5360cc84
> >>> Author: Carsten Haitzler (Rasterman) 
> >>> Date:   Tue Jul 5 15:56:43 2016 +0900
> >>>
> >>> efreet - fix mime file path messing with short paths like /
> >>>
> >>> this fixes T4015
> >>>
> >>> @fix
> >>> ---
> >>>  src/lib/efreet/efreet_mime.c   | 7 +--
> >>>  src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m | 1 +
> >>>  src/modules/evas/engines/gl_x11/evas_x_main.c  | 2 ++
> >>>  src/modules/evas/engines/wayland_egl/evas_wl_main.c| 1 +
> >>>  4 files changed, 9 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
> >>> index adfa790..87ca8ef 100644
> >>> --- a/src/lib/efreet/efreet_mime.c
> >>> +++ b/src/lib/efreet/efreet_mime.c
> >>> @@ -711,10 +711,13 @@ efreet_mime_special_check(const char *file)
> >>> parent[PATH_MAX - 1] = '\0';
> >>>
> >>> /* Kill any trailing slash */
> >>> -   parent[--path_len] = '\0';
> >>> +   if (parent[path_len - 1] == '/')
> >>> + parent[--path_len] = '\0';
> >>>
> >>> /* Truncate to last slash */
> >>> -   while (parent[--path_len] != '/') parent[path_len] = '\0';
> >>> +   while ((path_len > 0) &&
> >>> +  (parent[--path_len] != '/'))
> >>> + parent[path_len] = '\0';
> >>>
> >>>  #ifdef _WIN32
> >>> if (!stat(file, ))
> >>> diff --git a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> >>> b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> >>> index 15dc218..7df919f 100644
> >>> --- a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> >>> +++ b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
> >>> @@ -120,6 +120,7 @@ eng_window_free(Evas_GL_Cocoa_Window *gw)
> >>>  void
> >>>  eng_window_use(Evas_GL_Cocoa_Window *gw)
> >>>  {
> >>> +   if ((gw) && (!gw->gl_context)) return;
> >>> if (_evas_gl_cocoa_window != gw)
> >>>   {
> >>>  [[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
> >>> diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
> >>> b/src/modules/evas/engines/gl_x11/evas_x_main.c
> >>> index 59361e1..f5e2edf 100644
> >>> --- a/src/modules/evas/engines/gl_x11/evas_x_main.c
> >>> +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
> >>> @@ -676,6 +676,8 @@ eng_window_use(Outbuf *gw)
> >>> xwin = _tls_outbuf_get();
> >>>
> >>> glsym_evas_gl_preload_render_lock(eng_window_make_current, gw);
> >>> +   if ((gw) && (!gw->gl_context)) return;
> >>> +
> >>>  #ifdef GL_GLES
> >>> if (xwin)
> >>>   {
> >>> diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> >>> b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> >>> index 489a475..14e13ff 100644
> >>> --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> >>> +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
> >>> @@ -233,6 +233,7 @@ eng_window_use(Outbuf *gw)
> >>> Eina_Bool force = EINA_FALSE;
> >>>
> >>> glsym_evas_gl_preload_render_lock(eng_preload_make_current, gw);
> >>> +   if ((gw) && (!gw->gl_context)) return;
> >>>
> >>> if (_evas_gl_wl_window)
> >>>   {
> >>>
> >>> --
> >>>
> >>>
> >>>
> >> --
> >> ___
> >> enlightenment-devel mailing list
> >> enlightenment-devel@lists.sourceforge.net
> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> >>
> >
> >
> 
> 
> 

Re: [E-devel] Apache OpenOffice 4.1.2 locks in Enlightenment 0.21.99.21605

[The Rasterman]

On Tue, 30 Aug 2016 04:22:00 -0700 Jose R R  said:

> Thanks for replying.
> 
> On Sun, Aug 28, 2016 at 11:27 PM, Carsten Haitzler 
> wrote:
> > On Sat, 27 Aug 2016 03:42:52 -0700 Jose R R  said:
> >
> >> Niltze [Hello], all!
> >>
> >> I've noticed that Enlightenment 0.17.x.y and 0.21.x.y GUI environment
> >> sometimes becomes locked upon mousing over icons in Apache OpenOffice
> >> 4.1.2.
> >>
> >> Notwithstanding, when I built Enlightenment 0.19.x.y and 0.20.xy, the
> >> locking issue disappeared and I thought it was resolved; but then issue
> >> reappeared once more in Enlightenment 0.21.x.y. I have to CTRL + ALT and
> >> press F1, F2, etc. to get another shell, login and restart XDM.
> >>
> >> Any feedback would be greatly appreciated.
> >
> > is e stuck - has it crashed? do you get a crashdump?
> E21 must be 'stuck' -- as I can't locate a 'crashdump'.
> 
> Please see pic at:
> <
> https://metztli.it/blog/media/blogs/ixiptli/quick-uploads/p125/e21_apacheoo_issue.png?mtime=1472553272
> >
> >
> > https://www.enlightenment.org/docs-efl-debug
> I will try this as time avails. Thank you.
> >
> > you can also find if it isnt crashing by forcing a segv and seeing where
> > the bt says it was stuck:
> >
> > killall -SEGV enlightenment
> I have executed above directive and Recovery option seems useful -- as
> I don't have to restart XDM, thus potentially preserving existing
> sessions and/or data/work; again, please snapshot above and if
> interested for context, post entry:
> <
> https://metztli.it/blog/index.php/ixiptli/eterm-and-enlightenment-window-manager
> >

so when you sent a SEGV to enlightenment... after that did you have
~/.e-crashdump.txt ? because you now FORCED it to crash, thus a crashdump
should be produced. this may not work if yama ptrace is enabled.

sudo sysctl -w kernel.yama.ptrace_scope=0


will turn that off. you need gdb installed too. also when compiling e and efl
you need your CFFLAGS to contain "-g" to enable gdb debug symbols of course.

export CFLAGS="-g -O2 -march=native -fvisibility=hidden -ffast-math"

for example before you compile.

remember - e APPENDS to the crashdump file every crash, so the most recent
crash is the last bt set - grep for "pause" to find the crash points. :)

so crashdump file after this? that'll tell use what's up. hopefully. or give us
another thing to follow.

p.s.

btw - why eterm? eterm is fine and all but its an old old old school terminal
still using xlib directly etc. terminology is the modern terminal that uses efl
et. (runs even on OSX too) that has real bells and whistles (videos in the bg,
inline image display, tabs AND splits etc.)? and it does PROPER transparency -
no "esetroot" with fake "lets copy parts of the background pixmap into app
window to make it look transparent but only with a wallpaper".

> >
> > --
> > - Codito, ergo sum - "I code, therefore I am" --
> > The Rasterman (Carsten Haitzler)ras...@rasterman.com
> >
> 
> 
> Best Professional Regards.
> 
> -- 
> Jose R R
> http://metztli.it
> -
> Try at no charge http://b2evolution.net for http://OpenShift.com PaaS
> -
> from our GitHub http://Nepohualtzintzin.com repository. Cloud the easy way!
> 


-- 
- Codito, ergo sum - "I code, therefore I am" --
The Rasterman (Carsten Haitzler)ras...@rasterman.com


--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [apps/ephoto] master 01/01: Ephoto: Use a transition of the directory browser rolling down into the button to give users a better hint about how to reshow it.

[Stephen okra Houston]

okra pushed a commit to branch master.

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

commit 8f9522ce25890c74c90aa5753af8ecdfbd8924ec
Author: Stephen okra Houston 
Date:   Tue Aug 30 17:28:02 2016 -0500

Ephoto: Use a transition of the directory browser rolling down into the 
button to give users a better hint about how to reshow it.
---
 data/themes/ephoto.edc | 2 ++
 src/bin/ephoto_main.c  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/themes/ephoto.edc b/data/themes/ephoto.edc
index 2a194e5..00f3bc7 100644
--- a/data/themes/ephoto.edc
+++ b/data/themes/ephoto.edc
@@ -266,6 +266,8 @@ collections {
 description { state: "hidden" 0.0;
inherit: "default" 0.0;
color: 255 255 255 0;
+   rel1.to: "ephoto,controls";
+   rel1.relative: 0.0 0.0;
visible: 0;
 }
  }
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index d01002e..eb11aee 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -562,7 +562,7 @@ ephoto_window_add(const char *path)
  elm_object_text_set(but, _("Show Folders"));
evas_object_smart_callback_add(but, "clicked", _folder_icon_clicked, 
ephoto);
elm_object_tooltip_text_set(but, _("Show Folders"));
-   elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_TOP);
+   elm_object_tooltip_orient_set(but, ELM_TOOLTIP_ORIENT_RIGHT);
elm_box_pack_end(ephoto->statusbar, but);
evas_object_show(but);
fold = but;

-- 

[EGIT] [core/efl] master 01/01: elm: Try to use the code highlight color from out website in Elm_Code

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

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

commit 9e54ae93736eddd1e804745af57ac01283c6167d
Author: Andy Williams 
Date:   Tue Aug 30 23:22:41 2016 +0100

elm: Try to use the code highlight color from out website in Elm_Code
---
 src/lib/elementary/elm_code_widget.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 246f5ee..158c0d3 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1456,27 +1456,27 @@ _elm_code_widget_setup_palette(Evas_Object *o)
 
// setup token colors
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_DEFAULT,
-205, 205, 205, 255);
+187, 187, 187, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_COMMENT,
-51, 153, 255, 255);
+51, 85, 187, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_STRING,
-255, 90, 53, 255);
+255, 136, 119, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_NUMBER,
-212, 212, 42, 255);
+170, 153, 34, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_BRACE,
-101, 101, 101, 255);
+170, 102, 170, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_TYPE,
-51, 153, 255, 255);
+255, 255, 255, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_CLASS,
-114, 170, 212, 255);
+255, 255, 255, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_FUNCTION,
-114, 170, 212, 255);
-   evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_PARAM,
 255, 255, 255, 255);
+   evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_PARAM,
+187, 187, 187, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_KEYWORD,
-255, 153, 0, 255);
+68, 136, 204, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_PREPROCESSOR,
-0, 176, 0, 255);
+102, 255, 85, 255);
 
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, 
ELM_CODE_TOKEN_TYPE_ADDED,
 54, 255, 54, 255);

-- 

Re: [E-devel] Apache OpenOffice 4.1.2 locks in Enlightenment 0.21.99.21605

[Pau Espin Pedrol]

Hi,

Recently I also noticed that E hanged (no more graphic interaction or
refreshed) a few times randomly while opening a link menu in firefox by
right-clicking on a link. I think it is more probable to hit the issue if
the page is heavy and is still finishing loading.

I guess it may be the same issue.

I'm using enlightenment-0.20.10-1 and efl-1.17.2-1 from Archlinux
Graphic card (lspci): Intel Corporation Haswell-ULT Integrated Graphics
Controller (rev 0b)
xf86-video-intel is not installed, so I guess I'm using generic KMS.

Regards,
Pau Espin Pedrol

2016-08-30 13:22 GMT+02:00 Jose R R :

> Thanks for replying.
>
> On Sun, Aug 28, 2016 at 11:27 PM, Carsten Haitzler 
> wrote:
> > On Sat, 27 Aug 2016 03:42:52 -0700 Jose R R  said:
> >
> >> Niltze [Hello], all!
> >>
> >> I've noticed that Enlightenment 0.17.x.y and 0.21.x.y GUI environment
> >> sometimes becomes locked upon mousing over icons in Apache OpenOffice
> 4.1.2.
> >>
> >> Notwithstanding, when I built Enlightenment 0.19.x.y and 0.20.xy, the
> >> locking issue disappeared and I thought it was resolved; but then issue
> >> reappeared once more in Enlightenment 0.21.x.y. I have to CTRL + ALT and
> >> press F1, F2, etc. to get another shell, login and restart XDM.
> >>
> >> Any feedback would be greatly appreciated.
> >
> > is e stuck - has it crashed? do you get a crashdump?
> E21 must be 'stuck' -- as I can't locate a 'crashdump'.
>
> Please see pic at:
> < https://metztli.it/blog/media/blogs/ixiptli/quick-uploads/
> p125/e21_apacheoo_issue.png?mtime=1472553272
> >
> >
> > https://www.enlightenment.org/docs-efl-debug
> I will try this as time avails. Thank you.
> >
> > you can also find if it isnt crashing by forcing a segv and seeing where
> the bt
> > says it was stuck:
> >
> > killall -SEGV enlightenment
> I have executed above directive and Recovery option seems useful -- as
> I don't have to restart XDM, thus potentially preserving existing
> sessions and/or data/work; again, please snapshot above and if
> interested for context, post entry:
> < https://metztli.it/blog/index.php/ixiptli/eterm-and-
> enlightenment-window-manager
> >
>
> >
> > --
> > - Codito, ergo sum - "I code, therefore I am" --
> > The Rasterman (Carsten Haitzler)ras...@rasterman.com
> >
>
>
> Best Professional Regards.
>
> --
> Jose R R
> http://metztli.it
> 
> -
> Try at no charge http://b2evolution.net for http://OpenShift.com PaaS
> 
> -
> from our GitHub http://Nepohualtzintzin.com repository. Cloud the easy
> way!
>
> 
> --
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [apps/epour] master 03/03: Fix restoring paused torrents to session

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/epour.git/commit/?id=7433ec24833d00fdaf982d80cb70580a1f180a1b

commit 7433ec24833d00fdaf982d80cb70580a1f180a1b
Author: Kai Huuhko 
Date:   Tue Aug 30 18:58:27 2016 +0300

Fix restoring paused torrents to session
---
 epour/gui/TorrentSelector.py | 10 ++
 epour/session.py |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/epour/gui/TorrentSelector.py b/epour/gui/TorrentSelector.py
index c55c3bf..48873b1 100644
--- a/epour/gui/TorrentSelector.py
+++ b/epour/gui/TorrentSelector.py
@@ -229,12 +229,14 @@ seed, this flag has no effect.'''
 self.add_dict["flags"] = (
 add_torrent_params_flags_t.flag_apply_ip_filter +
 add_torrent_params_flags_t.flag_update_subscribe +
-add_torrent_params_flags_t.flag_duplicate_is_error +
-add_torrent_params_flags_t.flag_auto_managed
-)
+add_torrent_params_flags_t.flag_duplicate_is_error)
 
 def option_flag_cb(c, flag):
-self.add_dict["flags"] = self.add_dict["flags"] ^ flag
+flags = self.add_dict["flags"]
+flags = flags ^ flag
+if flag == int(add_torrent_params_flags_t.flag_paused):
+flags = flags ^ 
int(add_torrent_params_flags_t.flag_auto_managed)
+self.add_dict["flags"] = flags
 
 for name, flag in sorted(add_torrent_params_flags_t.names.items()):
 if not int(flag) in self.names.keys():
diff --git a/epour/session.py b/epour/session.py
index 8acfedb..469f6f3 100644
--- a/epour/session.py
+++ b/epour/session.py
@@ -470,7 +470,7 @@ def status_to_flags(status):
 flags += 8 if status.share_mode else 0
 flags += 16 if status.ip_filter_applies else 0
 flags += 32 if status.paused else 0
-flags += 64  # auto_managed
+flags += 64  if status.auto_managed else 0
 flags += 128  # duplicate_is_error
 #flags += 256 deprecated
 flags += 512  # update_subscribe

-- 

[EGIT] [apps/epour] master 02/03: Preferences: Fix py2ism

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/epour.git/commit/?id=8f808340cdc0d2b4cef30b96088910e840ede852

commit 8f808340cdc0d2b4cef30b96088910e840ede852
Author: Kai Huuhko 
Date:   Mon Aug 29 18:47:12 2016 +0300

Preferences: Fix py2ism
---
 epour/gui/Preferences.py | 37 +++--
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/epour/gui/Preferences.py b/epour/gui/Preferences.py
index 322b1ee..1d5608d 100644
--- a/epour/gui/Preferences.py
+++ b/epour/gui/Preferences.py
@@ -1,7 +1,7 @@
 #
 #  Epour - A bittorrent client using EFL and libtorrent
 #
-#  Copyright 2012-2014 Kai Huuhko 
+#  Copyright 2012-2016 Kai Huuhko 
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -22,31 +22,32 @@
 import os
 import cgi
 import logging
-log = logging.getLogger("epour.preferences")
 
 import libtorrent as lt
 
-from efl.elementary.box import Box
-from efl.elementary.label import Label
-from efl.elementary.button import Button
-from efl.elementary.frame import Frame
-from efl.elementary.entry import Entry
-from efl.elementary.check import Check
-from efl.elementary.spinner import Spinner
-from efl.elementary.hoversel import Hoversel
-from efl.elementary.scroller import Scroller, ELM_SCROLLER_POLICY_AUTO
-from efl.elementary.separator import Separator
-from efl.elementary.slider import Slider
-from efl.elementary.table import Table
-from efl.elementary.configuration import Configuration
-from efl.elementary.window import StandardWindow
-from efl.elementary.background import Background
+from efl.elementary import Box
+from efl.elementary import Label
+from efl.elementary import Button
+from efl.elementary import Frame
+from efl.elementary import Entry
+from efl.elementary import Check
+from efl.elementary import Spinner
+from efl.elementary import Hoversel
+from efl.elementary import Scroller, ELM_SCROLLER_POLICY_AUTO
+from efl.elementary import Separator
+from efl.elementary import Slider
+from efl.elementary import Table
+from efl.elementary import Configuration
+from efl.elementary import StandardWindow
+from efl.elementary import Background
 
 from efl.evas import Rectangle, EVAS_HINT_EXPAND, EVAS_HINT_FILL
 
 from .Widgets import UnitSpinner, Error, Information, ActSWithLabel, FsButton, 
\
 RangeSpinners
 
+log = logging.getLogger("epour.preferences")
+
 EXPAND_BOTH = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
 EXPAND_HORIZ = EVAS_HINT_EXPAND, 0.0
 FILL_BOTH = EVAS_HINT_FILL, EVAS_HINT_FILL
@@ -616,7 +617,7 @@ class PreferencesSession(PreferencesDialog):
 def apply_settings(self, btn, widgets, session):
 s = lt.session_settings()
 
-for k, w in widgets.iteritems():
+for k, w in widgets.items():
 
 if k == "disk_cache_algorithm":
 v = lt.disk_cache_algo_t(w.value)

-- 

[EGIT] [apps/epour] master 01/03: Use DialogWindow instead of StandardWindow for child windows

[Kai Huuhko]

kuuko pushed a commit to branch master.

http://git.enlightenment.org/apps/epour.git/commit/?id=fa3366552fac653d80ddfb48384b8c77cc3e0de0

commit fa3366552fac653d80ddfb48384b8c77cc3e0de0
Author: Kai Huuhko 
Date:   Fri Aug 26 22:12:05 2016 +0300

Use DialogWindow instead of StandardWindow for child windows
---
 epour/gui/TorrentProps.py| 21 +++--
 epour/gui/TorrentSelector.py | 17 ++---
 epour/gui/__init__.py|  4 ++--
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/epour/gui/TorrentProps.py b/epour/gui/TorrentProps.py
index c1fc757..f62cd6e 100644
--- a/epour/gui/TorrentProps.py
+++ b/epour/gui/TorrentProps.py
@@ -1,7 +1,7 @@
 #
 #  Epour - A bittorrent client using EFL and libtorrent
 #
-#  Copyright 2012-2014 Kai Huuhko 
+#  Copyright 2012-2016 Kai Huuhko 
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ from efl import ecore
 from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL
 from efl.elementary.genlist import Genlist, GenlistItemClass, \
 ELM_GENLIST_ITEM_NONE, ELM_GENLIST_ITEM_TREE, ELM_GENLIST_ITEM_FIELD_TEXT
-from efl.elementary.window import StandardWindow
+from efl.elementary.window import DialogWindow
 from efl.elementary.button import Button
 from efl.elementary.box import Box
 from efl.elementary.check import Check
@@ -117,15 +117,15 @@ def attach(branch, file_entry, n, trunk):
 attach(others, file_entry, n, trunk[node])
 
 
-class TorrentProps(StandardWindow):
+class TorrentProps(DialogWindow):
 
-def __init__(self, h):
+def __init__(self, parent_win, h):
 if not h.is_valid():
 Information(self, _("Invalid torrent handle."))
 return
 
-StandardWindow.__init__(
-self, "epour", "Epour - %s" % (h.name()),
+DialogWindow.__init__(
+self, parent_win, "epour", "Epour - %s" % (h.name()),
 size=(SCALE * 480, SCALE * 320),
 autodel=True
 )
@@ -201,10 +201,11 @@ class TorrentProps(StandardWindow):
 scroller.show()
 
 
-class TorrentFiles(StandardWindow):
-def __init__(self, h):
-StandardWindow.__init__(
+class TorrentFiles(DialogWindow):
+def __init__(self, parent_win, h):
+DialogWindow.__init__(
 self,
+parent_win,
 "epour",
 _("Epour - Files for torrent: %s") % (h.name()),
 size=(SCALE * 480, SCALE * 320),
@@ -402,7 +403,7 @@ class TorrentInfo(Box):
 
 fl_btn = Button(self, size_hint_align=ALIGN_LEFT)
 fl_btn.text = "Files ->"
-fl_btn.callback_clicked_add(lambda x: TorrentFiles(h))
+fl_btn.callback_clicked_add(lambda x: TorrentFiles(self.top_widget, h))
 
 self.pack_end(table)
 self.pack_end(tpriv)
diff --git a/epour/gui/TorrentSelector.py b/epour/gui/TorrentSelector.py
index 59c1dab..c55c3bf 100644
--- a/epour/gui/TorrentSelector.py
+++ b/epour/gui/TorrentSelector.py
@@ -26,8 +26,7 @@ from libtorrent import add_torrent_params_flags_t
 
 from efl.evas import EVAS_HINT_EXPAND, EVAS_HINT_FILL
 from efl import elementary as elm
-from efl.elementary import StandardWindow, Window, ELM_WIN_DIALOG_BASIC
-from efl.elementary import Background
+from efl.elementary import DialogWindow
 from efl.elementary import Button
 from efl.elementary import Box
 from efl.elementary import Frame
@@ -55,7 +54,7 @@ scale = elm_conf.scale
 log = logging.getLogger("epour.gui")
 
 
-class TorrentSelector(StandardWindow):
+class TorrentSelector(DialogWindow):
 
 names = {
 1: _("Seed Mode"),
@@ -138,8 +137,8 @@ seed, this flag has no effect.'''
 }
 
 def __init__(self, parent, session, t_uri=None):
-StandardWindow.__init__(
-self, "addtorrent", _("Add Torrent"),
+DialogWindow.__init__(
+self, parent, "addtorrent", _("Add Torrent"),
 size=(scale * 400, scale * 400), autodel=True
 )
 
@@ -336,18 +335,14 @@ class FsEntry(Fileselector, FileselectorEntry):
 FileselectorEntry.__init__(self, parent, **kwargs)
 
 
-class TorrentFs(Window):
+class TorrentFs(DialogWindow):
 
 def __init__(self, parent, uri_entry):
 
 super(TorrentFs, self).__init__(
-"torrentselect", ELM_WIN_DIALOG_BASIC, parent, size=(500, 500),
+parent, "torrentselect", "Select Torrent", size=(500, 500),
 autodel=True)
 
-bg = Background(self, size_hint_weight=EXPAND_BOTH)
-self.resize_object_add(bg)
-bg.show()
-
 fs = Fileselector(
 self, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH,
 expandable=False, is_save=False, path=os.path.expanduser("~")
diff --git a/epour/gui/__init__.py b/epour/gui/__init__.py
index 277d776..2293f3b 100644
--- 

[EGIT] [apps/ephoto] master 01/01: Ephoto: Filter processing popup should use the win as parent and block clicking other filters while the current one is still processing.

[Stephen okra Houston]

okra pushed a commit to branch master.

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

commit 950f16af06391bdae6bd39683d2e975920232115
Author: Stephen okra Houston 
Date:   Tue Aug 30 09:31:40 2016 -0500

Ephoto: Filter processing popup should use the win as parent and block 
clicking other filters while the current one is still processing.
---
 src/bin/ephoto.h| 24 ++--
 src/bin/ephoto_filters.c| 87 +
 src/bin/ephoto_single_browser.c | 24 ++--
 3 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index f4795e2..b8e3488 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -146,18 +146,18 @@ void ephoto_red_eye_add(Ephoto *ephoto, Evas_Object 
*main, Evas_Object *parent,
 Evas_Object *image);
 void ephoto_scale_add(Ephoto *ephoto, Evas_Object *main, Evas_Object *parent,
 Evas_Object *image, const char *file);
-void ephoto_filter_blur(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_sharpen(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_dither(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_black_and_white(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_old_photo(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_painting(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_posterize(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_sketch(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_invert(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_edge(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_emboss(Evas_Object *main, Evas_Object *image);
-void ephoto_filter_histogram_eq(Evas_Object *main, Evas_Object *image);
+void ephoto_filter_blur(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_sharpen(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_dither(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_black_and_white(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_old_photo(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_painting(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_posterize(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_sketch(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_invert(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_edge(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_emboss(Ephoto *ephoto, Evas_Object *image);
+void ephoto_filter_histogram_eq(Ephoto *ephoto, Evas_Object *image);
 
 /*file functions*/
 void ephoto_file_save_image(Ephoto *ephoto, Ephoto_Entry *entry, 
diff --git a/src/bin/ephoto_filters.c b/src/bin/ephoto_filters.c
index 982b6a1..1ebe90d 100644
--- a/src/bin/ephoto_filters.c
+++ b/src/bin/ephoto_filters.c
@@ -22,7 +22,7 @@ enum _Ephoto_Image_Filter
 struct _Ephoto_Filter
 {
Ephoto_Image_Filter filter;
-   Evas_Object *main;
+   Ephoto *ephoto;
Evas_Object *image;
Evas_Object *popup;
Ecore_Thread *thread;;
@@ -56,7 +56,7 @@ static void _histogram_eq(void *data, Ecore_Thread *th 
EINA_UNUSED);
 
 static Ephoto_Filter *
 _initialize_filter(Ephoto_Image_Filter filter,
-Evas_Object *main, Evas_Object *image)
+Ephoto *ephoto, Evas_Object *image)
 {
Ephoto_Filter *ef = calloc(1, sizeof(Ephoto_Filter));
Evas_Coord w, h;
@@ -67,7 +67,7 @@ _initialize_filter(Ephoto_Image_Filter filter,
evas_object_image_size_get(image, , );
 
ef->filter = filter;
-   ef->main = main;
+   ef->ephoto = ephoto;
ef->image = image;
ef->im_data = malloc(sizeof(unsigned int) * w * h);
ef->im_data = memcpy(ef->im_data, im_data, sizeof(unsigned int) * w * h);
@@ -159,6 +159,7 @@ _processing(Evas_Object *main)
 
elm_object_part_content_set(popup, "default", box);
evas_object_show(popup);
+
return popup;
 }
 
@@ -168,8 +169,8 @@ _thread_finished_cb(void *data, Ecore_Thread *th 
EINA_UNUSED)
Ephoto_Filter *ef = data;
if (ef->qcount == 0)
  {
-ephoto_single_browser_image_data_done(ef->main, ef->im_data_new,
-ef->w, ef->h);
+ephoto_single_browser_image_data_done(ef->ephoto->single_browser,
+ef->im_data_new, ef->w, ef->h);
 if (ef->popup)
   {
  evas_object_del(ef->popup);
@@ -218,8 +219,8 @@ _thread_finished_cb(void *data, Ecore_Thread *th 
EINA_UNUSED)
   }
 else
   {
- ephoto_single_browser_image_data_done(ef->main, ef->im_data_new,
- ef->w, ef->h);
+ ephoto_single_browser_image_data_done(ef->ephoto->single_browser,
+ ef->im_data_new, ef->w, ef->h);
  if (ef->popup)
{
   evas_object_del(ef->popup);
@@ -1068,22 +1069,22 @@ _histogram_eq(void *data, Ecore_Thread *th EINA_UNUSED)
 }
 
 void
-ephoto_filter_blur(Evas_Object *main, Evas_Object 

[EGIT] [admin/devs] master 01/01: q66: update info, remove office rsa key

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=6b27545c34574e9ba5c02f339322dcaa1f37cd79

commit 6b27545c34574e9ba5c02f339322dcaa1f37cd79
Author: Daniel Kolesa 
Date:   Tue Aug 30 15:19:04 2016 +0100

q66: update info, remove office rsa key
---
 developers/q66/id_rsa_work.pub |  1 -
 developers/q66/info.txt| 10 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/developers/q66/id_rsa_work.pub b/developers/q66/id_rsa_work.pub
deleted file mode 100644
index 171cb7b..000
--- a/developers/q66/id_rsa_work.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC9Cv+pP7WmkgzhcDGqHzi3/Iz9KCr9Hic+516Nu6ZMLvn5P92U7M5QddLA07EPqoukhHzJVMlg7sEUcP3l3nctSPpc4AtwbP4kPri9NrjYqhn2MfG5cwoehH7C79wK3PBHC01sUR9vjphmwDUEpS8IbxUCwBDrDp7/gD6/uIRPIcNxNLHDmfWTEkwEDZFm4+yZ70r6veyiYXSq5nN56VE96IpLbkmBtdR4eIPyLUheE+8LmY1amskO8YLFBzqNmuY40QYXM7sDRXYaT7FP3BUBAC3aGWuY6eXlnbRghI6iE1uG+aAx1vblpkoEJtseBr51sVmiSTQYaS95Xu2io9Bd
 d.kol...@samsung.com
diff --git a/developers/q66/info.txt b/developers/q66/info.txt
index 4078cef..cde6fc1 100644
--- a/developers/q66/info.txt
+++ b/developers/q66/info.txt
@@ -1,13 +1,11 @@
 Login:q66
 IRC Nick: q66
 Cloak:developer/q66
-Jabber:   qua...@jabbim.cz
-GTalk:quake...@gmail.com
+GTalk:dan...@octaforge.org
 Name: Daniel Kolesa
-Location: Staines, United Kingdom
-E-Mail:   dan...@octaforge.org, d.kol...@samsung.com
+Location: Brno, Czech Republic
+E-Mail:   dan...@octaforge.org, dan...@q66.moe, d.kol...@osg.samsung.com, 
d.kol...@samsung.com
 Managing: eolian, elua, enity
 Contributing: efl, elementary, enlightenment, emodules, czech l10n
 Group:Libraries
-Platform: Debian (Linux), FreeBSD
-GeoData:  51.420794 -0.506058
+Platform: FreeBSD, Void Linux

-- 

[EGIT] [core/efl] master 01/01: Edje edit: allocate memory for mempools.

[Mykyta Biliavskyi]

nikawhite pushed a commit to branch master.

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

commit b6e2b8601df25086bfbee14b5b478d357209ec88
Author: Mykyta Biliavskyi 
Date:   Tue Aug 30 16:57:33 2016 +0300

Edje edit: allocate memory for mempools.

Just added allocations that missed in "edje - reduce another 400k or so
of memory usage (esp hello world)" commit.
---
 src/lib/edje/edje_edit.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index f13a1f3..8784864 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -1599,6 +1599,9 @@ edje_edit_sound_samplesource_get(Evas_Object *obj, const 
char *sample_name)
 static void
 _mempools_add(Edje_Part_Collection_Directory_Entry *de)
 {
+   de->mp = calloc(1, sizeof(Edje_Part_Collection_Directory_Entry_Mp));
+   if (!de->mp)
+ return;
 #define EDIT_EMN(Tp, Sz, Ce) \
   Ce->mp->mp.Tp = eina_mempool_add("chained_mempool", #Tp, NULL, sizeof (Sz), 
8);
 #define EDIT_EMNP(Tp, Sz, Ce) \

-- 

Re: [E-devel] [RFC] Efl.Net.Dialer.Websocket

[Gustavo Sverzut Barbieri]

On Tue, Aug 30, 2016 at 10:00 AM, Raoul Hecky  wrote:
>>
>> Nice! Would you also try to do some tests or rewrite some part of your
>> existing code to use my proposed API?
>>
> Not really. The code is written in C++ in calaos and all is working
> smoothly, so rewriting
> is not something we want to do right now... And your implementation is only
> for
> client, not server.

I see... well, the WebSocket's primitives aren't that many, I suppose
you're code is mostly focused on text of binary messages, so it's one
method and one event.  Some #ifdef would do?

I know the feeling of "not willing to touch something that it's
working", but if you want to help... :-)



>> Also: do you use some plublic web service? Which one? I may add another
>> example and using something more real than a echo server would be nice.
>>
> Except for the echo public server, not really.

hum... ok, so you use calaos as both server and client in this scope?
Is this expected to go over the internet or just local networking...
IOW: why did you pick WebSocket?


-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [RFC] Efl.Net.Dialer.Websocket

[Raoul Hecky]

>
> Nice! Would you also try to do some tests or rewrite some part of your
> existing code to use my proposed API?
>
Not really. The code is written in C++ in calaos and all is working
smoothly, so rewriting
is not something we want to do right now... And your implementation is only
for
client, not server.


>
> Also: do you use some plublic web service? Which one? I may add another
> example and using something more real than a echo server would be nice.
>
Except for the echo public server, not really.


> One thing that I heavily used to validate my implementation was to use the
> > Autobahn Websocket Testsuite project. It runs hundreds of test on your
> > client or server implementation and gives you nice results and message on
> > what is not working as expected.
> >
> > Link:
> > http://autobahn.ws/testsuite/
>
>
> Nice to know its a good test suite. It was mentioned in the nodejs
> framework I used to test, but I was doing only manual tests using that. Now
> that it works, must do some extensive testing.
>
>
> --
> Gustavo Sverzut Barbieri
> --
> Mobile: +55 (16) 99354-9890
> 
> --
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 01/01: Evas engine drm: Fix style (and thus compilation warning).

[Tom Hacohen]

tasn pushed a commit to branch master.

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

commit 45707a7bb600c921a8d08e5943e65954ce44b26c
Author: Tom Hacohen 
Date:   Tue Aug 30 13:39:37 2016 +0100

Evas engine drm: Fix style (and thus compilation warning).

Double parenthesis in ifs, such as "if ((x = 5))" should only be used
iff using assignment inside of conditions (like the example above). This
explicitly conveys the intention to both the compiler and other
programmers and essentially eliminates the class of bugs that result
from accidental assignment when a comparison was intended and vise-versa
in conditions.
---
 src/modules/evas/engines/drm/evas_outbuf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/evas/engines/drm/evas_outbuf.c 
b/src/modules/evas/engines/drm/evas_outbuf.c
index 3ab2a54..e26fea7 100644
--- a/src/modules/evas/engines/drm/evas_outbuf.c
+++ b/src/modules/evas/engines/drm/evas_outbuf.c
@@ -445,7 +445,7 @@ _outbuf_update_region_new(Outbuf *ob, int x, int y, int w, 
int h, int *cx, int *
 
RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, ob->w, ob->h);
 
-   if ((ob->rotation == 0))// && (ob->depth == 32))
+   if (ob->rotation == 0) // && (ob->depth == 32))
  {
 Eina_Rectangle *rect;
 

-- 

[EGIT] [core/efl] master 01/01: Edje cc: Rename and move around shadowing variable.

[Tom Hacohen]

tasn pushed a commit to branch master.

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

commit 1198dd4efb4307599fd31a4479e6a18c61c13d6b
Author: Tom Hacohen 
Date:   Tue Aug 30 13:36:41 2016 +0100

Edje cc: Rename and move around shadowing variable.
---
 src/bin/edje/edje_cc_handlers.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 9bcfa4f..18697ee 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -4646,7 +4646,7 @@ st_collections_group_inherit(void)
 
if (pc2->alias)
  {
-char *key, *alias;
+char *key;
 
 memset(, 0, sizeof(Edje_List_Foreach_Data));
 eina_hash_foreach(pc2->alias,
@@ -4654,8 +4654,9 @@ st_collections_group_inherit(void)
 if (!pc->alias) pc->alias = eina_hash_string_small_new(free);
 EINA_LIST_FREE(fdata.list, key)
   {
- alias = eina_hash_find(pc2->alias, key);
- eina_hash_direct_add(pc->alias, key, alias);
+ char *tmp;
+ tmp = eina_hash_find(pc2->alias, key);
+ eina_hash_direct_add(pc->alias, key, tmp);
   }
  }
if (pc2->aliased)

-- 

Re: [E-devel] [EGIT] [core/efl] master 01/01: efreet - fix mime file path messing with short paths like /

[Tom Hacohen]

Has this been reverted already? (The unrelated changes)

Or should I do it?

On 27/08/16 01:48, Carsten Haitzler (The Rasterman) wrote:
> On Fri, 26 Aug 2016 14:15:46 + Mike Blumenkrantz
>  said:
>
>> I just noticed this while doing some bisecting...was it intentional that
>> you included undocumented evas engine changes in your efreet commit?
>
> wtf? i... what? i haven't even opened evas_gl_cocoa_main.m in like... months 
> and
> months - i think i edited then once before 1.18 release to fix a bug... wtf?
> how? i didn't touch these! i haven't been looking at anything in evas engines
> for a while... certainly not int he last week or 2.
>
> WTH?
>
>> On Tue, Jul 5, 2016 at 3:29 AM Carsten Haitzler 
>> wrote:
>>
>>> raster pushed a commit to branch master.
>>>
>>>
>>> http://git.enlightenment.org/core/efl.git/commit/?id=2ca5075193e27dbc30f26e478019719a5360cc84
>>>
>>> commit 2ca5075193e27dbc30f26e478019719a5360cc84
>>> Author: Carsten Haitzler (Rasterman) 
>>> Date:   Tue Jul 5 15:56:43 2016 +0900
>>>
>>> efreet - fix mime file path messing with short paths like /
>>>
>>> this fixes T4015
>>>
>>> @fix
>>> ---
>>>  src/lib/efreet/efreet_mime.c   | 7 +--
>>>  src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m | 1 +
>>>  src/modules/evas/engines/gl_x11/evas_x_main.c  | 2 ++
>>>  src/modules/evas/engines/wayland_egl/evas_wl_main.c| 1 +
>>>  4 files changed, 9 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
>>> index adfa790..87ca8ef 100644
>>> --- a/src/lib/efreet/efreet_mime.c
>>> +++ b/src/lib/efreet/efreet_mime.c
>>> @@ -711,10 +711,13 @@ efreet_mime_special_check(const char *file)
>>> parent[PATH_MAX - 1] = '\0';
>>>
>>> /* Kill any trailing slash */
>>> -   parent[--path_len] = '\0';
>>> +   if (parent[path_len - 1] == '/')
>>> + parent[--path_len] = '\0';
>>>
>>> /* Truncate to last slash */
>>> -   while (parent[--path_len] != '/') parent[path_len] = '\0';
>>> +   while ((path_len > 0) &&
>>> +  (parent[--path_len] != '/'))
>>> + parent[path_len] = '\0';
>>>
>>>  #ifdef _WIN32
>>> if (!stat(file, ))
>>> diff --git a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
>>> b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
>>> index 15dc218..7df919f 100644
>>> --- a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
>>> +++ b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
>>> @@ -120,6 +120,7 @@ eng_window_free(Evas_GL_Cocoa_Window *gw)
>>>  void
>>>  eng_window_use(Evas_GL_Cocoa_Window *gw)
>>>  {
>>> +   if ((gw) && (!gw->gl_context)) return;
>>> if (_evas_gl_cocoa_window != gw)
>>>   {
>>>  [[(NSOpenGLView*)gw->view openGLContext] makeCurrentContext];
>>> diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
>>> b/src/modules/evas/engines/gl_x11/evas_x_main.c
>>> index 59361e1..f5e2edf 100644
>>> --- a/src/modules/evas/engines/gl_x11/evas_x_main.c
>>> +++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
>>> @@ -676,6 +676,8 @@ eng_window_use(Outbuf *gw)
>>> xwin = _tls_outbuf_get();
>>>
>>> glsym_evas_gl_preload_render_lock(eng_window_make_current, gw);
>>> +   if ((gw) && (!gw->gl_context)) return;
>>> +
>>>  #ifdef GL_GLES
>>> if (xwin)
>>>   {
>>> diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
>>> b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
>>> index 489a475..14e13ff 100644
>>> --- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
>>> +++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
>>> @@ -233,6 +233,7 @@ eng_window_use(Outbuf *gw)
>>> Eina_Bool force = EINA_FALSE;
>>>
>>> glsym_evas_gl_preload_render_lock(eng_preload_make_current, gw);
>>> +   if ((gw) && (!gw->gl_context)) return;
>>>
>>> if (_evas_gl_wl_window)
>>>   {
>>>
>>> --
>>>
>>>
>>>
>> --
>> ___
>> enlightenment-devel mailing list
>> enlightenment-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>>
>
>


--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [RFC] Efl.Net.Dialer.Websocket

[Gustavo Sverzut Barbieri]

Hi Raoul!

Em terça-feira, 30 de agosto de 2016, Raoul Hecky 
escreveu:

> Hi Gustavo,
>
> As I implemented websocket (server+client) in calaos on top of ecore_con, I
> know some things about websocket ;)


Nice! Would you also try to do some tests or rewrite some part of your
existing code to use my proposed API?

Also: do you use some plublic web service? Which one? I may add another
example and using something more real than a echo server would be nice.


One thing that I heavily used to validate my implementation was to use the
> Autobahn Websocket Testsuite project. It runs hundreds of test on your
> client or server implementation and gives you nice results and message on
> what is not working as expected.
>
> Link:
> http://autobahn.ws/testsuite/


Nice to know its a good test suite. It was mentioned in the nodejs
framework I used to test, but I was doing only manual tests using that. Now
that it works, must do some extensive testing.


-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 01/01: ecore_con: Add missing socket.h

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit ba80f7e5b027eebcfcbcb2b9758c2047383ec9ca
Author: Jean-Philippe Andre 
Date:   Tue Aug 30 20:52:02 2016 +0900

ecore_con: Add missing socket.h

Reported and patched by @netstar

Fixes T4461
---
 src/lib/ecore_con/ecore_con_url_curl.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/ecore_con/ecore_con_url_curl.h 
b/src/lib/ecore_con/ecore_con_url_curl.h
index 98d4a1e..cff6a73 100644
--- a/src/lib/ecore_con/ecore_con_url_curl.h
+++ b/src/lib/ecore_con/ecore_con_url_curl.h
@@ -8,6 +8,7 @@
  */
 #include 
 #else
+#include 
 
 // all the types, defines, enums etc. from curl that we actually USE.
 // we have to add to this if we use more things from curl not already

-- 

Re: [E-devel] Apache OpenOffice 4.1.2 locks in Enlightenment 0.21.99.21605

[Jose R R]

Thanks for replying.

On Sun, Aug 28, 2016 at 11:27 PM, Carsten Haitzler  wrote:
> On Sat, 27 Aug 2016 03:42:52 -0700 Jose R R  said:
>
>> Niltze [Hello], all!
>>
>> I've noticed that Enlightenment 0.17.x.y and 0.21.x.y GUI environment
>> sometimes becomes locked upon mousing over icons in Apache OpenOffice 4.1.2.
>>
>> Notwithstanding, when I built Enlightenment 0.19.x.y and 0.20.xy, the
>> locking issue disappeared and I thought it was resolved; but then issue
>> reappeared once more in Enlightenment 0.21.x.y. I have to CTRL + ALT and
>> press F1, F2, etc. to get another shell, login and restart XDM.
>>
>> Any feedback would be greatly appreciated.
>
> is e stuck - has it crashed? do you get a crashdump?
E21 must be 'stuck' -- as I can't locate a 'crashdump'.

Please see pic at:
< 
https://metztli.it/blog/media/blogs/ixiptli/quick-uploads/p125/e21_apacheoo_issue.png?mtime=1472553272
>
>
> https://www.enlightenment.org/docs-efl-debug
I will try this as time avails. Thank you.
>
> you can also find if it isnt crashing by forcing a segv and seeing where the 
> bt
> says it was stuck:
>
> killall -SEGV enlightenment
I have executed above directive and Recovery option seems useful -- as
I don't have to restart XDM, thus potentially preserving existing
sessions and/or data/work; again, please snapshot above and if
interested for context, post entry:
< 
https://metztli.it/blog/index.php/ixiptli/eterm-and-enlightenment-window-manager
>

>
> --
> - Codito, ergo sum - "I code, therefore I am" --
> The Rasterman (Carsten Haitzler)ras...@rasterman.com
>


Best Professional Regards.

-- 
Jose R R
http://metztli.it
-
Try at no charge http://b2evolution.net for http://OpenShift.com PaaS
-
from our GitHub http://Nepohualtzintzin.com repository. Cloud the easy way!

--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [tools/eflete] eflete-1.18 02/02: Revert "fix build"

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch eflete-1.18.

http://git.enlightenment.org/tools/eflete.git/commit/?id=c88ea781212e8b5f3dc1d006fb214a25e4f4ab87

commit c88ea781212e8b5f3dc1d006fb214a25e4f4ab87
Author: Vyacheslav Reutskiy 
Date:   Tue Aug 30 11:47:30 2016 +0300

Revert "fix build"

This reverts commit 5e270bf6301dee66bde709ee3b72a92b1422e9af.
---
 src/bin/common/validator.c |  2 +-
 src/bin/ui/colorclass_manager.c|  2 +-
 src/bin/ui/project_navigator.c |  2 +-
 src/bin/ui/property/property_group.c   |  4 ++--
 src/bin/ui/sound_manager.c |  4 ++--
 src/bin/ui/sound_player/sound_player.c | 28 ++--
 src/bin/ui/style_manager.c |  4 ++--
 src/bin/ui/tab_home_import_edc.c   |  2 +-
 src/bin/ui/tab_home_import_edj.c   |  2 +-
 src/bin/ui/tab_home_new.c  |  2 +-
 src/bin/ui/workspace/group_navigator.c | 10 +-
 src/lib/ewe_ruler.c| 20 +++-
 src/lib/ewe_ruler.eo   |  2 +-
 13 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index eae52b9..0b95702 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -112,5 +112,5 @@ resource_name_validator_helper(void *data, const Eo_Event 
*event)
  }
vc->signal = validator->signal;
if (validator->status)
- efl_event_callback_stop(event->object);
+ eo_event_callback_stop(event->object);
 }
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index ac0721b..55bf7fd 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -82,7 +82,7 @@ _add_colorclass_content_get(void *data __UNUSED__, 
Evas_Object **to_focus)
 
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
ENTRY_ADD(item, mng.entry, true);
-   efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
+   eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name 
here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 71a97c3..2ae3320 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -400,7 +400,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate, 
NULL);
-   efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
+   eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c 
b/src/bin/ui/property/property_group.c
index 77554bd..b72c62f 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -792,10 +792,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
  elm_object_disabled_set(action->control, true);
  break;
   case ATTRIBUTE_PART_NAME:
- efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
+ eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
  break;
   case ATTRIBUTE_GROUP_DATA_NAME:
- efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.group_data_name_validator);
+ eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.group_data_name_validator);
  break;
   case ATTRIBUTE_STATE_IMAGE:
   case ATTRIBUTE_GROUP_DATA_VALUE:
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index 006ac1f..e46c79a 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -361,7 +361,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
elm_box_padding_set(box, 0, 10);
LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow")
ENTRY_ADD(item, mng.tone_entry, true);
-   efl_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.tone_validator);
+   eo_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, 

[EGIT] [tools/eflete] eflete-1.18 01/02: Revert "update according the change in efl about eo naming."

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch eflete-1.18.

http://git.enlightenment.org/tools/eflete.git/commit/?id=5c8f105afb444706b94338253776ba7fe4b04307

commit 5c8f105afb444706b94338253776ba7fe4b04307
Author: Vyacheslav Reutskiy 
Date:   Tue Aug 30 11:47:15 2016 +0300

Revert "update according the change in efl about eo naming."

This reverts commit d1ce5fa0e2f46fe54d9bbd200289f0341192707e.
---
 src/bin/ui/editors/animator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index 7670126..26fd9a5 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -364,7 +364,7 @@ _on_bt_prog_add(void *data,
animator->popup.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL);
LAYOUT_PROP_ADD(animator->popup.popup, _("Frequency:"), "property", 
"1swallow")
ENTRY_ADD(item, animator->popup.entry, true)
-   efl_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
+   eo_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
evas_object_smart_callback_add(animator->popup.entry, "changed", 
_validation, animator);
elm_object_part_content_set(item, "elm.swallow.content", 
animator->popup.entry);
 

-- 

Re: [E-devel] [RFC] Efl.Net.Dialer.Websocket

[Raoul Hecky]

Hi Gustavo,

As I implemented websocket (server+client) in calaos on top of ecore_con, I
know some things about websocket ;)

One thing that I heavily used to validate my implementation was to use the
Autobahn Websocket Testsuite project. It runs hundreds of test on your
client or server implementation and gives you nice results and message on
what is not working as expected.

Link:
http://autobahn.ws/testsuite/

Cheers!


--
Raoul Hecky

2016-08-30 6:04 GMT+02:00 Gustavo Sverzut Barbieri :

> Hi all,
>
> I'm taking over the work started at
> https://phab.enlightenment.org/D2985, please take a look at my last
> comment https://phab.enlightenment.org/D2985#71145 for more details.
>
> The branch is https://git.enlightenment.org/core/efl.git/log/?h=devs/
> barbieri/websocket
> there you can see two examples of the API usage.
>
> If you're not familiar with WebSocket, it's a bi-directional
> message-based (NOT streaming!) protocol on top of HTTP, starts with a
> GET request and requests a connection upgrade, then can use proxies,
> TLS/SSL and authentication. It's used to avoid polling web-servers
> with new HTTP requests for data, such as Stock Tickers, WebEditors and
> so on. Compared to an older solution SSE (Server-Side Events), it
> offers more efficient message framing and bi-directional
> communication.
>
> My branch builds on top of Efl.Net.Dialer.Http (our new HTTP client
> based on CURL) and exposes a new API for the message-based primitives
> of WebSockets. However, to play nice with other Efl.Io.Reader and
> Efl.Io.Writer users, such as Efl.Io.Copier, you can ask
> Efl.Net.Dialer.Websocket to operate in streaming mode, picking one of
> Text or Binary messages as your channel. Then the traditional
> "can_read"/"read()", "can_write"/"write()" will work.
>
> Play with them and let me know what you think. In the phab comment you
> can see how to create a nodejs websocket server to make your testing
> simpler.
>
> What do you think about this API?
>
> --
> Gustavo Sverzut Barbieri
> --
> Mobile: +55 (16) 99354-9890
>
> 
> --
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [tools/eflete] master 01/01: Revert "Revert "update according the change in efl about eo naming.""

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=2b88ed85997457dc3c44080365badca61211bf6b

commit 2b88ed85997457dc3c44080365badca61211bf6b
Author: Vyacheslav Reutskiy 
Date:   Tue Aug 30 10:18:15 2016 +0300

Revert "Revert "update according the change in efl about eo naming.""

Oh, sorry, this revert it was mistake, build was fixed in commit
5e270bf6301dee66bde709ee3b72a92b1422e9af

This reverts commit 7f163ec9e7a4efbdb65c0816a8d7e77f7991ff8b.
---
 src/bin/common/validator.c |  2 +-
 src/bin/ui/colorclass_manager.c|  2 +-
 src/bin/ui/editors/animator.c  |  2 +-
 src/bin/ui/project_navigator.c |  2 +-
 src/bin/ui/property/property_group.c   |  4 ++--
 src/bin/ui/sound_manager.c |  4 ++--
 src/bin/ui/sound_player/sound_player.c | 28 ++--
 src/bin/ui/style_manager.c |  4 ++--
 src/bin/ui/tab_home_import_edc.c   |  2 +-
 src/bin/ui/tab_home_import_edj.c   |  2 +-
 src/bin/ui/tab_home_new.c  |  2 +-
 src/bin/ui/workspace/group_navigator.c | 10 +-
 src/lib/ewe_ruler.c| 18 +-
 src/lib/ewe_ruler.eo   |  2 +-
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index 0b95702..eae52b9 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -112,5 +112,5 @@ resource_name_validator_helper(void *data, const Eo_Event 
*event)
  }
vc->signal = validator->signal;
if (validator->status)
- eo_event_callback_stop(event->object);
+ efl_event_callback_stop(event->object);
 }
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 55bf7fd..ac0721b 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -82,7 +82,7 @@ _add_colorclass_content_get(void *data __UNUSED__, 
Evas_Object **to_focus)
 
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
ENTRY_ADD(item, mng.entry, true);
-   eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
+   efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name 
here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index 26fd9a5..7670126 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -364,7 +364,7 @@ _on_bt_prog_add(void *data,
animator->popup.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL);
LAYOUT_PROP_ADD(animator->popup.popup, _("Frequency:"), "property", 
"1swallow")
ENTRY_ADD(item, animator->popup.entry, true)
-   eo_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
+   efl_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
evas_object_smart_callback_add(animator->popup.entry, "changed", 
_validation, animator);
elm_object_part_content_set(item, "elm.swallow.content", 
animator->popup.entry);
 
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 2ae3320..71a97c3 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -400,7 +400,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate, 
NULL);
-   eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
+   efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c 
b/src/bin/ui/property/property_group.c
index b72c62f..77554bd 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -792,10 +792,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
  elm_object_disabled_set(action->control, true);
  break;
   case ATTRIBUTE_PART_NAME:
- eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
+ efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 

[EGIT] [tools/eflete] master 02/04: UTC: fix build

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=c9a8192eec61a03d652f3dc330487aebdc1bcaae

commit c9a8192eec61a03d652f3dc330487aebdc1bcaae
Author: Andrii Kroitor 
Date:   Tue Aug 30 10:00:14 2016 +0300

UTC: fix build
---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a335da9..6adecef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,6 +25,7 @@ FLAGS = \
 -I${top_srcdir}/src/bin/editor \
 -I${top_srcdir}/src/bin/logger \
 -I${top_srcdir}/src/bin/loop_manager \
+-I${top_srcdir}/src/bin/project_manager \
 -I${top_srcdir}/src/bin/config \
 -I${top_srcdir}/src/bin/history \
 -I${top_srcdir}/src/bin/ui \

-- 

[EGIT] [tools/eflete] master 04/04: Revert "update according the change in efl about eo naming."

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=7f163ec9e7a4efbdb65c0816a8d7e77f7991ff8b

commit 7f163ec9e7a4efbdb65c0816a8d7e77f7991ff8b
Author: Vyacheslav Reutskiy 
Date:   Thu Aug 18 15:16:26 2016 +0300

Revert "update according the change in efl about eo naming."

This reverts commit 4f52979de219a77ccc2a07fcf273c1e19819e73e.

Oh, no. Update namespace after release. Eflete 0.7.0 will be released
on efl-1.18
---
 src/bin/common/validator.c |  2 +-
 src/bin/ui/colorclass_manager.c|  2 +-
 src/bin/ui/editors/animator.c  |  2 +-
 src/bin/ui/project_navigator.c |  2 +-
 src/bin/ui/property/property_group.c   |  4 ++--
 src/bin/ui/sound_manager.c |  4 ++--
 src/bin/ui/sound_player/sound_player.c | 28 ++--
 src/bin/ui/style_manager.c |  4 ++--
 src/bin/ui/tab_home_import_edc.c   |  2 +-
 src/bin/ui/tab_home_import_edj.c   |  2 +-
 src/bin/ui/tab_home_new.c  |  2 +-
 src/bin/ui/workspace/group_navigator.c | 10 +-
 src/lib/ewe_ruler.c| 18 +-
 src/lib/ewe_ruler.eo   |  2 +-
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index eae52b9..0b95702 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -112,5 +112,5 @@ resource_name_validator_helper(void *data, const Eo_Event 
*event)
  }
vc->signal = validator->signal;
if (validator->status)
- efl_event_callback_stop(event->object);
+ eo_event_callback_stop(event->object);
 }
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index ac0721b..55bf7fd 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -82,7 +82,7 @@ _add_colorclass_content_get(void *data __UNUSED__, 
Evas_Object **to_focus)
 
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
ENTRY_ADD(item, mng.entry, true);
-   efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
+   eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name 
here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index 7670126..26fd9a5 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -364,7 +364,7 @@ _on_bt_prog_add(void *data,
animator->popup.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL);
LAYOUT_PROP_ADD(animator->popup.popup, _("Frequency:"), "property", 
"1swallow")
ENTRY_ADD(item, animator->popup.entry, true)
-   efl_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
+   eo_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
evas_object_smart_callback_add(animator->popup.entry, "changed", 
_validation, animator);
elm_object_part_content_set(item, "elm.swallow.content", 
animator->popup.entry);
 
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 71a97c3..2ae3320 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -400,7 +400,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate, 
NULL);
-   efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
+   eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c 
b/src/bin/ui/property/property_group.c
index 77554bd..b72c62f 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -792,10 +792,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
  elm_object_disabled_set(action->control, true);
  break;
   case ATTRIBUTE_PART_NAME:
- efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
+ eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, 

[EGIT] [tools/eflete] master 01/04: fix build

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=5e270bf6301dee66bde709ee3b72a92b1422e9af

commit 5e270bf6301dee66bde709ee3b72a92b1422e9af
Author: Andrii Kroitor 
Date:   Mon Aug 15 13:12:53 2016 +0300

fix build

Follow the white rabbit.
---
 src/bin/common/validator.c |  2 +-
 src/bin/ui/colorclass_manager.c|  2 +-
 src/bin/ui/project_navigator.c |  2 +-
 src/bin/ui/property/property_group.c   |  4 ++--
 src/bin/ui/sound_manager.c |  4 ++--
 src/bin/ui/sound_player/sound_player.c | 28 ++--
 src/bin/ui/style_manager.c |  4 ++--
 src/bin/ui/tab_home_import_edc.c   |  2 +-
 src/bin/ui/tab_home_import_edj.c   |  2 +-
 src/bin/ui/tab_home_new.c  |  2 +-
 src/bin/ui/workspace/group_navigator.c | 10 +-
 src/lib/ewe_ruler.c| 20 +---
 src/lib/ewe_ruler.eo   |  2 +-
 13 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index 0b95702..eae52b9 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -112,5 +112,5 @@ resource_name_validator_helper(void *data, const Eo_Event 
*event)
  }
vc->signal = validator->signal;
if (validator->status)
- eo_event_callback_stop(event->object);
+ efl_event_callback_stop(event->object);
 }
diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 55bf7fd..ac0721b 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -82,7 +82,7 @@ _add_colorclass_content_get(void *data __UNUSED__, 
Evas_Object **to_focus)
 
LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
ENTRY_ADD(item, mng.entry, true);
-   eo_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
+   efl_event_callback_add(mng.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.name_validator);
evas_object_smart_callback_add(mng.entry, "changed", _validation, NULL);
elm_object_part_text_set(mng.entry, "guide", _("Type new color class name 
here"));
elm_object_part_content_set(item, "elm.swallow.content", mng.entry);
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 2ae3320..71a97c3 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -400,7 +400,7 @@ _add_group_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
LAYOUT_PROP_ADD(layout_p.box, _("Name"), "popup", "1swallow")
ENTRY_ADD(layout_p.box, layout_p.entry, true)
evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate, 
NULL);
-   eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
+   efl_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property/property_group.c 
b/src/bin/ui/property/property_group.c
index b72c62f..77554bd 100644
--- a/src/bin/ui/property/property_group.c
+++ b/src/bin/ui/property/property_group.c
@@ -792,10 +792,10 @@ _init_cb(Property_Attribute *pa, Property_Action *action)
  elm_object_disabled_set(action->control, true);
  break;
   case ATTRIBUTE_PART_NAME:
- eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
+ efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.part_name_validator);
  break;
   case ATTRIBUTE_GROUP_DATA_NAME:
- eo_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.group_data_name_validator);
+ efl_event_callback_add(action->control, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, group_pd.group_data_name_validator);
  break;
   case ATTRIBUTE_STATE_IMAGE:
   case ATTRIBUTE_GROUP_DATA_VALUE:
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index e46c79a..006ac1f 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -361,7 +361,7 @@ _add_tone_content_get(void *data __UNUSED__, Evas_Object 
**to_focus)
elm_box_padding_set(box, 0, 10);
LAYOUT_PROP_ADD(box, _("Tone name:"), "popup", "1swallow")
ENTRY_ADD(item, mng.tone_entry, true);
-   eo_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.tone_validator);
+   efl_event_callback_add(mng.tone_entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, mng.tone_validator);

[EGIT] [tools/eflete] master 03/04: update according the change in efl about eo naming.

[Jaehwan Kim]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=d1ce5fa0e2f46fe54d9bbd200289f0341192707e

commit d1ce5fa0e2f46fe54d9bbd200289f0341192707e
Author: Jaehwan Kim 
Date:   Thu Aug 18 15:59:54 2016 +0900

update according the change in efl about eo naming.
---
 src/bin/ui/editors/animator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index 26fd9a5..7670126 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -364,7 +364,7 @@ _on_bt_prog_add(void *data,
animator->popup.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL);
LAYOUT_PROP_ADD(animator->popup.popup, _("Frequency:"), "property", 
"1swallow")
ENTRY_ADD(item, animator->popup.entry, true)
-   eo_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
+   efl_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
evas_object_smart_callback_add(animator->popup.entry, "changed", 
_validation, animator);
elm_object_part_content_set(item, "elm.swallow.content", 
animator->popup.entry);
 

-- 

[EGIT] [core/efl] master 02/03: evas events: Properly signal to clients which values are set

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit 2edf50cb10f6ce5e6fc8b04492413c41678e7d85
Author: Jean-Philippe Andre 
Date:   Mon Aug 29 17:04:31 2016 +0900

evas events: Properly signal to clients which values are set

Since pointer events are all the same thing, users may not know
what values are valid for what kind of event. Eventually we
want to expose more information, but we also need a way to inform
the caller about the validity of the values we get.
---
 src/lib/efl/interfaces/efl_common_internal.h |  6 +-
 src/lib/evas/canvas/efl_input_pointer.c  | 11 
 src/lib/evas/canvas/evas_events.c| 91 +++-
 3 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/src/lib/efl/interfaces/efl_common_internal.h 
b/src/lib/efl/interfaces/efl_common_internal.h
index 07d6236..d6c51de 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -107,13 +107,15 @@ struct _Efl_Input_Hold_Data
 static inline Eina_Bool
 _efl_input_value_has(const Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
 {
-   return (pd->value_flags & (1 << (int) key)) != 0;
+   return (pd->value_flags & (1u << (int) key)) != 0;
 }
 
 static inline void
 _efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
 {
-   pd->value_flags |= (1 << (int) key);
+   pd->value_flags |= (1u << (int) key);
 }
 
+#define _efl_input_value_mask(key) (1u << (int) key)
+
 #endif
diff --git a/src/lib/evas/canvas/efl_input_pointer.c 
b/src/lib/evas/canvas/efl_input_pointer.c
index dd055a1..cd06f7d 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -147,6 +147,7 @@ _efl_input_pointer_action_get(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd)
 EOLIAN static void
 _efl_input_pointer_button_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, 
int but)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_BUTTON);
pd->button = but;
 }
 
@@ -161,6 +162,7 @@ _efl_input_pointer_button_pressed_set(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Dat
 {
if (button < 0) return;
if (button > 31) return;
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_BUTTONS_PRESSED);
if (pressed)
  pd->button_flags |= (1 << button);
else
@@ -178,6 +180,8 @@ _efl_input_pointer_button_pressed_get(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Dat
 EOLIAN static void
 _efl_input_pointer_position_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data 
*pd, int x, int y)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_X);
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_Y);
pd->cur.x = (double) x;
pd->cur.y = (double) y;
 }
@@ -192,6 +196,8 @@ _efl_input_pointer_position_get(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd,
 EOLIAN static void
 _efl_input_pointer_previous_position_set(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd, int x, int y)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_PREVIOUS_X);
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_PREVIOUS_Y);
pd->prev.x = (double) x;
pd->prev.y = (double) y;
 }
@@ -264,6 +270,7 @@ _efl_input_pointer_efl_input_event_event_flags_get(Eo *obj 
EINA_UNUSED, Efl_Inpu
 EOLIAN static void
 _efl_input_pointer_efl_input_event_timestamp_set(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd, double ms)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_TIMESTAMP);
pd->timestamp = (unsigned int) ms;
 }
 
@@ -276,6 +283,7 @@ _efl_input_pointer_efl_input_event_timestamp_get(Eo *obj 
EINA_UNUSED, Efl_Input_
 EOLIAN static void
 _efl_input_pointer_wheel_direction_set(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd, Efl_Orient dir)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_WHEEL_DIRECTION);
pd->wheel.dir = dir;
 }
 
@@ -288,6 +296,7 @@ _efl_input_pointer_wheel_direction_get(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Da
 EOLIAN static void
 _efl_input_pointer_wheel_delta_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data 
*pd, int dist)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_WHEEL_DELTA);
pd->wheel.z = dist;
 }
 
@@ -306,6 +315,7 @@ _efl_input_pointer_tool_get(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd)
 EOLIAN static void
 _efl_input_pointer_tool_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, 
int id)
 {
+   _efl_input_value_mark(pd, EFL_INPUT_VALUE_TOOL);
pd->tool = id;
 }
 
@@ -465,6 +475,7 @@ _efl_input_pointer_value_set(Eo *obj EINA_UNUSED, 
Efl_Input_Pointer_Data *pd, Ef
 return EINA_FALSE;
  }
 
+   _efl_input_value_mark(pd, key);
return EINA_TRUE;
 }
 
diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index 2075eb2..b390c60 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -1209,6 +1209,13 @@ _canvas_event_feed_mouse_down_internal(Evas_Public_Data 
*e, Efl_Input_Pointer_Da
Evas *eo_e;
int addgrab = 0;
 

[EGIT] [core/efl] master 03/03: win: Fix ERR message with object, focus, in

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit 062145b605acdc05a6f37599e97d391f11d9fcc3
Author: Jean-Philippe Andre 
Date:   Tue Aug 30 11:04:31 2016 +0900

win: Fix ERR message with object,focus,in

enventor exhibits this issue, where the focus target is
NULL in some cases. The ERR message was harmless, but it's
good to avoid it and be explicit that the object should be
non NULL when adding event callbacks.
---
 src/lib/elementary/efl_ui_win.c | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 76d0762..2c84249 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2308,13 +2308,16 @@ _elm_win_object_focus_in(void *data,
 
target = _elm_win_focus_target_get(obj);
sd->focus_highlight.cur.target = target;
-   if (target && elm_widget_highlight_in_theme_get(target))
- sd->focus_highlight.cur.in_theme = EINA_TRUE;
-   else
- _elm_win_focus_target_callbacks_add(sd);
 
-   evas_object_event_callback_add
- (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj);
+   if (target)
+ {
+if (elm_widget_highlight_in_theme_get(target))
+  sd->focus_highlight.cur.in_theme = EINA_TRUE;
+else
+  _elm_win_focus_target_callbacks_add(sd);
+evas_object_event_callback_add
+  (target, EVAS_CALLBACK_DEL, _elm_win_focus_target_del, sd->obj);
+ }
 
_elm_win_focus_highlight_reconfigure_job_start(sd);
 }

-- 

[EGIT] [core/efl] master 01/03: evas events: Fix mistake in multi_move

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit 68be4f49ed924977ae72d1d109fb553cdcfc8001
Author: Jean-Philippe Andre 
Date:   Mon Aug 29 17:04:57 2016 +0900

evas events: Fix mistake in multi_move

I guess (can't test) that multi touch was broken, as the
position of the event was set to the position of the pointer
on the canvas. Which means all fingers would be in the same
spot, no matter what the real input. Copy & paste error.
---
 src/lib/evas/canvas/evas_events.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index 6a17cb4..2075eb2 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -2464,8 +2464,6 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data 
*e, Efl_Input_Pointer_Da
if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return;
 
evt = ev->eo;
-   ev->cur.x = e->pointer.x;
-   ev->cur.y = e->pointer.y;
ev->modifiers = &(e->modifiers);
ev->locks = &(e->locks);
ev->event_flags = e->default_event_flags;

-- 

[EGIT] [tools/expedite] master 01/01: ui: Fix build break due to eo api changes (input events)

[Jean-Philippe Andre]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/tools/expedite.git/commit/?id=19657b6d255daf17088981a6fdec3b6a46b55a7b

commit 19657b6d255daf17088981a6fdec3b6a46b55a7b
Author: Jean-Philippe Andre 
Date:   Tue Aug 30 15:45:39 2016 +0900

ui: Fix build break due to eo api changes (input events)
---
 src/bin/ui.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/bin/ui.c b/src/bin/ui.c
index fad356f..4018f35 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -258,8 +258,8 @@ _ui_select(void)
 static void
 _ui_key(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Event_Key *ev = event->info;
-   const char *keyname = efl_event_key_name_get(ev);
+   Efl_Input_Key *ev = event->info;
+   const char *keyname = efl_input_key_name_get(ev);
 
if (!keyname) return;
 
@@ -300,12 +300,12 @@ static int down_menu_sel = 0;
 static void
 _ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Event_Pointer *ev = event->info;
+   Efl_Input_Pointer *ev = event->info;
 
-   if (efl_event_pointer_button_get(ev) != 1) return;
+   if (efl_input_pointer_button_get(ev) != 1) return;
if (menu_active)
  {
-efl_event_pointer_position_get(ev, _x, _y);
+efl_input_pointer_position_get(ev, _x, _y);
 down_menu_sel = menu_sel;
  }
 }
@@ -313,14 +313,14 @@ _ui_mouse_down(void *data EINA_UNUSED, const Eo_Event 
*event)
 static void
 _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Event_Pointer *ev = event->info;
+   Efl_Input_Pointer *ev = event->info;
 
-   if (efl_event_pointer_button_get(ev) != 1) return;
+   if (efl_input_pointer_button_get(ev) != 1) return;
if (menu_active)
  {
 Evas_Coord dx, dy, x, y;
 
-efl_event_pointer_position_get(ev, , );
+efl_input_pointer_position_get(ev, , );
 dx = x - down_x;
 dy = y - down_y;
 if dx * dx) + (dy * dy)) < (20 * 20)) &&
@@ -337,14 +337,14 @@ _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event 
*event)
 static void
 _ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   Efl_Event_Pointer *ev = event->info;
+   Efl_Input_Pointer *ev = event->info;
 
-   if (efl_event_pointer_button_get(ev) != 1) return;
+   if (efl_input_pointer_button_get(ev) != 1) return;
if (menu_active)
  {
 Evas_Coord x;
 
-efl_event_pointer_position_get(ev, , NULL);
+efl_input_pointer_position_get(ev, , NULL);
 menu_sel = down_menu_sel + ((x - down_x) / 25);
 /* scroll */
 if (menu_sel < 0) menu_sel = 0;

--