kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use key instead of keyname for considering setxkbmap

Browse Source
devs/devilhorns/drm
Jihoon Kim 10 years ago
parent 9637c2b835
commit 3ebc18731f
33 changed files with 223 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      doc/ecore_examples.dox
  2. 6
      doc/edje_examples.dox
  3. 14
      doc/evas_examples.dox
  4. 12
      src/examples/ecore/ecore_evas_window_sizes_example.c
  5. 6
      src/examples/edje/edje-animations.c
  6. 10
      src/examples/edje/edje-basic.c
  7. 12
      src/examples/edje/edje-basic2.c
  8. 12
      src/examples/edje/edje-box.c
  9. 8
      src/examples/edje/edje-box2.c
  10. 16
      src/examples/edje/edje-drag.c
  11. 22
      src/examples/edje/edje-perspective.c
  12. 8
      src/examples/edje/edje-signals-messages.c
  13. 14
      src/examples/edje/sigtest.c
  14. 24
      src/examples/emotion/emotion_border_example.c
  15. 24
      src/examples/emotion/emotion_generic_example.c
  16. 8
      src/examples/ephysics/test_bouncing_ball.c
  17. 8
      src/examples/ephysics/test_velocity.c
  18. 10
      src/examples/evas/evas-aspect-hints.c
  19. 30
      src/examples/evas/evas-box.c
  20. 16
      src/examples/evas/evas-events.c
  21. 14
      src/examples/evas/evas-hints.c
  22. 24
      src/examples/evas/evas-images.c
  23. 12
      src/examples/evas/evas-images2.c
  24. 6
      src/examples/evas/evas-images3.c
  25. 2
      src/examples/evas/evas-map-utils.c
  26. 10
      src/examples/evas/evas-object-manipulation-eo.c
  27. 10
      src/examples/evas/evas-object-manipulation.c
  28. 22
      src/examples/evas/evas-smart-interface.c
  29. 28
      src/examples/evas/evas-smart-object.c
  30. 20
      src/examples/evas/evas-stacking.c
  31. 18
      src/examples/evas/evas-text.c
  32. 4
      src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
  33. 8
      src/lib/evas/Evas_Legacy.h

8
doc/ecore_examples.dox
Unescape View File

@ -1317,7 +1317,7 @@
* ones on our window. Test it by trying to resize it to smaller sizes
* than that:
* @dontinclude ecore_evas_window_sizes_example.c
* @skip keyname, "m"
* @skip key, "m"
* @until }
* @until }
* @until }
@ -1326,7 +1326,7 @@
* to two times our initial size. Test it by trying to resize the
* window to bigger sizes than that:
* @dontinclude ecore_evas_window_sizes_example.c
* @skip keyname, "x"
* @skip key, "x"
* @until }
* @until }
* @until }
@ -1335,7 +1335,7 @@
* with the @c 'b' key. It will set a base size of two times the
* initial one:
* @dontinclude ecore_evas_window_sizes_example.c
* @skip keyname, "b"
* @skip key, "b"
* @until }
* @until }
* @until }
@ -1344,7 +1344,7 @@
* pixels. With than on (@c 's' key), you'll see the window will
* always be bound to @b multiples of that size, for dimensions on
* both axis:
* @skip keyname, "s"
* @skip key, "s"
* @until }
* @until }
* @until }

6
doc/edje_examples.dox
Unescape View File

@ -119,7 +119,7 @@
* scale). Scaling will be applied to @c "part_one", only, because
* that's the part flagged to be scaled at EDC level:
* @dontinclude edje-basic.c
* @skip strcmp(ev->keyname, "s") == 0
* @skip strcmp(ev->key, "s") == 0
* @until }
*
* Note, finally, that the @c 's' command will depend on the 'r' one
@ -128,7 +128,7 @@
* scaling factor. Only when the individual one is set to zero, will
* the global one take effect:
* @dontinclude edje-basic.c
* @skip strcmp(ev->keyname, "r") == 0
* @skip strcmp(ev->key, "r") == 0
* @until }
*
*
@ -810,7 +810,7 @@
* @until }
* @until }
* @dontinclude edje-signals-messages.c
* @skip keyname, "t"
* @skip key, "t"
* @until }
*
* The example's window should look like this picture:

14
doc/evas_examples.dox
Unescape View File

@ -127,7 +127,7 @@
* @until ;
* The 'p' one will change the source of the proxy image to one of the
* other two, as seem above.
* @skip if (strcmp(ev->keyname, "p") == 0)
* @skip if (strcmp(ev->key, "p") == 0)
* @until }
* Note the top right image, the smaller one:
* @dontinclude evas-images2.c
@ -158,7 +158,7 @@
* The 's' command will save one of the images on the disk, in the png
* format:
* @dontinclude evas-images2.c
* @skip if (strcmp(ev->keyname, "a") == 0)
* @skip if (strcmp(ev->key, "a") == 0)
* @until }
*
* The full example follows.
@ -266,13 +266,13 @@
* processing for the canvas (in the example, just for 3 seconds). Try
* to issue events for it during that freeze time:
* @dontinclude evas-events.c
* @skip if (strcmp(ev->keyname, "f") == 0)
* @skip if (strcmp(ev->key, "f") == 0)
* @until }
* The 'd' command will unregister those two canvas callbacks for you,
* so you won't see the messages about the focused object and the
* rendering process anymore:
* @dontinclude evas-events.c
* @skip if (strcmp(ev->keyname, "d") == 0)
* @skip if (strcmp(ev->key, "d") == 0)
* @until }
* In this example, we start using a focused object to handle the input
* events -- the background rectangle. We register a callback on an key input
@ -282,7 +282,7 @@
* @dontinclude evas-events.c
* @skip examine the keys pressed
* @until key grab
* We do so by examining the @c ev->keyname string (remember the event
* We do so by examining the @c ev->key string (remember the event
* information struct for key down events is the #Evas_Event_Key_Down
* one). There's one more trick for grabbing input events on this
* example -- evas_object_key_grab(). The 'c' command will, when
@ -314,7 +314,7 @@
* in the case) as not belonging to it when calculating mouse
* in/out/up/down events:
* @dontinclude evas-events.c
* @skip if (strcmp(ev->keyname, "p") == 0)
* @skip if (strcmp(ev->key, "p") == 0)
* @until }
* To finish the example, try the command bound to Control + 'o',
* which exemplifies Evas' <b>obscured regions</b>. When firstly
@ -479,7 +479,7 @@
* height of the box equally and, then, place the items in the cells
* in the diagonal:
* @dontinclude evas-box.c
* @skip keyname, "0"
* @skip key, "0"
* @until }
* @dontinclude evas-box.c
* @skip custom 'diagonal' layout

12
src/examples/ecore/ecore_evas_window_sizes_example.c
Unescape View File

@ -68,13 +68,13 @@ _on_keydown(void *data EINA_UNUSED,
{
Evas_Event_Key_Down *ev = einfo;
if (strcmp(ev->keyname, "h") == 0) /* print help */
if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
}
if (strcmp(ev->keyname, "m") == 0) /* impose a minimum size on the window */
if (strcmp(ev->key, "m") == 0) /* impose a minimum size on the window */
{
min_set = !min_set;
@ -93,7 +93,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "x") == 0) /* impose a maximum size on the window */
if (strcmp(ev->key, "x") == 0) /* impose a maximum size on the window */
{
max_set = !max_set;
@ -112,7 +112,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "b") == 0) /* impose a base size on the window */
if (strcmp(ev->key, "b") == 0) /* impose a base size on the window */
{
base_set = !base_set;
@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "s") == 0) /* impose a step size on the window */
if (strcmp(ev->key, "s") == 0) /* impose a step size on the window */
{
step_set = !step_set;
@ -149,7 +149,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "g") == 0) /* get screen geometry */
if (strcmp(ev->key, "g") == 0) /* get screen geometry */
{
int x, y, w, h;
ecore_evas_screen_geometry_get(ee, &x, &y, &w, &h);

6
src/examples/edje/edje-animations.c
Unescape View File

@ -73,7 +73,7 @@ _on_key_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, v
ev = (Evas_Event_Key_Down *)event_info;
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
@ -137,11 +137,11 @@ _on_key_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, v
edje_object_animation_set(obj, EINA_FALSE);
fprintf(stdout, "Stopping the animation in the Edje object\n");
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

10
src/examples/edje/edje-basic.c
Unescape View File

@ -49,12 +49,12 @@ _on_keydown(void *data,
ev = (Evas_Event_Key_Down *)einfo;
edje_obj = (Evas_Object *)data;
if (strcmp(ev->keyname, "h") == 0) /* print help */
if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
}
else if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */
else if (strcmp(ev->key, "s") == 0) /* global scaling factor */
{
double scale = edje_scale_get();
@ -69,7 +69,7 @@ _on_keydown(void *data,
return;
}
else if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */
else if (strcmp(ev->key, "r") == 0) /* individual scaling factor */
{
double scale = edje_object_scale_get(edje_obj);
@ -86,11 +86,11 @@ _on_keydown(void *data,
return;
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

12
src/examples/edje/edje-basic2.c
Unescape View File

@ -44,29 +44,29 @@ _on_key_down(void *data,
evas_object_geometry_get(edje_obj, &x, &y, NULL, NULL);
if(strcmp(ev->keyname,"Escape") == 0)
if(strcmp(ev->key,"Escape") == 0)
{
ecore_main_loop_quit();
}
else if(strcmp(ev->keyname, "Down") == 0)
else if(strcmp(ev->key, "Down") == 0)
{
y+=WALK;
}
else if(strcmp(ev->keyname, "Up") == 0)
else if(strcmp(ev->key, "Up") == 0)
{
y-=WALK;
}
else if(strcmp(ev->keyname, "Right") == 0)
else if(strcmp(ev->key, "Right") == 0)
{
x+=WALK;
}
else if(strcmp(ev->keyname, "Left") == 0)
else if(strcmp(ev->key, "Left") == 0)
{
x-=WALK;
}
else
{
fprintf(stdout, "Key %s not supported.\nCommands:%s", ev->keyname, commands);
fprintf(stdout, "Key %s not supported.\nCommands:%s", ev->key, commands);
return;
}

12
src/examples/edje/edje-box.c
Unescape View File

@ -111,12 +111,12 @@ _on_bg_key_down(void *data, Evas *e, Evas_Object *o EINA_UNUSED, void *event_inf
ev = (Evas_Event_Key_Down *)event_info;
edje_obj = ecore_evas_data_get(ee, "edje_obj");
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
}
if (!strcmp(ev->keyname, "i"))
if (!strcmp(ev->key, "i"))
{
rect = evas_object_rectangle_add(e);
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
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
}
else if (!strcmp(ev->keyname, "a"))
else if (!strcmp(ev->key, "a"))
{
rect = evas_object_rectangle_add(e);
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
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
}
else if (!strcmp(ev->keyname, "c"))
else if (!strcmp(ev->key, "c"))
edje_object_part_box_remove_all(edje_obj, "example/box", EINA_TRUE);
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

8
src/examples/edje/edje-box2.c
Unescape View File

@ -85,7 +85,7 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
edje_obj = (Evas_Object *)data;
mods = evas_key_modifier_get(evas);
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
@ -94,7 +94,7 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
{
int pos;
Evas_Object *obj = NULL;
pos = atoi(ev->keyname);
pos = atoi(ev->key);
obj = edje_object_part_box_remove_at(edje_obj, "example/box", pos);
if (obj)
evas_object_del(obj);
@ -104,13 +104,13 @@ on_keydown(void *data, Evas *evas, Evas_Object *o EINA_UNUSED, void *einfo)
{
Evas_Object *obj;
int pos;
pos = atoi(ev->keyname);
pos = atoi(ev->key);
obj = new_greenie_block(evas);
if (!edje_object_part_box_insert_at(edje_obj, "example/box", obj, pos))
edje_object_part_box_append(edje_obj, "example/box", obj);
return;
}
if (!strcmp(ev->keyname, "Escape"))
if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
}

16
src/examples/edje/edje-drag.c
Unescape View File

@ -78,36 +78,36 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
ev = (Evas_Event_Key_Down *)event_info;
edje_obj = ecore_evas_data_get(ee, "edje_obj");
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
}
else if (!strcmp(ev->keyname, "Down"))
else if (!strcmp(ev->key, "Down"))
{
edje_object_part_drag_step(edje_obj, PARTNAME, 0, 1.0);
}
else if (!strcmp(ev->keyname, "Up"))
else if (!strcmp(ev->key, "Up"))
{
edje_object_part_drag_step(edje_obj, PARTNAME, 0, -1.0);
}
else if (!strcmp(ev->keyname, "m"))
else if (!strcmp(ev->key, "m"))
{
edje_object_part_drag_value_set(edje_obj, PARTNAME, 0.0, 0.5);
}
else if (!strcmp(ev->keyname, "Prior"))
else if (!strcmp(ev->key, "Prior"))
{
edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, -1.0);
}
else if (!strcmp(ev->keyname, "Next"))
else if (!strcmp(ev->key, "Next"))
{
edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, 1.0);
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

22
src/examples/edje/edje-perspective.c
Unescape View File

@ -98,44 +98,44 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
struct _App *app = data;
Evas_Event_Key_Down *ev = event_info;
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
}
// just moving the part and text
else if (!strcmp(ev->keyname, "Down"))
else if (!strcmp(ev->key, "Down"))
{
_part_move(app, 0, 1);
}
else if (!strcmp(ev->keyname, "Up"))
else if (!strcmp(ev->key, "Up"))
{
_part_move(app, 0, -1);
}
else if (!strcmp(ev->keyname, "Left"))
else if (!strcmp(ev->key, "Left"))
{
_part_move(app, -1, 0);
}
else if (!strcmp(ev->keyname, "Right"))
else if (!strcmp(ev->key, "Right"))
{
_part_move(app, 1, 0);
}
else if (!strcmp(ev->keyname, "Prior"))
else if (!strcmp(ev->key, "Prior"))
{
_part_move(app, -1, -1);
}
else if (!strcmp(ev->keyname, "Next"))
else if (!strcmp(ev->key, "Next"))
{
_part_move(app, 1, 1);
}
// adjusting the perspective focal point distance
else if (!strcmp(ev->keyname, "KP_Add"))
else if (!strcmp(ev->key, "KP_Add"))
{
app->focal += 5;
edje_perspective_set(app->ps, 240, 160, 0, app->focal);
edje_object_calc_force(app->edje_obj);
}
else if (!strcmp(ev->keyname, "KP_Subtract"))
else if (!strcmp(ev->key, "KP_Subtract"))
{
app->focal -= 5;
if (app->focal < 5)
@ -145,11 +145,11 @@ _on_bg_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, voi
edje_object_calc_force(app->edje_obj);
}
// exiting
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

8
src/examples/edje/edje-signals-messages.c
Unescape View File

@ -51,12 +51,12 @@ _on_keydown(void *data,
ev = (Evas_Event_Key_Down *)einfo;
edje_obj = (Evas_Object *)data;
if (!strcmp(ev->keyname, "h")) /* print help */
if (!strcmp(ev->key, "h")) /* print help */
{
fprintf(stdout, commands);
return;
}
else if (!strcmp(ev->keyname, "t")) /* toggle right rectangle's visibility */
else if (!strcmp(ev->key, "t")) /* toggle right rectangle's visibility */
{
char buf[1024];
@ -70,11 +70,11 @@ _on_keydown(void *data,
return;
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

14
src/examples/edje/sigtest.c
Unescape View File

@ -45,12 +45,12 @@ _on_keydown(void *data,
edje_obj = ecore_evas_data_get(ee, "edje_obj");
edje_file = ecore_evas_data_get(ee, "file");
if (!strcmp(ev->keyname, "h"))
if (!strcmp(ev->key, "h"))
{
fprintf(stdout, commands);
return;
}
else if (!strcmp(ev->keyname, "e"))
else if (!strcmp(ev->key, "e"))
{
if (!edje_object_file_set(edje_obj, edje_file, "plain/edje/group"))
{
@ -64,7 +64,7 @@ _on_keydown(void *data,
" file sigtest.edj with success!\n");
return;
}
else if (!strcmp(ev->keyname, "l"))
else if (!strcmp(ev->key, "l"))
{
if (!edje_object_file_set(edje_obj, edje_file, "lua_base"))
{
@ -78,7 +78,7 @@ _on_keydown(void *data,
" file sigtest.edj with success!\n");
return;
}
else if (!strcmp(ev->keyname, "m"))
else if (!strcmp(ev->key, "m"))
{
Edje_Message_String *msg = malloc(sizeof(*msg));
@ -89,7 +89,7 @@ _on_keydown(void *data,
fprintf(stdout, "C message sent\n");
return;
}
else if (!strcmp(ev->keyname, "s"))
else if (!strcmp(ev->key, "s"))
{
fprintf(stdout, "\n");
edje_object_signal_emit(edje_obj, "C signal 1", "Csource");
@ -97,11 +97,11 @@ _on_keydown(void *data,
fprintf(stdout, "C signal sent\n");
return;
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
ecore_main_loop_quit();
else
{
printf("unhandled key: %s\n", ev->keyname);
printf("unhandled key: %s\n", ev->key);
fprintf(stdout, commands);
}
}

24
src/examples/emotion/emotion_border_example.c
Unescape View File

@ -39,19 +39,19 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
Evas_Event_Key_Down *ev = event_info;
Evas_Object *em = data;
if (!strcmp(ev->keyname, "Return"))
if (!strcmp(ev->key, "Return"))
{
emotion_object_play_set(em, EINA_TRUE);
}
else if (!strcmp(ev->keyname, "space"))
else if (!strcmp(ev->key, "space"))
{
emotion_object_play_set(em, EINA_FALSE);
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
{
ecore_main_loop_quit();
}
else if (!strcmp(ev->keyname, "n"))
else if (!strcmp(ev->key, "n"))
{
const char *file;
if (!curfile)
@ -62,7 +62,7 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
fprintf(stderr, "playing next file: %s\n", file);
emotion_object_file_set(em, file);
}
else if (!strcmp(ev->keyname, "p"))
else if (!strcmp(ev->key, "p"))
{
const char *file;
if (!curfile)
@ -73,33 +73,33 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
fprintf(stderr, "playing next file: %s\n", file);
emotion_object_file_set(em, file);
}
else if (!strcmp(ev->keyname, "b"))
else if (!strcmp(ev->key, "b"))
{
emotion_object_border_set(em, 0, 0, 50, 50);
}
else if (!strcmp(ev->keyname, "0"))
else if (!strcmp(ev->key, "0"))
{
emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_NONE);
}
else if (!strcmp(ev->keyname, "w"))
else if (!strcmp(ev->key, "w"))
{
emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_WIDTH);
}
else if (!strcmp(ev->keyname, "h"))
else if (!strcmp(ev->key, "h"))
{
emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_HEIGHT);
}
else if (!strcmp(ev->keyname, "2"))
else if (!strcmp(ev->key, "2"))
{
emotion_object_keep_aspect_set(em, EMOTION_ASPECT_KEEP_BOTH);
}
else if (!strcmp(ev->keyname, "c"))
else if (!strcmp(ev->key, "c"))
{
emotion_object_keep_aspect_set(em, EMOTION_ASPECT_CROP);
}
else
{
fprintf(stderr, "unhandled key: %s\n", ev->keyname);
fprintf(stderr, "unhandled key: %s\n", ev->key);
}
}

24
src/examples/emotion/emotion_generic_example.c
Unescape View File

@ -50,25 +50,25 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
Evas_Event_Key_Down *ev = event_info;
Evas_Object *em = data;
if (!strcmp(ev->keyname, "Return"))
if (!strcmp(ev->key, "Return"))
{
emotion_object_play_set(em, EINA_TRUE);
}
else if (!strcmp(ev->keyname, "space"))
else if (!strcmp(ev->key, "space"))
{
emotion_object_play_set(em, EINA_FALSE);
}
else if (!strcmp(ev->keyname, "Escape"))
else if (!strcmp(ev->key, "Escape"))
{
ecore_main_loop_quit();
}
else if (!strcmp(ev->keyname, "t"))
else if (!strcmp(ev->key, "t"))
{
int w, h;
emotion_object_size_get(em, &w, &h);
fprintf(stderr, "example -> size: %dx%d\n", w, h);
}
else if (!strcmp(ev->keyname, "s"))
else if (!strcmp(ev->key, "s"))
{
float len, pos;
len = emotion_object_play_length_get(em);
@ -76,17 +76,17 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
fprintf(stderr, "skipping to position %0.3f\n", pos);
emotion_object_position_set(em, pos);
}
else if (!strcmp(ev->keyname, "1"))
else if (!strcmp(ev->key, "1"))
{
fprintf(stderr, "setting speed to 1.0\n");
emotion_object_play_speed_set(em, 1.0);
}
else if (!strcmp(ev->keyname, "2"))
else if (!strcmp(ev->key, "2"))
{
fprintf(stderr, "setting speed to 2.0\n");
emotion_object_play_speed_set(em, 2.0);
}
else if (!strcmp(ev->keyname, "n"))
else if (!strcmp(ev->key, "n"))
{
const char *file;
if (!curfile)
@ -97,7 +97,7 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
fprintf(stderr, "playing next file: %s\n", file);
emotion_object_file_set(em, file);
}
else if (!strcmp(ev->keyname, "p"))
else if (!strcmp(ev->key, "p"))
{
const char *file;
if (!curfile)
@ -108,18 +108,18 @@ _on_key_down(void *data, Evas *e, Evas_Object *o, void *event_info)
fprintf(stderr, "playing next file: %s\n", file);
emotion_object_file_set(em, file);
}
else if (!strcmp(ev->keyname, "d"))
else if (!strcmp(ev->key, "d"))
{
evas_object_del(em);
}
else if (!strcmp(ev->keyname, "l"))
else if (!strcmp(ev->key, "l"))
{
// force frame dropping
sleep(5);
}
else
{
fprintf(stderr, "unhandled key: %s\n", ev->keyname);
fprintf(stderr, "unhandled key: %s\n", ev->key);
}
}

8
src/examples/ephysics/test_bouncing_ball.c
Unescape View File

@ -13,13 +13,13 @@ _on_keydown(void *data, Evas_Object *obj __UNUSED__, Evas_Object *src __UNUSED__
if (type != EVAS_CALLBACK_KEY_UP)
return EINA_FALSE;
if (strcmp(ev->keyname, "Up") == 0)
if (strcmp(ev->key, "Up") == 0)
ephysics_body_central_impulse_apply(body, 0, -300, 0);
else if (strcmp(ev->keyname, "Down") == 0)
else if (strcmp(ev->key, "Down") == 0)
ephysics_body_central_impulse_apply(body, 0, 300, 0);
else if (strcmp(ev->keyname, "Right") == 0)
else if (strcmp(ev->key, "Right") == 0)
ephysics_body_central_impulse_apply(body, 300, 0, 0);
else if (strcmp(ev->keyname, "Left") == 0)
else if (strcmp(ev->key, "Left") == 0)
ephysics_body_central_impulse_apply(body, -300, 0, 0);
return EINA_TRUE;

8
src/examples/ephysics/test_velocity.c
Unescape View File

@ -24,13 +24,13 @@ _on_keydown(void *data, Evas_Object *obj __UNUSED__, Evas_Object *src __UNUSED__
if (type != EVAS_CALLBACK_KEY_UP)
return EINA_FALSE;
if (strcmp(ev->keyname, "Up") == 0)
if (strcmp(ev->key, "Up") == 0)
ephysics_body_central_impulse_apply(body, 0, -300, 0);
else if (strcmp(ev->keyname, "Down") == 0)
else if (strcmp(ev->key, "Down") == 0)
ephysics_body_central_impulse_apply(body, 0, 300, 0);
else if (strcmp(ev->keyname, "Right") == 0)
else if (strcmp(ev->key, "Right") == 0)
ephysics_body_central_impulse_apply(body, 300, 0, 0);
else if (strcmp(ev->keyname, "Left") == 0)
else if (strcmp(ev->key, "Left") == 0)
ephysics_body_central_impulse_apply(body, -300, 0, 0);
return EINA_TRUE;

10
src/examples/evas/evas-aspect-hints.c
Unescape View File

@ -89,7 +89,7 @@ _on_keydown(void *data EINA_UNUSED,
mods = evas_key_modifier_get(evas_object_evas_get(o));
if (evas_key_modifier_is_set(mods, "Shift") &&
strcmp(ev->keyname, "h") == 0) /* print help */
strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, "commands are:\n"
"\tc - cycle aspect control on object\n"
@ -100,7 +100,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "s") == 0) /* get aspect status of the obj */
if (strcmp(ev->key, "s") == 0) /* get aspect status of the obj */
{
Evas_Coord w, h;
Evas_Aspect_Control aspect;
@ -114,7 +114,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "c") == 0) /* cycle aspect control on obj */
if (strcmp(ev->key, "c") == 0) /* cycle aspect control on obj */
{
Evas_Coord w, h;
Evas_Aspect_Control aspect;
@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "h") == 0) /* change horizontal aspect component */
if (strcmp(ev->key, "h") == 0) /* change horizontal aspect component */
{
Evas_Coord w, h;
Evas_Aspect_Control aspect;
@ -147,7 +147,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "v") == 0) /* change vertical aspect component */
if (strcmp(ev->key, "v") == 0) /* change vertical aspect component */
{
Evas_Coord w, h;
Evas_Aspect_Control aspect;

30
src/examples/evas/evas-box.c
Unescape View File

@ -106,7 +106,7 @@ _on_keydown(void *data EINA_UNUSED,
Evas_Event_Key_Down *ev = einfo;
const Evas_Modifier *mods = evas_key_modifier_get(evas);
if (strcmp(ev->keyname, "h") == 0) /* print help */
if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
@ -119,7 +119,7 @@ _on_keydown(void *data EINA_UNUSED,
Evas_Object *obj;
Eina_List *children;
pos = atoi(ev->keyname);
pos = atoi(ev->key);
children = evas_object_box_children_get(d.box);
obj = eina_list_nth(children, pos);
@ -137,14 +137,14 @@ list_free:
{
Evas_Object *o;
int pos;
pos = atoi(ev->keyname);
pos = atoi(ev->key);
o = _new_rectangle_add(d.evas);
if (!evas_object_box_insert_at(d.box, o, pos))
evas_object_box_append(d.box, o);
return;
}
if (strcmp(ev->keyname, "a") == 0)
if (strcmp(ev->key, "a") == 0)
{
double h, v;
@ -166,7 +166,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "p") == 0)
if (strcmp(ev->key, "p") == 0)
{
int h, v;
@ -184,7 +184,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "1") == 0)
if (strcmp(ev->key, "1") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_horizontal, NULL, NULL);
@ -193,7 +193,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "2") == 0)
if (strcmp(ev->key, "2") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_vertical, NULL, NULL);
@ -202,7 +202,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "3") == 0)
if (strcmp(ev->key, "3") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_homogeneous_horizontal, NULL,
@ -213,7 +213,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "4") == 0)
if (strcmp(ev->key, "4") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_homogeneous_vertical, NULL, NULL);
@ -223,7 +223,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "5") == 0)
if (strcmp(ev->key, "5") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_homogeneous_max_size_horizontal,
@ -234,7 +234,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "6") == 0)
if (strcmp(ev->key, "6") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_homogeneous_max_size_vertical,
@ -245,7 +245,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "7") == 0)
if (strcmp(ev->key, "7") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_flow_horizontal, NULL, NULL);
@ -254,7 +254,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "8") == 0)
if (strcmp(ev->key, "8") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_flow_vertical, NULL, NULL);
@ -263,7 +263,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "9") == 0)
if (strcmp(ev->key, "9") == 0)
{
evas_object_box_layout_set(
d.box, evas_object_box_layout_stack, NULL, NULL);
@ -272,7 +272,7 @@ list_free:
return;
}
if (strcmp(ev->keyname, "0") == 0)
if (strcmp(ev->key, "0") == 0)
{
evas_object_box_layout_set(d.box, _custom_layout, NULL, NULL);

16
src/examples/evas/evas-events.c
Unescape View File

@ -141,17 +141,17 @@ _on_keydown(void *data EINA_UNUSED,
const Evas_Modifier *mods;
Evas_Event_Key_Down *ev = einfo;
fprintf(stdout, "We've got key input: %s\n", ev->keyname);
fprintf(stdout, "We've got key input: %s\n", ev->key);
fprintf(stdout, "It actually came from %s\n", d.focus ?
"focus" : "key grab");
if (strcmp(ev->keyname, "h") == 0) /* print help */
if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
}
if (strcmp(ev->keyname, "a") == 0) /* toggle animation timer */
if (strcmp(ev->key, "a") == 0) /* toggle animation timer */
{
if (d.resize_timer != NULL)
{
@ -167,7 +167,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "c") == 0) /* cycle between focus and key
if (strcmp(ev->key, "c") == 0) /* cycle between focus and key
* grabs for key input */
{
Eina_Bool ret;
@ -246,7 +246,7 @@ c_end:
return;
}
if (strcmp(ev->keyname, "d") == 0) /* delete canvas' callbacks */
if (strcmp(ev->key, "d") == 0) /* delete canvas' callbacks */
{
fprintf(stdout, "Deleting canvas event callbacks\n");
evas_event_callback_del_full(evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
@ -257,7 +257,7 @@ c_end:
return;
}
if (strcmp(ev->keyname, "f") == 0) /* freeze input for 3 seconds */
if (strcmp(ev->key, "f") == 0) /* freeze input for 3 seconds */
{
fprintf(stdout, "Freezing input for 3 seconds\n");
evas_event_freeze(evas);
@ -265,7 +265,7 @@ c_end:
return;
}
if (strcmp(ev->keyname, "p") == 0) /* toggle precise point
if (strcmp(ev->key, "p") == 0) /* toggle precise point
* collision detection */
{
Eina_Bool precise = evas_object_precise_is_inside_get(d.img);
@ -279,7 +279,7 @@ c_end:
mods = evas_key_modifier_get(evas);
if (evas_key_modifier_is_set(mods, "Control") &&
(strcmp(ev->keyname, "o") == 0)) /* add an obscured
(strcmp(ev->key, "o") == 0)) /* add an obscured
* rectangle to the middle
* of the canvas */
{

14
src/examples/evas/evas-hints.c
Unescape View File

@ -157,12 +157,12 @@ _on_keydown(void *data EINA_UNUSED,
r_data = &d.b_data;
name = "bottom";
}
else if (strcmp(ev->keyname, "h") == 0) /* print help */
else if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
}
else if (strcmp(ev->keyname, "s") == 0) /* get aspect status of the
else if (strcmp(ev->key, "s") == 0) /* get aspect status of the
* rectangles WRT size
* hints */
{
@ -177,7 +177,7 @@ _on_keydown(void *data EINA_UNUSED,
if (!rect) return;
if (strcmp(ev->keyname, "a") == 0) /* alignment hints */
if (strcmp(ev->key, "a") == 0) /* alignment hints */
{
(r_data->align_ptr)++;
@ -194,7 +194,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "m") == 0) /* min. size hints */
if (strcmp(ev->key, "m") == 0) /* min. size hints */
{
(r_data->min_ptr)++;
@ -211,7 +211,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "n") == 0) /* max. size hints */
if (strcmp(ev->key, "n") == 0) /* max. size hints */
{
(r_data->max_ptr)++;
@ -228,7 +228,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "p") == 0) /* padding size hints */
if (strcmp(ev->key, "p") == 0) /* padding size hints */
{
(r_data->padding_ptr)++;
@ -251,7 +251,7 @@ _on_keydown(void *data EINA_UNUSED,
/* experiment with weights here. keep in mind that, for the box
* object, only if all the children have non zero weights this hint
* will have an effect */
if (strcmp(ev->keyname, "w") == 0) /* weight hints */
if (strcmp(ev->key, "w") == 0) /* weight hints */
{
(r_data->weight_ptr)++;

24
src/examples/evas/evas-images.c
Unescape View File

@ -95,13 +95,13 @@ _on_keydown(void *data EINA_UNUSED,
{
Evas_Event_Key_Down *ev = einfo;
if (strcmp(ev->keyname, "h") == 0) /* print help */
if (strcmp(ev->key, "h") == 0) /* print help */
{
fprintf(stdout, commands);
return;
}
if (strcmp(ev->keyname, "m") == 0) /* toggle border image's smooth scaling */
if (strcmp(ev->key, "m") == 0) /* toggle border image's smooth scaling */
{
Eina_Bool smooth_scale = evas_object_image_smooth_scale_get(d.border);
@ -113,7 +113,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "t") == 0) /* change border's thickness */
if (strcmp(ev->key, "t") == 0) /* change border's thickness */
{
int l, r, t, b;
@ -131,7 +131,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "c") == 0) /* change border's scaling factor */
if (strcmp(ev->key, "c") == 0) /* change border's scaling factor */
{
double scale = evas_object_image_border_scale_get(d.border);
@ -145,7 +145,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "b") == 0) /* change border's center
if (strcmp(ev->key, "b") == 0) /* change border's center
* region's aspect */
{
Eina_Bool fill = \
@ -161,7 +161,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "a") == 0) /* toggle alpha channel usage */
if (strcmp(ev->key, "a") == 0) /* toggle alpha channel usage */
{
Eina_Bool alpha = evas_object_image_alpha_get(d.img1);
@ -173,7 +173,7 @@ _on_keydown(void *data EINA_UNUSED,
return;
}
if (strcmp(ev->keyname, "f") == 0) /* toggle filled property */
<