That's the plan, anyway. And I expect Wayland won't be usable for most as a daily driver until 4.22 or even 4.24, so obviously X11 will remain a high priority.

That's the plan, anyway. And I expect Wayland won't be usable for most as a daily driver until 4.22 or even 4.24, so obviously X11 will remain a high priority. And even after then, the X11 code paths will still work. Most of the difference is handled inside GDK anyway; the work we've done for Wayland support is mainly where GDK doesn't handle what we want to do, and where we've had to write libX11 code.