w3m

commit eac7890991d17909469d2ab6bd2e5db1a7df089c
parent baf0c62ff56b24c7aa8c079e93384c2c87383eec
Author: ukai <ukai>
Date:   Wed, 13 Nov 2002 15:51:39 +0000

[w3m-dev 03427] Re: Select the nearest map area as default.
* map.c (newMapArea): accept sign chars
		if points is not enough, return as SHAPE_UNKNOWN
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
map.c
 | 
9
++++++---

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
 2002-11-14  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03427] Re: Select the nearest map area as default.
+	* map.c (newMapArea): accept sign chars
+			if points is not enough, return as SHAPE_UNKNOWN
+
+2002-11-14  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03425] charset of title
 	* display.c (displayBuffer): buffername converted to system coding
 					for term title
diff --git a/map.c b/map.c
@@ -64,7 +64,7 @@ nearestMapArea(MapList *ml, int x, int y)
     ListItem *al;
     MapArea *a;
     int i, l, n = 0, min = -1, limit = pixel_per_char * pixel_per_char
-				     + pixel_per_line * pixel_per_line;
+	+ pixel_per_line * pixel_per_line;
 
     if (!ml || !ml->area)
 	return n;
@@ -72,7 +72,7 @@ nearestMapArea(MapList *ml, int x, int y)
 	a = (MapArea *) al->ptr;
 	if (a) {
 	    l = (a->center_x - x) * (a->center_x - x)
-	      + (a->center_y - y) * (a->center_y - y);
+		+ (a->center_y - y) * (a->center_y - y);
 	    if ((min < 0 || l < min) && l < limit) {
 		n = i;
 		min = l;
@@ -271,7 +271,7 @@ newMapArea(char *url, char *target, char *alt, char *shape, char *coords)
     for (i = 0, p = coords; (a->shape == SHAPE_POLY || i < a->ncoords) && *p;) {
 	while (IS_SPACE(*p))
 	    p++;
-	if (!IS_DIGIT(*p))
+	if (!IS_DIGIT(*p) && *p != '-' && *p != '+')
 	    break;
 	if (a->shape == SHAPE_POLY) {
 	    if (max <= i) {
@@ -282,6 +282,8 @@ newMapArea(char *url, char *target, char *alt, char *shape, char *coords)
 	}
 	a->coords[i] = (short)atoi(p);
 	i++;
+	if (*p == '-' || *p == '+')
+	    p++;
 	while (IS_DIGIT(*p))
 	    p++;
 	if (*p != ',' && !IS_SPACE(*p))
@@ -295,6 +297,7 @@ newMapArea(char *url, char *target, char *alt, char *shape, char *coords)
 	a->shape = SHAPE_UNKNOWN;
 	a->coords = NULL;
 	a->ncoords = 0;
+	return a;
     }
     if (a->shape == SHAPE_POLY) {
 	a->ncoords = a->ncoords / 2 * 2;