return true;
}
-bool OBBindings::translate(const std::string &str, Binding &b,
- bool askey) const
+bool OBBindings::translate(const std::string &str, Binding &b) const
{
// parse out the base key name
std::string::size_type keybegin = str.find_last_of('-');
// set the binding
b.modifiers = modval;
- if (askey) {
- KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
- if (sym == NoSymbol) {
- printf(_("Invalid Key name in key binding: %s\n"), key.c_str());
- return false;
- }
- if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym)))
- printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
- return b.key != 0;
- } else {
- if (!buttonvalue(key, &b.key)) {
- printf(_("Invalid Button name in mouse binding: %s\n"), key.c_str());
- return false;
- } else
- return true;
+ KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
+ if (sym == NoSymbol) {
+ printf(_("Invalid Key name in key binding: %s\n"), key.c_str());
+ return false;
}
+ if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym)))
+ printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
+ return b.key != 0;
}
static void destroytree(BindingTree *tree)
ret = new BindingTree(id);
if (!p) ret->chain = false; // only the first built node
ret->first_child = p;
- if (!translate(*it, ret->binding, true)) {
+ if (!translate(*it, ret->binding)) {
destroytree(ret);
ret = 0;
break;
OBBindings::OBBindings()
- : _curpos(&_keytree), _mousetree(0), _resetkey(0,0)
+ : _curpos(&_tree),
+ _resetkey(0,0),
+ _timer(Openbox::instance->timerManager(),
+ (otk::OBTimeoutHandler)reset, this)
{
+ _timer.setTimeout(5000); // chains reset after 5 seconds
+
setResetKey("C-g"); // set the default reset key
}
OBBindings::~OBBindings()
{
- grabMouseOnAll(false); // ungrab everything
grabKeys(false);
remove_all();
}
-bool OBBindings::add_mouse(const std::string &button, int id)
-{
- BindingTree n;
-
- if (!translate(button, n.binding, false))
- return false;
-
- BindingTree *p = _mousetree, **newp = &_mousetree;
- while (p) {
- if (p->binding == n.binding)
- return false; // conflict
- p = p->next_sibling;
- newp = &p->next_sibling;
- }
-
- grabMouseOnAll(false); // ungrab everything
-
- *newp = new BindingTree(id);
- (*newp)->chain = false;
- (*newp)->binding.key = n.binding.key;
- (*newp)->binding.modifiers = n.binding.modifiers;
-
- grabMouseOnAll(true);
-
- return true;
-}
-
-
-int OBBindings::remove_mouse(const std::string &button)
-{
- (void)button;
- assert(false); // XXX: function not implemented yet
-
- grabMouseOnAll(false); // ungrab everything
-
- // do shit...
-
- grabMouseOnAll(true);
-}
-
-
void OBBindings::assimilate(BindingTree *node)
{
BindingTree *a, *b, *tmp, *last;
- if (!_keytree.first_child) {
+ if (!_tree.first_child) {
// there are no nodes at this level yet
- _keytree.first_child = node;
+ _tree.first_child = node;
} else {
- a = _keytree.first_child;
+ a = _tree.first_child;
last = a;
b = node;
while (a) {
}
-int OBBindings::find_key(BindingTree *search) const {
+int OBBindings::find(BindingTree *search) const {
BindingTree *a, *b;
- a = _keytree.first_child;
+ a = _tree.first_child;
b = search;
while (a && b) {
if (a->binding != b->binding) {
}
-bool OBBindings::add_key(const StringVect &keylist, int id)
+bool OBBindings::add(const StringVect &keylist, int id)
{
BindingTree *tree;
if (!(tree = buildtree(keylist, id)))
return false; // invalid binding requested
- if (find_key(tree) != -1) {
+ if (find(tree) != -1) {
// conflicts with another binding
destroytree(tree);
return false;
}
-int OBBindings::find_key(const StringVect &keylist)
+int OBBindings::find(const StringVect &keylist)
{
BindingTree *tree;
bool ret;
if (!(tree = buildtree(keylist, 0)))
return false; // invalid binding requested
- ret = find_key(tree) >= 0;
+ ret = find(tree) >= 0;
destroytree(tree);
}
-int OBBindings::remove_key(const StringVect &keylist)
+int OBBindings::remove(const StringVect &keylist)
{
(void)keylist;
assert(false); // XXX: function not implemented yet
grabKeys(false);
- _curpos = &_keytree;
+ _curpos = &_tree;
// do shit here...
void OBBindings::setResetKey(const std::string &key)
{
Binding b(0, 0);
- if (translate(key, b, true)) {
+ if (translate(key, b)) {
grabKeys(false);
_resetkey.key = b.key;
_resetkey.modifiers = b.modifiers;
void OBBindings::remove_all()
{
- if (_keytree.first_child) {
- remove_branch(_keytree.first_child);
- _keytree.first_child = 0;
- }
- BindingTree *p = _mousetree;
- while (p) {
- BindingTree *n = p->next_sibling;
- delete p;
- p = n;
- }
- _mousetree = 0;
-}
-
-
-void OBBindings::grabMouse(bool grab, const OBClient *client)
-{
- BindingTree *p = _mousetree;
- while (p) {
- if (grab)
- otk::OBDisplay::grabButton(p->binding.key, p->binding.modifiers,
- client->frame->window(), false,
- ButtonMotionMask | ButtonPressMask |
- ButtonReleaseMask, GrabModeAsync,
- GrabModeAsync, None, None, false);
- else
- otk::OBDisplay::ungrabButton(p->binding.key, p->binding.modifiers,
- client->frame->window());
- p = p->next_sibling;
- }
-}
-
-
-void OBBindings::grabMouseOnAll(bool grab)
-{
- for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
- OBScreen *s = Openbox::instance->screen(i);
- assert(s);
- OBScreen::ClientList::iterator it, end = s->clients.end();
- for (it = s->clients.begin(); it != end; ++it)
- grabMouse(grab, *it);
+ if (_tree.first_child) {
+ remove_branch(_tree.first_child);
+ _tree.first_child = 0;
}
}
BindingTree *p = _curpos->first_child;
while (p) {
- if (grab)
+ if (grab) {
otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
root, false, GrabModeAsync, GrabModeAsync,
false);
+ }
else
otk::OBDisplay::ungrabKey(p->binding.key, p->binding.modifiers,
root);
}
-void OBBindings::fire(OBActions::ActionType type, Window window,
- unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fire(Window window, unsigned int modifiers, unsigned int key,
+ Time time)
{
- if (type == OBActions::Action_KeyPress) {
- if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
- grabKeys(false);
- _curpos = &_keytree;
- grabKeys(true);
- } else {
- BindingTree *p = _curpos->first_child;
- while (p) {
- if (p->binding.key == key && p->binding.modifiers == modifiers) {
- if (p->chain) {
- grabKeys(false);
- _curpos = p;
- grabKeys(true);
- } else {
- python_callback_binding(p->id, type, window, modifiers, key, time);
- grabKeys(false);
- _curpos = &_keytree;
- grabKeys(true);
- }
- break;
- }
- p = p->next_sibling;
- }
- }
+ if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
+ reset(this);
} else {
- BindingTree *p = _mousetree;
+ BindingTree *p = _curpos->first_child;
while (p) {
if (p->binding.key == key && p->binding.modifiers == modifiers) {
- python_callback_binding(p->id, type, window, modifiers, key, time);
+ if (p->chain) {
+ _timer.start(); // start/restart the timer
+ grabKeys(false);
+ _curpos = p;
+ grabKeys(true);
+ } else {
+ python_callback_binding(p->id, window, modifiers, key, time);
+ reset(this);
+ }
break;
}
p = p->next_sibling;
}
}
+void OBBindings::reset(OBBindings *self)
+{
+ self->_timer.stop();
+ self->grabKeys(false);
+ self->_curpos = &self->_tree;
+ self->grabKeys(true);
+}
}
projects / chaz / openbox / blobdiff