mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Drop having a separate type for style options and make them all strings,
which allows formats to be expanded. Any styles without a '#{' are still
validated when they are set but any with a '#{' are not. Formats are not
expanded usefully in many cases yet, that will be changed later.
To make this work, a few other changes:
- set-option -a with a style option automatically appends a ",".
- OSC 10 and 11 don't set the window-style option anymore, instead the
  fg and bg are stored in the pane struct and act as the defaults that
  can be overridden by window-style.
- status-fg and -bg now override status-style instead of trying to keep
  them in sync.
			
			
This commit is contained in:
		@@ -3004,7 +3004,7 @@ window_copy_write_line(struct window_mode_entry *wme,
 | 
			
		||||
	size_t				 size = 0;
 | 
			
		||||
	u_int				 hsize = screen_hsize(data->backing);
 | 
			
		||||
 | 
			
		||||
	style_apply(&gc, oo, "mode-style");
 | 
			
		||||
	style_apply(&gc, oo, "mode-style", NULL);
 | 
			
		||||
	gc.flags |= GRID_FLAG_NOPALETTE;
 | 
			
		||||
 | 
			
		||||
	if (py == 0 && s->rupper < s->rlower && !data->hide_position) {
 | 
			
		||||
@@ -3311,7 +3311,7 @@ window_copy_set_selection(struct window_mode_entry *wme, int may_redraw,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* Set colours and selection. */
 | 
			
		||||
	style_apply(&gc, oo, "mode-style");
 | 
			
		||||
	style_apply(&gc, oo, "mode-style", NULL);
 | 
			
		||||
	gc.flags |= GRID_FLAG_NOPALETTE;
 | 
			
		||||
	screen_set_selection(s, sx, sy, endsx, endsy, data->rectflag,
 | 
			
		||||
	    data->modekeys, &gc);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user