static void set_curpos(KeyBindingTree *newpos)
{
+ if (curpos == newpos) return;
+
grab_keys(FALSE);
curpos = newpos;
grab_keys(TRUE);
if (curpos != NULL) {
gchar *text = NULL;
GList *it;
+ Rect *a;
for (it = curpos->keylist; it; it = g_list_next(it)) {
gchar *oldtext = text;
g_free(oldtext);
}
- popup_position(popup, NorthWestGravity, 10, 10);
+ a = screen_physical_area_monitor_active();
+ 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);
g_free(text);
{
KeyBindingTree *tree, *t;
gboolean conflict;
- gboolean mods = TRUE;
g_assert(keylist != NULL);
g_assert(action != NULL);
return FALSE;
}
- /* find if every key in this chain has modifiers, and also find the
- bottom node of the tree */
- while (t->first_child) {
- if (!t->state)
- mods = FALSE;
- t = t->first_child;
- }
+ /* find the bottom node */
+ for (; t->first_child; t = t->first_child);
/* when there are no modifiers in the binding, then the action cannot
be interactive */
- if (!mods && action->data.any.interactive) {
+ if (!t->state && action->data.any.interactive) {
+ g_print("not interactive\n");
action->data.any.interactive = FALSE;
action->data.inter.final = TRUE;
}
g_assert(istate.active);
+ /* ungrab first so they won't be NotifyWhileGrabbed */
+ if (ungrab)
+ ungrab_keyboard();
+
+ /* set this before running the actions so they know the keyboard is not
+ grabbed */
+ istate.active = FALSE;
+
alist = g_slist_append(NULL, istate.action);
action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
g_slist_free(alist);
- istate.active = FALSE;
-
- if (ungrab) {
- grab_keyboard(FALSE);
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
- }
+ keyboard_reset_chains(0);
}
static void keyboard_interactive_end_client(ObClient *client, gpointer data)
istate.client = NULL;
}
+
+void keyboard_interactive_cancel()
+{
+ keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
+}
+
gboolean keyboard_interactive_grab(guint state, ObClient *client,
ObAction *action)
{
g_assert(action->data.any.interactive);
if (!istate.active) {
- grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
- if (!grab_keyboard(TRUE)) {
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
+ if (!grab_keyboard())
return FALSE;
- }
} else if (action->func != istate.action->func) {
- keyboard_interactive_end(state, FALSE, action->data.any.time, FALSE);
+ keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
}
istate.active = TRUE;
gboolean cancel = FALSE;
if (istate.active) {
- if ((e->type == KeyRelease && !(istate.state & e->xkey.state)))
+ if ((e->type == KeyRelease && !(istate.state & e->xkey.state))) {
done = TRUE;
- else if (e->type == KeyPress) {
+ handled = TRUE;
+ } else if (e->type == KeyPress) {
/*if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
done = TRUE;
- else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+ else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
cancel = done = TRUE;
- } else if (e->type == ButtonPress)
- cancel = done = TRUE;
+ handled = TRUE;
+ }
+ } else if (e->type == ButtonPress) {
+ cancel = TRUE;
+ done = TRUE;
+ handled = FALSE;
+ }
- if (done) {
+ if (done)
keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
- handled = TRUE;
- } else
+ if (handled)
*client = istate.client;
}
{
KeyBindingTree *p;
+ if (e->type == KeyRelease) {
+ grab_key_passive_count(-1);
+ return;
+ }
+
g_assert(e->type == KeyPress);
+ grab_key_passive_count(1);
if (e->xkey.keycode == config_keyboard_reset_keycode &&
e->xkey.state == config_keyboard_reset_state)
} else if (p->chroot) /* an empty chroot */
set_curpos(p);
else {
- keyboard_reset_chains(0);
+ GSList *it;
+ gboolean inter = FALSE;
+
+ for (it = p->actions; it && !inter; it = g_slist_next(it))
+ if (((ObAction*)it->data)->data.any.interactive)
+ inter = TRUE;
+ if (!inter) /* don't reset if the action is interactive */
+ keyboard_reset_chains(0);
action_run_key(p->actions, client, e->xkey.state,
e->xkey.x_root, e->xkey.y_root,
{
grab_keys(TRUE);
popup = popup_new(FALSE);
+ popup_set_text_align(popup, RR_JUSTIFY_CENTER);
if (!reconfig)
- client_add_destructor(keyboard_interactive_end_client, NULL);
+ client_add_destroy_notify(keyboard_interactive_end_client, NULL);
}
void keyboard_shutdown(gboolean reconfig)
{
if (!reconfig)
- client_remove_destructor(keyboard_interactive_end_client);
+ client_remove_destroy_notify(keyboard_interactive_end_client);
- keyboard_interactive_end(0, TRUE, 0, TRUE);
+ if (istate.active)
+ keyboard_interactive_cancel();
ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);