By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Deleting the entered additional keys at achievement the limit and at exit.

krfb-new_symbols_appending.patch (text/plain), 2.95 KB, created by Roman Savochenko on 2020-01-06 13:17:25 CST

(hide)

Description: Deleting the entered additional keys at achievement the limit and at exit.

Filename:

MIME Type:

Creator: Roman Savochenko

Created: 2020-01-06 13:17:25 CST

Size: 2.95 KB

patch

obsolete

>--- tdenetwork-trinity-14.0.7/krfb/krfb/rfbcontroller.cc~ 2020-01-04 08:29:05.255495511 +0200 >+++ tdenetwork-trinity-14.0.7/krfb/krfb/rfbcontroller.cc 2020-01-04 08:28:17.831628202 +0200 >@@ -183,14 +183,13 @@ > const int KeyboardEvent::RIGHTSHIFT = 2; > const int KeyboardEvent::ALTGR = 4; > char KeyboardEvent::ModifierState; >- >-static KeySym added_keysyms[0x100]; >+KeySym KeyboardEvent::added_keysyms[0x100]; > > KeyboardEvent::KeyboardEvent(bool d, KeySym k) : > down(d), > keySym(k) { > >- if(k && !IsModifierKey(k)) add_keysym(k); >+ if(k && !IsModifierKey(k) && XKeysymToKeycode(dpy,k) == NoSymbol) add_keysym(k); > } > > void KeyboardEvent::initKeycodes() { >@@ -242,17 +241,18 @@ > > int minkey, maxkey, syms_per_keycode, kc, ret = 0; > XDisplayKeycodes(dpy, &minkey, &maxkey); >+ >+ repeate: > KeySym *keymap = XGetKeyboardMapping(dpy, minkey, (maxkey-minkey+1), &syms_per_keycode); > >+ bool is_empty = true; > 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++) { >+ is_empty = true; >+ for(int n = 0; n < syms_per_keycode; n++) > if(keymap[(kc-minkey)*syms_per_keycode+n] != NoSymbol) >- { is_empty = 0; break; } >- } >+ { is_empty = false; break; } > if(!is_empty) continue; > > for(int i = 0; i < 8; i++) newks[i] = NoSymbol; >@@ -268,12 +268,36 @@ > ret = kc; > break; > } >- > XFree(keymap); > >+ if(!is_empty) { delete_added_keycodes(); goto repeate; } >+ > return ret; > } > >+void KeyboardEvent::delete_added_keycodes( ) >+{ >+ for(int kc = 0; kc < 0x100; kc++) >+ if(added_keysyms[kc] != NoSymbol) { >+ added_keysyms[kc] = NoSymbol; >+ >+ int minkey, maxkey, syms_per_keycode, i; >+ KeySym *keymap; >+ KeySym ksym, newks[8]; >+ char *str; >+ >+ XDisplayKeycodes(dpy, &minkey, &maxkey); >+ keymap = XGetKeyboardMapping(dpy, minkey, (maxkey - minkey + 1), &syms_per_keycode); >+ >+ for (i = 0; i < 8; i++) newks[i] = NoSymbol; >+ >+ XChangeKeyboardMapping(dpy, kc, syms_per_keycode, newks, 1); >+ >+ XFree(keymap); >+ XFlush(dpy); >+ } >+} >+ > /* this function adjusts the modifiers according to mod (as from modifiers) and ModifierState */ > void KeyboardEvent::tweakModifiers(signed char mod, bool down) { > >@@ -431,6 +455,8 @@ > > RFBController::~RFBController() > { >+ KeyboardEvent::delete_added_keycodes(); >+ > stopServer(); > } > >--- tdenetwork-trinity-14.0.7/krfb/krfb/rfbcontroller.h~ 2020-01-04 08:29:09.787480501 +0200 >+++ tdenetwork-trinity-14.0.7/krfb/krfb/rfbcontroller.h 2020-01-04 08:28:17.831628202 +0200 >@@ -67,13 +67,15 @@ > static const int RIGHTSHIFT; > static const int ALTGR; > static char ModifierState; >+ static KeySym added_keysyms[0x100]; > > static void tweakModifiers(signed char mod, bool down); > public: > static void initKeycodes(); > > KeyboardEvent(bool d, KeySym k); >- int add_keysym( KeySym keysym ); >+ static int add_keysym( KeySym keysym ); >+ static void delete_added_keycodes( ); > virtual void exec(); > }; > View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]