vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove useless subwindow code 

SVN revision: 39975
This commit is contained in:
Vincent Torri 2009-04-11 08:33:44 +00:00
parent 3ef3df1e5d
commit 0e6ad24c60
11 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_border.c
View File

@ -153,9 +153,7 @@ EAPI int E_EVENT_BORDER_PROPERTY = 0;
#define GRAV_SET(bd, grav) \
ecore_x_window_gravity_set(bd->bg_win, grav); \
ecore_x_window_gravity_set(bd->client.shell_win, grav); \
ecore_x_window_gravity_set(bd->client.win, grav); \
ecore_x_window_gravity_set(bd->bg_subwin, grav); \
ecore_x_window_pixel_gravity_set(bd->bg_subwin, grav);
ecore_x_window_gravity_set(bd->client.win, grav);
/* externally accessible functions */
EAPI int
@ -251,7 +249,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
e_focus_setup(bd);
bd->bg_ecore_evas = e_canvas_new(e_config->evas_engine_borders, bd->win,
0, 0, bd->w, bd->h, 1, 0,
&(bd->bg_win), &(bd->bg_subwin));
&(bd->bg_win));
e_canvas_add(bd->bg_ecore_evas);
bd->event_win = ecore_x_window_input_new(bd->win, 0, 0, bd->w, bd->h);
bd->bg_evas = ecore_evas_get(bd->bg_ecore_evas);

1
src/bin/e_border.h
View File

@ -159,7 +159,6 @@ struct _E_Border
Ecore_Evas *bg_ecore_evas;
Evas *bg_evas;
Ecore_X_Window bg_win;
Ecore_X_Window bg_subwin;
Evas_Object *bg_object;
Evas_Object *icon_object;
Ecore_X_Window event_win;

7
src/bin/e_canvas.c
View File

@ -181,8 +181,7 @@ e_canvas_rehint(void)
EAPI Ecore_Evas *
e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
int direct_resize, int override, Ecore_X_Window *win_ret,
Ecore_X_Window *subwin_ret)
int direct_resize, int override, Ecore_X_Window *win_ret)
{
Ecore_Evas *ee;
int engine;
@ -196,7 +195,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_gl_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_gl_x11_window_get(ee);
if (subwin_ret) *subwin_ret = ecore_evas_gl_x11_subwindow_get(ee);
}
else
goto try2;
@ -209,7 +207,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_xrender_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_xrender_x11_window_get(ee);
if (subwin_ret) *subwin_ret = ecore_evas_xrender_x11_subwindow_get(ee);
}
else
goto try2;
@ -222,7 +219,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_16_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_16_window_get(ee);
if (subwin_ret) *subwin_ret = ecore_evas_software_x11_16_subwindow_get(ee);
}
else
goto try2;
@ -236,7 +232,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
if (subwin_ret) *subwin_ret = ecore_evas_software_x11_subwindow_get(ee);
}
}
return ee;

2
src/bin/e_canvas.h
View File

@ -14,7 +14,7 @@ EAPI void e_canvas_cache_flush(void);
EAPI void e_canvas_cache_reload(void);
EAPI void e_canvas_idle_flush(void);
EAPI void e_canvas_rehint(void);
EAPI Ecore_Evas *e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret, Ecore_X_Window *subwin_ret);
EAPI Ecore_Evas *e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret);
#endif
#endif

2
src/bin/e_container.c
View File

@ -89,7 +89,7 @@ e_container_new(E_Manager *man)
con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
0, 0, con->w, con->h, 1, 1,
&(con->bg_win), NULL);
&(con->bg_win));
e_canvas_add(con->bg_ecore_evas);
con->event_win = ecore_x_window_input_new(con->bg_win, 0, 0, con->w, con->h);
ecore_x_window_show(con->event_win);

2
src/bin/e_dnd.c
View File

@ -185,7 +185,7 @@ e_drag_new(E_Container *container, int x, int y,
e_object_ref(E_OBJECT(drag->container));
drag->ecore_evas = e_canvas_new(e_config->evas_engine_drag, drag->container->win,
drag->x, drag->y, drag->w, drag->h, 1, 1,
&(drag->evas_win), NULL);
&(drag->evas_win));
if (e_config->use_composite)
{
ecore_evas_alpha_set(drag->ecore_evas, 1);

2
src/bin/e_menu.c
View File

@ -1401,7 +1401,7 @@ _e_menu_realize(E_Menu *m)
m->ecore_evas =
e_canvas_new(e_config->evas_engine_menus, m->zone->container->win,
m->cur.x, m->cur.y, m->cur.w, m->cur.h, 1, 1,
&(m->evas_win), NULL);
&(m->evas_win));
e_canvas_add(m->ecore_evas);
m->shape = e_container_shape_add(m->zone->container);
e_container_shape_move(m->shape, m->cur.x, m->cur.y);

2
src/bin/e_popup.c
View File

@ -67,7 +67,7 @@ e_popup_new(E_Zone *zone, int x, int y, int w, int h)
pop->layer = 250;
pop->ecore_evas = e_canvas_new(e_config->evas_engine_popups, pop->zone->container->win,
pop->zone->x + pop->x, pop->zone->y + pop->y, pop->w, pop->h, 1, 1,
&(pop->evas_win), NULL);
&(pop->evas_win));
/* avoid excess exposes when shaped - set damage avoid to 1 */
// ecore_evas_avoid_damage_set(pop->ecore_evas, 1);

2
src/bin/e_win.c
View File

@ -47,7 +47,7 @@ e_win_new(E_Container *con)
win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root,
0, 0, 1, 1, 1, 0,
&(win->evas_win), NULL);
&(win->evas_win));
e_canvas_add(win->ecore_evas);
ecore_evas_data_set(win->ecore_evas, "E_Win", win);
ecore_evas_callback_move_set(win->ecore_evas, _e_win_cb_move);

2
src/bin/e_zone.c
View File

@ -179,7 +179,7 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
/* TODO: config the ecore_evas type. */
zone->black_ecore_evas =
e_canvas_new(e_config->evas_engine_zone, zone->container->win,
0, 0, zone->w, zone->h, 1, 1, &(zone->black_win), NULL);
0, 0, zone->w, zone->h, 1, 1, &(zone->black_win));
e_canvas_add(zone->black_ecore_evas);
ecore_evas_layer_set(zone->black_ecore_evas, 6);
zone->black_evas = ecore_evas_get(zone->black_ecore_evas);

2
src/modules/gadman/e_mod_gadman.c
View File

@ -446,7 +446,7 @@ _gadman_gadcon_new(const char* name, int ontop)
{
Man->top_ee = e_canvas_new(e_config->evas_engine_popups,
Man->container->win, 0, 0, 0, 0, 1, 1,
&(Man->top_win), NULL);
&(Man->top_win));
if (Man->use_composite)
{