date:20160125

[EGIT] [apps/ephoto] master 01/01: Ephoto: Deselect current directory when clicking empty space in file selector.

2016-01-25 Thread Stephen Houston

okra pushed a commit to branch master.

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

commit 8ffd43dd601af9cda6d5727c8315bc10985520da
Author: Stephen Houston 
Date:   Mon Jan 25 21:36:33 2016 -0600

Ephoto: Deselect current directory when clicking empty space in file 
selector.
---
 src/bin/ephoto_single_browser.c | 2 +-
 src/bin/ephoto_thumb_browser.c  | 9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 23fc22b..eb2b028 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -1311,7 +1311,7 @@ _save_image_as_done(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info)
   {
  char *dir = ecore_file_dir_get(buf);
 
-  if (!strcmp(dir, sb->ephoto->config->directory))
+  if (strcmp(dir, sb->ephoto->config->directory))
 {
   ephoto_thumb_browser_fsel_clear(sb->ephoto);
   ephoto_directory_set(sb->ephoto, dir, NULL,
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index c9b2b5e..fca1eba 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -3131,6 +3131,15 @@ _fsel_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
_on_list_selected(tb, NULL, item);
   }
  }
+   else if (!item)
+ {
+Elm_Object_Item *it;
+
+it = elm_genlist_selected_item_get(tb->fsel);
+if (it)
+  elm_genlist_item_selected_set(it, EINA_FALSE);
+ephoto_directory_set(tb->ephoto, tb->ephoto->top_directory, NULL, 0, 
1);
+ }
if (info->button != 3)
  return;
 

--

[EGIT] [website/www-content] master 01/01: Add floating point precision to shaders for gl_2d.c

2016-01-25 Thread Jean-Philippe Andre

jpeg pushed a commit to branch master.

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

commit 062e632d9d1bb1cdeb28dfaa530649a7c584735d
Author: Jean-Philippe Andre 
Date:   Tue Jan 26 16:25:21 2016 +0900

Add floating point precision to shaders for gl_2d.c
---
 media/code_c/tutorial/gl2d/gl_2d.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/media/code_c/tutorial/gl2d/gl_2d.c 
b/media/code_c/tutorial/gl2d/gl_2d.c
index d0a990e..aa14c97 100644
--- a/media/code_c/tutorial/gl2d/gl_2d.c
+++ b/media/code_c/tutorial/gl2d/gl_2d.c
@@ -240,6 +240,9 @@ init_shaders(GLData *gld)
Evas_GL_API *gl = gld->glapi;
 
GLbyte vertex_shader[] =
+   "#ifdef GL_ES\n"
+   "precision mediump float;\n"
+   "#endif\n"
"attribute vec4 a_position;\n"
"attribute vec4 a_color;\n"
"uniform mat4 u_mvp_mat;\n"
@@ -250,6 +253,9 @@ init_shaders(GLData *gld)
"   v_color = a_color;\n"
"}";
GLbyte fragment_shader[] =
+   "#ifdef GL_ES\n"
+   "precision highp float;\n"
+   "#endif\n"
"varying vec4 v_color;\n"
"void main()\n"
"{\n"

--

[EGIT] [core/elementary] master 01/01: elementary: Add missing EINA_UNUSED in combobox function

2016-01-25 Thread Chris Michael

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=3f0bf22d6218e7bbd50dbcdb62cc64ec850581dc

commit 3f0bf22d6218e7bbd50dbcdb62cc64ec850581dc
Author: Chris Michael 
Date:   Mon Jan 25 07:43:03 2016 -0500

elementary: Add missing EINA_UNUSED in combobox function

_elm_combobox_elm_genlist_filter_set function does not use the Eo *obj
parameter so mark it as EINA_UNUSED to remove compiler warning

Signed-off-by: Chris Michael 
---
 src/lib/elc_combobox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index bac259d..c00c772 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -502,7 +502,7 @@ 
_elm_combobox_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
 }
 
 EOLIAN void
-_elm_combobox_elm_genlist_filter_set(Eo *obj, Elm_Combobox_Data *pd, void *key)
+_elm_combobox_elm_genlist_filter_set(Eo *obj EINA_UNUSED, Elm_Combobox_Data 
*pd, void *key)
 {
pd->first_filter = EINA_FALSE;
 

--

[EGIT] [core/efl] master 01/01: edje: Fix potential NULL pointer dereference

2016-01-25 Thread Chris Michael

devilhorns pushed a commit to branch master.

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

commit 3d9a6e238af3837e273248c71da4d96daef10352
Author: Chris Michael 
Date:   Mon Jan 25 07:47:03 2016 -0500

edje: Fix potential NULL pointer dereference

It is possible that evas_object_data_get here does not return an Edje,
so check the return value. This fixes a coverity reported issue.

@fix
CID1349866

Signed-off-by: Chris Michael 
---
 src/lib/edje/edje_util.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 221bd1d..4bb0e9c 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3505,8 +3505,11 @@ _edje_object_part_swallow(Eo *obj EINA_UNUSED, Edje *ed, 
const char *part, Evas_
 /* the object is already swallowed in the requested part */
 if (rpcur == rp) return EINA_TRUE;
 sed = evas_object_data_get(obj_swallow, ".edje");
-/* The object is already swallowed somewhere, unswallow it first */
-edje_object_part_unswallow(sed->obj, obj_swallow);
+if (sed)
+  {
+ /* The object is already swallowed somewhere, unswallow it first 
*/
+ edje_object_part_unswallow(sed->obj, obj_swallow);
+  }
  }
 
if (!rp)

--

[EGIT] [core/efl] annotated tag v1.17.0-beta3 created (now bc15d54)

2016-01-25 Thread Enlightenment Git

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

stefan pushed a change to annotated tag v1.17.0-beta3
in repository core/efl.

at  bc15d54   (tag)
   tagging  90455285ade87fd9df7deb9da095191670918174 (commit)
  replaces  v1.17.0-beta2
 tagged by  Stefan Schmidt
on  Mon Jan 25 20:52:18 2016 +0100

- Log -
v1.17.0-beta3

Andy Williams (1):
  [efreet] document NULL return possibility.

Carsten Haitzler (1):
  Revert "edje_cc: fix detecting missing part for insert_before/after"

Cedric BAIL (1):
  ector: fix potential crash if cairo is not found on the system.

Chris Michael (7):
  ecore-drm: Cleanup ecore-drm shutdown routine
  ecore-evas-drm: Cleanup drm outputs during shutdown
  ecore-drm: Refactor logind code to use tty functions
  ecore-drm: Destroy any existing eeze watch when we free the device
  ecore-drm: Don't unset logind variable when disconnecting a device
  ecore-drm: Unify and cleanup tty code
  edje: Fix potential NULL pointer dereference

Dave Andreoli (1):
  Ethumb: make the emotion plugin correctly use the edje frame if requested.

Jean-Philippe ANDRÉ (22):
  Eina: Fix eina_file_mk[ds]temp when a path is passed
  Evas GL: Fix shader binaries cache
  elua: Fix use of eina_file_mkstemp after previous patch
  Eina: Convert eina_test_file.c to UTF-8
  Evas GL: Also fix surface cap cache
  Eina: Add proper test case for eina_mk[ds]temp
  Ecore: Remove all temporary files after running make check
  Evas: Fix shader flag 'afill' (forcing alpha to 255)
  Evas: Actually fix this 'afill' thing
  Ector: Fix warning on Windows (use PRIx64 to print uint64_t)
  Evas: Discard shaders cache when the code changed
  Evas: Avoid saving the shaders cache at every shutdown
  Evas GL: Actually save the checksum inside the file
  Eo: Replace deprecated EO_EV_ by EO_BASE_EVENT_
  Eo: Actually mark EO_EV_ as EINA_DEPRECATED
  Eolian Cxx: Fix warnings related to deprecated EO_EV_DEL
  Evas filters: Disable debug mode!
  Evas filters: Fix inconsistency in transform API
  Evas filters: Fix transform filter (crashes & blend)
  Evas filters: Re-enable transform test case, remove dead code
  Evas filters: Change FIXME comment in test case
  ecore_evas_extn: Add safety checks, fixing a crash in elm_test

Jee-Yong Um (2):
  edje_cc: fix detecting missing part for insert_before/after
  edje_cc: remove redundant comments which makes reference seem weird

Ji-Youn Park (2):
  evas: Updated documentation of evas_object_image_save.
  evas: Updated documentation of evas_object_image_save.

Mike Blumenkrantz (3):
  ecore-x: add safety checks for _ecore_x_disp in some functions
  efreet: reject invalid "" data for Efreet_Desktop->x hash
  efreet: add locking for efreet_desktop_x_field_get()

Stefan Schmidt (4):
  build: add hyphen as evas feature to be displayed in summary
  build: sane default setting for hyphen dir
  build: fix some last corner cases for the hyphen dir being set correctly
  release: Update NEWS and bump version for 1.17.0-beta3 release

Vyacheslav Reutskiy (1):
  edje/edje_edit: make posible to unset the program filter part and state

---

No new revisions were added by this update.

--

[EGIT] [core/elementary] master 01/01: release: Update NEWS and bump version for 1.17.0-beta3 release

2016-01-25 Thread Stefan Schmidt

stefan pushed a commit to branch master.

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

commit bdc256b2df449d01d75e709f33d38e9152f30bdd
Author: Stefan Schmidt 
Date:   Mon Jan 25 18:00:33 2016 +0100

release: Update NEWS and bump version for 1.17.0-beta3 release
---
 NEWS | 6 ++
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index f147b65..0503fad 100644
--- a/NEWS
+++ b/NEWS
@@ -89,6 +89,12 @@ Fixes:
* config: try to properly update config for popup new align value. (T3008)
* config: Correct defaults in upgrade of popup conf (T3008)
* Gengrid: improve item_region_show code
+   * elementary: Fix elm_win_window_id_get function (T3058)
+   * Adjust "context_menu_disabled" configuration.
+   * genlist : fix tree item floating issue when homoegeneous mode is enabled 
(T2708)
+   * combobox: move responsibility to define filter and content to the user of 
a combobox
+   * combobox: "return" key handled correctly and removed unreachable code. 
(T3075)
+   * Genlist: do not select the item two times in case of a double click.
 
 Changes since 1.15.0:
 -
diff --git a/configure.ac b/configure.ac
index fc2865c..bc0527f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 EFL_VERSION([1], [17], [0], [release])
-AC_INIT([elementary], [efl_version-beta2], 
[enlightenment-de...@lists.sourceforge.net])
+AC_INIT([elementary], [efl_version-beta3], 
[enlightenment-de...@lists.sourceforge.net])
 
 AC_PREREQ(2.63)
 AC_CONFIG_SRCDIR([configure.ac])

--

[EGIT] [core/enlightenment] master 09/09: fill zone obstacles on x/y axis during useful geometry recalc

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 10c43efc831edf771e198604ed5fffbe25c2fb5c
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 13:45:47 2016 -0500

fill zone obstacles on x/y axis during useful geometry recalc

this fixes an issue where shrinking vertical shelves would cause vertically
maximized windows to always match the height of the shelf

possibly needs improving later depending on usage of zone obstacles in
the future...
---
 src/bin/e_zone.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 2d02fd2..6c46822 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1239,7 +1239,10 @@ _e_zone_useful_geometry_calc(const E_Zone *zone, int dx, 
int dy, int *x, int *y,
EINA_INLIST_FOREACH(zone->obstacles, obs)
  {
 if (!E_INTERSECTS(obs->x, obs->y, obs->w, obs->h, zx, zy, zw, zh)) 
continue;
-eina_tiler_rect_del(tiler, &(Eina_Rectangle){obs->x - zx, obs->y - zy, 
obs->w, obs->h});
+if (obs->w >= obs->h)
+  eina_tiler_rect_del(tiler, &(Eina_Rectangle){0, obs->y - zy, zw, 
obs->h});
+else
+  eina_tiler_rect_del(tiler, &(Eina_Rectangle){obs->x - zx, 0, obs->w, 
zh});
  }
desk = e_desk_at_xy_get(zone, dx, dy);
if (desk)
@@ -1247,7 +1250,10 @@ _e_zone_useful_geometry_calc(const E_Zone *zone, int dx, 
int dy, int *x, int *y,
 EINA_INLIST_FOREACH(desk->obstacles, obs)
   {
  if (!E_INTERSECTS(obs->x, obs->y, obs->w, obs->h, zx, zy, zw, 
zh)) continue;
- eina_tiler_rect_del(tiler, &(Eina_Rectangle){obs->x - zx, obs->y 
- zy, obs->w, obs->h});
+ if (obs->w >= obs->h)
+   eina_tiler_rect_del(tiler, &(Eina_Rectangle){0, obs->y - zy, 
zw, obs->h});
+ else
+   eina_tiler_rect_del(tiler, &(Eina_Rectangle){obs->x - zx, 0, 
obs->w, zh});
   }
  }
it = eina_tiler_iterator_new(tiler);

--

[EGIT] [core/enlightenment] master 01/01: add missing EINA_UNUSED for _xkb_changed_state function

2016-01-25 Thread Chris Michael

devilhorns pushed a commit to branch master.

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

commit c692381f2e5f3294af8e771439f0fb7596c45a6a
Author: Chris Michael 
Date:   Mon Jan 25 14:02:48 2016 -0500

add missing EINA_UNUSED for _xkb_changed_state function

This function does not use the event parameter, so mark it as unused

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

diff --git a/src/modules/xkbswitch/e_mod_main.c 
b/src/modules/xkbswitch/e_mod_main.c
index 8f7f754..14d5747 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -279,7 +279,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class 
EINA_UNUSED, Evas *evas)
 }
 
 static Eina_Bool
-_xkb_changed_state(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+_xkb_changed_state(void *data EINA_UNUSED, int type EINA_UNUSED, void *event 
EINA_UNUSED)
 {
_xkb_update_icon(e_config->xkb.cur_group);
return ECORE_CALLBACK_PASS_ON;

--

[EGIT] [core/elementary] annotated tag v1.17.0-beta3 created (now 31ac1e1)

2016-01-25 Thread Enlightenment Git

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

stefan pushed a change to annotated tag v1.17.0-beta3
in repository core/elementary.

at  31ac1e1   (tag)
   tagging  bdc256b2df449d01d75e709f33d38e9152f30bdd (commit)
  replaces  v1.17.0-beta2
 tagged by  Stefan Schmidt
on  Mon Jan 25 20:55:13 2016 +0100

- Log -
v1.17.0-beta3

Cedric BAIL (1):
  combobox: move responsibility to define filter and content to the user of 
a combobox

Chris Michael (2):
  elementary: Fix elm_win_window_id_get function
  elementary: Add missing EINA_UNUSED in combobox function

Dave Andreoli (7):
  Hoversel: add a test for the populate-on-click scenario
  Combobox: rename the "selected" event to "item,selected" as it should be.
  Adjust "context_menu_disabled" configuration.
  Add a test to reveal a focus bug in Genlist/Gengrid
  Reveal the same focus bug of previous commit also in genlist.
  Genlist/grid: do not set again the focus on double/triple click
  Genlist: do not select the item two times in case of a double click.

Hermet Park (1):
  update author

Jaehyun Cho (1):
  naviframe: Update documentation of item_pop_cb_set and item_pop_to.

Jean-Philippe ANDRÉ (2):
  elm: Replace EO_EV_ by EO_BASE_EVENT_
  elm_test: Show popup error when Plug can't connect

Jee-Yong Um (1):
  elm_hoversel: fix calculation to make items fit to dropdown box

Mike Blumenkrantz (1):
  shelf: add "noshadow" data item to indicate no shadow should be used

Minkyu Kang (2):
  elm_widget: cleanup _elm_widget_on_focus function
  elm_widget: use internal function for clearing the focus

SangHyeon Lee (1):
  genlist : fix tree item floating issue when homoegeneous mode is enabled

Stefan Schmidt (1):
  release: Update NEWS and bump version for 1.17.0-beta3 release

divyesh purohit (2):
  combobox: "return" key handled correctly and removed unreachable code.
  combobox: apply proper style

---

No new revisions were added by this update.

--

[EGIT] [core/emotion_generic_players] annotated tag v1.17.0-beta3 created (now 468b2f4)

2016-01-25 Thread Enlightenment Git

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

stefan pushed a change to annotated tag v1.17.0-beta3
in repository core/emotion_generic_players.

at  468b2f4   (tag)
   tagging  9d642725fe810a4d6319b9e3fdf0c223886620c3 (commit)
  replaces  v1.17.0-beta2
 tagged by  Stefan Schmidt
on  Mon Jan 25 20:55:09 2016 +0100

- Log -
v1.17.0-beta3

Stefan Schmidt (1):
  release: Update NEWS and bump version for 1.17.0-beta3 release

---

No new revisions were added by this update.

--

[EGIT] [core/efl] master 01/01: release: Update NEWS and bump version for 1.17.0-beta3 release

2016-01-25 Thread Stefan Schmidt

stefan pushed a commit to branch master.

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

commit 90455285ade87fd9df7deb9da095191670918174
Author: Stefan Schmidt 
Date:   Mon Jan 25 17:37:38 2016 +0100

release: Update NEWS and bump version for 1.17.0-beta3 release
---
 NEWS | 18 ++
 configure.ac |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 08817b1..dbf959e 100644
--- a/NEWS
+++ b/NEWS
@@ -184,6 +184,24 @@ Fixes:
* win32: Fix compilation due to recent changes in Evil
* embryo: change the log catagory of printf in embryo
* ecore imf: fix imf module load hangs when not even configured
+   * ecore-x: add safety checks for _ecore_x_disp in some functions
+   * Eina: Fix eina_file_mk[ds]temp when a path is passed
+   * elua: Fix use of eina_file_mkstemp after previous patch
+   * Evas GL: Also fix surface cap cache
+   * edje/edje_edit: make posible to unset the program filter part and state
+   * ecore-drm: Cleanup ecore-drm shutdown routine
+   * ecore-evas-drm: Cleanup drm outputs during shutdown
+   * ecore-drm: Refactor logind code to use tty functions
+   * ecore-drm: Destroy any existing eeze watch when we free the device
+   * ecore-drm: Don't unset logind variable when disconnecting a device
+   * ecore-drm: Unify and cleanup tty code
+   * ector: fix potential crash if cairo is not found on the system. (T2938)
+   * Ethumb: make the emotion plugin correctly use the edje frame if requested.
+   * ecore_evas_extn: Add safety checks, fixing a crash in elm_test (T2835)
+   * edje: Fix potential NULL pointer dereference (CID1349866)
+   * efreet: reject invalid "" data for Efreet_Desktop->x hash (T3096)
+   * efreet: add locking for efreet_desktop_x_field_get()
+
 
 Changes since 1.15.0:
 -
diff --git a/configure.ac b/configure.ac
index dac30ce..852e989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 EFL_VERSION([1], [17], [0], [release])
-AC_INIT([efl], [efl_version-beta2], 
[enlightenment-de...@lists.sourceforge.net])
+AC_INIT([efl], [efl_version-beta3], 
[enlightenment-de...@lists.sourceforge.net])
 
 AC_PREREQ([2.60])
 AC_CONFIG_SRCDIR([configure.ac])

--

[EGIT] [core/evas_generic_loaders] annotated tag v1.17.0-beta3 created (now 2283ff9)

2016-01-25 Thread Enlightenment Git

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

stefan pushed a change to annotated tag v1.17.0-beta3
in repository core/evas_generic_loaders.

at  2283ff9   (tag)
   tagging  26976f6328bbd172e93104025540d0cc3280ac0b (commit)
  replaces  v1.17.0-beta2
 tagged by  Stefan Schmidt
on  Mon Jan 25 20:55:04 2016 +0100

- Log -
v1.17.0-beta3

Stefan Schmidt (1):
  release: Update NEWS and bump version for 1.17.0-beta3 release

---

No new revisions were added by this update.

--

[EGIT] [tools/enventor] master 01/01: removed unused textblock tags.

2016-01-25 Thread Hermet Park

hermet pushed a commit to branch master.

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

commit f9edc4363ddc59650186ea7403eb3af517935ee8
Author: Hermet Park 
Date:   Tue Jan 26 00:51:54 2016 +0900

removed unused textblock tags.
---
 data/themes/default/theme_ext.edc | 70 +++
 1 file changed, 4 insertions(+), 66 deletions(-)

diff --git a/data/themes/default/theme_ext.edc 
b/data/themes/default/theme_ext.edc
index 5173170..f8593f5 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -11,73 +11,11 @@
 #define PANEMIN2 16
 #define PANEWID 32
 
-#define ENABLED_TEXTBLOCK_TAGS \
-   tag: "em" "+ font_style=Oblique";   \
-   tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80";\
-   tag: "error" "+ underline=single underline_color=#ff 
underline2_color=#ff";  \
-   tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \
-   tag: "preedit" "+ underline=on underline_color=#3399ff";\
-   tag: "preedit_sel" "+ backing=on backing_color=#00 color=#ff";  \
-   tag: "title" "+ font_size=26";  \
-   tag: "subtitle" "+ font_size=18";   \
-   tag: "bigger" "+ font_size=12"; \
-   tag: "big" "+ font_size=11";\
-   tag: "small" "+ font_size=8";   \
-   tag: "smaller" "+ font_size=7"; \
-   tag: "name" "+ color=#88 font_weight=Bold"; \
-   tag: "val" "+ color=#ff";   \
-   tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30";  \
-   tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030";   \
-   tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030";   \
-   tag: "failure" "+ color=#ff style=glow glow_color=#ff30";   \
-   tag: "code" "+ font=Mono style=plain color=#ff";\
-   tag: "comment" "+ color=#00B000";   \
-   tag: "string" "+ color=#ff3a35";\
-   tag: "number" "+ color=#D4D42A font_weight=Bold";   \
-   tag: "brace" "+ color=#656565"; \
-   tag: "type" "+ color=#3399ff";  \
-   tag: "class" "+ color=#72AAD4 font_weight=Bold";\
-   tag: "function" "+ color=#72AAD4 font_weight=Bold"; \
-   tag: "param" "+ color=#ff"; \
-   tag: "keyword" "+ color=#ff9900 font_weight=Bold";  \
-   tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \
-   tag: "line_added" "+ color=#00B000";\
-   tag: "line_removed" "+ color=#ff3a35";  \
-   tag: "line_changed" "+ color=#ff9900";
+#define ENABLED_TEXTBLOCK_TAGS\
+   tag: "hilight" "+ style=glow glow_color=#3399ff80";\
 
-#define DISABLED_TEXTBLOCK_TAGS\
-   tag: "em" "+ font_style=Oblique";   \
-   tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20";\
-   tag: "error" "+ underline=double underline_color=#ff 
underline2_color=#ff";  \
-   tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on 
underline_color=#101820"; \
-   tag: "preedit" "+ underline=on underline_color=#3399ff88";  \
-   tag: "preedit_sel" "+ backing=on backing_color=#00 color=#88";  \
-   tag: "title" "+ font_size=26";  \
-   tag: "subtitle" "+ font_size=18";   \
-   tag: "bigger" "+ font_size=12"; \
-   tag: "big" "+ font_size=11";\
-   tag: "small" "+ font_size=8";   \
-   tag: "smaller" "+ font_size=7"; \
-   tag: "name" "+ color=#151515 font_weight=Bold"; \
-   tag: "val" "+ color=#151515";   \
-   tag: "info" "+ color=#3399ff60 style=glow glow_color=#3399ff18";\
-   tag: "success" "+ color=#00ff0060 style=glow glow_color=#00ff0018"; \
-   tag: "warning" "+ color=#ff7c0060 style=glow glow_color=#ff7c0018"; \
-   tag: "failure" "+ color=#ff60 style=glow glow_color=#ff18"; \
-   tag: "code" "+ style=shadow,bottom shadow_color=#ff19 font=Mono 
color=#151515"; \
-   tag:

[EGIT] [core/emotion_generic_players] master 01/01: release: Update NEWS and bump version for 1.17.0-beta3 release

2016-01-25 Thread Stefan Schmidt

stefan pushed a commit to branch master.

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

commit 9d642725fe810a4d6319b9e3fdf0c223886620c3
Author: Stefan Schmidt 
Date:   Mon Jan 25 17:58:45 2016 +0100

release: Update NEWS and bump version for 1.17.0-beta3 release
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 84bd98a..0f07bcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 EFL_VERSION([1], [17], [0], [release])
-AC_INIT([emotion_generic_players], [efl_version-beta2], 
[enlightenment-de...@lists.sourceforge.net])
+AC_INIT([emotion_generic_players], [efl_version-beta3], 
[enlightenment-de...@lists.sourceforge.net])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

--

[EGIT] [core/evas_generic_loaders] master 01/01: release: Update NEWS and bump version for 1.17.0-beta3 release

2016-01-25 Thread Stefan Schmidt

stefan pushed a commit to branch master.

http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=26976f6328bbd172e93104025540d0cc3280ac0b

commit 26976f6328bbd172e93104025540d0cc3280ac0b
Author: Stefan Schmidt 
Date:   Mon Jan 25 17:57:54 2016 +0100

release: Update NEWS and bump version for 1.17.0-beta3 release
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index e4c1635..e7a1ef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 EFL_VERSION([1], [17], [0], [release])
-AC_INIT([evas_generic_loaders], [efl_version-beta2], 
[enlightenment-de...@lists.sourceforge.net])
+AC_INIT([evas_generic_loaders], [efl_version-beta3], 
[enlightenment-de...@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

--

[EGIT] [core/efl] master 02/02: efreet: add locking for efreet_desktop_x_field_get()

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 200f45c2b5841133d3999c6b16c980be0d8a04f2
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 11:24:54 2016 -0500

efreet: add locking for efreet_desktop_x_field_get()

in a threaded environment, reading from a hash is not atomic and is
subject to race conditions

@fix

ref 39417cf0ea4e457fbc8d50d120bb8ac776aa366f
---
 src/lib/efreet/efreet_desktop.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index f3cef0c..78d0f51 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -537,8 +537,10 @@ efreet_desktop_x_field_get(Efreet_Desktop *desktop, const 
char *key)
 EINA_SAFETY_ON_NULL_RETURN_VAL(desktop->x, NULL);
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), NULL);
 
+eina_lock_take(&_lock);
 ret = eina_hash_find(desktop->x, key);
 ret = eina_stringshare_add(ret);
+eina_lock_release(&_lock);
 if (ret && (!ret[0]))
   {
  /* invalid null key somehow accepted; remove */

--

[EGIT] [core/efl] master 01/02: efreet: reject invalid "" data for Efreet_Desktop->x hash

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 9aee7c249a8ef237dbc617474c0e45dea8a42475
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 11:20:55 2016 -0500

efreet: reject invalid "" data for Efreet_Desktop->x hash

ref T3096

@fix
---
 src/lib/efreet/efreet_desktop.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index a49a975..f3cef0c 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -515,6 +515,7 @@ efreet_desktop_x_field_set(Efreet_Desktop *desktop, const 
char *key, const char
 {
 EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, EINA_FALSE);
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), EINA_FALSE);
+EINA_SAFETY_ON_TRUE_RETURN_VAL(data && (!data[0]), EINA_FALSE);
 
 eina_lock_take(&_lock);
 if (!desktop->x)
@@ -537,10 +538,15 @@ efreet_desktop_x_field_get(Efreet_Desktop *desktop, const 
char *key)
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), NULL);
 
 ret = eina_hash_find(desktop->x, key);
-if (!ret)
-return NULL;
+ret = eina_stringshare_add(ret);
+if (ret && (!ret[0]))
+  {
+ /* invalid null key somehow accepted; remove */
+ efreet_desktop_x_field_del(desktop, key);
+ eina_stringshare_replace(, NULL);
+  }
 
-return eina_stringshare_add(ret);
+return ret;
 }
 
 EAPI Eina_Bool

--

[EGIT] [core/enlightenment] master 08/09: use desk obstacles for calculating desk-specific zone useful geometry

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit ea2ec5a2f3735c18a752cf2dcfbe2c390eb96f35
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 13:41:13 2016 -0500

use desk obstacles for calculating desk-specific zone useful geometry

typo--
---
 src/bin/e_zone.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index ec28ce0..2d02fd2 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -1244,7 +1244,7 @@ _e_zone_useful_geometry_calc(const E_Zone *zone, int dx, 
int dy, int *x, int *y,
desk = e_desk_at_xy_get(zone, dx, dy);
if (desk)
  {
-EINA_INLIST_FOREACH(zone->obstacles, obs)
+EINA_INLIST_FOREACH(desk->obstacles, obs)
   {
  if (!E_INTERSECTS(obs->x, obs->y, obs->w, obs->h, zx, zy, zw, 
zh)) continue;
  eina_tiler_rect_del(tiler, &(Eina_Rectangle){obs->x - zx, obs->y 
- zy, obs->w, obs->h});

--

[EGIT] [core/enlightenment] master 03/09: disable shelf shadows if "noshadow" data item exists in shelf theme

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit e88823dd1b1ae1f7862abad92b9fc65bd7f90457
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:36:21 2016 -0500

disable shelf shadows if "noshadow" data item exists in shelf theme

this used to be handled by the "shaped" flag back when shelves had their
own windows, but the handling for it was lost during the transition away 
from
the E18 compositor
---
 src/bin/e_shelf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index c80f0bd..41a021f 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -266,7 +266,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char 
*style, E_Layer laye
 
e_shelf_style_set(es, style);
evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y);
-   if (layer == E_LAYER_DESKTOP)
+   if ((layer == E_LAYER_DESKTOP) || edje_object_data_get(es->o_base, 
"noshadow"))
  type = E_COMP_OBJECT_TYPE_NONE;
es->comp_object = e_comp_object_util_add(es->o_base, type);
evas_object_event_callback_add(es->comp_object, EVAS_CALLBACK_HIDE, 
_e_shelf_hidden, es);

--

[EGIT] [core/efl] efl-1.16 02/02: efreet: add locking for efreet_desktop_x_field_get()

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch efl-1.16.

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

commit cf03c8e44d0f72806108b2f5fc1c71be9b3c520b
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 11:24:54 2016 -0500

efreet: add locking for efreet_desktop_x_field_get()

in a threaded environment, reading from a hash is not atomic and is
subject to race conditions

@fix

ref 39417cf0ea4e457fbc8d50d120bb8ac776aa366f
---
 src/lib/efreet/efreet_desktop.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 0846d4b..2874610 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -531,8 +531,10 @@ efreet_desktop_x_field_get(Efreet_Desktop *desktop, const 
char *key)
 EINA_SAFETY_ON_NULL_RETURN_VAL(desktop->x, NULL);
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), NULL);
 
+eina_lock_take(&_lock);
 ret = eina_hash_find(desktop->x, key);
 ret = eina_stringshare_add(ret);
+eina_lock_release(&_lock);
 if (ret && (!ret[0]))
   {
  /* invalid null key somehow accepted; remove */

--

[EGIT] [core/elementary] master 01/01: shelf: add "noshadow" data item to indicate no shadow should be used

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=4382a346eeeab258d3dc53ac435408918c7095ab

commit 4382a346eeeab258d3dc53ac435408918c7095ab
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:32:34 2016 -0500

shelf: add "noshadow" data item to indicate no shadow should be used
---
 data/themes/edc/shelf.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/themes/edc/shelf.edc b/data/themes/edc/shelf.edc
index f4718ce..23e234c 100644
--- a/data/themes/edc/shelf.edc
+++ b/data/themes/edc/shelf.edc
@@ -242,6 +242,7 @@ group { name: "e/shelf/invisible/base"; nomouse;
inherit: "e/shelf/default/base";
data {
   item: "shaped" "1";
+  item: "noshadow" "1";
}
parts {
   part { name: "bg";
@@ -301,6 +302,7 @@ group { name: "e/shelf/translucent/base"; nomouse;
inherit: "e/shelf/default/base";
data {
   item: "shaped" "1";
+  item: "noshadow" "1";
}
parts {
   part { name: "bg";

--

[EGIT] [core/elementary] elementary-1.16 01/01: shelf: add "noshadow" data item to indicate no shadow should be used

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch elementary-1.16.

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

commit b7a977989724ce68f8873b888747417de54affe7
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:32:34 2016 -0500

shelf: add "noshadow" data item to indicate no shadow should be used
---
 data/themes/edc/shelf.edc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/themes/edc/shelf.edc b/data/themes/edc/shelf.edc
index f4718ce..23e234c 100644
--- a/data/themes/edc/shelf.edc
+++ b/data/themes/edc/shelf.edc
@@ -242,6 +242,7 @@ group { name: "e/shelf/invisible/base"; nomouse;
inherit: "e/shelf/default/base";
data {
   item: "shaped" "1";
+  item: "noshadow" "1";
}
parts {
   part { name: "bg";
@@ -301,6 +302,7 @@ group { name: "e/shelf/translucent/base"; nomouse;
inherit: "e/shelf/default/base";
data {
   item: "shaped" "1";
+  item: "noshadow" "1";
}
parts {
   part { name: "bg";

--

[EGIT] [core/efl] efl-1.16 01/02: efreet: reject invalid "" data for Efreet_Desktop->x hash

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch efl-1.16.

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

commit 3c465c62996706f068a51a579196a58ea05941fc
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 11:20:55 2016 -0500

efreet: reject invalid "" data for Efreet_Desktop->x hash

ref T3096

@fix
---
 src/lib/efreet/efreet_desktop.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 3de19be..0846d4b 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -509,6 +509,7 @@ efreet_desktop_x_field_set(Efreet_Desktop *desktop, const 
char *key, const char
 {
 EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, EINA_FALSE);
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), EINA_FALSE);
+EINA_SAFETY_ON_TRUE_RETURN_VAL(data && (!data[0]), EINA_FALSE);
 
 eina_lock_take(&_lock);
 if (!desktop->x)
@@ -531,10 +532,15 @@ efreet_desktop_x_field_get(Efreet_Desktop *desktop, const 
char *key)
 EINA_SAFETY_ON_TRUE_RETURN_VAL(strncmp(key, "X-", 2), NULL);
 
 ret = eina_hash_find(desktop->x, key);
-if (!ret)
-return NULL;
+ret = eina_stringshare_add(ret);
+if (ret && (!ret[0]))
+  {
+ /* invalid null key somehow accepted; remove */
+ efreet_desktop_x_field_del(desktop, key);
+ eina_stringshare_replace(, NULL);
+  }
 
-return eina_stringshare_add(ret);
+return ret;
 }
 
 EAPI Eina_Bool

--

[EGIT] [core/enlightenment] master 07/09: prefer specific context activation for bindings over generic context

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 6a20006ac2483f074a4673a56fffd45dd91b00c7
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 13:10:03 2016 -0500

prefer specific context activation for bindings over generic context

in the case where an ANY context action exists and a SPECIFIC context action
also exists for the exact same binding (eg. alt+click), the action which was
added to the config first would be activated

this is unreliable and confusing since it's impossible for users to 
determine
the order without either manually examining the config or clearing all 
bindings
and starting over, and this presupposes that the user is even aware of such 
an
issue

instead, now the most specific binding context will be chosen, with ANY 
used only
as a fallback in the case where no other binding could be activated for a 
given
scenario
---
 src/bin/e_bindings.c | 85 +++-
 1 file changed, 37 insertions(+), 48 deletions(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 0573b61..5dff5bd 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -424,23 +424,21 @@ e_bindings_mouse_button_find(E_Binding_Context ctxt, 
E_Binding_Event_Mouse_Butto
 {
E_Binding_Mouse *binding;
Eina_List *l;
+   E_Action *act = NULL;
 
EINA_LIST_FOREACH(mouse_bindings, l, binding)
  {
 if ((binding->button == (int)ev->button) &&
 ((binding->any_mod) || (binding->mod == ev->modifiers)))
   {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  if (bind_ret) *bind_ret = binding;
-  return act;
-   }
+ if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ act = e_action_find(binding->action);
+ if (bind_ret) *bind_ret = binding;
+ if (!act) continue;
+ if (binding->ctxt != E_BINDING_CONTEXT_ANY) break;
   }
  }
-   return NULL;
+   return act;
 }
 
 E_API E_Action *
@@ -678,6 +676,7 @@ e_bindings_key_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding
E_Binding_Modifier mod = 0;
E_Binding_Key *binding;
Eina_List *l;
+   E_Action *act = NULL;
 
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding)
@@ -685,18 +684,14 @@ e_bindings_key_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding
 if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
 ((binding->any_mod) || (binding->mod == mod)))
   {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  if (!act) continue;
-  if (bind_ret) *bind_ret = binding;
-  return act;
-   }
+ if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ act = e_action_find(binding->action);
+ if (bind_ret) *bind_ret = binding;
+ if (!act) continue;
+ if (binding->ctxt != E_BINDING_CONTEXT_ANY) break;
   }
  }
-   return NULL;
+   return act;
 }
 
 E_API Eina_Bool
@@ -850,9 +845,9 @@ e_bindings_edge_event_find(E_Binding_Context ctxt, 
E_Event_Zone_Edge *ev, Eina_B
{
   if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
   act = e_action_find(binding->action);
-  if (!act) continue;
   if (bind_ret) *bind_ret = binding;
-  break;
+  if (!act) continue;
+  if (binding->ctxt != E_BINDING_CONTEXT_ANY) break;
}
return act;
 }
@@ -1006,6 +1001,7 @@ e_bindings_signal_find(E_Binding_Context ctxt, const char 
*sig, const char *src,
E_Binding_Modifier mod = 0;
E_Binding_Signal *binding;
Eina_List *l;
+   E_Action *act = NULL;
 
if (strstr(sig, "MOD:Shift")) mod |= E_BINDING_MODIFIER_SHIFT;
if (strstr(sig, "MOD:Control")) mod |= E_BINDING_MODIFIER_CTRL;
@@ -1017,17 +1013,14 @@ e_bindings_signal_find(E_Binding_Context ctxt, const 
char *sig, const char *src,
 (e_util_glob_match(src, binding->src)) &&
 ((binding->any_mod) || (binding->mod == mod)))
   {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  if (bind_ret) *bind_ret = binding;
-  return act;
-   }
+ if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ act = e_action_find(binding->action);
+

[EGIT] [core/enlightenment] master 05/09: add edge binding event find function

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 93b106f17eb97014afd5aac7daaabfac8af903a8
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:51:56 2016 -0500

add edge binding event find function

similar to key/mouse/wheel functions
---
 src/bin/e_bindings.c | 25 +
 src/bin/e_bindings.h |  1 +
 2 files changed, 26 insertions(+)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index ad4d12d..d2af7cf 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -869,6 +869,31 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge 
edge, Eina_Bool drag_onl
 }
 
 E_API E_Action *
+e_bindings_edge_event_find(E_Binding_Context ctxt, E_Event_Zone_Edge *ev, 
Eina_Bool click, E_Binding_Edge **bind_ret)
+{
+   E_Binding_Edge *binding;
+   E_Binding_Modifier mod = 0;
+   E_Action *act = NULL;
+   Eina_List *l;
+
+   mod = _e_bindings_modifiers(ev->modifiers);
+   EINA_LIST_FOREACH(edge_bindings, l, binding)
+ /* A value of <= -1.0 for the delay indicates it as a mouse-click binding 
on that edge */
+ if (((binding->edge == ev->edge)) &&
+ ((click && (binding->delay == -1.0 * click)) || (!click && 
(binding->delay >= 0.0))) &&
+ ((binding->drag_only == ev->drag) || ev->drag) &&
+ ((binding->any_mod) || (binding->mod == mod)))
+   {
+  if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+  act = e_action_find(binding->action);
+  if (!act) continue;
+  if (bind_ret) *bind_ret = binding;
+  break;
+   }
+   return act;
+}
+
+E_API E_Action *
 e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, 
E_Event_Zone_Edge *ev)
 {
E_Binding_Modifier mod = 0;
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index 001c659..0c71c10 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -168,6 +168,7 @@ E_API Eina_Bool   e_bindings_key_allowed(const char *key);
 E_API voide_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge 
edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char 
*action, const char *params, float delay);
 E_API Eina_Bool   e_bindings_edge_flippable_get(E_Zone_Edge edge);
 E_API Eina_Bool   e_bindings_edge_non_flippable_get(E_Zone_Edge edge);
+E_API E_Action *e_bindings_edge_event_find(E_Binding_Context ctxt, 
E_Event_Zone_Edge *ev, Eina_Bool click, E_Binding_Edge **bind_ret);
 E_API E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge 
edge, int click);
 E_API voide_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge 
edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char 
*action, const char *params, float delay);
 E_API E_Action   *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, 
E_Object *obj, E_Event_Zone_Edge *ev);

--

[EGIT] [core/enlightenment] master 06/09: use event-finding functions to simplify key/edge binding handlers

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 37394b26c3189b0a21c424587960a4c3532970e1
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 13:00:11 2016 -0500

use event-finding functions to simplify key/edge binding handlers
---
 src/bin/e_bindings.c | 229 +++
 1 file changed, 66 insertions(+), 163 deletions(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index d2af7cf..0573b61 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -643,69 +643,33 @@ e_bindings_key_ungrab(E_Binding_Context ctxt, 
Ecore_X_Window win)
 E_API E_Action *
 e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, 
Ecore_Event_Key *ev)
 {
-   E_Binding_Modifier mod = 0;
E_Binding_Key *binding;
-   Eina_List *l;
+   E_Action *act;
 
if (bindings_disabled) return NULL;
-   mod = _e_bindings_modifiers(ev->modifiers);
-   EINA_LIST_FOREACH(key_bindings, l, binding)
- {
-if ((binding->key) && ((!strcmp(binding->key, ev->key)) || 
(!strcmp(binding->key, ev->keyname))) &&
-((binding->any_mod) || (binding->mod == mod)))
-  {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  if (act)
-{
-   if (act->func.go_key)
- act->func.go_key(obj, binding->params, ev);
-   else if (act->func.go)
- act->func.go(obj, binding->params);
-   return act;
-}
-  return NULL;
-   }
-  }
- }
-   return NULL;
+   act = e_bindings_key_event_find(ctxt, ev, );
+   if (!act) return NULL;
+   if (act->func.go_key)
+ act->func.go_key(obj, binding->params, ev);
+   else if (act->func.go)
+ act->func.go(obj, binding->params);
+   return act;
 }
 
 E_API E_Action *
 e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, 
Ecore_Event_Key *ev)
 {
-   E_Binding_Modifier mod = 0;
E_Binding_Key *binding;
-   Eina_List *l;
+   E_Action *act;
 
if (bindings_disabled) return NULL;
-   mod = _e_bindings_modifiers(ev->modifiers);
-   EINA_LIST_FOREACH(key_bindings, l, binding)
- {
-if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
-((binding->any_mod) || (binding->mod == mod)))
-  {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  if (act)
-{
-   if (act->func.end_key)
- act->func.end_key(obj, binding->params, ev);
-   else if (act->func.end)
- act->func.end(obj, binding->params);
-   return act;
-}
-  return NULL;
-   }
-  }
- }
-   return NULL;
+   act = e_bindings_key_event_find(ctxt, ev, );
+   if (!act) return NULL;
+   if (act->func.end_key)
+ act->func.end_key(obj, binding->params, ev);
+   else if (act->func.end)
+ act->func.end(obj, binding->params);
+   return act;
 }
 
 E_API E_Action *
@@ -896,161 +860,100 @@ e_bindings_edge_event_find(E_Binding_Context ctxt, 
E_Event_Zone_Edge *ev, Eina_B
 E_API E_Action *
 e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, 
E_Event_Zone_Edge *ev)
 {
-   E_Binding_Modifier mod = 0;
E_Binding_Edge *binding;
E_Desk *current = NULL;
E_Action *act = NULL;
-   Eina_List *l;
+   E_Binding_Edge_Data *ed;
+   E_Event_Zone_Edge *ev2;
 
if (bindings_disabled) return NULL;
current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, 
ev->zone->desk_y_current);
if (current->fullscreen_clients && (!e_config->fullscreen_flip)) return 
NULL;
-
-   if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= 
E_BINDING_MODIFIER_SHIFT;
-   if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= 
E_BINDING_MODIFIER_CTRL;
-   if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
-   if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
-   EINA_LIST_FOREACH(edge_bindings, l, binding)
- {
-/* A value of <= -1.0 for the delay indicates it as a mouse-click 
binding on that edge */
-if (((binding->edge == ev->edge)) && (binding->delay >= 0.0) &&
-((binding->drag_only == ev->drag) || ev->drag) &&
-((binding->any_mod) || (binding->mod == mod)))
-  {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  act = e_action_find(binding->action);
-  if (act)
-

[EGIT] [core/enlightenment] master 04/09: remove e_bindings_key_up_event_find, rename other one to e_bindings_key_event_find

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 6e3b9763b090da0e795112416d0b5e893bd4f75b
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:38:45 2016 -0500

remove e_bindings_key_up_event_find, rename other one to 
e_bindings_key_event_find

key up and key down are identical, having two functions here is misleading
---
 src/bin/e_bindings.c  | 27 +--
 src/bin/e_bindings.h  |  3 +--
 src/modules/syscon/e_syscon.c |  2 +-
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index aef0701..ad4d12d 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -709,7 +709,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Even
 }
 
 E_API E_Action *
-e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev, 
E_Binding_Key **bind_ret)
+e_bindings_key_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev, 
E_Binding_Key **bind_ret)
 {
E_Binding_Modifier mod = 0;
E_Binding_Key *binding;
@@ -735,31 +735,6 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Bi
return NULL;
 }
 
-E_API E_Action *
-e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
-{
-   E_Binding_Modifier mod = 0;
-   E_Binding_Key *binding;
-   Eina_List *l;
-
-   mod = _e_bindings_modifiers(ev->modifiers);
-   EINA_LIST_FOREACH(key_bindings, l, binding)
- {
-if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
-((binding->any_mod) || (binding->mod == mod)))
-  {
- if (_e_bindings_context_match(binding->ctxt, ctxt))
-   {
-  E_Action *act;
-
-  act = e_action_find(binding->action);
-  return act;
-   }
-  }
- }
-   return NULL;
-}
-
 E_API Eina_Bool
 e_bindings_key_allowed(const char *key)
 {
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index adf674f..001c659 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -161,8 +161,7 @@ E_API voide_bindings_key_grab(E_Binding_Context 
ctxt, Ecore_X_Window win
 E_API voide_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window 
win);
 E_API E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Event_Key *ev);
 E_API E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Event_Key *ev);
-E_API E_Action   *e_bindings_key_down_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding_Key **bind_ret);
-E_API E_Action   *e_bindings_key_up_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev);
+E_API E_Action   *e_bindings_key_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding_Key **bind_ret);
 
 E_API Eina_Bool   e_bindings_key_allowed(const char *key);
 
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index be38d9d..ab02573 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -390,7 +390,7 @@ _cb_key_down(EINA_UNUSED void *data, Ecore_Event_Key *ev)
 t = ecore_loop_time_get();
 if (t - show_time > 0.5)
   {
- act = e_bindings_key_down_event_find(E_BINDING_CONTEXT_ANY, ev, 
NULL);
+ act = e_bindings_key_event_find(E_BINDING_CONTEXT_ANY, ev, NULL);
  if ((act) && (act->name))
{
   if (!strcmp(act->name, "syscon"))

--

[EGIT] [core/enlightenment] master 02/09: add extra param to e_bindings_key_down_event_find() to return found binding

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit c637c70f1c50967b575ebd52fd378614d29accc3
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 12:27:54 2016 -0500

add extra param to e_bindings_key_down_event_find() to return found binding

this should match the corresponding mouse binding function
---
 src/bin/e_bindings.c  | 4 +++-
 src/bin/e_bindings.h  | 2 +-
 src/modules/syscon/e_syscon.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 1360529..aef0701 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -709,7 +709,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Even
 }
 
 E_API E_Action *
-e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
+e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev, 
E_Binding_Key **bind_ret)
 {
E_Binding_Modifier mod = 0;
E_Binding_Key *binding;
@@ -726,6 +726,8 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev)
   E_Action *act;
 
   act = e_action_find(binding->action);
+  if (!act) continue;
+  if (bind_ret) *bind_ret = binding;
   return act;
}
   }
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index a06f3ef..adf674f 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -161,7 +161,7 @@ E_API voide_bindings_key_grab(E_Binding_Context 
ctxt, Ecore_X_Window win
 E_API voide_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window 
win);
 E_API E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Event_Key *ev);
 E_API E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, 
E_Object *obj, Ecore_Event_Key *ev);
-E_API E_Action   *e_bindings_key_down_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev);
+E_API E_Action   *e_bindings_key_down_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding_Key **bind_ret);
 E_API E_Action   *e_bindings_key_up_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev);
 
 E_API Eina_Bool   e_bindings_key_allowed(const char *key);
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index 9749b3d..be38d9d 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -390,7 +390,7 @@ _cb_key_down(EINA_UNUSED void *data, Ecore_Event_Key *ev)
 t = ecore_loop_time_get();
 if (t - show_time > 0.5)
   {
- act = e_bindings_key_down_event_find(E_BINDING_CONTEXT_ANY, ev);
+ act = e_bindings_key_down_event_find(E_BINDING_CONTEXT_ANY, ev, 
NULL);
  if ((act) && (act->name))
{
   if (!strcmp(act->name, "syscon"))

--

[EGIT] [core/enlightenment] master 01/09: do not shortcut access of Efreet_Desktop->x hash in fileman

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 6d45baa5109b6781a8f2bf5310a9049970dd34d2
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 11:29:55 2016 -0500

do not shortcut access of Efreet_Desktop->x hash in fileman

this subverts thread safety and also (now) avoids return data validation

fix T3096
---
 src/modules/fileman/e_fwin.c | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 5087cdd..f6cf55f 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -1147,7 +1147,7 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin,
const char *res, *ret = NULL;
 
/* get a X-something custom tage from the .desktop for the dir */
-   res = eina_hash_find(ef->x, key);
+   res = efreet_desktop_x_field_get(ef, key);
/* free the old path */
if (prev_path) eina_stringshare_del(prev_path);
/* if there was no key found - return NULL */
@@ -1155,14 +1155,12 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin,
 
/* it's a full path */
if (res[0] == '/')
- ret = eina_stringshare_add(res);
+ return res;
/* relative path to the dir */
-   else
- {
-snprintf(buf, sizeof(buf), "%s/%s",
- e_fm2_real_path_get(fwin->cur_page->fm_obj), res);
-ret = eina_stringshare_add(buf);
- }
+   snprintf(buf, sizeof(buf), "%s/%s",
+e_fm2_real_path_get(fwin->cur_page->fm_obj), res);
+   ret = eina_stringshare_add(buf);
+   eina_stringshare_del(res);
return ret;
 }
 

--

[EGIT] [core/efl] master 01/01: evas: Fix segfault when trying to determine overlay usage

2016-01-25 Thread Chris Michael

devilhorns pushed a commit to branch master.

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

commit 64aff0a7f02de2d249e3cf908fc572f008576c99
Author: Chris Michael 
Date:   Mon Jan 25 16:10:25 2016 -0500

evas: Fix segfault when trying to determine overlay usage

Previously, _evas_render_can_use_overlay would segfault here when
trying to make use of an Evas_Video_Surface. This is because eo_tmp
variable was never reassigned to be the smart parent before we tried
to get eo data from it.

@fix

NB: Thanks Frenchie !! ;)

Signed-off-by: Chris Michael 
---
 src/lib/evas/canvas/evas_render.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_render.c 
b/src/lib/evas/canvas/evas_render.c
index 1952d60..b3497ee 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -964,8 +964,8 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, 
Evas_Object *eo_obj)
tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS);
while (tmp && !(_evas_render_has_map(tmp) && !_evas_render_can_map(tmp)))
  {
-tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS);
 eo_tmp = tmp->smart.parent;
+tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS);
  }
 
if (tmp && _evas_render_has_map(tmp) && !_evas_render_can_map(tmp))

--

[EGIT] [core/enlightenment] master 01/02: do not update keymap group in _e_comp_wl_input_keymap_update()

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 8678e01ce9472006c6e645403602c3ff919cb455
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 16:29:28 2016 -0500

do not update keymap group in _e_comp_wl_input_keymap_update()

this state is dead, and any group changes which have been made should
be reapplied based on the new state
---
 src/bin/e_comp_wl_input.c | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 61c29a9..5b984fb 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -331,7 +331,7 @@ static void
 _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
 {
char *tmp;
-   xkb_mod_mask_t latched = 0, locked = 0, group = 0;
+   xkb_mod_mask_t latched = 0, locked = 0;
struct wl_resource *res;
Eina_List *l;
 
@@ -353,18 +353,14 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
 locked =
   xkb_state_serialize_mods(e_comp_wl->xkb.state,
XKB_STATE_MODS_LOCKED);
-group =
-  xkb_state_serialize_layout(e_comp_wl->xkb.state,
- XKB_STATE_LAYOUT_EFFECTIVE);
 xkb_state_unref(e_comp_wl->xkb.state);
  }
 
/* create a new xkb state */
e_comp_wl->xkb.state = xkb_state_new(keymap);
 
-   if ((latched) || (locked) || (group))
- xkb_state_update_mask(e_comp_wl->xkb.state, 0,
-   latched, locked, 0, 0, group);
+   xkb_state_update_mask(e_comp_wl->xkb.state, 0,
+ latched, locked, 0, 0, 0);
 
/* increment keymap reference */
e_comp_wl->xkb.keymap = keymap;

--

[EGIT] [core/enlightenment] master 02/02: update xkb.cur_group and send event upon serializing an EFFECTIVE layout in wl input

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit d6772d89113a8c909bbd593b4efb2c4a79eb6528
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 16:31:11 2016 -0500

update xkb.cur_group and send event upon serializing an EFFECTIVE layout in 
wl input

according to xkbcommon, the group returned from serializing the EFFECTIVE 
layout
is the one which is currently active. this array index should match up with 
the
list used in the xkb part of E_Config
---
 src/bin/e_comp_wl_input.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 5b984fb..c733be1 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -522,6 +522,11 @@ e_comp_wl_input_keyboard_modifiers_serialize(void)
 
grp = xkb_state_serialize_layout(e_comp_wl->xkb.state,
 XKB_STATE_LAYOUT_EFFECTIVE);
+   if (grp != e_comp_wl->kbd.mod_group)
+ {
+e_config->xkb.cur_group = grp;
+ecore_event_add(E_EVENT_XKB_CHANGED, NULL, NULL, NULL);
+ }
changed |= grp != e_comp_wl->kbd.mod_group;
e_comp_wl->kbd.mod_group = grp;
return changed;

--

[EGIT] [core/enlightenment] master 01/01: add back binding key->keyname check in e_bindings_key_event_find()

2016-01-25 Thread Mike Blumenkrantz

discomfitor pushed a commit to branch master.

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

commit 6544ae2c652ef39291665d39b7958860ddaa139d
Author: Mike Blumenkrantz 
Date:   Mon Jan 25 16:56:52 2016 -0500

add back binding key->keyname check in e_bindings_key_event_find()

second copy/paste failure of the day...
---
 src/bin/e_bindings.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 5dff5bd..e3a9c63 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -681,7 +681,7 @@ e_bindings_key_event_find(E_Binding_Context ctxt, 
Ecore_Event_Key *ev, E_Binding
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding)
  {
-if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
+if ((binding->key) && (!strcmp(binding->key, ev->key)) && 
(!strcmp(binding->key, ev->keyname)) &&
 ((binding->any_mod) || (binding->mod == mod)))
   {
  if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;

--

[EGIT] [core/elementary] master 01/01: Elm Image: fix usage of animated gif on the same image object more than one time

2016-01-25 Thread Dave Andreoli

davemds pushed a commit to branch master.

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

commit 6b4bc0516b63d684cc3c21aeb5258ab69b906bd2
Author: Dave Andreoli 
Date:   Mon Jan 25 22:17:09 2016 +0100

Elm Image: fix usage of animated gif on the same image object more than one 
time

This patch @fix this usage example:

0. image obj create
1. file_set(an animated gif)
2. animated_set(TRUE) + animated_play_set(TRUE) to make the gif play
3. file_set(a normal image)
... at this point elm_image is confused because it still think that the 
image is animated
4. file_set(an animated gif)
5. animated_set(TRUE) + animated_play_set(TRUE) to make the gif play
...this now do not work because elm think that the image is already animated
---
 src/lib/elm_image.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 7cb9e1c..34ce7c1 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1119,6 +1119,13 @@ _elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data 
*sd, const char *file, cons
if (sd->remote) _elm_url_cancel(sd->remote);
sd->remote = NULL;
 
+   if (sd->anim)
+ {
+ELM_SAFE_FREE(sd->anim_timer, ecore_timer_del);
+sd->play = EINA_FALSE;
+sd->anim = EINA_FALSE;
+ }
+
for (i = 0; i < sizeof (remote_uri) / sizeof (remote_uri[0]); ++i)
  if (file && !strncmp(remote_uri[i], file, strlen(remote_uri[i])))
{

--

[EGIT] [apps/ephoto] master 01/01: Ephoto: Fix some incorrect thumb selection issues.

2016-01-25 Thread Stephen Houston

okra pushed a commit to branch master.

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

commit bcfd488e0f9dc59eeaac255c98ce320f2a2a25e8
Author: Stephen Houston 
Date:   Mon Jan 25 19:53:44 2016 -0600

Ephoto: Fix some incorrect thumb selection issues.
---
 src/bin/ephoto.h   | 1 +
 src/bin/ephoto_main.c  | 8 
 src/bin/ephoto_thumb_browser.c | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 210d879..f7d2a22 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -191,6 +191,7 @@ struct _Ephoto
Ephoto_State state, prev_state;
 
Ephoto_Config *config;
+   Ephoto_Entry *thumb_entry;
 };
 
 struct _Ephoto_Entry
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index d5f5371..e496687 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -38,11 +38,10 @@ _ephoto_thumb_browser_show(Ephoto *ephoto, Ephoto_Entry 
*entry)
_ephoto_state_set(ephoto, EPHOTO_STATE_THUMB);
ephoto_title_set(ephoto, ephoto->config->directory);
 
+   if (ephoto->thumb_entry)
+ elm_gengrid_item_selected_set(ephoto->thumb_entry->item, EINA_TRUE);
if ((entry) && (entry->item))
- {
-elm_gengrid_item_selected_set(entry->item, EINA_TRUE);
-elm_gengrid_item_bring_in(entry->item, ELM_GENGRID_ITEM_SCROLLTO_IN);
- }
+ elm_gengrid_item_bring_in(entry->item, ELM_GENGRID_ITEM_SCROLLTO_IN);
 }
 
 static void
@@ -58,6 +57,7 @@ _ephoto_single_browser_show(Ephoto *ephoto, Ephoto_Entry 
*entry)
  ephoto_single_browser_entries_set(ephoto->single_browser,
  ephoto->entries);
 
+   ephoto->thumb_entry = entry;
ephoto_single_browser_entry_set(ephoto->single_browser, entry);
elm_naviframe_item_simple_promote(ephoto->pager, ephoto->single_browser);
elm_object_focus_set(ephoto->single_browser, EINA_TRUE);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 230386c..c9b2b5e 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -1064,6 +1064,7 @@ _ephoto_thumb_activated(void *data, Evas_Object *obj 
EINA_UNUSED,
  {
 EINA_LIST_FOREACH(selected, s, item)
   {
+ elm_gengrid_item_selected_set(item, EINA_TRUE);
  tb->ephoto->selentries = eina_list_append(tb->ephoto->selentries,
  elm_object_item_data_get(item));
   }

--

[EGIT] [core/elementary] master 01/01: naviframe: Update documentation of item_pop_cb_set and item_pop_to.

2016-01-25 Thread Jaehyun Cho

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5e8b3a042c0840328324a72092f546e7d9dc501c

commit 5e8b3a042c0840328324a72092f546e7d9dc501c
Author: Jaehyun Cho 
Date:   Mon Jan 25 18:13:25 2016 +0900

naviframe: Update documentation of item_pop_cb_set and item_pop_to.
---
 src/lib/elm_naviframe_item.eo | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/lib/elm_naviframe_item.eo b/src/lib/elm_naviframe_item.eo
index f3d70b8..f620e46 100644
--- a/src/lib/elm_naviframe_item.eo
+++ b/src/lib/elm_naviframe_item.eo
@@ -19,6 +19,11 @@ class Elm.Naviframe_Item(Elm.Widget_Item)
 
   The items between the top and the given item will be deleted
   first, and then the top item will be popped at last.
+
+  Warning: The pop callback function set by
+  elm_naviframe_item_pop_cb_set is not called for items between the
+  top item and the destination item since those items are deleted
+  without being popped.
 ]]
 }
   title_enabled_get @const {
@@ -54,6 +59,9 @@ class Elm.Naviframe_Item(Elm.Widget_Item)
   additionally if the function does an exact same logic with
   this $func. When hardware back key is pressed then both
   callbacks will be called.
+  Warning: The pop callback function is called only if the item is
+  popped. Therefore, the pop callback function is not called if the
+  item is deleted without being popped.
 
   @since 1.8
 ]]

--

[EGIT] [tools/abi_checks] master 01/02: Add (missing) v1.16.0 configs.

2016-01-25 Thread Tom Hacohen

tasn pushed a commit to branch master.

http://git.enlightenment.org/tools/abi_checks.git/commit/?id=f8857d4dc6c98fbcd74ca975b6272dd3010afedf

commit f8857d4dc6c98fbcd74ca975b6272dd3010afedf
Author: Tom Hacohen 
Date:   Mon Jan 25 08:59:51 2016 +

Add (missing) v1.16.0 configs.
---
 efl-1.16.0.xml| 12 
 elementary-1.16.0.xml | 11 +++
 2 files changed, 23 insertions(+)

diff --git a/efl-1.16.0.xml b/efl-1.16.0.xml
new file mode 100644
index 000..55c8543
--- /dev/null
+++ b/efl-1.16.0.xml
@@ -0,0 +1,12 @@
+
+1.16.0
+
+
+
+/tmp/efl-1.16.0/usr/include
+
+
+
+/tmp/efl-1.16.0/usr/lib
+
+
diff --git a/elementary-1.16.0.xml b/elementary-1.16.0.xml
new file mode 100644
index 000..3785121
--- /dev/null
+++ b/elementary-1.16.0.xml
@@ -0,0 +1,11 @@
+
+1.16.0
+
+
+
+/tmp/elementary-1.16.0/usr/include
+
+
+
+/tmp/elementary-1.16.0/usr/lib
+

--

[EGIT] [tools/abi_checks] master 02/02: Add .gitignore.

2016-01-25 Thread Tom Hacohen

tasn pushed a commit to branch master.

http://git.enlightenment.org/tools/abi_checks.git/commit/?id=d427794fd82fdf6cf789797d939db7328f3aae36

commit d427794fd82fdf6cf789797d939db7328f3aae36
Author: Tom Hacohen 
Date:   Mon Jan 25 09:00:29 2016 +

Add .gitignore.
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..01897c9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/logs
+/compat_reports

--

[EGIT] [tools/erigo] master 01/01: Fix setting empty string in text fields

2016-01-25 Thread Yakov Goldberg

yakov pushed a commit to branch master.

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

commit d7785eb3c97811dde333dd09b62c8057565eebf9
Author: Yakov Goldberg 
Date:   Mon Jan 25 12:50:26 2016 +0200

Fix setting empty string in text fields

When setting empty string in text field NULL will be assigned.
---
 src/lib/gui_widget.c | 3 +--
 src/lib/gui_widget.h | 6 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 682feeb..073a880 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -3123,8 +3123,7 @@ void
 gui_value_string_set(Gui_Value *val, const char *str)
 {
val->type = GUI_TYPE_STRING;
-   if (str)
- val->string = strdup(str);
+   val->string = str ? strdup(str) : NULL;
 }
 
 void
diff --git a/src/lib/gui_widget.h b/src/lib/gui_widget.h
index f7adb44..d1af747 100644
--- a/src/lib/gui_widget.h
+++ b/src/lib/gui_widget.h
@@ -47,7 +47,11 @@ typedef struct _Item_Container_Item Item_Container_Item;
 {\
void *__p = gui_value_pointer_get(value);\
char *__s = *(char**)(__p);\
-   if (__s) free(__s);\
+   if (__s)\
+{\
+   free(__s);\
+   *(char**)(__p) = NULL;\
+}\
 }\
 
 #define DOUBLE_GET(val) (*((double *) gui_value_pointer_get((val

--

39 matches

Mail list logo