Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c eobj.h pager.c
Log Message:
Don't update fading windows in pager.
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- ecompmgr.c 26 Jan 2008 11:45:33 -0000 1.166
+++ ecompmgr.c 27 Jan 2008 18:38:53 -0000 1.167
@@ -99,7 +99,6 @@
int rcx, rcy, rcw, rch;
int mode;
unsigned damaged:1;
- unsigned fading:1;
unsigned fadeout:1;
unsigned has_shadow:1;
unsigned have_shape:1; /* Region validity - shape */
@@ -1311,12 +1310,12 @@
#if DEBUG_OPACITY
Eprintf("doECompMgrWinFade %#lx, %d/%d, %#x->%#x\n", EobjGetXwin(eo),
- cw->fading, cw->fadeout, cw->opacity, op);
+ eo->fading, cw->fadeout, cw->opacity, op);
#endif
- if (!cw->fading)
+ if (!eo->fading)
goto done;
- cw->fading = cw->fadeout;
+ eo->fading = cw->fadeout;
step = Conf_compmgr.fading.time / Conf.animation.step;
if (step == 0)
@@ -1332,7 +1331,7 @@
if (op - cw->opacity > step)
{
op = cw->opacity + step;
- cw->fading = 1;
+ eo->fading = 1;
}
}
else
@@ -1340,7 +1339,7 @@
if (cw->opacity - op > step)
{
op = cw->opacity - step;
- cw->fading = 1;
+ eo->fading = 1;
}
}
@@ -1349,7 +1348,7 @@
#endif
ECompMgrWinSetOpacity(eo, op);
- if (cw->fading)
+ if (eo->fading)
return 1;
if (eo->type == EOBJ_TYPE_EWIN)
@@ -1367,7 +1366,7 @@
if (op_from == op_to && op_to == eo->opacity)
{
- if (cw->fading)
+ if (eo->fading)
ECompMgrWinFadeEnd(eo, 0);
return;
}
@@ -1376,20 +1375,18 @@
cw->anim_fade = AnimatorAdd(doECompMgrWinFade, eo);
cw->opacity_to = op_to;
- cw->fading = 1;
+ eo->fading = 1;
ECompMgrWinSetOpacity(eo, op_from);
}
static void
ECompMgrWinFadeIn(EObj * eo)
{
- ECmWinInfo *cw = eo->cmhook;
-
#if DEBUG_OPACITY
Eprintf("ECompMgrWinFadeIn %#lx %#x -> %#x\n", EobjGetXwin(eo), 0x10000000,
eo->opacity);
#endif
- if (cw->fading)
+ if (eo->fading)
ECompMgrWinFadeEnd(eo, 0);
ECompMgrWinFade(eo, 0x10000000, eo->opacity);
@@ -1425,7 +1422,7 @@
ECompMgrDamageMergeObject(eo, cw->extents);
_ECM_SET_CLIP_CHANGED();
}
- cw->fading = 0;
+ eo->fading = 0;
if (done)
{
AnimatorDel(cw->anim_fade);
@@ -1794,7 +1791,7 @@
D1printf("ECompMgrWinDel %#lx\n", EobjGetXwin(eo));
- if (cw->fading)
+ if (eo->fading)
ECompMgrWinFadeEnd(eo, 1);
EventCallbackUnregister(eo->win, 0, ECompMgrHandleWindowEvent, eo);
@@ -1949,7 +1946,7 @@
if (!cw)
continue;
- if ((!eo->shown && !cw->fading) || eo->desk != dsk)
+ if ((!eo->shown && !eo->fading) || eo->desk != dsk)
continue;
/* Region of shaped window in screen coordinates */
@@ -1961,7 +1958,7 @@
ECompMgrWinSetExtents(eo);
D3printf(" - %#lx desk=%d shown=%d fading=%d fadeout=%d\n",
- EobjGetXwin(eo), eo->desk->num, eo->shown, cw->fading,
+ EobjGetXwin(eo), eo->desk->num, eo->shown, eo->fading,
cw->fadeout);
if (eo->type == EOBJ_TYPE_DESK)
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- eobj.h 20 May 2007 08:08:58 -0000 1.44
+++ eobj.h 27 Jan 2008 18:38:53 -0000 1.45
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -34,9 +34,9 @@
short type; /* Ewin, button, other, ... */
short ilayer; /* Internal stacking layer */
short layer; /* Stacking layer */
- Desk *desk; /* Belongs on desk */
signed char stacked;
signed char shaped;
+ Desk *desk; /* Belongs on desk */
char sticky;
char floating;
unsigned external:1;
@@ -46,6 +46,7 @@
unsigned noredir:1; /* Do not redirect */
unsigned shadow:1; /* Enable shadows */
unsigned fade:1; /* Enable fading */
+ unsigned fading:1; /* Is fading */
unsigned ghost:1; /* Ghost window */
struct
{
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -3 -r1.256 -r1.257
--- pager.c 26 Jan 2008 11:45:33 -0000 1.256
+++ pager.c 27 Jan 2008 18:38:53 -0000 1.257
@@ -393,7 +393,10 @@
EWin *ewin;
ewin = lst[i];
+
if (!EoIsShown(ewin))
+ continue;
+ if (ewin->o.fading)
continue;
PagerEwinUpdateMini(p, ewin);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
