mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Reset combine flag only if text is actually processed.
This commit is contained in:
		@@ -1742,6 +1742,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	if (ci->used == 0)
 | 
						if (ci->used == 0)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
 | 
						ctx->flags &= ~SCREEN_WRITE_COMBINE;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
 | 
						before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used,
 | 
				
			||||||
	    &wrapped);
 | 
						    &wrapped);
 | 
				
			||||||
@@ -1792,8 +1793,6 @@ screen_write_collect_add(struct screen_write_ctx *ctx,
 | 
				
			|||||||
	u_int				 sx = screen_size_x(s);
 | 
						u_int				 sx = screen_size_x(s);
 | 
				
			||||||
	int				 collect;
 | 
						int				 collect;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx->flags &= ~SCREEN_WRITE_COMBINE;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
	 * Don't need to check that the attributes and whatnot are still the
 | 
						 * Don't need to check that the attributes and whatnot are still the
 | 
				
			||||||
	 * same - input_parse will end the collection when anything that isn't
 | 
						 * same - input_parse will end the collection when anything that isn't
 | 
				
			||||||
@@ -1873,7 +1872,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 | 
				
			|||||||
		screen_write_collect_flush(ctx, 0, __func__);
 | 
							screen_write_collect_flush(ctx, 0, __func__);
 | 
				
			||||||
		gc = screen_write_combine(ctx, combine, &xx, &cx);
 | 
							gc = screen_write_combine(ctx, combine, &xx, &cx);
 | 
				
			||||||
		if (gc != NULL) {
 | 
							if (gc != NULL) {
 | 
				
			||||||
			cy = s->cy;
 | 
								cx = s->cx; cy = s->cy;
 | 
				
			||||||
			screen_write_set_cursor(ctx, xx, s->cy);
 | 
								screen_write_set_cursor(ctx, xx, s->cy);
 | 
				
			||||||
			screen_write_initctx(ctx, &ttyctx, 0);
 | 
								screen_write_initctx(ctx, &ttyctx, 0);
 | 
				
			||||||
			ttyctx.cell = gc;
 | 
								ttyctx.cell = gc;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user