#include "event.h"
#include "config.h"
#include "client.h"
+#include "openbox.h"
#include "debug.h"
#include "actions/all.h"
}
}
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
{
GSList *it;
ObActionsDefinition *def = NULL;
}
}
-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();
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);
}
}