aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Options.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-11-26 08:35:55 +0100
committerMihai Moldovan <ionic@ionic.de>2017-11-26 08:35:55 +0100
commit7f777e01e3bb8780ba91e70171a0aae78a95692e (patch)
treed7f160a956061a73d8636a1cf53078464ce2bf2e /nx-X11/programs/Xserver/hw/nxagent/Options.c
parent2e724702e004abf5df1061dd799c9349edc2b099 (diff)
parent66046f138cf816d4f0bd7ddd9faac772acb22a97 (diff)
downloadnx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.tar.gz
nx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.tar.bz2
nx-libs-7f777e01e3bb8780ba91e70171a0aae78a95692e.zip
Merge branch 'uli42-pr/nokeyconv' into 3.6.x
Attributes GH PR #556: https://github.com/ArcticaProject/nx-libs/pull/556
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Options.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Options.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index 978f3ab95..3464fdb10 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -168,6 +168,8 @@ void nxagentInitOptions()
nxagentOptions.SleepTime = DEFAULT_SLEEP_TIME;
nxagentOptions.ReconnectTolerance = DEFAULT_TOLERANCE;
+
+ nxagentOptions.KeycodeConversion = DEFAULT_KEYCODE_CONVERSION;
}
/*
@@ -193,6 +195,8 @@ void nxagentResetOptions()
nxagentOptions.WMBorderWidth = -1;
nxagentOptions.WMTitleHeight = -1;
+
+ nxagentOptions.KeycodeConversion = DEFAULT_KEYCODE_CONVERSION;
}
void nxagentSaveOptions()