X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e29363abf1f9c01a15ea5bfc960b2f47552f0dc8..6f8002cec40c9b53387ace05ea1f9a083acd0f3a:/lib/python/Tools/KeyBindings.py

diff --git a/lib/python/Tools/KeyBindings.py b/lib/python/Tools/KeyBindings.py
index 33fb241a..5bd70254 100644
--- a/lib/python/Tools/KeyBindings.py
+++ b/lib/python/Tools/KeyBindings.py
@@ -6,9 +6,9 @@ from keyids import KEYIDS
 keyDescriptions = {
 		KEYIDS["BTN_0"]: ("fp_up", 630, 320),
 		KEYIDS["BTN_1"]: ("fp_down", 565, 320),
-		KEYIDS["KEY_OK"]: ("ok", 585, 320),
-		KEYIDS["KEY_UP"]: ("up", 585, 290),
-		KEYIDS["KEY_DOWN"]: ("down", 585, 355),
+		KEYIDS["KEY_OK"]: ("ok", 598, 320),
+		KEYIDS["KEY_UP"]: ("up", 598, 290),
+		KEYIDS["KEY_DOWN"]: ("down", 598, 345),
 		KEYIDS["KEY_POWER"]: ("power", 615, 80),
 		KEYIDS["KEY_RED"]: ("red", 555, 390),
 		KEYIDS["KEY_BLUE"]: ("blue", 640, 390),
@@ -22,22 +22,25 @@ keyDescriptions = {
 		KEYIDS["KEY_AUDIO"]: ("audio", 555, 355),
 		KEYIDS["KEY_TV"]: ("tv", 560, 425),
 		KEYIDS["KEY_RADIO"]: ("radio", 585, 425),
+		KEYIDS["KEY_TEXT"]: ("text", 610, 425),
 		KEYIDS["KEY_NEXT"]: ("next", 635, 203),
 		KEYIDS["KEY_PREVIOUS"]: ("prev", 559, 203)
 	}
 
-def addKeyBinding(key, context, action):
-	if (context, action) in keyBindings:
-		keyBindings[(context, action)].append(key)
-	else:
-		keyBindings[(context, action)] = [key]
+def addKeyBinding(domain, key, context, action):
+	keyBindings.setdefault((context, action), []).append((key, domain))
 
 def queryKeyBinding(context, action):
 	if (context, action) in keyBindings:
-		return keyBindings[(context, action)]
+		return [x[0] for x in keyBindings[(context, action)]]
 	else:
 		return [ ]
 
 def getKeyDescription(key):
 	if key in keyDescriptions:
 		return keyDescriptions.get(key, [ ])
+
+def removeKeyBindings(domain):
+	# remove all entries of domain 'domain'
+	for x in keyBindings:
+		keyBindings[x] = filter(lambda e: e[1] != domain, keyBindings[x])