Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c buttons.c coords.c dialog.c draw.c iclass.c
iconify.c ipc.c menus.c pager.c progress.c settings.c
startup.c tooltips.c warp.c
Log Message:
Selective Transparency - basic functionality (Jaron Omega <[EMAIL PROTECTED]>).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -3 -r1.278 -r1.279
--- E.h 2 Jun 2004 22:55:18 -0000 1.278
+++ E.h 3 Jun 2004 18:04:43 -0000 1.279
@@ -66,6 +66,18 @@
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
+#define ST_UNKNWN 0
+#define ST_BORDER 1
+#define ST_WIDGET 2
+#define ST_ICONBOX 3
+#define ST_MENU 4
+#define ST_MENU_ITEM 5
+#define ST_TOOLTIP 6
+#define ST_DIALOG 7
+#define ST_HILIGHT 8
+#define ST_PAGER 9
+#define ST_WARPLIST 10
+
#else
#include <Imlib.h>
@@ -1574,6 +1586,7 @@
Dialog *d;
DItem *di;
int x, y;
+ int image_type;
}
DrawQueue;
@@ -2311,10 +2324,12 @@
void IclassPopulate(ImageClass * iclass);
int IclassIsTransparent(ImageClass * iclass);
void IclassApply(ImageClass * iclass, Window win, int w, int h,
- int active, int sticky, int state, char expose);
+ int active, int sticky, int state, char expose,
+ int image_type);
void IclassApplyCopy(ImageClass * iclass, Window win, int w,
int h, int active, int sticky, int state,
- PmapMask * pmm, int make_mask);
+ PmapMask * pmm, int make_mask,
+ int image_type);
void FreePmapMask(PmapMask * pmm);
/* iconify.c */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- borders.c 2 Jun 2004 22:55:18 -0000 1.188
+++ borders.c 3 Jun 2004 18:04:44 -0000 1.189
@@ -725,7 +725,8 @@
IclassApply(ewin->border->part[i].iclass, ewin->bits[i].win,
ewin->bits[i].w, ewin->bits[i].h, ewin->active,
- ewin->sticky, ewin->bits[i].state, ewin->bits[i].expose);
+ ewin->sticky, ewin->bits[i].state, ewin->bits[i].expose,
+ ST_BORDER);
if (ewin->border->part[i].flags == FLAG_TITLE)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- buttons.c 4 May 2004 19:04:23 -0000 1.33
+++ buttons.c 3 Jun 2004 18:04:44 -0000 1.34
@@ -303,7 +303,7 @@
{
EDBUG(3, "ButtonDraw");
- IclassApply(b->iclass, b->win, b->w, b->h, 0, 0, b->state, 0);
+ IclassApply(b->iclass, b->win, b->w, b->h, 0, 0, b->state, 0, ST_BORDER);
if (b->label)
TclassApply(b->iclass, b->win, b->w, b->h, 0, 0, b->state, 0, b->tclass,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- coords.c 18 May 2004 23:31:07 -0000 1.19
+++ coords.c 3 Jun 2004 18:04:44 -0000 1.20
@@ -99,7 +99,7 @@
EMoveResizeWindow(disp, c_win, cx, cy, cw, ch);
pq = Mode.queue_up;
Mode.queue_up = 0;
- IclassApply(ic, c_win, cw, ch, 1, 0, STATE_NORMAL, 0);
+ IclassApply(ic, c_win, cw, ch, 1, 0, STATE_NORMAL, 0, ST_UNKNWN);
TclassApply(ic, c_win, cw, ch, 0, 0, STATE_NORMAL, 0, tc, s);
Mode.queue_up = pq;
XFlush(disp);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- dialog.c 22 May 2004 19:31:12 -0000 1.89
+++ dialog.c 3 Jun 2004 18:04:44 -0000 1.90
@@ -481,7 +481,8 @@
state = STATE_CLICKED;
}
IclassApply(d->button[bnum]->iclass, d->button[bnum]->win,
- d->button[bnum]->w, d->button[bnum]->h, 0, 0, state, 0);
+ d->button[bnum]->w, d->button[bnum]->h, 0, 0, state, 0,
+ ST_WIDGET);
TclassApply(d->button[bnum]->iclass, d->button[bnum]->win,
d->button[bnum]->w, d->button[bnum]->h, 0, 0, state, 1,
d->button[bnum]->tclass, d->button[bnum]->text);
@@ -557,7 +558,7 @@
if ((!d->tclass) || (!d->iclass))
return;
- IclassApply(d->iclass, d->win, d->w, d->h, 0, 0, STATE_NORMAL, 0);
+ IclassApply(d->iclass, d->win, d->w, d->h, 0, 0, STATE_NORMAL, 0, ST_DIALOG);
for (i = 0; i < d->num_buttons; i++)
DialogDrawButton(d, i);
@@ -1616,20 +1617,9 @@
{
DrawQueue *dq;
- dq = Emalloc(sizeof(DrawQueue));
- dq->win = 0;
- dq->iclass = NULL;
+ dq = Ecalloc(1, sizeof(DrawQueue));
dq->w = w;
dq->h = h;
- dq->active = 0;
- dq->sticky = 0;
- dq->state = 0;
- dq->expose = 0;
- dq->tclass = NULL;
- dq->text = NULL;
- dq->shape_propagate = 0;
- dq->pager = NULL;
- dq->redraw_pager = NULL;
dq->d = d;
dq->di = di;
dq->x = x;
@@ -1687,12 +1677,13 @@
if (di->item.slider.base_win)
IclassApply(di->item.slider.ic_base, di->item.slider.base_win,
di->item.slider.base_w, di->item.slider.base_h, 0,
- 0, STATE_NORMAL, 0);
+ 0, STATE_NORMAL, 0, ST_WIDGET);
if (di->item.slider.border_win)
IclassApply(di->item.slider.ic_border,
di->item.slider.border_win,
di->item.slider.border_w,
- di->item.slider.border_h, 0, 0, STATE_NORMAL, 0);
+ di->item.slider.border_h, 0, 0, STATE_NORMAL, 0,
+ ST_WIDGET);
state = STATE_NORMAL;
if ((di->hilited) && (di->clicked))
state = STATE_CLICKED;
@@ -1703,7 +1694,7 @@
if (di->item.slider.knob_win)
IclassApply(di->item.slider.ic_knob, di->item.slider.knob_win,
di->item.slider.knob_w, di->item.slider.knob_h, 0,
- 0, state, 0);
+ 0, state, 0, ST_WIDGET);
break;
case DITEM_BUTTON:
state = STATE_NORMAL;
@@ -1713,13 +1704,14 @@
state = STATE_HILITED;
else if (!(di->hilited) && (di->clicked))
state = STATE_CLICKED;
- IclassApply(di->iclass, di->win, di->w, di->h, 0, 0, state, 0);
+ IclassApply(di->iclass, di->win, di->w, di->h, 0, 0, state, 0,
+ ST_WIDGET);
TclassApply(di->iclass, di->win, di->w, di->h, 0, 0, state, 1,
di->tclass, di->item.button.text);
break;
case DITEM_AREA:
IclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_NORMAL, 0);
+ STATE_NORMAL, 0, ST_DIALOG);
break;
case DITEM_CHECKBUTTON:
state = STATE_NORMAL;
@@ -1732,11 +1724,13 @@
if (di->item.check_button.onoff)
IclassApply(di->iclass, di->item.check_button.check_win,
di->item.check_button.check_orig_w,
- di->item.check_button.check_orig_h, 1, 0, state, 0);
+ di->item.check_button.check_orig_h, 1, 0, state, 0,
+ ST_WIDGET);
else
IclassApply(di->iclass, di->item.check_button.check_win,
di->item.check_button.check_orig_w,
- di->item.check_button.check_orig_h, 0, 0, state, 0);
+ di->item.check_button.check_orig_h, 0, 0, state, 0,
+ ST_WIDGET);
XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.check_button.text,
@@ -1757,10 +1751,10 @@
case DITEM_SEPARATOR:
if (di->item.separator.horizontal)
IclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_NORMAL, 0);
+ STATE_NORMAL, 0, ST_WIDGET);
else
IclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
- STATE_CLICKED, 0);
+ STATE_CLICKED, 0, ST_WIDGET);
break;
case DITEM_RADIOBUTTON:
state = STATE_NORMAL;
@@ -1773,11 +1767,13 @@
if (di->item.radio_button.onoff)
IclassApply(di->iclass, di->item.radio_button.radio_win,
di->item.radio_button.radio_orig_w,
- di->item.radio_button.radio_orig_h, 1, 0, state, 0);
+ di->item.radio_button.radio_orig_h, 1, 0, state, 0,
+ ST_WIDGET);
else
IclassApply(di->iclass, di->item.radio_button.radio_win,
di->item.radio_button.radio_orig_w,
- di->item.radio_button.radio_orig_w, 0, 0, state, 0);
+ di->item.radio_button.radio_orig_w, 0, 0, state, 0,
+ ST_WIDGET);
XClearArea(disp, d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.radio_button.text,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- draw.c 18 May 2004 23:31:07 -0000 1.48
+++ draw.c 3 Jun 2004 18:04:44 -0000 1.49
@@ -219,7 +219,7 @@
/* printf("I %x\n", dq->win); */
if (WinExists(dq->win))
IclassApply(dq->iclass, dq->win, dq->w, dq->h, dq->active,
- dq->sticky, dq->state, 0);
+ dq->sticky, dq->state, 0, dq->image_type);
}
else if (dq->pager)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- iclass.c 30 May 2004 01:46:47 -0000 1.37
+++ iclass.c 3 Jun 2004 18:04:44 -0000 1.38
@@ -390,7 +390,7 @@
static void
ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
- int make_mask, int w, int h)
+ int make_mask, int w, int h, int image_type __UNUSED__)
{
int apply, trans;
int ww, hh;
@@ -719,7 +719,7 @@
void
IclassApply(ImageClass * iclass, Window win, int w, int h, int active,
- int sticky, int state, char expose)
+ int sticky, int state, char expose, int image_type)
{
ImageState *is;
@@ -757,6 +757,7 @@
dq->di = NULL;
dq->x = 0;
dq->y = 0;
+ dq->image_type = image_type;
AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
EDBUG_RETURN_;
}
@@ -775,7 +776,7 @@
if (is->im)
{
- ImageStateMakePmapMask(is, win, NULL, 1, w, h);
+ ImageStateMakePmapMask(is, win, NULL, 1, w, h, image_type);
if ((is->unloadable) || (Conf.memory_paranoia))
{
@@ -806,7 +807,8 @@
void
IclassApplyCopy(ImageClass * iclass, Window win, int w, int h, int active,
- int sticky, int state, PmapMask * pmm, int make_mask)
+ int sticky, int state, PmapMask * pmm, int make_mask,
+ int image_type)
{
ImageState *is;
XGCValues gcv;
@@ -835,7 +837,7 @@
if (is->im)
{
- ImageStateMakePmapMask(is, win, pmm, make_mask, w, h);
+ ImageStateMakePmapMask(is, win, pmm, make_mask, w, h, image_type);
if ((is->unloadable) || (Conf.memory_paranoia))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- iconify.c 22 May 2004 19:31:12 -0000 1.109
+++ iconify.c 3 Jun 2004 18:04:45 -0000 1.110
@@ -824,7 +824,7 @@
if (!ic)
return;
- IclassApplyCopy(ic, d, w, h, 0, 0, STATE_NORMAL, &pmm, 1);
+ IclassApplyCopy(ic, d, w, h, 0, 0, STATE_NORMAL, &pmm, 1, ST_ICONBOX);
PastePixmap(disp, d, pmm.pmap, pmm.mask, x, y);
FreePmapMask(&pmm);
}
@@ -839,8 +839,7 @@
ic = FindItem("DEFAULT_ICON_BUTTON", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (!ic)
return;
-
- IclassApplyCopy(ic, d, w, h, 0, 0, STATE_NORMAL, &pmm, 1);
+ IclassApplyCopy(ic, d, w, h, 0, 0, STATE_NORMAL, &pmm, 1, ST_ICONBOX);
PasteMask(disp, d, pmm.mask, x, y, w, h);
FreePmapMask(&pmm);
}
@@ -1623,7 +1622,10 @@
ic = FindItem("ICONBOX_SCROLLBAR_BASE_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
- IclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0);
+ {
+ IclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+ ST_ICONBOX);
+ }
ic = FindItem("ICONBOX_SCROLLBAR_KNOB_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
@@ -1634,7 +1636,8 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_SCROLLKNOB_VERTICAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1646,7 +1649,8 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_ARROW_UP", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1658,7 +1662,8 @@
state = STATE_HILITED;
if (ib->arrow1_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_ARROW_DOWN", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1670,7 +1675,8 @@
state = STATE_HILITED;
if (ib->arrow2_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
/* remove this coment when fixed */
}
@@ -1865,7 +1871,10 @@
ic = FindItem("ICONBOX_SCROLLBAR_BASE_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
- IclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0);
+ {
+ IclassApply(ic, ib->scroll_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+ ST_ICONBOX);
+ }
ic = FindItem("ICONBOX_SCROLLBAR_KNOB_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
@@ -1876,7 +1885,8 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->scrollbar_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_SCROLLKNOB_HORIZONTAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1888,7 +1898,8 @@
state = STATE_HILITED;
if (ib->scrollbar_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->scrollbarknob_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_ARROW_LEFT", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1900,7 +1911,8 @@
state = STATE_HILITED;
if (ib->arrow1_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->arrow1_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
ic = FindItem("ICONBOX_ARROW_RIGHT", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -1912,7 +1924,8 @@
state = STATE_HILITED;
if (ib->arrow2_clicked)
state = STATE_CLICKED;
- IclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0);
+ IclassApply(ic, ib->arrow2_win, -1, -1, 0, 0, state, 0,
+ ST_ICONBOX);
}
}
PropagateShapes(ib->win);
@@ -2103,7 +2116,8 @@
{
EMoveResizeWindow(disp, ib->cover_win, ib_xlt, ib_ylt, ib_ww, ib_hh);
EMapWindow(disp, ib->cover_win);
- IclassApply(ib_ic_cover, ib->cover_win, -1, -1, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ib_ic_cover, ib->cover_win, -1, -1, 0, 0, STATE_NORMAL, 0,
+ ST_ICONBOX);
}
else
{
@@ -2119,7 +2133,7 @@
GetWinWH(ib->icon_win, (unsigned int *)&w, (unsigned int *)&h);
IclassApplyCopy(ib_ic_box, ib->icon_win, w, h, 0, 0, STATE_NORMAL,
- &pmm, 1);
+ &pmm, 1, ST_ICONBOX);
EShapeCombineMask(disp, ib->icon_win, ShapeBounding, 0, 0,
pmm.mask, ShapeSet);
PastePixmap(disp, ib->pmap, pmm.pmap, pmm.mask, 0, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- ipc.c 30 May 2004 15:14:24 -0000 1.158
+++ ipc.c 3 Jun 2004 18:04:45 -0000 1.159
@@ -1295,7 +1295,7 @@
}
pq = Mode.queue_up;
Mode.queue_up = 0;
- IclassApply(iclass, win, w, h, 0, 0, st, 0);
+ IclassApply(iclass, win, w, h, 0, 0, st, 0, ST_UNKNWN);
Mode.queue_up = pq;
}
}
@@ -1337,7 +1337,7 @@
pq = Mode.queue_up;
Mode.queue_up = 0;
IclassApplyCopy(iclass, win, w, h, 0, 0, st, &pmm,
- 1);
+ 1, ST_UNKNWN);
Mode.queue_up = pq;
Esnprintf(buf, sizeof(buf), "0x%08x 0x%08x",
(unsigned)pmm.pmap, (unsigned)pmm.mask);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- menus.c 29 May 2004 19:01:58 -0000 1.134
+++ menus.c 3 Jun 2004 18:04:46 -0000 1.135
@@ -770,7 +770,7 @@
ih = 0;
GetWinWH(m->items[i]->icon_win, &iw, &ih);
IclassApply(m->items[i]->icon_iclass, m->items[i]->icon_win, iw,
- ih, 0, 0, STATE_NORMAL, 0);
+ ih, 0, 0, STATE_NORMAL, 0, ST_MENU_ITEM);
}
if (x + maxw > mmw)
mmw = x + maxw;
@@ -828,7 +828,7 @@
GetWinWH(m->win, &w, &h);
FreePmapMask(&m->pmm);
IclassApplyCopy(m->style->bg_iclass, m->win, w, h, 0, 0,
- STATE_NORMAL, &m->pmm, 1);
+ STATE_NORMAL, &m->pmm, 1, ST_MENU);
ESetWindowBackgroundPixmap(disp, m->win, m->pmm.pmap);
EShapeCombineMask(disp, m->win, ShapeBounding, 0, 0, m->pmm.mask,
ShapeSet);
@@ -884,10 +884,12 @@
if (mi->child)
IclassApplyCopy(m->style->sub_iclass, mi->win, w, h,
- 0, 0, mi->state, &pmm, 1);
+ 0, 0, mi->state, &pmm, 1,
+ ST_MENU_ITEM);
else
- IclassApplyCopy(m->style->item_iclass, mi->win, w, h,
- 0, 0, mi->state, &pmm, 1);
+ IclassApplyCopy(m->style->item_iclass, mi->win, w,
+ h, 0, 0, mi->state, &pmm, 1,
+ ST_MENU_ITEM);
if (pmm.mask)
{
XSetClipMask(disp, gc, pmm.mask);
@@ -902,11 +904,11 @@
else
{
if (mi->child)
- IclassApplyCopy(m->style->sub_iclass, mi->win, w, h, 0, 0,
- mi->state, mi_pmm, 1);
+ IclassApplyCopy(m->style->sub_iclass, mi->win, w, h, 0,
+ 0, mi->state, mi_pmm, 1, ST_MENU_ITEM);
else
- IclassApplyCopy(m->style->item_iclass, mi->win, w, h, 0, 0,
- mi->state, mi_pmm, 1);
+ IclassApplyCopy(m->style->item_iclass, mi->win, w, h, 0,
+ 0, mi->state, mi_pmm, 1, ST_MENU_ITEM);
}
}
}
@@ -932,8 +934,10 @@
if (!m->style->use_item_bg)
{
if ((mi->state != STATE_NORMAL) || (mi->child))
- IclassApply(m->style->item_iclass, mi->win, w, h, 0, 0,
- mi->state, 0);
+ {
+ IclassApply(m->style->item_iclass, mi->win, w, h, 0, 0,
+ mi->state, 0, ST_MENU);
+ }
else
{
ESetWindowBackgroundPixmap(disp, mi->win, ParentRelative);
@@ -945,11 +949,15 @@
else
{
if (mi->child)
- IclassApply(m->style->sub_iclass, mi->win, w, h, 0, 0,
- mi->state, 0);
+ {
+ IclassApply(m->style->sub_iclass, mi->win, w, h, 0, 0,
+ mi->state, 0, ST_MENU);
+ }
else
- IclassApply(m->style->item_iclass, mi->win, w, h, 0, 0,
- mi->state, 0);
+ {
+ IclassApply(m->style->item_iclass, mi->win, w, h, 0, 0,
+ mi->state, 0, ST_MENU);
+ }
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- pager.c 31 May 2004 20:06:56 -0000 1.91
+++ pager.c 3 Jun 2004 18:04:46 -0000 1.92
@@ -213,7 +213,8 @@
Mode.queue_up = 0;
ic = FindItem("PAGER_SEL", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (ic)
- IclassApply(ic, p->sel_win, p->w / ax, p->h / ay, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, p->sel_win, p->w / ax, p->h / ay, 0, 0, STATE_NORMAL, 0,
+ ST_PAGER);
Mode.queue_up = pq;
return p;
}
@@ -269,7 +270,8 @@
cy = desks.desk[p->desktop].current_area_y;
EMoveResizeWindow(disp, p->sel_win, cx * p->dw, cy * p->dh, p->dw,
p->dh);
- IclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0, STATE_NORMAL, 0,
+ ST_PAGER);
}
Mode.queue_up = pq;
@@ -532,7 +534,7 @@
ic = FindItem("PAGER_WIN", 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (ic)
IclassApplyCopy(ic, ewin->win, w, h, 0, 0, STATE_NORMAL,
- &ewin->mini_pmm, 1);
+ &ewin->mini_pmm, 1, ST_PAGER);
}
else
{
@@ -624,6 +626,7 @@
dq->di = NULL;
dq->x = 0;
dq->y = 0;
+ dq->image_type = ST_PAGER;
AddItem(dq, "DRAW", dq->win, LIST_TYPE_DRAW);
return;
}
@@ -647,7 +650,7 @@
LIST_TYPE_ICLASS);
if (ic)
IclassApplyCopy(ic, p->win, p->w / ax, p->h / ay, 0, 0,
- STATE_NORMAL, &p->bgpmap, 0);
+ STATE_NORMAL, &p->bgpmap, 0, ST_PAGER);
}
else
{
@@ -1050,7 +1053,7 @@
LIST_TYPE_ICLASS);
if (ic)
IclassApply(ic, p->sel_win, p->dw, p->dh, 0, 0,
- STATE_NORMAL, 0);
+ STATE_NORMAL, 0, ST_PAGER);
}
}
Efree(pl);
@@ -1215,7 +1218,8 @@
hh = (i * h) / w;
xx = x + ((w - ww) / 2);
yy = y + ((h - hh) / 2);
- IclassApply(ic, p->hi_win, ww, hh, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, p->hi_win, ww, hh, 0, 0, STATE_NORMAL, 0,
+ ST_PAGER);
EMoveResizeWindow(disp, p->hi_win, xx, yy, ww, hh);
XClearWindow(disp, p->hi_win);
{
@@ -1239,7 +1243,8 @@
hh = i;
xx = x + ((w - ww) / 2);
yy = y + ((h - hh) / 2);
- IclassApply(ic, p->hi_win, ww, hh, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, p->hi_win, ww, hh, 0, 0, STATE_NORMAL, 0,
+ ST_PAGER);
EMoveResizeWindow(disp, p->hi_win, xx, yy, ww, hh);
XClearWindow(disp, p->hi_win);
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/progress.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- progress.c 4 May 2004 19:04:34 -0000 1.15
+++ progress.c 3 Jun 2004 18:04:46 -0000 1.16
@@ -97,7 +97,7 @@
Mode.queue_up = 0;
TclassApply(p->inc, p->n_win, p->h * 5, p->h, 0, 0, STATE_CLICKED, 0,
p->tnc, s);
- IclassApply(p->inc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0);
+ IclassApply(p->inc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0, ST_UNKNWN);
EResizeWindow(disp, p->p_win, w, p->h);
Mode.queue_up = pq;
XFlush(disp);
@@ -119,9 +119,11 @@
w = p->w;
pq = Mode.queue_up;
Mode.queue_up = 0;
- IclassApply(p->ic, p->win, p->w - (p->h * 5), p->h, 0, 0, STATE_NORMAL, 0);
- IclassApply(p->inc, p->n_win, (p->h * 5), p->h, 0, 0, STATE_CLICKED, 0);
- IclassApply(p->ipc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0);
+ IclassApply(p->ic, p->win, p->w - (p->h * 5), p->h, 0, 0, STATE_NORMAL, 0,
+ ST_UNKNWN);
+ IclassApply(p->inc, p->n_win, (p->h * 5), p->h, 0, 0, STATE_CLICKED, 0,
+ ST_UNKNWN);
+ IclassApply(p->ipc, p->p_win, w, p->h, 1, 0, STATE_NORMAL, 0, ST_UNKNWN);
EMapRaised(disp, p->win);
EMapRaised(disp, p->n_win);
EMapRaised(disp, p->p_win);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- settings.c 30 May 2004 13:09:16 -0000 1.108
+++ settings.c 3 Jun 2004 18:04:46 -0000 1.109
@@ -1058,7 +1058,7 @@
ic = FindItem("SETTINGS_DESKTOP_AREA", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
- IclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_UNKNWN);
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
wins[i] = 0;
called = 1;
@@ -1268,13 +1268,14 @@
ic = FindItem("SETTINGS_AREA_AREA", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
- IclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, win, w, h, 0, 0, STATE_NORMAL, 0, ST_UNKNWN);
awin = ECreateWindow(win, 0, 0, 18, 14, 0);
ic = FindItem("SETTINGS_AREADESK_AREA", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
if (ic)
{
- IclassApplyCopy(ic, awin, 18, 14, 0, 0, STATE_NORMAL, &pmm, 0);
+ IclassApplyCopy(ic, awin, 18, 14, 0, 0, STATE_NORMAL, &pmm, 0,
+ ST_UNKNWN);
ESetWindowBackgroundPixmap(disp, awin, pmm.pmap);
FreePmapMask(&pmm);
}
@@ -2498,6 +2499,7 @@
{
BackgroundImagesKeep(tmp_bg, 0);
}
+ HandleDrawQueue();
autosave();
data = NULL;
@@ -2772,10 +2774,10 @@
if (i == tmp_bg_selected)
IclassApplyCopy(ic, pmap, 64 + 8, 48 + 8, 0, 0,
- STATE_CLICKED, &pmm, 0);
+ STATE_CLICKED, &pmm, 0, ST_UNKNWN);
else
IclassApplyCopy(ic, pmap, 64 + 8, 48 + 8, 0, 0,
- STATE_NORMAL, &pmm, 0);
+ STATE_NORMAL, &pmm, 0, ST_UNKNWN);
XCopyArea(disp, pmm.pmap, pmap, gc, 0, 0, 64 + 8, 48 + 8, x,
0);
FreePmapMask(&pmm);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- startup.c 4 May 2004 19:04:41 -0000 1.43
+++ startup.c 3 Jun 2004 18:04:46 -0000 1.44
@@ -219,8 +219,10 @@
pq = Mode.queue_up;
Mode.queue_up = 0;
- IclassApply(ic, b1, VRoot.w, Conf.desks.dragbar_width, 0, 0, 0, 0);
- IclassApply(ic, b2, VRoot.w, Conf.desks.dragbar_width, 0, 0, 0, 0);
+ IclassApply(ic, b1, VRoot.w, Conf.desks.dragbar_width, 0, 0, 0, 0,
+ ST_UNKNWN);
+ IclassApply(ic, b2, VRoot.w, Conf.desks.dragbar_width, 0, 0, 0, 0,
+ ST_UNKNWN);
Mode.queue_up = pq;
BackgroundApply(bg, win1, 1);
BackgroundApply(bg, win2, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- tooltips.c 15 May 2004 22:42:21 -0000 1.63
+++ tooltips.c 3 Jun 2004 18:04:46 -0000 1.64
@@ -272,7 +272,8 @@
iy = (h - ih) / 2;
EMoveResizeWindow(disp, tt->iwin, ix, iy, iw, ih);
EMapWindow(disp, tt->iwin);
- IclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL, 0);
+ IclassApply(tt->tooltippic, tt->iwin, iw, ih, 0, 0, STATE_NORMAL, 0,
+ ST_TOOLTIP);
}
else
EUnmapWindow(disp, tt->iwin);
@@ -374,13 +375,17 @@
EMoveResizeWindow(disp, tt->win, xx - ww, yy - hh, w, h);
- IclassApply(tt->s_iclass[0], tt->s_win[0], 8, 8, 0, 0, STATE_NORMAL, 0);
- IclassApply(tt->s_iclass[1], tt->s_win[1], 16, 16, 0, 0, STATE_NORMAL, 0);
- IclassApply(tt->s_iclass[2], tt->s_win[2], 24, 24, 0, 0, STATE_NORMAL, 0);
- IclassApply(tt->s_iclass[3], tt->s_win[3], 32, 32, 0, 0, STATE_NORMAL, 0);
+ IclassApply(tt->s_iclass[0], tt->s_win[0], 8, 8, 0, 0, STATE_NORMAL, 0,
+ ST_TOOLTIP);
+ IclassApply(tt->s_iclass[1], tt->s_win[1], 16, 16, 0, 0, STATE_NORMAL, 0,
+ ST_TOOLTIP);
+ IclassApply(tt->s_iclass[2], tt->s_win[2], 24, 24, 0, 0, STATE_NORMAL, 0,
+ ST_TOOLTIP);
+ IclassApply(tt->s_iclass[3], tt->s_win[3], 32, 32, 0, 0, STATE_NORMAL, 0,
+ ST_TOOLTIP);
if (Conf.theme.transparency && tt->iclass->norm.normal->transparent == 0)
tt->iclass->norm.normal->transparent = 2;
- IclassApply(tt->iclass, tt->win, w, h, 0, 0, STATE_NORMAL, 0);
+ IclassApply(tt->iclass, tt->win, w, h, 0, 0, STATE_NORMAL, 0, ST_TOOLTIP);
EMapRaised(disp, tt->s_win[0]);
EMapRaised(disp, tt->s_win[1]);
EMapRaised(disp, tt->s_win[2]);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- warp.c 4 May 2004 19:04:42 -0000 1.44
+++ warp.c 3 Jun 2004 18:04:47 -0000 1.45
@@ -240,9 +240,10 @@
EMoveResizeWindow(disp, warplist[i].win, 0, (h * i), mw, mh);
if (ewin == warplist[i].ewin)
IclassApply(ic, warplist[i].win, mw, mh, 0, 0, STATE_CLICKED,
- 0);
+ 0, ST_WARPLIST);
else
- IclassApply(ic, warplist[i].win, mw, mh, 0, 0, STATE_NORMAL, 0);
+ IclassApply(ic, warplist[i].win, mw, mh, 0, 0, STATE_NORMAL,
+ 0, ST_WARPLIST);
}
PropagateShapes(warpFocusTitleWindow);
EMapWindow(disp, warpFocusTitleWindow);
@@ -266,9 +267,10 @@
state = (ewin == warplist[i].ewin) ? STATE_CLICKED : STATE_NORMAL;
- IclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0);
- TclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0,
- tc, warplist[i].txt);
+ IclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0,
+ ST_WARPLIST);
+ TclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0, tc,
+ warplist[i].txt);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
