[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

6
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.29 2002/01/15 17:23:29 ukai Exp $ */
/* $Id: rc.c,v 1.30 2002/01/16 15:37:07 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -74,6 +74,7 @@ static char *config_file = NULL;
#define CMT_I_COLOR "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤ο<F3A5AFA4>"
#define CMT_F_COLOR "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ο<EFBFBD>"
#define CMT_BG_COLOR "<22>طʤο<CAA4>"
#define CMT_MARK_COLOR "<22>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD>ο<EFBFBD>"
#define CMT_ACTIVE_STYLE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤵤<EFBFBD><F2A4B5A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤ο<F3A5AFA4><CEBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAA4B9>"
#define CMT_C_COLOR "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤵤<EFBFBD><F2A4B5A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤ο<F3A5AFA4>"
#define CMT_VISITED_ANCHOR "ˬ<>줿<EFBFBD><ECA4BF><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤Ͽ<F3A5AFA4><CFBF><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD>"
@@ -200,6 +201,7 @@ static char *config_file = NULL;
#define CMT_VISITED_ANCHOR "Use visited link color"
#define CMT_V_COLOR "Color of visited link"
#define CMT_BG_COLOR "Color of background"
#define CMT_MARK_COLOR "Color of mark"
#define CMT_HTTP_PROXY "URL of HTTP proxy host"
#ifdef USE_GOPHER
#define CMT_GOPHER_PROXY "URL of GOPHER proxy host"
@@ -435,6 +437,8 @@ struct param_ptr params2[] = {
{"form_color", P_COLOR, PI_SEL_C, (void *)&form_color, CMT_F_COLOR,
colorstr},
#ifdef USE_BG_COLOR
{"mark_color", P_COLOR, PI_SEL_C, (void *)&mark_color, CMT_MARK_COLOR,
colorstr},
{"bg_color", P_COLOR, PI_SEL_C, (void *)&bg_color, CMT_BG_COLOR, colorstr},
#endif /* USE_BG_COLOR */
{"active_style", P_INT, PI_ONOFF, (void *)&useActiveColor,