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:
Merge of etox from SPLIT.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/Etox_test.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Etox_test.h 23 May 2002 03:09:32 -0000 1.6
+++ Etox_test.h 14 Jan 2003 18:43:21 -0000 1.7
@@ -7,6 +7,7 @@
#include <sys/time.h>
#include <Evas.h>
+#include <Evas_Engine_Software_X11.h>
#include <Ecore.h>
#include "src/Etox.h"
@@ -28,24 +29,24 @@
typedef struct _panel_button Panel_Button;
struct _panel_button {
- Evas evas;
- Evas_Object box;
- Evas_Object label;
+ Evas *evas;
+ Evas_Object *box;
+ Evas_Object *label;
};
/* globals */
-extern Evas_Object o_bg_etox;
-extern Evas_Object clip_msg;
-extern Evas_Object clip_test;
-extern Evas_Object o_next_box;
-extern Evas_Object o_txt_next_box;
-extern Evas_List pbuttons;
+extern Evas_Object *o_bg_etox;
+extern Evas_Object *clip_msg;
+extern Evas_Object *clip_test;
+extern Evas_Object *o_next_box;
+extern Evas_Object *o_txt_next_box;
+extern Evas_List *pbuttons;
extern Etox *e_msg;
extern Etox *e_test;
-extern Evas evas;
-extern Evas_Render_Method render_method;
+extern Evas *evas;
+extern int render_method;
extern int max_colors;
extern int win_w;
extern int win_h;
@@ -69,12 +70,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_down(void *_data, Evas _e, Evas_Object _o, int _b,
- int _x, int _y);
+void button_mouse_in(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info);
+void button_mouse_out(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info);
+void button_mouse_down(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info);
/* button functions */
void button_next_new_all(Evas _e);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/etox_test.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etox_test.c 23 May 2002 03:09:32 -0000 1.21
+++ etox_test.c 14 Jan 2003 18:43:27 -0000 1.22
@@ -1,22 +1,21 @@
#include "Etox_test.h"
/* globals */
-Evas_Object clip_msg;
-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;
-Evas_Render_Method render_method = RENDER_ENGINE;
-int max_colors = MAX_EVAS_COLORS;
+Evas_Object *clip_msg;
+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;
+int render_method = 0;
Etox *e_msg;
Etox *e_test;
-Evas_List current_test = NULL;
+Evas_List *current_test = NULL;
int win_w = W, win_h = H;
int win_x = 0, win_y = 0;
@@ -43,95 +42,99 @@
void e_window_expose(Ecore_Event * ev)
{
Ecore_Event_Window_Expose *e;
+ Evas_Engine_Info_Software_X11 *info;
e = (Ecore_Event_Window_Expose *) ev->event;
- if ((e->win != evas_get_window(evas)))
+ info = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
+ if (e->win != info->info.drawable)
return;
- evas_update_rect(evas, e->x, e->y, e->w, e->h);
+ evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
}
void e_mouse_move(Ecore_Event * ev)
{
Ecore_Event_Mouse_Move *e;
+ Evas_Engine_Info_Software_X11 *info;
e = (Ecore_Event_Mouse_Move *) ev->event;
- if ((e->win != evas_get_window(evas)))
+ info = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
+ if (e->win != info->info.drawable)
return;
- evas_event_move(evas, e->x, e->y);
+ evas_event_feed_mouse_move(evas, e->x, e->y);
}
void e_mouse_down(Ecore_Event * ev)
{
Ecore_Event_Mouse_Down *e;
+ Evas_Engine_Info_Software_X11 *info;
e = (Ecore_Event_Mouse_Down *) ev->event;
- if ((e->win != evas_get_window(evas)))
+ info = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
+ if (e->win != info->info.drawable)
return;
- evas_event_button_down(evas, e->x, e->y, e->button);
+ evas_event_feed_mouse_down(evas, e->button);
}
void e_mouse_up(Ecore_Event * ev)
{
Ecore_Event_Mouse_Up *e;
+ Evas_Engine_Info_Software_X11 *info;
e = (Ecore_Event_Mouse_Up *) ev->event;
- if ((e->win != evas_get_window(evas)))
+ info = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
+ if (e->win != info->info.drawable)
return;
- evas_event_button_up(evas, e->x, e->y, e->button);
+ evas_event_feed_mouse_up(evas, e->button);
}
void
-button_mouse_in(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
- int _y)
+button_mouse_in(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info)
{
if ((_e = evas))
- evas_set_color(_e, _o, 0, 0, 0, 255);
+ evas_object_color_set(_o, 0, 0, 0, 255);
return;
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void
-button_mouse_out(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
- int _y)
+button_mouse_out(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info)
{
if ((_e = evas))
- evas_set_color(_e, _o, 0, 0, 0, 160);
+ evas_object_color_set(_o, 0, 0, 0, 160);
return;
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void
-button_mouse_down(void *_data, Evas _e, Evas_Object _o, int _b, int _x,
- int _y)
+button_mouse_down(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info)
{
- Evas_List l = _data;
+ 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);
+ evas_object_hide(o_prev_box);
+ evas_object_hide(o_txt_prev_box);
if (l->next) {
- evas_show(evas, o_next_box);
- evas_show(evas, o_txt_next_box);
+ evas_object_show(o_next_box);
+ evas_object_show(o_txt_next_box);
} else {
- evas_hide(evas, o_next_box);
- evas_hide(evas, o_txt_next_box);
+ evas_object_hide(o_next_box);
+ evas_object_hide(o_txt_next_box);
}
current_test = l;
@@ -143,13 +146,12 @@
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void
-next_test(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+next_test(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info)
{
void (*run) ();
@@ -162,16 +164,16 @@
*/
current_test = current_test->next;
if (!current_test->next) {
- evas_hide(evas, o_next_box);
- evas_hide(evas, o_txt_next_box);
+ evas_object_hide(o_next_box);
+ evas_object_hide(o_txt_next_box);
}
- evas_show(evas, o_prev_box);
- evas_show(evas, o_txt_prev_box);
+ evas_object_show(o_prev_box);
+ evas_object_show(o_txt_prev_box);
- evas_callback_add(evas, o_txt_next_box, CALLBACK_MOUSE_IN,
+ evas_object_event_callback_add(o_txt_next_box, EVAS_CALLBACK_MOUSE_IN,
button_mouse_in, NULL);
- evas_callback_add(evas, o_txt_next_box, CALLBACK_MOUSE_OUT,
+ evas_object_event_callback_add(o_txt_next_box, EVAS_CALLBACK_MOUSE_OUT,
button_mouse_out, NULL);
run = current_test->data;
@@ -181,13 +183,12 @@
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void
-prev_test(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+prev_test(void *_data, Evas *_e, Evas_Object *_o,
+ void *event_info)
{
void (*run) ();
@@ -200,16 +201,16 @@
*/
current_test = current_test->prev;
if (!current_test->prev) {
- evas_hide(evas, o_prev_box);
- evas_hide(evas, o_txt_prev_box);
+ evas_object_hide(o_prev_box);
+ evas_object_hide(o_txt_prev_box);
}
- evas_show(evas, o_next_box);
- evas_show(evas, o_txt_next_box);
+ evas_object_show(o_next_box);
+ evas_object_show(o_txt_next_box);
- evas_callback_add(evas, o_txt_prev_box, CALLBACK_MOUSE_IN,
+ evas_object_event_callback_add(o_txt_prev_box, EVAS_CALLBACK_MOUSE_IN,
button_mouse_in, NULL);
- evas_callback_add(evas, o_txt_prev_box, CALLBACK_MOUSE_OUT,
+ evas_object_event_callback_add(o_txt_prev_box, EVAS_CALLBACK_MOUSE_OUT,
button_mouse_out, NULL);
run = current_test->data;
@@ -219,17 +220,15 @@
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void setup(void)
{
double width, height;
Window win, ewin;
- Evas_Object o_bg;
- Evas_Object o_bg_etox;
+ 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"
@@ -261,12 +260,34 @@
/* 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);
+ evas = evas_new();
+ evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
+ evas_output_size_set(evas, win_w, win_h);
+ evas_output_viewport_set(evas, 0, 0, win_w, win_h);
+ {
+ Display *disp;
+ Evas_Engine_Info_Software_X11 *info;
+
+ disp = ecore_display_get();
+
+ info = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(evas);
+ info->info.display = disp;
+ info->info.visual = DefaultVisual(disp, DefaultScreen(disp));
+ info->info.colormap = DefaultColormap(disp, DefaultScreen(disp));
+
+ ewin = ecore_window_new(win, 0, 0, win_w, win_h);
+
+ info->info.drawable = ewin;
+ info->info.depth = DefaultDepth(disp, DefaultScreen(disp));
+
+ evas_engine_info_set(evas, (Evas_Engine_Info *)info);
+ }
+
+ evas_object_image_cache_set(evas, MAX_IMAGE_CACHE);
+ evas_object_font_cache_set(evas, MAX_FONT_CACHE);
+ evas_object_font_path_append(evas, 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);
@@ -281,22 +302,25 @@
/* 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);
+ o_bg = evas_object_image_add(evas);
+ evas_object_image_file_set(o_bg, IM "bg.png",
+ IM "bg.png");
+ evas_object_resize(o_bg, win_w, win_h);
+ evas_object_image_fill_set(o_bg, 0, 0, win_w, win_h);
+ evas_object_move(o_bg, 0, 0);
+ evas_object_layer_set(o_bg, 0);
+ evas_object_show(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);
+ clip_msg = evas_object_rectangle_add(evas);
+ evas_object_show(clip_msg);
+ evas_object_color_set(clip_msg, 255, 0, 255, 255);
+ evas_object_move(clip_msg, 40, 40);
+ evas_object_resize(clip_msg, 520, 140);
/* Create message etox */
e_msg = etox_new_all(evas, 40, 40, 520, 140, 255, ETOX_ALIGN_LEFT);
@@ -312,19 +336,19 @@
/* 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);
+ o_bg_etox = evas_object_rectangle_add(evas);
+ evas_object_move(o_bg_etox, 40, 200);
+ evas_object_resize(o_bg_etox, 520, 260);
+ evas_object_color_set(o_bg_etox, 0, 100, 100, 100);
+ evas_object_layer_set(o_bg_etox, 100);
+ evas_object_show(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);
+ clip_test = evas_object_rectangle_add(evas);
+ evas_object_color_set(clip_test, 255, 0, 255, 255);
+ evas_object_move(clip_test, 40, 200);
+ evas_object_resize(clip_test, 520, 260);
+ evas_object_show(clip_test);
/* Create test etox */
e_test =
@@ -341,55 +365,63 @@
/*
* 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);
+ o_next_box = evas_object_image_add(evas);
+ evas_object_image_file_set(o_next_box,
+ IM "panel_button1.png",
+ IM "panel_button1.png");
+ evas_object_image_border_set(o_next_box, 3, 3, 3, 3);
+ evas_object_layer_set(o_next_box, 1000);
+ evas_object_hide(o_next_box);
+
+ o_txt_next_box = evas_object_text_add(evas);
+ evas_object_text_font_set(o_txt_next_box, "andover", 24);
+ evas_object_text_text_set(o_txt_next_box, "Next");
+ evas_object_color_set(o_txt_next_box, 0, 0, 0, 160);
+ evas_object_layer_set(o_txt_next_box, 1000);
+ evas_object_move(o_next_box, 516, 150);
+ evas_object_move(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 = evas_object_text_horiz_advance_get(o_txt_next_box);
+ height = evas_object_text_vert_advance_get(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,
+ evas_object_resize(o_next_box, width, height);
+ evas_object_image_fill_set(o_next_box, 0, 0, width, height);
+ evas_object_hide(o_txt_next_box);
+ evas_object_event_callback_add(o_txt_next_box, EVAS_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, 416, 150);
- evas_move(evas, o_txt_prev_box, 419, 152);
+ o_prev_box = evas_object_image_add(evas);
+ evas_object_image_file_set(o_prev_box,
+ IM "panel_button1.png",
+ IM "panel_button1.png");
+ evas_object_image_border_set(o_prev_box, 3, 3, 3, 3);
+ evas_object_layer_set(o_prev_box, 1000);
+ evas_object_hide(o_prev_box);
+
+ o_txt_prev_box = evas_object_text_add(evas);
+ evas_object_text_font_set(o_txt_prev_box, "andover", 24);
+ evas_object_text_text_set(o_txt_prev_box, "Previous");
+ evas_object_color_set(o_txt_prev_box, 0, 0, 0, 160);
+ evas_object_layer_set(o_txt_prev_box, 1000);
+ evas_object_move(o_prev_box, 416, 150);
+ evas_object_move(o_txt_prev_box, 419, 152);
- width = evas_get_text_width(evas, o_txt_prev_box);
- height = evas_get_text_height(evas, o_txt_prev_box);
+ width = evas_object_text_horiz_advance_get(o_txt_prev_box);
+ height = evas_object_text_vert_advance_get(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,
+ evas_object_resize(o_prev_box, width, height);
+ evas_object_image_fill_set(o_prev_box, 0, 0, width, height);
+ evas_object_hide(o_txt_prev_box);
+ evas_object_event_callback_add(o_txt_prev_box, EVAS_CALLBACK_MOUSE_DOWN,
prev_test, NULL);
e_slide_panel_in(0, NULL);
@@ -397,7 +429,7 @@
int main(int argc, char **argv)
{
- Evas_List l;
+ Evas_List *l;
/* init X */
if (!ecore_display_init(NULL)) {
@@ -430,7 +462,7 @@
etox_free(e_test);
for (l = pbuttons; l; l = l->next)
- panel_button_free(evas, pbuttons->data);
+ panel_button_free(pbuttons->data);
evas_list_free(pbuttons);
evas_free(evas);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/panel.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- panel.c 23 May 2002 03:09:32 -0000 1.5
+++ panel.c 14 Jan 2003 18:43:33 -0000 1.6
@@ -1,10 +1,10 @@
#include "Etox_test.h"
/* globals */
-Evas_Object o_panel;
-Evas_Object o_showpanel;
-Evas_Object o_hidepanel;
-Evas_Object o_txt_paneltitle;
+Evas_Object *o_panel;
+Evas_Object *o_showpanel;
+Evas_Object *o_hidepanel;
+Evas_Object *o_txt_paneltitle;
Panel_Button *pbutton;
int panel_active = 0;
@@ -18,32 +18,32 @@
int w;
int y_offset = 40;
double ascent, descent;
- Evas_List l;
+ Evas_List *l;
panel_active = 1;
if (v == 0)
- evas_set_layer(evas, o_showpanel, 180);
+ evas_object_layer_set(o_showpanel, 180);
if (v == 0)
start = get_time();
val = (get_time() - start) / duration;
- evas_get_image_size(evas, o_panel, &w, NULL);
+ evas_object_image_size_get(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);
+ evas_object_move(o_panel, px, 0);
+ evas_object_move(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,
+ evas_object_move(pbutton->box, px + 5, win_h - y_offset);
+ evas_object_move(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 = evas_object_text_max_ascent_get(pbutton->label);
+ descent = evas_object_text_max_descent_get(pbutton->label);
+ evas_object_resize(pbutton->box, 108, ascent - descent + 4);
+ evas_object_image_fill_set(pbutton->box, 0, 0, 108,
ascent - descent + 4);
}
if (val < 1.0)
@@ -63,30 +63,29 @@
int w;
int y_offset = 40;
double ascent, descent;
- Evas_List l;
+ Evas_List *l;
if (v == 0)
- evas_set_layer(evas, o_showpanel, 1000);
+ evas_object_layer_set(o_showpanel, 1000);
if (v == 0)
start = get_time();
val = (get_time() - start) / duration;
- evas_get_image_size(evas, o_panel, &w, NULL);
+ evas_object_image_size_get(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);
+ evas_object_move(o_panel, px, 0);
+ evas_object_move(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);
+ evas_object_move(pbutton->box, px + 5, win_h - y_offset);
+ evas_object_move(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 = evas_object_text_max_ascent_get(pbutton->label);
+ descent = evas_object_text_max_descent_get(pbutton->label);
+ evas_object_resize(pbutton->box, 108, ascent - descent + 4);
+ evas_object_image_fill_set(pbutton->box, 0, 0, 108,
ascent - descent + 4);
}
if (val < 1.0)
@@ -100,7 +99,7 @@
}
void
-show_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+show_panel(void *_data, Evas *_e, Evas_Object *_o, void *event_info)
{
if (!panel_active)
e_slide_panel_in(0, NULL);
@@ -109,13 +108,11 @@
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
void
-hide_panel(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+hide_panel(void *_data, Evas *_e, Evas_Object *_o, void *event_info)
{
if (panel_active)
e_slide_panel_out(0, NULL);
@@ -124,44 +121,47 @@
_data = NULL;
_e = NULL;
_o = NULL;
- _b = 0;
- _x = 0;
- _y = 0;
+ event_info = NULL;
}
-void setup_panel(Evas _e)
+void setup_panel(Evas *_e)
{
int w;
Panel_Button *pbutton1, *pbutton2, *pbutton3;
- 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);
+ o_panel = evas_object_image_add(_e);
+ evas_object_image_file_set(o_panel, IM "panel.png",
+ IM "panel.png");
+ o_showpanel = evas_object_rectangle_add(_e);
+ o_hidepanel = evas_object_rectangle_add(_e);
+ evas_object_color_set(o_showpanel, 0, 0, 0, 0);
+ evas_object_color_set(o_hidepanel, 0, 0, 0, 0);
+ evas_object_image_size_get(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);
+ evas_object_move(o_panel, -w, 0);
+ evas_object_resize(o_panel, w, win_h);
+ evas_object_image_fill_set(o_panel, 0, 0, w, win_h);
+ evas_object_layer_set(o_panel, 200);
+ evas_object_resize(o_showpanel, 64, win_h);
if (panel_active)
- evas_set_layer(_e, o_showpanel, 180);
+ evas_object_layer_set(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);
+ evas_object_layer_set(o_showpanel, 1000);
+ evas_object_move(o_hidepanel, 128, 0);
+ evas_object_resize(o_hidepanel, win_w - 128, win_h);
+ evas_object_layer_set(o_hidepanel, 1000);
+ evas_object_move(o_showpanel, 0, 0);
+ evas_object_show(o_panel);
+ evas_object_show(o_showpanel);
+ evas_object_show(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);
+ o_txt_paneltitle = evas_object_text_add(_e);
+ evas_object_text_font_set(o_txt_paneltitle, "sinon", 17);
+ evas_object_text_text_set(o_txt_paneltitle, "Etox Test");
+ evas_object_color_set(o_txt_paneltitle, 255, 255, 255, 255);
+ evas_object_layer_set(o_txt_paneltitle, 250);
+ evas_object_show(o_txt_paneltitle);
/* Panel buttons */
pbutton1 = panel_button(evas, "Basic", basic_tests());
@@ -176,16 +176,16 @@
e_slide_panel_out(0, NULL);
/* Callbacks */
- evas_callback_add(evas, o_showpanel, CALLBACK_MOUSE_IN, show_panel,
+ evas_object_event_callback_add(o_showpanel, EVAS_CALLBACK_MOUSE_IN, show_panel,
NULL);
- evas_callback_add(evas, o_hidepanel, CALLBACK_MOUSE_IN, hide_panel,
+ evas_object_event_callback_add(o_hidepanel, EVAS_CALLBACK_MOUSE_IN, hide_panel,
NULL);
}
-Panel_Button *panel_button(Evas _e, char *_label, Evas_List tests)
+Panel_Button *panel_button(Evas *_e, char *_label, Evas_List *tests)
{
- Evas_Object o;
+ Evas_Object *o;
/*
* Create the new panel button's information
@@ -199,37 +199,41 @@
* 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);
+ o = evas_object_image_add(evas);
+ evas_object_image_file_set(o, IM "panel_button1.png",
+ IM "panel_button1.png");
+ evas_object_image_border_set(o, 3, 3, 3, 3);
+ evas_object_layer_set(o, 250);
+ evas_object_show(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);
+ o = evas_object_text_add(_e);
+ evas_object_text_font_set(o, "andover", 24);
+ evas_object_text_text_set(o, _label);
+ evas_object_color_set(o, 0, 0, 0, 160);
+ evas_object_layer_set(o, 250);
+ evas_object_show(o);
pbutton->label = o;
/*
* Attach the buttons callbacks
*/
- evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_IN,
+ evas_object_event_callback_add(pbutton->label, EVAS_CALLBACK_MOUSE_IN,
button_mouse_in, NULL);
- evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_OUT,
+ evas_object_event_callback_add(pbutton->label, EVAS_CALLBACK_MOUSE_OUT,
button_mouse_out, NULL);
- evas_callback_add(evas, pbutton->label, CALLBACK_MOUSE_DOWN,
+ evas_object_event_callback_add(pbutton->label, EVAS_CALLBACK_MOUSE_DOWN,
button_mouse_down, tests);
return pbutton;
}
-void panel_button_free(Evas _e, Panel_Button * pbutton)
+void panel_button_free(Panel_Button * pbutton)
{
if (pbutton->box)
- evas_del_object(_e, pbutton->box);
+ evas_object_del(pbutton->box);
if (pbutton->label)
- evas_del_object(_e, pbutton->label);
+ evas_object_del(pbutton->label);
free(pbutton);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/panel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- panel.h 17 May 2002 21:28:32 -0000 1.4
+++ panel.h 14 Jan 2003 18:43:37 -0000 1.5
@@ -3,13 +3,11 @@
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, void *event_info);
+void hide_panel(void *_data, Evas *_e, Evas_Object *_o, void *event_info);
+void setup_panel(Evas *_e);
-Panel_Button *panel_button(Evas _e, char *_label, Evas_List tests);
-void panel_button_free(Evas _e, Panel_Button * pbutton);
+Panel_Button *panel_button(Evas *_e, char *_label, Evas_List *tests);
+void panel_button_free(Panel_Button * pbutton);
#endif /* __PANEL_H__ */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/tests.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- tests.c 23 May 2002 03:09:32 -0000 1.8
+++ tests.c 14 Jan 2003 18:43:38 -0000 1.9
@@ -1,8 +1,8 @@
#include "Etox_test.h"
-Evas_List basic_tests()
+Evas_List *basic_tests()
{
- Evas_List l = NULL;
+ Evas_List *l = NULL;
l = evas_list_append(l, test_basic_init);
l = evas_list_append(l, test_basic_get);
@@ -94,9 +94,9 @@
return;
}
-Evas_List style_tests()
+Evas_List *style_tests()
{
- Evas_List l = NULL;
+ Evas_List *l = NULL;
l = evas_list_append(l, test_style_init);
l = evas_list_append(l, test_style_bold);
@@ -209,9 +209,9 @@
return;
}
-Evas_List callback_tests()
+Evas_List *callback_tests()
{
- Evas_List l = NULL;
+ Evas_List *l = NULL;
l = evas_list_append(l, test_callback_init);
/* l = evas_list_append(l, test_callback_add); */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/tests.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- tests.h 23 May 2002 03:09:32 -0000 1.5
+++ tests.h 14 Jan 2003 18:43:42 -0000 1.6
@@ -4,7 +4,7 @@
/*
* Basic test prototypes
*/
-Evas_List basic_tests();
+Evas_List *basic_tests();
void test_basic_init();
void test_basic_get();
void test_basic_set();
@@ -13,7 +13,7 @@
/*
* Style tests prototypes
*/
-Evas_List style_tests();
+Evas_List *style_tests();
void test_style_init();
void test_style_bold();
void test_style_outline();
@@ -23,7 +23,7 @@
/*
* Callback tests prototypes
*/
-Evas_List callback_tests();
+Evas_List *callback_tests();
void test_callback_init();
/* void test_callback_add(); */
-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving
your online business a competitive advantage. Test-drive a Thawte SSL
certificate - our easy online guide will show you how. Click here to get
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
