Complete the work started in #1778.
this ticket has been moved to: https://github.com/Xpra-org/xpra/issues/2578