Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c
Log Message:
Consistency.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- ecompmgr.c 21 Sep 2005 21:13:45 -0000 1.66
+++ ecompmgr.c 28 Sep 2005 19:10:57 -0000 1.67
@@ -586,7 +586,7 @@
}
static conv *
-make_gaussian_map(Display * dpy __UNUSED__, double r)
+make_gaussian_map(double r)
{
conv *c;
int size = ((int)ceil((r * 3)) + 1) & ~1;
@@ -686,8 +686,9 @@
}
static XImage *
-make_shadow(Display * dpy, double opacity, int width, int height)
+make_shadow(double opacity, int width, int height)
{
+ Display *dpy = disp;
XImage *ximage;
unsigned char *data;
int gsize = gaussianMap->size;
@@ -781,15 +782,15 @@
}
static Picture
-shadow_picture(Display * dpy, double opacity, int width, int height, int *wp,
- int *hp)
+shadow_picture(double opacity, int width, int height, int *wp, int *hp)
{
+ Display *dpy = disp;
XImage *shadowImage;
Pixmap shadowPixmap;
Picture shadowPicture;
GC gc;
- shadowImage = make_shadow(dpy, opacity, width, height);
+ shadowImage = make_shadow(opacity, width, height);
if (!shadowImage)
return None;
@@ -819,7 +820,7 @@
*/
static XserverRegion
-win_extents(Display * dpy, EObj * eo)
+win_extents(EObj * eo)
{
ECmWinInfo *cw = eo->cmhook;
XRectangle r;
@@ -873,7 +874,7 @@
if (cw->mode == WINDOW_TRANS)
opacity *= ((double)cw->opacity) / OPAQUE;
- cw->shadow = shadow_picture(dpy, opacity, cw->rcw, cw->rch,
+ cw->shadow = shadow_picture(opacity, cw->rcw, cw->rch,
&cw->shadow_width,
&cw->shadow_height);
}
@@ -902,7 +903,7 @@
D2printf("win_extents %#lx %d %d %d %d\n", eo->win, r.x, r.y, r.width,
r.height);
- return XFixesCreateRegion(dpy, &r, 1);
+ return XFixesCreateRegion(disp, &r, 1);
}
static XserverRegion
@@ -1187,7 +1188,7 @@
D1printf("ECompMgrWinMap %#lx\n", eo->win);
if (cw->extents == None)
- cw->extents = win_extents(disp, eo);
+ cw->extents = win_extents(eo);
ECompMgrDamageMergeObject(eo, cw->extents, 0);
if (Conf_compmgr.fading.enable && eo->fade)
@@ -1358,7 +1359,7 @@
ECompMgrWinInvalidate(eo, invalidate);
/* Find new window region */
- cw->extents = win_extents(disp, eo);
+ cw->extents = win_extents(eo);
#if 1
/* Hmmm. Why if not changed? - To get shadows painted. */
@@ -1415,7 +1416,7 @@
ECompMgrWinInvalidate(eo, INV_POS);
/* Find new window region */
- cw->extents = win_extents(disp, eo);
+ cw->extents = win_extents(eo);
ECompMgrDamageMergeObject(eo, cw->extents, 0);
}
}
@@ -1504,7 +1505,7 @@
if (!cw->damaged)
{
- parts = win_extents(dpy, eo);
+ parts = win_extents(eo);
XDamageSubtract(dpy, cw->damage, None, None);
cw->damaged = 1;
}
@@ -1650,7 +1651,7 @@
/* Region of window in screen coordinates, including shadows */
if (!cw->extents)
- cw->extents = win_extents(dpy, eo);
+ cw->extents = win_extents(eo);
if (EventDebug(EDBUG_TYPE_COMPMGR3))
ERegionShow("extents", cw->extents);
@@ -1894,7 +1895,7 @@
ECompMgrShadowsInit(int mode, int cleanup)
{
if (mode == ECM_SHADOWS_BLURRED)
- gaussianMap = make_gaussian_map(disp, Conf_compmgr.shadows.blur.radius);
+ gaussianMap = make_gaussian_map(Conf_compmgr.shadows.blur.radius);
else
{
if (gaussianMap)
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
