[w3m-dev-en 00730] Re: Patch for a more flexible dictionary lookup

* NEWS: rc: use_dictcommand, dictcommand
* main.c (execdict): use url_quote_conv() instead of cURLcode()
* proto.h (cURLcode): deleted
* doc-jp/README.dict: updated
From: Fumitoshi UKAI  <ukai@debian.or.jp>

[w3m-dev-en 00729] Re: Patch for a more flexible dictionary lookup
* config.h.dist (DICT): define
* configure (use_dict): default y
* fm.h (DICTCMD): deleted
	(UseDictCommand): added
	(DictCommand): added
* main.c (execdict): rewrite to use DictCommand, loadGeneralFile()
* rc.c (CMT_USE_DICTCOMMAND): added
	(CMT_DICTCOMMAND): added
	(params1): use_dictcommand, dictcommand added
* doc/README.dict: updated
From:  Tushar Samant <scribble@pobox.com>
This commit is contained in:
Fumitoshi UKAI
2002-04-24 18:29:35 +00:00
parent aac1c333cf
commit 4e8c85a7fa
10 changed files with 135 additions and 50 deletions

16
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.41 2002/03/29 16:39:37 ukai Exp $ */
/* $Id: rc.c,v 1.42 2002/04/24 18:29:35 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -148,6 +148,10 @@ static char *config_file = NULL;
#endif
#define CMT_EXT_DIRLIST "<22>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD>Ȥ˳<C8A4><CBB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4>Ȥ<EFBFBD>"
#define CMT_DIRLIST_CMD "<22>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD><EAA5B9><EFBFBD>ѥ<EFBFBD><D1A5>ޥ<EFBFBD><DEA5><EFBFBD>"
#ifdef USE_DICT
#define CMT_USE_DICTCOMMAND "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>CGI<47><49>ͳ<EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD><EFBFBD>ʤ<EFBFBD>"
#define CMT_DICTCOMMAND "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD>URL"
#endif /* USE_DICT */
#define CMT_IGNORE_NULL_IMG_ALT "<22><><EFBFBD><EFBFBD>IMG ALT°<54><C2B0><EFBFBD>λ<EFBFBD><CEBB>˥<EFBFBD><CBA5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD><CCBE>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#define CMT_IFILE "<22>ƥǥ<C6A5><C7A5><EFBFBD>ȥ<EFBFBD><C8A5>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD>ǥå<C7A5><C3A5><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>"
#define CMT_RETRY_HTTP "URL<52>˼<EFBFBD>ưŪ<C6B0><C5AA> http:// <20><><EFBFBD>䤦"
@@ -283,6 +287,10 @@ static char *config_file = NULL;
#endif
#define CMT_EXT_DIRLIST "Use external program for directory listing"
#define CMT_DIRLIST_CMD "Directory listing command"
#ifdef USE_DICT
#define CMT_USE_DICTCOMMAND "Enable dictionary lookup through CGI"
#define CMT_DICTCOMMAND "URL of dictionary lookup command"
#endif /* USE_DICT */
#define CMT_IGNORE_NULL_IMG_ALT "Ignore IMG ALT=\"\" (display link name)"
#define CMT_IFILE "Index file for the directory"
#define CMT_RETRY_HTTP "Prepend http:// to URL automatically"
@@ -456,6 +464,12 @@ struct param_ptr params1[] = {
CMT_EXT_DIRLIST, NULL},
{"dirlist_cmd", P_STRING, PI_TEXT, (void *)&DirBufferCommand,
CMT_DIRLIST_CMD, NULL},
#ifdef USE_DICT
{"use_dictcommand", P_INT, PI_ONOFF, (void *)&UseDictCommand,
CMT_USE_DICTCOMMAND, NULL},
{"dictcommand", P_STRING, PI_TEXT, (void *)&DictCommand,
CMT_DICTCOMMAND, NULL},
#endif /* USE_DICT */
{"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL},
{"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY,
NULL},