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

settings can't be NULL here, or we'd have already crashed anyway

Browse source
This commit is contained in:
Mikael Magnusson 2010-06-26 13:45:45 +02:00
parent a1bb01c92e
commit 128909214a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openbox/client.c
View file

@ -283,12 +283,12 @@ void client_manage(Window window, ObPrompt *prompt)
if (ob_state() != OB_STATE_STARTING && if (ob_state() != OB_STATE_STARTING &&
(!self->session || self->session->focused) && (!self->session || self->session->focused) &&
/* this means focus=true for window is same as config_focus_new=true */ /* this means focus=true for window is same as config_focus_new=true */
((config_focus_new || (settings && settings->focus == 1)) || ((config_focus_new || settings->focus == 1) ||
client_search_focus_tree_full(self)) && client_search_focus_tree_full(self)) &&
/* NET_WM_USER_TIME 0 when mapping means don't focus */ /* NET_WM_USER_TIME 0 when mapping means don't focus */
(user_time != 0) && (user_time != 0) &&
/* this checks for focus=false for the window */ /* this checks for focus=false for the window */
(!settings || settings->focus != 0) && settings->focus != 0 &&
focus_valid_target(self, self->desktop, focus_valid_target(self, self->desktop,
FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE,
settings->focus == 1)) settings->focus == 1))
@ -368,7 +368,7 @@ void client_manage(Window window, ObPrompt *prompt)
(self->type == OB_CLIENT_TYPE_DIALOG || (self->type == OB_CLIENT_TYPE_DIALOG ||
self->type == OB_CLIENT_TYPE_SPLASH || self->type == OB_CLIENT_TYPE_SPLASH ||
(!((self->positioned & USPosition) || (!((self->positioned & USPosition) ||
(settings && settings->pos_given)) && settings->pos_given) &&
client_normal(self) && client_normal(self) &&
!self->session && !self->session &&
/* don't move oldschool fullscreen windows to /* don't move oldschool fullscreen windows to
@ -436,7 +436,7 @@ void client_manage(Window window, ObPrompt *prompt)
ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s", ob_debug_type(OB_DEBUG_FOCUS, "Going to try activate new window? %s",
activate ? "yes" : "no"); activate ? "yes" : "no");
if (activate) { if (activate) {
activate = client_can_steal_focus(self, (settings && settings->focus), activate = client_can_steal_focus(self, settings->focus,
event_time(), launch_time); event_time(), launch_time);
if (!activate) { if (!activate) {