Moving all the X11-specific "fgDisplay" structure fields into their substructure...