[w3m-dev 03667] fold patch
* anchor.c (reAnchorPos): rewrite (reAnchorWord): delete reseq_anchor() (reAnchorAny): use l->size delete reseq_anchor() * backend.c (internal_get): pass TRUE to saveBuffer * buffer.c (newBuffer): delete n->linelen (reshapeBuffer): rewrite * display.c (displayBuffer): FoldLine (redrawLine): l->bpos (cursorUp0): added (cursorUp): rewrite (cursorDown0): added (cursowDown): rewrite (cursorRight): check l->next l->bwidth (cursorLeft): l->prev && l->bpos l->bwidth (arrangeCursor): buf->currentLine->bwidth buf->cursorX * etc.c (checkType): **oporp rewrite (calcPosition): realColumn allocated by New_reuse * file.c (addnewline): add nlines arg (propBuffer): deleted (colorBuffer): deleted (readHeader): propBuffer FOLD_BUFFER_WIDTH (HTMLlineproc2body): rewrite (addnewline2): added (addnewline): rewrite (loadBuffer): propBuffer, colorBuffer (saveBuffer): cont arg (getNextPage): rewrite * fm.h (LINELEN): 256 (FNLEN): deleted (Line): add size, bpos, bwidth (Buffer): delete linelen (INIT_BUFFER_WIDTH): check showLineNum (FOLD_BUFFER_WIDTH): added (FoldLine): added * funcname.tab (RESHAPE): added * main.c (do_dump): pass FALSE to saveBuffer (nscroll): rewrite (clear_mark): l->size (shiftvisualpos): rewrite (pipeBuf): pass TRUE to saveBuffer (linebeg): check line->prev && line->bpos (linend): check line->next, line->next->bpos (editScr): pass TRUE to saveBuffer (svBuf): pass TRUE to saveBuffer (vmSrc): pass TRUE to saveBuffer (reshape): added (curlno): rewrite * mimehead.c (LINELEN): deleted * proto.h (reshape): added (saveBuffer): add cont arg (cursorUp0): added (cursorDown0): added (checkType): change type oprop, ocolor, delete check_color, len * rc.c (CMT_FOLD_LINE): added (params1): add fold_line (sync_with_option): check PagerMax * search.c (set_mark): l->size (forwardSearch): rewrite (backwardSearch): rewrite * doc/README.func (RESHAPE): added * doc-jp/README.func (RESHAPE): added * scripts/w3mhelp.cgi.in (Buffer operation): add reshape From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
33
anchor.c
33
anchor.c
@@ -1,4 +1,4 @@
|
||||
/* $Id: anchor.c,v 1.20 2003/01/15 16:11:43 ukai Exp $ */
|
||||
/* $Id: anchor.c,v 1.21 2003/01/23 18:37:20 ukai Exp $ */
|
||||
#include "fm.h"
|
||||
#include "myctype.h"
|
||||
#include "regex.h"
|
||||
@@ -294,7 +294,7 @@ reAnchorPos(Buffer *buf, Line *l, char *p1, char *p2,
|
||||
{
|
||||
Anchor *a;
|
||||
int spos, epos;
|
||||
int i;
|
||||
int i, hseq = -2;
|
||||
|
||||
spos = p1 - l->lineBuf;
|
||||
epos = p2 - l->lineBuf;
|
||||
@@ -302,12 +302,27 @@ reAnchorPos(Buffer *buf, Line *l, char *p1, char *p2,
|
||||
if (l->propBuf[i] & (PE_ANCHOR | PE_FORM))
|
||||
return p2;
|
||||
}
|
||||
a = anchorproc(buf, p1, p2, l->linenumber, p1 - l->lineBuf);
|
||||
a->end.line = l->linenumber;
|
||||
a->end.pos = epos;
|
||||
a->hseq = -2;
|
||||
for (i = a->start.pos; i < a->end.pos; i++)
|
||||
for (i = spos; i < epos; i++)
|
||||
l->propBuf[i] |= PE_ANCHOR;
|
||||
while (1) {
|
||||
a = anchorproc(buf, p1, p2, l->linenumber, spos);
|
||||
a->hseq = hseq;
|
||||
if (hseq == -2) {
|
||||
reseq_anchor(buf);
|
||||
hseq = a->hseq;
|
||||
}
|
||||
a->end.line = l->linenumber;
|
||||
if (epos > l->len) {
|
||||
a->end.pos = l->len;
|
||||
spos = 0;
|
||||
epos -= l->len;
|
||||
l = l->next;
|
||||
}
|
||||
else {
|
||||
a->end.pos = epos;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return p2;
|
||||
}
|
||||
|
||||
@@ -315,7 +330,6 @@ void
|
||||
reAnchorWord(Buffer *buf, Line *l, int spos, int epos)
|
||||
{
|
||||
reAnchorPos(buf, l, &l->lineBuf[spos], &l->lineBuf[epos], _put_anchor_all);
|
||||
reseq_anchor(buf);
|
||||
}
|
||||
|
||||
/* search regexp and register them as anchors */
|
||||
@@ -338,7 +352,7 @@ reAnchorAny(Buffer *buf, char *re,
|
||||
l = l->next) {
|
||||
p = l->lineBuf;
|
||||
for (;;) {
|
||||
if (regexMatch(p, &l->lineBuf[l->len] - p, p == l->lineBuf) == 1) {
|
||||
if (regexMatch(p, &l->lineBuf[l->size] - p, p == l->lineBuf) == 1) {
|
||||
matchedPosition(&p1, &p2);
|
||||
p = reAnchorPos(buf, l, p1, p2, anchorproc);
|
||||
}
|
||||
@@ -346,7 +360,6 @@ reAnchorAny(Buffer *buf, char *re,
|
||||
break;
|
||||
}
|
||||
}
|
||||
reseq_anchor(buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user