Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c desktops.c dialog.c fx.c hiwin.c iclass.c
menus.c pager.c x.c
Log Message:
Use window depth when creating normal image pixmaps.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- backgrounds.c 29 Apr 2006 19:39:20 -0000 1.71
+++ backgrounds.c 7 May 2006 16:21:37 -0000 1.72
@@ -948,7 +948,7 @@
}
/* Create new cached bg mini image */
- pmap = ECreatePixmap(VRoot.win, 64, 48, VRoot.depth);
+ pmap = ECreatePixmap(VRoot.win, 64, 48, 0);
BackgroundApplyPmap(bg, pmap, 64, 48);
im = EImageGrabDrawable(pmap, None, 0, 0, 64, 48, 0);
EImageSave(im, s);
@@ -1516,7 +1516,7 @@
DialogItemAreaGetSize(di, &w, &h);
if (tmp_bg_mini_pixmap == None)
- tmp_bg_mini_pixmap = ECreatePixmap(win, w, h, VRoot.depth);
+ tmp_bg_mini_pixmap = ECreatePixmap(win, w, h, 0);
pmap = tmp_bg_mini_pixmap;
if (val == 1)
@@ -1712,7 +1712,7 @@
win = DialogItemAreaGetWindow(bg_sel);
DialogItemAreaGetSize(bg_sel, &w, &h);
- pmap = ECreatePixmap(win, w, h, VRoot.depth);
+ pmap = ECreatePixmap(win, w, h, 0);
gc = EXCreateGC(pmap, 0, NULL);
ic_button = ImageclassFind("DIALOG_BUTTON", 0);
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -3 -r1.242 -r1.243
--- desktops.c 29 Apr 2006 19:39:20 -0000 1.242
+++ desktops.c 7 May 2006 16:21:37 -0000 1.243
@@ -2300,7 +2300,7 @@
wins[i] = ECreateWindow(win, 0, 0, 64, 48, 0);
ESetWindowBorderWidth(wins[i], 1);
- pmap = ECreatePixmap(wins[i], 64, 48, VRoot.depth);
+ pmap = ECreatePixmap(wins[i], 64, 48, 0);
ESetWindowBackgroundPixmap(wins[i], pmap);
bg = DeskBackgroundGet(DeskGet(i));
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- dialog.c 7 May 2006 15:32:37 -0000 1.155
+++ dialog.c 7 May 2006 16:21:37 -0000 1.156
@@ -508,7 +508,7 @@
if (d->pmap == None)
{
- d->pmap = ECreatePixmap(d->win, d->w, d->h, VRoot.depth);
+ d->pmap = ECreatePixmap(d->win, d->w, d->h, 0);
ESetWindowBackgroundPixmap(d->win, d->pmap);
}
EXCopyArea(d->pmm_bg.pmap, d->pmap, 0, 0, d->w, d->h, 0, 0);
===================================================================
RCS file: /cvs/e/e16/e/src/fx.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- fx.c 29 Apr 2006 19:39:21 -0000 1.68
+++ fx.c 7 May 2006 16:21:37 -0000 1.69
@@ -95,8 +95,7 @@
fx_ripple_win = DeskGetBackgroundWin(DesksGetCurrent());
fx_ripple_above =
- ECreatePixmap(fx_ripple_win, VRoot.w, fx_ripple_waterh * 2,
- VRoot.depth);
+ ECreatePixmap(fx_ripple_win, VRoot.w, fx_ripple_waterh * 2, 0);
if (gc)
EXFreeGC(gc);
if (gc1)
@@ -539,7 +538,7 @@
fx_wave_win = DeskGetBackgroundWin(DesksGetCurrent());
fx_wave_above =
- ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2, VRoot.depth);
+ ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2, 0);
if (gc)
EXFreeGC(gc);
if (gc1)
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- hiwin.c 29 Apr 2006 19:39:21 -0000 1.15
+++ hiwin.c 7 May 2006 16:21:37 -0000 1.16
@@ -99,8 +99,7 @@
if (shown)
{
- pmap =
- ECreatePixmap(EoGetWin(phi), EoGetW(phi), EoGetH(phi), VRoot.depth);
+ pmap = ECreatePixmap(EoGetWin(phi), EoGetW(phi), EoGetH(phi), 0);
ESetWindowBackgroundPixmap(EoGetWin(phi), pmap);
HiwinRenderImageDrawX(phi, pmap);
EFreePixmap(pmap);
@@ -187,8 +186,7 @@
if (shown)
{
- pmap =
- ECreatePixmap(EoGetWin(phi), EoGetW(phi), EoGetH(phi), VRoot.depth);
+ pmap = ECreatePixmap(EoGetWin(phi), EoGetW(phi), EoGetH(phi), 0);
ESetWindowBackgroundPixmap(EoGetWin(phi), pmap);
HiwinRenderPixmapDrawX(phi, pmap);
EFreePixmap(pmap);
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- iclass.c 7 May 2006 15:32:37 -0000 1.100
+++ iclass.c 7 May 2006 16:21:37 -0000 1.101
@@ -808,7 +808,7 @@
pmap = None;
if (draw == None)
{
- pmap = ECreatePixmap(win, w, h, VRoot.depth);
+ pmap = ECreatePixmap(win, w, h, 0);
draw = pmap;
x = y = 0;
}
@@ -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 = ECreatePixmap(win, w, h, 0);
pmm->mask = None;
pmm->w = w;
pmm->h = h;
@@ -1282,7 +1282,7 @@
Pixmap tp = 0, tm = 0;
XGCValues gcv;
- tp = ECreatePixmap(win, w, h, VRoot.depth);
+ tp = ECreatePixmap(win, w, h, 0);
gcv.fill_style = FillTiled;
gcv.tile = pmm->pmap;
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 = ECreatePixmap(win, w, h, 0);
pmm->type = 0;
pmm->pmap = pmap;
pmm->mask = 0;
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -3 -r1.245 -r1.246
--- menus.c 7 May 2006 15:32:37 -0000 1.245
+++ menus.c 7 May 2006 16:21:37 -0000 1.246
@@ -921,7 +921,7 @@
EGetGeometry(mi->win, NULL, &x, &y, &w, &h, NULL, NULL);
mi_pmm->type = 0;
- mi_pmm->pmap = ECreatePixmap(mi->win, w, h, VRoot.depth);
+ mi_pmm->pmap = ECreatePixmap(mi->win, w, h, 0);
mi_pmm->mask = None;
ic = (mi->child) ? m->style->sub_iclass : m->style->item_iclass;
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -3 -r1.212 -r1.213
--- pager.c 3 May 2006 20:52:15 -0000 1.212
+++ pager.c 7 May 2006 16:21:37 -0000 1.213
@@ -506,7 +506,7 @@
pmap = p->bgpmap;
if (pmap != None)
EFreePixmap(pmap);
- pmap = p->bgpmap = ECreatePixmap(p->win, p->dw, p->dh, VRoot.depth);
+ pmap = p->bgpmap = ECreatePixmap(p->win, p->dw, p->dh, 0);
bg = DeskBackgroundGet(p->dsk);
if (Conf_pagers.snap && bg)
@@ -596,7 +596,7 @@
if (p->scale <= 0. || Mode.op_source == OPSRC_USER)
p->scale = ((float)VRoot.w / p->dw + (float)VRoot.h / p->dh) / 2;
- p->pmap = ECreatePixmap(p->win, p->w, p->h, VRoot.depth);
+ p->pmap = ECreatePixmap(p->win, p->w, p->h, 0);
ESetWindowBackgroundPixmap(p->win, p->pmap);
p->do_newbg = 1;
PagerCheckUpdate(p, NULL);
@@ -819,7 +819,7 @@
ewin->mini_w = w;
ewin->mini_h = h;
ewin->mini_pmm.type = 0;
- ewin->mini_pmm.pmap = ECreatePixmap(p->win, w, h, VRoot.depth);
+ ewin->mini_pmm.pmap = ECreatePixmap(p->win, w, h, 0);
ewin->mini_pmm.mask = None;
}
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- x.c 7 May 2006 15:08:01 -0000 1.132
+++ x.c 7 May 2006 16:21:37 -0000 1.133
@@ -348,7 +348,7 @@
c_attr->depth, InputOutput, c_attr->visual,
CWOverrideRedirect | CWSaveUnder | CWBackingStore |
CWColormap | CWBackPixmap | CWBorderPixel, &attr);
- win = EXidSet(xwin, xpar, x, y, w, h, VRoot.depth);
+ win = EXidSet(xwin, xpar, x, y, w, h, c_attr->depth);
return win;
}
@@ -365,7 +365,7 @@
xpar = (parent != NoWin) ? parent->xwin : VRoot.xwin;
xwin = XCreateWindow(disp, xpar, x, y, w, h, 0, 0, InputOnly,
CopyFromParent, CWOverrideRedirect, &attr);
- win = EXidSet(xwin, xpar, x, y, w, h, VRoot.depth);
+ win = EXidSet(xwin, xpar, x, y, w, h, 0);
return win;
}
-------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
