Skip to content

Commit

Permalink
#1568: fix keyboard handling (usual strings vs bytes..)
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@17095 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 4, 2017
1 parent 1475106 commit d433ab7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/xpra/server/server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2832,6 +2832,8 @@ def _process_key_action(self, proto, packet):
ss = self._server_sources.get(proto)
if ss is None:
return
keyname = bytestostr(keyname)
modifiers = tuple(bytestostr(x) for x in modifiers)
self.ui_driver = ss.uuid
self.set_keyboard_layout_group(group)
keycode = self.get_keycode(ss, client_keycode, keyname, modifiers)
Expand Down Expand Up @@ -2934,6 +2936,8 @@ def _process_key_repeat(self, proto, packet):
ss = self._server_sources.get(proto)
if ss is None:
return
keyname = bytestostr(keyname)
modifiers = tuple(bytestostr(x) for x in modifiers)
keycode = ss.get_keycode(client_keycode, keyname, modifiers)
#key repeat uses modifiers from a pointer event, so ignore mod_pointermissing:
ss.make_keymask_match(modifiers)
Expand Down

0 comments on commit d433ab7

Please sign in to comment.