[w3m-dev 03452] image map

* display.c (displayBuffer): use getCurrentMapLabel()
* fm.h (MapArea): delete ifdef MENU_MAP
	(image_map_list): added
* main.c (followA): don't call retrieveCurrentImg() ifdef USE_IMAGE
	use retrieveCurrentMap() ifndef USE_IMAGE
	(_followForm): indent
	(drawAnchorCursor0): add AnchorList
	(drawAnchorCuror): pass AnchorList to drawAnchorCursor0
	(follow_map): follow_map_panel
* map.c (searchMapList): added
	(nearestMapArea): n, min default value to -1
	(searchMapArea): added
	(getCurrentMapLabel): added
	(getMapXY): moved
	(retrieveCurrentMap): added
	(follow_map_menu): parsed_tagarg -> name
			rewrite to search map list/area
	(follow_map_panel): parsed_tagarg -> name
			rewrite to search map list/area
	(newMapArea): delete ifdef MENU_MAP
	(append_map_info): added
	(page_info_panel): append_map_info
* proto.h (follow_map_menu): parsed_tagarg -> name
	(follow_map_panel): parsed_tagarg -> name
	(getCurrentMapLabel): added
	(retrieveCurrentMap): added
* rc.c (CMT_IMAGE_MAP_LIST): added
	(image_map_list): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-19 17:40:30 +00:00
parent b8ec81336b
commit a17f5fe817
7 changed files with 321 additions and 154 deletions

6
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.64 2002/11/18 17:26:10 ukai Exp $ */
/* $Id: rc.c,v 1.65 2002/11/19 17:40:34 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -76,6 +76,7 @@ static char *config_file = NULL;
#define CMT_EXT_IMAGE_VIEWER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_IMAGE_SCALE "<22><><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(%)"
#define CMT_IMGDISPLAY "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>뤿<EFBFBD><EBA4BF><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5><EFBFBD>"
#define CMT_IMAGE_MAP_LIST "<22><><EFBFBD><EFBFBD><E1A1BC><EFBFBD>ޥåפΥ<D7A4><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#endif
#define CMT_MULTICOL "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Υޥ<CEA5><DEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_ALT_ENTITY "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>ƥ<EFBFBD><C6A5><EFBFBD> ASCII <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
@@ -229,6 +230,7 @@ static char *config_file = NULL;
#define CMT_EXT_IMAGE_VIEWER "Use external image viewer"
#define CMT_IMAGE_SCALE "Scale of image (%)"
#define CMT_IMGDISPLAY "External command to display image"
#define CMT_IMAGE_MAP_LIST "Use link list of image map"
#endif
#define CMT_MULTICOL "Display file names in multi-column format"
#define CMT_ALT_ENTITY "Use ASCII equivalents to display entities"
@@ -539,6 +541,8 @@ struct param_ptr params1[] = {
NULL},
{"imgdisplay", P_STRING, PI_TEXT, (void *)&Imgdisplay, CMT_IMGDISPLAY,
NULL},
{"image_map_list", P_INT, PI_ONOFF, (void *)&image_map_list,
CMT_IMAGE_MAP_LIST, NULL},
#endif
{"show_lnum", P_INT, PI_ONOFF, (void *)&showLineNum, CMT_SHOW_NUM, NULL},
{"show_srch_str", P_INT, PI_ONOFF, (void *)&show_srch_str,