Wait for capabilities message from Xorg #3197
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is partly mentioned in #1816
This commit adds a stage into the Xorg connection status to wait for the capabilities message from the Xorg server.
This allows us to move the xorgxrdp version check to xrdp from the X server for better reporting to the user.
This PR needs neutrinolabs/xorgxrdp#332 to function correctly, but can be merged separately.
Currently, if the xrdp and xorgxrdp versions don't match:-
~/.xorgxrdp.$D.log
(notxrdp.log
)With both of these PRs:-
xrdp.log
Screenshot for a version mismatch:-
Corresponding
xrdp.log
:-