[EGIT] [core/enlightenment] master 01/01: e comp data - actually ... NO visibility effect by default is right

2015-10-07 Thread Carsten Haitzler 
raster pushed a commit to branch master.

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

commit acbf4a79b49428731be08b54e6f1b7fa6f8718e9
Author: Carsten Haitzler (Rasterman) 
Date:   Thu Oct 8 08:27:38 2015 +0900

e comp data - actually ... NO visibility effect by default is right

so a bit of a config wipe had my comp config reset (some dev
shenanigans) and i got to see what current e "out of box" config is -
and it was horrid for menus. visibilitiy effect was broken. vertial.
default was none - always. forever. like empty. so go back to that. in
fact why do this visibility effect? that was the point of having a
different shadow in the theme - each has its own look + effect. this
makes things far more complex...
---
 src/bin/e_comp_cfdata.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/bin/e_comp_cfdata.c b/src/bin/e_comp_cfdata.c
index 91570fa..6deff58 100644
--- a/src/bin/e_comp_cfdata.c
+++ b/src/bin/e_comp_cfdata.c
@@ -153,7 +153,6 @@ e_comp_cfdata_config_new(void)
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_DROPDOWN_MENU;
mat->shadow_style = eina_stringshare_add("menu");
-   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
@@ -164,7 +163,6 @@ e_comp_cfdata_config_new(void)
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_COMBO;
mat->shadow_style = eina_stringshare_add("menu");
-   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
@@ -175,7 +173,6 @@ e_comp_cfdata_config_new(void)
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_MENU;
mat->shadow_style = eina_stringshare_add("menu");
-   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);

--

[EGIT] [bindings/python/python-efl] master 01/01: New 1.16 API: Hoversel.label_auto_changed

2015-10-07 Thread Dave Andreoli 
davemds pushed a commit to branch master.

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

commit a7c8b2d40d227a39e842df350c2dd2ee2de31ed8
Author: Dave Andreoli 
Date:   Wed Oct 7 22:05:28 2015 +0200

New 1.16 API: Hoversel.label_auto_changed

...what a bad name for this prop
---
 efl/elementary/hoversel.pxi  | 18 ++
 efl/elementary/hoversel_cdef.pxi |  2 ++
 examples/elementary/test_hoversel.py | 12 +++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/efl/elementary/hoversel.pxi b/efl/elementary/hoversel.pxi
index b02d770..4b9f665 100644
--- a/efl/elementary/hoversel.pxi
+++ b/efl/elementary/hoversel.pxi
@@ -250,6 +250,24 @@ cdef class Hoversel(Button):
 def expanded_get(self):
 return bool(elm_hoversel_expanded_get(self.obj))
 
+property label_auto_changed:
+"""Change the label of hoversel to that of selected item automatically.
+
+:type: bool
+
+..versionadded:: 1.16
+
+"""
+def __get__(self):
+return bool(elm_hoversel_label_auto_changed_get(self.obj))
+def __set__(self, bint enable):
+elm_hoversel_label_auto_changed_set(self.obj, enable)
+
+def elabel_auto_changed_get(self):
+return bool(elm_hoversel_label_auto_changed_get(self.obj))
+def elabel_auto_changed_set(self, bint enable):
+elm_hoversel_label_auto_changed_set(self.obj, enable)
+
 def clear(self):
 """This will remove all the children items from the hoversel.
 
diff --git a/efl/elementary/hoversel_cdef.pxi b/efl/elementary/hoversel_cdef.pxi
index cae03e0..f77ab82 100644
--- a/efl/elementary/hoversel_cdef.pxi
+++ b/efl/elementary/hoversel_cdef.pxi
@@ -20,3 +20,5 @@ cdef extern from "Elementary.h":
 Elm_Object_Item *elm_hoversel_item_add(Evas_Object *obj, const 
char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb 
func, void *data)
 void elm_hoversel_item_icon_set(Elm_Object_Item *it, 
const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type)
 void elm_hoversel_item_icon_get(const Elm_Object_Item 
*it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type)
+void elm_hoversel_label_auto_changed_set(Evas_Object 
*obj, Eina_Bool enable)
+Eina_Boolelm_hoversel_label_auto_changed_get(Evas_Object 
*obj)
diff --git a/examples/elementary/test_hoversel.py 
b/examples/elementary/test_hoversel.py
index 9672c54..07469c8 100644
--- a/examples/elementary/test_hoversel.py
+++ b/examples/elementary/test_hoversel.py
@@ -77,7 +77,6 @@ def hoversel_clicked(obj):
 bx.pack_end(bt)
 bt.show()
 
-
 ic = Icon(win, file=os.path.join(img_path, "sky_03.jpg"))
 bt = Hoversel(win, hover_parent=win, text="Icon + Label", content=ic,
 size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
@@ -90,6 +89,17 @@ def hoversel_clicked(obj):
 bx.pack_end(bt)
 bt.show()
 
+bt = Hoversel(win, hover_parent=win, text="Label auto changed",
+  label_auto_changed=True,
+  size_hint_weight=WEIGHT_ZERO, size_hint_align=ALIGN_CENTER)
+
+bt.item_add("Item 1", "apps", ELM_ICON_STANDARD)
+bt.item_add("Item 2", "arrow_down", ELM_ICON_STANDARD)
+bt.item_add("Item 3", "home", ELM_ICON_STANDARD)
+bt.item_add("Item 4", "close", ELM_ICON_STANDARD)
+bx.pack_end(bt)
+bt.show()
+
 win.show()
 
 

--

[EGIT] [core/efl] master 01/02: eet - fix signature alignment and position

2015-10-07 Thread Carsten Haitzler 
raster pushed a commit to branch master.

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

commit 7b018a9740924012e6a4f3ab9c13dfbea3780934
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Oct 7 14:32:37 2015 +0900

eet - fix signature alignment and position
---
 src/lib/eet/eet_lib.c | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 579dc28..367c740 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -481,22 +481,22 @@ eet_flush2(Eet_File *ef)
 
/* write data */
data_offset = orig_data_offset;
+   pad = 0;
for (i = 0; i < num; i++)
  {
 for (efn = ef->header->directory->nodes[i]; efn; efn = efn->next)
   {
- if (fwrite(efn->data, efn->size, 1, fp) != 1)
-   goto write_error;
-
- data_offset += efn->size;
-
- pad = (((data_offset + (ALIGN - 1)) / ALIGN) * ALIGN) - 
data_offset;
  if (pad > 0)
{
   data_offset += pad;
   if (fwrite(zeros, pad, 1, fp) != 1)
 goto write_error;
}
+ if (fwrite(efn->data, efn->size, 1, fp) != 1)
+   goto write_error;
+
+ data_offset += efn->size;
+ pad = (((data_offset + (ALIGN - 1)) / ALIGN) * ALIGN) - 
data_offset;
   }
  }
 
@@ -882,10 +882,7 @@ eet_internal_read2(Eet_File *ef)
 
 /* compute the possible position of a signature */
 if (signature_base_offset < (efn->offset + efn->size))
-  {
- signature_base_offset = efn->offset +
-   (((efn->size + (ALIGN - 1)) / ALIGN) * ALIGN);
-  }
+  signature_base_offset = efn->offset + efn->size;
  }
 
ef->ed = NULL;

--

[EGIT] [core/efl] master 02/02: ethumb - fix client free issue with pending dbus messages

2015-10-07 Thread Carsten Haitzler 
raster pushed a commit to branch master.

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

commit 44af3cb718a4354ef5e42b510daf29b5f6b3c282
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Oct 7 15:47:04 2015 +0900

ethumb - fix client free issue with pending dbus messages

this fixes T2769

@fix
---
 src/lib/ethumb_client/ethumb_client.c | 25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/lib/ethumb_client/ethumb_client.c 
b/src/lib/ethumb_client/ethumb_client.c
index d20d893..2bae0dc 100644
--- a/src/lib/ethumb_client/ethumb_client.c
+++ b/src/lib/ethumb_client/ethumb_client.c
@@ -110,6 +110,7 @@ struct _Ethumb_Client
Eina_List *pending_add;
Eina_List *pending_remove;
Eina_List *pending_gen;
+   Eina_List *dbus_pending;
struct
{
   Ethumb_Client_Die_Cb cb;
@@ -199,8 +200,11 @@ _ethumb_client_free(Ethumb_Client *client)
 {
void *data;
Eldbus_Object *obj;
+   Eldbus_Pending *pending;
 
if (client->invalid) return;
+   EINA_LIST_FREE(client->dbus_pending, pending)
+ eldbus_pending_cancel(pending);
client->invalid = EINA_TRUE;
EINA_LIST_FREE(client->pending_add, data)
  {
@@ -363,13 +367,14 @@ _ethumb_client_report_connect(Ethumb_Client *client, 
Eina_Bool success)
 }
 
 static void
-_ethumb_client_new_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending 
*pending EINA_UNUSED)
+_ethumb_client_new_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending 
*pending)
 {
const char *errname, *errmsg;
const char *opath;
Ethumb_Client *client = data;
Eldbus_Object *obj;
 
+   client->dbus_pending = eina_list_remove(client->dbus_pending, pending);
if (eldbus_message_error_get(msg, , ))
  {
 ERR("Error: %s %s", errname, errmsg);
@@ -404,10 +409,14 @@ static void
 _ethumb_client_call_new(Ethumb_Client *client)
 {
Eldbus_Message *msg;
+   Eldbus_Pending *pending;
msg = eldbus_message_method_call_new(_ethumb_dbus_bus_name,
_ethumb_dbus_path,
_ethumb_dbus_interface, "new");
-   eldbus_connection_send(client->conn, msg, _ethumb_client_new_cb, client, 
-1);
+   pending = eldbus_connection_send(client->conn, msg,
+_ethumb_client_new_cb, client, -1);
+   if (pending)
+ client->dbus_pending = eina_list_append(client->dbus_pending, pending);
 }
 
 static void
@@ -676,10 +685,13 @@ ethumb_client_on_server_die_callback_set(Ethumb_Client 
*client, Ethumb_Client_Di
  */
 
 static void
-_ethumb_client_ethumb_setup_cb(void *data EINA_UNUSED, const Eldbus_Message 
*msg, Eldbus_Pending *pending EINA_UNUSED)
+_ethumb_client_ethumb_setup_cb(void *data, const Eldbus_Message *msg, 
Eldbus_Pending *pending)
 {
const char *errname, *errmsg;
Eina_Bool result = 0;
+   Ethumb_Client *client = data;
+
+   client->dbus_pending = eina_list_remove(client->dbus_pending, pending);
 
if (eldbus_message_error_get(msg, , ))
  {
@@ -773,6 +785,7 @@ ethumb_client_ethumb_setup(Ethumb_Client *client)
const char *directory, *category;
double video_time, video_start, video_interval;
unsigned int video_ntimes, video_fps, document_page;
+   Eldbus_Pending *pending;
 
EINA_SAFETY_ON_NULL_RETURN(client);
EINA_SAFETY_ON_FALSE_RETURN(client->connected);
@@ -872,8 +885,10 @@ ethumb_client_ethumb_setup(Ethumb_Client *client)
 
eldbus_message_iter_container_close(main_iter, array);
 
-   eldbus_proxy_send(client->proxy, msg, _ethumb_client_ethumb_setup_cb,
-client, -1);
+   pending = eldbus_proxy_send(client->proxy, msg,
+   _ethumb_client_ethumb_setup_cb, client, -1);
+   if (pending)
+ client->dbus_pending = eina_list_append(client->dbus_pending, pending);
 }
 
 /**

--

[EGIT] [core/efl] master 01/01: eet - be robust about garbage at the end that looks like an idenity

2015-10-07 Thread Carsten Haitzler 
raster pushed a commit to branch master.

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

commit a5747f1ab3ec3d3876b73c08501a1e52404733f0
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Oct 7 17:24:20 2015 +0900

eet - be robust about garbage at the end that looks like an idenity

if there is an identity signaure at the end, ONLY check it if it looks
like a real one (correct magic number, cert and sig size fields are
sane etc.). this means eet opens dont fail for files that may have
trailing garbage or padding that is not an eet identity signature.
---
 src/lib/eet/Eet_private.h |  2 ++
 src/lib/eet/eet_cipher.c  |  2 --
 src/lib/eet/eet_lib.c | 42 ++
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/lib/eet/Eet_private.h b/src/lib/eet/Eet_private.h
index b487cf8..c2e6702 100644
--- a/src/lib/eet/Eet_private.h
+++ b/src/lib/eet/Eet_private.h
@@ -334,4 +334,6 @@ void eet_mempool_shutdown(void);
 # define EET_ASSERT(Test, Do) if (Test == 0) {abort(); }
 #endif /* ifdef DNDEBUG */
 
+#define EET_MAGIC_SIGN 0x1ee74271
+
 #endif /* ifndef _EET_PRIVATE_H */
diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
index 65a8635..6ccb9cc 100644
--- a/src/lib/eet/eet_cipher.c
+++ b/src/lib/eet/eet_cipher.c
@@ -51,8 +51,6 @@
 #include "Eet.h"
 #include "Eet_private.h"
 
-#define EET_MAGIC_SIGN 0x1ee74271
-
 #ifdef HAVE_GNUTLS
 # define MAX_KEY_LEN   32
 # define MAX_IV_LEN16
diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index 367c740..11d0706 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -982,18 +982,36 @@ eet_internal_read2(Eet_File *ef)
 #ifdef HAVE_SIGNATURE
 const unsigned char *buffer = ((const unsigned char *)ef->data) +
   signature_base_offset;
-ef->x509_der = eet_identity_check(ef->data,
-  signature_base_offset,
-  >sha1,
-  >sha1_length,
-  buffer,
-  ef->data_size - 
signature_base_offset,
-  >signature,
-  >signature_length,
-  >x509_length);
-
-if (eet_test_close(!ef->x509_der, ef))
-  return NULL;
+unsigned long int sig_size = ef->data_size - signature_base_offset;
+
+/* check that the signature is a sane size to bother even checking */
+if (sig_size >= (3 * sizeof(int)))
+  {
+ int head[3];
+
+ /* check the signature has the magic number and sig + cert len
+  * + magic is sane */
+ memcpy(head, buffer, 3 * sizeof(int));
+ head[0] = ntohl(head[0]);
+ head[1] = ntohl(head[1]);
+ head[2] = ntohl(head[2]);
+ if ((head[0] == EET_MAGIC_SIGN) && (head[1] > 0) && (head[2] > 0))
+   {
+  /* there appears to be an actual valid identity at the end
+   * so now actually check it */
+  ef->x509_der = eet_identity_check(ef->data,
+signature_base_offset,
+>sha1,
+>sha1_length,
+buffer,
+sig_size,
+>signature,
+>signature_length,
+>x509_length);
+
+  if (eet_test_close(!ef->x509_der, ef)) return NULL;
+   }
+  }
 
 #else /* ifdef HAVE_SIGNATURE */
 ERR(

--

[EGIT] [website/www-content] master 01/01: Wiki page state changed with summary [1.15 was already released] by jpeg

2015-10-07 Thread jpeg 
WWW-www.enlightenment.org pushed a commit to branch master.

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

commit 92d1a40f611c57704797dfa564c118f980ad74ef
Author: jpeg 
Date:   Wed Oct 7 19:20:45 2015 -0700

Wiki page state changed with summary [1.15 was already released] by jpeg
---
 pages/docs/efl/advanced/eflgfxfilter/state.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/docs/efl/advanced/eflgfxfilter/state.txt 
b/pages/docs/efl/advanced/eflgfxfilter/state.txt
index d308ee0..5dc6e95 100644
--- a/pages/docs/efl/advanced/eflgfxfilter/state.txt
+++ b/pages/docs/efl/advanced/eflgfxfilter/state.txt
@@ -1,6 +1,6 @@
 Go back to [[:docs:efl:advanced:eflgfxfilters|Efl.Gfx.Filters]].
 
-Since EFL 1.15 (to be released in August 2015)
+Since EFL 1.15 (August 2015)
 
  State 
 

--

[EGIT] [tools/erigo] master 01/01: First part of snippets feature

2015-10-07 Thread Daniel Zaoui 
jackdanielz pushed a commit to branch master.

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

commit 0f29e3b3c6f9a74199a76b1de8981c1c11e44483
Merge: e996c22 63df29d
Author: Daniel Zaoui 
Date:   Thu Oct 8 08:34:08 2015 +0300

First part of snippets feature

Changes have been made in:
- parser
- factory generation
- dummy objects handling

 CMakeLists.txt   |3 +
 data/config/CMakeLists.txt   |4 +-
 data/layouts/CMakeLists.txt  |   24 +
 data/layouts/dummy.edc   |   74 +
 data/layouts/dummy.json  |   28 +
 data/layouts/dummy.png   |  Bin 0 -> 15229 bytes
 data/layouts/factory.json|  561 
 src/bin/gui/contentview.c|5 +-
 src/bin/gui/dnd.c|  144 +-
 src/bin/gui/dnd.h|   21 +-
 src/bin/gui/editor.c |  591 ++--
 src/bin/gui/egui_layout.json | 6804 ++
 src/bin/gui/egui_logic.c |  212 +-
 src/bin/gui/egui_logic_private.h |2 +
 src/bin/gui/objtree.c|   19 +-
 src/bin/gui/props_helper.c   |2 +-
 src/bin/main.c   |5 +-
 src/lib/ffi_abstraction.c|   24 +-
 src/lib/ffi_abstraction.h|6 +-
 src/lib/ffi_glue.c   |8 +-
 src/lib/generator.c  |2 +-
 src/lib/gui_parser.c |   89 +-
 src/lib/gui_parser.h |   13 +-
 src/lib/gui_widget.c |  299 +-
 src/lib/gui_widget.h |   26 +-
 src/lib/json_generator.c |   56 +-
 src/lib/json_generator.h |3 +
 src/lib/simulator.c  |   24 +-
 src/lib/simulator.h  |3 +
 29 files changed, 4040 insertions(+), 5012 deletions(-)

--

[EGIT] [core/enlightenment] master 01/01: when removing VERTICAL maximize state, also remove LEFT and RIGHT states

2015-10-07 Thread Mike Blumenkrantz 
discomfitor pushed a commit to branch master.

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

commit 95b9770f08586e94dfaa9e744c986ff66d47040a
Author: Mike Blumenkrantz 
Date:   Wed Oct 7 15:43:29 2015 -0400

when removing VERTICAL maximize state, also remove LEFT and RIGHT states

LEFT and RIGHT are supersets of VERTICAL which serve no purpose on their 
own,
so remove them when removing VERTICAL

fix T2770
---
 src/bin/e_client.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 91846c1..f530dcb 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3838,7 +3838,11 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
   vert = EINA_TRUE;
   y = ec->saved.y + ec->zone->y;
   if ((max & E_MAXIMIZE_VERTICAL) == E_MAXIMIZE_VERTICAL)
-ec->maximized &= ~E_MAXIMIZE_VERTICAL;
+{
+   ec->maximized &= ~E_MAXIMIZE_VERTICAL;
+   ec->maximized &= ~E_MAXIMIZE_LEFT;
+   ec->maximized &= ~E_MAXIMIZE_RIGHT;
+}
   if ((max & E_MAXIMIZE_LEFT) == E_MAXIMIZE_LEFT)
 ec->maximized &= ~E_MAXIMIZE_LEFT;
   if ((max & E_MAXIMIZE_RIGHT) == E_MAXIMIZE_RIGHT)

--

[EGIT] [core/enlightenment] enlightenment-0.19 01/01: when removing VERTICAL maximize state, also remove LEFT and RIGHT states

2015-10-07 Thread Mike Blumenkrantz 
discomfitor pushed a commit to branch enlightenment-0.19.

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

commit 24c2d5fb95f694abf85cf4d321551c9586e59da5
Author: Mike Blumenkrantz 
Date:   Wed Oct 7 15:43:29 2015 -0400

when removing VERTICAL maximize state, also remove LEFT and RIGHT states

LEFT and RIGHT are supersets of VERTICAL which serve no purpose on their 
own,
so remove them when removing VERTICAL

fix T2770
---
 src/bin/e_client.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index a91ddd0..d669ca1 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3842,7 +3842,11 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
   vert = EINA_TRUE;
   y = ec->saved.y + ec->zone->y;
   if ((max & E_MAXIMIZE_VERTICAL) == E_MAXIMIZE_VERTICAL)
-ec->maximized &= ~E_MAXIMIZE_VERTICAL;
+{
+   ec->maximized &= ~E_MAXIMIZE_VERTICAL;
+   ec->maximized &= ~E_MAXIMIZE_LEFT;
+   ec->maximized &= ~E_MAXIMIZE_RIGHT;
+}
   if ((max & E_MAXIMIZE_LEFT) == E_MAXIMIZE_LEFT)
 ec->maximized &= ~E_MAXIMIZE_LEFT;
   if ((max & E_MAXIMIZE_RIGHT) == E_MAXIMIZE_RIGHT)

--

[EGIT] [core/enlightenment] master 01/01: e comp - default config was rather broken - fix

2015-10-07 Thread Carsten Haitzler 
raster pushed a commit to branch master.

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

commit d99869fed2e71613e73863e1e343909c97945819
Author: Carsten Haitzler (Rasterman) 
Date:   Wed Oct 7 19:54:21 2015 +0900

e comp - default config was rather broken - fix

default config didnt select menu style shadow - was selecting
vertical/still which meant animation was rather horrible. fix.
---
 src/bin/e_comp_cfdata.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_comp_cfdata.c b/src/bin/e_comp_cfdata.c
index d813937..91570fa 100644
--- a/src/bin/e_comp_cfdata.c
+++ b/src/bin/e_comp_cfdata.c
@@ -152,8 +152,8 @@ e_comp_cfdata_config_new(void)
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_DROPDOWN_MENU;
-   mat->shadow_style = eina_stringshare_add("still");
-   mat->visibility_effect = eina_stringshare_add("visibility/vertical");
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
@@ -163,8 +163,8 @@ e_comp_cfdata_config_new(void)
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_COMBO;
-   mat->shadow_style = eina_stringshare_add("still");
-   mat->visibility_effect = eina_stringshare_add("visibility/vertical");
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
@@ -174,8 +174,8 @@ e_comp_cfdata_config_new(void)
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);
mat->primary_type = E_WINDOW_TYPE_MENU;
-   mat->shadow_style = eina_stringshare_add("still");
-   mat->visibility_effect = eina_stringshare_add("visibility/vertical");
+   mat->shadow_style = eina_stringshare_add("menu");
+   mat->visibility_effect = eina_stringshare_add("still");
 
mat = E_NEW(E_Comp_Match, 1);
cfg->match.overrides = eina_list_append(cfg->match.overrides, mat);

--

[EGIT] [core/efl] master 01/01: Evas filters: Fix crash with async sw rendering

2015-10-07 Thread Jean-Philippe ANDRÉ 
jpeg pushed a commit to branch master.

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

commit 6e04d407cf1eb9506866f72f0d71c76ec2b80bc4
Author: Jean-Philippe Andre 
Date:   Wed Oct 7 18:08:56 2015 +0900

Evas filters: Fix crash with async sw rendering

If the filtered object (text or image object) was deleted, its
output image (cached inside the filter data) would be freed
immediately. This could cause crashes in case of async rendering.

@fix
---
 src/lib/evas/canvas/evas_filter_mixin.c | 8 +++-
 src/lib/evas/include/evas_private.h | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_filter_mixin.c 
b/src/lib/evas/canvas/evas_filter_mixin.c
index 934a8c6..154c6dc 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -254,6 +254,7 @@ evas_filter_object_render(Eo *eo_obj, 
Evas_Object_Protected_Data *obj,
 fcow = FCOW_BEGIN(pd);
 fcow->output = filter_output;
 fcow->changed = EINA_FALSE;
+fcow->async = do_async;
 if (!ok) fcow->invalid = EINA_TRUE;
 FCOW_END(fcow, pd);
 
@@ -518,7 +519,12 @@ _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
if (evas_object_filter_cow_default == pd->data) return;
 
if (pd->data->output)
- ENFN->image_free(ENDT, pd->data->output);
+ {
+if (!pd->data->async)
+  ENFN->image_free(ENDT, pd->data->output);
+else
+  evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
+ }
eina_hash_free(pd->data->sources);
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
  {
diff --git a/src/lib/evas/include/evas_private.h 
b/src/lib/evas/include/evas_private.h
index 8c57805..0aa28d1 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1206,6 +1206,7 @@ struct _Evas_Object_Filter_Data
} state;
Eina_Boolchanged : 1;
Eina_Boolinvalid : 1; // Code parse failed
+   Eina_Boolasync : 1;
 };
 
 struct _Evas_Object_Func

--

[EGIT] [core/efl] efl-1.15 01/01: Evas filters: Fix crash with async sw rendering

2015-10-07 Thread Jean-Philippe ANDRÉ 
jpeg pushed a commit to branch efl-1.15.

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

commit 42beea0ca57594759bd526afd4db62906728b1e7
Author: Jean-Philippe Andre 
Date:   Wed Oct 7 18:08:56 2015 +0900

Evas filters: Fix crash with async sw rendering

If the filtered object (text or image object) was deleted, its
output image (cached inside the filter data) would be freed
immediately. This could cause crashes in case of async rendering.

@fix
---
 src/lib/evas/canvas/evas_filter_mixin.c | 8 +++-
 src/lib/evas/include/evas_private.h | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_filter_mixin.c 
b/src/lib/evas/canvas/evas_filter_mixin.c
index 934a8c6..154c6dc 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -254,6 +254,7 @@ evas_filter_object_render(Eo *eo_obj, 
Evas_Object_Protected_Data *obj,
 fcow = FCOW_BEGIN(pd);
 fcow->output = filter_output;
 fcow->changed = EINA_FALSE;
+fcow->async = do_async;
 if (!ok) fcow->invalid = EINA_TRUE;
 FCOW_END(fcow, pd);
 
@@ -518,7 +519,12 @@ _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
if (evas_object_filter_cow_default == pd->data) return;
 
if (pd->data->output)
- ENFN->image_free(ENDT, pd->data->output);
+ {
+if (!pd->data->async)
+  ENFN->image_free(ENDT, pd->data->output);
+else
+  evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
+ }
eina_hash_free(pd->data->sources);
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
  {
diff --git a/src/lib/evas/include/evas_private.h 
b/src/lib/evas/include/evas_private.h
index 01b4340..730eae3 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1194,6 +1194,7 @@ struct _Evas_Object_Filter_Data
} state;
Eina_Boolchanged : 1;
Eina_Boolinvalid : 1; // Code parse failed
+   Eina_Boolasync : 1;
 };
 
 struct _Evas_Object_Func

--

[EGIT] [core/efl] master 01/01: evas-wayland-shm: Fix to add support for MERGE_MODE Smart

2015-10-07 Thread Christopher Michael 
devilhorns pushed a commit to branch master.

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

commit bf1eef174bb596cbab291f823c9f3644e1dc4bb3
Author: Chris Michael 
Date:   Wed Oct 7 11:00:46 2015 -0400

evas-wayland-shm: Fix to add support for MERGE_MODE Smart

Summary: Seems we were never setting any merge_mode for the
wayland-shm engine. This fix implements setting merge_mode

@fix

Signed-off-by: Chris Michael 
---
 src/modules/evas/engines/wayland_shm/evas_engine.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c 
b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 66913b8..de4ea9e 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -27,6 +27,8 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int 
rotation, unsigned int d
 {
Render_Engine *re;
Outbuf *ob;
+   Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
+   const char *s;
 
LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
@@ -52,6 +54,19 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int 
rotation, unsigned int d
 
re->outbuf_reconfigure = _evas_outbuf_reconfigure;
 
+   s = getenv("EVAS_WAYLAND_PARTIAL_MERGE");
+   if (s)
+ {
+if ((!strcmp(s, "bounding")) || (!strcmp(s, "b")))
+  merge_mode = MERGE_BOUNDING;
+else if ((!strcmp(s, "full")) || (!strcmp(s, "f")))
+  merge_mode = MERGE_FULL;
+else if ((!strcmp(s, "smart")) || (!strcmp(s, "s")))
+  merge_mode = MERGE_SMART;
+ }
+
+   evas_render_engine_software_generic_merge_mode_set(>generic, 
merge_mode);
+
/* return allocated render engine */
return re;
 

--

[EGIT] [bindings/python/python-efl] master 01/01: New 1.16 API: Configuration.scroll_thumbscroll_smooth_*

2015-10-07 Thread Dave Andreoli 
davemds pushed a commit to branch master.

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

commit b82ed6f029a272183cbae24291dc9404709b0ab4
Author: Dave Andreoli 
Date:   Wed Oct 7 20:58:21 2015 +0200

New 1.16 API: Configuration.scroll_thumbscroll_smooth_*
---
 efl/elementary/configuration.pxi  | 47 +++
 efl/elementary/configuration_cdef.pxi |  6 +
 2 files changed, 53 insertions(+)

diff --git a/efl/elementary/configuration.pxi b/efl/elementary/configuration.pxi
index f3af9e2..76bda93 100644
--- a/efl/elementary/configuration.pxi
+++ b/efl/elementary/configuration.pxi
@@ -350,6 +350,53 @@ cdef class Configuration(object):
 def __set__(self, double weight):
 elm_config_scroll_thumbscroll_acceleration_weight_set(weight)
 
+property scroll_thumbscroll_smooth_start:
+"""The smooth start mode for scrolling with your finger.
+
+:type: bool
+
+.. versionadded:: 1.16
+
+"""
+def __get__(self):
+return elm_config_scroll_thumbscroll_smooth_start_get()
+def __set__(self, bint enable):
+elm_config_scroll_thumbscroll_smooth_start_set(enable)
+
+property scroll_thumbscroll_smooth_amount:
+"""The amount of smoothing to apply to scrolling.
+
+Scrolling with your finger can be smoothed out and the amount to smooth
+is determined by this parameter. 0.0 means to not smooth at all and
+1.0 is to smoth as much as possible.
+
+:type: float
+
+.. versionadded:: 1.16
+
+"""
+def __get__(self):
+return elm_config_scroll_thumbscroll_smooth_amount_get()
+def __set__(self, double amount):
+elm_config_scroll_thumbscroll_smooth_amount_set(amount)
+
+property scroll_thumbscroll_smooth_time_window:
+"""The time window to look back at for events for smoothing.
+
+Scrolling with your finger can be smoothed out and the window of time
+to look at is determined by this config. The value is in seconds and
+is from 0.0 to 1.0
+
+:type: float
+
+.. versionadded:: 1.16
+
+"""
+def __get__(self):
+return elm_config_scroll_thumbscroll_smooth_time_window_get()
+def __set__(self, double amount):
+elm_config_scroll_thumbscroll_smooth_time_window_set(amount)
+
 property longpress_timeout:
 """The duration for occurring long press event.
 
diff --git a/efl/elementary/configuration_cdef.pxi 
b/efl/elementary/configuration_cdef.pxi
index a62f2da..79bb7b5 100644
--- a/efl/elementary/configuration_cdef.pxi
+++ b/efl/elementary/configuration_cdef.pxi
@@ -100,6 +100,12 @@ cdef extern from "Elementary.h":
 void
elm_config_scroll_thumbscroll_acceleration_time_limit_set(double time_limit)
 double  
elm_config_scroll_thumbscroll_acceleration_weight_get()
 void
elm_config_scroll_thumbscroll_acceleration_weight_set(double weight)
+Eina_Bool   elm_config_scroll_thumbscroll_smooth_start_get()
+void
elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enable)
+double  elm_config_scroll_thumbscroll_smooth_amount_get()
+void
elm_config_scroll_thumbscroll_smooth_amount_set(double amount)
+double  
elm_config_scroll_thumbscroll_smooth_time_window_get()
+void
elm_config_scroll_thumbscroll_smooth_time_window_set(double amount)
 
 double  elm_config_longpress_timeout_get()
 voidelm_config_longpress_timeout_set(double 
longpress_timeout)

--