enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fade ... OFF! 

SVN revision: 46070
This commit is contained in:
Carsten Haitzler 2010-02-11 07:40:44 +00:00
parent 64758733a6
commit 4fbe140b50
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ _e_mod_comp_win_move_effects_add(E_Comp_Win *cw)
//////////////////////////////////////////////////////////////////////////
#if 0
#if 1
#define DBG(f, x...) printf(f, ##x)
#else
#define DBG(f, x...)
@ -469,22 +469,26 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
e_mod_comp_update_clear(cw->up);
for (i = 0; r[i].w > 0; i++)
{
unsigned int *pix;
int x, y, w, h;
x = r[i].x; y = r[i].y;
w = r[i].w; h = r[i].h;
if (!ecore_x_image_get(cw->xim, cw->pixmap, x, y, x, y, w, h))
{
printf("EEEEK! get failed\n");
e_mod_comp_update_add(cw->up, x, y, w, h);
cw->update = 1;
}
else
{
unsigned int *pix;
// why do we neeed these 2? this smells wrong
pix = ecore_x_image_data_get(cw->xim, NULL, NULL, NULL);
DBG("UPDATE [0x%x] %i %i %ix%i -- pix = %p\n", cw->win, x, y, w, h, pix);
evas_object_image_data_set(cw->obj, pix);
pix = ecore_x_image_data_get(cw->xim, NULL, NULL, NULL);
DBG("UPDATE [0x%x] %i %i %ix%i -- pix = %p\n", cw->win, x, y, w, h, pix);
evas_object_image_data_set(cw->obj, pix);
evas_object_image_data_update_add(cw->obj, x, y, w, h);
if (cw->shaped) cw->shape_changed = 1;
evas_object_image_data_update_add(cw->obj, x, y, w, h);
if (cw->shaped) cw->shape_changed = 1;
}
}
if ((cw->shape_changed) && (!cw->argb))
{

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

@ -73,7 +73,7 @@ e_modapi_init(E_Module *m)
mod->conf->texture_from_pixmap = 0;
mod->conf->lock_fps = 1;
mod->conf->efl_sync = 1;
mod->conf->loose_sync = 0;
mod->conf->loose_sync = 1;
mod->conf->grab = 0;
mod->conf->keep_unmapped = 1;
mod->conf->send_flush = 1;
@ -81,12 +81,14 @@ e_modapi_init(E_Module *m)
mod->conf->max_unmapped_pixels = 32 * 1024;
mod->conf->max_unmapped_time = 10 * 3600;
mod->conf->min_unmapped_time = 5 * 60;
mod->conf->effect_fade = 1;
mod->conf->effect_fade = 0;
mod->conf->effect_zoom = 0;
mod->conf->effect_wobble = 0;
mod->conf->effect_rotate = 0;
}
mod->conf->effect_fade = 0; // OOOFFF!!!
_comp_mod = mod;
if (e_init_count_get() <= 0)