Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c dialog.c draw.c iclass.c x.c xwin.h
Log Message:
Window handling function api rename/rewrap continued.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- backgrounds.c 21 Apr 2006 22:52:58 -0000 1.68
+++ backgrounds.c 25 Apr 2006 22:40:06 -0000 1.69
@@ -492,7 +492,7 @@
}
static Pixmap
-BackgroundCreatePixmap(Window win, unsigned int w, unsigned int h,
+BackgroundCreatePixmap(Drawable draw, unsigned int w, unsigned int h,
unsigned int depth)
{
Pixmap pmap;
@@ -501,11 +501,11 @@
* Stupid hack to avoid that a new root pixmap has the same ID as the now
* invalid one from a previous session.
*/
- pmap = ECreatePixmap(win, w, h, depth);
- if (win == VRoot.win && pmap == Mode.root.ext_pmap)
+ pmap = EXCreatePixmap(draw, w, h, depth);
+ if (draw == VRoot.win && pmap == Mode.root.ext_pmap)
{
EFreePixmap(pmap);
- pmap = ECreatePixmap(win, w, h, depth);
+ pmap = EXCreatePixmap(draw, w, h, depth);
Mode.root.ext_pmap = None;
Mode.root.ext_pmap_valid = 0;
}
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- dialog.c 22 Apr 2006 13:24:51 -0000 1.149
+++ dialog.c 25 Apr 2006 22:40:06 -0000 1.150
@@ -508,7 +508,7 @@
d->pmap = ECreatePixmap(d->win, d->w, d->h, VRoot.depth);
ESetWindowBackgroundPixmap(d->win, d->pmap);
}
- ECopyArea(d->pmm_bg.pmap, d->pmap, 0, 0, d->w, d->h, 0, 0);
+ EXCopyArea(d->pmm_bg.pmap, d->pmap, 0, 0, d->w, d->h, 0, 0);
d->redraw = 1;
@@ -1680,8 +1680,8 @@
case DITEM_TEXT:
if (!d->redraw)
- ECopyArea(d->pmm_bg.pmap, d->pmap, di->x, di->y, di->w, di->h,
- di->x, di->y);
+ EXCopyArea(d->pmm_bg.pmap, d->pmap, di->x, di->y, di->w, di->h,
+ di->x, di->y);
x = di->x;
w = di->w;
goto draw_text;
===================================================================
RCS file: /cvs/e/e16/e/src/draw.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- draw.c 17 Apr 2006 21:55:34 -0000 1.93
+++ draw.c 25 Apr 2006 22:40:06 -0000 1.94
@@ -151,7 +151,7 @@
if (gcm)
EXFreeGC(gcm);
if (mask)
- EFreePixmap(mask);
+ EXFreePixmap(mask);
mask = 0;
gc = 0;
gcm = 0;
@@ -180,7 +180,7 @@
}
}
if (!mask)
- mask = ECreatePixmap(root, w, h, 1);
+ mask = EXCreatePixmap(root, w, h, 1);
if (!gcm)
gcm = EXCreateGC(mask, 0, &gcv);
if (!gc)
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- iclass.c 21 Apr 2006 22:52:59 -0000 1.97
+++ iclass.c 25 Apr 2006 22:40:06 -0000 1.98
@@ -979,7 +979,7 @@
EImageBlendCM(ii, is->im, (flags & ICLASS_ATTR_USE_CM) ? icm : NULL);
pmm->type = 0;
- pmm->pmap = pmap = ECreatePixmap(win, w, h, VRoot.depth);
+ pmm->pmap = pmap = EXCreatePixmap(win, w, h, VRoot.depth);
pmm->mask = None;
pmm->w = w;
pmm->h = h;
@@ -993,7 +993,7 @@
EImageRenderPixmaps(is->im, win, &pmap, &mask, w, h);
/* Replace the mask with the correct one */
- pmm->mask = ECreatePixmapCopy(mask, w, h, 1);
+ pmm->mask = EXCreatePixmapCopy(mask, w, h, 1);
EImagePixmapFree(pmap);
}
@@ -1187,7 +1187,7 @@
if (ts && text)
{
if (pmm.type != 0)
- pmap = ECreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
+ pmap = EXCreatePixmapCopy(pmm.pmap, w, h, VRoot.depth);
TextstateDrawText(ts, pmap, text, ic->padding.left,
ic->padding.top,
@@ -1282,7 +1282,7 @@
Pixmap tp = 0, tm = 0;
XGCValues gcv;
- tp = ECreatePixmap(win, w, h, VRoot.depth);
+ tp = EXCreatePixmap(win, w, h, VRoot.depth);
gcv.fill_style = FillTiled;
gcv.tile = pmm->pmap;
gcv.ts_x_origin = 0;
@@ -1293,7 +1293,7 @@
EXFreeGC(gc);
if (pmm->mask)
{
- tm = ECreatePixmap(win, w, h, 1);
+ tm = EXCreatePixmap(win, w, h, 1);
gcv.fill_style = FillTiled;
gcv.tile = pmm->mask;
gcv.ts_x_origin = 0;
@@ -1324,7 +1324,7 @@
if (pmm->pmap)
Eprintf("ImageclassApplyCopy: Hmm... pmm->pmap already set\n");
- pmap = ECreatePixmap(win, w, h, VRoot.depth);
+ pmap = EXCreatePixmap(win, w, h, VRoot.depth);
pmm->type = 0;
pmm->pmap = pmap;
pmm->mask = 0;
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- x.c 24 Apr 2006 16:06:05 -0000 1.127
+++ x.c 25 Apr 2006 22:40:06 -0000 1.128
@@ -1334,13 +1334,13 @@
}
Pixmap
-ECreatePixmapCopy(Pixmap src, unsigned int w, unsigned int h,
- unsigned int depth)
+EXCreatePixmapCopy(Pixmap src, unsigned int w, unsigned int h,
+ unsigned int depth)
{
Pixmap pmap;
GC gc;
- pmap = ECreatePixmap(src, w, h, depth);
+ pmap = EXCreatePixmap(src, w, h, depth);
gc = EXCreateGC(src, 0, NULL);
XCopyArea(disp, src, pmap, gc, 0, 0, w, h, 0, 0);
EXFreeGC(gc);
@@ -1349,8 +1349,8 @@
}
void
-ECopyArea(Drawable src, Drawable dst, int sx, int sy, unsigned int w,
- unsigned int h, int dx, int dy)
+EXCopyArea(Drawable src, Drawable dst, int sx, int sy, unsigned int w,
+ unsigned int h, int dx, int dy)
{
GC gc;
@@ -1414,7 +1414,7 @@
EGetGeometry(win, NULL, NULL, NULL, &w, &h, NULL, NULL);
mask = ECreatePixmap(win, w, h, 1);
- gc = XCreateGC(disp, mask, 0, NULL);
+ gc = EXCreateGC(mask, 0, NULL);
XSetForeground(disp, gc, 0);
rect = XShapeGetRectangles(disp, win, ShapeBounding, &rect_num, &rect_ord);
@@ -1428,7 +1428,7 @@
XFree(rect);
}
- XFreeGC(disp, gc);
+ EXFreeGC(gc);
return mask;
}
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- xwin.h 23 Apr 2006 23:18:23 -0000 1.14
+++ xwin.h 25 Apr 2006 22:40:06 -0000 1.15
@@ -107,10 +107,13 @@
#define ECreatePixmap(draw, w, h, depth) XCreatePixmap(disp, draw, w, h, depth)
#define EFreePixmap(pmap) XFreePixmap(disp, pmap)
-Pixmap ECreatePixmapCopy(Pixmap src, unsigned int w,
- unsigned int h, unsigned int depth);
-void ECopyArea(Drawable src, Drawable dst, int sx, int sy,
- unsigned int w, unsigned int h, int dx, int dy);
+
+#define EXCreatePixmap(draw, w, h, depth) XCreatePixmap(disp, draw, w, h,
depth)
+#define EXFreePixmap(pmap) XFreePixmap(disp, pmap)
+Pixmap EXCreatePixmapCopy(Pixmap src, unsigned int w,
+ unsigned int h, unsigned int depth);
+void EXCopyArea(Drawable src, Drawable dst, int sx, int sy,
+ unsigned int w, unsigned int h, int dx, int dy);
#define EXGetGeometry EGetGeometry
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
