diff options
| -rw-r--r-- | man/man1/9term.1 | 7 | ||||
| -rw-r--r-- | src/cmd/9term/9term.c | 6 | ||||
| -rw-r--r-- | src/cmd/9term/dat.h | 1 | ||||
| -rw-r--r-- | src/cmd/9term/wind.c | 25 |
4 files changed, 39 insertions, 0 deletions
diff --git a/man/man1/9term.1 b/man/man1/9term.1 index e0e5aad7..b0706139 100644 --- a/man/man1/9term.1 +++ b/man/man1/9term.1 @@ -285,6 +285,13 @@ containing the selection (typing cursor). A typical use of this feature is to tell the editor to find the source of an error by plumbing the file and line information in a compiler's diagnostic. .PP +The +.B look +menu item searches forward for the contents of the selection within +the window. If a match is found, it becomes the new selection and the +window scrolls to display it. The search wraps around to the beginning +of the windows if the end of the window is reached. +.PP For systems without a three-button mouse, the keyboard modifier keys can be used to modify the effect of the main mouse button. On Unix systems, the Control key changes the main button to button 2, diff --git a/src/cmd/9term/9term.c b/src/cmd/9term/9term.c index 107afed3..81c39a63 100644 --- a/src/cmd/9term/9term.c +++ b/src/cmd/9term/9term.c @@ -288,6 +288,7 @@ enum Paste, Snarf, Plumb, + Look, Send, Scroll, Cook @@ -298,6 +299,7 @@ char *menu2str[] = { "paste", "snarf", "plumb", + "look", "send", "cook", "scroll", @@ -348,6 +350,10 @@ button2menu(Window *w) wplumb(w); break; + case Look: + wlook(w); + break; + case Send: riogetsnarf(); wsnarf(w); diff --git a/src/cmd/9term/dat.h b/src/cmd/9term/dat.h index c1af6592..25270a0e 100644 --- a/src/cmd/9term/dat.h +++ b/src/cmd/9term/dat.h @@ -177,6 +177,7 @@ void wmousectl(Window*); void wmovemouse(Window*, Point); void wpaste(Window*); void wplumb(Window*); +void wlook(Window*); void wrefresh(Window*, Rectangle); void wrepaint(Window*); void wresize(Window*, Image*, int); diff --git a/src/cmd/9term/wind.c b/src/cmd/9term/wind.c index 7dc20443..d47e8467 100644 --- a/src/cmd/9term/wind.c +++ b/src/cmd/9term/wind.c @@ -907,6 +907,31 @@ winborder(Window *w, Point xy) } void +wlook(Window *w) +{ + int i, n, e; + + i = w->q1; + n = i - w->q0; + e = w->nr - n; + if(n <= 0 || e < n) + return; + + if(i > e) + i = 0; + + while(runestrncmp(w->r+w->q0, w->r+i, n) != 0){ + if(i < e) + i++; + else + i = 0; + } + + wsetselect(w, i, i+n); + wshow(w, i); +} + +void wmousectl(Window *w) { int but; |