Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/test
Modified Files:
Etox_test.h etox_test.c panel.c panel.h tests.c tests.h
Log Message:
The beginning of the test suite lists. Each test suite has a single function
call to return a list of test functions. Adding new tests only requires the
extra work of a function to build the list, and adding a few lines to create
the button that triggers the test. Also added support for a "Previous" button
to go back to a past test in a suite. The "Next" and "Previous" buttons hide
themselves when appropriate.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/Etox_test.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Etox_test.h 11 May 2002 22:29:00 -0000 1.4
+++ Etox_test.h 17 May 2002 21:28:32 -0000 1.5
@@ -27,11 +27,10 @@
typedef struct _panel_button Panel_Button;
-struct _panel_button
-{
- Evas evas;
- Evas_Object box;
- Evas_Object label;
+struct _panel_button {
+ Evas evas;
+ Evas_Object box;
+ Evas_Object label;
};
/* globals */
@@ -55,7 +54,7 @@
extern Window main_win;
/* general functions */
-double get_time (void);
+double get_time(void);
void setup(void);
/* callbacks for evas handling */
@@ -70,8 +69,12 @@
/* when a mouse button is released in the window call this */
void e_mouse_up(Ecore_Event * ev);
/* when the mouse moves over a button */
-void button_mouse_in (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void button_mouse_out (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
+void button_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y);
+void button_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y);
+void button_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y);
/* button functions */
void button_next_new_all(Evas _e);
@@ -80,4 +83,4 @@
#include "panel.h"
#include "tests.h"
-#endif /* __ETOX_TEST_H__ */
+#endif /* __ETOX_TEST_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/etox_test.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etox_test.c 12 May 2002 23:28:33 -0000 1.19
+++ etox_test.c 17 May 2002 21:28:32 -0000 1.20
@@ -5,6 +5,8 @@
Evas_Object clip_test;
Evas_Object o_next_box;
Evas_Object o_txt_next_box;
+Evas_Object o_prev_box;
+Evas_Object o_txt_prev_box;
Evas_List pbuttons;
Evas evas;
@@ -14,263 +16,415 @@
Etox *e_msg;
Etox *e_test;
+Evas_List current_test = NULL;
+
int win_w = W, win_h = H;
int win_x = 0, win_y = 0;
Window main_win;
-double
-get_time (void)
+double get_time(void)
{
- struct timeval timev;
+ struct timeval timev;
- gettimeofday (&timev, NULL);
- return (double) timev.tv_sec + (((double) timev.tv_usec) / 1000000);
+ gettimeofday(&timev, NULL);
+ return (double) timev.tv_sec +
+ (((double) timev.tv_usec) / 1000000);
}
-void
-button_next_new_all(Evas _e)
+/* Events */
+void e_idle(void *data)
{
- Evas_Object o;
- double ascent, descent;
-
- o = evas_add_image_from_file (evas, IM "panel_button1.png");
- evas_set_image_border (evas, o, 3, 3, 3, 3);
- evas_set_layer (evas, o, 1000);
- evas_show (evas, o);
- o_next_box = o;
- o_txt_next_box = evas_add_text (evas, "andover", 24, "Next");
- evas_set_color (evas, o_txt_next_box, 0, 0, 0, 160);
- evas_set_layer (evas, o_txt_next_box, 1000);
- evas_move (evas, o_next_box, 516, 150);
- evas_move (evas, o_txt_next_box, 519, 152);
- evas_text_get_max_ascent_descent (evas, o_txt_next_box, &ascent,
- &descent);
- evas_resize (evas, o_next_box, 43, ascent - descent + 4);
- evas_set_image_fill (evas, o_next_box, 0, 0, 43, ascent - descent + 4);
- evas_show (evas, o_txt_next_box);
+ evas_render(evas);
+
+ return;
+ data = NULL;
}
-void
-button_next_new(Evas _e)
+void e_window_expose(Ecore_Event * ev)
{
- Evas_Object o;
- double ascent, descent;
+ Ecore_Event_Window_Expose *e;
- evas_del_object(_e, o_txt_next_box);
- o_txt_next_box = evas_add_text (evas, "andover", 24, "Next");
- evas_set_color (evas, o_txt_next_box, 0, 0, 0, 160);
- evas_set_layer (evas, o_txt_next_box, 1000);
- evas_move (evas, o_txt_next_box, 519, 152);
- evas_show (evas, o_txt_next_box);
+ e = (Ecore_Event_Window_Expose *) ev->event;
+ if ((e->win != evas_get_window(evas)))
+ return;
+ evas_update_rect(evas, e->x, e->y, e->w, e->h);
}
-/* Events */
-void
-e_idle (void *data)
+void e_mouse_move(Ecore_Event * ev)
{
- evas_render (evas);
+ Ecore_Event_Mouse_Move *e;
+
+ e = (Ecore_Event_Mouse_Move *) ev->event;
+ if ((e->win != evas_get_window(evas)))
+ return;
+ evas_event_move(evas, e->x, e->y);
}
-void
-e_window_expose (Ecore_Event * ev)
+void e_mouse_down(Ecore_Event * ev)
{
- Ecore_Event_Window_Expose *e;
+ Ecore_Event_Mouse_Down *e;
- e = (Ecore_Event_Window_Expose *) ev->event;
- if ((e->win != evas_get_window (evas)))
- return;
- evas_update_rect (evas, e->x, e->y, e->w, e->h);
+ e = (Ecore_Event_Mouse_Down *) ev->event;
+ if ((e->win != evas_get_window(evas)))
+ return;
+ evas_event_button_down(evas, e->x, e->y, e->button);
}
-void
-e_mouse_move (Ecore_Event * ev)
+void e_mouse_up(Ecore_Event * ev)
{
- Ecore_Event_Mouse_Move *e;
+ Ecore_Event_Mouse_Up *e;
- e = (Ecore_Event_Mouse_Move *) ev->event;
- if ((e->win != evas_get_window (evas)))
- return;
- evas_event_move (evas, e->x, e->y);
+ e = (Ecore_Event_Mouse_Up *) ev->event;
+ if ((e->win != evas_get_window(evas)))
+ return;
+ evas_event_button_up(evas, e->x, e->y, e->button);
}
void
-e_mouse_down (Ecore_Event * ev)
+button_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y)
{
- Ecore_Event_Mouse_Down *e;
+ if ((_e = evas))
+ evas_set_color(_e, _o, 0, 0, 0, 255);
- e = (Ecore_Event_Mouse_Down *) ev->event;
- if ((e->win != evas_get_window (evas)))
- return;
- evas_event_button_down (evas, e->x, e->y, e->button);
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
}
void
-e_mouse_up (Ecore_Event * ev)
+button_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y)
{
- Ecore_Event_Mouse_Up *e;
+ if ((_e = evas))
+ evas_set_color(_e, _o, 0, 0, 0, 160);
- e = (Ecore_Event_Mouse_Up *) ev->event;
- if ((e->win != evas_get_window (evas)))
- return;
- evas_event_button_up (evas, e->x, e->y, e->button);
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
}
void
-button_mouse_in (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+button_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y)
{
- if ((_e = evas))
- evas_set_color (_e, _o, 0, 0, 0, 255);
+ Evas_List l = _data;
+ void (*run)();
+
+ etox_clear(e_msg);
+ etox_clear(e_test);
+
+ if (l) {
+ evas_hide(evas, o_prev_box);
+ evas_hide(evas, o_txt_prev_box);
+
+ if (l->next) {
+ evas_show(evas, o_next_box);
+ evas_show(evas, o_txt_next_box);
+ }
+ else {
+ evas_hide(evas, o_next_box);
+ evas_hide(evas, o_txt_next_box);
+ }
+
+ current_test = l;
+ run = l->data;
+ run();
+ }
+
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
}
void
-button_mouse_out (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+next_test(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{
- if ((_e = evas))
- evas_set_color (_e, _o, 0, 0, 0, 160);
+ void (*run) ();
+
+ if (!current_test || !current_test->next)
+ return;
+
+ /*
+ * Step to the next test, hide the "Next" button if appropriate, and
+ * run the current test.
+ */
+ current_test = current_test->next;
+ if (!current_test->next) {
+ evas_hide(evas, o_next_box);
+ evas_hide(evas, o_txt_next_box);
+ }
+
+ evas_show(evas, o_prev_box);
+ evas_show(evas, o_txt_prev_box);
+
+ run = current_test->data;
+ run();
+
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
}
void
-setup (void)
+prev_test(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
{
- Window win, ewin;
- Evas_Object o_bg;
- Evas_Object o_bg_etox;
- char msg[] =
- " The Etox Test utility consists in a series\n"
- " of test suites designed to exercise all of\n"
- " the etox functions.\n"
- " Informational messages will be displayed here,\n"
- " the test text will be presented in the colored\n"
- " rectangle below.\n"
- " To start a test suite, select it from the\n"
- " navigation panel on the left.\n";
-
- /* setup callbacks for events */
- ecore_event_filter_handler_add (ECORE_EVENT_WINDOW_EXPOSE, e_window_expose);
- ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_MOVE, e_mouse_move);
- ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_DOWN, e_mouse_down);
- ecore_event_filter_handler_add (ECORE_EVENT_MOUSE_UP, e_mouse_up);
- /* handler for when the event queue goes idle */
- ecore_event_filter_idle_handler_add (e_idle, NULL);
- /* create a toplevel window */
- win = ecore_window_new (0, 0, 0, win_w, win_h);
- ecore_window_set_title (win, "Etox Test");
- ecore_window_set_min_size (win, win_w, win_h);
- ecore_window_set_max_size (win, win_w, win_h);
- main_win = win;
-
- /* create a evas rendering in software - convenience function that */
- /* also creates the window for us in the right colormap & visual */
- evas =
- evas_new_all (ecore_display_get (), win, 0, 0, win_w, win_h,
- render_method, max_colors, MAX_FONT_CACHE, MAX_IMAGE_CACHE,
- FONT_DIRECTORY);
- /* get the window ID for the evas created for us */
- ewin = evas_get_window (evas);
- /* show the evas window */
- ecore_window_show (ewin);
- /* set the events this window accepts */
- ecore_window_set_events (ewin, XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE);
- /* show the toplevel */
- ecore_window_show (win);
-
- /* Create interface */
-
- /* Background */
- o_bg = evas_add_image_from_file (evas, IM "bg.png");
- evas_resize (evas, o_bg, win_w, win_h);
- evas_move (evas, o_bg, 0, 0);
- evas_set_layer (evas, o_bg, 0);
- evas_show (evas, o_bg);
-
- /* Panel */
- setup_panel (evas);
-
- /* Setup message etox */
- /* Clip rectangle for bounding where the message text is drawn */
- clip_msg = evas_add_rectangle (evas);
- evas_show (evas, clip_msg);
- evas_set_color (evas, clip_msg, 255, 0, 255, 255);
- evas_move (evas, clip_msg, 40, 40);
- evas_resize (evas, clip_msg, 520, 140);
-
- /* Create message etox */
- e_msg = etox_new_all (evas, 40, 40, 520, 140, 255, ETOX_ALIGN_LEFT);
- etox_context_set_align (e_msg, ETOX_ALIGN_LEFT);
- etox_context_set_font (e_msg, "sinon", 14);
- etox_context_set_style (e_msg, "plain");
- etox_context_set_color (e_msg, 255, 255, 255, 255);
- etox_set_text(e_msg, msg);
- etox_set_clip (e_msg, clip_msg);
- etox_set_alpha (e_msg, 255);
- etox_set_layer (e_msg, 1000);
- etox_show (e_msg);
-
- /* Setup test etox */
- /* Setup test etox background */
- o_bg_etox = evas_add_rectangle (evas);
- evas_move (evas, o_bg_etox, 40, 200);
- evas_resize (evas, o_bg_etox, 520, 260);
- evas_set_color (evas, o_bg_etox, 0, 100, 100, 100);
- evas_set_layer (evas, o_bg_etox, 100);
- evas_show (evas, o_bg_etox);
- /* Clip rectangle for bounding where the test text is drawn */
- clip_test = evas_add_rectangle (evas);
- evas_set_color (evas, clip_test, 255, 0, 255, 255);
- evas_move (evas, clip_test, 40, 200);
- evas_resize (evas, clip_test, 520, 260);
- evas_show (evas, clip_test);
- /* Create test etox */
- e_test = etox_new_all (evas, 40, 200, 520, 260, 255, ETOX_ALIGN_CENTER);
- etox_context_set_align (e_test, ETOX_ALIGN_CENTER);
- etox_context_set_font (e_test, "sinon", 14);
- etox_context_set_style (e_test, "plain");
- etox_context_set_color (e_test, 255, 255, 255, 255);
- etox_set_text(e_test, "");
- etox_set_clip (e_test, clip_test);
- etox_set_alpha (e_test, 255);
- etox_set_layer (e_test, 1000);
-
- e_slide_panel_in (0, NULL);
-}
-
-int
-main (int argc, char **argv)
-{
- Evas_List l;
-
- /* init X */
- if (!ecore_display_init (NULL))
- {
- if (getenv ("DISPLAY"))
- {
- printf ("Cannot initialize default display:\n");
- printf ("DISPLAY=%s\n", getenv ("DISPLAY"));
+ void (*run) ();
+
+ if (!current_test || !current_test->prev)
+ return;
+
+ /*
+ * Step to the next test, hide the "Next" button if appropriate, and
+ * run the current test.
+ */
+ current_test = current_test->prev;
+ if (!current_test->prev) {
+ evas_hide(evas, o_prev_box);
+ evas_hide(evas, o_txt_prev_box);
}
- else
- {
- printf ("No DISPLAY variable set!\n");
+
+ evas_show(evas, o_next_box);
+ evas_show(evas, o_txt_next_box);
+
+ run = current_test->data;
+ run();
+
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
+}
+
+void setup(void)
+{
+ double width, height;
+ Window win, ewin;
+ Evas_Object o_bg;
+ Evas_Object o_bg_etox;
+ char msg[] =
+ " The Etox Test utility consists in a series\n"
+ " of test suites designed to exercise all of\n"
+ " the etox functions.\n"
+ " Informational messages will be displayed here,\n"
+ " the test text will be presented in the colored\n"
+ " rectangle below.\n"
+ " To start a test suite, select it from the\n"
+ " navigation panel on the left.\n";
+
+ /* setup callbacks for events */
+ ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE,
+ e_window_expose);
+ ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_MOVE,
+ e_mouse_move);
+ ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_DOWN,
+ e_mouse_down);
+ ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_UP, e_mouse_up);
+
+ /* handler for when the event queue goes idle */
+ ecore_event_filter_idle_handler_add(e_idle, NULL);
+
+ /* create a toplevel window */
+ win = ecore_window_new(0, 0, 0, win_w, win_h);
+ ecore_window_set_title(win, "Etox Test");
+ ecore_window_set_min_size(win, win_w, win_h);
+ ecore_window_set_max_size(win, win_w, win_h);
+ main_win = win;
+
+ /* create a evas rendering in software - convenience function that */
+ /* also creates the window for us in the right colormap & visual */
+ evas =
+ evas_new_all(ecore_display_get(), win, 0, 0, win_w, win_h,
+ render_method, max_colors, MAX_FONT_CACHE,
+ MAX_IMAGE_CACHE, FONT_DIRECTORY);
+ /* get the window ID for the evas created for us */
+ ewin = evas_get_window(evas);
+
+ /* show the evas window */
+ ecore_window_show(ewin);
+
+ /* set the events this window accepts */
+ ecore_window_set_events(ewin,
+ XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE);
+
+ /* show the toplevel */
+ ecore_window_show(win);
+
+ /* Create interface */
+
+ /* Background */
+ o_bg = evas_add_image_from_file(evas, IM "bg.png");
+ evas_resize(evas, o_bg, win_w, win_h);
+ evas_move(evas, o_bg, 0, 0);
+ evas_set_layer(evas, o_bg, 0);
+ evas_show(evas, o_bg);
+
+ /* Panel */
+ setup_panel(evas);
+
+ /* Setup message etox */
+ /* Clip rectangle for bounding where the message text is drawn */
+ clip_msg = evas_add_rectangle(evas);
+ evas_show(evas, clip_msg);
+ evas_set_color(evas, clip_msg, 255, 0, 255, 255);
+ evas_move(evas, clip_msg, 40, 40);
+ evas_resize(evas, clip_msg, 520, 140);
+
+ /* Create message etox */
+ e_msg = etox_new_all(evas, 40, 40, 520, 140, 255, ETOX_ALIGN_LEFT);
+ etox_context_set_align(e_msg, ETOX_ALIGN_LEFT);
+ etox_context_set_font(e_msg, "sinon", 14);
+ etox_context_set_style(e_msg, "plain");
+ etox_context_set_color(e_msg, 255, 255, 255, 255);
+ etox_set_text(e_msg, msg);
+ etox_set_clip(e_msg, clip_msg);
+ etox_set_alpha(e_msg, 255);
+ etox_set_layer(e_msg, 1000);
+ etox_show(e_msg);
+
+ /* Setup test etox */
+ /* Setup test etox background */
+ o_bg_etox = evas_add_rectangle(evas);
+ evas_move(evas, o_bg_etox, 40, 200);
+ evas_resize(evas, o_bg_etox, 520, 260);
+ evas_set_color(evas, o_bg_etox, 0, 100, 100, 100);
+ evas_set_layer(evas, o_bg_etox, 100);
+ evas_show(evas, o_bg_etox);
+
+ /* Clip rectangle for bounding where the test text is drawn */
+ clip_test = evas_add_rectangle(evas);
+ evas_set_color(evas, clip_test, 255, 0, 255, 255);
+ evas_move(evas, clip_test, 40, 200);
+ evas_resize(evas, clip_test, 520, 260);
+ evas_show(evas, clip_test);
+
+ /* Create test etox */
+ e_test =
+ etox_new_all(evas, 40, 200, 520, 260, 255, ETOX_ALIGN_CENTER);
+ etox_context_set_align(e_test, ETOX_ALIGN_CENTER);
+ etox_context_set_font(e_test, "sinon", 14);
+ etox_context_set_style(e_test, "plain");
+ etox_context_set_color(e_test, 255, 255, 255, 255);
+ etox_set_text(e_test, "");
+ etox_set_clip(e_test, clip_test);
+ etox_set_alpha(e_test, 255);
+ etox_set_layer(e_test, 1000);
+
+ /*
+ * Create the next test button
+ */
+ o_next_box = evas_add_image_from_file(evas, IM "panel_button1.png");
+ evas_set_image_border(evas, o_next_box, 3, 3, 3, 3);
+ evas_set_layer(evas, o_next_box, 1000);
+ evas_hide(evas, o_next_box);
+
+ o_txt_next_box = evas_add_text(evas, "andover", 24, "Next");
+ evas_set_color(evas, o_txt_next_box, 0, 0, 0, 160);
+ evas_set_layer(evas, o_txt_next_box, 1000);
+ evas_move(evas, o_next_box, 516, 150);
+ evas_move(evas, o_txt_next_box, 519, 152);
+
+ width = evas_get_text_width(evas, o_txt_next_box);
+ height = evas_get_text_height(evas, o_txt_next_box);
+
+ width += 10;
+ height += 5;
+
+ evas_resize(evas, o_next_box, width, height);
+ evas_set_image_fill(evas, o_next_box, 0, 0, width, height);
+ evas_hide(evas, o_txt_next_box);
+ evas_callback_add(evas, o_txt_next_box, CALLBACK_MOUSE_DOWN,
+ next_test, NULL);
+
+ /*
+ * Create the previous test button
+ */
+ o_prev_box = evas_add_image_from_file(evas, IM "panel_button1.png");
+ evas_set_image_border(evas, o_prev_box, 3, 3, 3, 3);
+ evas_set_layer(evas, o_prev_box, 1000);
+ evas_hide(evas, o_prev_box);
+
+ o_txt_prev_box = evas_add_text(evas, "andover", 24, "Previous");
+ evas_set_color(evas, o_txt_prev_box, 0, 0, 0, 160);
+ evas_set_layer(evas, o_txt_prev_box, 1000);
+ evas_move(evas, o_prev_box, 16, 150);
+ evas_move(evas, o_txt_prev_box, 19, 152);
+
+ width = evas_get_text_width(evas, o_txt_prev_box);
+ height = evas_get_text_height(evas, o_txt_prev_box);
+
+ width += 10;
+ height += 5;
+
+ evas_resize(evas, o_prev_box, width, height);
+ evas_set_image_fill(evas, o_prev_box, 0, 0, width, height);
+ evas_hide(evas, o_txt_prev_box);
+ evas_callback_add(evas, o_txt_prev_box, CALLBACK_MOUSE_DOWN,
+ prev_test, NULL);
+
+ e_slide_panel_in(0, NULL);
+}
+
+int main(int argc, char **argv)
+{
+ Evas_List l;
+
+ /* init X */
+ if (!ecore_display_init(NULL)) {
+ if (getenv("DISPLAY")) {
+ printf("Cannot initialize default display:\n");
+ printf("DISPLAY=%s\n", getenv("DISPLAY"));
+ } else {
+ printf("No DISPLAY variable set!\n");
+ }
+ printf("Exit.\n");
+ exit(-1);
}
- printf ("Exit.\n");
- exit (-1);
- }
- /* setup handlers for system signals */
- ecore_event_signal_init ();
- /* setup the event filter */
- ecore_event_filter_init ();
- /* setup the X event internals */
- ecore_event_x_init ();
- /* program does its data setup here */
- setup ();
- /* and now loop forever handling events */
- ecore_event_loop ();
-
- etox_free (e_msg);
- etox_free (e_test);
- for (l = pbuttons; l; l = l->next)
- panel_button_free (evas, pbuttons->data);
- evas_list_free (pbuttons);
- evas_free (evas);
- return 0;
+ /* setup handlers for system signals */
+ ecore_event_signal_init();
+
+ /* setup the event filter */
+ ecore_event_filter_init();
+
+ /* setup the X event internals */
+ ecore_event_x_init();
+
+ /* program does its data setup here */
+ setup();
+
+ /* and now loop forever handling events */
+ ecore_event_loop();
+
+ etox_free(e_msg);
+ etox_free(e_test);
+
+ for (l = pbuttons; l; l = l->next)
+ panel_button_free(evas, pbuttons->data);
+
+ evas_list_free(pbuttons);
+ evas_free(evas);
+
+ return 0;
+ argc = 0;
+ argv = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/panel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- panel.c 12 May 2002 04:47:33 -0000 1.3
+++ panel.c 17 May 2002 21:28:32 -0000 1.4
@@ -1,5 +1,5 @@
#include "Etox_test.h"
-
+
/* globals */
Evas_Object o_panel;
Evas_Object o_showpanel;
@@ -9,200 +9,224 @@
int panel_active = 0;
-void
-e_slide_panel_in (int v, void *data)
-{
- static double start = 0.0;
- double duration = 0.5;
- double val;
- double px;
- int w;
- int y_offset = 40;
- double ascent, descent;
- Evas_List l;
-
- panel_active = 1;
-
- if (v == 0)
- evas_set_layer (evas, o_showpanel, 180);
- if (v == 0)
- start = get_time ();
- val = (get_time () - start) / duration;
-
- evas_get_image_size (evas, o_panel, &w, NULL);
- px = (w * sin (val * 0.5 * 3.141592654)) - w;
- evas_move (evas, o_panel, px, 0);
- evas_move (evas, o_txt_paneltitle, px + 4, 5);
- /* Pack the buttons in the panel in reverse */
- for (l = pbuttons->last; l; l = l->prev)
- {
- if (!(pbutton = l->data))
- return;
- evas_move (evas, pbutton->box, px + 5, win_h - y_offset);
- evas_move (evas, pbutton->label, px + 8, win_h - y_offset + 2);
- y_offset += 40;
- evas_text_get_max_ascent_descent (evas, pbutton->label, &ascent,
- &descent);
- evas_resize (evas, pbutton->box, 108, ascent - descent + 4);
- evas_set_image_fill (evas, pbutton->box, 0, 0, 108, ascent - descent + 4);
- }
- if (val < 1.0)
- ecore_add_event_timer ("e_slide_panel()", 0.05, e_slide_panel_in, v + 1,
- NULL);
-}
-
-void
-e_slide_panel_out (int v, void *data)
-{
- static double start = 0.0;
- double duration = 0.5;
- double val;
- double px;
- int w;
- int y_offset = 40;
- double ascent, descent;
- Evas_List l;
-
- if (v == 0)
- evas_set_layer (evas, o_showpanel, 1000);
- if (v == 0)
- start = get_time ();
- val = (get_time () - start) / duration;
-
- evas_get_image_size (evas, o_panel, &w, NULL);
- px = (w * sin ((1.0 - val) * 0.5 * 3.141592654)) - w;
- evas_move (evas, o_panel, px, 0);
- evas_move (evas, o_txt_paneltitle, px + 4, 5);
- /* Pack the buttons in the panel in reverse */
- for (l = pbuttons->last; l; l = l->prev)
- {
- if (!(pbutton = l->data))
- return;
- evas_move (evas, pbutton->box, px + 5, win_h - y_offset);
- evas_move (evas, pbutton->label, px + 8, win_h - y_offset + 2);
- y_offset += 40;
- evas_text_get_max_ascent_descent (evas, pbutton->label, &ascent,
- &descent);
- evas_resize (evas, pbutton->box, 108, ascent - descent + 4);
- evas_set_image_fill (evas, pbutton->box, 0, 0, 108, ascent - descent + 4);
- }
- if (val < 1.0)
- ecore_add_event_timer ("e_slide_panel()", 0.05, e_slide_panel_out, v + 1,
- NULL);
- else
- panel_active = 0;
-}
-
-void
-show_panel (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
-{
- if (!panel_active)
- e_slide_panel_in (0, NULL);
-}
-
-void
-hide_panel (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
-{
- if (panel_active)
- e_slide_panel_out (0, NULL);
-}
-
-void
-setup_panel (Evas _e)
-{
- int w;
- Panel_Button *pbutton1, *pbutton2;
- Evas_List l;
-
- o_panel = evas_add_image_from_file (_e, IM "panel.png");
- o_showpanel = evas_add_rectangle (_e);
- o_hidepanel = evas_add_rectangle (_e);
- evas_set_color (_e, o_showpanel, 0, 0, 0, 0);
- evas_set_color (_e, o_hidepanel, 0, 0, 0, 0);
- evas_get_image_size (_e, o_panel, &w, NULL);
- if (!panel_active)
- evas_move (_e, o_panel, -w, 0);
- evas_resize (_e, o_panel, w, win_h);
- evas_set_layer (_e, o_panel, 200);
- evas_resize (_e, o_showpanel, 64, win_h);
- if (panel_active)
- evas_set_layer (_e, o_showpanel, 180);
- else
- evas_set_layer (_e, o_showpanel, 1000);
- evas_move (_e, o_hidepanel, 128, 0);
- evas_resize (_e, o_hidepanel, win_w - 128, win_h);
- evas_set_layer (_e, o_hidepanel, 1000);
- evas_move (_e, o_showpanel, 0, 0);
- evas_show (_e, o_panel);
- evas_show (_e, o_showpanel);
- evas_show (_e, o_hidepanel);
-
- /* Panel title */
- o_txt_paneltitle = evas_add_text (_e, "sinon", 17, "Etox Test");
- evas_set_color (_e, o_txt_paneltitle, 255, 255, 255, 255);
- evas_set_layer (_e, o_txt_paneltitle, 250);
- evas_show (_e, o_txt_paneltitle);
-
- /* Panel buttons */
- pbutton1 = panel_button (evas, "Basic");
- pbuttons = evas_list_append(pbuttons, pbutton1);
- pbutton2 = panel_button (evas, "Style");
- pbuttons = evas_list_append(pbuttons, pbutton2);
-
- e_slide_panel_out (0, NULL);
-
- /* Callbacks */
- evas_callback_add (evas, o_showpanel, CALLBACK_MOUSE_IN, show_panel, NULL);
- evas_callback_add (evas, o_hidepanel, CALLBACK_MOUSE_IN, hide_panel, NULL);
- for (l = pbuttons; l; l = l->next)
- {
- pbutton = l->data;
- evas_callback_add (evas, pbutton->label, CALLBACK_MOUSE_IN, button_mouse_in,
- NULL);
- evas_callback_add (evas, pbutton->label, CALLBACK_MOUSE_OUT, button_mouse_out,
- NULL);
- }
- evas_callback_add (evas, pbutton1->label, CALLBACK_MOUSE_DOWN, test_basic,
- NULL);
- evas_callback_add (evas, pbutton2->label, CALLBACK_MOUSE_DOWN, test_style,
- NULL);
-}
-
-Panel_Button
-*panel_button (Evas _e, char *_label)
-{
- Evas_Object o;
-
- pbutton = panel_button_new (_e);
- o = evas_add_image_from_file (evas, IM "panel_button1.png");
- evas_set_image_border (_e, o, 3, 3, 3, 3);
- evas_set_layer (_e, o, 250);
- evas_show (_e, o);
- pbutton->box = o;
- o = evas_add_text (_e, "andover", 24, _label);
- evas_set_color (_e, o, 0, 0, 0, 160);
- evas_set_layer (_e, o, 250);
- evas_show (_e, o);
- pbutton->label = o;
- return pbutton;
-}
-
-Panel_Button
-*panel_button_new (Evas _e)
-{
- pbutton = malloc (sizeof (Panel_Button));
- pbutton->evas = _e;
- pbutton->box = NULL;
- pbutton->label = NULL;
- return pbutton;
-}
-
-void
-panel_button_free (Evas _e, Panel_Button *pbutton)
+void e_slide_panel_in(int v, void *data)
{
- if (pbutton->box)
- evas_del_object (_e, pbutton->box);
- if (pbutton->label)
- evas_del_object (_e, pbutton->label);
- free (pbutton);
+ static double start = 0.0;
+ double duration = 0.5;
+ double val;
+ double px;
+ int w;
+ int y_offset = 40;
+ double ascent, descent;
+ Evas_List l;
+
+ panel_active = 1;
+
+ if (v == 0)
+ evas_set_layer(evas, o_showpanel, 180);
+ if (v == 0)
+ start = get_time();
+ val = (get_time() - start) / duration;
+
+ evas_get_image_size(evas, o_panel, &w, NULL);
+ px = (w * sin(val * 0.5 * 3.141592654)) - w;
+ evas_move(evas, o_panel, px, 0);
+ evas_move(evas, o_txt_paneltitle, px + 4, 5);
+ /* Pack the buttons in the panel in reverse */
+ for (l = pbuttons->last; l; l = l->prev) {
+ if (!(pbutton = l->data))
+ return;
+ evas_move(evas, pbutton->box, px + 5, win_h - y_offset);
+ evas_move(evas, pbutton->label, px + 8,
+ win_h - y_offset + 2);
+ y_offset += 40;
+ evas_text_get_max_ascent_descent(evas, pbutton->label,
+ &ascent, &descent);
+ evas_resize(evas, pbutton->box, 108, ascent - descent + 4);
+ evas_set_image_fill(evas, pbutton->box, 0, 0, 108,
+ ascent - descent + 4);
+ }
+ if (val < 1.0)
+ ecore_add_event_timer("e_slide_panel()", 0.05,
+ e_slide_panel_in, v + 1, NULL);
+
+ return;
+ data = NULL;
+}
+
+void e_slide_panel_out(int v, void *data)
+{
+ static double start = 0.0;
+ double duration = 0.5;
+ double val;
+ double px;
+ int w;
+ int y_offset = 40;
+ double ascent, descent;
+ Evas_List l;
+
+ if (v == 0)
+ evas_set_layer(evas, o_showpanel, 1000);
+ if (v == 0)
+ start = get_time();
+ val = (get_time() - start) / duration;
+
+ evas_get_image_size(evas, o_panel, &w, NULL);
+ px = (w * sin((1.0 - val) * 0.5 * 3.141592654)) - w;
+ evas_move(evas, o_panel, px, 0);
+ evas_move(evas, o_txt_paneltitle, px + 4, 5);
+ /* Pack the buttons in the panel in reverse */
+ for (l = pbuttons->last; l; l = l->prev) {
+ if (!(pbutton = l->data))
+ return;
+ evas_move(evas, pbutton->box, px + 5, win_h - y_offset);
+ evas_move(evas, pbutton->label, px + 8,
+ win_h - y_offset + 2);
+ y_offset += 40;
+ evas_text_get_max_ascent_descent(evas, pbutton->label,
+ &ascent, &descent);
+ evas_resize(evas, pbutton->box, 108, ascent - descent + 4);
+ evas_set_image_fill(evas, pbutton->box, 0, 0, 108,
+ ascent - descent + 4);
+ }
+ if (val < 1.0)
+ ecore_add_event_timer("e_slide_panel()", 0.05,
+ e_slide_panel_out, v + 1, NULL);
+ else
+ panel_active = 0;
+
+ return;
+ data = NULL;
+}
+
+void
+show_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+{
+ if (!panel_active)
+ e_slide_panel_in(0, NULL);
+
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
+}
+
+void
+hide_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+{
+ if (panel_active)
+ e_slide_panel_out(0, NULL);
+
+ return;
+ _data = NULL;
+ _e = NULL;
+ _o = NULL;
+ _b = 0;
+ _x = 0;
+ _y = 0;
+}
+
+void setup_panel(Evas _e)
+{
+ int w;
+ Panel_Button *pbutton1, *pbutton2;
+
+ o_panel = evas_add_image_from_file(_e, IM "panel.png");
+ o_showpanel = evas_add_rectangle(_e);
+ o_hidepanel = evas_add_rectangle(_e);
+ evas_set_color(_e, o_showpanel, 0, 0, 0, 0);
+ evas_set_color(_e, o_hidepanel, 0, 0, 0, 0);
+ evas_get_image_size(_e, o_panel, &w, NULL);
+ if (!panel_active)
+ evas_move(_e, o_panel, -w, 0);
+ evas_resize(_e, o_panel, w, win_h);
+ evas_set_layer(_e, o_panel, 200);
+ evas_resize(_e, o_showpanel, 64, win_h);
+ if (panel_active)
+ evas_set_layer(_e, o_showpanel, 180);
+ else
+ evas_set_layer(_e, o_showpanel, 1000);
+ evas_move(_e, o_hidepanel, 128, 0);
+ evas_resize(_e, o_hidepanel, win_w - 128, win_h);
+ evas_set_layer(_e, o_hidepanel, 1000);
+ evas_move(_e, o_showpanel, 0, 0);
+ evas_show(_e, o_panel);
+ evas_show(_e, o_showpanel);
+ evas_show(_e, o_hidepanel);
+
+ /* Panel title */
+ o_txt_paneltitle = evas_add_text(_e, "sinon", 17, "Etox Test");
+ evas_set_color(_e, o_txt_paneltitle, 255, 255, 255, 255);
+ evas_set_layer(_e, o_txt_paneltitle, 250);
+ evas_show(_e, o_txt_paneltitle);
+
+ /* Panel buttons */
+ pbutton1 = panel_button(evas, "Basic", basic_tests());
+ pbuttons = evas_list_append(pbuttons, pbutton1);
+
+ pbutton2 = panel_button(evas, "Style", style_tests());
+ pbuttons = evas_list_append(pbuttons, pbutton2);
+
+ e_slide_panel_out(0, NULL);
+
+ /* Callbacks */
+ evas_callback_add(evas, o_showpanel, CALLBACK_MOUSE_IN, show_panel,
+ NULL);
+ evas_callback_add(evas, o_hidepanel, CALLBACK_MOUSE_IN, hide_panel,
+ NULL);
+
+}
+
+Panel_Button * panel_button(Evas _e, char *_label, Evas_List tests)
+{
+ Evas_Object o;
+
+ /*
+ * Create the new panel button's information
+ */
+ pbutton = malloc(sizeof(Panel_Button));
+ pbutton->evas = _e;
+ pbutton->box = NULL;
+ pbutton->label = NULL;
+
+ /*
+ * Now initialize it's fields, create the appearance, and add it to
+ * the evas.
+ */
+ o = evas_add_image_from_file(evas, IM "panel_button1.png");
+ evas_set_image_border(_e, o, 3, 3, 3, 3);
+ evas_set_layer(_e, o, 250);
+ evas_show(_e, o);
+ pbutton->box = o;
+
+ o = evas_add_text(_e, "andover", 24, _label);
+ evas_set_color(_e, o, 0, 0, 0, 160);
+ evas_set_layer(_e, o, 250);
+ evas_show(_e, o);
+ pbutton->label = o;
+
+ /*
+ * Attach the buttons callbacks
+ */
+ evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_IN,
+ button_mouse_in, NULL);
+ evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_OUT,
+ button_mouse_out, NULL);
+
+ evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_DOWN,
+ button_mouse_down, tests);
+
+ return pbutton;
+}
+
+void panel_button_free(Evas _e, Panel_Button * pbutton)
+{
+ if (pbutton->box)
+ evas_del_object(_e, pbutton->box);
+ if (pbutton->label)
+ evas_del_object(_e, pbutton->label);
+ free(pbutton);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/panel.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- panel.h 12 May 2002 04:47:33 -0000 1.3
+++ panel.h 17 May 2002 21:28:32 -0000 1.4
@@ -3,12 +3,13 @@
void e_slide_panel_in(int v, void *data);
void e_slide_panel_out(int v, void *data);
-void show_panel (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void hide_panel (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void setup_panel (Evas _e);
+void show_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y);
+void hide_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
+ int _y);
+void setup_panel(Evas _e);
-Panel_Button *panel_button (Evas _e, char *_label);
-Panel_Button *panel_button_new (Evas _e);
-void panel_button_free (Evas _e, Panel_Button *pbutton);
+Panel_Button *panel_button(Evas _e, char *_label, Evas_List tests);
+void panel_button_free(Evas _e, Panel_Button * pbutton);
-#endif /* __PANEL_H__ */
+#endif /* __PANEL_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/tests.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- tests.c 12 May 2002 23:28:33 -0000 1.6
+++ tests.c 17 May 2002 21:28:32 -0000 1.7
@@ -1,126 +1,122 @@
#include "Etox_test.h"
+Evas_List
+basic_tests()
+{
+ Evas_List l = NULL;
+
+ l = evas_list_append(l, test_basic);
+ l = evas_list_append(l, test_basic_get);
+ l = evas_list_append(l, test_basic_set);
+ l = evas_list_append(l, test_basic_append);
+
+ return l;
+}
+
void
-test_basic (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+test_basic()
{
- char msg[] =
- "This series of tests will exercise the most basic\n"
- "functions of etox, reading and displaying text with\n"
- "basic formatting.\n"
- "\n"
- "In addition, prepending, appending and inserting text\n"
- "in an existing etox will be tested.\n"
- "\n"
- "Click Next to begin the tests.";
-
- etox_set_text (e_msg, msg);
-
- etox_set_text (e_test, "");
-
- /* Create "Next" button */
- button_next_new_all (evas);
-
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_IN, button_mouse_in, NULL);
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_OUT, button_mouse_out, NULL);
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_DOWN,
- test_basic_get, e_msg);
+ char msg[] =
+ "This series of tests will exercise the most basic\n"
+ "functions of etox, reading and displaying text with\n"
+ "basic formatting.\n"
+ "\n"
+ "In addition, prepending, appending and inserting text\n"
+ "in an existing etox will be tested.\n"
+ "\n" "Click Next to begin the tests.";
+
+ etox_set_text(e_msg, msg);
+
+ etox_set_text(e_test, "");
+
+ return;
}
void
-test_basic_get (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+test_basic_get()
{
- char msg[] =
- "The sample text shown below was retrieved from\n"
- "the text in this message etox.\n"
- "\n"
- "The function used was etox_get_text.";
-
- char *string;
-
- /* Change message */
- etox_set_text (_data, msg);
-
- /* Recreate "Next" button */
- button_next_new(_e);
-
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_IN, button_mouse_in, NULL);
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_OUT, button_mouse_out, NULL);
- evas_callback_add (_e, o_txt_next_box, CALLBACK_MOUSE_DOWN,
- test_basic_set, _data);
-
- /* Set test text and show test etox */
- string = etox_get_text (e_msg);
- etox_set_text (e_test, string);
- etox_show (e_test);
+ char msg[] =
+ "The sample text shown below was retrieved from\n"
+ "the text in this message etox.\n"
+ "\n" "The function used was etox_get_text.";
+
+ char *string;
+
+ /* Change message */
+ etox_set_text(e_msg, msg);
+
+ /* Set test text and show test etox */
+ string = etox_get_text(e_msg);
+ etox_set_text(e_test, string);
+ etox_show(e_test);
+
+ return;
}
void
-test_basic_set (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+test_basic_set()
{
- char msg[] =
- "The text in an etox can be changed on the fly.\n"
- "The sample paragraph shown below replaced the\n"
- "text shown in the previous test.\n"
- "\n"
- "The function used was etox_set_text.";
-
- char string[] =
- "\n"
- "A file that big?\n"
- "It might be very useful.\n"
- "But now it is gone.\n"
- "\n";
-
- /* Change message */
- etox_set_text (_data, msg);
-
- /* Recreate "Next" button */
- button_next_new(_e);
-
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_IN, button_mouse_in, NULL);
- evas_callback_add (evas, o_txt_next_box, CALLBACK_MOUSE_OUT, button_mouse_out, NULL);
- evas_callback_add (_e, o_txt_next_box, CALLBACK_MOUSE_DOWN,
- test_basic_append, _data);
-
- /* Change test etox */
- etox_set_text (e_test, string);
+ char msg[] =
+ "The text in an etox can be changed on the fly.\n"
+ "The sample paragraph shown below replaced the\n"
+ "text shown in the previous test.\n"
+ "\n" "The function used was etox_set_text.";
+
+ char string[] =
+ "\n"
+ "A file that big?\n"
+ "It might be very useful.\n" "But now it is gone.\n" "\n";
+
+ /* Change message */
+ etox_set_text(e_msg, msg);
+
+ /* Change test etox */
+ etox_set_text(e_test, string);
+
+ return;
}
void
-test_basic_append (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+test_basic_append()
{
- char msg[] =
- "Text can be appended to the text already existent\n"
- "in the etox.\n"
- "\n"
- "The second paragraph shown below was appended\n"
- "at the end of the etox through etox_append_text.\n";
-
- char string[] =
- "The Tao that is seen\n"
- "Is not the true Tao\n"
- "Until you bring fresh toner.\n"
- "\n";
+ char msg[] =
+ "Text can be appended to the text already existent\n"
+ "in the etox.\n"
+ "\n"
+ "The second paragraph shown below was appended\n"
+ "at the end of the etox through etox_append_text.\n";
+
+ char string[] =
+ "The Tao that is seen\n"
+ "Is not the true Tao\n" "Until you bring fresh toner.\n" "\n";
- /* Change message */
- etox_set_text (_data, msg);
+ /* Change message */
+ etox_set_text(e_msg, msg);
- /* Recreate "Next" button */
- button_next_new(_e);
+ /* Change test etox */
+ etox_append_text(e_test, string);
- /* Change test etox */
- etox_append_text (e_test, string);
+ return;
+}
+
+Evas_List
+style_tests()
+{
+ Evas_List l = NULL;
+
+ l = evas_list_append(l, test_style);
+
+ return l;
}
void
-test_style (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+test_style()
{
- char msg[] =
- "Not implemented yet.";
-
- etox_set_text (e_msg, msg);
+ char msg[] = "Not implemented yet.";
+
+ etox_set_text(e_msg, msg);
- etox_set_text (e_test, "");
+ etox_set_text(e_test, "");
- button_next_new(_e);
+ return;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/tests.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- tests.h 11 May 2002 22:29:00 -0000 1.3
+++ tests.h 17 May 2002 21:28:32 -0000 1.4
@@ -1,10 +1,19 @@
#ifndef __ETOX_TEST_TESTS_H__
#define __ETOX_TEST_TESTS_H__
-void test_basic(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void test_basic_get(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void test_basic_set(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void test_basic_append(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
-void test_style(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y);
+/*
+ * Basic test prototypes
+ */
+Evas_List basic_tests();
+void test_basic();
+void test_basic_get();
+void test_basic_set();
+void test_basic_append();
-#endif /* __ETOX_TEST_TESTS_H__ */
+/*
+ * Style tests prototypes
+ */
+Evas_List style_tests();
+void test_style();
+
+#endif /* __ETOX_TEST_TESTS_H__ */
|