#include "kernel/focus.h"
+#include "kernel/screen.h"
+#include "kernel/frame.h"
#include "kernel/dispatch.h"
#include "kernel/openbox.h"
#include "kernel/event.h"
#include "kernel/grab.h"
+#include "kernel/client.h"
#include "kernel/action.h"
#include "kernel/prop.h"
-#include "kernel/parse.h"
#include "kernel/timer.h"
+#include "parser/parse.h"
#include "tree.h"
#include "keyboard.h"
#include "translate.h"
if (keylist) {
nact = parse_find_node("action", node);
while (nact) {
- if ((action = parse_action(doc, nact))) {
+ if ((action = action_parse(doc, nact))) {
/* validate that its okay for a key binding */
if (action->func == action_moveresize &&
action->data.moveresize.corner !=
KeyBindingTree *firstnode = NULL;
static KeyBindingTree *curpos;
-static guint reset_key, reset_state, button_return, button_escape;
-static Timer *chain_timer;
+static guint reset_key, reset_state;
+static ObTimer *chain_timer;
-static void grab_keys()
+static void grab_for_window(Window win, gboolean grab)
{
KeyBindingTree *p;
- ungrab_all_keys();
+ ungrab_all_keys(win);
- p = curpos ? curpos->first_child : firstnode;
- while (p) {
- grab_key(p->key, p->state, GrabModeAsync);
- p = p->next_sibling;
+ if (grab) {
+ p = curpos ? curpos->first_child : firstnode;
+ while (p) {
+ grab_key(p->key, p->state, win, GrabModeAsync);
+ p = p->next_sibling;
+ }
+ if (curpos)
+ grab_key(reset_key, reset_state, win, GrabModeAsync);
}
- if (curpos)
- grab_key(reset_key, reset_state, GrabModeAsync);
+}
+
+static void grab_keys(gboolean grab)
+{
+ GList *it;
+
+ grab_for_window(screen_support_win, grab);
+ for (it = client_list; it; it = g_list_next(it))
+ grab_for_window(((ObClient*)it->data)->frame->window, grab);
}
static void reset_chains()
}
if (curpos) {
curpos = NULL;
- grab_keys();
+ grab_keys(TRUE);
}
}
{
static KeyBindingTree *grabbed_key = NULL;
+ if (e->type == Event_Client_Mapped) {
+ grab_for_window(e->data.c.client->window, TRUE);
+ return;
+ } else if (e->type == Event_Client_Destroy) {
+ grab_for_window(e->data.c.client->window, FALSE);
+ return;
+ }
+
if (grabbed_key) {
gboolean done = FALSE;
!(grabbed_key->state & e->data.x.e->xkey.state)))
done = TRUE;
else if (e->type == Event_X_KeyPress) {
- if (e->data.x.e->xkey.keycode == button_return)
+ if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
done = TRUE;
- else if (e->data.x.e->xkey.keycode == button_escape) {
+ else if (e->data.x.e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
GSList *it;
for (it = grabbed_key->actions; it; it = it->next) {
Action *act = it->data;
chain_timer = timer_start(5000*1000, chain_timeout,
NULL);
curpos = p;
- grab_keys();
+ grab_keys(TRUE);
} else {
GSList *it;
for (it = p->actions; it; it = it->next) {
act->data.cycle.cancel = FALSE;
}
- act->data.any.c = focus_client;
- act->func(&act->data);
-
if (act->func == action_cycle_windows &&
- !grabbed_key) {
+ !grabbed_key && grab_keyboard(TRUE)) {
grabbed_key = p;
- grab_keyboard(TRUE);
- break;
}
+
+ act->data.any.c = focus_client;
+ act->func(&act->data);
}
}
void plugin_startup()
{
- guint i;
-
curpos = NULL;
chain_timer = NULL;
- dispatch_register(Event_X_KeyPress | Event_X_KeyRelease,
+ dispatch_register(Event_Client_Mapped | Event_Client_Destroy |
+ Event_X_KeyPress | Event_X_KeyRelease,
(EventHandler)event, NULL);
translate_key("C-g", &reset_state, &reset_key);
- translate_key("Escape", &i, &button_escape);
- translate_key("Return", &i, &button_return);
- grab_keys();
+ grab_keys(TRUE);
}
void plugin_shutdown()
tree_destroy(firstnode);
firstnode = NULL;
- ungrab_all_keys();
+ grab_keys(FALSE);
}