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

really fix focus_last?

Browse source
This commit is contained in:
Mikael Magnusson 2006-08-04 19:56:42 +00:00
parent e3c52da8c3
commit dce6247e69
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openbox/action.c
View file

@ -1071,7 +1071,8 @@ void action_focus(union ActionData *data)
void action_unfocus (union ActionData *data) void action_unfocus (union ActionData *data)
{ {
client_unfocus(data->client.any.c); if (data->client.any.c == focus_client);
focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
} }
void action_iconify(union ActionData *data) void action_iconify(union ActionData *data)

4
openbox/client.c
View file

@ -2833,13 +2833,15 @@ gboolean client_focus(ObClient *self)
return TRUE; return TRUE;
} }
/* Used when the current client is closed, focus_last will then prevent
* focus from going to the mouse pointer */
void client_unfocus(ObClient *self) void client_unfocus(ObClient *self)
{ {
if (focus_client == self) { if (focus_client == self) {
#ifdef DEBUG_FOCUS #ifdef DEBUG_FOCUS
ob_debug("client_unfocus for %lx\n", self->window); ob_debug("client_unfocus for %lx\n", self->window);
#endif #endif
focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); focus_fallback(OB_FOCUS_FALLBACK_CLOSED);
} }
} }

3
openbox/focus.c
View file

@ -249,7 +249,8 @@ ObClient* focus_fallback_target(ObFocusFallbackType type)
old = focus_client; old = focus_client;
if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) { if ((type == OB_FOCUS_FALLBACK_UNFOCUSING
|| type == OB_FOCUS_FALLBACK_CLOSED) && old) {
if (old->transient_for) { if (old->transient_for) {
gboolean trans = FALSE; gboolean trans = FALSE;

1
openbox/focus.h
View file

@ -48,6 +48,7 @@ void focus_set_client(struct _ObClient *client);
typedef enum { typedef enum {
OB_FOCUS_FALLBACK_UNFOCUSING, /*!< forcefully remove focus from the OB_FOCUS_FALLBACK_UNFOCUSING, /*!< forcefully remove focus from the
current window */ current window */
OB_FOCUS_FALLBACK_CLOSED, /*!< closed the window with focus */
OB_FOCUS_FALLBACK_NOFOCUS /*!< nothing has focus for some reason */ OB_FOCUS_FALLBACK_NOFOCUS /*!< nothing has focus for some reason */
} ObFocusFallbackType; } ObFocusFallbackType;