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

not much.. some debugs and a nicer if statement

Browse source
This commit is contained in:
Dana Jansens 2007-05-04 02:47:10 +00:00
parent 7c17296a20
commit 00bf97aecd
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
openbox/client.c
View file

@ -381,8 +381,10 @@ void client_manage(Window window)
focus_client->user_time : CurrentTime; focus_client->user_time : CurrentTime;
/* This is focus stealing prevention */ /* This is focus stealing prevention */
ob_debug("Want to focus new window 0x%x with time %u (last time %u)\n", ob_debug_type(OB_DEBUG_FOCUS,
self->window, self->user_time, last_time); "Want to focus new window 0x%x with time %u "
"(last time %u)\n",
self->window, self->user_time, last_time);
/* if it's on another desktop */ /* if it's on another desktop */
if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL)
@ -391,31 +393,38 @@ void client_manage(Window window)
!event_time_after(self->user_time, screen_desktop_user_time)) !event_time_after(self->user_time, screen_desktop_user_time))
{ {
activate = FALSE; activate = FALSE;
ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because its on another "
"desktop\n");
} }
/* If nothing is focused, or a parent was focused, then focus this /* If something is focused, and it's not our parent... */
always else if (focus_client && client_search_focus_parent(self) == NULL)
*/
else if (!focus_client || client_search_focus_parent(self) != NULL)
activate = TRUE;
else
{ {
/* If time stamp is old, don't steal focus */ /* If time stamp is old, don't steal focus */
if (self->user_time && last_time && if (self->user_time && last_time &&
!event_time_after(self->user_time, last_time)) !event_time_after(self->user_time, last_time))
{ {
activate = FALSE; activate = FALSE;
ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because the time is "
"too old\n");
} }
/* Don't steal focus from globally active clients. /* Don't steal focus from globally active clients.
I stole this idea from KWin. It seems nice. I stole this idea from KWin. It seems nice.
*/ */
if (!(focus_client->can_focus || focus_client->focus_notify)) if (!(focus_client->can_focus || focus_client->focus_notify)) {
activate = FALSE; activate = FALSE;
ob_debug_type(OB_DEBUG_FOCUS,
"Not focusing the window because a globally "
"active client has focus\n");
}
} }
if (!activate) { if (!activate) {
ob_debug("Focus stealing prevention activated for %s with time %u " ob_debug_type(OB_DEBUG_FOCUS,
"(last time %u)\n", "Focus stealing prevention activated for %s with "
self->title, self->user_time, last_time); "time %u (last time %u)\n",
self->title, self->user_time, last_time);
/* if the client isn't focused, then hilite it so the user /* if the client isn't focused, then hilite it so the user
knows it is there */ knows it is there */
client_hilite(self, TRUE); client_hilite(self, TRUE);