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

drop some wasted client_validates.

Browse source
This commit is contained in:
Dana Jansens 2007-03-28 02:00:10 +00:00
parent d20f84f5de
commit 33cc572402
5 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openbox/action.c
View file

@ -1166,8 +1166,7 @@ void action_focus(union ActionData *data)
moving on us */ moving on us */
event_halt_focus_delay(); event_halt_focus_delay();
if (client_validate(data->client.any.c)) client_focus(data->client.any.c);
client_focus(data->client.any.c);
} }
} }

5
openbox/client.c
View file

@ -2963,11 +2963,6 @@ gboolean client_focus(ObClient *self)
/* choose the correct target */ /* choose the correct target */
self = client_focus_target(self); self = client_focus_target(self);
#if 0
if (!client_validate(self))
return FALSE;
#endif
if (!client_can_focus(self)) { if (!client_can_focus(self)) {
if (!self->frame->visible) { if (!self->frame->visible) {
/* update the focus lists */ /* update the focus lists */

7
openbox/event.c
View file

@ -1320,11 +1320,8 @@ static gboolean focus_delay_func(gpointer data)
ObClient *c = data; ObClient *c = data;
if (focus_client != c) { if (focus_client != c) {
if (client_validate(c)) { if (client_focus(c) && config_focus_raise)
client_focus(c); client_raise(c);
if (config_focus_raise)
client_raise(c);
}
} }
return FALSE; /* no repeat */ return FALSE; /* no repeat */
} }

7
openbox/focus.c
View file

@ -212,8 +212,7 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
{ {
if ((target = client_under_pointer())) if ((target = client_under_pointer()))
if (allow_refocus || target != old) if (allow_refocus || target != old)
if (client_normal(target) && client_can_focus(target) && if (client_normal(target) && client_can_focus(target)) {
client_validate(target)) {
ob_debug("found in pointer stuff\n"); ob_debug("found in pointer stuff\n");
return target; return target;
} }
@ -254,8 +253,8 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
a splashscreen or a desktop window (save the desktop as a a splashscreen or a desktop window (save the desktop as a
backup fallback though) backup fallback though)
*/ */
if (client_can_focus(c) && client_validate(c) && if (client_can_focus(c) && c->desktop == screen_desktop &&
c->desktop == screen_desktop && !c->iconic) !c->iconic)
{ {
if (client_normal(c)) { if (client_normal(c)) {
ob_debug("found in focus order\n"); ob_debug("found in focus order\n");

2
openbox/screen.c
View file

@ -882,7 +882,7 @@ void screen_show_desktop(gboolean show)
ObClient *c = it->data; ObClient *c = it->data;
if (c->type == OB_CLIENT_TYPE_DESKTOP && if (c->type == OB_CLIENT_TYPE_DESKTOP &&
(c->desktop == screen_desktop || c->desktop == DESKTOP_ALL) && (c->desktop == screen_desktop || c->desktop == DESKTOP_ALL) &&
client_validate(it->data) && client_focus(it->data)) client_focus(it->data))
break; break;
} }
} else { } else {