diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-27 02:33:47 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-27 02:33:47 +0200 |
| commit | 45d9d2405eb7b2ab9e3fa67f1a7833843c400e1d (patch) | |
| tree | fd17b6b04b0ea9a3fcbc67430be3f9aba4873796 /debian/patches | |
| parent | 034bd9407c7a040c012173641c260dfa2843e505 (diff) | |
| download | nx-libs-45d9d2405eb7b2ab9e3fa67f1a7833843c400e1d.tar.gz nx-libs-45d9d2405eb7b2ab9e3fa67f1a7833843c400e1d.tar.bz2 nx-libs-45d9d2405eb7b2ab9e3fa67f1a7833843c400e1d.zip | |
README.keystrokes: add documentation for branding behavior.
Backported from Arctica GH 3.6.x branch.
Affects:
- 0320_nxagent_configurable-keystrokes.full.patch
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0320_nxagent_configurable-keystrokes.full.patch | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch index 3d08b3e00..475b9d0c4 100644 --- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch @@ -904,7 +904,7 @@ Description: Make nxagent-specific keyboard bindings configurable #endif /* __Keystroke_H__ */ --- /dev/null +++ b/README.keystrokes -@@ -0,0 +1,94 @@ +@@ -0,0 +1,102 @@ +Configurable keybindings in nxagent + +Keybindings in the redistributed x2go version of nxagent can now be configured @@ -913,13 +913,21 @@ Description: Make nxagent-specific keyboard bindings configurable +File location +------------- + -+nxagent searches for the configuration file in the following order: ++nxagent parses the first available configuration file and ignores all others. ++ ++If nxagent is called without branding, it searches: +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.nx/config/keystrokes.cfg +- in /etc/nxagent/keystrokes.cfg + -+If none of those files is accessible, the default configuration is used which ++If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches: ++- in the location given by the '-keystrokefile' command line parameter ++- in the location given by the NXAGENT_KEYSTROKEFILE environment variable ++- in ~/.x2go/config/keystrokes.cfg ++- in /etc/x2go/keystrokes.cfg ++ ++If none of these files are accessible, the default configuration is used which +is the same as the old, traditional nxagent keybindings. + +File format |