X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9f9c513165bbcae496b79656304e60bf74557af4..75b5dff4878843dec6913364bc044ab25c3b78a2:/lib/actions/action.cpp

diff --git a/lib/actions/action.cpp b/lib/actions/action.cpp
index 54684847..56ad89a1 100644
--- a/lib/actions/action.cpp
+++ b/lib/actions/action.cpp
@@ -54,12 +54,11 @@ void eActionMap::bindAction(const std::string &context, int priority, int id, eW
 	
 	bnd.m_context = context;
 	bnd.m_widget = widget;
-	bnd.m_fnc = 0;
 	bnd.m_id = id;
 	m_bindings.insert(std::pair<int,eActionBinding>(priority, bnd));
 }
 
-void eActionMap::bindAction(const std::string &context, int priority, PyObject *function)
+void eActionMap::bindAction(const std::string &context, int priority, ePyObject function)
 {
 	eActionBinding bnd;
 	
@@ -80,7 +79,7 @@ void eActionMap::unbindAction(eWidget *widget, int id)
 		}
 }
 
-void eActionMap::unbindAction(const std::string &context, PyObject *function)
+void eActionMap::unbindAction(const std::string &context, ePyObject function)
 {
 	for (std::multimap<int, eActionBinding>::iterator i(m_bindings.begin()); i != m_bindings.end(); ++i)
 	{
@@ -105,7 +104,7 @@ void eActionMap::bindKey(const std::string &device, int key, int flags, const st
 		{
 				// we found a native action.
 			eNativeKeyBinding bind;
-			bind.m_device = 0;
+			bind.m_device = device;
 			bind.m_key = key;
 			bind.m_flags = flags;
 			bind.m_action = actions[i].m_id;
@@ -117,7 +116,7 @@ void eActionMap::bindKey(const std::string &device, int key, int flags, const st
 		// we didn't find the action, so it must be a pythonAction
 	ePythonKeyBinding bind;
 
-	bind.m_device = 0;
+	bind.m_device = device;
 	bind.m_key = key;
 	bind.m_flags = flags;
 	bind.m_action = action;
@@ -126,14 +125,14 @@ void eActionMap::bindKey(const std::string &device, int key, int flags, const st
 
 struct call_entry
 {
-	PyObject *m_fnc, *m_arg;
+	ePyObject m_fnc, m_arg;
 	eWidget *m_widget;
-	void *m_widget_arg;
-	call_entry(PyObject *fnc, PyObject *arg): m_fnc(fnc), m_arg(arg), m_widget(0), m_widget_arg(0) { }
-	call_entry(eWidget *widget, void *arg): m_fnc(0), m_arg(0), m_widget(widget), m_widget_arg(arg) { }
+	void *m_widget_arg, *m_widget_arg2;
+	call_entry(ePyObject fnc, ePyObject arg): m_fnc(fnc), m_arg(arg), m_widget(0), m_widget_arg(0) { }
+	call_entry(eWidget *widget, void *arg, void *arg2): m_widget(widget), m_widget_arg(arg), m_widget_arg2(arg2) { }
 };
 
-void eActionMap::keyPressed(int device, int key, int flags)
+void eActionMap::keyPressed(const std::string &device, int key, int flags)
 {
 	std::list<call_entry> call_list;
 	
@@ -155,10 +154,11 @@ void eActionMap::keyPressed(int device, int key, int flags)
 				for (; k != e; ++k)
 				{
 					if (
-						// (k->second.m_device == m_device) &&
 							(k->second.m_key == key) &&
-							(k->second.m_flags & (1<<flags)))
-						call_list.push_back(call_entry(i->second.m_widget, (void*)k->second.m_action));
+							(k->second.m_flags & (1<<flags)) &&
+						  ((k->second.m_device == device) || (k->second.m_device == "generic"))
+						  )
+						call_list.push_back(call_entry(i->second.m_widget, (void*)i->second.m_id, (void*)k->second.m_action));
 				}
 			} else
 			{
@@ -177,11 +177,12 @@ void eActionMap::keyPressed(int device, int key, int flags)
 				for (; k != e;)
 				{
 					if (
-						// (k->second.m_device == m_device) &&
 						(k->second.m_key == key) &&
-						(k->second.m_flags & (1<<flags)))
+						(k->second.m_flags & (1<<flags)) &&
+						((k->second.m_device == device) || (k->second.m_device == "generic"))
+						)
 					{
-						PyObject *pArgs = PyTuple_New(2);
+						ePyObject pArgs = PyTuple_New(2);
 						PyTuple_SET_ITEM(pArgs, 0, PyString_FromString(k->first.c_str()));
 						PyTuple_SET_ITEM(pArgs, 1, PyString_FromString(k->second.m_action.c_str()));
 						++k;
@@ -192,7 +193,8 @@ void eActionMap::keyPressed(int device, int key, int flags)
 				}
 			} else
 			{
-				PyObject *pArgs = PyTuple_New(2);
+				eDebug("wildcard.");
+				ePyObject pArgs = PyTuple_New(2);
 				PyTuple_SET_ITEM(pArgs, 0, PyInt_FromLong(key));
 				PyTuple_SET_ITEM(pArgs, 1, PyInt_FromLong(flags));
 				Py_INCREF(i->second.m_fnc);
@@ -214,7 +216,7 @@ void eActionMap::keyPressed(int device, int key, int flags)
 		} else if (i->m_widget)
 		{
 			if (!res)
-				res = i->m_widget->event(eWidget::evtAction, 0, (void*)i->m_widget_arg);
+				res = i->m_widget->event(eWidget::evtAction, (void*)i->m_widget_arg, (void*)i->m_widget_arg2 );
 		}
 	}
 }