hw/xwin: misc fixes

Merged Jon Turney requested to merge jturney/xserver:xwin-misc-fixes into master

Various minor fixes

Edited by Jon Turney

Merge request reports