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

compositing work - make it solid and work in more places. hopefully this 

fixes some other issues if u turn on "keep hidden windows".. but that seems
to creat others atm.



SVN revision: 46036
This commit is contained in:
Carsten Haitzler 2010-02-10 07:47:59 +00:00
parent cecda9c13d
commit 218c418dc9
3 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/comp/e_mod_comp.c
View File

@ -403,12 +403,11 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
}
}
e_mod_comp_update_resize(cw->up, cw->pw, cw->ph);
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
(!cw->shaped) && (!cw->shape_changed))
{
if (new_pixmap)
e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph);
//y if (new_pixmap)
//y e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph);
evas_object_image_size_set(cw->obj, cw->pw, cw->ph);
if (!cw->native)
@ -444,7 +443,9 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
if (!cw->xim)
{
if (cw->xim = ecore_x_image_new(cw->pw, cw->ph, cw->vis, cw->depth))
e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph);
{
//y e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph);
}
}
r = e_mod_comp_update_rects_get(cw->up);
if (r)
@ -1135,6 +1136,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw, int x, int y, int w, int h, int border
}
}
if ((cw->input_only) || (cw->invalid)) return;
e_mod_comp_update_resize(cw->up, cw->w, cw->h); // this will lose updates - but configure == new pixmap == more damgaes
_e_mod_comp_win_render_queue(cw);
if (moved) _e_mod_comp_win_move_effects_add(cw);
}
@ -1403,6 +1405,26 @@ _e_mod_comp_bd_hide(void *data, int type, void *event)
return 1;
}
static int
_e_mod_comp_bd_move(void *data, int type, void *event)
{
E_Event_Border_Move *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
// fimxe: do move here for composited bd
return 1;
}
static int
_e_mod_comp_bd_resize(void *data, int type, void *event)
{
E_Event_Border_Resize *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
// fimxe: do resize here instead of conf notify
return 1;
}
static int
_e_mod_comp_bd_iconify(void *data, int type, void *event)
{
@ -1621,6 +1643,8 @@ e_mod_comp_init(void)
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _e_mod_comp_bd_del, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_SHOW, _e_mod_comp_bd_show, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_HIDE, _e_mod_comp_bd_hide, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_MOVE, _e_mod_comp_bd_move, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_RESIZE, _e_mod_comp_bd_resize, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_ICONIFY, _e_mod_comp_bd_iconify, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY, _e_mod_comp_bd_uniconify, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_URGENT_CHANGE, _e_mod_comp_bd_urgent_change, NULL));

35
src/modules/comp/e_mod_comp_update.c
View File

@ -60,16 +60,45 @@ e_mod_comp_update_tile_size_set(E_Update *up, int tsw, int tsh)
void
e_mod_comp_update_resize(E_Update *up, int w, int h)
{
unsigned char *ptiles = up->tiles, *p, *pp;
int ptw, pth, x, y;
if ((up->w == w) && (up->h == h)) return;
ptw = up->tw;
pth = up->th;
ptiles = up->tiles;
up->w = w;
up->h = h;
up->tw = (up->w + up->tsw - 1) / up->tsw;
up->th = (up->h + up->tsh - 1) / up->tsh;
if (up->tiles)
up->tiles = NULL;
_e_mod_comp_tiles_alloc(up);
if ((ptiles) && (up->tiles))
{
free(up->tiles);
up->tiles = NULL;
if (pth <= up->th)
{
for (y = 0; y < pth; y++)
{
p = up->tiles + (y * up->tw);
pp = ptiles + (y * ptw);
if (ptw <= up->tw) for (x = 0; x < ptw; x++) *p++ = *pp++;
else for (x = 0; x < up->tw; x++) *p++ = *pp++;
}
}
else
{
for (y = 0; y < up->th; y++)
{
p = up->tiles + (y * up->tw);
pp = ptiles + (y * ptw);
if (ptw <= up->tw) for (x = 0; x < ptw; x++) *p++ = *pp++;
else for (x = 0; x < up->tw; x++) *p++ = *pp++;
}
}
}
free(ptiles);
}
void

6
src/modules/comp/e_mod_config.c
View File

@ -231,12 +231,14 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
if ((_comp_mod->conf->use_shadow != cfdata->use_shadow) ||
(cfdata->lock_fps != _comp_mod->conf->lock_fps) ||
(cfdata->grab != _comp_mod->conf->grab) ||
(cfdata->effect_fade != _comp_mod->conf->effect_fade))
(cfdata->effect_fade != _comp_mod->conf->effect_fade) ||
(cfdata->keep_unmapped != _comp_mod->conf->keep_unmapped))
{
_comp_mod->conf->use_shadow = cfdata->use_shadow;
_comp_mod->conf->lock_fps = cfdata->lock_fps;
_comp_mod->conf->grab = cfdata->grab;
// _comp_mod->conf->effect_fade = cfdata->effect_fade;
_comp_mod->conf->effect_fade = cfdata->effect_fade;
_comp_mod->conf->keep_unmapped = cfdata->keep_unmapped;
e_mod_comp_shadow_set();
}
if ((_comp_mod->conf->engine != cfdata->engine) ||