gboolean ignored;
} ObEventData;
+typedef struct
+{
+ ObClient *client;
+ Time time;
+} ObFocusDelayData;
+
static void event_process(const XEvent *e, gpointer data);
static void event_client_dest(ObClient *client, gpointer data);
static void event_handle_root(XEvent *e);
static void event_handle_client(ObClient *c, XEvent *e);
static void event_handle_group(ObGroup *g, XEvent *e);
+static void focus_delay_destroy(gpointer data);
static gboolean focus_delay_func(gpointer data);
static void focus_delay_client_dest(ObClient *client, gpointer data);
static gboolean menu_can_hide;
+static ObFocusDelayData focus_delay_data = { .client = NULL,
+ .time = CurrentTime };
+
+
+
#ifdef USE_SM
static void ice_handler(gint fd, gpointer conn)
{
switch(e->type) {
case EnterNotify:
case LeaveNotify:
- if (e->xcrossing.detail == NotifyInferior)
- return TRUE;
- break;
+ return keyboard_interactively_grabbed();
case FocusIn:
case FocusOut:
/* I don't think this should ever happen with our event masks, but
ed->ignored = FALSE;
/* deal with it in the kernel */
- if (group)
+
+ if (menu_frame_visible &&
+ (e->type == EnterNotify || e->type == LeaveNotify))
+ {
+ /* crossing events for menu */
+ event_handle_menu(e);
+ } else if (group)
event_handle_group(group, e);
else if (client)
event_handle_client(client, e);
xerror_set_ignore(FALSE);
}
- /* crossing events for menu */
- if (e->type == EnterNotify || e->type == LeaveNotify)
- if (menu_frame_visible)
- event_handle_menu(e);
-
/* user input (action-bound) events */
if (e->type == ButtonPress || e->type == ButtonRelease ||
e->type == MotionNotify || e->type == KeyPress ||
if (client_normal(client) && client_can_focus(client)) {
if (config_focus_delay) {
ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+
+ focus_delay_data.client = client;
+ focus_delay_data.time = event_curtime;
+
ob_main_loop_timeout_add(ob_main_loop,
config_focus_delay,
focus_delay_func,
- client, NULL);
+ NULL, focus_delay_destroy);
} else
- focus_delay_func(client);
+ focus_delay_func(NULL);
}
}
}
break;
case LeaveNotify:
- if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window))) {
- if (e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
- menu_frame_select(e->frame, NULL);
- }
- case MotionNotify:
- if ((e = menu_entry_frame_under(ev->xmotion.x_root,
- ev->xmotion.y_root))) {
- /* XXX menu_frame_entry_move_on_screen(f); */
- menu_frame_select(e->frame, e);
+ if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
+ (f = find_active_menu()) && f->selected == e &&
+ e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
+ {
+ menu_frame_select(e->frame, NULL);
}
- break;
case KeyPress:
if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
menu_frame_hide_all();
return FALSE; /* no repeat */
}
-static gboolean focus_delay_func(gpointer data)
+static void focus_delay_destroy(gpointer data)
{
- ObClient *c = data;
+ focus_delay_data.client = NULL;
+ focus_delay_data.time = CurrentTime;
+}
- if (focus_client != c) {
- if (client_focus(c) && config_focus_raise)
- client_raise(c);
+static gboolean focus_delay_func(gpointer data)
+{
+ Time old = event_curtime;
+ event_curtime = focus_delay_data.time;
+ if (focus_client != focus_delay_data.client) {
+ if (client_focus(focus_delay_data.client) && config_focus_raise)
+ client_raise(focus_delay_data.client);
}
+ event_curtime = old;
return FALSE; /* no repeat */
}