mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Foreground colours with the bright attribute set need to use the bright
entries in the palette. GitHub issue 954.
This commit is contained in:
		
							
								
								
									
										21
									
								
								tty.c
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								tty.c
									
									
									
									
									
								
							@@ -1841,10 +1841,18 @@ tty_check_fg(struct tty *tty, const struct window_pane *wp,
 | 
			
		||||
	u_int	colours;
 | 
			
		||||
	int	c;
 | 
			
		||||
 | 
			
		||||
	/* Perform substitution if this pane has a palette */
 | 
			
		||||
	if ((~gc->flags & GRID_FLAG_NOPALETTE) &&
 | 
			
		||||
	    (c = window_pane_get_palette(wp, gc->fg)) != -1)
 | 
			
		||||
	/*
 | 
			
		||||
	 * Perform substitution if this pane has a palette. If the bright
 | 
			
		||||
	 * attribute is set, use the bright entry in the palette by changing to
 | 
			
		||||
	 * the aixterm colour.
 | 
			
		||||
	 */
 | 
			
		||||
	if (~gc->flags & GRID_FLAG_NOPALETTE) {
 | 
			
		||||
		c = gc->fg;
 | 
			
		||||
		if (gc->fg < 8 && gc->attr & GRID_ATTR_BRIGHT)
 | 
			
		||||
			c += 90;
 | 
			
		||||
		if ((c = window_pane_get_palette(wp, c)) != -1)
 | 
			
		||||
			gc->fg = c;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* Is this a 24-bit colour? */
 | 
			
		||||
	if (gc->fg & COLOUR_FLAG_RGB) {
 | 
			
		||||
@@ -1894,10 +1902,11 @@ tty_check_bg(struct tty *tty, const struct window_pane *wp,
 | 
			
		||||
	u_int	colours;
 | 
			
		||||
	int	c;
 | 
			
		||||
 | 
			
		||||
	/* Perform substitution if this pane has a palette */
 | 
			
		||||
	if ((~gc->flags & GRID_FLAG_NOPALETTE) &&
 | 
			
		||||
	    (c = window_pane_get_palette(wp, gc->bg)) != -1)
 | 
			
		||||
	/* Perform substitution if this pane has a palette. */
 | 
			
		||||
	if (~gc->flags & GRID_FLAG_NOPALETTE) {
 | 
			
		||||
		if ((c = window_pane_get_palette(wp, gc->bg)) != -1)
 | 
			
		||||
			gc->bg = c;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* Is this a 24-bit colour? */
 | 
			
		||||
	if (gc->bg & COLOUR_FLAG_RGB) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user