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

roll back focus fallback change, so it behaves well with new stacking

Browse source
This commit is contained in:
Dana Jansens 2007-03-12 02:41:34 +00:00
parent d113b9f33f
commit 52176d1485
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/focus.c
View file

@ -244,11 +244,14 @@ static ObClient* focus_fallback_transient(ObClient *top, ObClient *old)
return NULL; return NULL;
} }
ObClient* focus_fallback_target(ObFocusFallbackType type, ObClient *old) ObClient* focus_fallback_target(ObFocusFallbackType type)
{ {
GList *it; GList *it;
ObClient *old;
ObClient *target = NULL; ObClient *target = NULL;
old = focus_client;
if ((type == OB_FOCUS_FALLBACK_UNFOCUSING if ((type == OB_FOCUS_FALLBACK_UNFOCUSING
|| type == OB_FOCUS_FALLBACK_CLOSED) && old) { || type == OB_FOCUS_FALLBACK_CLOSED) && old) {
if (old->transient_for) { if (old->transient_for) {
@ -257,8 +260,8 @@ ObClient* focus_fallback_target(ObFocusFallbackType type, ObClient *old)
if (!config_focus_follow || config_focus_last) if (!config_focus_follow || config_focus_last)
trans = TRUE; trans = TRUE;
else if ((target = client_under_pointer()) && else if ((target = client_under_pointer()) &&
(client_search_transient client_search_transient
(client_search_top_parent(target), old))) (client_search_top_parent(target), old))
trans = TRUE; trans = TRUE;
/* try for transient relations */ /* try for transient relations */
@ -337,7 +340,6 @@ ObClient* focus_fallback_target(ObFocusFallbackType type, ObClient *old)
void focus_fallback(ObFocusFallbackType type) void focus_fallback(ObFocusFallbackType type)
{ {
ObClient *new; ObClient *new;
ObClient *old = focus_client;
/* unfocus any focused clients.. they can be focused by Pointer events /* unfocus any focused clients.. they can be focused by Pointer events
and such, and then when I try focus them, I won't get a FocusIn event and such, and then when I try focus them, I won't get a FocusIn event
@ -345,7 +347,7 @@ void focus_fallback(ObFocusFallbackType type)
*/ */
focus_set_client(NULL); focus_set_client(NULL);
if ((new = focus_fallback_target(type, old))) if ((new = focus_fallback_target(type)))
client_focus(new); client_focus(new);
} }

3
openbox/focus.h
View file

@ -53,8 +53,7 @@ typedef enum {
OB_FOCUS_FALLBACK_NOFOCUS /*!< nothing has focus for some reason */ OB_FOCUS_FALLBACK_NOFOCUS /*!< nothing has focus for some reason */
} ObFocusFallbackType; } ObFocusFallbackType;
struct _ObClient* focus_fallback_target(ObFocusFallbackType type, struct _ObClient* focus_fallback_target(ObFocusFallbackType type);
struct _ObClient *old);
/*! Call this when you need to focus something! */ /*! Call this when you need to focus something! */
void focus_fallback(ObFocusFallbackType type); void focus_fallback(ObFocusFallbackType type);

2
openbox/screen.c
View file

@ -465,7 +465,7 @@ void screen_set_desktop(guint num)
event_ignore_queued_enters(); event_ignore_queued_enters();
focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS, NULL); focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
if (focus_hilite) { if (focus_hilite) {
frame_adjust_focus(focus_hilite->frame, TRUE); frame_adjust_focus(focus_hilite->frame, TRUE);