mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-03 16:46:18 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										26
									
								
								window.c
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								window.c
									
									
									
									
									
								
							@@ -1282,8 +1282,32 @@ window_pane_visible(struct window_pane *wp)
 | 
			
		||||
	return (!window_pane_outside(wp));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
u_int
 | 
			
		||||
window_pane_search(struct window_pane *wp, const char *searchstr)
 | 
			
		||||
{
 | 
			
		||||
	struct screen	*s = &wp->base;
 | 
			
		||||
	char		*newsearchstr, *line;
 | 
			
		||||
	u_int		 i;
 | 
			
		||||
 | 
			
		||||
	xasprintf(&newsearchstr, "*%s*", searchstr);
 | 
			
		||||
 | 
			
		||||
	for (i = 0; i < screen_size_y(s); i++) {
 | 
			
		||||
		line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
 | 
			
		||||
		if (fnmatch(newsearchstr, line, 0) == 0) {
 | 
			
		||||
			free(line);
 | 
			
		||||
			break;
 | 
			
		||||
		}
 | 
			
		||||
		free(line);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	free(newsearchstr);
 | 
			
		||||
	if (i == screen_size_y(s))
 | 
			
		||||
		return (0);
 | 
			
		||||
	return (i + 1);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
char *
 | 
			
		||||
window_pane_search(struct window_pane *wp, const char *searchstr,
 | 
			
		||||
window_pane_search_old(struct window_pane *wp, const char *searchstr,
 | 
			
		||||
    u_int *lineno)
 | 
			
		||||
{
 | 
			
		||||
	struct screen	*s = &wp->base;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user