#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/timer.h"
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_for_window(Window win, gboolean grab)
{
{
GList *it;
- grab_for_window(focus_backup, grab);
+ grab_for_window(screen_support_win, grab);
for (it = client_list; it; it = g_list_next(it))
- grab_for_window(((Client*)it->data)->frame->window, grab);
+ grab_for_window(((ObClient*)it->data)->frame->window, grab);
}
static void reset_chains()
!(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;
}
if (act->func == action_cycle_windows &&
- !grabbed_key) {
+ !grabbed_key && grab_keyboard(TRUE)) {
grabbed_key = p;
- grab_keyboard(TRUE);
}
act->data.any.c = focus_client;
void plugin_startup()
{
- guint i;
-
curpos = NULL;
chain_timer = NULL;
(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(TRUE);
}