Compare commits

...

5 Commits

Author SHA1 Message Date
Jean-Philippe Andre c2900ca520 UI main loop: Fix indentation 2014-10-22 16:08:13 +09:00
Jean-Philippe Andre d4c8022788 Fix support of --count from command line
expedite would never exit after N loops
2014-10-22 15:58:20 +09:00
Cedric BAIL f046934f31 fix wrong ordering of report. 2014-09-04 14:23:38 +02:00
Cedric BAIL ef0024c010 disable font until 1.11. 2014-09-04 13:55:21 +02:00
Cedric BAIL c892d9a9e1 fix build on 1.10.x branch. 2014-09-04 13:50:44 +02:00
101 changed files with 209 additions and 184 deletions

View File

@ -8,7 +8,7 @@ _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
eo_do(o, evas_obj_position_set(10, 40),
evas_obj_size_set(win_w - 20, win_h - 50),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
import sys
import os

View File

@ -1,3 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 11
#undef FNAME
#undef NAME
#undef ICON
@ -98,3 +106,5 @@ void FNAME(void)
#undef FNAME
#undef NAME
#undef ICON
#endif

View File

@ -1,3 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 11
#undef FNAME
#undef NAME
#undef ICON
@ -100,3 +108,6 @@ void FNAME(void)
#undef FNAME
#undef NAME
#undef ICON
#endif

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("pan.png"), NULL),

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
eo_do(o,

View File

@ -25,7 +25,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < MANYNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
n = rnd() % 100;
w = 3 + ((n * (60 - 3)) / 100);

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("frame.png"), NULL),

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -22,7 +22,7 @@ static void _setup(void)
{
Evas_Object *o;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[0] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im1.png"), NULL),
@ -30,7 +30,7 @@ static void _setup(void)
evas_obj_size_set(720, 420),
evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[1] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im2.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,

View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,

View File

@ -29,7 +29,7 @@ static void _setup(void)
{
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,
@ -39,7 +39,7 @@ static void _setup(void)
evas_obj_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
evas_obj_image_fill_set(0, 0, 640, 480),

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_LINE_CLASS, evas);
o = eo_add(EVAS_OBJ_LINE_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;

View File

@ -9,6 +9,7 @@ const char *profile = "n800";
const char *choosen_engine = NULL;
int win_w = 720, win_h = 420;
int loops = LOOPS;
int one_test = 0;
Eina_Bool fullscreen = EINA_FALSE;
Eina_Bool cmp_report = EINA_FALSE;
@ -1322,6 +1323,7 @@ main(int argc, char **argv)
}
else if (test > 0)
{
one_test = 1;
ui_num(test);
}

View File

@ -47,6 +47,7 @@ extern "C"
extern Evas *evas;
extern int win_w, win_h;
extern int loops;
extern int one_test;
extern const char *choosen_engine;
extern Eina_Bool fullscreen;
extern Eina_Bool cmp_report;
@ -92,8 +93,8 @@ int engine_abort(void);
{ \
double fps; \
fps = (double)f / t; \
ui_fps(fps); \
printf("%4.2f , %s\n", fps, x); \
ui_fps(fps); \
done = 1; \
}

View File

@ -73,7 +73,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_POLYGON_CLASS, evas);
o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;

View File

@ -22,7 +22,7 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
@ -33,7 +33,7 @@ static void _setup(void)
for (i = 1; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_source_set(src),

View File

@ -26,7 +26,7 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
@ -35,7 +35,7 @@ static void _setup(void)
for (i = 0; i < OBNUM / 2; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_source_set(src, NULL),
evas_obj_size_set(120, 160),

View File

@ -27,11 +27,11 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"),
evas_obj_text_text_set("This is a test string"),
evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -46,7 +46,7 @@ static void _setup(void)
for ( ; i < OBNUM ; i ++)
{
s = o_texts[i % st];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o;
eo_do(o, evas_obj_image_source_set(s));
/* FIXME s == NULL*/

View File

@ -30,7 +30,7 @@ static void _setup(void)
"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
};
srnd();
o = eo_add(EVAS_TEXT_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[0] = o;
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
@ -40,7 +40,7 @@ static void _setup(void)
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set(buf),
evas_obj_text_text_set(buf),
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
@ -52,7 +52,7 @@ static void _setup(void)
evas_obj_visibility_set(EINA_TRUE));
for (i = 1 ; i < OBNUM ; i ++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o;
eo_do(o,
evas_obj_image_source_set(o_texts[0]));
@ -93,7 +93,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o_texts[0],
evas_obj_text_set(buf),
evas_obj_text_text_set(buf),
evas_obj_size_get(&w, &h));
for (i = 1; i < OBNUM; i++)
{

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255;

View File

@ -29,7 +29,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255;

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;

View File

@ -29,7 +29,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 0xff;
r = ((rnd()&0xff) * a) / 255;