git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved keymap.xml into data-dir
[enigma2.git]
/
keymapparser.py
diff --git
a/keymapparser.py
b/keymapparser.py
index 032805b34b595763f082137205ee58fa1d0b679c..11c8530adb0da2b0c6ab0df583523854b9f26cae 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,7
+40,7
@@
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))
@@
-66,7
+68,7
@@
def readKeymap():
raise "key id '" + str(id) + "' is illegal"
print context + "::" + mapto + " -> " + device + "." + hex(keyid)
raise "key id '" + str(id) + "' is illegal"
print context + "::" + mapto + " -> " + device + "." + hex(keyid)
- p.bindKey(device, keyid,
7
, context, mapto)
+ p.bindKey(device, keyid,
flags
, context, mapto)
parseKeys("generic", cmap)
parseKeys("generic", cmap)