25 lines
731 B
Diff
25 lines
731 B
Diff
|
Author: Michal Srb <msrb@suse.com>
|
||
|
|
Subject: Do not send ascii control characters for CTRL+[A-Z] combinations.
|
||
|
|
Patch-Mainline: To be upstreamed
|
||
|
|
References: bnc#864666
|
||
|
|
|
||
|
|
Index: vncviewer/Viewport.cxx
|
||
|
|
===================================================================
|
||
|
|
--- vncviewer/Viewport.cxx (revision 5162)
|
||
|
|
+++ vncviewer/Viewport.cxx (working copy)
|
||
|
|
@@ -753,7 +753,13 @@
|
||
|
|
return XK_VoidSymbol;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ucs = fl_utf8decode(keyText, NULL, NULL);
|
||
|
|
+ if (keyCode >= 'a' && keyCode <= 'z' && keyText[0] < 0x20) {
|
||
|
|
+ // Do not send ascii control characters - send the original key combination that caused them.
|
||
|
|
+ ucs = keyCode;
|
||
|
|
+ } else {
|
||
|
|
+ ucs = fl_utf8decode(keyText, NULL, NULL);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
return ucs2keysym(ucs);
|
||
|
|
}
|
||
|
|
|