#include "event.h"
#include "grab.h"
#include "client.h"
-#include "action.h"
+#include "actions.h"
#include "prop.h"
+#include "menuframe.h"
#include "config.h"
#include "keytree.h"
#include "keyboard.h"
#include <glib.h>
typedef struct {
+ gboolean active;
guint state;
ObClient *client;
- GSList *actions;
- ObFrameContext context;
+ ObActionsAct *action;
} ObInteractiveState;
KeyBindingTree *keyboard_firstnode = NULL;
static ObPopup *popup = NULL;
-static GSList *interactive_states;
+static ObInteractiveState istate;
static KeyBindingTree *curpos;
static void grab_keys(gboolean grab)
}
}
-static gboolean popup_show_timeout(gpointer data)
+static gboolean chain_timeout(gpointer data)
{
- gchar *text = data;
- popup_show(popup, text);
-
+ keyboard_reset_chains(0);
return FALSE; /* don't repeat */
}
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;
-
- for (it = curpos->keylist; it; it = g_list_next(it))
- text = g_strconcat((text ? text : ""), it->data, "-", NULL);
-
- popup_position(popup, NorthWestGravity, 10, 10);
- if (popup->mapped) {
- popup_show_timeout(text);
- g_free(text);
- } else {
- ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
- ob_main_loop_timeout_add(ob_main_loop, 1 * G_USEC_PER_SEC,
- popup_show_timeout, text,
- g_direct_equal, g_free);
+ Rect *a;
+
+ for (it = curpos->keylist; it; it = g_list_next(it)) {
+ gchar *oldtext = text;
+ if (text == NULL)
+ text = g_strdup(it->data);
+ else
+ text = g_strconcat(text, " - ", it->data, NULL);
+ g_free(oldtext);
}
+
+ a = screen_physical_area_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);
+ g_free(a);
} else {
popup_hide(popup);
- ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
}
}
}
}
-gboolean keyboard_bind(GList *keylist, ObAction *action)
+gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
{
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;
- }
-
- /* when there are no modifiers in the binding, then the action cannot
- be interactive */
- if (!mods && action->data.any.interactive) {
- action->data.any.interactive = FALSE;
- action->data.inter.final = TRUE;
- }
+ /* find the bottom node */
+ for (; t->first_child; t = t->first_child);
/* set the action */
t->actions = g_slist_append(t->actions, action);
return TRUE;
}
-gboolean keyboard_interactive_grab(guint state, ObClient *client,
- ObAction *action)
+static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
+ gboolean ungrab)
{
- ObInteractiveState *s;
+#if 0
+ GSList *alist;
- g_assert(action->data.any.interactive);
+ g_assert(istate.active);
- if (!interactive_states) {
- grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
- if (!grab_keyboard(TRUE)) {
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
- return FALSE;
- }
- }
-
- s = g_new(ObInteractiveState, 1);
+ /* ungrab first so they won't be NotifyWhileGrabbed */
+ if (ungrab)
+ ungrab_keyboard();
- s->state = state;
- s->client = client;
- s->actions = g_slist_append(NULL, action);
+ /* set this before running the actions so they know the keyboard is not
+ grabbed */
+ istate.active = FALSE;
- interactive_states = g_slist_append(interactive_states, s);
+ alist = g_slist_append(NULL, istate.action);
+ action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
+ g_slist_free(alist);
- return TRUE;
+ keyboard_reset_chains(0);
+#endif
}
-void keyboard_interactive_end(ObInteractiveState *s,
- guint state, gboolean cancel, Time time)
+static void keyboard_interactive_end_client(ObClient *client, gpointer data)
{
- action_run_interactive(s->actions, s->client, state, time, cancel, TRUE);
-
- g_slist_free(s->actions);
- g_free(s);
+ if (istate.active && istate.client == client)
+ istate.client = NULL;
+}
- interactive_states = g_slist_remove(interactive_states, s);
- if (!interactive_states) {
- grab_keyboard(FALSE);
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
- }
+void keyboard_interactive_cancel()
+{
+ keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
}
-void keyboard_interactive_end_client(ObClient *client, gpointer data)
+gboolean keyboard_interactive_grab(guint state, ObClient *client,
+ ObActionsAct *action)
{
- GSList *it, *next;
+#if 0
+ g_assert(action->data.any.interactive);
- for (it = interactive_states; it; it = next) {
- ObInteractiveState *s = it->data;
+ if (!istate.active) {
+ if (!grab_keyboard())
+ return FALSE;
+ } else if (action->func != istate.action->func) {
+ keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
+ }
- next = g_slist_next(it);
+ istate.active = TRUE;
+ istate.state = state;
+ istate.client = client;
+ istate.action = action;
- if (s->client == client)
- s->client = NULL;
- }
+#endif
+ return TRUE;
}
gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
{
- GSList *it, *next;
gboolean handled = FALSE;
gboolean done = FALSE;
gboolean cancel = FALSE;
- for (it = interactive_states; it; it = next) {
- ObInteractiveState *s = it->data;
-
- next = g_slist_next(it);
-
- if ((e->type == KeyRelease &&
- !(s->state & e->xkey.state)))
+ if (istate.active) {
+ 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))
- cancel = done = TRUE;
- } else if (e->type == ButtonPress)
- cancel = done = TRUE;
+ done = TRUE;
+ else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+ cancel = done = TRUE;
+ handled = TRUE;
+ }
+ } else if (e->type == ButtonPress) {
+ cancel = TRUE;
+ done = TRUE;
+ handled = FALSE;
+ }
- if (done) {
- keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time);
+ if (done)
+ keyboard_interactive_end(e->xkey.state, cancel, e->xkey.time,TRUE);
- handled = TRUE;
- } else
- *client = s->client;
+ if (handled)
+ *client = istate.client;
}
return handled;
{
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)
{
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
keyboard_reset_chains(-1);
return;
}
if (p->key == e->xkey.keycode &&
p->state == e->xkey.state)
{
- if (p->first_child != NULL) /* part of a chain */
+ /* 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 */
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ /* 3 second timeout for chains */
+ ob_main_loop_timeout_add(ob_main_loop, 3 * G_USEC_PER_SEC,
+ chain_timeout, NULL,
+ g_direct_equal, NULL);
set_curpos(p);
- else if (p->chroot) /* an empty chroot */
+ } 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 (((ObActionsAct*)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,
gboolean keyboard_interactively_grabbed()
{
- return !!interactive_states;
+ return istate.active;
}
void keyboard_startup(gboolean reconfig)
{
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)
{
- GSList *it;
-
if (!reconfig)
- client_remove_destructor(keyboard_interactive_end_client);
+ client_remove_destroy_notify(keyboard_interactive_end_client);
- for (it = interactive_states; it; it = g_slist_next(it))
- g_free(it->data);
- g_slist_free(interactive_states);
- interactive_states = NULL;
+ if (istate.active)
+ keyboard_interactive_cancel();
- ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
keyboard_unbind_all();
set_curpos(NULL);
projects / chaz / openbox / blobdiff