aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/man
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-19 12:36:28 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-19 12:36:28 +0100
commita8c65ab6290d9516b733273098db50721e84bcec (patch)
treeb52b16887a35591263b19d8d0f0dc4d11b11ec03 /nx-X11/programs/Xserver/hw/nxagent/man
parentab3e1485010ecb549bb09c4321d24b391eac82a1 (diff)
parenta70ec920dd33a04b74af876444602c587fe9ec80 (diff)
downloadnx-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/man')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.120
1 files changed, 16 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 892248d60..938c2eb57 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -525,8 +525,8 @@ don't reset keyboard device if the session is resumed
this is only relevant if you also specify \-keyboard=query. In that
case \fBnxagent\fR will lock the keyboard settings and clients will
get an error when trying to change keyboard settings via
-XKEYBOARD. With \-noxkblock the lock is not applied and clients can
-change the keyboard settings through XKEYBOARD.
+XKEYBOARD. With \-noxkblock the lock is not applied and clients are
+allowed change the keyboard settings through XKEYBOARD.
.TP 8
.B \-tile WxH
size of image tiles (minimum allowed: 32x32)
@@ -603,7 +603,7 @@ start or resume a session in fullscreen mode (default: off)
.TP 8
.B keyboard=<string> or kbtype=<string>
-.BR query | <model>/<layout>
+.BR query | clone | <model>/<layout> | rmlvo/<rules>#<model>#<layout>#<variant>#<options>
.RS 8
.TP 8
@@ -617,10 +617,22 @@ this platform. Note that in this case XKEYBOARD will always report
the default layout which will most likely not match the experienced
settings.
.TP 8
+.I clone
+ask the real X server for the keyboard settings using XKEYBOARD
+protocol functions and clone them. This is the recommended setting. For
+compatibility reasons it is not the default.
+.TP 8
.I <model>/<layout>
use the given model and layout. You can not modify keyboard rules,
-variant or options. Instead preset values are used. These are
+variant or options this way. Instead preset values are used. These are
\fIbase\fR for rules and empty strings for variant and options.
+.TP 8
+.I rmlvo/<rules>#<model>#<layout>#<variant>#<options>
+configure the keyboard according to the rmlvo
+(Rules+Model+Layout+Variant+Options) description given after the / and
+separated by #. This can be used to fully pass the keyboard
+configuration of \fBnxagent\fR right after the start. Example:
+rmlvo/base#pc105#de,us#nodeadkeys#lv3:rwin_switch
.RE
.TP 8