[w3m-dev 02854] highlight for incremental search

* display.c (EFFECT_MARK_START): added
* display.c (EFFECT_MARK_END): added
* display.c (EFFECT_MARK_START_C): added
* display.c (EFFECT_MARK_END_C): added
* display.c (EFFECT_MARK_START_M): added
* display.c (EFFECT_MARK_END_M): added
* display.c: define_effect for MARK_{START,END}
* display.c (mark_mode): added
* display.c (redrawLine): if mark_mode
* display.c (do_effects): do_effect2(PE_MARK, ...)
* display.c (do_effects): do_effect1(PE_MARK, ...)
* fm.h (P_EFFECT): changed to 0x01ff
* fm.h (PE_MARK): moved
* fm.h (mark_color): added
* linein.c (inputLineHistSearch): incrfunc(int ch, Str str)
* main.c (clear_mark): added
* main.c (dispincsrch): remove arg `x', `y'
* main.c (dispincsrch): move SAVE_BUFPOSITION()
* main.c (srch): if (result & SR_FOUND) clear_mark()
* main.c (cmd_mark): PE_MARK
* main.c (nextMk): s/PM_MARK/PE_MARK/
* main.c (prevMk): s/PM_MARK/PE_MARK/
* proto.h (inputLineHistSearch): change prototype incfunc()
* rc.c (CMT_MARK_COLOR): added
* rc.c (params2): add "mark_color"
* search.c (set_mark): added
* search.c (forwardSearch): use set_mark()
* search.c (backwardSearch): use set_mark()
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-01-16 15:37:06 +00:00
parent e5106ef688
commit 6877847e22
8 changed files with 123 additions and 54 deletions

9
fm.h
View File

@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.38 2002/01/15 17:23:29 ukai Exp $ */
/* $Id: fm.h,v 1.39 2002/01/16 15:37:06 ukai Exp $ */
/*
* w3m: WWW wo Miru utility
*
@@ -126,8 +126,9 @@ void bzero(void *, int);
#endif /* not KANJI_SYMBOLS */
/* Effect ( standout/underline ) */
#define P_EFFECT 0x01fe
#define P_EFFECT 0x01ff
#define PE_NORMAL 0x00
#define PE_MARK 0x01
#define PE_UNDER 0x02
#define PE_STAND 0x04
#define PE_BOLD 0x08
@@ -138,9 +139,6 @@ void bzero(void *, int);
#define PE_ACTIVE 0x80
#define PE_VISITED 0x0100
/* Mark */
#define PM_MARK 0x01
#define CharType(c) ((c)&P_CHARTYPE)
#ifdef KANJI_SYMBOLS
#define CharEffect(c) ((c)&P_EFFECT)
@@ -722,6 +720,7 @@ global int image_color init(2); /* green */
global int form_color init(1); /* red */
#ifdef USE_BG_COLOR
global int bg_color init(8); /* don't change */
global int mark_color init(6); /* cyan */
#endif /* USE_BG_COLOR */
global int useActiveColor init(FALSE);
global int active_color init(6); /* cyan */