#include "event.h"
#include "grab.h"
#include "client.h"
-#include "action.h"
+#include "actions.h"
#include "prop.h"
#include "menuframe.h"
#include "config.h"
gboolean active;
guint state;
ObClient *client;
- ObAction *action;
+ ObActionsAct *action;
} ObInteractiveState;
KeyBindingTree *keyboard_firstnode = NULL;
g_free(oldtext);
}
- a = screen_physical_area_monitor_active();
+ 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);
}
}
-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
static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
gboolean ungrab)
{
+#if 0
GSList *alist;
g_assert(istate.active);
g_slist_free(alist);
keyboard_reset_chains(0);
+#endif
}
static void keyboard_interactive_end_client(ObClient *client, gpointer data)
}
gboolean keyboard_interactive_grab(guint state, ObClient *client,
- ObAction *action)
+ ObActionsAct *action)
{
+#if 0
g_assert(action->data.any.interactive);
if (!istate.active) {
istate.client = client;
istate.action = action;
+#endif
return TRUE;
}
gboolean inter = FALSE;
for (it = p->actions; it && !inter; it = g_slist_next(it))
- if (((ObAction*)it->data)->data.any.interactive)
+ if (((ObActionsAct*)it->data)->data.any.interactive)
inter = TRUE;
if (!inter) /* don't reset if the action is interactive */
keyboard_reset_chains(0);