Change som macros to functions, adding check to avoid segv in certain (debug) situations.

SVN revision: 24444
This commit is contained in:
Kim Woelders 2006-08-07 20:26:05 +00:00
parent 32eed4b5a2
commit ca544e09ba
2 changed files with 19 additions and 2 deletions

View File

@ -59,6 +59,22 @@ static void EwinHandleEventsToplevel(Win win, XEvent * ev, void *prm);
static void EwinHandleEventsContainer(Win win, XEvent * ev, void *prm);
static void EwinHandleEventsClient(Win win, XEvent * ev, void *prm);
Window
EwinGetClientXwin(const EWin * ewin)
{
Win win = EwinGetClientWin(ewin);
return (win) ? WinGetXwin(win) : None;
}
Window
EwinGetContainerXwin(const EWin * ewin)
{
Win win = EwinGetContainerWin(ewin);
return (win) ? WinGetXwin(win) : None;
}
static void
EwinEventsConfigure(EWin * ewin, int mode)
{

View File

@ -276,9 +276,7 @@ struct _ewin
#define EwinGetWindowGroup(ewin) ((ewin)->icccm.group)
#define EwinGetClientWin(ewin) ((ewin)->client.win)
#define EwinGetClientXwin(ewin) Xwin((ewin)->client.win)
#define EwinGetContainerWin(ewin) ((ewin)->win_container)
#define EwinGetContainerXwin(ewin) Xwin((ewin)->win_container)
/* ewins.c */
#define EWIN_CHANGE_NAME (1<<0)
@ -289,6 +287,9 @@ struct _ewin
#define EWIN_CHANGE_OPACITY (1<<5)
#define EWIN_CHANGE_ATTENTION (1<<6)
Window EwinGetClientXwin(const EWin * ewin);
Window EwinGetContainerXwin(const EWin * ewin);
void EwinShapeSet(EWin * ewin);
void EwinRaise(EWin * ewin);
void EwinLower(EWin * ewin);