[w3m-dev 00371] "id" attribute

From: Hironori Sakamoto (hsaka@mth.biglobe.ne.jp)
Date: Sun Mar 05 2000 - 01:44:43 CST


$B:dK\$G$9!#(B

$B:G6a!"L/$K%i%Y%k$XHt$Y$J$$%Z!<%8$,$"$k$J$!$H;W$C$F$$$?$i!"(B
HTML 4.0 $B$N(B id $BB0@-$r;H$C$F$$$k$+$i$G$7$?!#(B

id $BB0@-$O(B name $BB0@-$H0c$$$[$H$s$I$N%?%0$K$D$1$k$3$H$,=PMh$kMM(B
$B$G$9$,!"BP1~$7$F$_$?$$J}$C$F$$$^$9$+!)(B
$B!t(B $B4JC1$K$O(B <$B%?%0(B ... id=$B%i%Y%k(B> $B"*(B <a name=$B%i%Y%k(B></a><$B%?%0(B ...>
$B!t(B $B$C$F$9$k$N$+$J$!!#(B

$B$^$?!"$3$l$rA[Dj$7$F%i%Y%k$XHt$V>l9g$K%+%i%`0LCV$b%"%s%+!<$N@hF,$X(B
$B0\F0$9$k(B patch $B$r:n$C$F$_$^$7$?!#(B

($B$J$*!"E:IU(B patch $B$K$O(B w3mmine.cgi $B$N=$@5(B patch $B$b4^$^$l$F$$$^$9!#(B)

PS.
$B!t(B i$B%b!<%I3(J8;z(B($B%7%U%H(BJIS $B$NJ}8@(B)$B$H$$$&$N$,$"$k$=$&$G$9!#(B
$B!t(B http://www.horagai.com/www/moji/akumu.htm
$B!t(B http://www.nttdocomo.co.jp/i/tag/emoji/index.html
$B!t(B 2000JIS(Shift_JISX0213) $B$h$j;H$o$l$=$&$@$+$i!"(B
$B!t(B $BM7$S$GBP1~$7$F$_$h$C$+$J(B^^;
-----------------------------------
$B:dK\(B $B9@B'(B <hsaka@mth.biglobe.ne.jp>
 http://www2u.biglobe.ne.jp/~hsaka/
===============================================================
diff -u proto.h.orig proto.h
--- proto.h.orig Fri Mar 3 00:18:22 2000
+++ proto.h Sun Mar 5 14:00:45 2000
@@ -344,7 +344,7 @@
 extern Anchor * retrieveCurrentImg ( Buffer *buf );
 extern Anchor * retrieveCurrentForm ( Buffer *buf );
 extern Anchor * searchAnchor ( AnchorList *al, char *str );
-extern int searchURLLabelLine ( Buffer *buf, char *url );
+extern Anchor * searchURLLabel ( Buffer *buf, char *url );
 extern char * reAnchor ( Buffer *buf, char *re );
 extern char* reAnchorNews ( Buffer *buf, char *re );
 extern Anchor *closest_next_anchor(AnchorList *a, Anchor *an, int x, int y);
diff -u anchor.c.orig anchor.c
--- anchor.c.orig Fri Jan 14 18:58:35 2000
+++ anchor.c Sun Mar 5 14:02:23 2000
@@ -180,15 +180,10 @@
         return NULL;
 }
 
-int
-searchURLLabelLine(Buffer *buf, char *url)
+Anchor *
+searchURLLabel(Buffer *buf, char *url)
 {
- Anchor *a;
-
- a = searchAnchor(buf->name,url);
- if (a)
- return a->start.line;
- return -1;
+ return searchAnchor(buf->name,url);
 }
 
 static Anchor*
diff -u file.c.orig file.c
--- file.c.orig Sat Mar 4 13:53:58 2000
+++ file.c Sun Mar 5 14:01:53 2000
@@ -985,14 +985,15 @@
     else
       b->type = "text/plain";
     if (proc == loadHTMLBuffer && pu.label) {
- int ln;
+ Anchor *a;
 #ifdef JP_CHARSET
- ln = searchURLLabelLine(b, conv(pu.label, b->document_code, InnerCode)->ptr);
+ a = searchURLLabel(b, conv(pu.label, b->document_code, InnerCode)->ptr);
 #else
- ln = searchURLLabelLine(b, pu.label);
+ a = searchURLLabel(b, pu.label);
 #endif
- if (ln >= 0) {
- gotoLine(b, ln);
+ if (a != NULL) {
+ gotoLine(b, a->start.line);
+ b->pos = a->start.pos;
         arrangeCursor(b);
       }
     }
diff -u main.c.orig main.c
--- main.c.orig Sat Mar 4 13:51:58 2000
+++ main.c Sun Mar 5 14:04:29 2000
@@ -1792,8 +1792,9 @@
     return;
   }
   if (*a->url == '#') { /* index within this buffer */
- ln = searchURLLabelLine(Currentbuf, a->url + 1);
- if (ln < 0) {
+ Anchor *al;
+ al = searchURLLabel(Currentbuf, a->url + 1);
+ if (al == NULL) {
       disp_message("Not found",T);
       return;
     }
@@ -1804,7 +1805,8 @@
     buf->currentURL.label = allocStr(a->url + 1, 0);
     (*buf->clone)++;
     pushBuffer(buf);
- gotoLine(Currentbuf, ln);
+ gotoLine(Currentbuf, al->start.line);
+ Currentbuf->pos = al->start.pos;
     arrangeCursor(Currentbuf);
     displayBuffer(Currentbuf, B_FORCE_REDRAW);
     return;
diff -u w3mmine.cgi.orig w3mmine.cgi
--- w3mmine.cgi.orig Sun Mar 5 15:31:20 2000
+++ w3mmine.cgi Sun Mar 5 15:30:35 2000
@@ -25,7 +25,7 @@
   &print_footer();
   exit;
 }
-if (! $New && $Id !~ /x/) {
+if (! $New && $Id == 0) {
   $New = 1;
   $Start = 1;
 }
@@ -35,12 +35,9 @@
   $N = $X * $Y;
   $M = ($M > $N) ? $N : ($M || int($N / 6) || 1);
   srand();
- $Q = int(2**31 * rand());
- $Id = "${X}x${Y}x${M}x${Q}";
+ $Id = int(2**31 * rand());
   $PX = $PY = 0;
   $Oid = $Cid = 0;
-} else {
- ($X, $Y, $M, $Q) = split("x", $Id);
 }
 
 &create_mine();
@@ -101,6 +98,9 @@
 </select>
 <input type=submit name=New value="New game">
 <input type=submit name=Change value="New game (change size)">
+<input type=hidden name=X value=$X>
+<input type=hidden name=Y value=$Y>
+<input type=hidden name=M value=$M>
 <input type=hidden name=Id value=$Id>
 <input type=hidden name=Oid value=$Oid>
 <input type=hidden name=Cid value=$Cid>
@@ -266,7 +266,7 @@
 
   %Mine = ();
 
- srand($Q);
+ srand($Id);
 
   while($b) {
     $x = int(rand($X)) + 1;



This archive was generated by hypermail 2b29 : Wed Jul 19 2000 - 10:30:54 CDT