summaryrefslogtreecommitdiff
path: root/pico
diff options
context:
space:
mode:
Diffstat (limited to 'pico')
-rw-r--r--pico/browse.c18
-rw-r--r--pico/estruct.h7
-rw-r--r--pico/osdep/altedit.c2
-rw-r--r--pico/osdep/spell.c2
-rw-r--r--pico/search.c132
5 files changed, 134 insertions, 27 deletions
diff --git a/pico/browse.c b/pico/browse.c
index 96f078f4..d30ad2d1 100644
--- a/pico/browse.c
+++ b/pico/browse.c
@@ -317,7 +317,7 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
UCS c, new_c;
int status, i, j;
int row, col, crow, ccol;
- int bsearch; /* search forward by default */
+ int flags;
char *p, *envp, child[NLINE], tmp[NLINE];
struct bmaster *mp;
struct fcell *tp;
@@ -1597,11 +1597,11 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
case 'w': /* Where is */
case 'W':
case (CTRL|'W'):
- bsearch = i = 0;
+ i = 0;
+ flags = SR_FORWARD;
while(!i){
-
- switch(readpattern(_("File name to find"), FALSE, bsearch)){
+ switch(readpattern(_("File name to find"), FALSE, flags)){
case HELPCH:
emlwrite(_("\007No help yet!"), NULL);
/* remove break and sleep after help text is installed */
@@ -1611,7 +1611,13 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
PaintBrowser(gmp, 0, &crow, &ccol);
break;
case (CTRL|'P'):
- bsearch = bsearch == 0 ? 1 : 0;
+ if(flags & SR_FORWARD){
+ flags &= ~SR_FORWARD;
+ flags |= SR_BACKWRD;
+ } else {
+ flags &= ~SR_BACKWRD;
+ flags |= SR_FORWARD;
+ }
break;
case (CTRL|'Y'): /* first first cell */
for(tp = gmp->top; tp->prev; tp = tp->prev)
@@ -1673,7 +1679,7 @@ FileBrowse(char *dir, size_t dirlen, char *fn, size_t fnlen,
if(pat && pat[0])
utf8 = ucs4_to_utf8_cpystr(pat);
- if(utf8 && (tp = FindCell(gmp, utf8, bsearch)) != NULL){
+ if(utf8 && (tp = FindCell(gmp, utf8, flags & SR_BACKWRD)) != NULL){
PlaceCell(gmp, gmp->current, &row, &col);
PaintCell(row, col, gmp->cpf, gmp->current, 0);
gmp->current = tp;
diff --git a/pico/estruct.h b/pico/estruct.h
index 410dfc02..ff3261c0 100644
--- a/pico/estruct.h
+++ b/pico/estruct.h
@@ -84,6 +84,13 @@
#define CFFLBF 0x0010 /* Last cmd was full buf fill */
#define CFFLPA 0x0020 /* Last cmd was paragraph fill */
+/* Constants for search type */
+#define SR_FORWARD 0x0001 /* search forward */
+#define SR_BACKWRD 0x0010 /* search backward */
+#define SR_BEGLINE 0x0100 /* search pattern at beginning of line */
+#define SR_ENDLINE 0x1000 /* search pattern at end of line */
+
+
/*
* macros to help filter character input
*/
diff --git a/pico/osdep/altedit.c b/pico/osdep/altedit.c
index ff7a6da8..25e49416 100644
--- a/pico/osdep/altedit.c
+++ b/pico/osdep/altedit.c
@@ -60,7 +60,6 @@ int alt_editor_valid(char *, char *, size_t);
int alt_editor_valid_fp(char *);
#endif /* _WINDOWS */
-
/*
* alt_editor - fork off an alternate editor for mail message composition
* if one is configured and passed from pine. If not, only
@@ -549,7 +548,6 @@ pathcat(char *buf, char **path, char *file)
return(TRUE);
}
-
#ifdef SIGCHLD
/*
* child_handler - handle child status change signal
diff --git a/pico/osdep/spell.c b/pico/osdep/spell.c
index 59efe282..e9aaa39f 100644
--- a/pico/osdep/spell.c
+++ b/pico/osdep/spell.c
@@ -285,7 +285,7 @@ movetoword(UCS *w)
olddotp = curwp->w_dotp;
curwp->w_bufp->b_mode |= MDEXACT; /* case sensitive */
- while(forscan(&i, w, 0, NULL, 0, 1) == TRUE){
+ while(forscan(&i, w, SR_FORWARD, NULL, 0, 1) == TRUE){
if(i)
break; /* wrap NOT allowed! */
diff --git a/pico/search.c b/pico/search.c
index 2cb0fc02..f2a5389f 100644
--- a/pico/search.c
+++ b/pico/search.c
@@ -114,7 +114,7 @@ eq(UCS bc, UCS pc)
int
forwsearch(int f, int n)
{
- int status, bsearch;
+ int status, flags;
int wrapt = FALSE, wrapt2 = FALSE;
int repl_mode = FALSE;
UCS defpat[NPAT];
@@ -130,15 +130,15 @@ forwsearch(int f, int n)
FWS_RETURN(0);
defpat[0] = '\0';
- bsearch = 0; /* search forward by default */
+ flags = SR_FORWARD; /* search forward by default */
/* ask the user for the text of a pattern */
while(1){
if (gmode & MDREPLACE)
- status = srpat("Search", defpat, NPAT, repl_mode, bsearch);
+ status = srpat("Search", defpat, NPAT, repl_mode, flags);
else
- status = readpattern("Search", TRUE, bsearch);
+ status = readpattern("Search", TRUE, flags);
switch(status){
case TRUE: /* user typed something */
@@ -166,7 +166,13 @@ forwsearch(int f, int n)
break;
case (CTRL|'P'):
- bsearch = bsearch == 0 ? 1 : 0;
+ if(flags & SR_FORWARD){
+ flags &= ~SR_FORWARD;
+ flags |= SR_BACKWRD;
+ } else {
+ flags &= ~SR_BACKWRD;
+ flags |= SR_FORWARD;
+ }
break;
case (CTRL|'V'):
@@ -179,6 +185,18 @@ forwsearch(int f, int n)
mlerase();
FWS_RETURN(TRUE);
+ case (CTRL|'^'):
+ if(!(flags & (SR_BEGLINE|SR_ENDLINE))){
+ flags |= SR_BEGLINE;
+ } else if (flags & SR_BEGLINE){
+ flags &= ~SR_BEGLINE;
+ flags |= SR_ENDLINE;
+ } else {
+ flags &= ~SR_ENDLINE;
+ flags |= SR_FORWARD;
+ }
+ break;
+
case (CTRL|'T') :
switch(status = readnumpat(_("Search to Line Number : "))){
case -1 :
@@ -269,7 +287,7 @@ forwsearch(int f, int n)
}
}
- reverse_all(defpat, bsearch);
+ reverse_all(defpat, flags & SR_BACKWRD);
/*
* This code is kind of dumb. What I want is successive C-W 's to
@@ -295,7 +313,7 @@ forwsearch(int f, int n)
/* search for the pattern */
while (n-- > 0) {
- if((status = forscan(&wrapt,defpat, bsearch, NULL,0,PTBEG)) == FALSE)
+ if((status = forscan(&wrapt,defpat, flags, NULL,0,PTBEG)) == FALSE)
break;
}
@@ -306,7 +324,7 @@ forwsearch(int f, int n)
x[0] = '\0';
- utf8 = sucs4_to_utf8_cpystr(defpat ? defpat : x, bsearch);
+ utf8 = sucs4_to_utf8_cpystr(defpat ? defpat : x, flags & SR_BACKWRD);
/* TRANSLATORS: reporting the result of a failed search */
eml.s = utf8;
emlwrite(_("\"%s\" not found"), &eml);
@@ -314,7 +332,7 @@ forwsearch(int f, int n)
fs_give((void **) &utf8);
}
else if((gmode & MDREPLACE) && repl_mode == TRUE){
- status = replace_pat(defpat, &wrapt2, bsearch); /* replace pattern */
+ status = replace_pat(defpat, &wrapt2, flags & SR_BACKWRD); /* replace pattern */
if (wrapt == TRUE || wrapt2 == TRUE){
eml.s = (status == ABORT) ? "cancelled but wrapped" : "Wrapped";
emlwrite("Replacement %s", &eml);
@@ -327,7 +345,7 @@ forwsearch(int f, int n)
emlwrite("", NULL);
}
- reverse_all(defpat, bsearch);
+ reverse_all(defpat, flags & SR_BACKWRD);
if(curwp->w_doto == -1){
curwp->w_doto = 0;
curwp->w_flag |= WFMOVE;
@@ -348,10 +366,15 @@ replace_pat(UCS *defpat, int *wrapt, int bsearch)
char utf8tmp[NPMT];
UCS prompt[NPMT];
UCS *promptp;
+ int flags;
- if(bsearch)
+ if(bsearch){
+ flags = SR_BACKWRD;
curwp->w_doto -= ucs4_strlen(defpat) - 1;
- forscan(wrapt, defpat, bsearch, NULL, 0, PTBEG); /* go to word to be replaced */
+ }
+ else flags = SR_FORWARD;
+
+ forscan(wrapt, defpat, flags, NULL, 0, PTBEG); /* go to word to be replaced */
lpat[0] = '\0';
@@ -558,18 +581,23 @@ replace_all(UCS *orig, UCS *repl, int bsearch)
LINE *stop_line = curwp->w_dotp;
int stop_offset = curwp->w_doto;
EML eml;
+ int flags;
/* similar to replace_pat. When we come here, if bsearch is set,
* the cursor is at the end of the match, so we must bring it back
* to the beginning.
*/
if(bsearch){
+ flags = SR_BACKWRD;
curwp->w_doto -= ucs4_strlen(orig) - 1;
curwp->w_flag |= WFMOVE;
}
+ else
+ flags = SR_FORWARD;
+
stop_offset = curwp->w_doto;
while (1)
- if (forscan(&wrapt, orig, bsearch, stop_line, stop_offset, PTBEG)){
+ if (forscan(&wrapt, orig, flags, stop_line, stop_offset, PTBEG)){
curwp->w_flag |= WFMOVE; /* put cursor back */
reverse_all(orig, bsearch); /* undo reverse buffer and pattern */
@@ -653,15 +681,22 @@ replace_all(UCS *orig, UCS *repl, int bsearch)
/* Read a replacement pattern. Modeled after readpattern(). */
int
-srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int bsearch)
+srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int flags)
{
register int s;
int i = 0;
+ int bsearch;
+ int bol;
+ int eol;
UCS *b;
UCS prompt[NPMT];
UCS *promptp;
EXTRAKEYS menu_pat[9];
+ bsearch = flags & SR_BACKWRD;
+ bol = flags & SR_BEGLINE;
+ eol = flags & SR_ENDLINE;
+
menu_pat[i = 0].name = "^Y";
menu_pat[i].label = N_("FirstLine");
menu_pat[i].key = (CTRL|'Y');
@@ -677,6 +712,11 @@ srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int bsearc
menu_pat[i].key = (CTRL|'R');
KS_OSDATASET(&menu_pat[i], KS_NONE);
+ menu_pat[++i].name = "^^";
+ menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ;
+ menu_pat[i].key = (CTRL|'^');
+ KS_OSDATASET(&menu_pat[i], KS_NONE);
+
if(!repl_mode){
menu_pat[++i].name = "^T";
menu_pat[i].label = N_("LineNumber");
@@ -720,6 +760,17 @@ srpat(char *utf8prompt, UCS *defpat, size_t defpatlen, int repl_mode, int bsearc
if(b) ucs4_strncat(prompt, b, ucs4_strlen(b));
prompt[NPMT-1] = '\0';
}
+ if(bol){
+ fs_give((void **) &b);
+ b = utf8_to_ucs4_cpystr(N_(" at start of line"));
+ if(b) ucs4_strncat(prompt, b, ucs4_strlen(b));
+ prompt[NPMT-1] = '\0';
+ } else if(eol){
+ fs_give((void **) &b);
+ b = utf8_to_ucs4_cpystr(N_(" at end of line"));
+ if(b) ucs4_strncat(prompt, b, ucs4_strlen(b));
+ prompt[NPMT-1] = '\0';
+ }
if(b) fs_give((void **) &b);
}
@@ -833,15 +884,20 @@ readnumpat(char *utf8prompt)
int
-readpattern(char *utf8prompt, int text_mode, int bsearch)
+readpattern(char *utf8prompt, int text_mode, int flags)
{
register int s;
int i;
+ int bsearch, bol, eol;
UCS *b;
UCS tpat[NPAT+20];
UCS *tpatp;
EXTRAKEYS menu_pat[8];
+ bsearch = flags & SR_BACKWRD;
+ bol = flags & SR_BEGLINE;
+ eol = flags & SR_ENDLINE;
+
menu_pat[i = 0].name = "^Y";
menu_pat[i].label = N_("FirstLine");
menu_pat[i].key = (CTRL|'Y');
@@ -852,7 +908,17 @@ readpattern(char *utf8prompt, int text_mode, int bsearch)
menu_pat[i].key = (CTRL|'V');
KS_OSDATASET(&menu_pat[i], KS_NONE);
+ menu_pat[++i].name = "^^";
+ menu_pat[i].label = bol ? N_("End Line") : eol ? N_("Anywhere") : N_("Bgn Line") ;
+ menu_pat[i].key = (CTRL|'^');
+ KS_OSDATASET(&menu_pat[i], KS_NONE);
+
if(text_mode){
+ menu_pat[++i].name = "^^";
+ menu_pat[i].label = N_("Begn of Line");
+ menu_pat[i].key = (CTRL|'^');
+ KS_OSDATASET(&menu_pat[i], KS_NONE);
+
menu_pat[++i].name = "^T";
menu_pat[i].label = N_("LineNumber");
menu_pat[i].key = (CTRL|'T');
@@ -891,6 +957,17 @@ readpattern(char *utf8prompt, int text_mode, int bsearch)
if(b) ucs4_strncat(tpat, b, ucs4_strlen(b));
tpat[NPAT+20-1] = '\0';
}
+ if(bol){
+ fs_give((void **) &b);
+ b = utf8_to_ucs4_cpystr(N_(" at start of line"));
+ if(b) ucs4_strncat(tpat, b, ucs4_strlen(b));
+ tpat[NPAT+20-1] = '\0';
+ } else if (eol){
+ fs_give((void **) &b);
+ b = utf8_to_ucs4_cpystr(N_(" at end of line"));
+ if(b) ucs4_strncat(tpat, b, ucs4_strlen(b));
+ tpat[NPAT+20-1] = '\0';
+ }
if(b) fs_give((void **) &b);
}
@@ -1010,7 +1087,7 @@ void reverse_ucs4(UCS *s)
int
forscan(int *wrapt, /* boolean indicating search wrapped */
UCS *patrn, /* string to scan for */
- int bsearch, /* search backwards */
+ int flags, /* direction and position */
LINE *limitp, /* stop searching if reached */
int limito, /* stop searching if reached */
int leavep) /* place to leave point
@@ -1028,7 +1105,14 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
UCS *patptr; /* pointer into pattern */
int stopoff; /* offset to stop search */
LINE *stopline; /* line to stop search */
-
+ int ftest; /* position of first character of test */
+ int bsearch;
+ int bol;
+ int eol;
+
+ bsearch = flags & SR_BACKWRD;
+ bol = flags & SR_BEGLINE;
+ eol = flags & SR_ENDLINE;
*wrapt = FALSE;
/* if bsearch is set we return the match at the beginning of the
@@ -1091,8 +1175,20 @@ forscan(int *wrapt, /* boolean indicating search wrapped */
else
c = lgetc(curline, curoff++).c; /* get the char */
+ if(bol)
+ ftest = bsearch == 0 ? 1 : llength(curline) - ucs4_strlen(patrn) + 1;
+ else if (eol)
+ ftest = bsearch == 0 ? llength(curline) - ucs4_strlen(patrn) + 1 : 1;
/* test it against first char in pattern */
- if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/
+ if (eq(c, patrn[0]) != FALSE /* if we find it..*/
+ && ((bol == 0 && eol == 0) /* ...and if it is anywhere */
+ || (bol != 0 /* ...or is at the begin or line */
+ && ((bsearch == 0 && curoff == ftest) /* and search forward and found at beginning of line */
+ || (bsearch != 0 && curoff == ftest))) /* or search backward and found at end of line */
+ || (eol != 0 /* ...or is at the end or line */
+ && ((bsearch == 0 && curoff == ftest) /* and search forward and found at beginning of line */
+ || (bsearch != 0 && curoff == ftest))) /* or search backward and found at end of line */
+ )){
/* setup match pointers */
matchline = curline;
matchoff = curoff;
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-01 09:39:46 +0000