Use X server time to restore focus when sent to the root window (bug #2472), a bit of code cleanup and some refactoring.

(Old svn revision: 23704)