summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2014-01-04 13:25:21 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2014-01-04 13:25:21 +0900
commit3ebc18731fa3712e9f7b29758908bf19fec7df83 (patch)
treea8aa6907b8c4be867689d02331aab1288e68af7e
parent9637c2b835c4b48b84a4509d57c1af19d1b8608f (diff)
Use key instead of keyname for considering setxkbmap
-rw-r--r--doc/ecore_examples.dox8
-rw-r--r--doc/edje_examples.dox6
-rw-r--r--doc/evas_examples.dox14
-rw-r--r--src/examples/ecore/ecore_evas_window_sizes_example.c12
-rw-r--r--src/examples/edje/edje-animations.c6
-rw-r--r--src/examples/edje/edje-basic.c10
-rw-r--r--src/examples/edje/edje-basic2.c12
-rw-r--r--src/examples/edje/edje-box.c12
-rw-r--r--src/examples/edje/edje-box2.c8
-rw-r--r--src/examples/edje/edje-drag.c16
-rw-r--r--src/examples/edje/edje-perspective.c22
-rw-r--r--src/examples/edje/edje-signals-messages.c8
-rw-r--r--src/examples/edje/sigtest.c14
-rw-r--r--src/examples/emotion/emotion_border_example.c24
-rw-r--r--src/examples/emotion/emotion_generic_example.c24
-rw-r--r--src/examples/ephysics/test_bouncing_ball.c8
-rw-r--r--src/examples/ephysics/test_velocity.c8
-rw-r--r--src/examples/evas/evas-aspect-hints.c10
-rw-r--r--src/examples/evas/evas-box.c30
-rw-r--r--src/examples/evas/evas-events.c16
-rw-r--r--src/examples/evas/evas-hints.c14
-rw-r--r--src/examples/evas/evas-images.c24
-rw-r--r--src/examples/evas/evas-images2.c12
-rw-r--r--src/examples/evas/evas-images3.c6
-rw-r--r--src/examples/evas/evas-map-utils.c2
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c10
-rw-r--r--src/examples/evas/evas-object-manipulation.c10
-rw-r--r--src/examples/evas/evas-smart-interface.c22
-rw-r--r--src/examples/evas/evas-smart-object.c28
-rw-r--r--src/examples/evas/evas-stacking.c20
-rw-r--r--src/examples/evas/evas-text.c18
-rw-r--r--src/lib/ecore_imf_evas/Ecore_IMF_Evas.h4
-rw-r--r--src/lib/evas/Evas_Legacy.h8
33 files changed, 223 insertions, 223 deletions
diff --git a/doc/ecore_examples.dox b/doc/ecore_examples.dox
index e7fc673..cc7f063 100644
--- a/doc/ecore_examples.dox
+++ b/doc/ecore_examples.dox
@@ -1317,7 +1317,7 @@
1317 * ones on our window. Test it by trying to resize it to smaller sizes 1317 * ones on our window. Test it by trying to resize it to smaller sizes
1318 * than that: 1318 * than that:
1319 * @dontinclude ecore_evas_window_sizes_example.c 1319 * @dontinclude ecore_evas_window_sizes_example.c
1320 * @skip keyname, "m" 1320 * @skip key, "m"
1321 * @until } 1321 * @until }
1322 * @until } 1322 * @until }
1323 * @until } 1323 * @until }
@@ -1326,7 +1326,7 @@
1326 * to two times our initial size. Test it by trying to resize the 1326 * to two times our initial size. Test it by trying to resize the
1327 * window to bigger sizes than that: 1327 * window to bigger sizes than that:
1328 * @dontinclude ecore_evas_window_sizes_example.c 1328 * @dontinclude ecore_evas_window_sizes_example.c
1329 * @skip keyname, "x" 1329 * @skip key, "x"
1330 * @until } 1330 * @until }
1331 * @until } 1331 * @until }
1332 * @until } 1332 * @until }
@@ -1335,7 +1335,7 @@
1335 * with the @c 'b' key. It will set a base size of two times the 1335 * with the @c 'b' key. It will set a base size of two times the
1336 * initial one: 1336 * initial one:
1337 * @dontinclude ecore_evas_window_sizes_example.c 1337 * @dontinclude ecore_evas_window_sizes_example.c
1338 * @skip keyname, "b" 1338 * @skip key, "b"
1339 * @until } 1339 * @until }
1340 * @until } 1340 * @until }
1341 * @until } 1341 * @until }
@@ -1344,7 +1344,7 @@
1344 * pixels. With than on (@c 's' key), you'll see the window will 1344 * pixels. With than on (@c 's' key), you'll see the window will
1345 * always be bound to @b multiples of that size, for dimensions on 1345 * always be bound to @b multiples of that size, for dimensions on
1346 * both axis: 1346 * both axis:
1347 * @skip keyname, "s" 1347 * @skip key, "s"
1348 * @until } 1348 * @until }
1349 * @until } 1349 * @until }
1350 * @until } 1350 * @until }
diff --git a/doc/edje_examples.dox b/doc/edje_examples.dox
index f44e0fa..c15dfb6 100644
--- a/doc/edje_examples.dox
+++ b/doc/edje_examples.dox
@@ -119,7 +119,7 @@
119 * scale). Scaling will be applied to @c "part_one", only, because 119 * scale). Scaling will be applied to @c "part_one", only, because
120 * that's the part flagged to be scaled at EDC level: 120 * that's the part flagged to be scaled at EDC level:
121 * @dontinclude edje-basic.c 121 * @dontinclude edje-basic.c
122 * @skip strcmp(ev->keyname, "s") == 0 122 * @skip strcmp(ev->key, "s") == 0
123 * @until } 123 * @until }
124 * 124 *
125 * Note, finally, that the @c 's' command will depend on the 'r' one 125 * Note, finally, that the @c 's' command will depend on the 'r' one
@@ -128,7 +128,7 @@
128 * scaling factor. Only when the individual one is set to zero, will 128 * scaling factor. Only when the individual one is set to zero, will
129 * the global one take effect: 129 * the global one take effect:
130 * @dontinclude edje-basic.c 130 * @dontinclude edje-basic.c
131 * @skip strcmp(ev->keyname, "r") == 0 131 * @skip strcmp(ev->key, "r") == 0
132 * @until } 132 * @until }
133 * 133 *
134 * 134 *
@@ -810,7 +810,7 @@
810 * @until } 810 * @until }
811 * @until } 811 * @until }
812 * @dontinclude edje-signals-messages.c 812 * @dontinclude edje-signals-messages.c
813 * @skip keyname, "t" 813 * @skip key, "t"
814 * @until } 814 * @until }
815 * 815 *
816 * The example's window should look like this picture: 816 * The example's window should look like this picture:
diff --git a/doc/evas_examples.dox b/doc/evas_examples.dox
index 103b8ea..809132f 100644
--- a/doc/evas_examples.dox
+++ b/doc/evas_examples.dox
@@ -127,7 +127,7 @@
127 * @until ; 127 * @until ;
128 * The 'p' one will change the source of the proxy image to one of the 128 * The 'p' one will change the source of the proxy image to one of the
129 * other two, as seem above. 129 * other two, as seem above.
130 * @skip if (strcmp(ev->keyname, "p") == 0) 130 * @skip if (strcmp(ev->key, "p") == 0)
131 * @until } 131 * @until }
132 * Note the top right image, the smaller one: 132 * Note the top right image, the smaller one:
133 * @dontinclude evas-images2.c 133 * @dontinclude evas-images2.c
@@ -158,7 +158,7 @@
158 * The 's' command will save one of the images on the disk, in the png 158 * The 's' command will save one of the images on the disk, in the png
159 * format: 159 * format:
160 * @dontinclude evas-images2.c 160 * @dontinclude evas-images2.c
161 * @skip if (strcmp(ev->keyname, "a") == 0) 161 * @skip if (strcmp(ev->key, "a") == 0)
162 * @until } 162 * @until }
163 * 163 *
164 * The full example follows. 164 * The full example follows.
@@ -266,13 +266,13 @@
266 * processing for the canvas (in the example, just for 3 seconds). Try 266 * processing for the canvas (in the example, just for 3 seconds). Try
267 * to issue events for it during that freeze time: 267 * to issue events for it during that freeze time:
268 * @dontinclude evas-events.c 268 * @dontinclude evas-events.c
269 * @skip if (strcmp(ev->keyname, "f") == 0) 269 * @skip if (strcmp(ev->key, "f") == 0)
270 * @until } 270 * @until }
271 * The 'd' command will unregister those two canvas callbacks for you, 271 * The 'd' command will unregister those two canvas callbacks for you,
272 * so you won't see the messages about the focused object and the 272 * so you won't see the messages about the focused object and the
273 * rendering process anymore: 273 * rendering process anymore:
274 * @dontinclude evas-events.c 274 * @dontinclude evas-events.c
275 * @skip if (strcmp(ev->keyname, "d") == 0) 275 * @skip if (strcmp(ev->key, "d") == 0)
276 * @until } 276 * @until }
277 * In this example, we start using a focused object to handle the input 277 * In this example, we start using a focused object to handle the input
278 * events -- the background rectangle. We register a callback on an key input 278 * events -- the background rectangle. We register a callback on an key input
@@ -282,7 +282,7 @@
282 * @dontinclude evas-events.c 282 * @dontinclude evas-events.c
283 * @skip examine the keys pressed 283 * @skip examine the keys pressed
284 * @until key grab 284 * @until key grab
285 * We do so by examining the @c ev->keyname string (remember the event 285 * We do so by examining the @c ev->key string (remember the event
286 * information struct for key down events is the #Evas_Event_Key_Down 286 * information struct for key down events is the #Evas_Event_Key_Down
287 * one). There's one more trick for grabbing input events on this 287 * one). There's one more trick for grabbing input events on this
288 * example -- evas_object_key_grab(). The 'c' command will, when 288 * example -- evas_object_key_grab(). The 'c' command will, when
@@ -314,7 +314,7 @@
314 * in the case) as not belonging to it when calculating mouse 314 * in the case) as not belonging to it when calculating mouse
315 * in/out/up/down events: 315 * in/out/up/down events:
316 * @dontinclude evas-events.c 316 * @dontinclude evas-events.c
317 * @skip if (strcmp(ev->keyname, "p") == 0) 317 * @skip if (strcmp(ev->key, "p") == 0)
318 * @until } 318 * @until }
319 * To finish the example, try the command bound to Control + 'o', 319 * To finish the example, try the command bound to Control + 'o',
320 * which exemplifies Evas' <b>obscured regions</b>. When firstly 320 * which exemplifies Evas' <b>obscured regions</b>. When firstly
@@ -479,7 +479,7 @@
479 * height of the box equally and, then, place the items in the cells 479 * height of the box equally and, then, place the items in the cells
480 * in the diagonal: 480 * in the diagonal:
481 * @dontinclude evas-box.c 481 * @dontinclude evas-box.c
482 * @skip keyname, "0" 482 * @skip key, "0"
483 * @until } 483 * @until }
484 * @dontinclude evas-box.c 484 * @dontinclude evas-box.c
485 * @skip custom 'diagonal' layout 485 * @skip custom 'diagonal' layout
diff --git a/src/examples/ecore/ecore_evas_window_sizes_example.c b/src/examples/ecore/ecore_evas_window_sizes_example.c
index a0777a5..d7f66ae 100644
--- a/src/examples/ecore/ecore_evas_window_sizes_example.c
+++ b/src/examples/ecore/ecore_evas_window_sizes_example.c
@@ -68,13 +68,13 @@ _on_keydown(void *data EINA_UNUSED,
68{ 68{
69 Evas_Event_Key_Down *ev = einfo; 69 Evas_Event_Key_Down *ev = einfo;
70 70
71 if (strcmp(ev->keyname, "h") == 0) /* print help */ 71 if (strcmp(ev->key, "h") == 0) /* print help */
72 { 72 {
73 fprintf(stdout, commands); 73 fprintf(stdout, commands);
74 return; 74 return;
75 } 75 }
76 76
77 if (strcmp(ev->keyname, "m") == 0) /* impose a minimum size on the window */ 77 if (strcmp(ev->key, "m") == 0) /* impose a minimum size on the window */
78 { 78 {
79 min_set = !min_set; 79 min_set = !min_set;
80 80
@@ -93,7 +93,7 @@ _on_keydown(void *data EINA_UNUSED,
93 return; 93 return;
94 } 94 }
95 95
96 if (strcmp(ev->keyname, "x") == 0) /* impose a maximum size on the window */ 96 if (strcmp(ev->key, "x") == 0) /* impose a maximum size on the window */
97 { 97 {
98 max_set = !max_set; 98 max_set = !max_set;
99 99
@@ -112,7 +112,7 @@ _on_keydown(void *data EINA_UNUSED,
112 return; 112 return;
113 } 113 }
114 114
115 if (strcmp(ev->keyname, "b") == 0) /* impose a base size on the window */ 115 if (strcmp(ev->key, "b") == 0) /* impose a base size on the window */
116 { 116 {
117 base_set = !base_set; 117 base_set = !base_set;
118 118
@@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
131 return; 131 return;
132 } 132 }
133 133
134 if (strcmp(ev->keyname, "s") == 0) /* impose a step size on the window */ 134 if (strcmp(ev->key, "s") == 0) /* impose a step size on the window */
135 { 135 {
136 step_set = !step_set; 136 step_set = !step_set;
137 137
@@ -149,7 +149,7 @@ _on_keydown(void *data EINA_UNUSED,
149 return; 149 return;
150 } 150 }
151 151
152 if (strcmp(ev->keyname, "g") == 0) /* get screen geometry */ 152 if (strcmp(ev->key, "g") == 0) /* get screen geometry */
153 { 153 {
154 int x, y, w, h; 154 int x, y, w, h;
155 ecore_evas_screen_geometry_get(ee, &x, &y, &w, &h); 155 ecore_evas_screen_geometry_get(ee, &x, &y, &w, &h);
diff --git a/src/examples/edje/edje-animations.c b/src/examples/edje/edje-animations.c
index 413394c..65f60c2 100644
--- a/src/examples/edje/edje-animations.c
+++ b/src/examples/edje/edje-animations.c
@@ -73,7 +73,7 @@ _on_key_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, v
73 73
74 ev = (Evas_Event_Key_Down *)event_info; 74 ev = (Evas_Event_Key_Down *)event_info;
75 75
76 if (!strcmp(ev->keyname, "h")) 76 if (!strcmp(ev->key, "h"))
77 { 77 {
78 fprintf(stdout, commands); 78 fprintf(stdout, commands);
79 return; 79 return;
@@ -137,11 +137,11 @@ _on_key_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, v
137 edje_object_animation_set(obj, EINA_FALSE); 137 edje_object_animation_set(obj, EINA_FALSE);
138 fprintf(stdout, "Stopping the animation in the Edje object\n"); 138 fprintf(stdout, "Stopping the animation in the Edje object\n");
139 } 139 }
140 else if (!strcmp(ev->keyname, "Escape")) 140 else if (!strcmp(ev->key, "Escape"))
141 ecore_main_loop_quit(); 141 ecore_main_loop_quit();
142 else 142 else
143 { 143 {
144 printf("unhandled key: %s\n", ev->keyname); 144 printf("unhandled key: %s\n", ev->key);
145 fprintf(stdout, commands); 145 fprintf(stdout, commands);
146 } 146 }
147} 147}
diff --git a/src/examples/edje/edje-basic.c b/src/examples/edje/edje-basic.c
index 4c7fad6..a49cf08 100644
--- a/src/examples/edje/edje-basic.c
+++ b/src/examples/edje/edje-basic.c
@@ -49,12 +49,12 @@ _on_keydown(void *data,
49 ev = (Evas_Event_Key_Down *)einfo; 49 ev = (Evas_Event_Key_Down *)einfo;
50 edje_obj = (Evas_Object *)data; 50 edje_obj = (Evas_Object *)data;
51 51
52 if (strcmp(ev->keyname, "h") == 0) /* print help */ 52 if (strcmp(ev->key, "h") == 0) /* print help */
53 { 53 {
54 fprintf(stdout, commands); 54 fprintf(stdout, commands);
55 return; 55 return;
56 } 56 }
57 else if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */ 57 else if (strcmp(ev->key, "s") == 0) /* global scaling factor */
58 { 58 {
59 double scale = edje_scale_get(); 59 double scale = edje_scale_get();
60 60
@@ -69,7 +69,7 @@ _on_keydown(void *data,
69 69
70 return; 70 return;
71 } 71 }
72 else if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */ 72 else if (strcmp(ev->key, "r") == 0) /* individual scaling factor */
73 { 73 {
74 double scale = edje_object_scale_get(edje_obj); 74 double scale = edje_object_scale_get(edje_obj);
75 75
@@ -86,11 +86,11 @@ _on_keydown(void *data,
86 86
87 return; 87 return;
88 } 88 }
89 else if (!strcmp(ev->keyname, "Escape")) 89 else if (!strcmp(ev->key, "Escape"))
90 ecore_main_loop_quit(); 90 ecore_main_loop_quit();
91 else 91 else
92 { 92 {
93 printf("unhandled key: %s\n", ev->keyname); 93 printf("unhandled key: %s\n", ev->key);
94 fprintf(stdout, commands); 94 fprintf(stdout, commands);
95 } 95 }
96} 96}
diff --git a/src/examples/edje/edje-basic2.c b/src/examples/edje/edje-basic2.c
index 8836e7e..e3cdde3 100644
--- a/src/examples/edje/edje-basic2.c
+++ b/src/examples/edje/edje-basic2.c
@@ -44,29 +44,29 @@ _on_key_down(void *data,
44 44
45 evas_object_geometry_get(edje_obj, &x, &y, NULL, NULL); 45 evas_object_geometry_get(edje_obj, &x, &y, NULL, NULL);
46 46
47 if(strcmp(ev->keyname,"Escape") == 0) 47 if(strcmp(ev->key,"Escape") == 0)
48 { 48 {
49 ecore_main_loop_quit(); 49 ecore_main_loop_quit();
50 } 50 }
51 else if(strcmp(ev->keyname, "Down") == 0) 51 else if(strcmp(ev->key, "Down") == 0)
52 { 52 {
53 y+=WALK; 53 y+=WALK;
54 } 54 }
55 else if(strcmp(ev->keyname, "Up") == 0) 55 else if(strcmp(ev->key, "Up") == 0)
56 { 56 {
57 y-=WALK; 57 y-=WALK;
58 } 58 }
59 else if(strcmp(ev->keyname, "Right") == 0) 59 else if(strcmp(ev->key, "Right") == 0)
60 { 60 {
61 x+=WALK; 61 x+=WALK;
62 } 62 }
63 else if(strcmp(ev->keyname, "Left") == 0) 63 else if(strcmp(ev->key, "Left") == 0)
64 { 64 {
65 x-=WALK; 65 x-=WALK;
66 } 66 }
67 else 67 else
68 { 68 {
69 fprintf(stdout, "Key %s not supported.\nCommands:%s", ev->keyname, commands); 69 fprintf(stdout, "Key %s not supported.\nCommands:%s", ev->key, commands);
70 return; 70 return;
71 } 71 }
72 72
diff --git a/src/examples/edje/edje-box.c b/src/examples/edje/edje-box.c
index 20cf56e..978a530 100644
--- a/src/examples/edje/edje-box.c
+++ b/src/examples/edje/edje-box.c
@@ -111,12 +111,12 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
111 ev = (Evas_Event_Key_Down *)event_info; 111 ev = (Evas_Event_Key_Down *)event_info;
112 edje_obj = ecore_evas_data_get(ee, "edje_obj"); 112 edje_obj = ecore_evas_data_get(ee, "edje_obj");
113 113
114 if (!strcmp(ev->keyname, "h")) 114 if (!strcmp(ev->key, "h"))
115 { 115 {
116 fprintf(stdout, commands); 116 fprintf(stdout, commands);
117 return; 117 return;
118 } 118 }
119 if (!strcmp(ev->keyname, "i")) 119 if (!strcmp(ev->key, "i"))
120 { 120 {
121 rect = evas_object_rectangle_add(e); 121 rect = evas_object_rectangle_add(e);
122 evas_object_color_set(rect, 0, 0, 128, 255); 122 evas_object_color_set(rect, 0, 0, 128, 255);
@@ -130,7 +130,7 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
130 130
131 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); 131 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
132 } 132 }
133 else if (!strcmp(ev->keyname, "a")) 133 else if (!strcmp(ev->key, "a"))
134 { 134 {
135 rect = evas_object_rectangle_add(e); 135 rect = evas_object_rectangle_add(e);
136 evas_object_color_set(rect, 0, 128, 0, 255); 136 evas_object_color_set(rect, 0, 128, 0, 255);
@@ -144,13 +144,13 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
144 144
145 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL); 145 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
146 } 146 }
147 else if (!strcmp(ev->keyname, "c")) 147 else if (!strcmp(ev->key, "c"))
148 edje_object_part_box_remove_all(edje_obj, "example/box", EINA_TRUE); 148 edje_object_part_box_remove_all(edje_obj, "example/box", EINA_TRUE);
149 else if (!strcmp(ev->keyname, "Escape")) 149 else if (!strcmp(ev->key, "Escape"))
150 ecore_main_loop_quit(); 150 ecore_main_loop_quit();
151 else 151 else
152 { 152 {
153 printf("unhandled key: %s\n", ev->keyname); 153 printf("unhandled key: %s\n", ev->key);
154 fprintf(stdout, commands); 154 fprintf(stdout, commands);
155 } 155 }
156} 156}
diff --git a/src/examples/edje/edje-box2.c b/src/examples/edje/edje-box2.c
index e2a172f..c61913b 100644
--- a/src/examples/edje/edje-box2.c
+++ b/src/examples/edje/edje-box2.c
@@ -85,7 +85,7 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
85 edje_obj = (Evas_Object *)data; 85 edje_obj = (Evas_Object *)data;
86 86
87 mods = evas_key_modifier_get(evas); 87 mods = evas_key_modifier_get(evas);
88 if (!strcmp(ev->keyname, "h")) 88 if (!strcmp(ev->key, "h"))
89 { 89 {
90 fprintf(stdout, commands); 90 fprintf(stdout, commands);
91 return; 91 return;
@@ -94,7 +94,7 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
94 { 94 {
95 int pos; 95 int pos;
96 Evas_Object *obj = NULL; 96 Evas_Object *obj = NULL;
97 pos = atoi(ev->keyname); 97 pos = atoi(ev->key);
98 obj = edje_object_part_box_remove_at(edje_obj, "example/box", pos); 98 obj = edje_object_part_box_remove_at(edje_obj, "example/box", pos);
99 if (obj) 99 if (obj)
100 evas_object_del(obj); 100 evas_object_del(obj);
@@ -104,13 +104,13 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
104 { 104 {
105 Evas_Object *obj; 105 Evas_Object *obj;
106 int pos; 106 int pos;
107 pos = atoi(ev->keyname); 107 pos = atoi(ev->key);
108 obj = new_greenie_block(evas); 108 obj = new_greenie_block(evas);
109 if (!edje_object_part_box_insert_at(edje_obj, "example/box", obj, pos)) 109 if (!edje_object_part_box_insert_at(edje_obj, "example/box", obj, pos))
110 edje_object_part_box_append(edje_obj, "example/box", obj); 110 edje_object_part_box_append(edje_obj, "example/box", obj);
111 return; 111 return;
112 } 112 }
113 if (!strcmp(ev->keyname, "Escape")) 113 if (!strcmp(ev->key, "Escape"))
114 ecore_main_loop_quit(); 114 ecore_main_loop_quit();
115} 115}
116 116
diff --git a/src/examples/edje/edje-drag.c b/src/examples/edje/edje-drag.c
index da7504f..6098fd9 100644
--- a/src/examples/edje/edje-drag.c
+++ b/src/examples/edje/edje-drag.c
@@ -78,36 +78,36 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
78 ev = (Evas_Event_Key_Down *)event_info; 78 ev = (Evas_Event_Key_Down *)event_info;
79 edje_obj = ecore_evas_data_get(ee, "edje_obj"); 79 edje_obj = ecore_evas_data_get(ee, "edje_obj");
80 80
81 if (!strcmp(ev->keyname, "h")) 81 if (!strcmp(ev->key, "h"))
82 { 82 {
83 fprintf(stdout, commands); 83 fprintf(stdout, commands);
84 return; 84 return;
85 } 85 }
86 else if (!strcmp(ev->keyname, "Down")) 86 else if (!strcmp(ev->key, "Down"))
87 { 87 {
88 edje_object_part_drag_step(edje_obj, PARTNAME, 0, 1.0); 88 edje_object_part_drag_step(edje_obj, PARTNAME, 0, 1.0);
89 } 89 }
90 else if (!strcmp(ev->keyname, "Up")) 90 else if (!strcmp(ev->key, "Up"))
91 { 91 {
92 edje_object_part_drag_step(edje_obj, PARTNAME, 0, -1.0); 92 edje_object_part_drag_step(edje_obj, PARTNAME, 0, -1.0);
93 } 93 }
94 else if (!strcmp(ev->keyname, "m")) 94 else if (!strcmp(ev->key, "m"))
95 { 95 {
96 edje_object_part_drag_value_set(edje_obj, PARTNAME, 0.0, 0.5); 96 edje_object_part_drag_value_set(edje_obj, PARTNAME, 0.0, 0.5);
97 } 97 }
98 else if (!strcmp(ev->keyname, "Prior")) 98 else if (!strcmp(ev->key, "Prior"))
99 { 99 {
100 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, -1.0); 100 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, -1.0);
101 } 101 }
102 else if (!strcmp(ev->keyname, "Next")) 102 else if (!strcmp(ev->key, "Next"))
103 { 103 {
104 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, 1.0); 104 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, 1.0);
105 } 105 }
106 else if (!strcmp(ev->keyname, "Escape")) 106 else if (!strcmp(ev->key, "Escape"))
107 ecore_main_loop_quit(); 107 ecore_main_loop_quit();
108 else 108 else
109 { 109 {
110 printf("unhandled key: %s\n", ev->keyname); 110 printf("unhandled key: %s\n", ev->key);
111 fprintf(stdout, commands); 111 fprintf(stdout, commands);
112 } 112 }
113} 113}
diff --git a/src/examples/edje/edje-perspective.c b/src/examples/edje/edje-perspective.c
index dc8c248..7bdcbf4 100644
--- a/src/examples/edje/edje-perspective.c
+++ b/src/examples/edje/edje-perspective.c
@@ -98,44 +98,44 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
98 struct _App *app = data; 98 struct _App *app = data;
99 Evas_Event_Key_Down *ev = event_info; 99 Evas_Event_Key_Down *ev = event_info;
100 100
101 if (!strcmp(ev->keyname, "h")) 101 if (!strcmp(ev->key, "h"))
102 { 102 {
103 fprintf(stdout, commands); 103 fprintf(stdout, commands);
104 return; 104 return;
105 } 105 }
106 // just moving the part and text 106 // just moving the part and text
107 else if (!strcmp(ev->keyname, "Down")) 107 else if (!strcmp(ev->key, "Down"))
108 { 108 {
109 _part_move(app, 0, 1); 109 _part_move(app, 0, 1);
110 } 110 }
111 else if (!strcmp(ev->keyname, "Up")) 111 else if (!strcmp(ev->key, "Up"))
112 { 112 {
113 _part_move(app, 0, -1); 113 _part_move(app, 0, -1);
114 } 114 }
115 else if (!strcmp(ev->keyname, "Left")) 115 else if (!strcmp(ev->key, "Left"))
116 { 116 {
117 _part_move(app, -1, 0); 117 _part_move(app, -1, 0);
118 } 118 }
119 else if (!strcmp(ev->keyname, "Right")) 119 else if (!strcmp(ev->key, "Right"))
120 { 120 {
121 _part_move(app, 1, 0); 121 _part_move(app, 1, 0);
122 } 122 }
123 else if (!strcmp(ev->keyname, "Prior")) 123 else if (!strcmp(ev->key, "Prior"))
124 { 124 {
125 _part_move(app, -1, -1); 125 _part_move(app, -1, -1);
126 } 126 }
127 else if (!strcmp(ev->keyname, "Next")) 127 else if (!strcmp(ev->key, "Next"))
128 { 128 {
129 _part_move(app, 1, 1); 129 _part_move(app, 1, 1);
130 } 130 }
131 // adjusting the perspective focal point distance 131 // adjusting the perspective focal point distance
132 else if (!strcmp(ev->keyname, "KP_Add")) 132 else if (!strcmp(ev->key, "KP_Add"))
133 { 133 {
134 app->focal += 5; 134 app->focal += 5;
135 edje_perspective_set(app->ps, 240, 160, 0, app->focal); 135 edje_perspective_set(app->ps, 240, 160, 0, app->focal);
136 edje_object_calc_force(app->edje_obj); 136 edje_object_calc_force(app->edje_obj);
137 } 137 }
138 else if (!strcmp(ev->keyname, "KP_Subtract")) 138 else if (!strcmp(ev->key, "KP_Subtract"))
139 { 139 {
140 app->focal -= 5; 140 app->focal -= 5;
141 if (app->focal < 5) 141 if (app->focal < 5)
@@ -145,11 +145,11 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
145 edje_object_calc_force(app->edje_obj); 145 edje_object_calc_force(app->edje_obj);
146 } 146 }
147 // exiting 147 // exiting
148 else if (!strcmp(ev->keyname, "Escape")) 148 else if (!strcmp(ev->key, "Escape"))
149 ecore_main_loop_quit(); 149 ecore_main_loop_quit();
150 else 150 else
151 { 151 {
152 printf("unhandled key: %s\n", ev->keyname); 152 printf("unhandled key: %s\n", ev->key);
153 fprintf(stdout, commands); 153 fprintf(stdout, commands);
154 } 154 }
155} 155}
diff --git a/src/examples/edje/edje-signals-messages.c b/src/examples/edje/edje-signals-messages.c
index b9b5f34..22155fd 100644
--- a/src/examples/edje/edje-signals-messages.c
+++ b/src/examples/edje/edje-signals-messages.c
@@ -51,12 +51,12 @@ _on_keydown(void *data,
51 ev = (Evas_Event_Key_Down *)einfo; 51 ev = (Evas_Event_Key_Down *)einfo;
52 edje_obj = (Evas_Object *)data; 52 edje_obj = (Evas_Object *)data;
53 53
54 if (!strcmp(ev->keyname, "h")) /* print help */ 54 if (!strcmp(ev->key, "h")) /* print help */
55 { 55 {
56 fprintf(stdout, commands); 56 fprintf(stdout, commands);
57 return; 57 return;
58 } 58 }
59 else if (!strcmp(ev->keyname, "t")) /* toggle right rectangle's visibility */ 59 else if (!strcmp(ev->key, "t")) /* toggle right rectangle's visibility */
60 { 60 {
61 char buf[1024]; 61 char buf[1024];
62 62
@@ -70,11 +70,11 @@ _on_keydown(void *data,
70 70
71 return; 71 return;
72 } 72 }
73 else if (!strcmp(ev->keyname, "Escape")) 73 else if (!strcmp(ev->key, "Escape"))
74 ecore_main_loop_quit(); 74 ecore_main_loop_quit();
75 else 75 else
76 { 76 {
77 printf("unhandled key: %s\n", ev->keyname); 77 printf("unhandled key: %s\n", ev->key);
78 fprintf(stdout, commands); 78 fprintf(stdout, commands);
79 } 79 }
80} 80}
diff --git a/src/examples/edje/sigtest.c b/src/examples/edje/sigtest.c
index 2d600ff..a949ca3 100644
--- a/src/examples/edje/sigtest.c
+++ b/src/examples/edje/sigtest.c
@@ -45,12 +45,12 @@ _on_keydown(void *data,
45 edje_obj = ecore_evas_data_get(ee, "edje_obj"); 45 edje_obj = ecore_evas_data_get(ee, "edje_obj");
46 edje_file = ecore_evas_data_get(ee, "file"); 46 edje_file = ecore_evas_data_get(ee, "file");
47 47
48 if (!strcmp(ev->keyname, "h")) 48 if (!strcmp(ev->key, "h"))
49 { 49 {
50 fprintf(stdout, commands); 50 fprintf(stdout, commands);
51 return; 51 return;
52 } 52 }
53 else if (!strcmp(ev->keyname, "e")) 53 else if (!strcmp(ev->key, "e"))
54 { 54 {
55 if (!edje_object_file_set(edje_obj, edje_file, "plain/edje/group")) 55 if (!edje_object_file_set(edje_obj, edje_file, "plain/edje/group"))
56 { 56 {
@@ -64,7 +64,7 @@ _on_keydown(void *data,
64 " file sigtest.edj with success!\n"); 64 " file sigtest.edj with success!\n");
65 return; 65 return;
66 } 66 }
67 else if (!strcmp(ev->keyname, "l")) 67 else if (!strcmp(ev->key, "l"))
68 { 68 {
69 if (!edje_object_file_set(edje_obj, edje_file, "lua_base")) 69 if (!edje_object_file_set(edje_obj, edje_file, "lua_base"))
70 { 70 {
@@ -78,7 +78,7 @@ _on_keydown(void *data,
78 " file sigtest.edj with success!\n"); 78 " file sigtest.edj with success!\n");
79 return; 79 return;
80 } 80 }
81 else if (!strcmp(ev->keyname, "m")) 81 else if (!strcmp(ev->key, "m"))
82 { 82 {
83 Edje_Message_String *msg = malloc(sizeof(*msg)); 83 Edje_Message_String *msg = malloc(sizeof(*msg));
84 84
@@ -89,7 +89,7 @@ _on_keydown(void *data,
89 fprintf(stdout, "C message sent\n"); 89 fprintf(stdout, "C message sent\n");
90 return; 90 return;
91 } 91 }
92 else if (!strcmp(ev->keyname, "s")) 92 else if (!strcmp(ev->key, "s"))
93 { 93 {
94 fprintf(stdout, "\n"); 94 fprintf(stdout, "\n");
95 edje_object_signal_emit(edje_obj, "C signal 1", "Csource"); 95 edje_object_signal_emit(edje_obj, "C signal 1", "Csource");
@@ -97,11 +97,11 @@ _on_keydown(void *data,
97 fprintf(stdout, "C signal sent\n"); 97 fprintf(stdout, "C signal sent\n");
98 return; 98 return;
99 } 99 }
100 else if (!strcmp(ev->keyname, "Escape")) 100 else if (!strcmp(ev->key, "Escape"))
101 ecore_main_loop_quit(); 101 ecore_main_loop_quit();
102 else 102 else
103 { 103 {
104 printf("unhandled key: %s\n", ev->keyname); 104 printf("unhandled key: %s\n", ev->key);
105 fprintf(stdout, commands); 105 fprintf(stdout, commands);
106 } 106 }
107} 107}
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 5fa6f0f..a9d22e9 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -39,19 +39,19 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
39 Evas_Event_Key_Down *ev = event_info; 39 Evas_Event_Key_Down *ev = event_info;
40 Evas_Object *em = data; 40 Evas_Object *em = data;
41 41
42 if (!strcmp(ev->keyname, "Return")) 42 if (!strcmp(ev->key, "Return"))
43 { 43 {
44 emotion_object_play_set(em, EINA_TRUE); 44 emotion_object_play_set(em, EINA_TRUE);
45 } 45 }
46 else if (!strcmp(ev->keyname, "space")) 46 else if (!strcmp(ev->key, "space"))
47 { 47 {
48 emotion_object_play_set(em, EINA_FALSE); 48 emotion_object_play_set(em, EINA_FALSE);
49 } 49 }
50 else if (!strcmp(ev->keyname, "Escape")) 50 else if (!strcmp(ev->key, "Escape"))
51 { 51 {
52 ecore_main_loop_quit(); 52 ecore_main_loop_quit();
53 } 53 }
54 else if (!strcmp(ev->keyname, "n")) 54 else if (!strcmp(ev->key, "n"))
55 { 55 {
56 const char *file; 56 const char *file;
57 if (!curfile) 57 if (!curfile)
@@ -62,7 +62,7 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
62 fprintf(stderr, "playing next file: %s\n", file); 62 fprintf(stderr, "playing next file: %s\n", file);
63 emotion_object_file_set(em, file); 63 emotion_object_file_set(em, file);
64 } 64 }
65 else if (!strcmp(ev->keyname, "p")) 65 else if (!strcmp(ev->key, "p"))
66 { 66 {
67 const char *file; 67 const char *file;
68 if (!curfile) 68 if (!curfile)
@@ -73,33 +73,33 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
73 fprintf(stderr, "playing next file: %s\n", file); 73 fprintf(stderr, "playing next file: %s\n", file);
74 emotion_object_file_set(em, file); 74 emotion_object_file_set(em, file);
75 } 75 }
76 else if (!strcmp(ev->keyname, "b")) 76 else if (!strcmp(ev->key, "b"))
77 { 77 {
78 emotion_object_border_set(em, 0, 0, 50, 50); 78 emotion_object_border_set(em, 0, 0, 50, 50);
79 } 79 }
80 else if (!strcmp(ev->keyname, "0")) 80 else if (!strcmp(ev->key, "0"))
81 { 81 {
82 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_NONE); 82 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_NONE);
83 } 83 }
84 else if (!strcmp(ev->keyname, "w")) 84 else if (!strcmp(ev->key, "w"))
85 { 85 {
86 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_WIDTH); 86 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_WIDTH);
87 } 87 }
88 else if (!strcmp(ev->keyname, "h")) 88 else if (!strcmp(ev->key, "h"))
89 { 89 {
90 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_HEIGHT); 90 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_HEIGHT);
91 } 91 }
92 else if (!strcmp(ev->keyname, "2")) 92 else if (!strcmp(ev->key, "2"))
93 { 93 {
94 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_BOTH); 94 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_BOTH);
95 } 95 }
96 else if (!strcmp(ev->keyname, "c")) 96 else if (!strcmp(ev->key, "c"))
97 { 97 {
98 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_CROP); 98 emotion_object_keep_aspect_set(em, EMOTION_ASPECT_CROP);
99 } 99 }
100 else 100 else
101 { 101 {
102 fprintf(stderr, "unhandled key: %s\n", ev->keyname); 102 fprintf(stderr, "unhandled key: %s\n", ev->key);
103 } 103 }
104} 104}
105 105
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index 580cae9..6d585fb 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -50,25 +50,25 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
50 Evas_Event_Key_Down *ev = event_info; 50 Evas_Event_Key_Down *ev = event_info;
51 Evas_Object *em = data; 51 Evas_Object *em = data;
52 52
53 if (!strcmp(ev->keyname, "Return")) 53 if (!strcmp(ev->key, "Return"))
54 { 54 {
55 emotion_object_play_set(em, EINA_TRUE); 55 emotion_object_play_set(em, EINA_TRUE);
56 } 56 }
57 else if (!strcmp(ev->keyname, "space")) 57 else if (!strcmp(ev->key, "space"))
58 { 58 {
59 emotion_object_play_set(em, EINA_FALSE); 59 emotion_object_play_set(em, EINA_FALSE);
60 } 60 }
61 else if (!strcmp(ev->keyname, "Escape")) 61 else if (!strcmp(ev->key, "Escape"))
62 { 62 {
63 ecore_main_loop_quit(); 63 ecore_main_loop_quit();
64 } 64 }
65 else if (!strcmp(ev->keyname, "t")) 65 else if (!strcmp(ev->key, "t"))
66 { 66 {
67 int w, h; 67 int w, h;
68 emotion_object_size_get(em, &w, &h); 68 emotion_object_size_get(em, &w, &h);
69 fprintf(stderr, "example -> size: %dx%d\n", w, h); 69 fprintf(stderr, "example -> size: %dx%d\n", w, h);
70 } 70 }
71 else if (!strcmp(ev->keyname, "s")) 71 else if (!strcmp(ev->key, "s"))
72 { 72 {
73 float len, pos; 73 float len, pos;
74 len = emotion_object_play_length_get(em); 74 len = emotion_object_play_length_get(em);
@@ -76,17 +76,17 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
76 fprintf(stderr, "skipping to position %0.3f\n", pos); 76 fprintf(stderr, "skipping to position %0.3f\n", pos);
77 emotion_object_position_set(em, pos); 77 emotion_object_position_set(em, pos);
78 } 78 }
79 else if (!strcmp(ev->keyname, "1")) 79 else if (!strcmp(ev->key, "1"))
80 { 80 {
81 fprintf(stderr, "setting speed to 1.0\n"); 81 fprintf(stderr, "setting speed to 1.0\n");
82 emotion_object_play_speed_set(em, 1.0); 82 emotion_object_play_speed_set(em, 1.0);
83 } 83 }
84 else if (!strcmp(ev->keyname, "2")) 84 else if (!strcmp(ev->key, "2"))
85 { 85 {
86 fprintf(stderr, "setting speed to 2.0\n"); 86 fprintf(stderr, "setting speed to 2.0\n");
87 emotion_object_play_speed_set(em, 2.0); 87 emotion_object_play_speed_set(em, 2.0);
88 } 88 }
89 else if (!strcmp(ev->keyname, "n")) 89 else if (!strcmp(ev->key, "n"))
90 { 90 {
91 const char *file; 91 const char *file;
92 if (!curfile) 92 if (!curfile)
@@ -97,7 +97,7 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
97 fprintf(stderr, "playing next file: %s\n", file); 97 fprintf(stderr, "playing next file: %s\n", file);
98 emotion_object_file_set(em, file); 98 emotion_object_file_set(em, file);
99 } 99 }
100 else if (!strcmp(ev->keyname, "p")) 100 else if (!strcmp(ev->key, "p"))
101 { 101 {
102 const char *file; 102 const char *file;
103 if (!curfile) 103 if (!curfile)
@@ -108,18 +108,18 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
108 fprintf(stderr, "playing next file: %s\n", file); 108 fprintf(stderr, "playing next file: %s\n", file);
109 emotion_object_file_set(em, file); 109 emotion_object_file_set(em, file);
110 } 110 }
111 else if (!strcmp(ev->keyname, "d")) 111 else if (!strcmp(ev->key, "d"))
112 { 112 {
113 evas_object_del(em); 113 evas_object_del(em);
114 } 114 }
115 else if (!strcmp(ev->keyname, "l")) 115 else if (!strcmp(ev->key, "l"))
116 { 116 {
117 // force frame dropping 117 // force frame dropping
118 sleep(5); 118 sleep(5);
119 } 119 }
120 else 120 else
121 { 121 {
122 fprintf(stderr, "unhandled key: %s\n", ev->keyname); 122 fprintf(stderr, "unhandled key: %s\n", ev->key);
123 } 123 }
124} 124}
125 125
diff --git a/src/examples/ephysics/test_bouncing_ball.c b/src/examples/ephysics/test_bouncing_ball.c
index 00736b0..6d2ad6d 100644
--- a/src/examples/ephysics/test_bouncing_ball.c
+++ b/src/examples/ephysics/test_bouncing_ball.c
@@ -13,13 +13,13 @@ _on_keydown(void *data, Evas_Object *obj __UNUSED__, Evas_Object *src __UNUSED__
13 if (type != EVAS_CALLBACK_KEY_UP) 13 if (type != EVAS_CALLBACK_KEY_UP)
14 return EINA_FALSE; 14 return EINA_FALSE;
15 15
16 if (strcmp(ev->keyname, "Up") == 0) 16 if (strcmp(ev->key, "Up") == 0)
17 ephysics_body_central_impulse_apply(body, 0, -300, 0); 17 ephysics_body_central_impulse_apply(body, 0, -300, 0);
18 else if (strcmp(ev->keyname, "Down") == 0) 18 else if (strcmp(ev->key, "Down") == 0)
19 ephysics_body_central_impulse_apply(body, 0, 300, 0); 19 ephysics_body_central_impulse_apply(body, 0, 300, 0);
20 else if (strcmp(ev->keyname, "Right") == 0) 20 else if (strcmp(ev->key, "Right") == 0)
21 ephysics_body_central_impulse_apply(body, 300, 0, 0); 21 ephysics_body_central_impulse_apply(body, 300, 0, 0);
22 else if (strcmp(ev->keyname, "Left") == 0) 22 else if (strcmp(ev->key, "Left") == 0)
23 ephysics_body_central_impulse_apply(body, -300, 0, 0); 23 ephysics_body_central_impulse_apply(body, -300, 0, 0);
24 24
25 return EINA_TRUE; 25 return EINA_TRUE;
diff --git a/src/examples/ephysics/test_velocity.c b/src/examples/ephysics/test_velocity.c
index 785767b..0680204 100644
--- a/src/examples/ephysics/test_velocity.c
+++ b/src/examples/ephysics/test_velocity.c
@@ -24,13 +24,13 @@ _on_keydown(void *data, Evas_Object *obj __UNUSED__, Evas_Object *src __UNUSED__
24 if (type != EVAS_CALLBACK_KEY_UP) 24 if (type != EVAS_CALLBACK_KEY_UP)
25 return EINA_FALSE; 25 return EINA_FALSE;
26 26
27 if (strcmp(ev->keyname, "Up") == 0) 27 if (strcmp(ev->key, "Up") == 0)
28 ephysics_body_central_impulse_apply(body, 0, -300, 0); 28 ephysics_body_central_impulse_apply(body, 0, -300, 0);
29 else if (strcmp(ev->keyname, "Down") == 0) 29 else if (strcmp(ev->key, "Down") == 0)
30 ephysics_body_central_impulse_apply(body, 0, 300, 0); 30 ephysics_body_central_impulse_apply(body, 0, 300, 0);
31 else if (strcmp(ev->keyname, "Right") == 0) 31 else if (strcmp(ev->key, "Right") == 0)
32 ephysics_body_central_impulse_apply(body, 300, 0, 0); 32 ephysics_body_central_impulse_apply(body, 300, 0, 0);
33 else if (strcmp(ev->keyname, "Left") == 0) 33 else if (strcmp(ev->key, "Left") == 0)
34 ephysics_body_central_impulse_apply(body, -300, 0, 0); 34 ephysics_body_central_impulse_apply(body, -300, 0, 0);
35 35
36 return EINA_TRUE; 36 return EINA_TRUE;
diff --git a/src/examples/evas/evas-aspect-hints.c b/src/examples/evas/evas-aspect-hints.c
index 0d81027..6da0102 100644
--- a/src/examples/evas/evas-aspect-hints.c
+++ b/src/examples/evas/evas-aspect-hints.c
@@ -89,7 +89,7 @@ _on_keydown(void *data EINA_UNUSED,
89 mods = evas_key_modifier_get(evas_object_evas_get(o)); 89 mods = evas_key_modifier_get(evas_object_evas_get(o));
90 90
91 if (evas_key_modifier_is_set(mods, "Shift") && 91 if (evas_key_modifier_is_set(mods, "Shift") &&
92 strcmp(ev->keyname, "h") == 0) /* print help */ 92 strcmp(ev->key, "h") == 0) /* print help */
93 { 93 {
94 fprintf(stdout, "commands are:\n" 94 fprintf(stdout, "commands are:\n"
95 "\tc - cycle aspect control on object\n" 95 "\tc - cycle aspect control on object\n"
@@ -100,7 +100,7 @@ _on_keydown(void *data EINA_UNUSED,
100 return; 100 return;
101 } 101 }
102 102
103 if (strcmp(ev->keyname, "s") == 0) /* get aspect status of the obj */ 103 if (strcmp(ev->key, "s") == 0) /* get aspect status of the obj */
104 { 104 {
105 Evas_Coord w, h; 105 Evas_Coord w, h;
106 Evas_Aspect_Control aspect; 106 Evas_Aspect_Control aspect;
@@ -114,7 +114,7 @@ _on_keydown(void *data EINA_UNUSED,
114 return; 114 return;
115 } 115 }
116 116
117 if (strcmp(ev->keyname, "c") == 0) /* cycle aspect control on obj */ 117 if (strcmp(ev->key, "c") == 0) /* cycle aspect control on obj */
118 { 118 {
119 Evas_Coord w, h; 119 Evas_Coord w, h;
120 Evas_Aspect_Control aspect; 120 Evas_Aspect_Control aspect;
@@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
131 return; 131 return;
132 } 132 }
133 133
134 if (strcmp(ev->keyname, "h") == 0) /* change horizontal aspect component */ 134 if (strcmp(ev->key, "h") == 0) /* change horizontal aspect component */
135 { 135 {
136 Evas_Coord w, h; 136 Evas_Coord w, h;
137 Evas_Aspect_Control aspect; 137 Evas_Aspect_Control aspect;
@@ -147,7 +147,7 @@ _on_keydown(void *data EINA_UNUSED,
147 return; 147 return;
148 } 148 }
149 149
150 if (strcmp(ev->keyname, "v") == 0) /* change vertical aspect component */ 150 if (strcmp(ev->key, "v") == 0) /* change vertical aspect component */
151 { 151 {
152 Evas_Coord w, h; 152 Evas_Coord w, h;
153 Evas_Aspect_Control aspect; 153 Evas_Aspect_Control aspect;
diff --git a/src/examples/evas/evas-box.c b/src/examples/evas/evas-box.c
index 839759e..c58298e 100644
--- a/src/examples/evas/evas-box.c
+++ b/src/examples/evas/evas-box.c
@@ -106,7 +106,7 @@ _on_keydown(void *data EINA_UNUSED,
106 Evas_Event_Key_Down *ev = einfo; 106 Evas_Event_Key_Down *ev = einfo;
107 const Evas_Modifier *mods = evas_key_modifier_get(evas); 107 const Evas_Modifier *mods = evas_key_modifier_get(evas);
108 108
109 if (strcmp(ev->keyname, "h") == 0) /* print help */ 109 if (strcmp(ev->key, "h") == 0) /* print help */
110 { 110 {
111 fprintf(stdout, commands); 111 fprintf(stdout, commands);
112 return; 112 return;
@@ -119,7 +119,7 @@ _on_keydown(void *data EINA_UNUSED,
119 Evas_Object *obj; 119 Evas_Object *obj;
120 Eina_List *children; 120 Eina_List *children;
121 121
122 pos = atoi(ev->keyname); 122 pos = atoi(ev->key);
123 children = evas_object_box_children_get(d.box); 123 children = evas_object_box_children_get(d.box);
124 124
125 obj = eina_list_nth(children, pos); 125 obj = eina_list_nth(children, pos);
@@ -137,14 +137,14 @@ list_free:
137 { 137 {
138 Evas_Object *o; 138 Evas_Object *o;
139 int pos; 139 int pos;
140 pos = atoi(ev->keyname); 140 pos = atoi(ev->key);
141 o = _new_rectangle_add(d.evas); 141 o = _new_rectangle_add(d.evas);
142 if (!evas_object_box_insert_at(d.box, o, pos)) 142 if (!evas_object_box_insert_at(d.box, o, pos))
143 evas_object_box_append(d.box, o); 143 evas_object_box_append(d.box, o);
144 return; 144 return;
145 } 145 }
146 146
147 if (strcmp(ev->keyname, "a") == 0) 147 if (strcmp(ev->key, "a") == 0)
148 { 148 {
149 double h, v; 149 double h, v;
150 150
@@ -166,7 +166,7 @@ list_free:
166 return; 166 return;
167 } 167 }
168 168
169 if (strcmp(ev->keyname, "p") == 0) 169 if (strcmp(ev->key, "p") == 0)
170 { 170 {
171 int h, v; 171 int h, v;
172 172
@@ -184,7 +184,7 @@ list_free:
184 return; 184 return;
185 } 185 }
186 186
187 if (strcmp(ev->keyname, "1") == 0) 187 if (strcmp(ev->key, "1") == 0)
188 { 188 {
189 evas_object_box_layout_set( 189 evas_object_box_layout_set(
190 d.box, evas_object_box_layout_horizontal, NULL, NULL); 190 d.box, evas_object_box_layout_horizontal, NULL, NULL);
@@ -193,7 +193,7 @@ list_free:
193 return; 193 return;
194 } 194 }
195 195
196 if (strcmp(ev->keyname, "2") == 0) 196 if (strcmp(ev->key, "2") == 0)
197 { 197 {
198 evas_object_box_layout_set( 198 evas_object_box_layout_set(
199 d.box, evas_object_box_layout_vertical, NULL, NULL); 199 d.box, evas_object_box_layout_vertical, NULL, NULL);
@@ -202,7 +202,7 @@ list_free:
202 return; 202 return;
203 } 203 }
204 204
205 if (strcmp(ev->keyname, "3") == 0) 205 if (strcmp(ev->key, "3") == 0)
206 { 206 {
207 evas_object_box_layout_set( 207 evas_object_box_layout_set(
208 d.box, evas_object_box_layout_homogeneous_horizontal, NULL, 208 d.box, evas_object_box_layout_homogeneous_horizontal, NULL,
@@ -213,7 +213,7 @@ list_free:
213 return; 213 return;
214 } 214 }
215 215
216 if (strcmp(ev->keyname, "4") == 0) 216 if (strcmp(ev->key, "4") == 0)
217 { 217 {
218 evas_object_box_layout_set( 218 evas_object_box_layout_set(
219 d.box, evas_object_box_layout_homogeneous_vertical, NULL, NULL); 219 d.box, evas_object_box_layout_homogeneous_vertical, NULL, NULL);
@@ -223,7 +223,7 @@ list_free:
223 return; 223 return;
224 } 224 }
225 225
226 if (strcmp(ev->keyname, "5") == 0) 226 if (strcmp(ev->key, "5") == 0)
227 { 227 {
228 evas_object_box_layout_set( 228 evas_object_box_layout_set(
229 d.box, evas_object_box_layout_homogeneous_max_size_horizontal, 229 d.box, evas_object_box_layout_homogeneous_max_size_horizontal,
@@ -234,7 +234,7 @@ list_free:
234 return; 234 return;
235 } 235 }
236 236
237 if (strcmp(ev->keyname, "6") == 0) 237 if (strcmp(ev->key, "6") == 0)
238 { 238 {
239 evas_object_box_layout_set( 239 evas_object_box_layout_set(
240 d.box, evas_object_box_layout_homogeneous_max_size_vertical, 240 d.box, evas_object_box_layout_homogeneous_max_size_vertical,
@@ -245,7 +245,7 @@ list_free:
245 return; 245 return;
246 } 246 }
247 247
248 if (strcmp(ev->keyname, "7") == 0) 248 if (strcmp(ev->key, "7") == 0)
249 { 249 {
250 evas_object_box_layout_set( 250 evas_object_box_layout_set(
251 d.box, evas_object_box_layout_flow_horizontal, NULL, NULL); 251 d.box, evas_object_box_layout_flow_horizontal, NULL, NULL);
@@ -254,7 +254,7 @@ list_free:
254 return; 254 return;
255 } 255 }
256 256
257 if (strcmp(ev->keyname, "8") == 0) 257 if (strcmp(ev->key, "8") == 0)
258 { 258 {
259 evas_object_box_layout_set( 259 evas_object_box_layout_set(
260 d.box, evas_object_box_layout_flow_vertical, NULL, NULL); 260 d.box, evas_object_box_layout_flow_vertical, NULL, NULL);
@@ -263,7 +263,7 @@ list_free:
263 return; 263 return;
264 } 264 }
265 265
266 if (strcmp(ev->keyname, "9") == 0) 266 if (strcmp(ev->key, "9") == 0)
267 { 267 {
268 evas_object_box_layout_set( 268 evas_object_box_layout_set(
269 d.box, evas_object_box_layout_stack, NULL, NULL); 269 d.box, evas_object_box_layout_stack, NULL, NULL);
@@ -272,7 +272,7 @@ list_free:
272 return; 272 return;
273 } 273 }
274 274
275 if (strcmp(ev->keyname, "0") == 0) 275 if (strcmp(ev->key, "0") == 0)
276 { 276 {
277 evas_object_box_layout_set(d.box, _custom_layout, NULL, NULL); 277 evas_object_box_layout_set(d.box, _custom_layout, NULL, NULL);
278 278
diff --git a/src/examples/evas/evas-events.c b/src/examples/evas/evas-events.c
index d890823..2f04248 100644
--- a/src/examples/evas/evas-events.c
+++ b/src/examples/evas/evas-events.c
@@ -141,17 +141,17 @@ _on_keydown(void *data EINA_UNUSED,
141 const Evas_Modifier *mods; 141 const Evas_Modifier *mods;
142 Evas_Event_Key_Down *ev = einfo; 142 Evas_Event_Key_Down *ev = einfo;
143 143
144 fprintf(stdout, "We've got key input: %s\n", ev->keyname); 144 fprintf(stdout, "We've got key input: %s\n", ev->key);
145 fprintf(stdout, "It actually came from %s\n", d.focus ? 145 fprintf(stdout, "It actually came from %s\n", d.focus ?
146 "focus" : "key grab"); 146 "focus" : "key grab");
147 147
148 if (strcmp(ev->keyname, "h") == 0) /* print help */ 148 if (strcmp(ev->key, "h") == 0) /* print help */
149 { 149 {
150 fprintf(stdout, commands); 150 fprintf(stdout, commands);
151 return; 151 return;
152 } 152 }
153 153
154 if (strcmp(ev->keyname, "a") == 0) /* toggle animation timer */ 154 if (strcmp(ev->key, "a") == 0) /* toggle animation timer */
155 { 155 {
156 if (d.resize_timer != NULL) 156 if (d.resize_timer != NULL)
157 { 157 {
@@ -167,7 +167,7 @@ _on_keydown(void *data EINA_UNUSED,
167 return; 167 return;
168 } 168 }
169 169
170 if (strcmp(ev->keyname, "c") == 0) /* cycle between focus and key 170 if (strcmp(ev->key, "c") == 0) /* cycle between focus and key
171 * grabs for key input */ 171 * grabs for key input */
172 { 172 {
173 Eina_Bool ret; 173 Eina_Bool ret;
@@ -246,7 +246,7 @@ c_end:
246 return; 246 return;
247 } 247 }
248 248
249 if (strcmp(ev->keyname, "d") == 0) /* delete canvas' callbacks */ 249 if (strcmp(ev->key, "d") == 0) /* delete canvas' callbacks */
250 { 250 {
251 fprintf(stdout, "Deleting canvas event callbacks\n"); 251 fprintf(stdout, "Deleting canvas event callbacks\n");
252 evas_event_callback_del_full(evas, EVAS_CALLBACK_RENDER_FLUSH_PRE, 252 evas_event_callback_del_full(evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
@@ -257,7 +257,7 @@ c_end:
257 return; 257 return;
258 } 258 }
259 259
260 if (strcmp(ev->keyname, "f") == 0) /* freeze input for 3 seconds */ 260 if (strcmp(ev->key, "f") == 0) /* freeze input for 3 seconds */
261 { 261 {
262 fprintf(stdout, "Freezing input for 3 seconds\n"); 262 fprintf(stdout, "Freezing input for 3 seconds\n");
263 evas_event_freeze(evas); 263 evas_event_freeze(evas);
@@ -265,7 +265,7 @@ c_end:
265 return; 265 return;
266 } 266 }
267 267
268 if (strcmp(ev->keyname, "p") == 0) /* toggle precise point 268 if (strcmp(ev->key, "p") == 0) /* toggle precise point
269 * collision detection */ 269 * collision detection */
270 { 270 {
271 Eina_Bool precise = evas_object_precise_is_inside_get(d.img); 271 Eina_Bool precise = evas_object_precise_is_inside_get(d.img);
@@ -279,7 +279,7 @@ c_end:
279 279
280 mods = evas_key_modifier_get(evas); 280 mods = evas_key_modifier_get(evas);
281 if (evas_key_modifier_is_set(mods, "Control") && 281 if (evas_key_modifier_is_set(mods, "Control") &&
282 (strcmp(ev->keyname, "o") == 0)) /* add an obscured 282 (strcmp(ev->key, "o") == 0)) /* add an obscured
283 * rectangle to the middle 283 * rectangle to the middle
284 * of the canvas */ 284 * of the canvas */
285 { 285 {
diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c
index 8cfbdb1..fb11421 100644
--- a/src/examples/evas/evas-hints.c
+++ b/src/examples/evas/evas-hints.c
@@ -157,12 +157,12 @@ _on_keydown(void *data EINA_UNUSED,
157 r_data = &d.b_data; 157 r_data = &d.b_data;
158 name = "bottom"; 158 name = "bottom";
159 } 159 }
160 else if (strcmp(ev->keyname, "h") == 0) /* print help */ 160 else if (strcmp(ev->key, "h") == 0) /* print help */
161 { 161 {
162 fprintf(stdout, commands); 162 fprintf(stdout, commands);
163 return; 163 return;
164 } 164 }
165 else if (strcmp(ev->keyname, "s") == 0) /* get aspect status of the 165 else if (strcmp(ev->key, "s") == 0) /* get aspect status of the
166 * rectangles WRT size 166 * rectangles WRT size
167 * hints */ 167 * hints */
168 { 168 {
@@ -177,7 +177,7 @@ _on_keydown(void *data EINA_UNUSED,
177 177
178 if (!rect) return; 178 if (!rect) return;
179 179
180 if (strcmp(ev->keyname, "a") == 0) /* alignment hints */ 180 if (strcmp(ev->key, "a") == 0) /* alignment hints */
181 { 181 {
182 (r_data->align_ptr)++; 182 (r_data->align_ptr)++;
183 183
@@ -194,7 +194,7 @@ _on_keydown(void *data EINA_UNUSED,
194 return; 194 return;
195 } 195 }
196 196
197 if (strcmp(ev->keyname, "m") == 0) /* min. size hints */ 197 if (strcmp(ev->key, "m") == 0) /* min. size hints */
198 { 198 {
199 (r_data->min_ptr)++; 199 (r_data->min_ptr)++;
200 200
@@ -211,7 +211,7 @@ _on_keydown(void *data EINA_UNUSED,
211 return; 211 return;
212 } 212 }
213 213
214 if (strcmp(ev->keyname, "n") == 0) /* max. size hints */ 214 if (strcmp(ev->key, "n") == 0) /* max. size hints */
215 { 215 {
216 (r_data->max_ptr)++; 216 (r_data->max_ptr)++;
217 217
@@ -228,7 +228,7 @@ _on_keydown(void *data EINA_UNUSED,
228 return; 228 return;
229 } 229 }
230 230
231 if (strcmp(ev->keyname, "p") == 0) /* padding size hints */ 231 if (strcmp(ev->key, "p") == 0) /* padding size hints */
232 { 232 {
233 (r_data->padding_ptr)++; 233 (r_data->padding_ptr)++;
234 234
@@ -251,7 +251,7 @@ _on_keydown(void *data EINA_UNUSED,
251 /* experiment with weights here. keep in mind that, for the box 251 /* experiment with weights here. keep in mind that, for the box
252 * object, only if all the children have non zero weights this hint 252 * object, only if all the children have non zero weights this hint
253 * will have an effect */ 253 * will have an effect */
254 if (strcmp(ev->keyname, "w") == 0) /* weight hints */ 254 if (strcmp(ev->key, "w") == 0) /* weight hints */
255 { 255 {
256 (r_data->weight_ptr)++; 256 (r_data->weight_ptr)++;
257 257
diff --git a/src/examples/evas/evas-images.c b/src/examples/evas/evas-images.c
index 59ca8d3..d924d25 100644
--- a/src/examples/evas/evas-images.c
+++ b/src/examples/evas/evas-images.c
@@ -95,13 +95,13 @@ _on_keydown(void *data EINA_UNUSED,
95{ 95{
96 Evas_Event_Key_Down *ev = einfo; 96 Evas_Event_Key_Down *ev = einfo;
97 97
98 if (strcmp(ev->keyname, "h") == 0) /* print help */ 98 if (strcmp(ev->key, "h") == 0) /* print help */
99 { 99 {
100 fprintf(stdout, commands); 100 fprintf(stdout, commands);
101 return; 101 return;
102 } 102 }
103 103
104 if (strcmp(ev->keyname, "m") == 0) /* toggle border image's smooth scaling */ 104 if (strcmp(ev->key, "m") == 0) /* toggle border image's smooth scaling */
105 { 105 {
106 Eina_Bool smooth_scale = evas_object_image_smooth_scale_get(d.border); 106 Eina_Bool smooth_scale = evas_object_image_smooth_scale_get(d.border);
107 107
@@ -113,7 +113,7 @@ _on_keydown(void *data EINA_UNUSED,
113 return; 113 return;
114 } 114 }
115 115
116 if (strcmp(ev->keyname, "t") == 0) /* change border's thickness */ 116 if (strcmp(ev->key, "t") == 0) /* change border's thickness */
117 { 117 {
118 int l, r, t, b; 118 int l, r, t, b;
119 119
@@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
131 return; 131 return;
132 } 132 }
133 133
134 if (strcmp(ev->keyname, "c") == 0) /* change border's scaling factor */ 134 if (strcmp(ev->key, "c") == 0) /* change border's scaling factor */
135 { 135 {
136 double scale = evas_object_image_border_scale_get(d.border); 136 double scale = evas_object_image_border_scale_get(d.border);
137 137
@@ -145,7 +145,7 @@ _on_keydown(void *data EINA_UNUSED,
145 return; 145 return;
146 } 146 }
147 147
148 if (strcmp(ev->keyname, "b") == 0) /* change border's center 148 if (strcmp(ev->key, "b") == 0) /* change border's center
149 * region's aspect */ 149 * region's aspect */
150 { 150 {
151 Eina_Bool fill = \ 151 Eina_Bool fill = \
@@ -161,7 +161,7 @@ _on_keydown(void *data EINA_UNUSED,
161 return; 161 return;
162 } 162 }
163 163
164 if (strcmp(ev->keyname, "a") == 0) /* toggle alpha channel usage */ 164 if (strcmp(ev->key, "a") == 0) /* toggle alpha channel usage */
165 { 165 {
166 Eina_Bool alpha = evas_object_image_alpha_get(d.img1); 166 Eina_Bool alpha = evas_object_image_alpha_get(d.img1);
167 167
@@ -173,7 +173,7 @@ _on_keydown(void *data EINA_UNUSED,
173 return; 173 return;
174 } 174 }
175 175
176 if (strcmp(ev->keyname, "f") == 0) /* toggle filled property */ 176 if (strcmp(ev->key, "f") == 0) /* toggle filled property */
177 { 177 {
178 Eina_Bool filled = evas_object_image_filled_get(d.img1); 178 Eina_Bool filled = evas_object_image_filled_get(d.img1);
179 179
@@ -185,7 +185,7 @@ _on_keydown(void *data EINA_UNUSED,
185 return; 185 return;
186 } 186 }
187 187
188 if (strcmp(ev->keyname, "x") == 0) /* change x fill coordinate */ 188 if (strcmp(ev->key, "x") == 0) /* change x fill coordinate */
189 { 189 {
190 Evas_Coord x, y, w, h; 190 Evas_Coord x, y, w, h;
191 191
@@ -198,7 +198,7 @@ _on_keydown(void *data EINA_UNUSED,
198 return; 198 return;
199 } 199 }
200 200
201 if (strcmp(ev->keyname, "y") == 0) /* change y fill coordinate */ 201 if (strcmp(ev->key, "y") == 0) /* change y fill coordinate */
202 { 202 {
203 Evas_Coord x, y, w, h; 203 Evas_Coord x, y, w, h;
204 204
@@ -211,7 +211,7 @@ _on_keydown(void *data EINA_UNUSED,
211 return; 211 return;
212 } 212 }
213 213
214 if (strcmp(ev->keyname, "w") == 0) /* change w fill size */ 214 if (strcmp(ev->key, "w") == 0) /* change w fill size */
215 { 215 {
216 Evas_Coord x, y, w, h; 216 Evas_Coord x, y, w, h;
217 217
@@ -226,7 +226,7 @@ _on_keydown(void *data EINA_UNUSED,
226 return; 226 return;
227 } 227 }
228 228
229 if (strcmp(ev->keyname, "e") == 0) /* change h fill size */ 229 if (strcmp(ev->key, "e") == 0) /* change h fill size */
230 { 230 {
231 Evas_Coord x, y, w, h; 231 Evas_Coord x, y, w, h;
232 232
@@ -241,7 +241,7 @@ _on_keydown(void *data EINA_UNUSED,
241 return; 241 return;
242 } 242 }
243 243
244 if (strcmp(ev->keyname, "s") == 0) /* status */ 244 if (strcmp(ev->key, "s") == 0) /* status */
245 { 245 {
246 Evas_Coord x, y, w, h; 246 Evas_Coord x, y, w, h;
247 247
diff --git a/src/examples/evas/evas-images2.c b/src/examples/evas/evas-images2.c
index b1c8c79..f441301 100644
--- a/src/examples/evas/evas-images2.c
+++ b/src/examples/evas/evas-images2.c
@@ -160,13 +160,13 @@ _on_keydown(void *data EINA_UNUSED,
160{ 160{
161 Evas_Event_Key_Down *ev = einfo; 161 Evas_Event_Key_Down *ev = einfo;
162 162
163 if (strcmp(ev->keyname, "h") == 0) /* print help */ 163 if (strcmp(ev->key, "h") == 0) /* print help */
164 { 164 {
165 fprintf(stdout, commands); 165 fprintf(stdout, commands);
166 return; 166 return;
167 } 167 }
168 168
169 if (strcmp(ev->keyname, "s") == 0) /* print proxy image' stride value */ 169 if (strcmp(ev->key, "s") == 0) /* print proxy image' stride value */
170 { 170 {
171 int stride = evas_object_image_stride_get(d.noise_img); 171 int stride = evas_object_image_stride_get(d.noise_img);
172 172
@@ -176,7 +176,7 @@ _on_keydown(void *data EINA_UNUSED,
176 return; 176 return;
177 } 177 }
178 178
179 if (strcmp(ev->keyname, "p") == 0) /* change proxy's source */ 179 if (strcmp(ev->key, "p") == 0) /* change proxy's source */
180 { 180 {
181 Evas_Object *source = evas_object_image_source_get(d.proxy_img); 181 Evas_Object *source = evas_object_image_source_get(d.proxy_img);
182 182
@@ -190,7 +190,7 @@ _on_keydown(void *data EINA_UNUSED,
190 return; 190 return;
191 } 191 }
192 192
193 if (strcmp(ev->keyname, "a") == 0) /* save noise image to disk */ 193 if (strcmp(ev->key, "a") == 0) /* save noise image to disk */
194 { 194 {
195 if (!evas_object_image_save(d.noise_img, file_path, NULL, quality_str)) 195 if (!evas_object_image_save(d.noise_img, file_path, NULL, quality_str))
196 fprintf(stderr, "Cannot save image to '%s' (flags '%s')\n", 196 fprintf(stderr, "Cannot save image to '%s' (flags '%s')\n",
@@ -202,7 +202,7 @@ _on_keydown(void *data EINA_UNUSED,
202 return; 202 return;
203 } 203 }
204 204
205 if (strcmp(ev->keyname, "v") == 0) /* change source visibility */ 205 if (strcmp(ev->key, "v") == 0) /* change source visibility */
206 { 206 {
207 Eina_Bool src_visible = 207 Eina_Bool src_visible =
208 evas_object_image_source_visible_get(d.proxy_img); 208 evas_object_image_source_visible_get(d.proxy_img);
@@ -210,7 +210,7 @@ _on_keydown(void *data EINA_UNUSED,
210 return; 210 return;
211 } 211 }
212 212
213 if (strcmp(ev->keyname, "e") == 0) /* change source events */ 213 if (strcmp(ev->key, "e") == 0) /* change source events */
214 { 214 {
215 Eina_Bool src_events = evas_object_image_source_events_get(d.proxy_img); 215 Eina_Bool src_events = evas_object_image_source_events_get(d.proxy_img);
216 evas_object_image_source_events_set(d.proxy_img, !src_events); 216 evas_object_image_source_events_set(d.proxy_img, !src_events);
diff --git a/src/examples/evas/evas-images3.c b/src/examples/evas/evas-images3.c
index fe35ca3..52e2656 100644
--- a/src/examples/evas/evas-images3.c
+++ b/src/examples/evas/evas-images3.c
@@ -73,13 +73,13 @@ _on_keydown(void *data EINA_UNUSED,
73{ 73{
74 Evas_Event_Key_Down *ev = einfo; 74 Evas_Event_Key_Down *ev = einfo;
75 75
76 if (strcmp(ev->keyname, "h") == 0) /* print help */ 76 if (strcmp(ev->key, "h") == 0) /* print help */
77 { 77 {
78 fprintf(stdout, commands); 78 fprintf(stdout, commands);
79 return; 79 return;
80 } 80 }
81 81
82 if (strcmp(ev->keyname, "i") == 0) /* change proxy's source */ 82 if (strcmp(ev->key, "i") == 0) /* change proxy's source */
83 { 83 {
84 int stride = evas_object_image_stride_get(d.logo); 84 int stride = evas_object_image_stride_get(d.logo);
85 int w, h; 85 int w, h;
@@ -91,7 +91,7 @@ _on_keydown(void *data EINA_UNUSED,
91 return; 91 return;
92 } 92 }
93 93
94 if (strcmp(ev->keyname, "w") == 0) /* save noise image to disk */ 94 if (strcmp(ev->key, "w") == 0) /* save noise image to disk */
95 { 95 {
96 int i; 96 int i;
97 char *pixels = evas_object_image_data_get(d.logo, EINA_FALSE); 97 char *pixels = evas_object_image_data_get(d.logo, EINA_FALSE);
diff --git a/src/examples/evas/evas-map-utils.c b/src/examples/evas/evas-map-utils.c
index 30eb052..f4acf5b 100644
--- a/src/examples/evas/evas-map-utils.c
+++ b/src/examples/evas/evas-map-utils.c
@@ -170,7 +170,7 @@ _on_keydown(void *data, Evas *e, Evas_Object *o, void *event)
170 const Evas_Modifier *mods; 170 const Evas_Modifier *mods;
171 171
172 mods = evas_key_modifier_get(ad->canvas); 172 mods = evas_key_modifier_get(ad->canvas);
173 switch (ev->keyname[0]) 173 switch (ev->key[0])
174 { 174 {
175 case 'a': 175 case 'a':
176 ad->alpha = !ad->alpha; 176 ad->alpha = !ad->alpha;
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 03941aa..5a2bdb8 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -66,13 +66,13 @@ _on_keydown(void *data EINA_UNUSED,
66{ 66{
67 Evas_Event_Key_Down *ev = einfo; 67 Evas_Event_Key_Down *ev = einfo;
68 68
69 if (strcmp(ev->keyname, "h") == 0) /* print help */ 69 if (strcmp(ev->key, "h") == 0) /* print help */
70 { 70 {
71 fprintf(stdout, "%s", commands); 71 fprintf(stdout, "%s", commands);
72 return; 72 return;
73 } 73 }
74 74
75 if (strcmp(ev->keyname, "o") == 0) /* change clipper's opacity */ 75 if (strcmp(ev->key, "o") == 0) /* change clipper's opacity */
76 { 76 {
77 int alpha, r, g, b; 77 int alpha, r, g, b;
78 78
@@ -91,7 +91,7 @@ _on_keydown(void *data EINA_UNUSED,
91 return; 91 return;
92 } 92 }
93 93
94 if (strcmp(ev->keyname, "r") == 0) /* toggle clipper's color 94 if (strcmp(ev->key, "r") == 0) /* toggle clipper's color
95 * between red and white */ 95 * between red and white */
96 { 96 {
97 int alpha, r, g, b; 97 int alpha, r, g, b;
@@ -117,7 +117,7 @@ _on_keydown(void *data EINA_UNUSED,
117 return; 117 return;
118 } 118 }
119 119
120 if (strcmp(ev->keyname, "c") == 0) /* toggle clipper's clipping function */ 120 if (strcmp(ev->key, "c") == 0) /* toggle clipper's clipping function */
121 { 121 {
122 fprintf(stdout, "Toggling clipping "); 122 fprintf(stdout, "Toggling clipping ");
123 123
@@ -136,7 +136,7 @@ _on_keydown(void *data EINA_UNUSED,
136 return; 136 return;
137 } 137 }
138 138
139 if (strcmp(ev->keyname, "v") == 0) /* toggle clipper's visibility */ 139 if (strcmp(ev->key, "v") == 0) /* toggle clipper's visibility */
140 { 140 {
141 Eina_Bool visibility; 141 Eina_Bool visibility;
142 /* Don't use "get"-"set" expressions in one eo_do call, 142 /* Don't use "get"-"set" expressions in one eo_do call,
diff --git a/src/examples/evas/evas-object-manipulation.c b/src/examples/evas/evas-object-manipulation.c
index adc0316..d52f221 100644
--- a/src/examples/evas/evas-object-manipulation.c
+++ b/src/examples/evas/evas-object-manipulation.c
@@ -55,7 +55,7 @@ _on_keydown(void *data EINA_UNUSED,
55{ 55{
56 Evas_Event_Key_Down *ev = einfo; 56 Evas_Event_Key_Down *ev = einfo;
57 57
58 if (strcmp(ev->keyname, "h") == 0) /* print help */ 58 if (strcmp(ev->key, "h") == 0) /* print help */
59 { 59 {
60 fprintf(stdout, "commands are:\n" 60 fprintf(stdout, "commands are:\n"
61 "\to - change clipper's opacity\n" 61 "\to - change clipper's opacity\n"
@@ -65,7 +65,7 @@ _on_keydown(void *data EINA_UNUSED,
65 return; 65 return;
66 } 66 }
67 67
68 if (strcmp(ev->keyname, "o") == 0) /* change clipper's opacity */ 68 if (strcmp(ev->key, "o") == 0) /* change clipper's opacity */
69 { 69 {
70 int alpha, r, g, b; 70 int alpha, r, g, b;
71 71
@@ -84,7 +84,7 @@ _on_keydown(void *data EINA_UNUSED,
84 return; 84 return;
85 } 85 }
86 86
87 if (strcmp(ev->keyname, "r") == 0) /* toggle clipper's color 87 if (strcmp(ev->key, "r") == 0) /* toggle clipper's color
88 * between red and white */ 88 * between red and white */
89 { 89 {
90 int alpha, r, g, b; 90 int alpha, r, g, b;
@@ -110,7 +110,7 @@ _on_keydown(void *data EINA_UNUSED,
110 return; 110 return;
111 } 111 }
112 112
113 if (strcmp(ev->keyname, "c") == 0) /* toggle clipper's clipping function */ 113 if (strcmp(ev->key, "c") == 0) /* toggle clipper's clipping function */
114 { 114 {
115 fprintf(stdout, "Toggling clipping "); 115 fprintf(stdout, "Toggling clipping ");
116 116
@@ -127,7 +127,7 @@ _on_keydown(void *data EINA_UNUSED,
127 return; 127 return;
128 } 128 }
129 129
130 if (strcmp(ev->keyname, "v") == 0) /* toggle clipper's visibility */ 130 if (strcmp(ev->key, "v") == 0) /* toggle clipper's visibility */
131 { 131 {
132 fprintf(stdout, "Clipper is now "); 132 fprintf(stdout, "Clipper is now ");
133 133
diff --git a/src/examples/evas/evas-smart-interface.c b/src/examples/evas/evas-smart-interface.c
index 02ab8b2..39e24f3 100644
--- a/src/examples/evas/evas-smart-interface.c
+++ b/src/examples/evas/evas-smart-interface.c
@@ -491,19 +491,19 @@ _on_keydown(void *data EINA_UNUSED,
491{ 491{
492 Evas_Event_Key_Down *ev = einfo; 492 Evas_Event_Key_Down *ev = einfo;
493 493
494 if (strcmp(ev->keyname, "q") == 0) /* print help */ 494 if (strcmp(ev->key, "q") == 0) /* print help */
495 { 495 {
496 _on_destroy(NULL); 496 _on_destroy(NULL);
497 return; 497 return;
498 } 498 }
499 499
500 if (strcmp(ev->keyname, "h") == 0) /* print help */ 500 if (strcmp(ev->key, "h") == 0) /* print help */
501 { 501 {
502 fprintf(stdout, commands); 502 fprintf(stdout, commands);
503 return; 503 return;
504 } 504 }
505 505
506 if (strcmp(ev->keyname, "w") == 0) /* clear out smart object (WRT 506 if (strcmp(ev->key, "w") == 0) /* clear out smart object (WRT
507 * members) */ 507 * members) */
508 { 508 {
509 if (d.rects[0]) 509 if (d.rects[0])
@@ -524,7 +524,7 @@ _on_keydown(void *data EINA_UNUSED,
524 return; 524 return;
525 } 525 }
526 526
527 if (strcmp(ev->keyname, "l") == 0) /* insert random colored 527 if (strcmp(ev->key, "l") == 0) /* insert random colored
528 * rectangle on the left */ 528 * rectangle on the left */
529 { 529 {
530 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev; 530 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev;
@@ -553,7 +553,7 @@ _on_keydown(void *data EINA_UNUSED,
553 return; 553 return;
554 } 554 }
555 555
556 if (strcmp(ev->keyname, "r") == 0) /* insert random colored 556 if (strcmp(ev->key, "r") == 0) /* insert random colored
557 * rectangle on the right */ 557 * rectangle on the right */
558 { 558 {
559 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev; 559 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev;
@@ -583,14 +583,14 @@ _on_keydown(void *data EINA_UNUSED,
583 } 583 }
584 584
585 /* move smart object along the canvas */ 585 /* move smart object along the canvas */
586 if (strcmp(ev->keyname, "Right") == 0 || strcmp(ev->keyname, "Left") == 0 || 586 if (strcmp(ev->key, "Right") == 0 || strcmp(ev->key, "Left") == 0 ||
587 strcmp(ev->keyname, "Up") == 0 || strcmp(ev->keyname, "Down") == 0) 587 strcmp(ev->key, "Up") == 0 || strcmp(ev->key, "Down") == 0)
588 { 588 {
589 Evas_Coord x, y; 589 Evas_Coord x, y;
590 590
591 evas_object_geometry_get(d.smt, &x, &y, NULL, NULL); 591 evas_object_geometry_get(d.smt, &x, &y, NULL, NULL);
592 592
593 switch (ev->keyname[0]) 593 switch (ev->key[0])
594 { 594 {
595 case 'R': 595 case 'R':
596 x += 20; 596 x += 20;
@@ -615,7 +615,7 @@ _on_keydown(void *data EINA_UNUSED,
615 } 615 }
616 616
617 /* increase smart object's size */ 617 /* increase smart object's size */
618 if (strcmp(ev->keyname, "i") == 0) 618 if (strcmp(ev->key, "i") == 0)
619 { 619 {
620 Evas_Coord w, h; 620 Evas_Coord w, h;
621 621
@@ -630,7 +630,7 @@ _on_keydown(void *data EINA_UNUSED,
630 } 630 }
631 631
632 /* decrease smart object's size */ 632 /* decrease smart object's size */
633 if (strcmp(ev->keyname, "d") == 0) 633 if (strcmp(ev->key, "d") == 0)
634 { 634 {
635 Evas_Coord w, h; 635 Evas_Coord w, h;
636 636
@@ -645,7 +645,7 @@ _on_keydown(void *data EINA_UNUSED,
645 } 645 }
646 646
647 /* change smart object's clipper color */ 647 /* change smart object's clipper color */
648 if (strcmp(ev->keyname, "c") == 0) 648 if (strcmp(ev->key, "c") == 0)
649 { 649 {
650 cur_color = (cur_color + 1) % 4; 650 cur_color = (cur_color + 1) % 4;
651 651
diff --git a/src/examples/evas/evas-smart-object.c b/src/examples/evas/evas-smart-object.c
index 7377c47..c21bfc2 100644
--- a/src/examples/evas/evas-smart-object.c
+++ b/src/examples/evas/evas-smart-object.c
@@ -443,19 +443,19 @@ _on_keydown(void *data EINA_UNUSED,
443{ 443{
444 Evas_Event_Key_Down *ev = einfo; 444 Evas_Event_Key_Down *ev = einfo;
445 445
446 if (strcmp(ev->keyname, "q") == 0) /* print help */ 446 if (strcmp(ev->key, "q") == 0) /* print help */
447 { 447 {
448 _on_destroy(NULL); 448 _on_destroy(NULL);
449 return; 449 return;
450 } 450 }
451 451
452 if (strcmp(ev->keyname, "h") == 0) /* print help */ 452 if (strcmp(ev->key, "h") == 0) /* print help */
453 { 453 {
454 fprintf(stdout, commands); 454 fprintf(stdout, commands);
455 return; 455 return;
456 } 456 }
457 457
458 if (strcmp(ev->keyname, "w") == 0) /* clear out smart object (WRT 458 if (strcmp(ev->key, "w") == 0) /* clear out smart object (WRT
459 * members) */ 459 * members) */
460 { 460 {
461 if (d.rects[0]) 461 if (d.rects[0])
@@ -476,7 +476,7 @@ _on_keydown(void *data EINA_UNUSED,
476 return; 476 return;
477 } 477 }
478 478
479 if (strcmp(ev->keyname, "l") == 0) /* insert random colored 479 if (strcmp(ev->key, "l") == 0) /* insert random colored
480 * rectangle on the left */ 480 * rectangle on the left */
481 { 481 {
482 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev; 482 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev;
@@ -505,7 +505,7 @@ _on_keydown(void *data EINA_UNUSED,
505 return; 505 return;
506 } 506 }
507 507
508 if (strcmp(ev->keyname, "r") == 0) /* insert random colored 508 if (strcmp(ev->key, "r") == 0) /* insert random colored
509 * rectangle on the right */ 509 * rectangle on the right */
510 { 510 {
511 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev; 511 Evas_Object *rect = evas_object_rectangle_add(d.evas), *prev;
@@ -535,14 +535,14 @@ _on_keydown(void *data EINA_UNUSED,
535 } 535 }
536 536
537 /* move smart object along the canvas */ 537 /* move smart object along the canvas */
538 if (strcmp(ev->keyname, "Right") == 0 || strcmp(ev->keyname, "Left") == 0 || 538 if (strcmp(ev->key, "Right") == 0 || strcmp(ev->key, "Left") == 0 ||
539 strcmp(ev->keyname, "Up") == 0 || strcmp(ev->keyname, "Down") == 0) 539 strcmp(ev->key, "Up") == 0 || strcmp(ev->key, "Down") == 0)
540 { 540 {
541 Evas_Coord x, y; 541 Evas_Coord x, y;
542 542
543 evas_object_geometry_get(d.smt, &x, &y, NULL, NULL); 543 evas_object_geometry_get(d.smt, &x, &y, NULL, NULL);
544 544
545 switch (ev->keyname[0]) 545 switch (ev->key[0])
546 { 546 {
547 case 'R': 547 case 'R':
548 x += 20; 548 x += 20;
@@ -568,7 +568,7 @@ _on_keydown(void *data EINA_UNUSED,
568 } 568 }
569 569
570 /* increase smart object's size */ 570 /* increase smart object's size */
571 if (strcmp(ev->keyname, "i") == 0) 571 if (strcmp(ev->key, "i") == 0)
572 { 572 {
573 Evas_Coord w, h; 573 Evas_Coord w, h;
574 574
@@ -584,7 +584,7 @@ _on_keydown(void *data EINA_UNUSED,
584 } 584 }
585 585
586 /* decrease smart object's size */ 586 /* decrease smart object's size */
587 if (strcmp(ev->keyname, "d") == 0) 587 if (strcmp(ev->key, "d") == 0)
588 { 588 {
589 Evas_Coord w, h; 589 Evas_Coord w, h;
590 590
@@ -600,7 +600,7 @@ _on_keydown(void *data EINA_UNUSED,
600 } 600 }
601 601
602 /* change smart object's clipper color */ 602 /* change smart object's clipper color */
603 if (strcmp(ev->keyname, "c") == 0) 603 if (strcmp(ev->key, "c") == 0)
604 { 604 {
605 cur_color = (cur_color + 1) % 4; 605 cur_color = (cur_color + 1) % 4;
606 606
@@ -615,21 +615,21 @@ _on_keydown(void *data EINA_UNUSED,
615 } 615 }
616 616
617 /* rotate object to the right */ 617 /* rotate object to the right */
618 if (strcmp(ev->keyname, "period") == 0) 618 if (strcmp(ev->key, "period") == 0)
619 { 619 {
620 cur_angle = (cur_angle + 30) % 360; 620 cur_angle = (cur_angle + 30) % 360;
621 _map_update(); 621 _map_update();
622 return; 622 return;
623 } 623 }
624 624
625 if (strcmp(ev->keyname, "comma") == 0) 625 if (strcmp(ev->key, "comma") == 0)
626 { 626 {
627 cur_angle = (cur_angle - 30) % 360; 627 cur_angle = (cur_angle - 30) % 360;
628 _map_update(); 628 _map_update();
629 return; 629 return;
630 } 630 }
631 631
632 fprintf(stderr, "Invalid key: '%s'\n", ev->keyname); 632 fprintf(stderr, "Invalid key: '%s'\n", ev->key);
633} 633}
634 634
635static void 635static void
diff --git a/src/examples/evas/evas-stacking.c b/src/examples/evas/evas-stacking.c
index 9763227..18221cd 100644
--- a/src/examples/evas/evas-stacking.c
+++ b/src/examples/evas/evas-stacking.c
@@ -91,13 +91,13 @@ _on_keydown(void *data EINA_UNUSED,
91 Evas_Event_Key_Down *ev = einfo; 91 Evas_Event_Key_Down *ev = einfo;
92 const char *name = _name_get(d.rects[d.cur_rect]); 92 const char *name = _name_get(d.rects[d.cur_rect]);
93 93
94 if (strcmp(ev->keyname, "h") == 0) /* print help */ 94 if (strcmp(ev->key, "h") == 0) /* print help */
95 { 95 {
96 fprintf(stdout, commands); 96 fprintf(stdout, commands);
97 return; 97 return;
98 } 98 }
99 99
100 if (strcmp(ev->keyname, "s") == 0) /* get status of the 100 if (strcmp(ev->key, "s") == 0) /* get status of the
101 * rectangles WRT size 101 * rectangles WRT size
102 * hints */ 102 * hints */
103 { 103 {
@@ -126,7 +126,7 @@ _on_keydown(void *data EINA_UNUSED,
126 return; 126 return;
127 } 127 }
128 128
129 if (strcmp(ev->keyname, "l") == 0) /* change background rectangle's layer */ 129 if (strcmp(ev->key, "l") == 0) /* change background rectangle's layer */
130 { 130 {
131 d.cur_layer = (d.cur_layer + 1) % 3; 131 d.cur_layer = (d.cur_layer + 1) % 3;
132 evas_object_layer_set(d.bg, d.layers[d.cur_layer]); 132 evas_object_layer_set(d.bg, d.layers[d.cur_layer]);
@@ -136,7 +136,7 @@ _on_keydown(void *data EINA_UNUSED,
136 return; 136 return;
137 } 137 }
138 138
139 if (strcmp(ev->keyname, "c") == 0) /* change rectangle to operate on */ 139 if (strcmp(ev->key, "c") == 0) /* change rectangle to operate on */
140 { 140 {
141 d.cur_rect = (d.cur_rect + 1) % 3; 141 d.cur_rect = (d.cur_rect + 1) % 3;
142 142
@@ -145,7 +145,7 @@ _on_keydown(void *data EINA_UNUSED,
145 return; 145 return;
146 } 146 }
147 147
148 if (strcmp(ev->keyname, "t") == 0) /* bring target to top */ 148 if (strcmp(ev->key, "t") == 0) /* bring target to top */
149 { 149 {
150 Evas_Object *neighbour; 150 Evas_Object *neighbour;
151 151
@@ -160,7 +160,7 @@ _on_keydown(void *data EINA_UNUSED,
160 return; 160 return;
161 } 161 }
162 162
163 if (strcmp(ev->keyname, "m") == 0) /* bring target to bottom */ 163 if (strcmp(ev->key, "m") == 0) /* bring target to bottom */
164 { 164 {
165 Evas_Object *neighbour; 165 Evas_Object *neighbour;
166 166
@@ -176,7 +176,7 @@ _on_keydown(void *data EINA_UNUSED,
176 return; 176 return;
177 } 177 }
178 178
179 if (strcmp(ev->keyname, "p") == 0) /* toggle pass events */ 179 if (strcmp(ev->key, "p") == 0) /* toggle pass events */
180 { 180 {
181 Eina_Bool pass = evas_object_pass_events_get(d.rects[d.cur_rect]); 181 Eina_Bool pass = evas_object_pass_events_get(d.rects[d.cur_rect]);
182 182
@@ -188,7 +188,7 @@ _on_keydown(void *data EINA_UNUSED,
188 return; 188 return;
189 } 189 }
190 190
191 if (strcmp(ev->keyname, "r") == 0) /* toggle repeat events */ 191 if (strcmp(ev->key, "r") == 0) /* toggle repeat events */
192 { 192 {
193 Eina_Bool repeat = evas_object_repeat_events_get(d.rects[d.cur_rect]); 193 Eina_Bool repeat = evas_object_repeat_events_get(d.rects[d.cur_rect]);
194 194
@@ -200,7 +200,7 @@ _on_keydown(void *data EINA_UNUSED,
200 return; 200 return;
201 } 201 }
202 202
203 if (strcmp(ev->keyname, "a") == 0) /* stack target above */ 203 if (strcmp(ev->key, "a") == 0) /* stack target above */
204 { 204 {
205 Evas_Object *neighbour = evas_object_above_get(d.rects[d.cur_rect]); 205 Evas_Object *neighbour = evas_object_above_get(d.rects[d.cur_rect]);
206 206
@@ -222,7 +222,7 @@ _on_keydown(void *data EINA_UNUSED,
222 return; 222 return;
223 } 223 }
224 224
225 if (strcmp(ev->keyname, "b") == 0) /* stack target below */ 225 if (strcmp(ev->key, "b") == 0) /* stack target below */
226 { 226 {
227 Evas_Object *neighbour = evas_object_below_get(d.rects[d.cur_rect]); 227 Evas_Object *neighbour = evas_object_below_get(d.rects[d.cur_rect]);
228 228
diff --git a/src/examples/evas/evas-text.c b/src/examples/evas/evas-text.c
index e3c3e85..b24ac14 100644
--- a/src/examples/evas/evas-text.c
+++ b/src/examples/evas/evas-text.c
@@ -154,13 +154,13 @@ _on_keydown(void *data EINA_UNUSED,
154{ 154{
155 Evas_Event_Key_Down *ev = einfo; 155 Evas_Event_Key_Down *ev = einfo;
156 156
157 if (strcmp(ev->keyname, "h") == 0) /* print help */ 157 if (strcmp(ev->key, "h") == 0) /* print help */
158 { 158 {
159 fprintf(stdout, commands); 159 fprintf(stdout, commands);
160 return; 160 return;
161 } 161 }
162 162
163 if (strcmp(ev->keyname, "t") == 0) /* change text's current style */ 163 if (strcmp(ev->key, "t") == 0) /* change text's current style */
164 { 164 {
165 Evas_Text_Style_Type type = evas_object_text_style_get(d.text); 165 Evas_Text_Style_Type type = evas_object_text_style_get(d.text);
166 166
@@ -174,7 +174,7 @@ _on_keydown(void *data EINA_UNUSED,
174 return; 174 return;
175 } 175 }
176 176
177 if (strcmp(ev->keyname, "f") == 0) /* change text's font */ 177 if (strcmp(ev->key, "f") == 0) /* change text's font */
178 { 178 {
179 int sz; 179 int sz;
180 180
@@ -191,7 +191,7 @@ _on_keydown(void *data EINA_UNUSED,
191 return; 191 return;
192 } 192 }
193 193
194 if (strcmp(ev->keyname, "b") == 0) /* change text's base color */ 194 if (strcmp(ev->key, "b") == 0) /* change text's base color */
195 { 195 {
196 (d.t_data.text_ptr)++; 196 (d.t_data.text_ptr)++;
197 197
@@ -208,7 +208,7 @@ _on_keydown(void *data EINA_UNUSED,
208 return; 208 return;
209 } 209 }
210 210
211 if (strcmp(ev->keyname, "g") == 0) /* change text's glow 2 color */ 211 if (strcmp(ev->key, "g") == 0) /* change text's glow 2 color */
212 { 212 {
213 (d.t_data.glow2_ptr)++; 213 (d.t_data.glow2_ptr)++;
214 214
@@ -225,7 +225,7 @@ _on_keydown(void *data EINA_UNUSED,
225 return; 225 return;
226 } 226 }
227 227
228 if (strcmp(ev->keyname, "w") == 0) /* change text's glow color */ 228 if (strcmp(ev->key, "w") == 0) /* change text's glow color */
229 { 229 {
230 (d.t_data.glow_ptr)++; 230 (d.t_data.glow_ptr)++;
231 231
@@ -242,7 +242,7 @@ _on_keydown(void *data EINA_UNUSED,
242 return; 242 return;
243 } 243 }
244 244
245 if (strcmp(ev->keyname, "o") == 0) /* change text's outline color */ 245 if (strcmp(ev->key, "o") == 0) /* change text's outline color */
246 { 246 {
247 (d.t_data.outline_ptr)++; 247 (d.t_data.outline_ptr)++;
248 248
@@ -259,7 +259,7 @@ _on_keydown(void *data EINA_UNUSED,
259 return; 259 return;
260 } 260 }
261 261
262 if (strcmp(ev->keyname, "s") == 0) /* change text's shadow color */ 262 if (strcmp(ev->key, "s") == 0) /* change text's shadow color */
263 { 263 {
264 (d.t_data.shadow_ptr)++; 264 (d.t_data.shadow_ptr)++;
265 265
@@ -276,7 +276,7 @@ _on_keydown(void *data EINA_UNUSED,
276 return; 276 return;
277 } 277 }
278 278
279 if (strcmp(ev->keyname, "z") == 0) /* change text's font size */ 279 if (strcmp(ev->key, "z") == 0) /* change text's font size */
280 { 280 {
281 const char *font; 281 const char *font;
282 int size; 282 int size;
diff --git a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
index b6c4fc2..84794c2 100644
--- a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
+++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
@@ -112,7 +112,7 @@ EAPI void ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_eve
112 * _key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) 112 * _key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
113 * { 113 * {
114 * Evas_Event_Key_Down *ev = event_info; 114 * Evas_Event_Key_Down *ev = event_info;
115 * if (!ev->keyname) return; 115 * if (!ev->key) return;
116 * 116 *
117 * if (imf_context) 117 * if (imf_context)
118 * { 118 * {
@@ -143,7 +143,7 @@ EAPI void ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, Ec
143 * _key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) 143 * _key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
144 * { 144 * {
145 * Evas_Event_Key_Up *ev = event_info; 145 * Evas_Event_Key_Up *ev = event_info;
146 * if (!ev->keyname) return; 146 * if (!ev->key) return;
147 * 147 *
148 * if (imf_context) 148 * if (imf_context)
149 * { 149 * {
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index f2b4b2b..ce38414 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -2569,7 +2569,7 @@ EAPI void evas_object_pass_events_set(Evas_Object *obj, Eina_Bool pass) EIN
2569 * 2569 *
2570 * Example: 2570 * Example:
2571 * @dontinclude evas-stacking.c 2571 * @dontinclude evas-stacking.c
2572 * @skip if (strcmp(ev->keyname, "p") == 0) 2572 * @skip if (strcmp(ev->key, "p") == 0)
2573 * @until } 2573 * @until }
2574 * 2574 *
2575 * See the full @ref Example_Evas_Stacking "example". 2575 * See the full @ref Example_Evas_Stacking "example".
@@ -2597,7 +2597,7 @@ EAPI Eina_Bool evas_object_pass_events_get(const Evas_Object *obj) EINA_WARN_UNU
2597 * 2597 *
2598 * Example: 2598 * Example:
2599 * @dontinclude evas-stacking.c 2599 * @dontinclude evas-stacking.c
2600 * @skip if (strcmp(ev->keyname, "r") == 0) 2600 * @skip if (strcmp(ev->key, "r") == 0)
2601 * @until } 2601 * @until }
2602 * 2602 *
2603 * See the full @ref Example_Evas_Stacking "example". 2603 * See the full @ref Example_Evas_Stacking "example".
@@ -3006,7 +3006,7 @@ EAPI void evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas
3006 * 3006 *
3007 * Example: 3007 * Example:
3008 * @dontinclude evas-aspect-hints.c 3008 * @dontinclude evas-aspect-hints.c
3009 * @skip if (strcmp(ev->keyname, "c") == 0) 3009 * @skip if (strcmp(ev->key, "c") == 0)
3010 * @until } 3010 * @until }
3011 * 3011 *
3012 * See the full @ref Example_Evas_Aspect_Hints "example". 3012 * See the full @ref Example_Evas_Aspect_Hints "example".
@@ -3434,7 +3434,7 @@ EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj)
3434 * 3434 *
3435 * Example code follows. 3435 * Example code follows.
3436 * @dontinclude evas-events.c 3436 * @dontinclude evas-events.c
3437 * @skip if (strcmp(ev->keyname, "p") == 0) 3437 * @skip if (strcmp(ev->key, "p") == 0)
3438 * @until } 3438 * @until }
3439 * 3439 *
3440 * See the full example @ref Example_Evas_Events "here". 3440 * See the full example @ref Example_Evas_Events "here".