remove trailing spaces

SVN revision: 32103
expedite-1.1
doursse 16 years ago committed by doursse
parent b4b852d75a
commit 43ecaa0ee6
  1. 2
      src/bin/about.c
  2. 10
      src/bin/engine_gl_x11.c
  3. 4
      src/bin/engine_software_ddraw.c
  4. 10
      src/bin/engine_xrender_x11.c
  5. 2
      src/bin/image_blend_occlude1.c
  6. 2
      src/bin/image_blend_occlude1_few.c
  7. 2
      src/bin/image_blend_occlude1_many.c
  8. 2
      src/bin/image_blend_occlude1_very_many.c
  9. 2
      src/bin/image_blend_occlude2.c
  10. 2
      src/bin/image_blend_occlude2_few.c
  11. 2
      src/bin/image_blend_occlude2_many.c
  12. 2
      src/bin/image_blend_occlude2_very_many.c
  13. 2
      src/bin/image_blend_occlude3.c
  14. 2
      src/bin/image_blend_occlude3_few.c
  15. 2
      src/bin/image_blend_occlude3_many.c
  16. 2
      src/bin/image_blend_occlude3_very_many.c
  17. 8
      src/bin/image_crossfade.c
  18. 8
      src/bin/image_data_ycbcr601pl_wide_stride.c
  19. 6
      src/bin/main.c
  20. 4
      src/bin/poly_blend.c
  21. 2
      src/bin/rect_blend.c
  22. 2
      src/bin/rect_blend_few.c
  23. 2
      src/bin/rect_solid.c
  24. 2
      src/bin/rect_solid_few.c
  25. 2
      src/bin/text_basic.c
  26. 2
      src/bin/text_styles_different_strings.c
  27. 12
      src/bin/textblock_basic.c
  28. 12
      src/bin/textblock_intl.c
  29. 60
      src/bin/ui.c
  30. 2
      src/bin/ui.h

@ -33,7 +33,7 @@ _setup(void)
"components (libraries and applications) that have specific uses. "
"It is very large, and so requires more testing and demonstration."
"</center>"
"<center>"
"Expedite is a full test suite for Evas, which is one of the "
"core components of the Enlightenment Foundation Libraries. Evas "

@ -28,7 +28,7 @@ engine_gl_x11_args(int argc, char **argv)
Evas_Engine_Info_GL_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
@ -38,10 +38,10 @@ engine_gl_x11_args(int argc, char **argv)
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
evas_output_method_set(evas, evas_render_method_lookup("gl_x11"));
einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(evas);
if (!einfo)
@ -49,7 +49,7 @@ engine_gl_x11_args(int argc, char **argv)
printf("Evas does not support the OpenGL X11 Engine\n");
return 0;
}
einfo->info.display = disp;
einfo->info.visual = einfo->func.best_visual_get(disp, DefaultScreen(disp));
einfo->info.colormap = einfo->func.best_colormap_get(disp, DefaultScreen(disp));
@ -73,7 +73,7 @@ engine_gl_x11_args(int argc, char **argv)
&attr);
einfo->info.drawable = win;
evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
XStoreName(disp, win, "Expedite - Evas Test Suite");
chint.res_name = "expedite";
chint.res_class = "Expedite";

@ -133,8 +133,8 @@ MainWndProc(HWND hwnd,
PostQuitMessage(0);
return 0;
case WM_WINDOWPOSCHANGED: {
PAINTSTRUCT ps;
HDC hdc;
PAINTSTRUCT ps;
HDC hdc;
hdc = BeginPaint (window, &ps);
evas_damage_rectangle_add(evas,

@ -28,7 +28,7 @@ engine_xrender_x11_args(int argc, char **argv)
Evas_Engine_Info_XRender_X11 *einfo;
int i;
int ok = 0;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
@ -38,10 +38,10 @@ engine_xrender_x11_args(int argc, char **argv)
}
}
if (!ok) return 0;
disp = XOpenDisplay(NULL);
if (!disp) return 0;
evas_output_method_set(evas, evas_render_method_lookup("xrender_x11"));
einfo = (Evas_Engine_Info_XRender_X11 *)evas_engine_info_get(evas);
if (!einfo)
@ -49,7 +49,7 @@ engine_xrender_x11_args(int argc, char **argv)
printf("Evas does not support the XRender X11 Engine\n");
return 0;
}
einfo->info.display = disp;
einfo->info.visual = DefaultVisual(disp, DefaultScreen(disp));
attr.backing_store = NotUseful;
@ -70,7 +70,7 @@ engine_xrender_x11_args(int argc, char **argv)
&attr);
einfo->info.drawable = win;
evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
XStoreName(disp, win, "Expedite - Evas Test Suite");
chint.res_name = "expedite";
chint.res_class = "Expedite";

@ -31,7 +31,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -31,7 +31,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -31,7 +31,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -34,7 +34,7 @@ static void _setup(void)
else
{
Evas_Coord x, y;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);

@ -21,21 +21,21 @@ static Evas_Object *o_images[2];
static void _setup(void)
{
Evas_Object *o;
o = evas_object_image_add(evas);
o_images[0] = o;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/im1.png", NULL);
evas_object_image_fill_set(o, 0, 0, 720, 420);
evas_object_resize(o, 720, 420);
evas_object_show(o);
o = evas_object_image_add(evas);
o_images[1] = o;
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/im2.png", NULL);
evas_object_image_fill_set(o, 0, 0, 720, 420);
evas_object_resize(o, 720, 420);
evas_object_show(o);
done = 0;
}
@ -50,7 +50,7 @@ static void _cleanup(void)
static void _loop(double t, int f)
{
int a;
a = f & 0x1f;
a = ((a << 3) | (a >> 2)) & 0xff;
evas_object_color_set(o_images[1], a, a, a, a);

@ -90,7 +90,7 @@ static void _loop(double t, int f)
for (i = 0; i < 1; i++)
{
unsigned char **data, **lp;
w = 640;
h = 480;
x = (win_w / 2) - (w / 2);
@ -98,13 +98,13 @@ static void _loop(double t, int f)
evas_object_move(o_images[i], x, y);
evas_object_resize(o_images[i], w, h);
evas_object_image_fill_set(o_images[i], 0, 0, w, h);
w = 320 - 16 + f;
if (w < 1) w = 1;
else if (w > 640) w = 640;
w &= ~0x1;
evas_object_image_size_set(o_images[i], w, 480);
data = evas_object_image_data_get(o_images[i], 1);
if (data)

@ -1134,7 +1134,7 @@ _engine_args(int argc, char **argv)
char buf[4096];
char *prefix;
int profile_ok;
/* FIXME: parse args for geometry, engine etc. */
profile_ok = _profile_parse(argc, argv);
if (engine_software_x11_args(argc, argv))
@ -1178,7 +1178,7 @@ _engine_args(int argc, char **argv)
strcpy(buf, PACKAGE_DATA_DIR"/data");
else
snprintf(buf, 4096, "%s", prefix);
evas_output_size_set(evas, win_w, win_h);
evas_output_viewport_set(evas, 0, 0, win_w, win_h);
evas_key_modifier_add(evas, "Shift");
@ -1211,7 +1211,7 @@ main(int argc, char **argv)
evas_render(evas);
}
evas_free(evas);
evas_shutdown();
return 0;
}

@ -67,7 +67,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int r, g, b, a;
o = evas_object_polygon_add(evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
@ -94,7 +94,7 @@ static void _loop(double t, int f)
int i;
Evas_Coord x, y, w, h;
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = o_images[i];

@ -25,7 +25,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int r, g, b, a;
o = evas_object_rectangle_add(evas);
o_images[i] = o;
a = rnd()&0xff;

@ -28,7 +28,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int r, g, b, a;
o = evas_object_rectangle_add(evas);
o_images[i] = o;
a = rnd()&0xff;

@ -25,7 +25,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int r, g, b, a;
o = evas_object_rectangle_add(evas);
o_images[i] = o;
a = 0xff;

@ -28,7 +28,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int r, g, b, a;
o = evas_object_rectangle_add(evas);
o_images[i] = o;
a = 0xff;

@ -22,7 +22,7 @@ static void _setup(void)
{
int i;
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = evas_object_text_add(evas);

@ -26,7 +26,7 @@ static void _setup(void)
char buf[1024];
const char *strs[] = {
"Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I",
"Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
"Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
};

@ -44,7 +44,7 @@ static void _setup(void)
evas_object_textblock_style_set(o, st);
evas_textblock_style_free(st);
evas_object_textblock_clear(o);
evas_object_textblock_text_markup_set
(o,
"<center><h1>Title</h1></center><br>"
@ -110,9 +110,9 @@ static void _setup(void)
"plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
"</blockquote>"
);
evas_object_show(o);
done = 0;
}
@ -127,18 +127,18 @@ static void _loop(double t, int f)
{
Evas_Coord x, y, w, h, w0, h0;
int i = 0;
w0 = 160;
h0 = 120;
w = 150 + ((1.0 + cos((double)(f + (i * 10)) / (37.4 * SLOW) )) * w0 * 2);
h = 50 + ((1.0 + sin((double)(f + (i * 19)) / (52.6 * SLOW) )) * h0 * 2);
x = (win_w / 2) - (w / 2);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
evas_object_move(o_text, x, y);
evas_object_resize(o_text, w, 5000);
FPS_STD(NAME);
}

@ -34,7 +34,7 @@ static void _setup(void)
evas_object_textblock_style_set(o, st);
evas_textblock_style_free(st);
evas_object_textblock_clear(o);
evas_object_textblock_text_markup_set
(o,
"This is a test of International test rendering in Evas<br>"
@ -86,9 +86,9 @@ static void _setup(void)
"Tibetan: 'ཨ་ན་ཀ།'<br>"
"Yiddish: 'יוניקאָד'<br>"
);
evas_object_show(o);
done = 0;
}
@ -103,17 +103,17 @@ static void _loop(double t, int f)
{
Evas_Coord x, y, w, h, w0, h0;
int i = 0;
evas_object_textblock_size_native_get(o_text, &w0, &h0);
w = w0;
h = h0;
x = (win_w / 2) - (w / 2);
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2));
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
evas_object_move(o_text, x, y);
evas_object_resize(o_text, w, h);
FPS_STD(NAME);
}

@ -56,11 +56,11 @@ _ui_all(void)
Evas_List *l;
double fps = 0.0;
int t_count = 0;
for (l = menu; l; l = l->next)
{
Menu_Item *mi;
mi = l->data;
if ((mi->func == about_start) ||
(mi->func == _ui_exit) ||
@ -86,7 +86,7 @@ _ui_select(void)
Evas_List *l;
int i;
void (*func) (void) = NULL;
evas_object_hide(o_menu_logo);
evas_object_hide(o_menu_title);
evas_object_hide(o_menu_title2);
@ -97,7 +97,7 @@ _ui_select(void)
for (i = 0, l = menu; l; l = l->next, i++)
{
Menu_Item *mi;
mi = l->data;
evas_object_hide(mi->o_icon);
if (i == menu_sel)
@ -111,7 +111,7 @@ static void
_ui_key(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Key_Down *ev;
ev = event_info;
if (key_func)
{
@ -143,7 +143,7 @@ static void
_ui_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Down *ev;
ev = event_info;
if (ev->button != 1) return;
if (menu_active)
@ -162,13 +162,13 @@ static void
_ui_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Up *ev;
ev = event_info;
if (ev->button != 1) return;
if (menu_active)
{
Evas_Coord dx, dy;
dx = ev->canvas.x - down_x;
dy = ev->canvas.y - down_y;
if ((((dx * dx) + (dy * dy)) < (20 * 20)) &&
@ -187,7 +187,7 @@ static void
_ui_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Move *ev;
ev = event_info;
if (!down) return;
if (menu_active)
@ -208,7 +208,7 @@ _ui_menu_item_add(char *icon, char *text, void (*func) (void))
{
char buf[4096];
Menu_Item *mi;
mi = malloc(sizeof(Menu_Item));
snprintf(buf, 4096, "%s%s", data_dir, icon);
mi->o_icon = evas_object_image_add(evas);
@ -235,7 +235,7 @@ _ui_setup(void)
strcpy(data_dir, PACKAGE_DATA_DIR"/data/");
else
snprintf(data_dir, 4096, "%s/", prefix);
o = evas_object_rectangle_add(evas);
evas_object_move(o, 0, 0);
evas_object_resize(o, win_w, win_h);
@ -257,7 +257,7 @@ _ui_setup(void)
evas_object_show(o);
o_wallpaper = o;
/*
/*
o = evas_object_image_add(evas);
evas_object_move(o, 0, 0);
evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/bg.png", NULL);
@ -268,7 +268,7 @@ _ui_setup(void)
evas_object_show(o);
o_wallpaper = o;
*/
o = evas_object_text_add(evas);
evas_object_text_font_set(o, "Vera-Bold", 10);
evas_object_text_text_set(o, "EXPEDITE");
@ -279,7 +279,7 @@ _ui_setup(void)
x = (win_w - w) / 2;
y = 0;
evas_object_move(o, x, y);
evas_object_show(o);
evas_object_show(o);
o_title = o;
o = evas_object_text_add(evas);
@ -292,9 +292,9 @@ _ui_setup(void)
x = (win_w - w) / 2;
y = h + 2;
evas_object_move(o, x, y);
evas_object_show(o);
evas_object_show(o);
o_byline = o;
o = evas_object_image_add(evas);
evas_object_move(o, (win_w - 120) / 2, ((win_h - 160) / 2));
snprintf(buf, 4096, "%s%s", data_dir, "logo.png");
@ -305,14 +305,14 @@ _ui_setup(void)
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_show(o);
o_menu_logo = o;
o = evas_object_image_add(evas);
evas_object_move(o, win_w - 128, - 128);
evas_object_image_fill_set(o, 0, 0, 256, 256);
evas_object_resize(o, 256, 256);
evas_object_show(o);
o_menu_icon = o;
o = evas_object_image_add(evas);
evas_object_move(o, 0, 0);
snprintf(buf, 4096, "%s%s", data_dir, "icon_sel.png");
@ -337,7 +337,7 @@ _ui_setup(void)
evas_object_resize(o, 56, 41);
evas_object_image_fill_set(o, 0, 0, 56, 41);
o_menu_icon_sel2 = o;
o = evas_object_text_add(evas);
evas_object_text_font_set(o, "Vera-Bold", 10);
evas_object_text_text_set(o, "");
@ -359,7 +359,7 @@ _ui_setup(void)
y = (win_h - h) / 2;
evas_object_move(o, x, y);
o_menu_title = o;
_ui_menu_item_add("e.png", "About Enlightenment", about_start);
_ui_menu_item_add("e.png", "All Tests", _ui_all);
#define UI
@ -375,7 +375,7 @@ void
ui_args(int argc, char **argv)
{
int i;
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-e")) && (i < (argc - 1)))
@ -420,7 +420,7 @@ ui_loop(void)
pt = t2;
}
first = 0;
/* menu layout */
if (menu_active)
{
@ -428,7 +428,7 @@ ui_loop(void)
int i;
static double tr = 0.0;
double tt;
tt = t;
tt += tr;
while (tt > 0.001)
@ -445,7 +445,7 @@ ui_loop(void)
Evas_Coord len;
double a;
Evas_Object *o;
mi = l->data;
o = mi->o_icon;
evas_object_geometry_get(o_menu_logo, NULL, NULL, &w, &h);
@ -463,8 +463,8 @@ ui_loop(void)
a = 255 - (30 * a);
evas_object_color_set(o, a, a, a, a);
evas_object_show(o);
if (i == menu_sel)
{
a = menu_anim - (double)i;
@ -477,7 +477,7 @@ ui_loop(void)
o = o_menu_icon_sel2;
evas_object_move(o, (win_w - 56) / 2, (win_h / 2) + len - 4);
o = o_menu_title;
evas_object_color_set(o, 0, 0, 0, a);
evas_object_text_text_set(o, mi->text);
@ -490,7 +490,7 @@ ui_loop(void)
evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2);
evas_object_text_text_set(o, mi->text);
evas_object_move(o, x + 1, y + 1);
o = o_menu_text_sel;
w = tw + 24;
h = 28;
@ -500,7 +500,7 @@ ui_loop(void)
evas_object_resize(o, w, h);
evas_object_image_fill_set(o, 0, 0, w, h);
evas_object_color_set(o, a, a, a, a);
o = o_menu_icon;
snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
evas_object_image_file_set(o, buf, NULL);
@ -544,7 +544,7 @@ void
ui_fps(double fps)
{
char buf[256];
snprintf(buf, sizeof(buf), "ESCAPE - exit, FPS: %4.3f", fps);
evas_object_text_text_set(o_byline, buf);
p_fps = fps;

@ -6,5 +6,5 @@ void ui_loop(void);
void ui_menu(void);
void ui_func_set(void (*kfunc) (char *key), void (*lfunc) (double t, int f));
void ui_fps(double fps);
#endif

Loading…
Cancel
Save