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

Diff for /src/usr.bin/tmux/window.c between version 1.176 and 1.177

version 1.176, 2016/11/16 09:22:16 version 1.177, 2017/01/07 15:28:13
Line 447 
Line 447 
 void  void
 window_redraw_active_switch(struct window *w, struct window_pane *wp)  window_redraw_active_switch(struct window *w, struct window_pane *wp)
 {  {
         const struct grid_cell  *agc, *wgc;          const struct grid_cell  *gc;
   
         if (wp == w->active)          if (wp == w->active)
                 return;                  return;
   
         /*          /*
          * If window-style and window-active-style are the same, we don't need           * If window-style and window-active-style are the same, we don't need
          * to redraw panes when switching active panes. Otherwise, if the           * to redraw panes when switching active panes.
          * active or inactive pane do not have a custom style, they will need  
          * to be redrawn.  
          */           */
         agc = options_get_style(w->options, "window-active-style");          gc = options_get_style(w->options, "window-active-style");
         wgc = options_get_style(w->options, "window-style");          if (style_equal(gc, options_get_style(w->options, "window-style")))
         if (style_equal(agc, wgc))  
                 return;                  return;
         if (style_equal(&grid_default_cell, &w->active->colgc))  
           /*
            * If the now active or inactive pane do not have a custom style or if
            * the palette is different, they need to be redrawn.
            */
           if (WINDOW_PANE_PALETTE_HAS(w->active, w->active->colgc.fg) ||
               WINDOW_PANE_PALETTE_HAS(w->active, w->active->colgc.bg) ||
               style_equal(&grid_default_cell, &w->active->colgc))
                 w->active->flags |= PANE_REDRAW;                  w->active->flags |= PANE_REDRAW;
         if (style_equal(&grid_default_cell, &wp->colgc))          if (WINDOW_PANE_PALETTE_HAS(wp, wp->colgc.fg) ||
               WINDOW_PANE_PALETTE_HAS(wp, wp->colgc.bg) ||
               style_equal(&grid_default_cell, &wp->colgc))
                 wp->flags |= PANE_REDRAW;                  wp->flags |= PANE_REDRAW;
 }  }
   
Line 829 
Line 835 
         free((void *)wp->cwd);          free((void *)wp->cwd);
         free(wp->shell);          free(wp->shell);
         cmd_free_argv(wp->argc, wp->argv);          cmd_free_argv(wp->argc, wp->argv);
           free(wp->palette);
         free(wp);          free(wp);
 }  }
   
Line 1089 
Line 1096 
         grid_destroy(wp->saved_grid);          grid_destroy(wp->saved_grid);
         wp->saved_grid = NULL;          wp->saved_grid = NULL;
   
           wp->flags |= PANE_REDRAW;
   }
   
   void
   window_pane_set_palette(struct window_pane *wp, u_int n, int colour)
   {
           if (n > 0xff)
                   return;
   
           if (wp->palette == NULL)
                   wp->palette = xcalloc(0x100, sizeof *wp->palette);
   
           wp->palette[n] = colour;
           wp->flags |= PANE_REDRAW;
   }
   
   void
   window_pane_unset_palette(struct window_pane *wp, u_int n)
   {
           if (n > 0xff || wp->palette == NULL)
                   return;
   
           wp->palette[n] = 0;
           wp->flags |= PANE_REDRAW;
   }
   
   void
   window_pane_reset_palette(struct window_pane *wp)
   {
           if (wp->palette == NULL)
                   return;
   
           free(wp->palette);
           wp->palette = NULL;
         wp->flags |= PANE_REDRAW;          wp->flags |= PANE_REDRAW;
 }  }
   
Legend:
Removed from v.1.176  
changed lines
  Added in v.1.177