git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add nimsetup
[enigma2.git]
/
keymapparser.py
diff --git
a/keymapparser.py
b/keymapparser.py
index 510a47a951c26e761861740d638c93a38a9e5de6..7b64ae04af3436979e1e014aa01a2f8f1c037ce1 100644
(file)
--- a/
keymapparser.py
+++ b/
keymapparser.py
@@
-9,12
+9,14
@@
def readKeymap():
enigma.eActionMap.getInstance(p)
assert p
enigma.eActionMap.getInstance(p)
assert p
- filename = "keymap.xml"
-
+ filename1 = "data/keymap.xml"
+ filename2 = "/usr/share/enigma2/keymap.xml"
+
try:
try:
- source = open(filename)
+ source = open(filename
1
)
except:
except:
- raise "couldn't open keymap.xml!"
+ source = open(filename2)
+# raise "couldn't open keymap.xml!"
try:
dom = xml.dom.minidom.parse(source)
try:
dom = xml.dom.minidom.parse(source)
@@
-38,11
+40,11
@@
def readKeymap():
id = x.getAttribute("id")
flags = x.getAttribute("flags")
id = x.getAttribute("id")
flags = x.getAttribute("flags")
- flag_ascii_to_id = lambda x: {'m':1,'
r':2,'b
':4}[x]
+ flag_ascii_to_id = lambda x: {'m':1,'
b':2,'r
':4}[x]
# try:
flags = sum(map(flag_ascii_to_id, flags))
# try:
flags = sum(map(flag_ascii_to_id, flags))
-
print "-> " + str(flags)
+
#
print "-> " + str(flags)
# except:
# raise str("%s: illegal flags '%s' specificed in context %s, id '%s'" % (filename, flags, context, id))
# except:
# raise str("%s: illegal flags '%s' specificed in context %s, id '%s'" % (filename, flags, context, id))
@@
-52,14
+54,21
@@
def readKeymap():
if len(id) == 1:
keyid = ord(id) | 0x8000
if len(id) == 1:
keyid = ord(id) | 0x8000
+ elif id[0] == '\\':
+ if id[1] == 'x':
+ keyid = int(id[2:], 0x10) | 0x8000
+ elif id[1] == 'd':
+ keyid = int(id[2:]) | 0x8000
+ else:
+ raise "key id '" + str(id) + "' is neither hex nor dec"
else:
try:
keyid = KEYIDS[id]
except:
raise "key id '" + str(id) + "' is illegal"
else:
try:
keyid = KEYIDS[id]
except:
raise "key id '" + str(id) + "' is illegal"
-
print context + "::" + mapto + " -> " + device + "." + hex(keyid)
- p.bindKey(device, keyid,
7
, context, mapto)
+
#
print context + "::" + mapto + " -> " + device + "." + hex(keyid)
+ p.bindKey(device, keyid,
flags
, context, mapto)
parseKeys("generic", cmap)
parseKeys("generic", cmap)