X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf7e40884d7add91e219e9e70e83988ae7752bd8..5138dce8cfa3d4987ebc8899d5fd990883d1a1dc:/lib/python/Components/ActionMap.py

diff --git a/lib/python/Components/ActionMap.py b/lib/python/Components/ActionMap.py
index 046a92d9..a018983a 100644
--- a/lib/python/Components/ActionMap.py
+++ b/lib/python/Components/ActionMap.py
@@ -1,35 +1,66 @@
-from enigma import *
+from enigma import eActionMap
 
 class ActionMap:
 	def __init__(self, contexts = [ ], actions = { }, prio=0):
 		self.actions = actions
 		self.contexts = contexts
 		self.prio = prio
-		self.p = eActionMapPtr()
-		eActionMap.getInstance(self.p)
+		self.p = eActionMap.getInstance()
+		self.bound = False
+		self.exec_active = False
+		self.enabled = True
+
+	def setEnabled(self, enabled):
+		self.enabled = enabled
+		self.checkBind()
+
+	def doBind(self):
+		if not self.bound:
+			for ctx in self.contexts:
+				self.p.bindAction(ctx, self.prio, self.action)
+			self.bound = True
+
+	def doUnbind(self):
+		if self.bound:
+			for ctx in self.contexts:
+				self.p.unbindAction(ctx, self.action)
+			self.bound = False
+
+	def checkBind(self):
+		if self.exec_active and self.enabled:
+			self.doBind()
+		else:
+			self.doUnbind()
 
 	def execBegin(self):
-		for ctx in self.contexts:
-			self.p.bindAction(ctx, self.prio, self.action)
+		self.exec_active = True
+		self.checkBind()
 
 	def execEnd(self):
-		for ctx in self.contexts:
-			self.p.unbindAction(ctx, self.action)
+		self.exec_active = False
+		self.checkBind()
 
 	def action(self, context, action):
 		print " ".join(("action -> ", context, action))
 		if self.actions.has_key(action):
-			self.actions[action]()
+			res = self.actions[action]()
+			if res is not None:
+				return res
 			return 1
 		else:
 			print "unknown action %s/%s! typo in keymap?" % (context, action)
 			return 0
 
+	def destroy(self):
+		pass
+
 class NumberActionMap(ActionMap):
 	def action(self, contexts, action):
-		numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+		numbers = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
 		if (action in numbers and self.actions.has_key(action)):
-			self.actions[action](int(action))
+			res = self.actions[action](int(action))
+			if res is not None:
+				return res
 			return 1
 		else:
 			return ActionMap.action(self, contexts, action)
@@ -52,7 +83,7 @@ class HelpableActionMap(ActionMap):
 		adict = { }
 		for (action, funchelp) in actions.iteritems():
 			# check if this is a tuple
-			if type(funchelp) is type(()):
+			if isinstance(funchelp, tuple):
 				alist.append((action, funchelp[1]))
 				adict[action] = funchelp[0]
 			else: