More evdev keyboard changes #333
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The single call to rdpkeybDeviceInit() in rdpkeybControl() initialises some local variables which are then unused. This commit removes the local variables, the call to rdpkeybDeviceInit() and the dependences of rdpkeybDeviceInit() which are not used elsewhere.
The keyboard layout is set when the keyboard is initialised and when a client connects. When the X server is started and the keyboard is initialised, client layout info is unavailable. Therefore, a default layout is set. Subsequent calls are made when a client connects to the X server. These calls set the client layout for the currently connected RDP client. The amount of time which may elapse between the X server starting and the first RDP client connecting may be considerable - a session could be started without a client using xrdp-sesrun. Or, it may be only a second or so, if the X server is started by a connection to xrdp. The two codepaths for setting the layout are separate. The initialisation codepath appears to be deficient in that the layout is not also set on inputInfo.keyboard. This seems to cause problems where X11 clients can end up loading the wrong layout where an RDP client has not yet connected. See (for example):- neutrinolabs/xrdp#1721 This is pretty rare, but when it happens is difficult to debug. This commit unifies the codepaths so that the same code is always used when the layout changes.
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes neutrinolabs/xrdp#1721
This commit removes some unused code from the keyboard driver, and fixes a rare race condition between the Xorg server starting and the first RDP client connecting (see neutrinolabs/xrdp#1721)
Keyboard layout logging is also somewhat improved. On X server startup, a line like this is logged:-
Following a client connect, the change is logged:-