nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prevent flicker in the follow actiosn again instead of in focus fallback. focus fallback needs to be very reliable.

Browse source
This commit is contained in:
Dana Jansens 2007-05-25 15:23:48 +00:00
parent 7cf4c970ae
commit 336011efb1
3 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/action.c
View file

@ -1588,7 +1588,7 @@ void action_send_to_desktop(union ActionData *data)
data->sendto.desk == DESKTOP_ALL) {
client_set_desktop(c, data->sendto.desk, data->sendto.follow);
if (data->sendto.follow && data->sendto.desk != screen_desktop)
screen_set_desktop(data->sendto.desk, TRUE);
screen_set_desktop(data->sendto.desk, c != focus_client);
}
}
@ -1601,7 +1601,7 @@ void action_desktop(union ActionData *data)
{
screen_set_desktop(data->desktop.desk, TRUE);
if (data->inter.any.interactive)
screen_desktop_popup(data->desktop.desk, TRUE);
screen_desktop_popup(data->desktop.desk, focus_client->desktop != DESKTOP_ALL);
}
}
@ -1621,7 +1621,7 @@ void action_desktop_dir(union ActionData *data)
if (!data->sendtodir.inter.any.interactive ||
(data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
{
if (d != screen_desktop) screen_set_desktop(d, TRUE);
if (d != screen_desktop) screen_set_desktop(d, focus_client->desktop != DESKTOP_ALL);
}
}
@ -1645,7 +1645,7 @@ void action_send_to_desktop_dir(union ActionData *data)
{
client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow && d != screen_desktop)
screen_set_desktop(d, TRUE);
screen_set_desktop(d, c != focus_client);
}
}

5
openbox/event.c
View file

@ -526,10 +526,7 @@ static void event_process(const XEvent *ec, gpointer data)
/* 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, but note that
nothing is focused now.
*/
focus_set_client(NULL);
Just wait for the next FocusOut/FocusIn pair. */
}
else if (client != focus_client) {
focus_left_screen = FALSE;

41
openbox/focus.c
View file

@ -94,8 +94,7 @@ void focus_set_client(ObClient *client)
}
}
static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
gboolean send_focus)
static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
{
GList *it;
ObClient *c;
@ -104,14 +103,10 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
if (config_focus_follow && !config_focus_last)
if ((c = client_under_pointer()) &&
(allow_refocus || c != old) &&
client_normal(c) &&
/* if we're sending focus then try to */
((send_focus && client_focus(c)) ||
/* if not just see if we could try, or it's already focused */
(!send_focus && (c == old || client_can_focus(c)))))
(client_normal(c) &&
client_focus(c)))
{
ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff (%d)\n",
send_focus);
ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n");
return c;
}
@ -119,11 +114,9 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
if (allow_refocus && old &&
old->desktop == DESKTOP_ALL &&
client_normal(old) &&
/* this one is only for when not sending focus, to keep it there */
!send_focus)
client_focus(old))
{
ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness (%d)\n",
send_focus);
ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n");
return old;
}
@ -141,14 +134,9 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
if (c->desktop == screen_desktop &&
client_normal(c) &&
(allow_refocus || c != old) &&
/* if we're sending focus then try to */
((send_focus && client_focus(c)) ||
/* if not just see if we could try, or it's already focused */
(!send_focus && (c == old || client_can_focus(c)))))
client_focus(c))
{
ob_debug_type(OB_DEBUG_FOCUS, "found in focus order (%d) 0x%x "
"from 0x%x\n",
send_focus, c, old);
ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
return c;
}
}
@ -165,13 +153,9 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
*/
if (c->type == OB_CLIENT_TYPE_DESKTOP &&
(allow_refocus || c != old) &&
/* if we're sending focus then try to */
((send_focus && client_focus(c)) ||
/* if not just see if we could try, or it's already focused */
(!send_focus && (c == old || client_can_focus(c)))))
client_focus(c))
{
ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window (%d)\n",
send_focus);
ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
return c;
}
}
@ -184,15 +168,12 @@ ObClient* focus_fallback(gboolean allow_refocus)
ObClient *new;
ObClient *old = focus_client;
new = focus_fallback_target(allow_refocus, old, FALSE);
if (new == old) return;
/* unfocus any focused clients.. they can be focused by Pointer events
and such, and then when we try focus them, we won't get a FocusIn
event at all for them. */
focus_nothing();
new = focus_fallback_target(allow_refocus, old, TRUE);
new = focus_fallback_target(allow_refocus, old);
return new;
}