static ObActionsAct *interactive_act = NULL;
static guint interactive_initial_state = 0;
-static gboolean replay_pointer = FALSE;
struct _ObActionsDefinition {
guint ref;
static GSList *registered = NULL;
-
void actions_startup(gboolean reconfig)
{
if (reconfig) return;
actions_definition_ref(act->def);
act->options = NULL;
} else
- g_message(_("Invalid action '%s' requested. No such action exists."),
+ g_message(_("Invalid action \"%s\" requested. No such action exists."),
name);
return act;
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,
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(ob_display, ReplayPointer, event_curtime);
- replay_pointer = FALSE;
- }
- }
else if (config_focus_follow &&
data->context != OB_FRAME_CONTEXT_CLIENT)
{
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) {
+ 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");