Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c iconify.c ipc.c pager.c
Log Message:
Mostly trivial EWin struct member renaming.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -3 -r1.304 -r1.305
--- E.h 13 Jul 2004 17:15:20 -0000 1.304
+++ E.h 13 Jul 2004 19:58:57 -0000 1.305
@@ -922,6 +922,8 @@
#define EWIN_TYPE_ICONBOX 0x04
#define EWIN_TYPE_PAGER 0x08
+#define EwinIsMapped(ewin) (ewin->state >= EWIN_STATE_MAPPED)
+
struct _ewin
{
Window win;
@@ -945,7 +947,7 @@
int num_groups;
char docked;
char sticky;
- char visible;
+ char shown;
char iconified;
char shaded;
char active;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -3 -r1.213 -r1.214
--- borders.c 5 Jul 2004 15:02:52 -0000 1.213
+++ borders.c 13 Jul 2004 19:58:58 -0000 1.214
@@ -147,7 +147,7 @@
w = ewin->w;
h = ewin->h;
if ((px >= x) && (py >= y) && (px < (x + w)) && (py < (y + h)) &&
- (ewin->visible) && (ewin->state == EWIN_STATE_MAPPED))
+ EwinIsMapped(ewin))
EDBUG_RETURN(ewin);
}
@@ -2201,9 +2201,9 @@
{
EDBUG(3, "ShowEwin");
- if (ewin->visible)
+ if (ewin->shown)
EDBUG_RETURN_;
- ewin->visible = 1;
+ ewin->shown = 1;
if (ewin->client.win)
{
@@ -2229,9 +2229,9 @@
{
EDBUG(3, "HideEwin");
- if (ewin->state != EWIN_STATE_MAPPED || !ewin->visible)
+ if (!ewin->shown || !EwinIsMapped(ewin))
EDBUG_RETURN_;
- ewin->visible = 0;
+ ewin->shown = 0;
if (GetZoomEWin() == ewin)
Zoom(NULL);
@@ -3461,7 +3461,7 @@
/* This is a hack. Maybe we should do something with expose events. */
if (mode == 0)
- if (Mode.mode == MODE_DESKSWITCH && ewin->sticky && ewin->visible)
+ if (Mode.mode == MODE_DESKSWITCH && ewin->sticky && ewin->shown)
EwinRefresh(ewin);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- iconify.c 19 Jun 2004 01:31:21 -0000 1.114
+++ iconify.c 13 Jul 2004 19:58:58 -0000 1.115
@@ -719,7 +719,7 @@
ewin->icon_h = h;
ewin->icon_pmm.pmap = ECreatePixmap(disp, ewin->win, w, h, VRoot.depth);
- if (ewin->visible)
+ if (EwinIsMapped(ewin))
{
ScaleRect(ewin->icon_pmm.pmap, ewin->win, 0, 0, 0, 0, ewin->w, ewin->h,
w, h);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- ipc.c 13 Jul 2004 17:15:20 -0000 1.168
+++ ipc.c 13 Jul 2004 19:58:58 -0000 1.169
@@ -5701,7 +5701,7 @@
border->border.top, border->border.bottom,
ewin->desktop,
ewin->num_groups, ewin->docked, ewin->sticky,
- ewin->visible, ewin->iconified, ewin->shaded,
+ ewin->shown, ewin->iconified, ewin->shaded,
ewin->active, ewin->layer, ewin->never_use_area,
ewin->floating, ewin->client.w, ewin->client.h,
ewin->client.icon_win,
@@ -5756,7 +5756,7 @@
"NeverUseArea %i FixedPos %i\n"
"Desktop %i Layer %i\n"
"Iconified %i Sticky %i Shaded %i Docked %i\n"
- "State %i Visible %i Active %i Floating %i\n"
+ "State %i Shown %i Active %i Floating %i\n"
"Member of groups %i\n",
SS(ewin->icccm.wm_name),
SS(ewin->icccm.wm_icon_name),
@@ -5791,7 +5791,7 @@
ewin->never_use_area, ewin->fixedpos,
ewin->desktop, ewin->layer,
ewin->iconified, ewin->sticky, ewin->shaded, ewin->docked,
- ewin->state, ewin->visible, ewin->active, ewin->floating,
+ ewin->state, ewin->shown, ewin->active, ewin->floating,
ewin->num_groups);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- pager.c 1 Jul 2004 21:04:42 -0000 1.99
+++ pager.c 13 Jul 2004 19:58:58 -0000 1.100
@@ -738,7 +738,7 @@
int wx, wy, ww, wh;
ewin = lst[i];
- if (!ewin->iconified && ewin->visible)
+ if (!ewin->iconified && EwinIsMapped(ewin))
{
wx = ((ewin->x + (cx * VRoot.w)) * (p->w / ax)) / VRoot.w;
wy = ((ewin->y + (cy * VRoot.h)) * (p->h / ay)) / VRoot.h;
@@ -920,7 +920,7 @@
EWin *ewin;
ewin = lst[i];
- if ((ewin->visible) && (!ewin->iconified))
+ if (!ewin->iconified && EwinIsMapped(ewin))
{
wx = ((ewin->x + (cx * VRoot.w)) * (p->w / ax)) / VRoot.w;
wy = ((ewin->y + (cy * VRoot.h)) * (p->h / ay)) / VRoot.h;
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
