mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Need to set attributes before clearing.
This commit is contained in:
		
							
								
								
									
										4
									
								
								tty.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tty.c
									
									
									
									
									
								
							@@ -1281,12 +1281,12 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 | 
				
			|||||||
		    gcp->bg != last.bg ||
 | 
							    gcp->bg != last.bg ||
 | 
				
			||||||
		    ux + width + gcp->data.width > nx ||
 | 
							    ux + width + gcp->data.width > nx ||
 | 
				
			||||||
		    (sizeof buf) - len < gcp->data.size)) {
 | 
							    (sizeof buf) - len < gcp->data.size)) {
 | 
				
			||||||
 | 
								tty_attributes(tty, &last, wp);
 | 
				
			||||||
			if (last.flags & GRID_FLAG_CLEARED) {
 | 
								if (last.flags & GRID_FLAG_CLEARED) {
 | 
				
			||||||
				log_debug("%s: %zu cleared", __func__, len);
 | 
									log_debug("%s: %zu cleared", __func__, len);
 | 
				
			||||||
				tty_clear_line(tty, wp, aty, atx + ux, width,
 | 
									tty_clear_line(tty, wp, aty, atx + ux, width,
 | 
				
			||||||
				    last.bg);
 | 
									    last.bg);
 | 
				
			||||||
			} else {
 | 
								} else {
 | 
				
			||||||
				tty_attributes(tty, &last, wp);
 | 
					 | 
				
			||||||
				tty_cursor(tty, atx + ux, aty);
 | 
									tty_cursor(tty, atx + ux, aty);
 | 
				
			||||||
				tty_putn(tty, buf, len, width);
 | 
									tty_putn(tty, buf, len, width);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
@@ -1322,11 +1322,11 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if (len != 0 && ((~last.flags & GRID_FLAG_CLEARED) || last.bg != 8)) {
 | 
						if (len != 0 && ((~last.flags & GRID_FLAG_CLEARED) || last.bg != 8)) {
 | 
				
			||||||
 | 
							tty_attributes(tty, &last, wp);
 | 
				
			||||||
		if (last.flags & GRID_FLAG_CLEARED) {
 | 
							if (last.flags & GRID_FLAG_CLEARED) {
 | 
				
			||||||
			log_debug("%s: %zu cleared (end)", __func__, len);
 | 
								log_debug("%s: %zu cleared (end)", __func__, len);
 | 
				
			||||||
			tty_clear_line(tty, wp, aty, atx + ux, width, last.bg);
 | 
								tty_clear_line(tty, wp, aty, atx + ux, width, last.bg);
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
			tty_attributes(tty, &last, wp);
 | 
					 | 
				
			||||||
			tty_cursor(tty, atx + ux, aty);
 | 
								tty_cursor(tty, atx + ux, aty);
 | 
				
			||||||
			tty_putn(tty, buf, len, width);
 | 
								tty_putn(tty, buf, len, width);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user