static gboolean focus_delay_func(gpointer data);
static void focus_delay_client_dest(ObClient *client, gpointer data);
-static gboolean menu_hide_delay_func(gpointer data);
-
/* The time for the current event being processed */
Time event_curtime = CurrentTime;
static guint ignore_enter_focus = 0;
-static gboolean menu_can_hide;
static gboolean focus_left_screen = FALSE;
#ifdef USE_SM
/* This means focus reverted off of a client */
else if (detail == NotifyPointerRoot ||
detail == NotifyDetailNone ||
- detail == NotifyInferior)
+ detail == NotifyInferior ||
+ /* This means focus got here from another screen */
+ detail == NotifyNonlinear)
return TRUE;
else
return FALSE;
/* crossing events for menu */
event_handle_menu(e);
} else if (e->type == FocusIn) {
+ if (client &&
+ e->xfocus.detail == NotifyInferior)
+ {
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Focus went to the frame window");
+
+ focus_left_screen = FALSE;
+
+ focus_fallback(FALSE, FALSE);
+
+ /* We don't get a FocusOut for this case, because it's just moving
+ from our Inferior up to us. This happens when iconifying a
+ window with RevertToParent focus */
+ frame_adjust_focus(client->frame, FALSE);
+ /* focus_set_client(NULL) has already been called */
+ client_calc_layer(client);
+ }
if (e->xfocus.detail == NotifyPointerRoot ||
e->xfocus.detail == NotifyDetailNone ||
- e->xfocus.detail == NotifyInferior)
+ e->xfocus.detail == NotifyInferior ||
+ e->xfocus.detail == NotifyNonlinear)
{
XEvent ce;
- ob_debug_type(OB_DEBUG_FOCUS, "Focus went to pointer root/none or"
- " the frame window\n");
+ ob_debug_type(OB_DEBUG_FOCUS,
+ "Focus went to root or pointer root/none\n");
+
+ if (e->xfocus.detail == NotifyInferior ||
+ e->xfocus.detail == NotifyNonlinear)
+ {
+ focus_left_screen = FALSE;
+ }
/* If another FocusIn is in the queue then don't fallback yet. This
fixes the fun case of:
*/
if (!focus_left_screen)
- focus_fallback(TRUE, FALSE);
+ focus_fallback(FALSE, FALSE);
}
}
else if (!client)
/* If you send focus to a window and then it disappears, you can
get the FocusIn for it, after it is unmanaged.
- Just wait for the next FocusOut/FocusIn pair. */
+ Just wait for the next FocusOut/FocusIn pair, but make note that
+ the window that was focused no longer is. */
+ focus_set_client(NULL);
}
else if (client != focus_client) {
focus_left_screen = FALSE;
}
break;
case MotionNotify:
+ /* when there is a grab on the pointer, we won't get enter/leave
+ notifies, but we still get motion events */
+ if (grab_on_pointer()) break;
+
con = frame_context(client, e->xmotion.window,
e->xmotion.x, e->xmotion.y);
switch (con) {
also you can't compress stacking events
*/
- gint x, y, w, h, b;
+ gint x, y, w, h;
gboolean move = FALSE;
gboolean resize = FALSE;
- gboolean border = FALSE;
+ gboolean restack = FALSE;
/* get the current area */
RECT_TO_DIMS(client->area, x, y, w, h);
- b = client->border_width;
ob_debug("ConfigureRequest for \"%s\" desktop %d wmstate %d "
"visibile %d\n"
" x %d y %d w %d h %d b %d\n",
client->title,
screen_desktop, client->wmstate, client->frame->visible,
- x, y, w, h, b);
+ x, y, w, h, client->border_width);
if (e->xconfigurerequest.value_mask & CWBorderWidth)
if (client->border_width != e->xconfigurerequest.border_width) {
- b = e->xconfigurerequest.border_width;
- border = TRUE;
+ client->border_width = e->xconfigurerequest.border_width;
+
+ /* if the border width is changing then that is the same
+ as requesting a resize, but we don't actually change
+ the client's border, so it will change their root
+ coordiantes (since they include the border width) and
+ we need to a notify then */
+ move = TRUE;
}
}
/* activate it rather than just focus it */
- stacking_restack_request(client, sibling,
- e->xconfigurerequest.detail, TRUE);
+ restack = stacking_restack_request(client, sibling,
+ e->xconfigurerequest.detail,
+ TRUE);
/* if a stacking change moves the window without resizing */
move = TRUE;
desktop. eg. open amarok window on desktop 1, switch to desktop
2, click amarok tray icon. it will move by its decoration size.
*/
- if (move && !resize &&
- x != client->area.x &&
+ if (x != client->area.x &&
x == (client->frame->area.x + client->frame->size.left -
(gint)client->border_width) &&
y != client->area.y &&
y == (client->frame->area.y + client->frame->size.top -
- (gint)client->border_width))
+ (gint)client->border_width) &&
+ w == client->area.width &&
+ h == client->area.height)
{
ob_debug_type(OB_DEBUG_APP_BUGS,
"Application %s is trying to move via "
notify is sent or not */
}
- if (move || resize || border) {
+ if (move || resize) {
gint lw,lh;
- if (move || resize) {
- client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
+ client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
- /* if x was not given, then use gravity to figure out the new
- x. the reference point should not be moved */
- if ((e->xconfigurerequest.value_mask & CWWidth &&
- !(e->xconfigurerequest.value_mask & CWX)))
- client_gravity_resize_w(client, &x, client->area.width, w);
- /* if y was not given, then use gravity to figure out the new
- y. the reference point should not be moved */
- if ((e->xconfigurerequest.value_mask & CWHeight &&
- !(e->xconfigurerequest.value_mask & CWY)))
- client_gravity_resize_h(client, &y, client->area.height,h);
+ /* if x was not given, then use gravity to figure out the new
+ x. the reference point should not be moved */
+ if ((e->xconfigurerequest.value_mask & CWWidth &&
+ !(e->xconfigurerequest.value_mask & CWX)))
+ client_gravity_resize_w(client, &x, client->area.width, w);
+ /* if y was not given, then use gravity to figure out the new
+ y. the reference point should not be moved */
+ if ((e->xconfigurerequest.value_mask & CWHeight &&
+ !(e->xconfigurerequest.value_mask & CWY)))
+ client_gravity_resize_h(client, &y, client->area.height,h);
+
+ client_find_onscreen(client, &x, &y, w, h, FALSE);
- client_find_onscreen(client, &x, &y, w, h, FALSE);
- }
/* if they requested something that moves the window, or if
the window is actually being changed then configure it and
send a configure notify to them */
- if (move || !RECT_EQUAL_DIMS(client->area, x, y, w, h) ||
- border)
- {
- ob_debug("Granting ConfigureRequest x %d y %d w %d h %d "
- "b %d\n",
- x, y, w, h, b);
- client_configure(client, x, y, w, h, b, FALSE, TRUE);
+ if (move || !RECT_EQUAL_DIMS(client->area, x, y, w, h)) {
+ ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
+ x, y, w, h);
+ client_configure(client, x, y, w, h, FALSE, TRUE);
}
- /* ignore enter events caused by these like ob actions do */
- event_ignore_all_queued_enters();
+ if (!restack || !config_focus_under_mouse) {
+ /* ignore enter events caused by these like ob actions do */
+ event_ignore_all_queued_enters();
+ }
}
break;
}
break;
case ReparentNotify:
/* this is when the client is first taken captive in the frame */
- if (e->xreparent.parent == client->frame->plate) break;
+ if (e->xreparent.parent == client->frame->window) break;
/*
This event is quite rare and is usually handled in unmapHandler.
client_set_state(client, e->xclient.data.l[0],
e->xclient.data.l[1], e->xclient.data.l[2]);
- /* ignore enter events caused by these like ob actions do */
- event_ignore_all_queued_enters();
+ if (!config_focus_under_mouse) {
+ /* ignore enter events caused by these like ob actions do */
+ event_ignore_all_queued_enters();
+ }
} else if (msgtype == prop_atoms.net_close_window) {
ob_debug("net_close_window for 0x%lx\n", client->window);
client_close(client);
client_find_onscreen(client, &x, &y, w, h, FALSE);
- client_configure(client, x, y, w, h, client->border_width,
- FALSE, TRUE);
+ client_configure(client, x, y, w, h, FALSE, TRUE);
client->gravity = ograv;
if (msgtype == XA_WM_NORMAL_HINTS) {
client_update_normal_hints(client);
/* normal hints can make a window non-resizable */
- client_setup_decor_and_functions(client);
+ client_setup_decor_and_functions(client, TRUE);
} else if (msgtype == XA_WM_HINTS) {
client_update_wmhints(client);
} else if (msgtype == XA_WM_TRANSIENT_FOR) {
client_get_type_and_transientness(client);
/* type may have changed, so update the layer */
client_calc_layer(client);
- client_setup_decor_and_functions(client);
+ client_setup_decor_and_functions(client, TRUE);
} else if (msgtype == prop_atoms.net_wm_name ||
msgtype == prop_atoms.wm_name ||
msgtype == prop_atoms.net_wm_icon_name ||
client_update_title(client);
} else if (msgtype == prop_atoms.wm_protocols) {
client_update_protocols(client);
- client_setup_decor_and_functions(client);
+ client_setup_decor_and_functions(client, TRUE);
}
else if (msgtype == prop_atoms.net_wm_strut) {
client_update_strut(client);
dock_hide(FALSE);
break;
case LeaveNotify:
- dock_hide(TRUE);
+ /* don't hide when moving into a dock app */
+ if (e->xcrossing.detail != NotifyInferior)
+ dock_hide(TRUE);
break;
}
}
if (frame == NULL)
ret = FALSE;
- else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) {
- /* Escape goes to the parent menu or closes the last one */
- if (frame->parent)
- menu_frame_select(frame, NULL, TRUE);
- else
- menu_frame_hide_all();
- }
+ else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0)
+ menu_frame_hide_all();
else if (keycode == ob_keycode(OB_KEY_RETURN) && (state == 0 ||
state == ControlMask))
switch (ev->type) {
case ButtonRelease:
- if ((ev->xbutton.button < 4 || ev->xbutton.button > 5)
- && menu_can_hide)
+ if (menu_hide_delay_reached() &&
+ (ev->xbutton.button < 4 || ev->xbutton.button > 5))
{
if ((e = menu_entry_frame_under(ev->xbutton.x_root,
ev->xbutton.y_root)))
moved/resized */
client = moveresize_client;
- menu_can_hide = FALSE;
- ob_main_loop_timeout_add(ob_main_loop,
- config_menu_hide_delay * 1000,
- menu_hide_delay_func,
- NULL, g_direct_equal, NULL);
-
if (e->type == ButtonPress ||
e->type == ButtonRelease ||
e->type == MotionNotify)
}
}
-static gboolean menu_hide_delay_func(gpointer data)
-{
- menu_can_hide = TRUE;
- return FALSE; /* no repeat */
-}
-
static void focus_delay_dest(gpointer data)
{
g_free(data);