mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master' into master
This commit is contained in:
		
							
								
								
									
										7
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								tmux.h
									
									
									
									
									
								
							@@ -780,7 +780,8 @@ struct screen {
 | 
			
		||||
	u_int				 cy;	  /* cursor y */
 | 
			
		||||
 | 
			
		||||
	enum screen_cursor_style	 cstyle;  /* cursor style */
 | 
			
		||||
	char				*ccolour; /* cursor colour */
 | 
			
		||||
	int				 ccolour; /* cursor colour */
 | 
			
		||||
	int				 default_ccolour;
 | 
			
		||||
 | 
			
		||||
	u_int				 rupper;  /* scroll region top */
 | 
			
		||||
	u_int				 rlower;  /* scroll region bottom */
 | 
			
		||||
@@ -1277,7 +1278,7 @@ struct tty {
 | 
			
		||||
	u_int		 cx;
 | 
			
		||||
	u_int		 cy;
 | 
			
		||||
	enum screen_cursor_style cstyle;
 | 
			
		||||
	char		*ccolour;
 | 
			
		||||
	int		 ccolour;
 | 
			
		||||
 | 
			
		||||
	int		 oflag;
 | 
			
		||||
	u_int		 oox;
 | 
			
		||||
@@ -2794,7 +2795,7 @@ void	 screen_reinit(struct screen *);
 | 
			
		||||
void	 screen_free(struct screen *);
 | 
			
		||||
void	 screen_reset_tabs(struct screen *);
 | 
			
		||||
void	 screen_set_cursor_style(struct screen *, u_int);
 | 
			
		||||
void	 screen_set_cursor_colour(struct screen *, const char *);
 | 
			
		||||
void	 screen_set_cursor_colour(struct screen *, int);
 | 
			
		||||
int	 screen_set_title(struct screen *, const char *);
 | 
			
		||||
void	 screen_set_path(struct screen *, const char *);
 | 
			
		||||
void	 screen_push_title(struct screen *);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user