keyboard.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "keyboard.h"
#include "translate.h"
#include "moveresize.h"
+#include "gettext.h"
#include <glib.h>
t = tree;
if (conflict) {
- g_warning("conflict with binding");
+ g_message(_("Conflict with key binding in config file"));
tree_destroy(tree);
return FALSE;
}
if (!interactive_states) {
if (!grab_keyboard(TRUE))
return FALSE;
- if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
- grab_keyboard(FALSE);
- return FALSE;
- }
}
s = g_new(ObInteractiveState, 1);
}
void keyboard_interactive_end(ObInteractiveState *s,
- guint state, gboolean cancel)
+ guint state, gboolean cancel, Time time)
{
- action_run_interactive(s->actions, s->client, state, cancel, TRUE);
+ action_run_interactive(s->actions, s->client, state, time, cancel, TRUE);
g_slist_free(s->actions);
g_free(s);
if (!interactive_states) {
grab_keyboard(FALSE);
- grab_pointer(FALSE, OB_CURSOR_NONE);
keyboard_reset_chains();
}
}
cancel = done = TRUE;
}
if (done) {
- keyboard_interactive_end(s, e->xkey.state, cancel);
+ keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time);
handled = TRUE;
} else
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
/* 5 second timeout for chains */
ob_main_loop_timeout_add(ob_main_loop, 5 * G_USEC_PER_SEC,
- chain_timeout, NULL, NULL);
+ chain_timeout, NULL,
+ g_direct_equal, NULL);
grab_keys(FALSE);
curpos = p;
grab_keys(TRUE);
keyboard_reset_chains();
action_run_key(p->actions, client, e->xkey.state,
- e->xkey.x_root, e->xkey.y_root);
+ e->xkey.x_root, e->xkey.y_root,
+ e->xkey.time);
}
break;
}