e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Eliminate EwinIsMapped() and EwinGetDesk(). 

SVN revision: 59969
This commit is contained in:
Kim Woelders 2011-06-05 14:53:55 +00:00
parent 89d43e4f1b
commit 34910b33bc
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ewins.c
View File

@ -507,7 +507,7 @@ GetEwinPointerInClient(void)
w = EoGetW(ewin);
h = EoGetH(ewin);
if ((px >= x) && (py >= y) && (px < (x + w)) && (py < (y + h)) &&
EwinIsMapped(ewin))
EoIsMapped(ewin))
return ewin;
}
@ -1523,7 +1523,7 @@ EwinShow(EWin * ewin)
void
EwinHide(EWin * ewin)
{
if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin)))
if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EoIsMapped(ewin)))
return;
EwinUnmap1(ewin);
@ -2155,7 +2155,7 @@ EwinsTouch(Desk * dsk)
for (i = num - 1; i >= 0; i--)
{
ewin = lst[i];
if (EwinIsMapped(ewin) && EwinIsOnScreen(ewin))
if (EoIsMapped(ewin) && EwinIsOnScreen(ewin))
#if 1 /* FIXME - Which one? */
EwinMove(ewin, EoGetX(ewin), EoGetY(ewin));
#else

3
src/ewins.h
View File

@ -286,9 +286,6 @@ struct _ewin {
#define EWIN_GRAVITY_SW 2
#define EWIN_GRAVITY_SE 3
#define EwinIsMapped(ewin) EoIsMapped(ewin)
#define EwinGetDesk(ewin) EoGetDesk(ewin)
#define EwinIsInternal(ewin) ((ewin)->type != EWIN_TYPE_NORMAL)
#define EwinIsTransientChild(ewin) ((ewin)->icccm.transient > 0)
#define EwinIsTransient(ewin) ((ewin)->icccm.transient != 0)

2
src/focus.c
View File

@ -83,7 +83,7 @@ FocusEwinValid(EWin * ewin, int want_on_screen, int click, int want_visible)
if (ewin->state.inhibit_focus)
return 0;
if (!EwinIsMapped(ewin) || !EoIsShown(ewin))
if (!EoIsMapped(ewin) || !EoIsShown(ewin))
return 0;
if (ewin->props.focusclick && !click)

2
src/menus-misc.c
View File

@ -506,7 +506,7 @@ MenuCheckShowEwinDesk(EWin * ewin, void *prm)
{
if (!EwinGetTitle(ewin) || ewin->props.skip_winlist)
return 0;
return !prm || EwinGetDesk(ewin) == prm;
return !prm || EoGetDesk(ewin) == prm;
}
static void

2
src/menus.c
View File

@ -1291,7 +1291,7 @@ MenuEventKeyPress(Menu * m, XEvent * ev)
if (!m || m->num <= 0)
break;
ewin = m->ewin;
if (!ewin || !EwinIsMapped(ewin))
if (!ewin || !EoIsMapped(ewin))
break;
mi = MenuFindItemByChild(m, m->child);
goto check_activate;