some python import cleanups

[vuplus_dvbapp] / lib / actions / action.cpp

diff --git a/lib/actions/action.cpp b/lib/actions/action.cpp
index 0fa5236..c1d2c19 100644 (file)
--- a/lib/actions/action.cpp
+++ b/lib/actions/action.cpp
@@ -41,25 +41,17 @@ RESULT eActionMap::getInstance(ePtr<eActionMap> &ptr)
        return 0;
 }
 
-#if 0
-void eActionMap::getInstance(eActionMap **ptr)
-{
-       *ptr = instance;
-}
-#endif
-
 void eActionMap::bindAction(const std::string &context, int priority, int id, eWidget *widget)
 {
        eActionBinding bnd;
        
        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 +72,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 +97,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 +109,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 +118,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) { }
-       call_entry(eWidget *widget, void *arg): 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 +147,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,13 +170,14 @@ 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);
-                                               PyTuple_SetItem(pArgs, 0, PyString_FromString(k->first.c_str()));
-                                               PyTuple_SetItem(pArgs, 1, PyString_FromString(k->second.m_action.c_str()));
+                                               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;
                                                Py_INCREF(i->second.m_fnc);
                                                call_list.push_back(call_entry(i->second.m_fnc, pArgs));
@@ -192,9 +186,10 @@ void eActionMap::keyPressed(int device, int key, int flags)
                                }
                        } else
                        {
-                               PyObject *pArgs = PyTuple_New(2);
-                               PyTuple_SetItem(pArgs, 0, PyInt_FromLong(key));
-                               PyTuple_SetItem(pArgs, 1, PyInt_FromLong(flags));
+                               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);
                                call_list.push_back(call_entry(i->second.m_fnc, pArgs));
                        }
@@ -214,9 +209,16 @@ 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 );
                }
        }
 }
 
+ePtr<eActionMap> NewActionMapPtr(void)
+{
+       ePtr<eActionMap> ptr;
+       eActionMap::getInstance(ptr);
+       return ptr;
+}
+
 eAutoInitPtr<eActionMap> init_eActionMap(eAutoInitNumbers::actions, "eActionMap");