Moved some more code to the X11 driver.

35 files changed