Add some new members to window structure in window.h.