#include "moveresize.h"
#include "popup.h"
#include "gettext.h"
+#include "obt/keyboard.h"
#include <glib.h>
KeyBindingTree *keyboard_firstnode = NULL;
static ObPopup *popup = NULL;
static KeyBindingTree *curpos;
+static guint chain_timer = 0;
static void grab_keys(gboolean grab)
{
return FALSE; /* don't repeat */
}
+static void chain_done(gpointer data)
+{
+ chain_timer = 0;
+}
+
static void set_curpos(KeyBindingTree *newpos)
{
if (curpos == newpos) return;
if (curpos != NULL) {
gchar *text = NULL;
GList *it;
- Rect *a;
+ const Rect *a;
for (it = curpos->keylist; it; it = g_list_next(it)) {
gchar *oldtext = text;
g_free(oldtext);
}
- a = screen_physical_area_primary();
+ a = screen_physical_area_primary(FALSE);
popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10);
/* 1 second delay for the popup to show */
- popup_delay_show(popup, G_USEC_PER_SEC, text);
+ popup_delay_show(popup, 1000, text);
g_free(text);
- g_free(a);
} else {
popup_hide(popup);
}
gboolean handled = FALSE;
gboolean done = FALSE;
gboolean cancel = FALSE;
+ guint mods;
+
+ mods = obt_keyboard_only_modmasks(ev->xkey.state);
if (istate.active) {
- if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
+ if ((e->type == KeyRelease && !(istate.state & mods))) {
done = TRUE;
handled = TRUE;
} else if (e->type == KeyPress) {
}
#endif
-void keyboard_event(ObClient *client, const XEvent *e)
+gboolean keyboard_event(ObClient *client, const XEvent *e)
{
KeyBindingTree *p;
+ gboolean used;
+ guint mods;
if (e->type == KeyRelease) {
grab_key_passive_count(-1);
- return;
+ return FALSE;
}
g_assert(e->type == KeyPress);
grab_key_passive_count(1);
+ mods = obt_keyboard_only_modmasks(e->xkey.state);
+
if (e->xkey.keycode == config_keyboard_reset_keycode &&
- e->xkey.state == config_keyboard_reset_state)
+ mods == config_keyboard_reset_state)
{
- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ if (chain_timer) g_source_remove(chain_timer);
keyboard_reset_chains(-1);
- return;
+ return TRUE;
}
+ used = FALSE;
if (curpos == NULL)
p = keyboard_firstnode;
else
p = curpos->first_child;
while (p) {
- if (p->key == e->xkey.keycode &&
- p->state == e->xkey.state)
- {
+ if (p->key == e->xkey.keycode && p->state == mods) {
/* if we hit a key binding, then close any open menus and run it */
if (menu_frame_visible)
menu_frame_hide_all();
if (p->first_child != NULL) { /* part of a chain */
- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ if (chain_timer) g_source_remove(chain_timer);
/* 3 second timeout for chains */
- obt_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC,
- chain_timeout, NULL,
- g_direct_equal, NULL);
+ chain_timer =
+ g_timeout_add_full(G_PRIORITY_DEFAULT,
+ 3000, chain_timeout, NULL,
+ chain_done);
set_curpos(p);
} else if (p->chroot) /* an empty chroot */
set_curpos(p);
0, OB_FRAME_CONTEXT_NONE, client);
}
break;
+ used = TRUE;
}
p = p->next_sibling;
}
+ return used;
}
static void node_rebind(KeyBindingTree *node)
old = keyboard_firstnode;
keyboard_firstnode = NULL;
- node_rebind(old);
+ if (old)
+ node_rebind(old);
tree_destroy(old);
set_curpos(NULL);
void keyboard_shutdown(gboolean reconfig)
{
- obt_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ if (chain_timer) g_source_remove(chain_timer);
keyboard_unbind_all();
set_curpos(NULL);