summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Savochenko <roman@oscada.org>2019-08-04 16:38:55 +0300
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2019-08-14 01:30:13 +0000
commitb75ba2ef0d61d0d356a3a0fe9e581e5aaf29b7a4 (patch)
treeeaf5cf8ec8584796351733368a4e6b90235755c8
parent78e79db9ef1d65e412ce19aa6ae19806683d0e04 (diff)
downloadtdenetwork-b75ba2ef.tar.gz
tdenetwork-b75ba2ef.zip
krfb: Add a function for appending new symbols to the actual X-server keymapHEADorigin/masterorigin/HEADmaster
This resolves bug 3014 and issue #11 Signed-off-by: Roman Savochenko <roman@oscada.org>
-rw-r--r--krfb/krfb/rfbcontroller.cc53
-rw-r--r--krfb/krfb/rfbcontroller.h1
2 files changed, 54 insertions, 0 deletions
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 750d2ecc..2e14837b 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -186,9 +186,13 @@ const int KeyboardEvent::RIGHTSHIFT = 2;
const int KeyboardEvent::ALTGR = 4;
char KeyboardEvent::ModifierState;
+static KeySym added_keysyms[0x100];
+
KeyboardEvent::KeyboardEvent(bool d, KeySym k) :
down(d),
keySym(k) {
+
+ if(k && !IsModifierKey(k)) add_keysym(k);
}
void KeyboardEvent::initKeycodes() {
@@ -223,6 +227,55 @@ void KeyboardEvent::initKeycodes() {
XFree ((char *)keymap);
}
+int KeyboardEvent::add_keysym( KeySym keysym )
+{
+ static int first = 1;
+ if(first) {
+ for(int n = 0; n < 0x100; n++)
+ added_keysyms[n] = NoSymbol;
+ first = 0;
+ }
+
+ if(keysym == NoSymbol) return 0;
+
+ /* there can be a race before MappingNotify */
+ for(int n = 0; n < 0x100; n++)
+ if(added_keysyms[n] == keysym) return n;
+
+ int minkey, maxkey, syms_per_keycode, kc, ret = 0;
+ XDisplayKeycodes(dpy, &minkey, &maxkey);
+ KeySym *keymap = XGetKeyboardMapping(dpy, minkey, (maxkey-minkey+1), &syms_per_keycode);
+
+ for(int kc = minkey+1; kc <= maxkey; kc++) {
+ int j, didmsg = 0, is_empty = 1;
+ char *str;
+ KeySym newks[8];
+
+ for(int n = 0; n < syms_per_keycode; n++) {
+ if(keymap[(kc-minkey)*syms_per_keycode+n] != NoSymbol)
+ { is_empty = 0; break; }
+ }
+ if(!is_empty) continue;
+
+ for(int i = 0; i < 8; i++) newks[i] = NoSymbol;
+ for(int i = 0; i < syms_per_keycode; i++) {
+ newks[i] = keysym;
+ if(i >= 7) break;
+ }
+
+ XChangeKeyboardMapping(dpy, kc, syms_per_keycode, newks, 1);
+
+ XFlush(dpy);
+ added_keysyms[kc] = keysym;
+ ret = kc;
+ break;
+ }
+
+ XFree(keymap);
+
+ return ret;
+}
+
/* this function adjusts the modifiers according to mod (as from modifiers) and ModifierState */
void KeyboardEvent::tweakModifiers(signed char mod, bool down) {
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index e5595311..3d3cd73c 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -74,6 +74,7 @@ public:
static void initKeycodes();
KeyboardEvent(bool d, KeySym k);
+ int add_keysym( KeySym keysym );
virtual void exec();
};