summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-06-20 13:31:05 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-06-20 13:31:05 -0400
commit976fc8566446bcac442682df5d6947dd34f9d455 (patch)
treebab4cf7154d7c06b2c1f954e5ef4e00e8fa1f6d3
parent02bc569e83b5090d2a31a59aeb9745660abb80f4 (diff)
wip
-rw-r--r--src/csd_move.c14
-rw-r--r--src/csd_move2.c2
-rw-r--r--src/ssd_move.c14
-rw-r--r--src/ssd_move2.c16
4 files changed, 32 insertions, 14 deletions
diff --git a/src/csd_move.c b/src/csd_move.c
index 4ee117d..b4ebac0 100644
--- a/src/csd_move.c
+++ b/src/csd_move.c
@@ -7,7 +7,7 @@ move_end()
7{ 7{
8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2)); 8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2));
9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0); 9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0);
10 timed_shot_quit(0.75); 10 timed_shot_quit(1);
11} 11}
12 12
13static void 13static void
@@ -15,7 +15,7 @@ move_next()
15{ 15{
16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4); 16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4);
17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4); 17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4);
18 timed_shot_next(0.75, move_end); 18 timed_shot_next(0.3, move_end);
19} 19}
20 20
21static void 21static void
@@ -23,7 +23,13 @@ move_start()
23{ 23{
24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2)); 24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
25 ecore_evas_pointer_warp(e_comp->ee, e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2)); 25 ecore_evas_pointer_warp(e_comp->ee, e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
26 timed_shot_next(0.75, move_next); 26 timed_shot_next(0.3, move_next);
27}
28
29static void
30next()
31{
32 timed_shot_next(0.3, move_start);
27} 33}
28 34
29static void 35static void
@@ -33,7 +39,7 @@ launched()
33 39
34 cursor_hide(); 40 cursor_hide();
35 mouse_down(ec->x + (ec->w / 2), ec->y + 10, 1, 0); 41 mouse_down(ec->x + (ec->w / 2), ec->y + 10, 1, 0);
36 timed_shot_next(0.75, move_start); 42 comp_show_next(next);
37} 43}
38 44
39TEST_FN(csd_move) 45TEST_FN(csd_move)
diff --git a/src/csd_move2.c b/src/csd_move2.c
index 9a63400..0dee332 100644
--- a/src/csd_move2.c
+++ b/src/csd_move2.c
@@ -7,7 +7,7 @@ move_end()
7{ 7{
8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2)); 8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2));
9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0); 9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0);
10 timed_shot_quit(0.7); 10 timed_shot_quit(1);
11} 11}
12 12
13static void 13static void
diff --git a/src/ssd_move.c b/src/ssd_move.c
index 01d0f53..ba43773 100644
--- a/src/ssd_move.c
+++ b/src/ssd_move.c
@@ -7,7 +7,7 @@ move_end()
7{ 7{
8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2)); 8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2));
9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0); 9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0);
10 timed_shot_quit(0.75); 10 timed_shot_quit(1);
11} 11}
12 12
13static void 13static void
@@ -15,7 +15,7 @@ move_next()
15{ 15{
16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4); 16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4);
17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4); 17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4);
18 timed_shot_next(0.75, move_end); 18 timed_shot_next(0.3, move_end);
19} 19}
20 20
21static void 21static void
@@ -23,7 +23,13 @@ move_start()
23{ 23{
24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2)); 24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
25 ecore_evas_pointer_warp(e_comp->ee, e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2)); 25 ecore_evas_pointer_warp(e_comp->ee, e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
26 timed_shot_next(0.75, move_next); 26 timed_shot_next(0.3, move_next);
27}
28
29static void
30next()
31{
32 timed_shot_next(0.3, move_start);
27} 33}
28 34
29static void 35static void
@@ -33,7 +39,7 @@ launched()
33 39
34 cursor_hide(); 40 cursor_hide();
35 mouse_down(ec->x + (ec->w / 2), ec->y + 5, 1, 0); 41 mouse_down(ec->x + (ec->w / 2), ec->y + 5, 1, 0);
36 timed_shot_next(0.75, move_start); 42 comp_show_next(next);
37} 43}
38 44
39TEST_FN(ssd_move) 45TEST_FN(ssd_move)
diff --git a/src/ssd_move2.c b/src/ssd_move2.c
index b32375e..5d15baf 100644
--- a/src/ssd_move2.c
+++ b/src/ssd_move2.c
@@ -7,7 +7,7 @@ move_end()
7{ 7{
8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2)); 8 fprintf(stderr, "WARP %d,%d\n",e_comp->w / 2,(e_comp->h / 2) - (ec->h / 2));
9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0); 9 mouse_up(e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2), 1, 0);
10 timed_shot_quit(0.75); 10 timed_shot_quit(1);
11} 11}
12 12
13static void 13static void
@@ -15,15 +15,21 @@ move_next()
15{ 15{
16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4); 16 fprintf(stderr, "WARP %d,%d\n",e_comp->w * 3 / 4, e_comp->h * 3 / 4);
17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4); 17 ecore_evas_pointer_warp(e_comp->ee, e_comp->w * 3 / 4, e_comp->h * 3 / 4);
18 timed_shot_next(0.75, move_end); 18 timed_shot_next(0.3, move_end);
19} 19}
20 20
21static void 21static void
22move_start() 22move_start()
23{ 23{
24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2)); 24 fprintf(stderr, "WARP %d,%d\n", e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
25 ecore_evas_pointer_warp(e_comp->ee, 0, 0); 25 ecore_evas_pointer_warp(e_comp->ee, e_comp->w / 2, (e_comp->h / 2) - (ec->h / 2));
26 timed_shot_next(0.75, move_next); 26 timed_shot_next(0.3, move_next);
27}
28
29static void
30next()
31{
32 timed_shot_next(0.3, move_start);
27} 33}
28 34
29static void 35static void
@@ -33,7 +39,7 @@ launched()
33 39
34 cursor_hide(); 40 cursor_hide();
35 mouse_down(ec->x + (ec->w / 2), ec->y + 5, 1, 0); 41 mouse_down(ec->x + (ec->w / 2), ec->y + 5, 1, 0);
36 timed_shot_next(0.75, move_start); 42 comp_show_next(next);
37} 43}
38 44
39TEST_FN(ssd_move2) 45TEST_FN(ssd_move2)