summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--src/lib/evas/Evas_Eo.h24
-rw-r--r--src/lib/evas/Evas_Legacy.h1
-rw-r--r--src/lib/evas/canvas/evas_events.c114
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/include/evas_private.h1
6 files changed, 113 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 515d66d73b..df5c5e5630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12013-04-03 Rafael Antognolli 12013-04-03 Rafael Antognolli
2 2
3 * Evas: Added evas_event_input_mouse_move() for internal use only. 3 * Evas: Added evas_event_input_mouse_move() for internal use only.
4 * Evas: Added evas_event_input_multi_move() for internal use only.
4 5
52013-04-29 ChunEon Park (Hermet) 62013-04-29 ChunEon Park (Hermet)
6 7
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index e2a6965eed..4750d78d3a 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -191,6 +191,7 @@ enum
191 EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT, 191 EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT,
192 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN, 192 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN,
193 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP, 193 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP,
194 EVAS_CANVAS_SUB_ID_EVENT_INPUT_MULTI_MOVE,
194 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE, 195 EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE,
195 EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN, 196 EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN,
196 EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP, 197 EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP,
@@ -996,6 +997,29 @@ enum
996#define evas_canvas_event_feed_multi_up(d, x, y, rad, radx, rady, pres, ang, fx, fy, flags, timestamp, data) EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP), EO_TYPECHECK(int, d), EO_TYPECHECK(int, x), EO_TYPECHECK(int, y), EO_TYPECHECK(double, rad), EO_TYPECHECK(double, radx), EO_TYPECHECK(double, rady), EO_TYPECHECK(double, pres), EO_TYPECHECK(double, ang), EO_TYPECHECK(double, fx), EO_TYPECHECK(double, fy), EO_TYPECHECK(Evas_Button_Flags, flags), EO_TYPECHECK(unsigned int, timestamp), EO_TYPECHECK(const void *, data) 997#define evas_canvas_event_feed_multi_up(d, x, y, rad, radx, rady, pres, ang, fx, fy, flags, timestamp, data) EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP), EO_TYPECHECK(int, d), EO_TYPECHECK(int, x), EO_TYPECHECK(int, y), EO_TYPECHECK(double, rad), EO_TYPECHECK(double, radx), EO_TYPECHECK(double, rady), EO_TYPECHECK(double, pres), EO_TYPECHECK(double, ang), EO_TYPECHECK(double, fx), EO_TYPECHECK(double, fy), EO_TYPECHECK(Evas_Button_Flags, flags), EO_TYPECHECK(unsigned int, timestamp), EO_TYPECHECK(const void *, data)
997 998
998/** 999/**
1000 * @def evas_canvas_event_input_multi_move
1001 * @since 1.8
1002 *
1003 * No description supplied by the EAPI.
1004 *
1005 * @param[in] d
1006 * @param[in] x
1007 * @param[in] y
1008 * @param[in] rad
1009 * @param[in] radx
1010 * @param[in] rady
1011 * @param[in] pres
1012 * @param[in] ang
1013 * @param[in] fx
1014 * @param[in] fy
1015 * @param[in] timestamp
1016 * @param[in] data
1017 *
1018 * @see evas_event_feed_multi_move
1019 */
1020#define evas_canvas_event_input_multi_move(d, x, y, rad, radx, rady, pres, ang, fx, fy, timestamp, data) EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_INPUT_MULTI_MOVE), EO_TYPECHECK(int, d), EO_TYPECHECK(int, x), EO_TYPECHECK(int, y), EO_TYPECHECK(double, rad), EO_TYPECHECK(double, radx), EO_TYPECHECK(double, rady), EO_TYPECHECK(double, pres), EO_TYPECHECK(double, ang), EO_TYPECHECK(double, fx), EO_TYPECHECK(double, fy), EO_TYPECHECK(unsigned int, timestamp), EO_TYPECHECK(const void *, data)
1021
1022/**
999 * @def evas_canvas_event_feed_multi_move 1023 * @def evas_canvas_event_feed_multi_move
1000 * @since 1.8 1024 * @since 1.8
1001 * 1025 *
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 8e59c9c820..3451acbad3 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -1170,6 +1170,7 @@ EAPI void evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *
1170EAPI void evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data) EINA_ARG_NONNULL(1); 1170EAPI void evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data) EINA_ARG_NONNULL(1);
1171EAPI void evas_event_feed_multi_down(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data); 1171EAPI void evas_event_feed_multi_down(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
1172EAPI void evas_event_feed_multi_up(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data); 1172EAPI void evas_event_feed_multi_up(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
1173EAPI void evas_event_input_multi_move(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
1173EAPI void evas_event_feed_multi_move(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data); 1174EAPI void evas_event_feed_multi_move(Evas *e, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
1174 1175
1175/** 1176/**
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 4c6ca84bdf..10ee07a8ce 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -2373,37 +2373,14 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list)
2373 _evas_unwalk(e); 2373 _evas_unwalk(e);
2374} 2374}
2375 2375
2376EAPI void 2376static void
2377evas_event_feed_multi_move(Evas *eo_e, 2377_canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x,
2378 int d, int x, int y, 2378 int y, double rad, double radx,
2379 double rad, double radx, double rady, 2379 double rady, double pres, double ang,
2380 double pres, double ang, 2380 double fx, double fy,
2381 double fx, double fy, 2381 unsigned int timestamp,
2382 unsigned int timestamp, const void *data) 2382 const void *data)
2383{
2384 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
2385 return;
2386 MAGIC_CHECK_END();
2387
2388 eo_do(eo_e, evas_canvas_event_feed_multi_move(d, x, y, rad, radx, rady, pres, ang, fx, fy, timestamp, data));
2389}
2390
2391void
2392_canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2393{ 2383{
2394 int d = va_arg(*list, int);
2395 int x = va_arg(*list, int);
2396 int y = va_arg(*list, int);
2397 double rad = va_arg(*list, double);
2398 double radx = va_arg(*list, double);
2399 double rady = va_arg(*list, double);
2400 double pres = va_arg(*list, double);
2401 double ang = va_arg(*list, double);
2402 double fx = va_arg(*list, double);
2403 double fy = va_arg(*list, double);
2404 unsigned int timestamp = va_arg(*list, unsigned int);
2405 const void *data = va_arg(*list, const void *);
2406
2407 Evas_Public_Data *e = _pd; 2384 Evas_Public_Data *e = _pd;
2408 2385
2409 if (e->is_frozen) return; 2386 if (e->is_frozen) return;
@@ -2569,6 +2546,83 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2569} 2546}
2570 2547
2571EAPI void 2548EAPI void
2549evas_event_input_multi_move(Evas *eo_e,
2550 int d, int x, int y,
2551 double rad, double radx, double rady,
2552 double pres, double ang,
2553 double fx, double fy,
2554 unsigned int timestamp, const void *data)
2555{
2556 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
2557 return;
2558 MAGIC_CHECK_END();
2559
2560 eo_do(eo_e, evas_canvas_event_input_multi_move(d, x, y, rad, radx, rady,
2561 pres, ang, fx, fy, timestamp,
2562 data));
2563}
2564
2565void
2566_canvas_event_input_multi_move(Eo *eo_e, void *_pd, va_list *list)
2567{
2568 int d = va_arg(*list, int);
2569 int x = va_arg(*list, int);
2570 int y = va_arg(*list, int);
2571 double rad = va_arg(*list, double);
2572 double radx = va_arg(*list, double);
2573 double rady = va_arg(*list, double);
2574 double pres = va_arg(*list, double);
2575 double ang = va_arg(*list, double);
2576 double fx = va_arg(*list, double);
2577 double fy = va_arg(*list, double);
2578 unsigned int timestamp = va_arg(*list, unsigned int);
2579 const void *data = va_arg(*list, const void *);
2580 Evas_Public_Data *e = _pd;
2581
2582 _canvas_event_feed_multi_move_internal(eo_e, _pd, d,
2583 x - e->framespace.x, y - e->framespace.y,
2584 rad, radx, rady,
2585 pres, ang, fx, fy, timestamp, data);
2586}
2587
2588EAPI void
2589evas_event_feed_multi_move(Evas *eo_e,
2590 int d, int x, int y,
2591 double rad, double radx, double rady,
2592 double pres, double ang,
2593 double fx, double fy,
2594 unsigned int timestamp, const void *data)
2595{
2596 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
2597 return;
2598 MAGIC_CHECK_END();
2599
2600 eo_do(eo_e, evas_canvas_event_feed_multi_move(d, x, y, rad, radx, rady,
2601 pres, ang, fx, fy, timestamp,
2602 data));
2603}
2604
2605void
2606_canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2607{
2608 int d = va_arg(*list, int);
2609 int x = va_arg(*list, int);
2610 int y = va_arg(*list, int);
2611 double rad = va_arg(*list, double);
2612 double radx = va_arg(*list, double);
2613 double rady = va_arg(*list, double);
2614 double pres = va_arg(*list, double);
2615 double ang = va_arg(*list, double);
2616 double fx = va_arg(*list, double);
2617 double fy = va_arg(*list, double);
2618 unsigned int timestamp = va_arg(*list, unsigned int);
2619 const void *data = va_arg(*list, const void *);
2620
2621 _canvas_event_feed_multi_move_internal(eo_e, _pd, d, x, y, rad, radx, rady,
2622 pres, ang, fx, fy, timestamp, data);
2623}
2624
2625EAPI void
2572evas_event_feed_key_down(Evas *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data) 2626evas_event_feed_key_down(Evas *eo_e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data)
2573{ 2627{
2574 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 2628 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 4d7ab7a6a0..ce630e33f5 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1044,6 +1044,7 @@ _class_constructor(Eo_Class *klass)
1044 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT), _canvas_event_feed_mouse_out), 1044 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT), _canvas_event_feed_mouse_out),
1045 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN), _canvas_event_feed_multi_down), 1045 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN), _canvas_event_feed_multi_down),
1046 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP), _canvas_event_feed_multi_up), 1046 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP), _canvas_event_feed_multi_up),
1047 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_INPUT_MULTI_MOVE), _canvas_event_input_multi_move),
1047 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE), _canvas_event_feed_multi_move), 1048 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE), _canvas_event_feed_multi_move),
1048 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN), _canvas_event_feed_key_down), 1049 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN), _canvas_event_feed_key_down),
1049 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP), _canvas_event_feed_key_up), 1050 EO_OP_FUNC(EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP), _canvas_event_feed_key_up),
@@ -1145,6 +1146,7 @@ static const Eo_Op_Description op_desc[] = {
1145 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT, "Mouse out event feed."), 1146 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MOUSE_OUT, "Mouse out event feed."),
1146 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN, "Multi down event feed."), 1147 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_DOWN, "Multi down event feed."),
1147 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP, "Multi up event feed."), 1148 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_UP, "Multi up event feed."),
1149 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_INPUT_MULTI_MOVE, "Multi move event input."),
1148 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE, "Multi move event feed."), 1150 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_MULTI_MOVE, "Multi move event feed."),
1149 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN, "Key down event feed"), 1151 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_DOWN, "Key down event feed"),
1150 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP, "Key up event feed"), 1152 EO_OP_DESCRIPTION(EVAS_CANVAS_SUB_ID_EVENT_FEED_KEY_UP, "Key up event feed"),
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index b1f6d56ef3..5db60ace45 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1137,6 +1137,7 @@ void _canvas_event_feed_mouse_in(Eo *e, void *_pd, va_list *list);
1137void _canvas_event_feed_mouse_out(Eo *e, void *_pd, va_list *list); 1137void _canvas_event_feed_mouse_out(Eo *e, void *_pd, va_list *list);
1138void _canvas_event_feed_multi_down(Eo *e, void *_pd, va_list *list); 1138void _canvas_event_feed_multi_down(Eo *e, void *_pd, va_list *list);
1139void _canvas_event_feed_multi_up(Eo *e, void *_pd, va_list *list); 1139void _canvas_event_feed_multi_up(Eo *e, void *_pd, va_list *list);
1140void _canvas_event_input_multi_move(Eo *e, void *_pd, va_list *list);
1140void _canvas_event_feed_multi_move(Eo *e, void *_pd, va_list *list); 1141void _canvas_event_feed_multi_move(Eo *e, void *_pd, va_list *list);
1141void _canvas_event_feed_key_down(Eo *e, void *_pd, va_list *list); 1142void _canvas_event_feed_key_down(Eo *e, void *_pd, va_list *list);
1142void _canvas_event_feed_key_up(Eo *e, void *_pd, va_list *list); 1143void _canvas_event_feed_key_up(Eo *e, void *_pd, va_list *list);