From: <enl...@li...> - 2005-10-16 14:00:03
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: coords.c desktops.c iclass.c iclass.h progress.c startup.c tooltips.c Log Message: Cosmetics. =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- coords.c 15 Oct 2005 12:14:00 -0000 1.35 +++ coords.c 16 Oct 2005 13:59:52 -0000 1.36 @@ -123,7 +123,7 @@ EobjMap(eo, 0); } - ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, 0, ST_UNKNWN, + ITApply(eo->win, ic, NULL, cw, ch, STATE_NORMAL, 1, 0, 0, ST_SOLID, tc, NULL, s); EFlush(); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v retrieving revision 1.187 retrieving revision 1.188 diff -u -3 -r1.187 -r1.188 --- desktops.c 16 Oct 2005 13:58:34 -0000 1.187 +++ desktops.c 16 Oct 2005 13:59:52 -0000 1.188 @@ -1818,7 +1818,7 @@ { ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0); if (ic) - ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_UNKNWN); + ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID); for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++) wins[i] = 0; called = 1; @@ -1844,7 +1844,7 @@ ic = ImageclassFind("SETTINGS_DESKTOP_AREA", 0); if (ic) ImageclassApply(ic, wins[i], 64, 48, 0, 0, STATE_NORMAL, 0, - ST_UNKNWN); + ST_SOLID); } EFreePixmap(pmap); @@ -2086,7 +2086,7 @@ ic = ImageclassFind("SETTINGS_AREA_AREA", 0); if (ic) - ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_UNKNWN); + ImageclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_SOLID); awin = ECreateWindow(win, 0, 0, 18, 14, 0); ic = ImageclassFind("SETTINGS_AREADESK_AREA", 0); if (ic) =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -3 -r1.76 -r1.77 --- iclass.c 26 Sep 2005 17:32:09 -0000 1.76 +++ iclass.c 16 Oct 2005 13:59:52 -0000 1.77 @@ -837,7 +837,7 @@ switch (image_type) { default: - case ST_UNKNWN: + case ST_SOLID: case ST_BUTTON: flags = ICLASS_ATTR_OPAQUE; break; @@ -1550,7 +1550,7 @@ w = (int)strtol(atword(params, 5), (char **)NULL, 0); h = (int)strtol(hptr, (char **)NULL, 0); } - ImageclassApply(ic, win, w, h, 0, 0, st, 0, ST_UNKNWN); + ImageclassApply(ic, win, w, h, 0, 0, st, 0, ST_SOLID); } } else if (!strcmp(param2, "apply_copy")) @@ -1583,7 +1583,7 @@ w = (int)strtol(atword(params, 5), (char **)NULL, 0); h = (int)strtol(hptr, (char **)NULL, 0); ImageclassApplyCopy(ic, win, w, h, 0, 0, st, - &pmm, 1, ST_UNKNWN); + &pmm, 1, ST_SOLID); IpcPrintf("0x%08x 0x%08x\n", (unsigned)pmm.pmap, (unsigned)pmm.mask); /* FreePmapMask(&pmm); ??? */ =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/iclass.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- iclass.h 6 Oct 2005 21:57:17 -0000 1.2 +++ iclass.h 16 Oct 2005 13:59:52 -0000 1.3 @@ -34,7 +34,7 @@ typedef struct _imagestate ImageState; /* Selective Transparency item types */ -#define ST_UNKNWN 0 +#define ST_SOLID 0 #define ST_BORDER 1 #define ST_WIDGET 2 #define ST_ICONBOX 3 =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/progress.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- progress.c 26 Sep 2005 17:32:10 -0000 1.26 +++ progress.c 16 Oct 2005 13:59:52 -0000 1.27 @@ -167,7 +167,7 @@ TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED, 0, p->tnc, s); ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0, - ST_UNKNWN); + ST_SOLID); EobjResize(p->p_win, w, p->h); @@ -186,11 +186,11 @@ w = p->w; ImageclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0, - STATE_NORMAL, 0, ST_UNKNWN); + STATE_NORMAL, 0, ST_SOLID); ImageclassApply(p->inc, p->n_win->win, (p->h * 5), p->h, 0, 0, STATE_CLICKED, - 0, ST_UNKNWN); + 0, ST_SOLID); ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL, 0, - ST_UNKNWN); + ST_SOLID); EobjMap(p->win, 0); EobjMap(p->n_win, 0); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- startup.c 9 Oct 2005 18:01:30 -0000 1.61 +++ startup.c 16 Oct 2005 13:59:52 -0000 1.62 @@ -102,8 +102,8 @@ EMapRaised(b1); EMapRaised(b2); - ImageclassApply(ic, b1, bw, bh, 0, 0, 0, 0, ST_UNKNWN); - ImageclassApply(ic, b2, bw, bh, 0, 0, 0, 0, ST_UNKNWN); + ImageclassApply(ic, b1, bw, bh, 0, 0, 0, 0, ST_SOLID); + ImageclassApply(ic, b2, bw, bh, 0, 0, 0, 0, ST_SOLID); } BackgroundSet(bg, win1, VRoot.w, VRoot.h); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -3 -r1.87 -r1.88 --- tooltips.c 10 Oct 2005 19:40:11 -0000 1.87 +++ tooltips.c 16 Oct 2005 13:59:52 -0000 1.88 @@ -439,7 +439,7 @@ EMoveResizeWindow(tt->iwin, ix, iy, iw, ih); EMapWindow(tt->iwin); ImageclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL, 0, - ST_TOOLTIP); + ST_SOLID); } else EUnmapWindow(tt->iwin); |