Enlightenment CVS committal
Author : sleuth
Project : e17
Module : apps/e
Dir : e17/apps/e/src
Modified Files:
Tag: SPLIT
actions.c block.c border.c border.h config.c config.h
cursors.c desktops.c desktops.h e.h embed.c embed.h entry.c
entry.h exec.c file.c file.h focus.c fs.c guides.c main.c
menu.c menu.h menubuild.c menubuild.h observer.c observer.h
place.c resist.c text.c text.h util.c util.h
Log Message:
Port to evas2
- Replace evas API calls with evas2 API calls
I've labelled areas I wasn't sure about with either "checkme" or "todo"
depending on if it's possibly wrong, or unfinished.
status: Well, it runs. I've been using Xnest, if you run this, and an Eterm or
two things aren't bad. There is a little border corruption, usually on the
lower right corner in my case. There is also a segf sometimes when I close
an app. There are some warnings left. They should be harmless.
I've ported raster's enstrom also. I'll be making a patch to his version
available shortly. It'll be at http://kevb.net/files with a name like
enstrom_evas2_20020530.diff
Kevin Brosius <cobra@...>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/actions.c,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -3 -r1.49.2.1 -r1.49.2.2
--- actions.c 26 Mar 2002 22:05:08 -0000 1.49.2.1
+++ actions.c 29 Jul 2002 01:17:57 -0000 1.49.2.2
@@ -11,9 +11,9 @@
#include "bordermenu.h"
#include "block.h"
-static Evas_List action_impls = NULL;
-static Evas_List current_actions = NULL;
-static Evas_List current_timers = NULL;
+static Evas_List * action_impls = NULL;
+static Evas_List * current_actions = NULL;
+static Evas_List * current_timers = NULL;
static void e_action_find(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods,
@@ -141,9 +141,9 @@
int a_button = 0;
char *a_key = NULL;
int a_modifiers = 0;
- Evas_List l;
+ Evas_List * l;
E_Action *a;
- static Evas_List actions = NULL;
+ static Evas_List * actions = NULL;
E_CFG_FILE(cfg_actions, "actions");
@@ -228,7 +228,7 @@
/* and action for it */
for (l = actions; l; l = l->next)
{
- Evas_List ll;
+ Evas_List * ll;
a = l->data;
if (act != a->event)
@@ -333,7 +333,7 @@
char *key, Ecore_Event_Key_Modifiers mods,
E_Object * object, void *data, int x, int y, int rx, int ry)
{
- Evas_List l;
+ Evas_List * l;
int started_long_action = 0;
D_ENTER;
@@ -373,7 +373,7 @@
char *key, Ecore_Event_Key_Modifiers mods, E_Object * object,
void *data, int x, int y, int rx, int ry)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -433,7 +433,7 @@
Ecore_Event_Key_Modifiers mods, E_Object * object, void *data,
int x, int y, int rx, int ry, int dx, int dy)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -459,7 +459,7 @@
e_action_stop_by_object(E_Object * object, void *data, int x, int y, int rx,
int ry)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -491,7 +491,7 @@
void
e_action_stop_by_type(char *action)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -546,7 +546,7 @@
void
e_action_del_timer(E_Object * object, char *name)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -590,7 +590,7 @@
void
e_action_del_timer_object(E_Object * object)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/block.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- block.c 3 Mar 2002 10:40:05 -0000 1.2
+++ block.c 29 Jul 2002 01:17:57 -0000 1.2.2.1
@@ -10,14 +10,14 @@
int refs;
};
-static Evas_List blocks = NULL;
+static Evas_List * blocks = NULL;
static E_Block *e_block_find(char *name);
static E_Block *
e_block_find(char *name)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
for (l = blocks; l; l = l->next)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/border.c,v
retrieving revision 1.72.2.1
retrieving revision 1.72.2.2
diff -u -3 -r1.72.2.1 -r1.72.2.2
--- border.c 26 Mar 2002 22:05:08 -0000 1.72.2.1
+++ border.c 29 Jul 2002 01:17:57 -0000 1.72.2.2
@@ -18,8 +18,8 @@
/* Window border rendering, querying, setting & modification code */
/* globals local to window borders */
-static Evas_List evases = NULL;
-static Evas_List borders = NULL;
+static Evas_List * evases = NULL;
+static Evas_List * borders = NULL;
static int mouse_x, mouse_y, mouse_win_x, mouse_win_y;
static int mouse_buttons = 0;
@@ -106,7 +106,7 @@
void
e_border_update_borders(void)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -600,33 +600,73 @@
e_cb_border_mouse_down(b, ev);
else
{
- Evas evas;
+ Evas * evas;
int x, y;
+ Window win;
evas = b->evas.l;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
+ /* checkme
evas_event_button_down(evas, x, y, e->button);
+ */
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_down(evas,e->button);
evas = b->evas.r;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_button_down(evas, x, y, e->button);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_down(evas,e->button);
evas = b->evas.t;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_button_down(evas, x, y, e->button);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_down(evas,e->button);
evas = b->evas.b;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_button_down(evas, x, y, e->button);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_down(evas,e->button);
}
}
}
@@ -660,33 +700,82 @@
e_cb_border_mouse_up(b, ev);
else
{
- Evas evas;
+ Evas * evas;
int x, y;
+ Window win;
evas = b->evas.l;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_up(evas, e->button);
+ /* checkme
evas_event_button_up(evas, x, y, e->button);
+ */
evas = b->evas.r;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_up(evas, e->button);
+ /* checkme
evas_event_button_up(evas, x, y, e->button);
+ */
evas = b->evas.t;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_up(evas, e->button);
+ /* checkme
evas_event_button_up(evas, x, y, e->button);
+ */
evas = b->evas.b;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_up(evas, e->button);
+ /* checkme
evas_event_button_up(evas, x, y, e->button);
+ */
}
}
}
@@ -720,33 +809,66 @@
e_cb_border_mouse_move(b, ev);
else
{
- Evas evas;
+ Evas * evas;
int x, y;
+ Window win;
evas = b->evas.l;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
+ evas_event_feed_mouse_move(evas, x, y);
evas = b->evas.r;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
+ evas_event_feed_mouse_move(evas, x, y);
evas = b->evas.t;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
+ evas_event_feed_mouse_move(evas, x, y);
evas = b->evas.b;
- ecore_window_get_root_relative_location(evas_get_window(evas),
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win,
&x, &y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
+ evas_event_feed_mouse_move(evas, x, y);
}
}
}
@@ -772,39 +894,72 @@
else if (e->win == b->win.input)
{
int x, y;
- Evas evas;
+ Evas * evas;
+ Window win;
evas = b->evas.l;
- ecore_window_get_root_relative_location(evas_get_window(evas), &x,
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win, &x,
&y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
- evas_event_enter(evas);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_in(evas);
evas = b->evas.r;
- ecore_window_get_root_relative_location(evas_get_window(evas), &x,
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win, &x,
&y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
- evas_event_enter(evas);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_in(evas);
evas = b->evas.t;
- ecore_window_get_root_relative_location(evas_get_window(evas), &x,
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win, &x,
&y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
- evas_event_enter(evas);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_in(evas);
evas = b->evas.b;
- ecore_window_get_root_relative_location(evas_get_window(evas), &x,
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ ecore_window_get_root_relative_location(win, &x,
&y);
x = e->rx - x;
y = e->ry - y;
- evas_event_move(evas, x, y);
- evas_event_enter(evas);
+ /*evas_event_feed_mouse_move(evas, x, y);*/
+ evas_event_feed_mouse_in(evas);
}
}
current_ev = NULL;
@@ -831,10 +986,10 @@
e_cb_border_mouse_out(b, ev);
if (e->win == b->win.input)
{
- evas_event_leave(b->evas.l);
- evas_event_leave(b->evas.r);
- evas_event_leave(b->evas.t);
- evas_event_leave(b->evas.b);
+ evas_event_feed_mouse_out(b->evas.l);
+ evas_event_feed_mouse_out(b->evas.r);
+ evas_event_feed_mouse_out(b->evas.t);
+ evas_event_feed_mouse_out(b->evas.b);
}
}
}
@@ -854,16 +1009,25 @@
current_ev = ev;
e = ev->event;
{
- Evas_List l;
+ Evas_List * l;
E_Border *b;
for (l = evases; l; l = l->next)
{
- Evas evas;
+ Evas * evas;
+ Window win;
evas = l->data;
- if (evas_get_window(evas) == e->win)
- evas_update_rect(evas, e->x, e->y, e->w, e->h);
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+ }
+ if (win == e->win)
+ evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
}
b = e_border_find_by_window(e->win);
if (b)
@@ -1120,7 +1284,7 @@
y = ((Ecore_Event_Mouse_Down *) (e->event))->y;
bt = ((Ecore_Event_Mouse_Down *) (e->event))->button;
{
- Evas_List l;
+ Evas_List * l;
again:
for (l = b->grabs; l; l = l->next)
@@ -1266,7 +1430,7 @@
static void
e_border_cleanup(E_Border * b)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -1754,30 +1918,30 @@
ecore_window_show(b->win.input);
ecore_window_show(b->win.container);
- b->evas.l = evas_new_all(ecore_display_get(),
+ b->evas.l = e_evas_new_all(ecore_display_get(),
b->win.main,
0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE,
max_colors, font_cache, image_cache, font_dir);
- b->win.l = evas_get_window(b->evas.l);
- b->evas.r = evas_new_all(ecore_display_get(),
+ b->win.l = e_evas_get_window(b->evas.l);
+ b->evas.r = e_evas_new_all(ecore_display_get(),
b->win.main,
0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE,
max_colors, font_cache, image_cache, font_dir);
- b->win.r = evas_get_window(b->evas.r);
- b->evas.t = evas_new_all(ecore_display_get(),
+ b->win.r = e_evas_get_window(b->evas.r);
+ b->evas.t = e_evas_new_all(ecore_display_get(),
b->win.main,
0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE,
max_colors, font_cache, image_cache, font_dir);
- b->win.t = evas_get_window(b->evas.t);
- b->evas.b = evas_new_all(ecore_display_get(),
+ b->win.t = e_evas_get_window(b->evas.t);
+ b->evas.b = e_evas_new_all(ecore_display_get(),
b->win.main,
0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE,
max_colors, font_cache, image_cache, font_dir);
- b->win.b = evas_get_window(b->evas.b);
+ b->win.b = e_evas_get_window(b->evas.b);
e_cursors_display_in_window(b->win.l, "Default");
e_cursors_display_in_window(b->win.r, "Default");
e_cursors_display_in_window(b->win.t, "Default");
@@ -1788,25 +1952,25 @@
b->obj.title.t = e_text_new(b->evas.t, "", "title");
b->obj.title.b = e_text_new(b->evas.b, "", "title");
- b->obj.title_clip.l = evas_add_rectangle(b->evas.l);
- b->obj.title_clip.r = evas_add_rectangle(b->evas.r);
- b->obj.title_clip.t = evas_add_rectangle(b->evas.t);
- b->obj.title_clip.b = evas_add_rectangle(b->evas.b);
-
- evas_set_color(b->evas.l, b->obj.title_clip.l, 255, 255, 255, 255);
- evas_set_color(b->evas.r, b->obj.title_clip.r, 255, 255, 255, 255);
- evas_set_color(b->evas.t, b->obj.title_clip.t, 255, 255, 255, 255);
- evas_set_color(b->evas.b, b->obj.title_clip.b, 255, 255, 255, 255);
+ b->obj.title_clip.l = evas_object_rectangle_add(b->evas.l);
+ b->obj.title_clip.r = evas_object_rectangle_add(b->evas.r);
+ b->obj.title_clip.t = evas_object_rectangle_add(b->evas.t);
+ b->obj.title_clip.b = evas_object_rectangle_add(b->evas.b);
+
+ evas_object_color_set(b->obj.title_clip.l, 255, 255, 255, 255);
+ evas_object_color_set(b->obj.title_clip.r, 255, 255, 255, 255);
+ evas_object_color_set(b->obj.title_clip.t, 255, 255, 255, 255);
+ evas_object_color_set(b->obj.title_clip.b, 255, 255, 255, 255);
e_text_show(b->obj.title.l);
e_text_show(b->obj.title.r);
e_text_show(b->obj.title.t);
e_text_show(b->obj.title.b);
- evas_show(b->evas.l, b->obj.title_clip.l);
- evas_show(b->evas.r, b->obj.title_clip.r);
- evas_show(b->evas.t, b->obj.title_clip.t);
- evas_show(b->evas.b, b->obj.title_clip.b);
+ evas_object_show(b->obj.title_clip.l);
+ evas_object_show(b->obj.title_clip.r);
+ evas_object_show(b->obj.title_clip.t);
+ evas_object_show(b->obj.title_clip.b);
e_text_set_clip(b->obj.title.l, b->obj.title_clip.l);
e_text_set_clip(b->obj.title.r, b->obj.title_clip.r);
@@ -1871,7 +2035,7 @@
void
e_border_remove_mouse_grabs(E_Border * b)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -1999,7 +2163,7 @@
void
e_border_remove_all_mouse_grabs(void)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -2012,7 +2176,7 @@
void
e_border_attach_all_mouse_grabs(void)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -2031,7 +2195,7 @@
static time_t mod_date_settings = 0;
time_t mod;
int changed = 0;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -2065,7 +2229,7 @@
E_Border *
e_border_find_by_window(Window win)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -2144,11 +2308,11 @@
e_border_set_color_class(b, "Title BG", 100, 200, 255, 255);
#define HOOK_CB(_class) \
-ebits_set_classed_bit_callback(b->bits.t, _class, CALLBACK_MOUSE_IN, e_cb_mouse_in, b); \
-ebits_set_classed_bit_callback(b->bits.t, _class, CALLBACK_MOUSE_OUT, e_cb_mouse_out, b); \
-ebits_set_classed_bit_callback(b->bits.t, _class, CALLBACK_MOUSE_DOWN, e_cb_mouse_down, b); \
-ebits_set_classed_bit_callback(b->bits.t, _class, CALLBACK_MOUSE_UP, e_cb_mouse_up, b); \
-ebits_set_classed_bit_callback(b->bits.t, _class, CALLBACK_MOUSE_MOVE, e_cb_mouse_move, b);
+ebits_set_classed_bit_callback(b->bits.t, _class, EVAS_CALLBACK_MOUSE_IN, e_cb_mouse_in, b); \
+ebits_set_classed_bit_callback(b->bits.t, _class, EVAS_CALLBACK_MOUSE_OUT, e_cb_mouse_out, b); \
+ebits_set_classed_bit_callback(b->bits.t, _class, EVAS_CALLBACK_MOUSE_DOWN, e_cb_mouse_down, b); \
+ebits_set_classed_bit_callback(b->bits.t, _class, EVAS_CALLBACK_MOUSE_UP, e_cb_mouse_up, b); \
+ebits_set_classed_bit_callback(b->bits.t, _class, EVAS_CALLBACK_MOUSE_MOVE, e_cb_mouse_move, b);
HOOK_CB("Title_Bar");
HOOK_CB("Resize");
HOOK_CB("Resize_Horizontal");
@@ -2418,8 +2582,8 @@
{
ecore_window_show(b->win.l);
ecore_window_move_resize(b->win.l, x, y, w, h);
- evas_set_output_size(b->evas.l, w, h);
- evas_set_output_viewport(b->evas.l, x, y, w, h);
+ evas_output_size_set(b->evas.l, w, h);
+ evas_output_viewport_set(b->evas.l, x, y, w, h);
}
x = 0, y = 0, w = b->current.w, h = pt;
@@ -2429,8 +2593,8 @@
{
ecore_window_show(b->win.t);
ecore_window_move_resize(b->win.t, x, y, w, h);
- evas_set_output_size(b->evas.t, w, h);
- evas_set_output_viewport(b->evas.t, x, y, w, h);
+ evas_output_size_set(b->evas.t, w, h);
+ evas_output_viewport_set(b->evas.t, x, y, w, h);
}
x = b->current.w - pr, y = pt, w = pr, h =
@@ -2441,8 +2605,8 @@
{
ecore_window_show(b->win.r);
ecore_window_move_resize(b->win.r, x, y, w, h);
- evas_set_output_size(b->evas.r, w, h);
- evas_set_output_viewport(b->evas.r, x, y, w, h);
+ evas_output_size_set(b->evas.r, w, h);
+ evas_output_viewport_set(b->evas.r, x, y, w, h);
}
x = 0, y = b->current.h - pb, w = b->current.w, h = pb;
@@ -2452,8 +2616,8 @@
{
ecore_window_show(b->win.b);
ecore_window_move_resize(b->win.b, x, y, w, h);
- evas_set_output_size(b->evas.b, w, h);
- evas_set_output_viewport(b->evas.b, x, y, w, h);
+ evas_output_size_set(b->evas.b, w, h);
+ evas_output_viewport_set(b->evas.b, x, y, w, h);
}
}
else
@@ -2468,8 +2632,8 @@
{
ecore_window_show(b->win.l);
ecore_window_move_resize(b->win.l, x, y, w, h);
- evas_set_output_size(b->evas.l, w, h);
- evas_set_output_viewport(b->evas.l, x, y, w, h);
+ evas_output_size_set(b->evas.l, w, h);
+ evas_output_viewport_set(b->evas.l, x, y, w, h);
}
x = 0, y = 0, w = b->current.w, h = pt;
@@ -2479,8 +2643,8 @@
{
ecore_window_show(b->win.t);
ecore_window_move_resize(b->win.t, x, y, w, h);
- evas_set_output_size(b->evas.t, w, h);
- evas_set_output_viewport(b->evas.t, x, y, w, h);
+ evas_output_size_set(b->evas.t, w, h);
+ evas_output_viewport_set(b->evas.t, x, y, w, h);
}
x = b->current.w - pr, y = pt, w = pr, h =
@@ -2491,8 +2655,8 @@
{
ecore_window_show(b->win.r);
ecore_window_move_resize(b->win.r, x, y, w, h);
- evas_set_output_size(b->evas.r, w, h);
- evas_set_output_viewport(b->evas.r, x, y, w, h);
+ evas_output_size_set(b->evas.r, w, h);
+ evas_output_viewport_set(b->evas.r, x, y, w, h);
}
x = 0, y = b->current.h - pb, w = b->current.w, h = pb;
@@ -2502,8 +2666,8 @@
{
ecore_window_show(b->win.b);
ecore_window_move_resize(b->win.b, x, y, w, h);
- evas_set_output_size(b->evas.b, w, h);
- evas_set_output_viewport(b->evas.b, x, y, w, h);
+ evas_output_size_set(b->evas.b, w, h);
+ evas_output_viewport_set(b->evas.b, x, y, w, h);
}
if (b->current.shaded == b->client.h)
{
@@ -2557,8 +2721,8 @@
else
e_text_set_state(b->obj.title.l, "normal");
}
- evas_move(b->evas.l, b->obj.title_clip.l, tx, ty);
- evas_resize(b->evas.l, b->obj.title_clip.l, tw, th);
+ evas_object_move(b->obj.title_clip.l, tx, ty);
+ evas_object_resize(b->obj.title_clip.l, tw, th);
ebits_get_named_bit_geometry(b->bits.r, "Title_Area", &tx, &ty, &tw,
&th);
@@ -2571,8 +2735,8 @@
else
e_text_set_state(b->obj.title.r, "normal");
}
- evas_move(b->evas.r, b->obj.title_clip.r, tx, ty);
- evas_resize(b->evas.r, b->obj.title_clip.r, tw, th);
+ evas_object_move(b->obj.title_clip.r, tx, ty);
+ evas_object_resize(b->obj.title_clip.r, tw, th);
ebits_get_named_bit_geometry(b->bits.t, "Title_Area", &tx, &ty, &tw,
&th);
@@ -2585,8 +2749,8 @@
else
e_text_set_state(b->obj.title.t, "normal");
}
- evas_move(b->evas.t, b->obj.title_clip.t, tx, ty);
- evas_resize(b->evas.t, b->obj.title_clip.t, tw, th);
+ evas_object_move(b->obj.title_clip.t, tx, ty);
+ evas_object_resize(b->obj.title_clip.t, tw, th);
ebits_get_named_bit_geometry(b->bits.b, "Title_Area", &tx, &ty, &tw,
&th);
@@ -2599,8 +2763,8 @@
else
e_text_set_state(b->obj.title.b, "normal");
}
- evas_move(b->evas.b, b->obj.title_clip.b, tx, ty);
- evas_resize(b->evas.b, b->obj.title_clip.b, tw, th);
+ evas_object_move(b->obj.title_clip.b, tx, ty);
+ evas_object_resize(b->obj.title_clip.b, tw, th);
if (b->obj.title.l)
e_text_set_layer(b->obj.title.l, 1);
@@ -2669,7 +2833,7 @@
void
e_border_raise(E_Border * b)
{
- Evas_List l;
+ Evas_List * l;
E_Border *rel;
D_ENTER;
@@ -2709,7 +2873,7 @@
void
e_border_lower(E_Border * b)
{
- Evas_List l;
+ Evas_List * l;
E_Border *rel;
D_ENTER;
@@ -2871,7 +3035,7 @@
E_Border *
e_border_current_focused(void)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
for (l = borders; l; l = l->next)
@@ -2897,7 +3061,7 @@
void
e_border_focus_grab_ended(void)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -2954,7 +3118,7 @@
void
e_border_raise_next(void)
{
- Evas_List next;
+ Evas_List * next;
E_Border *current;
D_ENTER;
@@ -3037,7 +3201,7 @@
D_RETURN;
}
-Evas_List
+Evas_List *
e_border_get_borders_list()
{
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/border.h,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -3 -r1.19 -r1.19.2.1
--- border.h 3 Mar 2002 10:40:05 -0000 1.19
+++ border.h 29 Jul 2002 01:17:57 -0000 1.19.2.1
@@ -38,7 +38,7 @@
win;
struct
{
- Evas l, r, t, b;
+ Evas *l, *r, *t, *b;
}
evas;
struct
@@ -50,7 +50,7 @@
title;
struct
{
- Evas_Object l, r, t, b;
+ Evas_Object *l, *r, *t, *b;
}
title_clip;
}
@@ -213,7 +213,7 @@
int shape_changed;
int placed;
- Evas_List grabs;
+ Evas_List *grabs;
E_Grab *click_grab;
E_Desktop *desk;
@@ -224,7 +224,7 @@
int hold_changes;
- Evas_List menus;
+ Evas_List *menus;
int changed;
};
@@ -272,5 +272,5 @@
void e_border_print_pos(char *buf, E_Border * b);
void e_border_print_size(char *buf, E_Border * b);
void e_border_set_gravity(E_Border * b, int gravity);
-Evas_List e_border_get_borders_list();
+Evas_List *e_border_get_borders_list();
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/config.c,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -3 -r1.32 -r1.32.2.1
--- config.c 4 Mar 2002 22:00:15 -0000 1.32
+++ config.c 29 Jul 2002 01:17:57 -0000 1.32.2.1
@@ -187,7 +187,7 @@
time_t last_mod;
}
user , system;
- Evas_List hash[256];
+ Evas_List * hash[256];
};
void
@@ -265,7 +265,7 @@
{
E_DB_File *db;
char buf[PATH_MAX];
- Evas_List l;
+ Evas_List * l;
char *data;
D_ENTER;
@@ -326,7 +326,7 @@
break;
case E_CFG_TYPE_LIST:
{
- Evas_List l2;
+ Evas_List * l2;
int i, count;
l2 = NULL;
@@ -342,7 +342,7 @@
data2 = e_config_load(file, buf, node->sub_type);
l2 = evas_list_append(l2, data2);
}
- (*((Evas_List *) (&(data[node->offset])))) = l2;
+ (*((Evas_List *) (&(data[node->offset])))) = *l2;
}
break;
case E_CFG_TYPE_KEY:
@@ -366,7 +366,7 @@
struct _list_base
{
- Evas_List elements;
+ Evas_List * elements;
};
struct _list_element
@@ -412,7 +412,7 @@
/* got data */
else
{
- Evas_List l;
+ Evas_List * l;
for (l = cfg_data->elements; l; l = l->next)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/config.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -3 -r1.8 -r1.8.2.1
--- config.h 3 Mar 2002 10:40:05 -0000 1.8
+++ config.h 29 Jul 2002 01:17:57 -0000 1.8.2.1
@@ -168,7 +168,7 @@
struct _e_config_base_type
{
int size;
- Evas_List nodes;
+ Evas_List * nodes;
};
struct _e_config_node
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/cursors.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -3 -r1.9 -r1.9.2.1
--- cursors.c 3 Mar 2002 10:40:05 -0000 1.9
+++ cursors.c 29 Jul 2002 01:17:57 -0000 1.9.2.1
@@ -16,7 +16,7 @@
static int cursor_change = 0;
static char *cur_cursor = NULL;
static char *prev_cursor = NULL;
-static Evas_List cursors = NULL;
+static Evas_List * cursors = NULL;
static void e_cursors_idle(void *data);
static void e_cursors_set(char *type);
@@ -62,7 +62,7 @@
static E_Cursor *
e_cursors_find(char *type)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/desktops.c,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -3 -r1.46.2.1 -r1.46.2.2
--- desktops.c 26 Mar 2002 22:05:08 -0000 1.46.2.1
+++ desktops.c 29 Jul 2002 01:17:57 -0000 1.46.2.2
@@ -7,7 +7,7 @@
#include "util.h"
#include "object.h"
-static Evas_List desktops = NULL;
+static Evas_List * desktops = NULL;
static Window e_base_win = 0;
static int screen_w, screen_h;
@@ -54,7 +54,7 @@
void
e_desktops_scroll(E_Desktop * desk, int dx, int dy)
{
- Evas_List l;
+ Evas_List * l;
int xd, yd, wd, hd;
int grav, grav_stick;
@@ -283,7 +283,7 @@
E_Desktop *
e_desktops_get(int d)
{
- Evas_List l;
+ Evas_List * l;
int i;
D_ENTER;
@@ -332,7 +332,7 @@
if (desk)
{
int dx, dy;
- Evas_List l;
+ Evas_List * l;
if ((d == desk->desk.desk) &&
(ax == desk->desk.area.x) && (ay == desk->desk.area.y))
@@ -384,7 +384,7 @@
D_RETURN;
}
-Evas_List
+Evas_List *
e_desktops_get_desktops_list()
{
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/desktops.h,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -3 -r1.9.2.1 -r1.9.2.2
--- desktops.h 26 Mar 2002 22:05:08 -0000 1.9.2.1
+++ desktops.h 29 Jul 2002 01:17:57 -0000 1.9.2.2
@@ -28,7 +28,7 @@
int w, h;
}
real , virt;
- Evas_List windows;
+ Evas_List * windows;
struct
{
int desk;
@@ -89,6 +89,6 @@
int e_desktops_get_current(void);
void e_desktops_goto_desk(int d);
void e_desktops_goto(int d, int ax, int ay);
-Evas_List e_desktops_get_desktops_list();
+Evas_List *e_desktops_get_desktops_list();
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/e.h,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -u -3 -r1.67 -r1.67.2.1
--- e.h 3 Mar 2002 10:40:05 -0000 1.67
+++ e.h 29 Jul 2002 01:17:57 -0000 1.67.2.1
@@ -22,6 +22,7 @@
#endif
#include <Imlib2.h>
#include <Evas.h>
+#include <Evas_Engine_Software_X11.h>
#include <Ebits.h>
#include <Ecore.h>
#include <Edb.h>
@@ -44,7 +45,7 @@
/* macros for allowing sections of code to be runtime profiled */
#define E_PROF 1
#ifdef E_PROF
-extern Evas_List __e_profiles;
+extern Evas_List * __e_profiles;
typedef struct _e_prof
{
@@ -57,7 +58,7 @@
#define E_PROF_START(_prof_func) \
{ \
E_Prof __p, *__pp; \
-Evas_List __pl; \
+Evas_List * __pl; \
__p.func = _prof_func; \
__p.total = 0.0; \
__p.t1 = ecore_get_time(); \
@@ -86,7 +87,7 @@
}
#define E_PROF_DUMP \
{ \
-Evas_List __pl; \
+Evas_List * __pl; \
for (__pl = __e_profiles; __pl; __pl = __pl->next) \
{ \
E_Prof *__p; \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/embed.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -3 -r1.5 -r1.5.2.1
--- embed.c 3 Mar 2002 10:40:06 -0000 1.5
+++ embed.c 29 Jul 2002 01:17:57 -0000 1.5.2.1
@@ -7,9 +7,9 @@
struct _Embed
{
Ebits_Object o;
- Evas evas;
- Evas_Object image_obj;
- Evas_Object clip_obj;
+ Evas * evas;
+ Evas_Object * image_obj;
+ Evas_Object * clip_obj;
int clip_x, clip_y;
E_Text *text_obj;
};
@@ -23,7 +23,7 @@
em = _data;
if (em->clip_obj)
- evas_show(em->evas, em->clip_obj);
+ evas_object_show(em->clip_obj);
e_text_show(em->text_obj);
D_RETURN;
@@ -38,7 +38,7 @@
em = _data;
if (em->clip_obj)
- evas_hide(em->evas, em->clip_obj);
+ evas_object_hide(em->clip_obj);
e_text_hide(em->text_obj);
D_RETURN;
@@ -53,7 +53,7 @@
em = _data;
if (em->clip_obj)
- evas_move(em->evas, em->clip_obj, x, y);
+ evas_object_move(em->clip_obj, x, y);
e_text_move(em->text_obj, x, y);
D_RETURN;
@@ -68,7 +68,7 @@
em = _data;
if (em->clip_obj)
- evas_resize(em->evas, em->clip_obj, w, h);
+ evas_object_resize(em->clip_obj, w, h);
e_text_resize(em->text_obj, w, h);
D_RETURN;
@@ -83,7 +83,7 @@
em = _data;
if (em->clip_obj)
- evas_raise(em->evas, em->clip_obj);
+ evas_object_raise(em->clip_obj);
e_text_raise(em->text_obj);
D_RETURN;
@@ -98,7 +98,7 @@
em = _data;
if (em->clip_obj)
- evas_lower(em->evas, em->clip_obj);
+ evas_object_lower(em->clip_obj);
e_text_lower(em->text_obj);
D_RETURN;
@@ -113,14 +113,14 @@
em = _data;
if (em->clip_obj)
- evas_set_layer(em->evas, em->clip_obj, l);
+ evas_object_layer_set(em->clip_obj, l);
e_text_set_layer(em->text_obj, l);
D_RETURN;
}
static void
-e_embed_text_func_set_clip(void *_data, Evas_Object clip)
+e_embed_text_func_set_clip(void *_data, Evas_Object * clip)
{
Embed_Private *em;
@@ -198,7 +198,7 @@
/***/
Embed
-e_embed_text(Ebits_Object o, char *bit_name, Evas evas, E_Text * text_obj,
+e_embed_text(Ebits_Object o, char *bit_name, Evas * evas, E_Text * text_obj,
int clip_x, int clip_y)
{
Embed_Private *em;
@@ -214,10 +214,10 @@
em->clip_y = clip_y;
if ((clip_x) || (clip_y))
{
- em->clip_obj = evas_add_rectangle(em->evas);
- evas_set_color(em->evas, em->clip_obj, 255, 255, 255, 255);
+ em->clip_obj = evas_object_rectangle_add(em->evas);
+ evas_object_color_set(em->clip_obj, 255, 255, 255, 255);
e_text_set_clip(em->text_obj, em->clip_obj);
- evas_show(em->evas, em->clip_obj);
+ evas_object_show(em->clip_obj);
}
ebits_set_named_bit_replace(o, bit_name,
e_embed_text_func_show,
@@ -244,7 +244,7 @@
D_ENTER;
em = _data;
- evas_show(em->evas, em->image_obj);
+ evas_object_show(em->image_obj);
D_RETURN;
}
@@ -257,7 +257,7 @@
D_ENTER;
em = _data;
- evas_hide(em->evas, em->image_obj);
+ evas_object_hide(em->image_obj);
D_RETURN;
}
@@ -270,7 +270,7 @@
D_ENTER;
em = _data;
- evas_move(em->evas, em->image_obj, x, y);
+ evas_object_move(em->image_obj, x, y);
D_RETURN;
}
@@ -283,8 +283,8 @@
D_ENTER;
em = _data;
- evas_resize(em->evas, em->image_obj, w, h);
- evas_set_image_fill(em->evas, em->image_obj, 0, 0, w, h);
+ evas_object_resize(em->image_obj, w, h);
+ evas_object_image_fill_set(em->image_obj, 0, 0, w, h);
D_RETURN;
}
@@ -297,7 +297,7 @@
D_ENTER;
em = _data;
- evas_raise(em->evas, em->image_obj);
+ evas_object_raise(em->image_obj);
D_RETURN;
}
@@ -310,7 +310,7 @@
D_ENTER;
em = _data;
- evas_lower(em->evas, em->image_obj);
+ evas_object_lower(em->image_obj);
D_RETURN;
}
@@ -323,13 +323,13 @@
D_ENTER;
em = _data;
- evas_set_layer(em->evas, em->image_obj, l);
+ evas_object_layer_set(em->image_obj, l);
D_RETURN;
}
static void
-e_embed_image_func_set_clip(void *_data, Evas_Object clip)
+e_embed_image_func_set_clip(void *_data, Evas_Object * clip)
{
Embed_Private *em;
@@ -337,9 +337,9 @@
em = _data;
if (clip)
- evas_set_clip(em->evas, em->image_obj, clip);
+ evas_object_clip_set(em->image_obj, clip);
else
- evas_unset_clip(em->evas, em->image_obj);
+ evas_object_clip_unset(em->image_obj);
D_RETURN;
}
@@ -354,7 +354,7 @@
em = _data;
if ((cc) && (!strcmp(cc, "icon")))
- evas_set_color(em->evas, em->image_obj, r, g, b, a);
+ evas_object_color_set(em->image_obj, r, g, b, a);
D_RETURN;
}
@@ -370,7 +370,7 @@
em = _data;
iw = 0;
ih = 0;
- evas_get_image_size(em->evas, em->image_obj, &iw, &ih);
+ evas_object_image_size_get(em->image_obj, &iw, &ih);
if (w)
*w = iw;
if (h)
@@ -388,7 +388,7 @@
D_ENTER;
em = _data;
- evas_get_image_size(em->evas, em->image_obj, &iw, &ih);
+ evas_object_image_size_get(em->image_obj, &iw, &ih);
if (w)
*w = iw;
if (h)
@@ -400,8 +400,8 @@
/***/
Embed
-e_embed_image_object(Ebits_Object o, char *bit_name, Evas evas,
- Evas_Object image_obj)
+e_embed_image_object(Ebits_Object o, char *bit_name, Evas * evas,
+ Evas_Object * image_obj)
{
Embed_Private *em;
@@ -438,7 +438,7 @@
em = emb;
if (em->clip_obj)
- evas_del_object(em->evas, em->clip_obj);
+ evas_object_del(em->clip_obj);
FREE(em);
D_RETURN;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/embed.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- embed.h 3 Mar 2002 10:40:06 -0000 1.2
+++ embed.h 29 Jul 2002 01:17:57 -0000 1.2.2.1
@@ -6,10 +6,10 @@
typedef void *Embed;
-Embed e_embed_text(Ebits_Object o, char *bit_name, Evas evas,
+Embed e_embed_text(Ebits_Object o, char *bit_name, Evas * evas,
E_Text * text_obj, int clip_x, int clip_y);
Embed e_embed_image_object(Ebits_Object o, char *bit_name,
- Evas evas, Evas_Object image_obj);
+ Evas * evas, Evas_Object * image_obj);
void e_embed_free(Embed em);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/entry.c,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -3 -r1.29 -r1.29.2.1
--- entry.c 11 Mar 2002 20:03:13 -0000 1.29
+++ entry.c 29 Jul 2002 01:17:57 -0000 1.29.2.1
@@ -3,16 +3,16 @@
#include "config.h"
#include "util.h"
-static Evas_List entries;
+static Evas_List * entries;
static void e_clear_selection(Ecore_Event * ev);
static void e_paste_request(Ecore_Event * ev);
-static void e_entry_down_cb(void *_data, Evas _e, Evas_Object _o,
+static void e_entry_down_cb(void *_data, Evas * _e, Evas_Object * _o,
int _b, int _x, int _y);
-static void e_entry_up_cb(void *_data, Evas _e, Evas_Object _o, int _b,
+static void e_entry_up_cb(void *_data, Evas * _e, Evas_Object * _o, int _b,
int _x, int _y);
-static void e_entry_move_cb(void *_data, Evas _e, Evas_Object _o,
+static void e_entry_move_cb(void *_data, Evas * _e, Evas_Object * _o,
int _b, int _x, int _y);
static void e_entry_realize(E_Entry * entry);
static void e_entry_unrealize(E_Entry * entry);
@@ -22,7 +22,7 @@
e_clear_selection(Ecore_Event * ev)
{
Ecore_Event_Clear_Selection *e;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -49,7 +49,7 @@
e_paste_request(Ecore_Event * ev)
{
Ecore_Event_Paste_Request *e;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -73,7 +73,7 @@
}
static void
-e_entry_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+e_entry_down_cb(void *_data, Evas *_e, Evas_Object * _o, int _b, int _x, int _y)
{
E_Entry *entry;
int pos;
@@ -90,13 +90,19 @@
else if (!entry->mouse_down)
{
entry->focused = 1;
+ /* checkme
pos = evas_text_at_position(_e, entry->text, _x, _y,
NULL, NULL, NULL, NULL);
+ */
+ pos = evas_object_text_char_coords_get(entry->text, _x, _y,
+ NULL, NULL, NULL, NULL);
if (pos < 0)
{
int tw;
+ /* checkme todo
tw = evas_get_text_width(_e, entry->text);
+ */
if (_x > entry->x + tw)
{
entry->cursor_pos = strlen(entry->buffer);
@@ -120,7 +126,7 @@
}
static void
-e_entry_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+e_entry_up_cb(void *_data, Evas * _e, Evas_Object * _o, int _b, int _x, int _y)
{
E_Entry *entry;
@@ -141,7 +147,7 @@
}
static void
-e_entry_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+e_entry_move_cb(void *_data, Evas * _e, Evas_Object * _o, int _b, int _x, int _y)
{
E_Entry *entry;
@@ -154,14 +160,20 @@
double ty;
ppos = entry->cursor_pos;
- evas_get_geometry(entry->evas, entry->text, NULL, &ty, NULL, NULL);
+ evas_object_geometry_get(entry->text, NULL, &ty, NULL, NULL);
+ /* checkme
pos = evas_text_at_position(_e, entry->text, _x, ty,
NULL, NULL, NULL, NULL);
+ */
+ pos = evas_object_text_char_coords_get(entry->text, _x, ty,
+ NULL, NULL, NULL, NULL);
if (pos < 0)
{
int tw;
+ /* checkme todo
tw = evas_get_text_width(_e, entry->text);
+ */
if (_x > entry->x + tw)
{
entry->cursor_pos = strlen(entry->buffer);
@@ -258,24 +270,27 @@
/* ebits_set_color_class(entry->obj_base, "Base FG", 100, 200, 255, 255);*/
}
- entry->clip_box = evas_add_rectangle(entry->evas);
- entry->text = evas_add_text(entry->evas, "borzoib", 8, "");
+ entry->clip_box = evas_object_rectangle_add(entry->evas);
+ entry->text = evas_object_text_add(entry->evas);
+ evas_object_text_font_set(entry->text, "borzoib", 8);
if (entry->obj_cursor)
ebits_set_clip(entry->obj_cursor, entry->clip_box);
if (entry->obj_selection)
ebits_set_clip(entry->obj_selection, entry->clip_box);
- entry->event_box = evas_add_rectangle(entry->evas);
- evas_set_color(entry->evas, entry->clip_box, 255, 255, 255, 255);
- evas_set_color(entry->evas, entry->event_box, 0, 0, 0, 0);
- evas_set_color(entry->evas, entry->text, 0, 0, 0, 255);
- evas_set_clip(entry->evas, entry->text, entry->clip_box);
- evas_set_clip(entry->evas, entry->event_box, entry->clip_box);
- evas_callback_add(entry->evas, entry->event_box, CALLBACK_MOUSE_DOWN,
+ entry->event_box = evas_object_rectangle_add(entry->evas);
+ evas_object_color_set(entry->clip_box, 255, 255, 255, 255);
+ evas_object_color_set(entry->event_box, 0, 0, 0, 0);
+ evas_object_color_set(entry->text, 0, 0, 0, 255);
+ evas_object_clip_set(entry->text, entry->clip_box);
+ evas_object_clip_set(entry->event_box, entry->clip_box);
+ /* checkme todo
+ evas_object_event_callback_add(entry->event_box, EVAS_CALLBACK_MOUSE_DOWN,
e_entry_down_cb, entry);
- evas_callback_add(entry->evas, entry->event_box, CALLBACK_MOUSE_UP,
+ evas_object_event_callback_add(entry->event_box, EVAS_CALLBACK_MOUSE_UP,
e_entry_up_cb, entry);
- evas_callback_add(entry->evas, entry->event_box, CALLBACK_MOUSE_MOVE,
+ evas_object_event_callback_add(entry->event_box, EVAS_CALLBACK_MOUSE_MOVE,
e_entry_move_cb, entry);
+ */
D_RETURN;
}
@@ -286,11 +301,11 @@
D_ENTER;
if (entry->event_box)
- evas_del_object(entry->evas, entry->event_box);
+ evas_object_del(entry->event_box);
if (entry->text)
- evas_del_object(entry->evas, entry->text);
+ evas_object_del(entry->text);
if (entry->clip_box)
- evas_del_object(entry->evas, entry->clip_box);
+ evas_object_del(entry->clip_box);
if (entry->obj_base)
ebits_free(entry->obj_base);
if (entry->obj_cursor)
@@ -330,12 +345,12 @@
ebits_move(entry->obj_base, entry->x, entry->y);
ebits_resize(entry->obj_base, entry->w, entry->h);
}
- evas_move(entry->evas, entry->clip_box, entry->x + p1l, entry->y + p1t);
- evas_resize(entry->evas, entry->clip_box, entry->w - p1l - p1r,
+ evas_object_move(entry->clip_box, entry->x + p1l, entry->y + p1t);
+ evas_object_resize(entry->clip_box, entry->w - p1l - p1r,
entry->h - p1t - p1b);
- evas_move(entry->evas, entry->event_box, entry->x + p1l + p2l,
+ evas_object_move(entry->event_box, entry->x + p1l + p2l,
entry->y + p1t + p2t);
- evas_resize(entry->evas, entry->event_box, entry->w - p1l - p1r - p2l - p2r,
+ evas_object_resize(entry->event_box, entry->w - p1l - p1r - p2l - p2r,
entry->h - p1t - p1b - p2t - p2b);
if ((entry->buffer) && (entry->buffer[0] != 0) && (entry->focused))
{
@@ -343,18 +358,30 @@
if (entry->cursor_pos < (int)strlen(entry->buffer))
{
+ /* checkme
evas_text_at(entry->evas, entry->text, entry->cursor_pos, &tx, &ty,
&tw, &th);
+ */
+ evas_object_text_char_pos_get(entry->text, entry->cursor_pos, &tx, &ty,
+ &tw, &th);
}
else
{
entry->cursor_pos = strlen(entry->buffer);
+ /* checkme
evas_text_at(entry->evas, entry->text, entry->cursor_pos - 1, &tx,
&ty, &tw, &th);
+ */
+ evas_object_text_char_pos_get(entry->text, entry->cursor_pos - 1, &tx,
+ &ty, &tw, &th);
tx += tw;
tw = entry->end_width;
}
+ /* check me
th = evas_get_text_height(entry->evas, entry->text);
+ */
+ th = evas_object_text_ascent_get(entry->text)+
+ evas_object_text_descent_get(entry->text);
if (tx + tw + entry->scroll_pos > entry->w - p1l - p1r)
entry->scroll_pos = entry->w - tx - tw - p1l - p1r - p1l - p2l;
else if (tx + entry->scroll_pos < p1l)
@@ -375,7 +402,11 @@
entry->scroll_pos = 0;
tw = 4;
tx = 0;
+ /* checkme
th = evas_get_text_height(entry->evas, entry->text);
+ */
+ th = evas_object_text_ascent_get(entry->text)+
+ evas_object_text_descent_get(entry->text);
if (entry->obj_cursor)
{
ebits_move(entry->obj_cursor,
@@ -391,27 +422,45 @@
if (entry->obj_cursor)
ebits_hide(entry->obj_cursor);
}
- evas_move(entry->evas, entry->text, entry->x + entry->scroll_pos + p1l + p2l,
+ evas_object_move(entry->text, entry->x + entry->scroll_pos + p1l + p2l,
entry->y + p1t + p2t);
if (entry->select.start >= 0)
{
double x1, y1, x2, tw, th;
+ /* checkme
evas_text_at(entry->evas, entry->text, entry->select.start, &x1, &y1,
NULL, NULL);
+ */
+ evas_object_text_char_pos_get(entry->text, entry->select.start, &x1, &y1,
+ NULL, NULL);
if (entry->select.start + entry->select.length <=
(int)strlen(entry->buffer))
+ {
+ /* checkme
evas_text_at(entry->evas, entry->text,
entry->select.start + entry->select.length - 1, &x2,
NULL, &tw, &th);
+ */
+ evas_object_text_char_pos_get(entry->text,
+ entry->select.start + entry->select.length - 1, &x2,
+ NULL, &tw, &th);
+ }
else
{
+ /* checkme
evas_text_at(entry->evas, entry->text,
entry->select.start + entry->select.length - 2, &x2,
NULL, &tw, &th);
+ */
+ evas_object_text_char_pos_get(entry->text,
+ entry->select.start + entry->select.length - 2, &x2,
+ NULL, &tw, &th);
tw += entry->end_width;
}
+ /* checkme todo
th = evas_get_text_height(entry->evas, entry->text);
+ */
if (entry->obj_selection)
{
ebits_move(entry->obj_selection,
@@ -598,7 +647,7 @@
}
void
-e_entry_set_evas(E_Entry * entry, Evas evas)
+e_entry_set_evas(E_Entry * entry, Evas * evas)
{
D_ENTER;
@@ -632,9 +681,9 @@
ebits_show(entry->obj_cursor);
if (entry->obj_selection)
ebits_show(entry->obj_selection);
- evas_show(entry->evas, entry->event_box);
- evas_show(entry->evas, entry->clip_box);
- evas_show(entry->evas, entry->text);
+ evas_object_show(entry->event_box);
+ evas_object_show(entry->clip_box);
+ evas_object_show(entry->text);
D_RETURN;
}
@@ -655,9 +704,9 @@
ebits_hide(entry->obj_cursor);
if (entry->obj_selection)
ebits_hide(entry->obj_selection);
- evas_hide(entry->evas, entry->event_box);
- evas_hide(entry->evas, entry->clip_box);
- evas_hide(entry->evas, entry->text);
+ evas_object_hide(entry->event_box);
+ evas_object_hide(entry->clip_box);
+ evas_object_hide(entry->text);
D_RETURN;
}
@@ -669,13 +718,13 @@
if (entry->obj_base)
ebits_raise(entry->obj_base);
- evas_raise(entry->evas, entry->clip_box);
- evas_raise(entry->evas, entry->text);
+ evas_object_raise(entry->clip_box);
+ evas_object_raise(entry->text);
if (entry->obj_selection)
ebits_raise(entry->obj_selection);
if (entry->obj_cursor)
ebits_raise(entry->obj_cursor);
- evas_raise(entry->evas, entry->event_box);
+ evas_object_raise(entry->event_box);
D_RETURN;
}
@@ -685,13 +734,13 @@
{
D_ENTER;
- evas_lower(entry->evas, entry->event_box);
+ evas_object_lower(entry->event_box);
if (entry->obj_cursor)
ebits_lower(entry->obj_cursor);
if (entry->obj_selection)
ebits_lower(entry->obj_selection);
- evas_lower(entry->evas, entry->text);
- evas_lower(entry->evas, entry->clip_box);
+ evas_object_lower(entry->text);
+ evas_object_lower(entry->clip_box);
if (entry->obj_base)
ebits_lower(entry->obj_base);
@@ -705,23 +754,23 @@
if (entry->obj_base)
ebits_set_layer(entry->obj_base, l);
- evas_set_layer(entry->evas, entry->clip_box, l);
- evas_set_layer(entry->evas, entry->text, l);
+ evas_object_layer_set(entry->clip_box, l);
+ evas_object_layer_set(entry->text, l);
if (entry->obj_selection)
ebits_set_layer(entry->obj_selection, l);
if (entry->obj_cursor)
ebits_set_layer(entry->obj_cursor, l);
- evas_set_layer(entry->evas, entry->event_box, l);
+ evas_object_layer_set(entry->event_box, l);
D_RETURN;
}
void
-e_entry_set_clip(E_Entry * entry, Evas_Object clip)
+e_entry_set_clip(E_Entry * entry, Evas_Object * clip)
{
D_ENTER;
- evas_set_clip(entry->evas, entry->clip_box, clip);
+ evas_object_clip_set(entry->clip_box, clip);
if (entry->obj_base)
ebits_set_clip(entry->obj_base, clip);
@@ -733,7 +782,7 @@
{
D_ENTER;
- evas_unset_clip(entry->evas, entry->clip_box);
+ evas_object_clip_unset(entry->clip_box);
if (entry->obj_base)
ebits_unset_clip(entry->obj_base);
@@ -779,12 +828,14 @@
if (entry->obj_cursor)
ebits_get_insets(entry->obj_cursor, &p2l, &p2r, &p2t, &p2b);
+ /* checkme todo
if (w)
*w =
evas_get_text_width(entry->evas, entry->text) + p1l + p1r + p2l + p2r;
if (h)
*h =
evas_get_text_height(entry->evas, entry->text) + p1t + p1b + p2t + p2b;
+ */
D_RETURN;
}
@@ -805,9 +856,11 @@
ebits_get_insets(entry->obj_cursor, &p2l, &p2r, &p2t, &p2b);
if (w)
*w = 8000;
+ /* checkme todo
if (h)
*h =
evas_get_text_height(entry->evas, entry->text) + p1t + p1b + p2t + p2b;
+ */
D_RETURN;
}
@@ -828,9 +881,11 @@
ebits_get_insets(entry->obj_cursor, &p2l, &p2r, &p2t, &p2b);
if (w)
*w = p1l + p1r + p2l + p2r + entry->min_size;
+ /* checkme todo
if (h)
*h =
evas_get_text_height(entry->evas, entry->text) + p1t + p1b + p2t + p2b;
+ */
D_RETURN;
}
@@ -889,7 +944,7 @@
IF_FREE(entry->buffer);
e_strdup(entry->buffer, text);
- evas_set_text(entry->evas, entry->text, entry->buffer);
+ evas_object_text_text_set(entry->text, entry->buffer);
if (entry->cursor_pos > (int)strlen(entry->buffer))
entry->cursor_pos = strlen(entry->buffer);
e_entry_configure(entry);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/entry.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -3 -r1.6 -r1.6.2.1
--- entry.h 3 Mar 2002 10:40:06 -0000 1.6
+++ entry.h 29 Jul 2002 01:17:57 -0000 1.6.2.1
@@ -7,7 +7,7 @@
struct _E_Entry
{
- Evas evas;
+ Evas * evas;
char *buffer;
int cursor_pos;
struct
@@ -24,9 +24,9 @@
Ebits_Object obj_base;
Ebits_Object obj_cursor;
Ebits_Object obj_selection;
- Evas_Object event_box;
- Evas_Object clip_box;
- Evas_Object text;
+ Evas_Object * event_box;
+ Evas_Object * clip_box;
+ Evas_Object * text;
Window paste_win;
Window selection_win;
int end_width;
@@ -52,13 +52,13 @@
E_Entry *e_entry_new(void);
void e_entry_handle_keypress(E_Entry * entry,
Ecore_Event_Key_Down * e);
-void e_entry_set_evas(E_Entry * entry, Evas evas);
+void e_entry_set_evas(E_Entry * entry, Evas * evas);
void e_entry_show(E_Entry * entry);
void e_entry_hide(E_Entry * entry);
void e_entry_raise(E_Entry * entry);
void e_entry_lower(E_Entry * entry);
void e_entry_set_layer(E_Entry * entry, int l);
-void e_entry_set_clip(E_Entry * entry, Evas_Object clip);
+void e_entry_set_clip(E_Entry * entry, Evas_Object * clip);
void e_entry_unset_clip(E_Entry * entry);
void e_entry_move(E_Entry * entry, int x, int y);
void e_entry_resize(E_Entry * entry, int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/exec.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -3 -r1.10 -r1.10.2.1
--- exec.c 3 Mar 2002 10:40:06 -0000 1.10
+++ exec.c 29 Jul 2002 01:17:57 -0000 1.10.2.1
@@ -15,7 +15,7 @@
void *func_data;
};
-static Evas_List hack_found_cb = NULL;
+static Evas_List * hack_found_cb = NULL;
void *
e_exec_broadcast_cb_add(void (*func) (Window win, void *_data), void *data)
@@ -42,7 +42,7 @@
void
e_exec_broadcast_e_hack_found(Window win)
{
- Evas_List l;
+ Evas_List * l;
for (l = hack_found_cb; l; l = l->next)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/file.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- file.c 3 Mar 2002 10:40:06 -0000 1.4
+++ file.c 29 Jul 2002 01:17:57 -0000 1.4.2.1
@@ -193,12 +193,12 @@
D_RETURN_(f);
}
-Evas_List
+Evas_List *
e_file_ls(char *dir)
{
DIR *dirp;
struct dirent *dp;
- Evas_List list;
+ Evas_List * list;
D_ENTER;
@@ -210,7 +210,7 @@
{
if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
{
- Evas_List l;
+ Evas_List * l;
char *f;
/* insertion sort */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/file.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- file.h 3 Mar 2002 10:40:06 -0000 1.4
+++ file.h 29 Jul 2002 01:17:57 -0000 1.4.2.1
@@ -35,6 +35,6 @@
int e_file_can_exec(struct stat *st);
char *e_file_readlink(char *link);
-Evas_List e_file_ls(char *dir);
+Evas_List * e_file_ls(char *dir);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/focus.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -3 -r1.5 -r1.5.2.1
--- focus.c 3 Mar 2002 10:40:06 -0000 1.5
+++ focus.c 29 Jul 2002 01:17:57 -0000 1.5.2.1
@@ -4,7 +4,7 @@
#include "e.h"
#include "util.h"
-static Evas_List focus_list = NULL;
+static Evas_List * focus_list = NULL;
void
e_focus_set_focus(E_Border * b)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/fs.c,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -3 -r1.28 -r1.28.2.1
--- fs.c 3 Mar 2002 10:40:06 -0000 1.28
+++ fs.c 29 Jul 2002 01:17:57 -0000 1.28.2.1
@@ -4,8 +4,8 @@
#include "util.h"
static EfsdConnection *ec = NULL;
-static Evas_List fs_handlers = NULL;
-static Evas_List fs_restart_handlers = NULL;
+static Evas_List * fs_handlers = NULL;
+static Evas_List * fs_restart_handlers = NULL;
static pid_t efsd_pid = 0;
static void e_fs_child_handle(Ecore_Event * ev);
@@ -80,7 +80,7 @@
if (efsd_next_event(ec, &ev) >= 0)
{
- Evas_List l;
+ Evas_List * l;
for (l = fs_handlers; l; l = l->next)
{
@@ -136,7 +136,7 @@
}
if (ec)
{
- Evas_List l;
+ Evas_List * l;
ecore_add_event_fd(efsd_get_connection_fd(ec), e_fs_fd_handle);
for (l = fs_restart_handlers; l; l = l->next)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/guides.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -3 -r1.12 -r1.12.2.1
--- guides.c 3 Mar 2002 10:40:06 -0000 1.12
+++ guides.c 29 Jul 2002 01:17:57 -0000 1.12.2.1
@@ -37,10 +37,10 @@
win;
struct
{
- Evas evas;
+ Evas * evas;
Ebits_Object bg;
E_Text *text;
- Evas_Object icon;
+ Evas_Object * icon;
Imlib_Image image;
}
disp;
@@ -81,6 +81,8 @@
D_RETURN;
redraw = 0;
+ /* checkme todo */
+#if 0
if (guides.prev.visible != guides.current.visible)
{
if (guides.current.visible)
@@ -540,6 +542,7 @@
}
}
guides.prev = guides.current;
+#endif
D_RETURN;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/main.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -3 -r1.33.2.1 -r1.33.2.2
--- main.c 26 Mar 2002 22:05:08 -0000 1.33.2.1
+++ main.c 29 Jul 2002 01:17:57 -0000 1.33.2.2
@@ -19,7 +19,7 @@
#include <X11/Xproto.h>
#ifdef E_PROF
-Evas_List __e_profiles = NULL;
+Evas_List * __e_profiles = NULL;
#endif
static void cb_exit(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/menu.c,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -3 -r1.33 -r1.33.2.1
--- menu.c 17 Mar 2002 22:08:33 -0000 1.33
+++ menu.c 29 Jul 2002 01:17:57 -0000 1.33.2.1
@@ -4,8 +4,8 @@
#include "util.h"
#include "math.h"
-static Evas_List open_menus = NULL; /* List of all open menus */
-static Evas_List menus = NULL;
+static Evas_List * open_menus = NULL; /* List of all open menus */
+static Evas_List * menus = NULL;
static E_Menu_Item *curr_selected_item = NULL; /* Currently selected item */
static Window menu_event_win = 0; /* Window which originated event */
static int screen_w, screen_h; /* Screen width and height */
@@ -28,7 +28,7 @@
static void
e_scroller_timer(int val, void *data)
{
- Evas_List l;
+ Evas_List * l;
int ok = 0;
int resist = 5;
int scroll_speed = 12;
@@ -142,7 +142,7 @@
static void
e_idle(void *data)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -240,7 +240,7 @@
ok = 1;
else
{
- Evas_List l;
+ Evas_List * l;
for (l = open_menus; l; l = l->next)
{
@@ -256,7 +256,7 @@
}
if (ok)
{
- Evas_List l;
+ Evas_List * l;
E_Menu *m = NULL;
E_Menu_Item *mi = NULL;
@@ -386,7 +386,7 @@
m = open_menus->data;
if ((e->time - m->time) > 200)
{
- Evas_List l;
+ Evas_List * l;
for (l = open_menus; l; l = l->next)
{
@@ -398,7 +398,7 @@
/* Get the dimensions of the selection for use in
* the test */
double s_x, s_y, s_w, s_h;
- evas_get_geometry(m->evas, m->selected->obj_entry,
+ evas_object_geometry_get(m->selected->obj_entry,
&s_x, &s_y, &s_w, &s_h);
if (INTERSECTS(m->current.x + rint(s_x),
m->current.y + rint(s_y),
@@ -443,7 +443,7 @@
keyboard_nav = 0;
if (e->win == menu_event_win)
{
- Evas_List l;
+ Evas_List * l;
mouse_x = e->rx;
mouse_y = e->ry;
@@ -452,13 +452,17 @@
E_Menu *m;
m = l->data;
- evas_event_move(m->evas,
+ /* checkme
+ evas_event_move(m->evas,
+ e->rx - m->current.x, e->ry - m->current.y);
+ */
+ evas_event_feed_mouse_move(m->evas,
e->rx - m->current.x, e->ry - m->current.y);
}
}
else
{
- Evas_List l;
+ Evas_List * l;
mouse_x = e->rx;
mouse_y = e->ry;
@@ -468,8 +472,12 @@
m = l->data;
+ /* checkme
evas_event_move(m->evas,
e->rx - m->current.x, e->ry - m->current.y);
+ */
+ evas_event_feed_mouse_move(m->evas,
+ e->rx - m->current.x, e->ry - m->current.y);
}
}
e_scroller_timer(0, NULL);
@@ -517,7 +525,7 @@
}
else
{
- Evas_List l;
+ Evas_List * l;
for (l = open_menus; l; l = l->next)
{
@@ -526,7 +534,7 @@
m = l->data;
if ((e->win == m->win.main) || (e->win == m->win.evas))
{
- evas_event_move(m->evas, -99999999, -99999999);
+ evas_event_feed_mouse_move(m->evas, -99999999, -99999999);
}
}
}
@@ -548,7 +556,7 @@
e = ev->event;
{
- Evas_List l;
+ Evas_List * l;
for (l = open_menus; l; l = l->next)
{
@@ -558,7 +566,10 @@
if (e->win == m->win.evas)
{
m->first_expose = 1;
+ /* checkme
evas_update_rect(m->evas, e->x, e->y, e->w, e->h);
+ */
+ evas_damage_rectangle_add(m->evas, e->x, e->y, e->w, e->h);
break;
}
}
@@ -625,9 +636,10 @@
* @y: ?????
*/
static void
-e_menu_item_in_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+e_menu_item_in_cb(void *_data, Evas * _e, Evas_Object * _o, void *ev_info)
{
E_Menu_Item *mi;
+ Evas_Event_Mouse_In *event_info = ev_info;
D_ENTER;
@@ -645,9 +657,6 @@
D_RETURN;
UN(_e);
UN(_o);
- UN(_b);
- UN(_x);
- UN(_y);
}
/**
@@ -662,9 +671,10 @@
* @y: ?????
*/
static void
-e_menu_item_out_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
+e_menu_item_out_cb(void *_data, Evas * _e, Evas_Object * _o, void *ev_info)
{
E_Menu_Item *mi;
+ Evas_Event_Mouse_Out *event_info = ev_info;
D_ENTER;
@@ -674,9 +684,6 @@
D_RETURN;
UN(_e);
UN(_o);
- UN(_b);
- UN(_x);
- UN(_y);
}
void
@@ -721,7 +728,7 @@
void
e_menu_hide_submenus(E_Menu * menus_after)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -756,7 +763,7 @@
void
e_menu_select(int dx, int dy)
{
- Evas_List l, ll;
+ Evas_List *l, *ll;
int done = 0;
D_ENTER;
@@ -852,7 +859,7 @@
/* Moving out of a submenu: */
if (dx < 0)
{
- Evas_List ll;
+ Evas_List * ll;
mm = l->prev->data;
for (ll = mm->entries; (ll) && (!mi); ll = ll->next)
@@ -962,7 +969,7 @@
ecore_window_raise(menu_event_win);
if ((!ecore_grab_window_get()) || (!ecore_keyboard_grab_window_get()))
{
- Evas_List l;
+ Evas_List * l;
for (l = menus; l; l = l->next)
{
@@ -1209,7 +1216,7 @@
static void
e_menu_cleanup(E_Menu * m)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -1257,7 +1264,7 @@
e_object_init(E_OBJECT(m), (E_Cleanup_Func) e_menu_cleanup);
m->win.main = ecore_window_override_new(0, 0, 0, 1, 1);
- m->evas = evas_new_all(ecore_display_get(),
+ m->evas = e_evas_new_all(ecore_display_get(),
m->win.main,
0, 0, 1, 1,
RENDER_METHOD_ALPHA_SOFTWARE,
@@ -1276,9 +1283,9 @@
/* screen - an then re-render it all - but well.. it's an extreme and */
/* for now i think people will just have to live with a maximum menu size */
/* of 32768x32768... didums! */
- evas_event_move(m->evas, -999999999, -99999999);
+ evas_event_feed_mouse_move(m->evas, -999999999, -99999999);
- m->win.evas = evas_get_window(m->evas);
+ m->win.evas = e_evas_get_window(m->evas);
ecore_window_set_events(m->win.evas,
XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT
| XEV_KEY);
@@ -1420,7 +1427,7 @@
th = 0;
if (mi->obj_text)
{
- evas_get_geometry(m->evas, mi->obj_text, NULL, NULL, &dtw, &dth);
+ evas_object_geometry_get(mi->obj_text, NULL, NULL, &dtw, &dth);
tw = (int)dtw;
th = (int)dth;
}
@@ -1433,7 +1440,7 @@
{
int sh;
- evas_get_image_size(m->evas, mi->obj_icon, &iw, &ih);
+ evas_object_image_size_get(mi->obj_icon, &iw, &ih);
sh = th;
if (rh > th)
sh = rh;
@@ -1446,10 +1453,10 @@
ix = rx + m->size.state + m->pad.state;
ix += ((m->size.icon - iw) / 2);
iy = ((mi->size.h - ih) / 2);
- evas_move(m->evas, mi->obj_icon, m->sel_border.l + mi->x + ix,
+ evas_object_move(mi->obj_icon, m->sel_border.l + mi->x + ix,
m->sel_border.t + mi->y + iy);
- evas_resize(m->evas, mi->obj_icon, iw, ih);
- evas_set_image_fill(m->evas, mi->obj_icon, 0, 0, iw, ih);
+ evas_object_resize(mi->obj_icon, iw, ih);
+ evas_object_image_fill_set(mi->obj_icon, 0, 0, iw, ih);
}
if (mi->obj_text)
@@ -1459,14 +1466,14 @@
if (m->size.icon)
tx += m->size.icon + m->pad.icon;
ty = ((mi->size.h - th) / 2);
- evas_move(m->evas, mi->obj_text, m->sel_border.l + mi->x + tx,
+ evas_object_move(mi->obj_text, m->sel_border.l + mi->x + tx,
m->sel_border.t + mi->y + ty);
}
if (mi->obj_entry)
{
- evas_move(m->evas, mi->obj_entry, mi->x, mi->y);
- evas_resize(m->evas, mi->obj_entry,
+ evas_object_move(mi->obj_entry, mi->x, mi->y);
+ evas_object_resize(mi->obj_entry,
mi->size.w + m->sel_border.l + m->sel_border.r,
mi->size.h + m->sel_border.t + m->sel_border.b);
}
@@ -1490,13 +1497,13 @@
IF_FREE(mi->bg_file);
mi->bg_file = NULL;
if (mi->obj_entry)
- evas_del_object(m->evas, mi->obj_entry);
+ evas_object_del(mi->obj_entry);
mi->obj_entry = NULL;
if (mi->obj_text)
- evas_del_object(m->evas, mi->obj_text);
+ evas_object_del(mi->obj_text);
mi->obj_text = NULL;
if (mi->obj_icon)
- evas_del_object(m->evas, mi->obj_icon);
+ evas_object_del(mi->obj_icon);
mi->obj_icon = NULL;
if (mi->state)
ebits_free(mi->state);
@@ -1528,29 +1535,32 @@
{
if (mi->str)
{
- mi->obj_text = evas_add_text(m->evas, "borzoib", 8, mi->str);
- evas_set_color(m->evas, mi->obj_text, 0, 0, 0, 255);
- evas_show(m->evas, mi->obj_text);
- evas_set_layer(m->evas, mi->obj_text, 10);
+ mi->obj_text = evas_object_text_add(m->evas);
+ evas_object_text_font_set(mi->obj_text, "borzoib", 8);
+ evas_object_text_text_set(mi->obj_text, mi->str);
+ evas_object_color_set(mi->obj_text, 0, 0, 0, 255);
+ evas_object_show(mi->obj_text);
+ evas_object_layer_set(mi->obj_text, 10);
}
if (mi->icon)
{
- mi->obj_icon = evas_add_image_from_file(m->evas, mi->icon);
- evas_show(m->evas, mi->obj_icon);
- evas_set_layer(m->evas, mi->obj_icon, 10);
- }
- mi->obj_entry = evas_add_rectangle(m->evas);
- evas_set_layer(m->evas, mi->obj_entry, 11);
- evas_set_color(m->evas, mi->obj_entry, 0, 0, 0, 0);
- evas_show(m->evas, mi->obj_entry);
+ mi->obj_icon = evas_object_image_add(m->evas);
+ evas_object_image_file_set(mi->obj_icon, mi->icon, NULL);
+ evas_object_show(mi->obj_icon);
+ evas_object_layer_set(mi->obj_icon, 10);
+ }
+ mi->obj_entry = evas_object_rectangle_add(m->evas);
+ evas_object_layer_set(mi->obj_entry, 11);
+ evas_object_color_set(mi->obj_entry, 0, 0, 0, 0);
+ evas_object_show(mi->obj_entry);
tw = 0;
th = 0;
if (mi->obj_text)
- evas_get_geometry(m->evas, mi->obj_text, NULL, NULL, &tw, &th);
+ evas_object_geometry_get(mi->obj_text, NULL, NULL, &tw, &th);
iw = 0;
ih = 0;
if (mi->obj_icon)
- evas_get_image_size(m->evas, mi->obj_icon, &iw, &ih);
+ evas_object_image_size_get(mi->obj_icon, &iw, &ih);
rw = 0;
rh = 0;
if (mi->state)
@@ -1561,9 +1571,10 @@
if (((!mi->scale_icon) && (ih > th)) || ((!mi->str) && (ih > th)))
th = (double)ih;
mi->size.min.h = (int)th;
- evas_callback_add(m->evas, mi->obj_entry, CALLBACK_MOUSE_IN,
+ /* checkme todo */
+ evas_object_event_callback_add(mi->obj_entry, EVAS_CALLBACK_MOUSE_IN,
e_menu_item_in_cb, mi);
- evas_callback_add(m->evas, mi->obj_entry, CALLBACK_MOUSE_OUT,
+ evas_object_event_callback_add(mi->obj_entry, EVAS_CALLBACK_MOUSE_OUT,
e_menu_item_out_cb, mi);
e_menu_set_sel(m, mi);
if ((mi->radio) || (mi->check))
@@ -1595,17 +1606,17 @@
D_ENTER;
/* obscure stuff outside the screen boundaries - optimizes rendering */
- evas_clear_obscured_rects(m->evas);
- evas_add_obscured_rect(m->evas,
+ evas_obscured_clear(m->evas);
+ evas_obscured_rectangle_add(m->evas,
-m->current.x - 100000,
-m->current.y - 100000, 200000 + screen_w, 100000);
- evas_add_obscured_rect(m->evas,
+ evas_obscured_rectangle_add(m->evas,
-m->current.x - 100000,
-m->current.y - 100000, 100000, 200000 + screen_h);
- evas_add_obscured_rect(m->evas,
+ evas_obscured_rectangle_add(m->evas,
-m->current.x - 100000,
screen_h - m->current.y, 200000 + screen_w, 100000);
- evas_add_obscured_rect(m->evas,
+ evas_obscured_rectangle_add(m->evas,
screen_w - m->current.x,
-m->current.y - 100000, 100000, 200000 + screen_h);
@@ -1615,7 +1626,7 @@
void
e_menu_scroll_all_by(int dx, int dy)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -1638,7 +1649,7 @@
E_Menu *m;
m = l->data;
- evas_event_move(m->evas,
+ evas_event_feed_mouse_move(m->evas,
mouse_x - m->current.x, mouse_y - m->current.y);
}
}
@@ -1696,7 +1707,7 @@
if (m->recalc_entries)
{
- Evas_List l;
+ Evas_List * l;
int max_w, max_h;
int i;
@@ -1725,12 +1736,12 @@
tw = 0;
th = 0;
if (mi->obj_text)
- evas_get_geometry(m->evas, mi->obj_text, NULL, NULL, &tw,
+ evas_object_geometry_get(mi->obj_text, NULL, NULL, &tw,
&th);
iw = 0;
ih = 0;
if (mi->obj_icon)
- evas_get_image_size(m->evas, mi->obj_icon, &iw, &ih);
+ evas_object_image_size_get(mi->obj_icon, &iw, &ih);
rw = 0;
rh = 0;
if (mi->state)
@@ -1791,7 +1802,7 @@
}
if (m->redo_sel)
{
- Evas_List l;
+ Evas_List * l;
for (l = m->entries; l; l = l->next)
{
@@ -1839,8 +1850,8 @@
if (size_changed)
{
ecore_window_resize(m->win.evas, m->current.w, m->current.h);
- evas_set_output_size(m->evas, m->current.w, m->current.h);
- evas_set_output_viewport(m->evas, 0, 0, m->current.w, m->current.h);
+ evas_output_size_set(m->evas, m->current.w, m->current.h);
+ evas_output_viewport_set(m->evas, 0, 0, m->current.w, m->current.h);
if (m->bg)
ebits_resize(m->bg, m->current.w, m->current.h);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/menu.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -3 -r1.6 -r1.6.2.1
--- menu.h 3 Mar 2002 10:40:06 -0000 1.6
+++ menu.h 29 Jul 2002 01:17:57 -0000 1.6.2.1
@@ -27,9 +27,9 @@
Window main, evas;
}
win;
- Evas evas;
- Ebits_Object bg;
- Evas_List entries;
+ Evas * evas;
+ Ebits_Object * bg;
+ Evas_List * entries;
char *bg_file;
int first_expose;
@@ -77,13 +77,13 @@
char *bg_file;
int selected;
- Evas_Object obj_entry;
+ Evas_Object * obj_entry;
char *str;
- Evas_Object obj_text;
+ Evas_Object * obj_text;
char *icon;
- Evas_Object obj_icon;
+ Evas_Object * obj_icon;
int scale_icon;
Ebits_Object state;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/menubuild.c,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -3 -r1.18.2.2 -r1.18.2.3
--- menubuild.c 27 Mar 2002 18:39:04 -0000 1.18.2.2
+++ menubuild.c 29 Jul 2002 01:17:57 -0000 1.18.2.3
@@ -7,7 +7,7 @@
#include "border.h"
#include "observer.h"
-Evas_List build_menus = NULL;
+Evas_List * build_menus = NULL;
static void e_build_menu_cb_exec(E_Menu * m, E_Menu_Item * mi,
void *data);
@@ -81,7 +81,7 @@
static void
e_build_menu_unbuild(E_Build_Menu * bm)
{
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -271,7 +271,7 @@
e_build_menu_gnome_apps_build_dir(E_Build_Menu * bm, char *dir)
{
E_Menu *menu = NULL;
- Evas_List l, entries = NULL;
+ Evas_List *l, *entries = NULL;
D_ENTER;
@@ -282,7 +282,7 @@
{
FILE *f;
char buf[PATH_MAX];
- Evas_List dirlist = NULL;
+ Evas_List * dirlist = NULL;
/* read .order file */
snprintf(buf, PATH_MAX, "%s/.order", dir);
@@ -313,7 +313,7 @@
/* if it isnt a "dot" file or dir */
if (s[0] != '.')
{
- Evas_List ll;
+ Evas_List * ll;
int have_it;
have_it = 0;
@@ -527,7 +527,7 @@
e_build_menu_new_from_iconified_borders()
{
E_Build_Menu *bm;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
@@ -535,9 +535,12 @@
ZERO(bm, E_Build_Menu, 1);
/* e_observer_init(E_OBSERVER(bm), E_EVENT_BORDER_ICONIFY | E_EVENT_BORDER_UNICONIFY | E_EVENT_BORDER_NEW, e_build_menu_iconified_borders_changed, (E_Cleanup_Func) e_build_menu_cleanup);*/
+
+/* checkme todo
e_observer_init(E_OBSERVER(bm), E_EVENT_BORDER_ALL,
e_build_menu_iconified_borders_changed,
(E_Cleanup_Func) e_build_menu_cleanup);
+*/
for (l = e_border_get_borders_list(); l; l = l->next)
{
@@ -599,7 +602,7 @@
e_build_menu_iconified_borders_build(E_Build_Menu * bm)
{
E_Menu *menu = NULL;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/menubuild.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -3 -r1.7 -r1.7.2.1
--- menubuild.h 3 Mar 2002 10:40:06 -0000 1.7
+++ menubuild.h 29 Jul 2002 01:17:57 -0000 1.7.2.1
@@ -16,8 +16,8 @@
E_Menu *menu;
- Evas_List menus;
- Evas_List commands;
+ Evas_List * menus;
+ Evas_List * commands;
int changed;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/observer.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -3 -r1.6 -r1.6.2.1
--- observer.c 10 Mar 2002 17:23:42 -0000 1.6
+++ observer.c 29 Jul 2002 01:17:57 -0000 1.6.2.1
@@ -3,7 +3,7 @@
#include "debug.h"
#include "observer.h"
-static Evas_List observers;
+static Evas_List * observers;
void
e_observer_init(E_Observer * obs, E_Event_Type event,
@@ -97,7 +97,7 @@
void
e_observee_notify_observers(E_Observee * o, E_Event_Type event, void *data)
{
- Evas_List obs_list = NULL;
+ Evas_List * obs_list = NULL;
E_Observer *obs = NULL;
D_ENTER;
@@ -122,7 +122,7 @@
void
e_observee_notify_all_observers(E_Observee * o, E_Event_Type event, void *data)
{
- Evas_List obs_list = NULL;
+ Evas_List * obs_list = NULL;
E_Observer *obs = NULL;
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/observer.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -3 -r1.8 -r1.8.2.1
--- observer.h 10 Mar 2002 17:23:42 -0000 1.8
+++ observer.h 29 Jul 2002 01:17:57 -0000 1.8.2.1
@@ -60,7 +60,7 @@
{
E_Object obj;
- Evas_List watched; /* list<E_Observee> */
+ Evas_List * watched; /* list<E_Observee> */
E_Event_Type event;
E_Notify_Func notify_func;
};
@@ -69,7 +69,7 @@
{
E_Object obj;
- Evas_List observers; /* list<E_Observer> */
+ Evas_List * observers; /* list<E_Observer> */
};
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/place.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -3 -r1.10 -r1.10.2.1
--- place.c 3 Mar 2002 10:40:06 -0000 1.10
+++ place.c 29 Jul 2002 01:17:57 -0000 1.10.2.1
@@ -122,7 +122,7 @@
int w, h;
int a_w = 0, a_h = 0;
int *a_x = NULL, *a_y = NULL;
- Evas_List l;
+ Evas_List * l;
D_ENTER;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/resist.c,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -3 -r1.13.2.1 -r1.13.2.2
--- resist.c 26 Mar 2002 22:05:08 -0000 1.13.2.1
+++ resist.c 29 Jul 2002 01:17:57 -0000 1.13.2.2
@@ -14,7 +14,7 @@
/* int ok = 0; */
int dx, dy, d;
int resist_x = 0, resist_y = 0;
- Evas_List l, rects = NULL;
+ Evas_List *l, *rects = NULL;
E_Rect *r;
E_CFG_INT(cfg_resist, "settings", "/move/resist", 1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/text.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -3 -r1.9 -r1.9.2.1
--- text.c 3 Mar 2002 10:40:07 -0000 1.9
+++ text.c 29 Jul 2002 01:17:57 -0000 1.9.2.1
@@ -3,7 +3,7 @@
#include "util.h"
E_Text *
-e_text_new(Evas evas, char *text, char *class)
+e_text_new(Evas * evas, char *text, char *class)
{
E_Text *t;
@@ -21,32 +21,53 @@
else
t->text = strdup("");
t->evas = evas;
- t->obj.o1 = evas_add_text(t->evas, "borzoib", 8, t->text);
- t->obj.o2 = evas_add_text(t->evas, "borzoib", 8, t->text);
- t->obj.o3 = evas_add_text(t->evas, "borzoib", 8, t->text);
- t->obj.o4 = evas_add_text(t->evas, "borzoib", 8, t->text);
- t->obj.text = evas_add_text(t->evas, "borzoib", 8, t->text);
- evas_set_pass_events(t->evas, t->obj.o1, 1);
- evas_set_pass_events(t->evas, t->obj.o2, 1);
- evas_set_pass_events(t->evas, t->obj.o3, 1);
- evas_set_pass_events(t->evas, t->obj.o4, 1);
- evas_set_pass_events(t->evas, t->obj.text, 1);
- evas_set_color(t->evas, t->obj.o1, 0, 0, 0, 255);
- evas_set_color(t->evas, t->obj.o2, 0, 0, 0, 255);
- evas_set_color(t->evas, t->obj.o3, 0, 0, 0, 255);
- evas_set_color(t->evas, t->obj.o4, 0, 0, 0, 255);
- evas_set_color(t->evas, t->obj.text, 255, 255, 255, 255);
- evas_move(t->evas, t->obj.o1, t->x + 1, t->y);
- evas_move(t->evas, t->obj.o2, t->x, t->y + 1);
- evas_move(t->evas, t->obj.o3, t->x + 2, t->y + 1);
- evas_move(t->evas, t->obj.o4, t->x + 1, t->y + 2);
- evas_move(t->evas, t->obj.text, t->x + 1, t->y + 1);
+ t->obj.o1 = evas_object_text_add(t->evas);
+ evas_object_text_font_set(t->obj.o1, "borzoib", 8);
+ evas_object_text_text_set(t->obj.o1, t->text);
+
+ t->obj.o2 = evas_object_text_add(t->evas);
+ evas_object_text_font_set(t->obj.o2, "borzoib", 8);
+ evas_object_text_text_set(t->obj.o2, t->text);
+
+ t->obj.o3 = evas_object_text_add(t->evas);
+ evas_object_text_font_set(t->obj.o3, "borzoib", 8);
+ evas_object_text_text_set(t->obj.o3, t->text);
+
+ t->obj.o4 = evas_object_text_add(t->evas);
+ evas_object_text_font_set(t->obj.o4, "borzoib", 8);
+ evas_object_text_text_set(t->obj.o4, t->text);
+
+ t->obj.text = evas_object_text_add(t->evas);
+ evas_object_text_font_set(t->obj.text, "borzoib", 8);
+ evas_object_text_text_set(t->obj.text, t->text);
+
+ evas_object_pass_events_set(t->obj.o1, 1);
+ evas_object_pass_events_set(t->obj.o2, 1);
+ evas_object_pass_events_set(t->obj.o3, 1);
+ evas_object_pass_events_set(t->obj.o4, 1);
+ evas_object_pass_events_set(t->obj.text, 1);
+ evas_object_color_set(t->obj.o1, 0, 0, 0, 255);
+ evas_object_color_set(t->obj.o2, 0, 0, 0, 255);
+ evas_object_color_set(t->obj.o3, 0, 0, 0, 255);
+ evas_object_color_set(t->obj.o4, 0, 0, 0, 255);
+ evas_object_color_set(t->obj.text, 255, 255, 255, 255);
+ evas_object_move(t->obj.o1, t->x + 1, t->y);
+ evas_object_move(t->obj.o2, t->x, t->y + 1);
+ evas_object_move(t->obj.o3, t->x + 2, t->y + 1);
+ evas_object_move(t->obj.o4, t->x + 1, t->y + 2);
+ evas_object_move(t->obj.text, t->x + 1, t->y + 1);
t->color.r = 255;
t->color.g = 255;
t->color.b = 255;
t->color.a = 255;
+ /* checkme
t->w = evas_get_text_width(t->evas, t->obj.text) + 2;
t->h = evas_get_text_height(t->evas, t->obj.text) + 2;
+ */
+ evas_object_geometry_get(t->obj.text, NULL, NULL, &t->w, &t->h);
+ t->w += 2;
+ t->h += 2;
+
t->min.w = t->w + 2;
t->min.h = t->h + 2;
t->max.w = t->w + 2;
@@ -66,11 +87,11 @@
if ((t->evas) && (t->obj.text))
{
- evas_del_object(t->evas, t->obj.o1);
- evas_del_object(t->evas, t->obj.o2);
- evas_del_object(t->evas, t->obj.o3);
- evas_del_object(t->evas, t->obj.o4);
- evas_del_object(t->evas, t->obj.text);
+ evas_object_del(t->obj.o1);
+ evas_object_del(t->obj.o2);
+ evas_object_del(t->obj.o3);
+ evas_object_del(t->obj.o4);
+ evas_object_del(t->obj.text);
}
FREE(t);
@@ -88,13 +109,19 @@
D_RETURN;
FREE(t->text);
t->text = strdup(text);
- evas_set_text(t->evas, t->obj.o1, t->text);
- evas_set_text(t->evas, t->obj.o2, t->text);
- evas_set_text(t->evas, t->obj.o3, t->text);
- evas_set_text(t->evas, t->obj.o4, t->text);
- evas_set_text(t->evas, t->obj.text, t->text);
+ evas_object_text_text_set(t->obj.o1, t->text);
+ evas_object_text_text_set(t->obj.o2, t->text);
+ evas_object_text_text_set(t->obj.o3, t->text);
+ evas_object_text_text_set(t->obj.o4, t->text);
+ evas_object_text_text_set(t->obj.text, t->text);
+ /* checkme
t->w = evas_get_text_width(t->evas, t->obj.text) + 2;
t->h = evas_get_text_height(t->evas, t->obj.text) + 2;
+ */
+ evas_object_geometry_get(t->obj.text, NULL, NULL, &t->w, &t->h);
+ t->w += 2;
+ t->h += 2;
+
t->min.w = t->w + 2;
t->min.h = t->h + 2;
t->max.w = t->w + 2;
@@ -111,25 +138,25 @@
if (t->layer == l)
D_RETURN;
t->layer = l;
- evas_set_layer(t->evas, t->obj.o1, t->layer);
- evas_set_layer(t->evas, t->obj.o2, t->layer);
- evas_set_layer(t->evas, t->obj.o3, t->layer);
- evas_set_layer(t->evas, t->obj.o4, t->layer);
- evas_set_layer(t->evas, t->obj.text, t->layer);
+ evas_object_layer_set(t->obj.o1, t->layer);
+ evas_object_layer_set(t->obj.o2, t->layer);
+ evas_object_layer_set(t->obj.o3, t->layer);
+ evas_object_layer_set(t->obj.o4, t->layer);
+ evas_object_layer_set(t->obj.text, t->layer);
D_RETURN;
}
void
-e_text_set_clip(E_Text * t, Evas_Object clip)
+e_text_set_clip(E_Text * t, Evas_Object * clip)
{
D_ENTER;
- evas_set_clip(t->evas, t->obj.o1, clip);
- evas_set_clip(t->evas, t->obj.o2, clip);
- evas_set_clip(t->evas, t->obj.o3, clip);
- evas_set_clip(t->evas, t->obj.o4, clip);
- evas_set_clip(t->evas, t->obj.text, clip);
+ evas_object_clip_set(t->obj.o1, clip);
+ evas_object_clip_set(t->obj.o2, clip);
+ evas_object_clip_set(t->obj.o3, clip);
+ evas_object_clip_set(t->obj.o4, clip);
+ evas_object_clip_set(t->obj.text, clip);
D_RETURN;
}
@@ -139,11 +166,11 @@
{
D_ENTER;
- evas_unset_clip(t->evas, t->obj.o1);
- evas_unset_clip(t->evas, t->obj.o2);
- evas_unset_clip(t->evas, t->obj.o3);
- evas_unset_clip(t->evas, t->obj.o4);
- evas_unset_clip(t->evas, t->obj.text);
+ evas_object_clip_unset(t->obj.o1);
+ evas_object_clip_unset(t->obj.o2);
+ evas_object_clip_unset(t->obj.o3);
+ evas_object_clip_unset(t->obj.o4);
+ evas_object_clip_unset(t->obj.text);
D_RETURN;
}
@@ -153,11 +180,11 @@
{
D_ENTER;
- evas_raise(t->evas, t->obj.o1);
- evas_raise(t->evas, t->obj.o2);
- evas_raise(t->evas, t->obj.o3);
- evas_raise(t->evas, t->obj.o4);
- evas_raise(t->evas, t->obj.text);
+ evas_object_raise(t->obj.o1);
+ evas_object_raise(t->obj.o2);
+ evas_object_raise(t->obj.o3);
+ evas_object_raise(t->obj.o4);
+ evas_object_raise(t->obj.text);
D_RETURN;
}
@@ -167,11 +194,11 @@
{
D_ENTER;
- evas_lower(t->evas, t->obj.text);
- evas_lower(t->evas, t->obj.o4);
- evas_lower(t->evas, t->obj.o3);
- evas_lower(t->evas, t->obj.o2);
- evas_lower(t->evas, t->obj.o1);
+ evas_object_lower(t->obj.text);
+ evas_object_lower(t->obj.o4);
+ evas_object_lower(t->obj.o3);
+ evas_object_lower(t->obj.o2);
+ evas_object_lower(t->obj.o1);
D_RETURN;
}
@@ -184,11 +211,11 @@
if (t->visible)
D_RETURN;
t->visible = 1;
- evas_show(t->evas, t->obj.o1);
- evas_show(t->evas, t->obj.o2);
- evas_show(t->evas, t->obj.o3);
- evas_show(t->evas, t->obj.o4);
- evas_show(t->evas, t->obj.text);
+ evas_object_show(t->obj.o1);
+ evas_object_show(t->obj.o2);
+ evas_object_show(t->obj.o3);
+ evas_object_show(t->obj.o4);
+ evas_object_show(t->obj.text);
D_RETURN;
}
@@ -201,11 +228,11 @@
if (!t->visible)
D_RETURN;
t->visible = 0;
- evas_hide(t->evas, t->obj.o1);
- evas_hide(t->evas, t->obj.o2);
- evas_hide(t->evas, t->obj.o3);
- evas_hide(t->evas, t->obj.o4);
- evas_hide(t->evas, t->obj.text);
+ evas_object_hide(t->obj.o1);
+ evas_object_hide(t->obj.o2);
+ evas_object_hide(t->obj.o3);
+ evas_object_hide(t->obj.o4);
+ evas_object_hide(t->obj.text);
D_RETURN;
}
@@ -222,7 +249,7 @@
t->color.g = g;
t->color.b = b;
t->color.a = a;
- evas_set_color(t->evas, t->obj.text, t->color.r, t->color.g, t->color.b,
+ evas_object_color_set(t->obj.text, t->color.r, t->color.g, t->color.b,
t->color.a);
D_RETURN;
@@ -237,11 +264,11 @@
D_RETURN;
t->x = x;
t->y = y;
- evas_move(t->evas, t->obj.o1, t->x + 1, t->y);
- evas_move(t->evas, t->obj.o2, t->x, t->y + 1);
- evas_move(t->evas, t->obj.o3, t->x + 2, t->y + 1);
- evas_move(t->evas, t->obj.o4, t->x + 1, t->y + 2);
- evas_move(t->evas, t->obj.text, t->x + 1, t->y + 1);
+ evas_object_move(t->obj.o1, t->x + 1, t->y);
+ evas_object_move(t->obj.o2, t->x, t->y + 1);
+ evas_object_move(t->obj.o3, t->x + 2, t->y + 1);
+ evas_object_move(t->obj.o4, t->x + 1, t->y + 2);
+ evas_object_move(t->obj.text, t->x + 1, t->y + 1);
D_RETURN;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/text.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- text.h 3 Mar 2002 10:40:07 -0000 1.4
+++ text.h 29 Jul 2002 01:17:57 -0000 1.4.2.1
@@ -25,23 +25,23 @@
color;
int layer;
- Evas evas;
+ Evas * evas;
struct
{
- Evas_Object text;
- Evas_Object o1;
- Evas_Object o2;
- Evas_Object o3;
- Evas_Object o4;
+ Evas_Object * text;
+ Evas_Object * o1;
+ Evas_Object * o2;
+ Evas_Object * o3;
+ Evas_Object * o4;
}
obj;
};
-E_Text *e_text_new(Evas evas, char *text, char *class);
+E_Text *e_text_new(Evas * evas, char *text, char *class);
void e_text_free(E_Text * t);
void e_text_set_text(E_Text * t, char *text);
void e_text_set_layer(E_Text * t, int l);
-void e_text_set_clip(E_Text * t, Evas_Object clip);
+void e_text_set_clip(E_Text * t, Evas_Object * clip);
void e_text_unset_clip(E_Text * t);
void e_text_raise(E_Text * t);
void e_text_lower(E_Text * t);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/util.c,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -3 -r1.25 -r1.25.2.1
--- util.c 3 Mar 2002 10:40:07 -0000 1.25
+++ util.c 29 Jul 2002 01:17:57 -0000 1.25.2.1
@@ -1,5 +1,7 @@
#include "debug.h"
#include "util.h"
+#include "Evas.h"
+#include "Evas_Engine_Software_X11.h"
void
e_util_set_env(char *variable, char *content)
@@ -101,4 +103,73 @@
D_RETURN_(NULL);
D_RETURN_(wk);
+}
+
+
+Evas *
+e_evas_new_all(Display *disp, Window parent_window,
+ int x, int y, int win_w, int win_h,
+ int render,
+ int max_colors, int fc, int ic,
+ char *font_dir)
+{
+ Evas *e;
+
+ e = evas_new();
+ evas_output_method_set(e, evas_render_method_lookup("software_x11"));
+ evas_output_size_set(e, win_w, win_h);
+ evas_output_viewport_set(e, 0, 0, win_w, win_h);
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+ XSetWindowAttributes att;
+ Window window;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(e);
+
+ /* the following is specific to the engine */
+ einfo->info.display = disp;
+ einfo->info.visual = DefaultVisual(disp, DefaultScreen(disp));
+ einfo->info.colormap = DefaultColormap(disp, DefaultScreen(disp));
+
+ att.background_pixmap = None;
+ att.colormap = /*colormap*/ DefaultColormap(disp, DefaultScreen(disp));
+ att.border_pixel = 0;
+ att.event_mask = 0;
+ window = XCreateWindow(disp,
+ parent_window,
+ x, y, win_w, win_h, 0,
+ DefaultDepth(disp, DefaultScreen(disp)),
+ /*imlib_get_visual_depth(display, visual),*/
+ InputOutput,
+ einfo->info.visual,
+ CWColormap | CWBorderPixel | CWEventMask | CWBackPixmap,
+ &att);
+
+ einfo->info.drawable = window /*win*/;
+ einfo->info.depth = DefaultDepth(disp, DefaultScreen(disp));
+ einfo->info.rotation = 0;
+ einfo->info.debug = 0;
+ evas_engine_info_set(e, (Evas_Engine_Info *) einfo);
+ }
+
+ evas_object_image_cache_set(e, 0);
+ evas_object_font_cache_set(e, 0);
+ evas_object_font_path_append(e, font_dir);
+
+ return e;
+}
+
+
+Window
+e_evas_get_window(Evas *evas)
+{
+ Window win;
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ /* the following is specific to the engine */
+ win = einfo->info.drawable;
+
+ return win;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/util.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -3 -r1.7 -r1.7.2.1
--- util.h 3 Mar 2002 10:40:07 -0000 1.7
+++ util.h 29 Jul 2002 01:17:57 -0000 1.7.2.1
@@ -8,6 +8,15 @@
void *e_util_memdup(void *data, int size);
int e_util_glob_matches(char *str, char *glob);
char *e_util_de_url_and_verify(const char *fi);
+Window e_evas_get_window(Evas *evas);
+Evas *
+e_evas_new_all(Display *disp, Window win,
+ int x, int y, int win_w, int win_h,
+ int render,
+ int max_colors, int fc, int ic,
+ char *font_dir);
+
+#define RENDER_METHOD_ALPHA_SOFTWARE 0
#define e_strdup(__dest, __var) \
{ \
|