[EGIT] [core/efl] master 01/01: eolian-cxx: Removed unused function
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=51d9760fe648179aa660c893dbb965a7e5cc7f18
commit 51d9760fe648179aa660c893dbb965a7e5cc7f18
Author: Felipe Magno de Almeida fel...@expertisesolutions.com.br
Date: Tue Jun 2 14:32:45 2015 -0300
eolian-cxx: Removed unused function
Removed unused function and consequent warning
---
src/bin/eolian_cxx/convert.cc | 7 ---
1 file changed, 7 deletions(-)
diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 0b75183..051c6e3 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -108,13 +108,6 @@ _convert_eolian_parameters(Eina_Iterator *parameters,
}
static efl::eolian::parameters_container_type
-_convert_eolian_parameters(Eolian_Function const func, getter_t func_type)
-{
- return _convert_eolian_parameters
- (::eolian_function_parameters_get(func), func_type.value);
-}
-
-static efl::eolian::parameters_container_type
_convert_eolian_parameters(Eina_Iterator *parameters, getter_t func_type)
{
return _convert_eolian_parameters(parameters, func_type.value);
--
[EGIT] [core/efl] master 01/01: ecore-x: add new grab touch devices functionality.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2017c8be95c06a905a363838922176931cd2a34f
commit 2017c8be95c06a905a363838922176931cd2a34f
Author: Lukasz Stanislawski l.stanisl...@samsung.com
Date: Thu Jun 4 13:06:27 2015 -0400
ecore-x: add new grab touch devices functionality.
Summary:
EFL currently supports pointer grabbing. This patch introduces new API
allowing to grab all slave touch devices registered in X server
Grabbing is performed by XIGrabDevice function from XInput 2.0.
By default ecore_x_input_touch_devices_grab grabs all XISlavePointer
devices,
having XITouchInfoClass. Function returns EINA_TRUE if at least one touch
device
was successfully grabbed. ecore_x_input_touch_devices_ungrab ungrabs all
previously grabbed devices.
To process events correctly change has been done in x_input_handler to
emulate
mouse pointer events. If XITouchEmulatingPointer flag is set on touch
events and
device is grabbed framework will generate mouse events. This is required
due to X Server design in which mouse events are no longer send to client
when device is
detached (grabbed) from virtual core pointer.
@feature
Reviewers: cedric, raster, devilhorns
Subscribers: seoz, cedric
Differential Revision: https://phab.enlightenment.org/D2568
---
src/lib/ecore_x/Ecore_X.h | 2 +
src/lib/ecore_x/xcb/ecore_xcb_input.c | 14
src/lib/ecore_x/xlib/ecore_x_xi2.c| 117 +-
3 files changed, 132 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 86a33c9..8c3a41f 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2533,6 +2533,8 @@ EAPI Eina_Bool ecore_x_image_to_argb_convert(void
*src, int sbpp, int sbpl,
EAPI Eina_Bool ecore_x_input_multi_select(Ecore_X_Window win); /**
@since 1.13 */
EAPI Eina_Bool ecore_x_input_raw_select(Ecore_X_Window win); /** @since
1.8 */
+EAPI Eina_Bool ecore_x_input_touch_devices_grab(Ecore_X_Window win); /**
@since 1.15 */
+EAPI Eina_Bool ecore_x_input_touch_devices_ungrab(void); /** @since 1.15
*/
EAPI Eina_Bool ecore_x_vsync_animator_tick_source_set(Ecore_X_Window win);
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_input.c
b/src/lib/ecore_x/xcb/ecore_xcb_input.c
index e94cc80..cd9e488 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_input.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_input.c
@@ -279,3 +279,17 @@ ecore_x_input_raw_select(Ecore_X_Window win EINA_UNUSED)
/* NB: FIXME: This is just a placeholder. XCB does not have XInput2 yet */
return EINA_FALSE;
}
+
+EAPI Eina_Bool
+ecore_x_input_touch_devices_grab(Ecore_X_Window win EINA_UNUSED)
+{
+ /* NB: FIXME: This is just a placeholder. XCB does not have XInput2 yet */
+ return EINA_FALSE;
+}
+
+EAPI Eina_Bool
+ecore_x_input_touch_devices_ungrab(void)
+{
+ /* NB: FIXME: This is just a placeholder. XCB does not have XInput2 yet */
+ return EINA_FALSE;
+}
diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c
b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index 832b424..d18bbab 100644
--- a/src/lib/ecore_x/xlib/ecore_x_xi2.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c
@@ -41,6 +41,7 @@ static int _ecore_x_xi2_num = 0;
#ifdef ECORE_XI2_2
static Eina_Inlist *_ecore_x_xi2_touch_info_list = NULL;
#endif /* ifdef ECORE_XI2_2 */
+static Eina_List *_ecore_x_xi2_grabbed_devices_list;
#endif /* ifdef ECORE_XI2 */
void
@@ -140,6 +141,10 @@ _ecore_x_input_shutdown(void)
_ecore_x_xi2_num = 0;
_ecore_x_xi2_opcode = -1;
+
+ if (_ecore_x_xi2_grabbed_devices_list)
+ eina_list_free(_ecore_x_xi2_grabbed_devices_list);
+ _ecore_x_xi2_grabbed_devices_list = NULL;
#endif /* ifdef ECORE_XI2 */
}
@@ -271,6 +276,23 @@ _ecore_x_input_raw_handler(XEvent *xevent)
#endif /* ifdef ECORE_XI2 */
}
+static Eina_Bool
+_ecore_x_input_grabbed_is(int deviceId)
+{
+#ifdef ECORE_XI2
+ void *id;
+ Eina_List *l;
+
+ EINA_LIST_FOREACH(_ecore_x_xi2_grabbed_devices_list, l, id)
+ {
+if (deviceId == (intptr_t)id)
+ return EINA_TRUE;
+ }
+#endif /* ifdef ECORE_XI2 */
+
+ return EINA_FALSE;
+}
+
void
_ecore_x_input_mouse_handler(XEvent *xevent)
{
@@ -282,6 +304,9 @@ _ecore_x_input_mouse_handler(XEvent *xevent)
switch (xevent-xcookie.evtype)
{
+ case XI_TouchUpdate:
+ if (!_ecore_x_input_grabbed_is(devid))
+ break;
case XI_Motion:
INF(Handling XI_Motion);
_ecore_mouse_move
@@ -300,6 +325,9 @@ _ecore_x_input_mouse_handler(XEvent *xevent)
evd-root_x, evd-root_y);
break;
+ case XI_TouchBegin:
+ if (!_ecore_x_input_grabbed_is(devid))
+ break;
case XI_ButtonPress:
INF(ButtonEvent:multi press time=%u x=%d y=%d devid=%d, (unsigned
int)evd-time, (int)evd-event_x, (int)evd-event_y, devid);
[EGIT] [core/efl] master 02/03: Evas image: Fix some Eolian warnings.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=183541cc75203ed0869c5a4974b974e49bc989a5
commit 183541cc75203ed0869c5a4974b974e49bc989a5
Author: Tom Hacohen t...@stosb.com
Date: Thu Jun 4 10:15:29 2015 +0100
Evas image: Fix some Eolian warnings.
---
src/lib/evas/canvas/evas_image.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_image.eo
b/src/lib/evas/canvas/evas_image.eo
index fc25f3f..555ee90 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -88,7 +88,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image,
Efl.Gfx.Fill, Efl.Gfx.View)
@see evas_object_image_source_set() for more details */
}
values {
-src: Evas_Object *; /*@ Source object to use for the proxy. */
+src: Evas.Object *; /*@ Source object to use for the proxy. */
}
}
@property filled {
--
[EGIT] [core/efl] master 01/03: Evas canvas: Fix some Eolian warnings.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b9a3b069844941fdfd21e9bb92c89cc1a7cd396e
commit b9a3b069844941fdfd21e9bb92c89cc1a7cd396e
Author: Tom Hacohen t...@stosb.com
Date: Thu Jun 4 10:15:16 2015 +0100
Evas canvas: Fix some Eolian warnings.
---
src/lib/evas/canvas/evas_canvas.eo | 70 +++---
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/lib/evas/canvas/evas_canvas.eo
b/src/lib/evas/canvas/evas_canvas.eo
index f27fda0..d6dc105 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -25,10 +25,10 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@since 1.1 */
}
values {
-x: Evas_Coord; /*@ The left coordinate in output units, usually
pixels. */
-y: Evas_Coord; /*@ The top coordinate in output units, usually
pixels. */
-w: Evas_Coord; /*@ The width in output units, usually pixels. */
-h: Evas_Coord; /*@ The height in output units, usually pixels. */
+x: Evas.Coord; /*@ The left coordinate in output units, usually
pixels. */
+y: Evas.Coord; /*@ The top coordinate in output units, usually
pixels. */
+w: Evas.Coord; /*@ The width in output units, usually pixels. */
+h: Evas.Coord; /*@ The height in output units, usually pixels. */
}
}
@property output_viewport {
@@ -65,10 +65,10 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@endcode */
}
values {
-x: Evas_Coord; /*@ The top-left corner x value of the viewport. */
-y: Evas_Coord; /*@ The top-left corner y value of the viewport. */
-w: Evas_Coord; /*@ The width of the viewport. Must be greater
than 0. */
-h: Evas_Coord; /*@ The height of the viewport. Must be greater
than 0. */
+x: Evas.Coord; /*@ The top-left corner x value of the viewport. */
+y: Evas.Coord; /*@ The top-left corner y value of the viewport. */
+w: Evas.Coord; /*@ The width of the viewport. Must be greater
than 0. */
+h: Evas.Coord; /*@ The height of the viewport. Must be greater
than 0. */
}
}
@property image_cache {
@@ -302,7 +302,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
focused rectangle. See the full @ref Example_Evas_Events example.
@ingroup Evas_Object_Group_Find */
-return: Evas_Object * @warn_unused;
+return: Evas.Object * @warn_unused;
}
}
@property object_top {
@@ -325,7 +325,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@warning This function will @b skip objects parented by smart
objects, acting only on the ones at the top level, with regard to
object parenting. */
-return: Evas_Object * @warn_unused;
+return: Evas.Object * @warn_unused;
}
}
@property key_lock {
@@ -366,8 +366,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@endcode */
}
values {
-x: Evas_Coord; /*@ The pointer to a Evas_Coord to be filled in */
-y: Evas_Coord; /*@ The pointer to a Evas_Coord to be filled in
+x: Evas.Coord; /*@ The pointer to a Evas_Coord to be filled in */
+y: Evas.Coord; /*@ The pointer to a Evas_Coord to be filled in
@ingroup Evas_Pointer_Group */
}
}
@@ -517,7 +517,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
@warning This function will @b skip objects parented by smart
objects, acting only on the ones at the top level, with regard to
object parenting. */
-return: Evas_Object * @warn_unused;
+return: Evas.Object * @warn_unused;
}
}
@property key_modifier {
@@ -592,7 +592,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
return: listEvas.Object * * @warn_unused;
params {
-@in stop: Evas_Object *; /*@ An Evas Object where to stop
searching. */
+@in stop: Evas.Object *; /*@ An Evas Object where to stop
searching. */
@in x: int; /*@ The horizontal coordinate of the position. */
@in y: int; /*@ The vertical coordinate of the position. */
}
@@ -808,8 +808,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
object parenting. */
return: listEvas.Object * * @warn_unused;
params {
-@in x: Evas_Coord; /*@ The horizontal coordinate of the position */
-@in y: Evas_Coord; /*@ The vertical coordinate of the position */
+@in x: Evas.Coord; /*@ The horizontal coordinate of the position */
+@in y: Evas.Coord; /*@ The vertical coordinate of the position */
@in
[EGIT] [core/efl] master 03/03: Evas 3d texture: Fix some Eolian warnings.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=20934fa03da25b2923192926d9a13b8201311b2e
commit 20934fa03da25b2923192926d9a13b8201311b2e
Author: Tom Hacohen t...@stosb.com
Date: Thu Jun 4 10:15:41 2015 +0100
Evas 3d texture: Fix some Eolian warnings.
---
src/lib/evas/canvas/evas_3d_texture.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_3d_texture.eo
b/src/lib/evas/canvas/evas_3d_texture.eo
index 4abd244..0063146 100644
--- a/src/lib/evas/canvas/evas_3d_texture.eo
+++ b/src/lib/evas/canvas/evas_3d_texture.eo
@@ -97,7 +97,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
*/
params {
-@in source: Evas_Object *; /*@ Source evas object to be used as
the texture data. */
+@in source: Evas.Object *; /*@ Source evas object to be used as
the texture data. */
}
}
--
[EGIT] [tools/exactness] master 01/01: Avoid comparing of tests in play step having common prefix
tasn pushed a commit to branch master.
http://git.enlightenment.org/tools/exactness.git/commit/?id=773e5390834e2a6d025c1e4ad816357fede9d39a
commit 773e5390834e2a6d025c1e4ad816357fede9d39a
Author: kabeer khan kabeer.k...@samsung.com
Date: Thu Jun 4 10:50:33 2015 +0100
Avoid comparing of tests in play step having common prefix
Summary:
Currently genlist_group is also running in play step even if it is
commented in tests.txt. Fixed this issue
Signed-off-by: kabeer khan kabeer.k...@samsung.com
Reviewers: cedric, stefan_schmidt, tasn
Subscribers: stefan_schmidt
Differential Revision: https://phab.enlightenment.org/D2604
---
src/bin/run_test.c | 3 ++-
src/lib/tsuite_evas_hook.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/run_test.c b/src/bin/run_test.c
index 7e8fd76..3b4ee47 100644
--- a/src/bin/run_test.c
+++ b/src/bin/run_test.c
@@ -121,7 +121,8 @@ static void
_compare_list_cb(const char *name, const char *path EINA_UNUSED, void *data)
{
const char *prefix = data;
- if (!strncmp(name, prefix, strlen(prefix)))
+ unsigned int len = strlen(prefix);
+ if (!strncmp(name, prefix, len) (strlen(name) len) (name[len] ==
'+'))
{
char filename1[EXACTNESS_PATH_MAX], filename2[EXACTNESS_PATH_MAX];
snprintf(filename1, EXACTNESS_PATH_MAX, %s/%s/%s,
exactness_config.dest_dir, CURRENT_SUBDIR, name);
diff --git a/src/lib/tsuite_evas_hook.c b/src/lib/tsuite_evas_hook.c
index e9d1516..025186c 100644
--- a/src/lib/tsuite_evas_hook.c
+++ b/src/lib/tsuite_evas_hook.c
@@ -203,7 +203,7 @@ tsuite_shot_do(char *name, Evas *e)
if (_hook_setting-dest_dir)
sprintf(filename, %s/, _hook_setting-dest_dir);
-sprintf(filename + dir_name_len, %s_%03d%s, _hook_setting-test_name,
+sprintf(filename + dir_name_len, %s+%03d%s, _hook_setting-test_name,
ts.serial, IMAGE_FILENAME_EXT);
}
_tsuite_verbosef(Shot taken (%s).\n, filename);
--
