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

Diff for /src/usr.bin/tmux/cmd-find.c between version 1.26 and 1.27

version 1.26, 2015/12/15 14:32:55 version 1.27, 2015/12/16 21:50:37
Line 190 
Line 190 
         u_int             ssize;          u_int             ssize;
         struct session   *s;          struct session   *s;
   
         if (fs->cmdq->client != NULL) {          if (fs->cmdq != NULL && fs->cmdq->client != NULL) {
                 fs->s = cmd_find_try_TMUX(fs->cmdq->client, fs->w);                  fs->s = cmd_find_try_TMUX(fs->cmdq->client, fs->w);
                 if (fs->s != NULL)                  if (fs->s != NULL)
                         return (cmd_find_best_winlink_with_window(fs));                          return (cmd_find_best_winlink_with_window(fs));
Line 254 
Line 254 
          * sessions to those containing that pane (we still use the current           * sessions to those containing that pane (we still use the current
          * window in the best session).           * window in the best session).
          */           */
         if (fs->cmdq->client->tty.path != NULL) {          if (fs->cmdq != NULL && fs->cmdq->client->tty.path != NULL) {
                 RB_FOREACH(wp, window_pane_tree, &all_window_panes) {                  RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
                         if (strcmp(wp->tty, fs->cmdq->client->tty.path) == 0)                          if (strcmp(wp->tty, fs->cmdq->client->tty.path) == 0)
                                 break;                                  break;
Line 289 
Line 289 
         return (0);          return (0);
   
 unknown_pane:  unknown_pane:
         fs->s = cmd_find_try_TMUX(fs->cmdq->client, NULL);          fs->s = NULL;
           if (fs->cmdq != NULL)
                   fs->s = cmd_find_try_TMUX(fs->cmdq->client, NULL);
         if (fs->s == NULL)          if (fs->s == NULL)
                 fs->s = cmd_find_best_session(NULL, 0, fs->flags);                  fs->s = cmd_find_best_session(NULL, 0, fs->flags);
         if (fs->s == NULL)          if (fs->s == NULL)
Line 310 
Line 312 
 cmd_find_current_session(struct cmd_find_state *fs)  cmd_find_current_session(struct cmd_find_state *fs)
 {  {
         /* If we know the current client, use it. */          /* If we know the current client, use it. */
         if (fs->cmdq->client != NULL) {          if (fs->cmdq != NULL && fs->cmdq->client != NULL) {
                 log_debug("%s: have client %p%s", __func__, fs->cmdq->client,                  log_debug("%s: have client %p%s", __func__, fs->cmdq->client,
                     fs->cmdq->client->session == NULL ? "" : " (with session)");                      fs->cmdq->client->session == NULL ? "" : " (with session)");
                 if (fs->cmdq->client->session == NULL)                  if (fs->cmdq->client->session == NULL)
Line 860 
Line 862 
                 log_debug("%s: idx=%d", prefix, fs->idx);                  log_debug("%s: idx=%d", prefix, fs->idx);
         else          else
                 log_debug("%s: idx=none", prefix);                  log_debug("%s: idx=none", prefix);
   }
   
   /* Find state from a session. */
   int
   cmd_find_from_session(struct cmd_find_state *fs, struct session *s)
   {
           cmd_find_clear_state(fs, NULL, 0);
   
           fs->s = s;
           fs->wl = fs->s->curw;
           fs->w = fs->wl->window;
           fs->wp = fs->w->active;
   
           cmd_find_log_state(__func__, fs);
           return (0);
   }
   
   /* Find state from a window. */
   int
   cmd_find_from_window(struct cmd_find_state *fs, struct window *w)
   {
           cmd_find_clear_state(fs, NULL, 0);
   
           fs->w = w;
           if (cmd_find_best_session_with_window(fs) != 0)
                   return (-1);
           if (cmd_find_best_winlink_with_window(fs) != 0)
                   return (-1);
   
           cmd_find_log_state(__func__, fs);
           return (0);
   }
   
   /* Find state from a pane. */
   int
   cmd_find_from_pane(struct cmd_find_state *fs, struct window_pane *wp)
   {
           if (cmd_find_from_window(fs, wp->window) != 0)
                   return (-1);
           fs->wp = wp;
   
           cmd_find_log_state(__func__, fs);
           return (0);
 }  }
   
 /*  /*
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27