diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-05-07 09:55:40 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-05-07 09:55:40 +0200 |
| commit | c6f84a448a84c07a2050ab594e1c64ea72a1071c (patch) | |
| tree | 4bbf00cbb9d54514d86bd26e386fe0d659555441 | |
| parent | 7e55c36f4b5d287a3fb0c592b9a52692670f9206 (diff) | |
| download | nx-libs-c6f84a448a84c07a2050ab594e1c64ea72a1071c.tar.gz nx-libs-c6f84a448a84c07a2050ab594e1c64ea72a1071c.tar.bz2 nx-libs-c6f84a448a84c07a2050ab594e1c64ea72a1071c.zip | |
Configurable keystrokes: Don't ignore first XML element in keystrokes.cfg anymore. (Fixes: #488).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/320_nxagent_configurable-keystrokes.full.patch | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4034c898f..f0ba3ddb5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ nx-libs (2:3.5.0.24-0x2go1) UNRELEASED; urgency=low + Fix: nx-libs source: not-binnmuable-all-depends-any x2goagent -> nxagent. * Update 320_nxagent_configurable-keystrokes.full.patch: The keystrokes config file's default name now is keystrokes.cfg (plural). + * Configurable keystrokes: Don't ignore first XML element in keystrokes.cfg + anymore. (Fixes: #488). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 06 May 2014 18:34:36 +0200 diff --git a/debian/patches/320_nxagent_configurable-keystrokes.full.patch b/debian/patches/320_nxagent_configurable-keystrokes.full.patch index 1f6e32832..d9f1fd796 100644 --- a/debian/patches/320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/320_nxagent_configurable-keystrokes.full.patch @@ -83,7 +83,7 @@ Description: Make nxagent-specific keyboard bindings configurable #ifdef NX_DEBUG_INPUT int nxagentDebugInputDevices = 0; -@@ -47,297 +54,527 @@ +@@ -47,297 +54,528 @@ #undef DEBUG #undef DUMP @@ -649,10 +649,11 @@ Description: Make nxagent-specific keyboard bindings configurable - { - *result = doViewportMoveUp; - } -+ while ((cur++)->stroke != KEYSTROKE_END_MARKER) { ++ while (cur->stroke != KEYSTROKE_END_MARKER) { + if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { + return cur->stroke; + } ++ cur++; + } - break; |