Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h buttons.c coords.c ecompmgr.c eobj.c ewin-ops.c ewins.c
ipc.c menus.c pager.c startup.c tooltips.c
Log Message:
Simplify handling of top-level windows - part 1.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -3 -r1.403 -r1.404
--- E.h 7 Apr 2005 16:38:55 -0000 1.403
+++ E.h 12 Apr 2005 16:43:32 -0000 1.404
@@ -501,6 +501,7 @@
int w, h;
char sticky;
char floating;
+ char shown;
#if USE_COMPOSITE
char shadow; /* Enable shadows */
unsigned int opacity;
@@ -512,8 +513,8 @@
#define EOBJ_TYPE_EWIN 0
#define EOBJ_TYPE_BUTTON 1
#define EOBJ_TYPE_DESK 2
-#define EOBJ_TYPE_OVERR 3
-#define EOBJ_TYPE_OTHER 4
+#define EOBJ_TYPE_MISC 3
+#define EOBJ_TYPE_EXT 4
#define EoGetWin(eo) ((eo)->o.win)
#define EoGetType(eo) ((eo)->o.type)
@@ -523,6 +524,7 @@
#define EoGetH(eo) ((eo)->o.h)
#define EoIsSticky(eo) ((eo)->o.sticky)
#define EoIsFloating(eo) ((eo)->o.floating)
+#define EoIsShown(eo) ((eo)->o.shown)
#define EoGetDesk(eo) ((eo)->o.desk)
#define EoGetLayer(eo) ((eo)->o.layer)
#define EoGetPixmap(eo) EobjGetPixmap(&((eo)->o))
@@ -536,6 +538,9 @@
#define EoSetFloating(eo, _f) EobjSetFloating(&((eo)->o), (_f))
#define EoSetDesk(eo, _d) EobjSetDesk(&((eo)->o), (_d))
#define EoSetLayer(eo, _l) EobjSetLayer(&((eo)->o), (_l))
+#define EoMap(eo) EobjMap(&((eo)->o))
+#define EoUnmap(eo) EobjUnmap(&((eo)->o))
+#define EoMoveResize(eo, x, y, w, h) EobjMoveResize(&((eo)->o), x, y, w, h)
#if USE_COMPOSITE
#define EoSetOpacity(eo, _o) (eo)->o.opacity = (_o)
#define EoGetOpacity(eo) ((eo)->o.opacity)
@@ -708,7 +713,6 @@
Group **groups;
char visibility;
char docked;
- char shown;
char iconified;
char shaded;
char active;
@@ -1305,8 +1309,6 @@
const char *ButtonGetName(const Button * b);
int ButtonGetRefcount(const Button * b);
int ButtonGetDesk(const Button * b);
-void ButtonGetGeometry(const Button * b, int *x, int *y,
- unsigned int *w, unsigned int *h);
int ButtonGetInfo(const Button * b, RectBox * r, int desk);
ActionClass *ButtonGetAClass(const Button * b);
Window ButtonGetWindow(const Button * b);
@@ -1528,6 +1530,9 @@
EObj *EobjRegister(Window win, int type);
void EobjUnregister(Window win);
+void EobjMap(EObj * eo);
+void EobjUnmap(EObj * eo);
+void EobjMoveResize(EObj * eo, int x, int y, int w, int h);
#if USE_COMPOSITE
Pixmap EobjGetPixmap(const EObj * eo);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- buttons.c 31 Mar 2005 23:22:02 -0000 1.56
+++ buttons.c 12 Apr 2005 16:43:34 -0000 1.57
@@ -49,14 +49,11 @@
TextClass *tclass;
char *label;
int flags;
- char visible;
char internal;
char default_show;
char used;
- int cx, cy, cw, ch;
int state;
- char expose;
Window inside_win;
Window event_win;
char destroy_inside_win;
@@ -108,7 +105,6 @@
b->tclass->ref_count++;
b->flags = flags;
- b->visible = 0;
b->geom.width.min = minw;
b->geom.width.max = maxw;
b->geom.height.min = minh;
@@ -131,12 +127,7 @@
b->default_show = 1;
b->used = 0;
b->left = 0;
- b->cx = -10;
- b->cy = -10;
- b->cw = -10;
- b->ch = -10;
b->state = 0;
- b->expose = 0;
b->ref_count = 0;
EoSetWin(b, ECreateWindow(DeskGetWin(desk), -100, -100, 50, 50, 0));
@@ -255,34 +246,14 @@
void
ButtonShow(Button * b)
{
- char move, resize;
-
ButtonCalc(b);
-
- move = 0;
- resize = 0;
- if ((EoGetX(b) != b->cx) || (EoGetY(b) != b->cy))
- move = 1;
- if ((EoGetW(b) != b->cw) || (EoGetH(b) != b->ch))
- resize = 1;
-
- if ((move) && (resize))
- EMoveResizeWindow(EoGetWin(b), EoGetX(b), EoGetY(b), EoGetW(b),
- EoGetH(b));
- else if (move)
- EMoveWindow(EoGetWin(b), EoGetX(b), EoGetY(b));
- else if (resize)
- EResizeWindow(EoGetWin(b), EoGetW(b), EoGetH(b));
+ EoMoveResize(b, EoGetX(b), EoGetY(b), EoGetW(b), EoGetH(b));
+#if 0 /* Why? */
if (EoIsSticky(b))
ERaiseWindow(EoGetWin(b));
-
+#endif
ButtonDraw(b);
- b->visible = 1;
- EMapWindow(EoGetWin(b));
- b->cx = EoGetX(b);
- b->cy = EoGetY(b);
- b->cw = EoGetW(b);
- b->ch = EoGetH(b);
+ EoMap(b);
}
void
@@ -305,8 +276,7 @@
void
ButtonHide(Button * b)
{
- EUnmapWindow(EoGetWin(b));
- b->visible = 0;
+ EoUnmap(b);
}
void
@@ -315,7 +285,7 @@
if (b->used)
return;
- if (b->visible)
+ if (EoIsShown(b))
ButtonHide(b);
else
ButtonShow(b);
@@ -324,17 +294,8 @@
void
ButtonDraw(Button * b)
{
-#if 0 /* FIXME - Remove? */
- ImageclassApply(b->iclass, EoGetWin(b), EoGetW(b), EoGetH(b), 0, 0,
b->state,
- 0, ST_BUTTON);
-
- if (b->label)
- TextclassApply(b->iclass, EoGetWin(b), EoGetW(b), EoGetH(b), 0, 0,
- b->state, 0, b->tclass, b->label);
-#else
ITApply(EoGetWin(b), b->iclass, NULL, EoGetW(b), EoGetH(b),
b->state, 0, 0, 0, ST_BUTTON, b->tclass, NULL, b->label);
-#endif
}
void
@@ -348,7 +309,6 @@
ButtonMoveToCoord(Button * b, int x, int y)
{
int rx, ry, relx, rely, absx, absy;
- char move, resize;
if (b->flags & FLAG_FIXED)
return;
@@ -381,26 +341,13 @@
b->geom.yabs = absy;
b->geom.yrel = rely;
}
+
ButtonCalc(b);
- move = 0;
- resize = 0;
- if ((EoGetX(b) != b->cx) || (EoGetY(b) != b->cy))
- move = 1;
- if ((EoGetW(b) != b->cw) || (EoGetH(b) != b->ch))
- resize = 1;
- if ((move) && (resize))
- EMoveResizeWindow(EoGetWin(b), EoGetX(b), EoGetY(b), EoGetW(b),
- EoGetH(b));
- else if (move)
- EMoveWindow(EoGetWin(b), EoGetX(b), EoGetY(b));
- else if (resize)
- EResizeWindow(EoGetWin(b), EoGetW(b), EoGetH(b));
+ EoMoveResize(b, EoGetX(b), EoGetY(b), EoGetW(b), EoGetH(b));
+#if 0 /* Why? */
if (EoIsSticky(b))
ERaiseWindow(EoGetWin(b));
- b->cx = EoGetX(b);
- b->cy = EoGetY(b);
- b->cw = EoGetW(b);
- b->ch = EoGetH(b);
+#endif
}
void
@@ -450,24 +397,10 @@
return EoGetDesk(b);
}
-void
-ButtonGetGeometry(const Button * b, int *x, int *y, unsigned int *w,
- unsigned int *h)
-{
- if (x)
- *x = EoGetX(b);
- if (y)
- *y = EoGetY(b);
- if (w)
- *w = EoGetW(b);
- if (h)
- *h = EoGetH(b);
-}
-
int
ButtonGetInfo(const Button * b, RectBox * r, int desk)
{
- if (!b->visible || b->internal)
+ if (!EoIsShown(b) || b->internal)
return -1;
if (!EoIsSticky(b) && EoGetDesk(b) != desk)
return -1;
@@ -576,7 +509,8 @@
Mode.button_move_pending = 1;
Mode.start_x = Mode.x;
Mode.start_y = Mode.y;
- ButtonGetGeometry(b, &Mode.win_x, &Mode.win_y, NULL, NULL);
+ Mode.win_x = EoGetX(b);
+ Mode.win_y = EoGetY(b);
}
static void
@@ -1062,7 +996,7 @@
fprintf(fs, "538 %i\n", blst[i]->geom.size_from_image);
fprintf(fs, "539 %i\n", EoGetDesk(blst[i]));
fprintf(fs, "540 %i\n", EoIsSticky(blst[i]));
- fprintf(fs, "542 %i\n", blst[i]->visible);
+ fprintf(fs, "542 %i\n", EoIsShown(blst[i]));
if (blst[i]->flags)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- coords.c 19 Mar 2005 16:40:00 -0000 1.24
+++ coords.c 12 Apr 2005 16:43:34 -0000 1.25
@@ -22,9 +22,7 @@
*/
#include "E.h"
-static char coords_visible = 0;
-static Window c_win = 0;
-static int cx = 0, cy = 0, cw = 0, ch = 0;
+static EObj *coord_eo = NULL;
void
CoordsShow(EWin * ewin)
@@ -34,6 +32,9 @@
char s[256], pq;
int md;
int x, y, w, h;
+ int cx, cy, cw, ch;
+ Window win;
+ EObj *eo = coord_eo;
if (!Conf.movres.mode_info)
return;
@@ -45,6 +46,8 @@
if ((!ic) || (!tc))
return;
+ cx = cy = cw = ch = 0;
+
x = ewin->shape_x;
y = ewin->shape_y;
w = (ewin->client.w - ewin->client.base_w) / ewin->client.w_inc;
@@ -52,59 +55,63 @@
Esnprintf(s, sizeof(s), "%i x %i (%i, %i)", w, h, x, y);
TextSize(tc, 0, 0, 0, s, &cw, &ch, 17);
- cw += (ic->padding.left + ic->padding.right);
- ch += (ic->padding.top + ic->padding.bottom);
+ cw += ic->padding.left + ic->padding.right;
+ ch += ic->padding.top + ic->padding.bottom;
- cx = 0;
- cy = 0;
- if (ewin)
- {
- if (Mode.mode == MODE_MOVE)
- md = Conf.movres.mode_move;
- else
- md = Conf.movres.mode_resize;
+ if (Mode.mode == MODE_MOVE)
+ md = Conf.movres.mode_move;
+ else
+ md = Conf.movres.mode_resize;
- if ((md == 0) || ((cw < ewin->client.w) && (ch < ewin->client.h)))
+ if ((md == 0) || ((cw < ewin->client.w) && (ch < ewin->client.h)))
+ {
+ if (Conf.movres.mode_info == 1)
{
- if (Conf.movres.mode_info == 1)
+ switch (md)
{
- switch (md)
- {
- case 0:
- case 1:
- case 2:
- cx = x + ((EoGetW(ewin) - cw) / 2) +
- DeskGetX(EoGetDesk(ewin));
- cy = y + ((EoGetH(ewin) - ch) / 2) +
- DeskGetY(EoGetDesk(ewin));
- break;
- }
+ case 0:
+ case 1:
+ case 2:
+ cx = x + ((EoGetW(ewin) - cw) / 2) +
+ DeskGetX(EoGetDesk(ewin));
+ cy = y + ((EoGetH(ewin) - ch) / 2) +
+ DeskGetY(EoGetDesk(ewin));
+ break;
}
}
}
- if (!c_win)
- c_win = ECreateWindow(VRoot.win, 0, 0, 1, 1, 2);
+ if (!eo)
+ {
+ win = ECreateWindow(VRoot.win, 0, 0, 1, 1, 2);
+ eo = EobjRegister(win, EOBJ_TYPE_MISC);
+ if (!eo)
+ return;
+ EobjSetLayer(eo, 10);
+ EobjSetFloating(eo, 1);
+ EobjListStackRaise(eo);
+ coord_eo = eo;
+ }
- EMoveResizeWindow(c_win, cx, cy, cw, ch);
- ERaiseWindow(c_win);
+ EobjMoveResize(eo, cx, cy, cw, ch);
- if (!coords_visible)
- EMapWindow(c_win);
- coords_visible = 1;
+ if (!eo->shown)
+ EobjMap(eo);
pq = Mode.queue_up;
Mode.queue_up = 0;
- ImageclassApply(ic, c_win, cw, ch, 1, 0, STATE_NORMAL, 0, ST_UNKNWN);
- TextclassApply(ic, c_win, cw, ch, 0, 0, STATE_NORMAL, 0, tc, s);
+ ImageclassApply(ic, eo->win, cw, ch, 1, 0, STATE_NORMAL, 0, ST_UNKNWN);
+ TextclassApply(ic, eo->win, cw, ch, 0, 0, STATE_NORMAL, 0, tc, s);
Mode.queue_up = pq;
+
XFlush(disp);
}
void
CoordsHide(void)
{
- if (c_win)
- EUnmapWindow(c_win);
- coords_visible = 0;
+ EObj *eo = coord_eo;
+
+ if (eo && eo->shown)
+ EobjUnmap(eo);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ecompmgr.c 7 Apr 2005 21:05:59 -0000 1.19
+++ ecompmgr.c 12 Apr 2005 16:43:34 -0000 1.20
@@ -2064,7 +2064,7 @@
case MapNotify:
eo = EobjListStackFind(ev->xmap.window);
if (!eo)
- eo = EobjRegister(ev->xmap.window, EOBJ_TYPE_OVERR);
+ eo = EobjRegister(ev->xmap.window, EOBJ_TYPE_EXT);
else
EobjListStackRaise(eo); /* FIXME - Use
Configure/CirculateNotify */
if (eo)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- eobj.c 24 Mar 2005 23:38:08 -0000 1.15
+++ eobj.c 12 Apr 2005 16:43:35 -0000 1.16
@@ -34,7 +34,8 @@
return EwinGetName((EWin *) eo);
case EOBJ_TYPE_BUTTON:
return ButtonGetName((Button *) eo);
- case EOBJ_TYPE_OVERR:
+ case EOBJ_TYPE_MISC:
+ case EOBJ_TYPE_EXT:
return eo->name;
}
}
@@ -113,8 +114,8 @@
eo->floating = 1;
break;
case EOBJ_TYPE_DESK:
- case EOBJ_TYPE_OVERR:
- case EOBJ_TYPE_OTHER:
+ case EOBJ_TYPE_MISC:
+ case EOBJ_TYPE_EXT:
eo->ilayer = 10 * eo->layer;
break;
}
@@ -219,7 +220,7 @@
if (EventDebug(EDBUG_TYPE_EWINS))
Eprintf("EobjRegister: %#lx %s\n", win, eo->name);
- if (type == EOBJ_TYPE_OVERR)
+ if (type == EOBJ_TYPE_EXT)
EobjSetFloating(eo, 1);
EobjSetLayer(eo, 4);
EobjListStackAdd(eo, 1);
@@ -236,7 +237,7 @@
if (!eo)
return;
#if 0
- if (eo->type != EOBJ_TYPE_OVERR)
+ if (eo->type != EOBJ_TYPE_EXT)
return;
#endif
@@ -248,6 +249,47 @@
EobjDestroy(eo);
}
+void
+EobjMap(EObj * eo)
+{
+ if (eo->shown)
+ return;
+ eo->shown = 1;
+
+ EMapWindow(eo->win);
+}
+
+void
+EobjUnmap(EObj * eo)
+{
+ if (!eo->shown)
+ return;
+ eo->shown = 0;
+
+ EUnmapWindow(eo->win);
+}
+
+void
+EobjMoveResize(EObj * eo, int x, int y, int w, int h)
+{
+ eo->x = x;
+ eo->y = y;
+ eo->w = w;
+ eo->h = h;
+ if (eo->type == EOBJ_TYPE_EWIN)
+ {
+ if (EventDebug(250))
+ EDrawableDumpImage(eo->win, "Win1");
+ ExMoveResizeWindow(eo, x, y, w, h);
+ if (EventDebug(250))
+ EDrawableDumpImage(eo->win, "Win2");
+ }
+ else
+ {
+ EMoveResizeWindow(eo->win, x, y, w, h);
+ }
+}
+
#if USE_COMPOSITE
Pixmap
EobjGetPixmap(const EObj * eo)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewin-ops.c 31 Mar 2005 19:04:35 -0000 1.21
+++ ewin-ops.c 12 Apr 2005 16:43:35 -0000 1.22
@@ -320,12 +320,7 @@
}
}
- if (EventDebug(250))
- EDrawableDumpImage(ewin->o.win, "Win1");
- ExMoveResizeWindow(&ewin->o, EoGetX(ewin), EoGetY(ewin),
- EoGetW(ewin), EoGetH(ewin));
- if (EventDebug(250))
- EDrawableDumpImage(ewin->o.win, "Win2");
+ EoMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), EoGetW(ewin), EoGetH(ewin));
if (ewin->shaded == 0)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewins.c 3 Apr 2005 15:46:42 -0000 1.37
+++ ewins.c 12 Apr 2005 16:43:35 -0000 1.38
@@ -1092,7 +1092,7 @@
ewin->state = EWIN_STATE_ICONIC;
else
ewin->state = EWIN_STATE_WITHDRAWN;
- ewin->shown = 0;
+ ewin->o.shown = 0; /* FIXME - TBD */
ActionsEnd(ewin);
@@ -1548,35 +1548,33 @@
void
ShowEwin(EWin * ewin)
{
- if (ewin->shown)
+ if (EoIsShown(ewin))
return;
- ewin->shown = 1;
if (ewin->client.win)
{
+#if 0 /* FIXME - Why? */
if (ewin->shaded)
EMoveResizeWindow(ewin->win_container, -30, -30, 1, 1);
+#endif
EMapWindow(ewin->client.win);
}
- if (EoGetWin(ewin))
- EMapWindow(EoGetWin(ewin));
+ EoMap(ewin);
}
void
HideEwin(EWin * ewin)
{
- if (!ewin->shown || !EwinIsMapped(ewin))
+ if (!EoIsShown(ewin) || !EwinIsMapped(ewin))
return;
- ewin->shown = 0;
if (GetZoomEWin() == ewin)
Zoom(NULL);
EUnmapWindow(ewin->client.win);
- if (EoGetWin(ewin))
- EUnmapWindow(EoGetWin(ewin));
+ EoUnmap(ewin);
}
Window
@@ -1764,7 +1762,8 @@
/* This is a hack. Maybe we should do something with expose events. */
if (mode)
- if (Mode.mode == MODE_DESKSWITCH && EoIsSticky(ewin) && ewin->shown)
+ if (Mode.mode == MODE_DESKSWITCH && EoIsSticky(ewin) &&
+ EoIsShown(ewin))
EwinRefresh(ewin);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -3 -r1.212 -r1.213
--- ipc.c 31 Mar 2005 19:04:35 -0000 1.212
+++ ipc.c 12 Apr 2005 16:43:36 -0000 1.213
@@ -1012,7 +1012,7 @@
border->border.top, border->border.bottom,
EoGetDesk(ewin),
ewin->num_groups, ewin->docked, EoIsSticky(ewin),
- ewin->shown, ewin->iconified, ewin->shaded,
+ EoIsShown(ewin), ewin->iconified, ewin->shaded,
ewin->active, EoGetLayer(ewin), ewin->never_use_area,
EoIsFloating(ewin), ewin->client.w, ewin->client.h,
ewin->client.icon_win,
@@ -1118,7 +1118,7 @@
ewin->never_use_area, ewin->fixedpos, EoGetDesk(ewin),
EoGetLayer(ewin), ewin->o.ilayer,
ewin->iconified, EoIsSticky(ewin), ewin->shaded,
- ewin->docked, ewin->state, ewin->shown, ewin->active,
+ ewin->docked, ewin->state, EoIsShown(ewin), ewin->active,
EoIsFloating(ewin), ewin->num_groups, ewin->ewmh.opacity
#if USE_COMPOSITE
, EoGetOpacity(ewin), EoGetShadow(ewin)
@@ -1187,6 +1187,30 @@
}
static void
+IPC_ObjInfo(const char *params __UNUSED__, Client * c __UNUSED__)
+{
+ int i, num;
+ EObj *const *lst, *eo;
+
+ lst = EobjListStackGet(&num);
+
+ IpcPrintf("Num window T L D pos size S F C Name\n");
+ for (i = 0; i < num; i++)
+ {
+ eo = lst[i];
+ IpcPrintf(" %2d %#lx %d %3d %2d %5d,%5d %4dx%4d %d %d %d %s\n", i,
+ eo->win, eo->type, eo->ilayer, eo->desk,
+ eo->x, eo->y, eo->w, eo->h, eo->sticky, eo->floating,
+#if USE_COMPOSITE
+ (eo->cmhook) ? 1 : 0,
+#else
+ 0,
+#endif
+ EobjGetName(eo));
+ }
+}
+
+static void
IPC_Reparent(const char *params, Client * c __UNUSED__)
{
char param1[FILEPATH_LEN_MAX];
@@ -1467,6 +1491,8 @@
{
IPC_EwinInfo2, "win_info", "wi", "Show client window info", NULL},
{
+ IPC_ObjInfo, "obj_info", "oi", "Show window object info", NULL},
+ {
IPC_Reparent,
"reparent", "rep",
"Reparent window",
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- menus.c 31 Mar 2005 21:20:38 -0000 1.181
+++ menus.c 12 Apr 2005 16:43:38 -0000 1.182
@@ -1001,7 +1001,7 @@
Mode_menus.cover_win =
ECreateEventWindow(ewin->parent, 0, 0, VRoot.w, VRoot.h);
Mode_menus.win_covered = EoGetWin(ewin);
- eo = EobjRegister(Mode_menus.cover_win, EOBJ_TYPE_OVERR);
+ eo = EobjRegister(Mode_menus.cover_win, EOBJ_TYPE_MISC);
EobjSetDesk(eo, EoGetDesk(ewin));
EobjSetLayer(eo, 2);
EobjSetFloating(eo, 1);
@@ -1621,7 +1621,7 @@
ewin = FindItem(NULL, m->win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
if (!ewin)
return;
- if (!ewin->shown)
+ if (!EoIsShown(ewin))
return;
mi = data->mi;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- pager.c 3 Apr 2005 15:46:42 -0000 1.125
+++ pager.c 12 Apr 2005 16:43:38 -0000 1.126
@@ -432,7 +432,7 @@
int wx, wy, ww, wh;
ewin = lst[i];
- if (!ewin->iconified && ewin->shown)
+ if (!ewin->iconified && EoIsShown(ewin))
{
wx = ((EoGetX(ewin) +
(cx * VRoot.w)) * (p->w / ax)) / VRoot.w;
@@ -883,7 +883,7 @@
EWin *ewin;
ewin = lst[i];
- if (!ewin->iconified && ewin->shown)
+ if (!ewin->iconified && EoIsShown(ewin))
{
wx = ((EoGetX(ewin) + (cx * VRoot.w)) * (p->w / ax)) / VRoot.w;
wy = ((EoGetY(ewin) + (cy * VRoot.h)) * (p->h / ay)) / VRoot.h;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- startup.c 19 Mar 2005 16:40:17 -0000 1.51
+++ startup.c 12 Apr 2005 16:43:39 -0000 1.52
@@ -95,10 +95,10 @@
EMapRaised(w1);
EMapRaised(w2);
- eo = EobjRegister(w1, EOBJ_TYPE_OTHER);
+ eo = EobjRegister(w1, EOBJ_TYPE_MISC);
EobjSetFloating(eo, 1);
EobjListStackRaise(eo);
- eo = EobjRegister(w2, EOBJ_TYPE_OTHER);
+ eo = EobjRegister(w2, EOBJ_TYPE_MISC);
EobjSetFloating(eo, 1);
EobjListStackRaise(eo);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- tooltips.c 19 Mar 2005 16:40:17 -0000 1.72
+++ tooltips.c 12 Apr 2005 16:43:39 -0000 1.73
@@ -89,7 +89,7 @@
tt->win = ECreateWindow(VRoot.win, -10, -100, 1, 1, 1);
tt->iwin = ECreateWindow(tt->win, -10, -100, 1, 1, 1);
#if USE_COMPOSITE
- eo = EobjRegister(tt->win, EOBJ_TYPE_OVERR);
+ eo = EobjRegister(tt->win, EOBJ_TYPE_MISC);
eo->opacity = OpacityExt(Conf_tooltips.opacity);
#endif
@@ -105,7 +105,7 @@
win = ECreateWindow(VRoot.win, -10, -100, wh, wh, 1);
tt->s_iclass[i]->ref_count++;
#if USE_COMPOSITE
- eo = EobjRegister(win, EOBJ_TYPE_OVERR);
+ eo = EobjRegister(win, EOBJ_TYPE_MISC);
eo->opacity = OpacityExt(Conf_tooltips.opacity);
#endif
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
