[EGIT] [core/elementary] master 01/01: box: implement Evas.Object_Smart.calculate

2015-12-22 Thread Mike Blumenkrantz 
discomfitor pushed a commit to branch master.

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

commit 193568f7e3b35b6dc8f44d8a2d6eeaacd87f374c
Author: Mike Blumenkrantz 
Date:   Tue Dec 22 13:45:48 2015 -0500

box: implement Evas.Object_Smart.calculate

this allows boxes to be manually calculated

ref T2836
---
 src/lib/elm_box.c  | 8 
 src/lib/elm_box.eo | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 352e956..db38fdc 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -374,6 +374,14 @@ _transition_layout_animation_exec(Evas_Object *obj,
 }
 
 EOLIAN static void
+_elm_box_evas_object_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
+{
+   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+
+   evas_object_smart_calculate(wd->resize_obj);
+}
+
+EOLIAN static void
 _elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
diff --git a/src/lib/elm_box.eo b/src/lib/elm_box.eo
index ca33d26..fb80153 100644
--- a/src/lib/elm_box.eo
+++ b/src/lib/elm_box.eo
@@ -282,6 +282,7 @@ class Elm.Box (Elm.Widget)
   Eo.Base.constructor;
   Evas.Object_Smart.add;
   Evas.Object_Smart.del;
+  Evas.Object_Smart.calculate;
   Elm.Widget.focus_direction;
   Elm.Widget.focus_next_manager_is;
   Elm.Widget.focus_direction_manager_is;

--

[EGIT] [core/efl] master 01/02: evas: unset pointer ungrabs when using EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN

2015-12-22 Thread Mike Blumenkrantz 
discomfitor pushed a commit to branch master.

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

commit e4d11e2e4fd6a1e2a74da2129278ca3bd542046b
Author: Mike Blumenkrantz 
Date:   Tue Dec 22 16:06:30 2015 -0500

evas: unset pointer ungrabs when using 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN

I have no idea what this mode was intended to do since there are no docs
and the related code in evas events is undocumented, so I can only 
speculate.

what I can say for certain is that this mode does grab, in opposition to 
its name,
and that until this commit any object which sets this pointer mode will
permanently break mouse eventing on the canvas

ref evas SVN 67264

@fix
---
 src/lib/evas/canvas/evas_events.c | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index c60526f..3089cf0 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -459,7 +459,8 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, 
Evas *eo_e, Evas_Event_M
  {
 if (src->delete_me) return;
 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
-if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
+if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
+ (child->pointer_mode == 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
 (child->mouse_grabbed > 0))
   {
  child->mouse_grabbed--;
@@ -620,7 +621,8 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, 
Evas *eo_e, Evas_Event_M
  {
 ev->canvas = point;
 child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS);
-if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
+if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
+ (child->pointer_mode == 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) ||
 (child->mouse_grabbed > 0))
   {
  child->mouse_grabbed--;
@@ -1274,7 +1276,8 @@ _evas_canvas_event_feed_mouse_up(Eo *eo_e, 
Evas_Public_Data *e, int b, Evas_Butt
 EINA_LIST_FOREACH(copy, l, eo_obj)
   {
  Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, 
EVAS_OBJECT_CLASS);
- if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
+ if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
+ (obj->pointer_mode == 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
  (obj->mouse_grabbed > 0))
{
   obj->mouse_grabbed--;
@@ -2217,7 +2220,8 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void 
*_pd,
   ev.canvas.xsub = ev.canvas.x; // fixme - lost precision
 if (y != ev.canvas.y)
   ev.canvas.ysub = ev.canvas.y; // fixme - lost precision
-if ((obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
+if (((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
+(obj->pointer_mode == 
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) &&
 (obj->mouse_grabbed > 0))
   {
  obj->mouse_grabbed--;

--

[EGIT] [tools/enventor] master 01/01: Parser: rework parser_collections_block_pos_get function.

2015-12-22 Thread Mykyta Biliavskyi 
nikawhite pushed a commit to branch master.

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

commit 47134c410def62b7491a54747840dc2595dcdc8e
Author: Mykyta Biliavskyi 
Date:   Wed Dec 23 11:23:37 2015 +0900

Parser: rework parser_collections_block_pos_get function.

Make parser recognize the resource blocks (images, styles, etc)
This function uses for getting the insert position of the resource
block.

@fix T2740
---
 src/lib/edc_parser.c | 74 
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 2fc1d51..2f69baf 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -1013,6 +1013,8 @@ static Eina_Bool
 parser_collections_block_pos_get(const Evas_Object *entry,
  const char *block_name, int *ret)
 {
+   if (!ret) return EINA_FALSE;
+
const char* GROUP_SYNTAX_NAME = "group";
const int BLOCK_NAME_LEN = strlen(block_name);
*ret = -1;
@@ -1023,26 +1025,64 @@ parser_collections_block_pos_get(const Evas_Object 
*entry,
char *utf8 = elm_entry_markup_to_utf8(text);
if (!utf8) return EINA_FALSE;
 
-   const char *pos = strstr(utf8, block_name);
-   if (pos)
- {
-/* TODO: Remove this check and process lines of the form
-   "images.image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;" */
-if (*(pos + BLOCK_NAME_LEN + 1) == '.')
-  return EINA_FALSE;
+   int cur_cursor = elm_entry_cursor_pos_get(entry);
+   const char *pos = utf8 + cur_cursor;
 
-pos = strstr(pos, "{\n");
-if (!pos) return EINA_FALSE;
+   int len = strlen(utf8);
 
-*ret = pos - utf8 + 2;
-return EINA_TRUE;
- }
-   pos = strstr(utf8, GROUP_SYNTAX_NAME);
-   if (pos)
+   /*
+* The next loop processing the text of block "group"
+* from actual cursor postion up to the block name or
+* the "group" position.
+* Returned value for the cases when the position
+* found correctly will be the first symbol of the next line.
+*
+* TODO and FIXME: possible wrong behaviour when before the
+* "group" keyword will be found part with name like "blah.group".
+*/
+
+   while (pos && (pos > utf8))
  {
-*ret = pos - utf8;
-return EINA_FALSE;
- }
+int block_pos = strncmp(block_name, pos, BLOCK_NAME_LEN);
+if (block_pos == 0)
+  {
+ const char *block = pos + BLOCK_NAME_LEN;
+ while (block && (block < utf8 + len))
+   {
+  if (*block == '.')
+{
+   block = strchr(block, '\n');
+   *ret = block - utf8 + 1;
+   return EINA_FALSE;
+}
+  else if (*block == '{')
+{
+   block = strchr(block, '\n');
+   *ret = block - utf8 + 1;
+   return EINA_TRUE;
+}
+  block++;
+   }
+ return EINA_FALSE;
+  }
+int group_pos = strncmp(GROUP_SYNTAX_NAME, pos, 5);
+if (group_pos == 0)
+  {
+ const char *group_block = pos + 5;
+ while (group_block && (group_block < utf8 + len))
+   {
+  if (*group_block == '{')
+{
+   group_block = strchr(group_block, '\n');
+   *ret = group_block - utf8 + 1;
+   return EINA_FALSE;
+}
+  group_block++;
+   }
+ return EINA_FALSE;
+  }
+pos--;
+  }
return EINA_FALSE;
 }
 

--

[EGIT] [enlightenment/modules/desksanity] master 01/01: move to single makefile build

2015-12-22 Thread Mike Blumenkrantz 
discomfitor pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=289f356c281de31471f5bce957ab696b01e8dad8

commit 289f356c281de31471f5bce957ab696b01e8dad8
Author: Mike Blumenkrantz 
Date:   Sun Dec 20 19:24:50 2015 -0500

move to single makefile build
---
 Makefile.am |  6 --
 configure.ac|  1 -
 src/Makefile.am | 27 ---
 src/Makefile.mk | 24 
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ebe7e4e..a52b50e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
+
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
   config.sub configure compile depcomp install-sh 
ltmain.sh \
   missing module.desktop config.rpath mkinstalldirs
 
-SUBDIRS = src
-
 #if HAVE_PO
 
 #SUBDIRS += po
@@ -23,6 +23,8 @@ glow_bottom.png \
 glow_top.png
 
 
+include src/Makefile.mk
+
 e-module-desksanity.edj: e-module-desksanity.edc
$(EDJE_CC) -id $(top_srcdir) $< $@
 
diff --git a/configure.ac b/configure.ac
index e546c88..54f9908 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ AC_MSG_RESULT(${EDJE_CC})
 
 AC_OUTPUT([
 Makefile
-src/Makefile
 module.desktop
 e_modules-desksanity.spec
 ], [
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index a3e5990..000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = -I. \
-  -I$(top_srcdir) \
-  -I$(includedir) \
-  -DLOCALEDIR=\"$(datadir)/locale\" \
-  -DPACKAGE_DATA_DIR=\"$(module_dir)/$(PACKAGE)\" \
-  @E_CFLAGS@
-
-pkgdir = $(module_dir)/$(PACKAGE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.h \
-   e_mod_main.c \
-ds_config.c \
-maximize.c \
-moveresize.c \
-pip.c \
-zoom.c \
-magnify.c \
-desksanity.c
-
-module_la_LIBADD = @E_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-clean-local:
-   rm -rf *~
diff --git a/src/Makefile.mk b/src/Makefile.mk
new file mode 100644
index 000..1649c6b
--- /dev/null
+++ b/src/Makefile.mk
@@ -0,0 +1,24 @@
+AM_CPPFLAGS = \
+-Isrc \
+-I$(top_srcdir) \
+-I$(includedir) \
+-DLOCALEDIR=\"$(datadir)/locale\" \
+-DPACKAGE_DATA_DIR=\"$(module_dir)/$(PACKAGE)\" \
+@E_CFLAGS@
+
+pkgdir = $(module_dir)/$(PACKAGE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = \
+src/e_mod_main.h \
+src/e_mod_main.c \
+src/ds_config.c \
+src/maximize.c \
+src/moveresize.c \
+src/pip.c \
+src/zoom.c \
+src/magnify.c \
+src/desksanity.c
+
+module_la_LIBADD = @E_LIBS@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h

--