#include "gettext.h"
#include "grab.h"
#include "screen.h"
+#include "event.h"
+#include "config.h"
+#include "client.h"
+#include "openbox.h"
+#include "debug.h"
#include "actions/all.h"
static void actions_definition_unref(ObActionsDefinition *def);
static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state);
static void actions_interactive_end_act();
+static ObActionsAct* actions_build_act_from_string(const gchar *name);
static ObActionsAct *interactive_act = NULL;
static guint interactive_initial_state = 0;
}
}
-ObActionsAct* actions_parse_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
{
GSList *it;
ObActionsDefinition *def = NULL;
return act;
}
-ObActionsAct* actions_parse(ObParseInst *i,
- xmlDocPtr doc,
- xmlNodePtr node)
+ObActionsAct* actions_parse_string(const gchar *name)
+{
+ ObActionsAct *act = NULL;
+
+ if ((act = actions_build_act_from_string(name)))
+ if (act->def->setup)
+ act->options = act->def->setup(NULL);
+
+ return act;
+}
+
+ObActionsAct* actions_parse(xmlNodePtr node)
{
gchar *name;
ObActionsAct *act = NULL;
- if (parse_attr_string("name", node, &name)) {
- if ((act = actions_parse_string(name)))
+ if (obt_parse_attr_string(node, "name", &name)) {
+ if ((act = actions_build_act_from_string(name)))
/* there is more stuff to parse here */
if (act->def->setup)
- act->options = act->def->setup(i, doc, node->xmlChildrenNode);
+ act->options = act->def->setup(node->children);
g_free(name);
}
guint state,
gint x,
gint y,
+ gint button,
ObFrameContext con,
struct _ObClient *client)
{
data->state = state;
data->x = x;
data->y = y;
+ data->button = button;
data->context = con;
data->client = client;
}
guint state,
gint x,
gint y,
+ gint button,
ObFrameContext con,
struct _ObClient *client)
{
ObActionsAct *act = it->data;
gboolean ok = TRUE;
- actions_setup_data(&data, uact, state, x, y, con, client);
+ actions_setup_data(&data, uact, state, x, y, button, con, client);
- if (actions_act_is_interactive(act) &&
- (!interactive_act || interactive_act->def != act->def))
- {
- ok = actions_interactive_begin_act(act, state);
+ /* if they have the same run function, then we'll assume they are
+ cooperating and not cancel eachother out */
+ if (!interactive_act || interactive_act->def->run != act->def->run) {
+ if (actions_act_is_interactive(act)) {
+ /* cancel the old one */
+ if (interactive_act)
+ actions_interactive_cancel_act();
+ ok = actions_interactive_begin_act(act, state);
+ }
}
/* fire the action's run function with this data */
if (ok) {
- if (!act->def->run(&data, act->options))
- actions_interactive_end_act();
- else {
+ if (!act->def->run(&data, act->options)) {
+ if (actions_act_is_interactive(act))
+ actions_interactive_end_act();
+ } else {
/* make sure its interactive if it returned TRUE */
g_assert(act->def->i_cancel && act->def->i_input);
}
}
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
{
return interactive_act != NULL;
}
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
{
if (interactive_act) {
interactive_act->def->i_cancel(interactive_act->options);
static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
{
- /* cancel the old one */
- if (interactive_act)
- actions_interactive_cancel_act();
-
if (grab_keyboard()) {
interactive_act = act;
actions_act_ref(interactive_act);
interactive_initial_state = state;
+
+ /* if using focus_delay, stop the timer now so that focus doesn't go
+ moving on us, which would kill the action */
+ event_halt_focus_delay();
+
return TRUE;
}
else
return FALSE;
}
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
{
if (interactive_act) {
ungrab_keyboard();
}
return used;
}
+
+void actions_client_move(ObActionsData *data, gboolean start)
+{
+ static gulong ignore_start = 0;
+ if (start)
+ ignore_start = event_start_ignore_all_enters();
+ else if (config_focus_follow &&
+ data->context != OB_FRAME_CONTEXT_CLIENT)
+ {
+ if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
+ struct _ObClient *c;
+
+ /* usually this is sorta redundant, but with a press action
+ that moves windows our from under the cursor, the enter
+ event will come as a GrabNotify which is ignored, so this
+ makes a fake enter event
+
+ don't do this if there is a grab on the pointer. enter events
+ are ignored during a grab, so don't force fake ones when they
+ should be ignored
+ */
+ if ((c = client_under_pointer()) && c != data->client &&
+ !grab_on_pointer())
+ {
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Generating fake enter because we did a "
+ "mouse-event action");
+ event_enter_client(c);
+ }
+ }
+ else if (!data->button && !config_focus_under_mouse)
+ event_end_ignore_all_enters(ignore_start);
+ }
+}