[BACK]Return to server-window.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/Attic/server-window.c between version 1.22 and 1.23

version 1.22, 2011/08/24 09:58:44 version 1.23, 2012/01/21 06:13:16
Line 56 
Line 56 
                                 server_status_session(s);                                  server_status_session(s);
                         TAILQ_FOREACH(wp, &w->panes, entry)                          TAILQ_FOREACH(wp, &w->panes, entry)
                                 server_window_check_content(s, wl, wp);                                  server_window_check_content(s, wl, wp);
   
                           if (!(s->flags & SESSION_UNATTACHED))
                                   w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY);
                 }                  }
                 w->flags &= ~(WINDOW_BELL|WINDOW_ACTIVITY);  
         }          }
 }  }
   
Line 72 
Line 74 
   
         if (!(w->flags & WINDOW_BELL) || wl->flags & WINLINK_BELL)          if (!(w->flags & WINDOW_BELL) || wl->flags & WINLINK_BELL)
                 return (0);                  return (0);
         if (s->curw != wl)          if (s->curw != wl || s->flags & SESSION_UNATTACHED)
                 wl->flags |= WINLINK_BELL;                  wl->flags |= WINLINK_BELL;
   
         action = options_get_number(&s->options, "bell-action");          action = options_get_number(&s->options, "bell-action");
Line 129 
Line 131 
   
         if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY)          if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_ACTIVITY)
                 return (0);                  return (0);
         if (s->curw == wl)          if (s->curw == wl && !(s->flags & SESSION_UNATTACHED))
                 return (0);                  return (0);
   
         if (!options_get_number(&w->options, "monitor-activity"))          if (!options_get_number(&w->options, "monitor-activity"))
Line 165 
Line 167 
         if (!(w->flags & WINDOW_SILENCE) || wl->flags & WINLINK_SILENCE)          if (!(w->flags & WINDOW_SILENCE) || wl->flags & WINLINK_SILENCE)
                 return (0);                  return (0);
   
         if (s->curw == wl) {          if (s->curw == wl && !(s->flags & SESSION_UNATTACHED)) {
                 /*                  /*
                  * Reset the timer for this window if we've focused it.  We                   * Reset the timer for this window if we've focused it.  We
                  * don't want the timer tripping as soon as we've switched away                   * don't want the timer tripping as soon as we've switched away
Line 217 
Line 219 
         /* Activity flag must be set for new content. */          /* Activity flag must be set for new content. */
         if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_CONTENT)          if (!(w->flags & WINDOW_ACTIVITY) || wl->flags & WINLINK_CONTENT)
                 return (0);                  return (0);
         if (s->curw == wl)          if (s->curw == wl && !(s->flags & SESSION_UNATTACHED))
                 return (0);                  return (0);
   
         ptr = options_get_string(&w->options, "monitor-content");          ptr = options_get_string(&w->options, "monitor-content");
Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23