From a4473785553a06f35b005683c7d50c1ef7561b13 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 22 Jul 2017 14:44:46 +0200 Subject: nxagent manpage: Improve explanation of -noignore and -noxkblock Fixes ArcticaProject/nx-libs#257 --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1') diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index f28c1616f..8167c9629 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -421,13 +421,19 @@ disable use of shared pixmaps enable use of shared pixmaps .TP 8 .B \-noignore -don't ignore pointer and keyboard configuration changes mandated by clients +don't ignore pointer and keyboard configuration changes mandated by +clients. As a result, configuration commands like disabling the +keyboard bell (xset -b) will also affect the real X server. .TP 8 .B \-nokbreset don't reset keyboard device if the session is resumed .TP 8 .B \-noxkblock -always allow applications to change layout through XKEYBOARD +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. .TP 8 .B \-tile WxH size of image tiles (minimum allowed: 32x32) -- cgit v1.2.3 From 5c4a001acdd67fc2c87af2b0233a8c03dd303a55 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 22 Jul 2017 15:28:59 +0200 Subject: nxagent manpage: Extend keyboard documentation --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 28 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1') 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= start or resume a session in fullscreen mode (default: off) .TP 8 -.B keyboard= -set remote keyboard layout +.B keyboard= or kbtype= + +.BR query | / + +.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 / +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= set keycode conversion mode @@ -542,9 +563,6 @@ enable using shared memory .B shpix= enable shared pixmaps support .TP 8 -.B kbtype= -set remote keyboard type -.TP 8 .B client= type of connecting operating system (supported: \fIlinux\fR, \fIwindows\fR, \fIsolaris\fR and \fImacosx\fR) -- cgit v1.2.3 From a02b645b23c912f064f40b7f06a4447dd0f83e97 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 13 Nov 2017 21:06:36 +0100 Subject: nxagent manpage: extend description of keyboard option --- nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1') diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 20838bdb8..a46974104 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -518,11 +518,14 @@ settings. .TP 8 .I / 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). +variant or options. Instead preset values are used. These are +\fIxfree86\fR for rules and empty strings for variant and options. .RE +.TP 8 + +.PP +If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR will be used (rules: \fIxfree86\fR, layout: \fIus\fR, model: \fIpc102\fR, empty variant and options). + .TP 8 .B keyconv= set keycode conversion mode -- cgit v1.2.3