}
-void eActionMap::bindKey(const std::string &device, int key, int flags, const std::string &context, const std::string &action)
+void eActionMap::bindKey(const std::string &domain, const std::string &device, int key, int flags, const std::string &context, const std::string &action)
{
// first, search the actionlist table
unsigned int i;
bind.m_key = key;
bind.m_flags = flags;
bind.m_action = actions[i].m_id;
+ bind.m_domain = domain;
m_native_keys.insert(std::pair<std::string,eNativeKeyBinding>(context, bind));
return;
}
bind.m_key = key;
bind.m_flags = flags;
bind.m_action = action;
+ bind.m_domain = domain;
m_python_keys.insert(std::pair<std::string,ePythonKeyBinding>(context, bind));
}
+void eActionMap::unbindKeyDomain(const std::string &domain)
+{
+ for (std::multimap<std::string, eNativeKeyBinding>::iterator i(m_native_keys.begin()); i != m_native_keys.end(); ++i)
+ if (i->second.m_domain == domain)
+ {
+ m_native_keys.erase(i);
+ i = m_native_keys.begin();
+ }
+
+ for (std::multimap<std::string, ePythonKeyBinding>::iterator i(m_python_keys.begin()); i != m_python_keys.end(); ++i)
+ if (i->second.m_domain == domain)
+ {
+ m_python_keys.erase(i);
+ i = m_python_keys.begin();
+ }
+}
+
struct call_entry
{
ePyObject m_fnc, m_arg;
void bindAction(const std::string &context, int priority, SWIG_PYOBJECT(ePyObject) function);
void unbindAction(const std::string &context, SWIG_PYOBJECT(ePyObject) function);
-
- void bindKey(const std::string &device, int key, int flags, const std::string &context, const std::string &action);
+
+ void bindKey(const std::string &domain, const std::string &device, int key, int flags, const std::string &context, const std::string &action);
+ void unbindKeyDomain(const std::string &domain);
void keyPressed(const std::string &device, int key, int flags);
{
// eActionContext *m_context;
std::string m_context; // FIXME
+ std::string m_domain;
ePyObject m_fnc;
struct eNativeKeyBinding
{
std::string m_device;
+ std::string m_domain;
int m_key;
int m_flags;
struct ePythonKeyBinding
{
std::string m_device;
+ std::string m_domain;
int m_key;
int m_flags;