circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Change find-window and monitor-content to use fnmatch(3). For convenience and

Browse Source 
compatibility, *s are implicitly added at the start and end of the pattern.

Also display the line number and the entire line in the results, and lose the
nasty section_string function and the now empty util.c file.

Initially from Tiago Cunha.
This commit is contained in:
Nicholas Marriott
2009-06-24 22:49:56 +00:00
parent 096cbf2ea5
commit 7e796dea03
8 changed files with 44 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
window.c
View File

@@ -21,6 +21,7 @@
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <paths.h>
#include <signal.h>
#include <stdint.h>
@@ -588,23 +589,26 @@ window_pane_mouse(
}
char *
window_pane_search(struct window_pane *wp, const char *searchstr)
window_pane_search(struct window_pane *wp, const char *searchstr, u_int *lineno)
{
struct screen *s = &wp->base;
char *line, *ptr;
char *newsearchstr, *line, *msg;
u_int i;
ptr = NULL;
msg = NULL;
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));
log_debug("XXX %s", line);
if ((ptr = strstr(line, searchstr)) != NULL)
break;
if (fnmatch(newsearchstr, line, 0) == 0) {
msg = line;
if (lineno != NULL)
*lineno = i;
break;
}
xfree(line);
}
if (ptr != NULL) {
ptr = section_string(line, strlen(ptr), ptr - line, 40);
xfree(line);
}
return (ptr);
xfree(newsearchstr);
return (msg);
}