#include "event.h"
#include "config.h"
#include "client.h"
+#include "openbox.h"
#include "debug.h"
#include "actions/all.h"
static ObActionsAct *interactive_act = NULL;
static guint interactive_initial_state = 0;
+static gboolean replay_pointer = FALSE;
struct _ObActionsDefinition {
guint ref;
}
}
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
{
GSList *it;
ObActionsDefinition *def = NULL;
if ((act = actions_build_act_from_string(name)))
if (act->def->setup)
- act->options = act->def->setup(NULL, NULL, NULL);
+ act->options = act->def->setup(NULL);
return act;
}
-ObActionsAct* actions_parse(ObParseInst *i,
- xmlDocPtr doc,
- xmlNodePtr node)
+ObActionsAct* actions_parse(xmlNodePtr node)
{
gchar *name;
ObActionsAct *act = NULL;
- if (parse_attr_string("name", node, &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);
}
data->client = client;
}
+void actions_set_need_pointer_replay_before_move(gboolean replay)
+{
+ replay_pointer = replay;
+}
+
+gboolean actions_get_need_pointer_replay_before_move()
+{
+ return replay_pointer;
+}
+
void actions_run_acts(GSList *acts,
ObUserAction uact,
guint state,
}
}
-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);
/* 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();
void actions_client_move(ObActionsData *data, gboolean start)
{
static gulong ignore_start = 0;
- if (start)
+ if (start) {
ignore_start = event_start_ignore_all_enters();
+ if (replay_pointer) {
+ /* replay the pointer event before any windows move */
+ XAllowEvents(obt_display, ReplayPointer, event_curtime);
+ replay_pointer = FALSE;
+ }
+ }
else if (config_focus_follow &&
data->context != OB_FRAME_CONTEXT_CLIENT)
{
- if (!data->button && data->client && !config_focus_under_mouse)
- event_end_ignore_all_enters(ignore_start);
- else {
+ if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
struct _ObClient *c;
/* usually this is sorta redundant, but with a press action
event_enter_client(c);
}
}
+ else if (!data->button && !config_focus_under_mouse)
+ event_end_ignore_all_enters(ignore_start);
}
}