See the COPYING file for a copy of the GNU General Public License.
*/
-#include "mainloop.h"
#include "focus.h"
#include "screen.h"
#include "frame.h"
#include "event.h"
#include "grab.h"
#include "client.h"
-#include "action.h"
-#include "prop.h"
+#include "actions.h"
#include "menuframe.h"
#include "config.h"
#include "keytree.h"
#include "moveresize.h"
#include "popup.h"
#include "gettext.h"
+#include "obt/keyboard.h"
#include <glib.h>
-typedef struct {
- gboolean active;
- guint state;
- ObClient *client;
- ObAction *action;
-} ObInteractiveState;
-
KeyBindingTree *keyboard_firstnode = NULL;
static ObPopup *popup = NULL;
-static ObInteractiveState istate;
static KeyBindingTree *curpos;
+static guint chain_timer = 0;
static void grab_keys(gboolean grab)
{
KeyBindingTree *p;
- ungrab_all_keys(RootWindow(ob_display, ob_screen));
+ ungrab_all_keys(obt_root(ob_screen));
if (grab) {
p = curpos ? curpos->first_child : keyboard_firstnode;
while (p) {
- grab_key(p->key, p->state, RootWindow(ob_display, ob_screen),
- GrabModeAsync);
+ if (p->key)
+ grab_key(p->key, p->state, obt_root(ob_screen),
+ GrabModeAsync);
p = p->next_sibling;
}
if (curpos)
grab_key(config_keyboard_reset_keycode,
config_keyboard_reset_state,
- RootWindow(ob_display, ob_screen), GrabModeAsync);
+ obt_root(ob_screen), GrabModeAsync);
}
}
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_active();
+ 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);
}
set_curpos(p);
}
-void keyboard_unbind_all()
+void keyboard_unbind_all(void)
{
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
}
}
-gboolean keyboard_bind(GList *keylist, ObAction *action)
+gboolean keyboard_bind(GList *keylist, ObActionsAct *action)
{
KeyBindingTree *tree, *t;
gboolean conflict;
/* 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 (!t->state && action->data.any.interactive) {
- g_print("not interactive\n");
- action->data.any.interactive = FALSE;
- action->data.inter.final = TRUE;
- }
-
/* set the action */
t->actions = g_slist_append(t->actions, action);
/* assimilate this built tree into the main tree. assimilation
return TRUE;
}
-static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
- gboolean ungrab)
-{
- GSList *alist;
-
- 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);
-
- keyboard_reset_chains(0);
-}
-
-static void keyboard_interactive_end_client(ObClient *client, gpointer data)
-{
- if (istate.active && istate.client == client)
- 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) {
- if (!grab_keyboard())
- return FALSE;
- } else if (action->func != istate.action->func) {
- keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
- }
-
- istate.active = TRUE;
- istate.state = state;
- istate.client = client;
- istate.action = action;
-
- return TRUE;
-}
-
+#if 0
gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
{
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) {
return handled;
}
+#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)
{
- ob_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 */
- ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ if (chain_timer) g_source_remove(chain_timer);
/* 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);
+ 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);
else {
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 */
+ for (it = p->actions; it; it = g_slist_next(it))
+ if (actions_act_is_interactive(it->data)) break;
+ if (it == NULL) /* reset if the actions are not interactive */
keyboard_reset_chains(0);
- action_run_key(p->actions, client, e->xkey.state,
- e->xkey.x_root, e->xkey.y_root,
- e->xkey.time);
+ actions_run_acts(p->actions, OB_USER_ACTION_KEYBOARD_KEY,
+ e->xkey.state, e->xkey.x_root, e->xkey.y_root,
+ 0, OB_FRAME_CONTEXT_NONE, client);
}
break;
+ used = TRUE;
}
p = p->next_sibling;
}
+ return used;
}
-gboolean keyboard_interactively_grabbed()
+static void node_rebind(KeyBindingTree *node)
{
- return istate.active;
+ if (node->first_child) {
+ /* find leaf nodes */
+ node_rebind(node->first_child);
+
+ /* for internal nodes, add them to the tree if they
+ are a chroot, but do this after adding their
+ children */
+ if (node->chroot)
+ keyboard_chroot(node->keylist);
+ }
+ else {
+ /* for leaf nodes, rebind each action assigned to it */
+ while (node->actions) {
+ /* add each action, and remove them from the original tree so
+ they don't get free'd on us */
+ keyboard_bind(node->keylist, node->actions->data);
+ node->actions = g_slist_delete_link(node->actions, node->actions);
+ }
+
+ if (node->chroot)
+ keyboard_chroot(node->keylist);
+ }
+
+ /* go through each sibling */
+ if (node->next_sibling) node_rebind(node->next_sibling);
+}
+
+void keyboard_rebind(void)
+{
+ KeyBindingTree *old;
+
+ old = keyboard_firstnode;
+ keyboard_firstnode = NULL;
+ node_rebind(old);
+
+ tree_destroy(old);
+ set_curpos(NULL);
+ grab_keys(TRUE);
}
void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
- popup = popup_new(FALSE);
+ popup = popup_new();
popup_set_text_align(popup, RR_JUSTIFY_CENTER);
-
- if (!reconfig)
- client_add_destroy_notify(keyboard_interactive_end_client, NULL);
}
void keyboard_shutdown(gboolean reconfig)
{
- if (!reconfig)
- client_remove_destroy_notify(keyboard_interactive_end_client);
-
- if (istate.active)
- keyboard_interactive_cancel();
-
- ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
+ if (chain_timer) g_source_remove(chain_timer);
keyboard_unbind_all();
set_curpos(NULL);
popup_free(popup);
popup = NULL;
}
-