aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-07-22 15:28:59 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-14 00:08:33 +0100
commit5c4a001acdd67fc2c87af2b0233a8c03dd303a55 (patch)
tree7e5cae0a66ef19ce204a5384c0b2bd56d2749dd3 /nx-X11/programs
parent8b206a261c97817adf951a272035c2202f440765 (diff)
downloadnx-libs-5c4a001acdd67fc2c87af2b0233a8c03dd303a55.tar.gz
nx-libs-5c4a001acdd67fc2c87af2b0233a8c03dd303a55.tar.bz2
nx-libs-5c4a001acdd67fc2c87af2b0233a8c03dd303a55.zip
nxagent manpage: Extend keyboard documentation
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.128
1 files changed, 23 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 8167c9629..20838bdb8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -500,8 +500,29 @@ set resizing support (default: true)
.B fullscreen=<bool>
start or resume a session in fullscreen mode (default: off)
.TP 8
-.B keyboard=<string>
-set remote keyboard layout
+.B keyboard=<string> or kbtype=<string>
+
+.BR query | <model>/<layout>
+
+.RS 8
+.TP 8
+.I query
+use the default XKB keyboard layout (see below) and only allow clients
+to query the settings but prevent any changes. \fIquery\fR is
+especially helpful for setups where you need to set/modify the actual
+keyboard layout using core X protocol functions (e.g. via \fBxmodmap\fR). It is used for
+MacOS X clients to handle some keyboard problems that are special for
+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 <model>/<layout>
+use the given model and layout. You can not modify keyboard rules,
+variants or options.
+.TP 8
+If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR
+will used (rules: xfree86, layout: us, model: pc102).
+.RE
.TP 8
.B keyconv=<string>
set keycode conversion mode
@@ -542,9 +563,6 @@ enable using shared memory
.B shpix=<bool>
enable shared pixmaps support
.TP 8
-.B kbtype=<string>
-set remote keyboard type
-.TP 8
.B client=<string>
type of connecting operating system (supported: \fIlinux\fR,
\fIwindows\fR, \fIsolaris\fR and \fImacosx\fR)