> So here we don't get a MapNotify anyway when switching back and using
 > VisibilityNotify should be TRT.

Can you please try the attached patch and tell me whether it improves or
breaks things.

Thank you, martin