diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:36:28 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:36:28 +0100 |
| commit | a8c65ab6290d9516b733273098db50721e84bcec (patch) | |
| tree | b52b16887a35591263b19d8d0f0dc4d11b11ec03 /nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | |
| parent | ab3e1485010ecb549bb09c4321d24b391eac82a1 (diff) | |
| parent | a70ec920dd33a04b74af876444602c587fe9ec80 (diff) | |
| download | nx-libs-a8c65ab6290d9516b733273098db50721e84bcec.tar.gz nx-libs-a8c65ab6290d9516b733273098db50721e84bcec.tar.bz2 nx-libs-a8c65ab6290d9516b733273098db50721e84bcec.zip | |
Merge branch 'uli42-pr/improve_keyboard2' into 3.6.x
Attributes GH PR #743: https://github.com/ArcticaProject/nx-libs/pull/743
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Reconnect.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 4b1ae03f9..91445a383 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -584,6 +584,9 @@ Bool nxagentReconnectSession(void) goto nxagentReconnectError; } + /* Update remote XKB information */ + nxagentGetRemoteXkbExtension(); + /* if there's no keyboard definition in the options file restore the previous value. */ #ifdef DEBUG @@ -598,7 +601,8 @@ Bool nxagentReconnectSession(void) if (nxagentOption(ResetKeyboardAtResume) == 1 && (nxagentKeyboard == NULL || nxagentOldKeyboard == NULL || strcmp(nxagentKeyboard, nxagentOldKeyboard) != 0 || - strcmp(nxagentKeyboard, "query") == 0)) + strcmp(nxagentKeyboard, "query") == 0 || + strcmp(nxagentKeyboard, "clone") == 0)) { if (nxagentResetKeyboard() == 0) { @@ -616,7 +620,7 @@ Bool nxagentReconnectSession(void) } else { - nxagentResetKeycodeConversion(); + nxagentKeycodeConversionSetup(); } nxagentXkbState.Initialized = 0; |