Skip to content

Commit

Permalink
* we don't use "nuisance", it gets re-calculated server side anyway
Browse files Browse the repository at this point in the history
* move debug code near where it is used

git-svn-id: https://xpra.org/svn/Xpra/trunk@9651 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jun 17, 2015
1 parent f315792 commit 4026a0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/xpra/platform/xposix/keyboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ def get_keyboard_repeat(self):
return None

def update_modifier_map(self, display, xkbmap_mod_meanings):
try:
dn = "%s %s" % (type(display).__name__, display.get_name())
except Exception as e:
dn = str(display)
try:
from xpra.x11.gtk_x11.keys import grok_modifier_map
self.modifier_map = grok_modifier_map(display, xkbmap_mod_meanings)
except ImportError:
self.modifier_map = MODIFIER_MAP
try:
dn = "%s %s" % (type(display).__name__, display.get_name())
except Exception as e:
dn = str(display)
log("update_modifier_map(%s, %s) modifier_map=%s", dn, xkbmap_mod_meanings, self.modifier_map)
3 changes: 0 additions & 3 deletions src/xpra/x11/gtk_x11/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,4 @@ def grok_modifier_map(display, meanings):
modifier = meanings.get(keyval_name)
if modifier:
modifier_map[modifier] |= (1 << i)
modifier_map["nuisance"] = (modifier_map["lock"]
| modifier_map["scroll"]
| modifier_map["num"])
return modifier_map

0 comments on commit 4026a0e

Please sign in to comment.