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

Ignore bogus unmap events (before window is mapped) and synthetic unmap events. 

- Either would fix trouble with misbehaving client (gnome-terminal
  configuration window).


SVN revision: 26932
This commit is contained in:
Kim Woelders 2006-11-03 19:29:17 +00:00
parent edf61065c6
commit ebf31bd1e5
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ewins.c
View File

@ -1151,12 +1151,23 @@ EwinEventMap(EWin * ewin, XEvent * ev)
}
static void
EwinEventUnmap(EWin * ewin)
EwinEventUnmap(EWin * ewin, XEvent * ev)
{
if (EventDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinEventUnmap %#lx st=%d: %s\n", EwinGetClientXwin(ewin),
ewin->state.state, EwinGetName(ewin));
if (ewin->state.state == EWIN_STATE_NEW)
{
Eprintf("EwinEventUnmap %#lx: Ignoring bogus Unmap event\n",
EwinGetClientXwin(ewin));
return;
}
/* Ignore synthetic events */
if (ev->xany.send_event)
return;
if (ewin->state.state == EWIN_STATE_WITHDRAWN)
return;
@ -2070,15 +2081,7 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm)
case EX_EVENT_UNMAP_GONE:
EoSetGone(ewin);
case UnmapNotify:
#if 0
if (ewin->state.state == EWIN_STATE_NEW)
{
Eprintf("EwinEventUnmap %#lx: Ignoring bogus Unmap event\n",
EwinGetClientXwin(ewin));
break;
}
#endif
EwinEventUnmap(ewin);
EwinEventUnmap(ewin, ev);
break;
case MapNotify:
@ -2194,7 +2197,7 @@ EwinHandleEventsRoot(Win win __UNUSED__, XEvent * ev, void *prm __UNUSED__)
break;
if (ev->type == EX_EVENT_UNMAP_GONE)
EoSetGone(ewin);
EwinEventUnmap(ewin);
EwinEventUnmap(ewin, ev);
break;
case DestroyNotify: