Index: kit/CHANGELOG
diff -u kit/CHANGELOG:1.9 kit/CHANGELOG:removed
--- kit/CHANGELOG:1.9	Sat Sep  5 00:11:21 1998
+++ kit/CHANGELOG	Mon Jan 14 05:10:00 2008
@@ -1,51 +0,0 @@
-CHANGELOG for magicpoint
-$Id: CHANGELOG,v 1.9 1998/09/04 15:11:21 onoe Exp $
-
-Fri Sep  5 1998  onoe@sm.sony.co.jp
-	* handle key inputs from invoked terminal as pressed on Xserver,
-	  even if the Xserver is running on a remote host.
-
-Mon Aug 26 1998  itojun@iijlab.net
-	* new copyright. (BSDish copyright without clause 3)
-
-Mon Aug 25 1998  itojun@iijlab.net
-	* print.c: better x11/freetype/vflib -> postscript font mapping.
-
-Mon Aug 23 1998  kato@wide.ad.jp
-	* embedded image support (added mgpembed.pl and embed.c)
-
-Mon Aug 22 1998  itojun@iijlab.net
-	* added contrib/xmindpath, MindPath PocketPoint user-level driver.
-
-Fri Jul 10 11:57:59 JST 1998  itojun@iijlab.net
-	* cache gs-generated image file.
-	  Suggested by: luigi@FreeBSD.org
-
-Mon Jul  6 11:38:32 JST 1998  itojun@iijlab.net
-	* capable of handling GB2312 and KSC5601 encoding.
-	  they must be encoded by using iso-2022 like escape sequences.
-	  EUC-cn or EUC-kr does not work.
-	* -x option is added.
-
-Thu Jul  2 18:04:16 JST 1998  itojun@iijlab.net
-	* eliminate gsview.
-	* revamp "xfont" directive. (see SYNTAX for detail)
-
-Thu Jun 25 13:10:28 JST 1998  itojun@iijlab.net
-	* print.c: color postscript support by "mgp2ps -c".
-
-changes between 1.02a and 1.03a:
-	* To allow color name that has space inbetween ("dark blue"), 
-	  color name after directives SHOULD come with doublequote.
-	  Therefore,
-		%fore blue
-	  should be
-		%fore "blue"
-	  At this moment, doublequote can be ommitted for backward
-	  compatibility.  We may require to have doublequote in the future.
-	  Font names and other string parameter obeys the same rule.
-	* %image is now capable of rendering encapsulated postscript files
-	  (*.eps).
-		%image foo.eps
-	  should work fine.
-	  By using -X option, you can specify device name for ghostscript.
Index: kit/ctlwords.pl
diff -u kit/ctlwords.pl:1.2 kit/ctlwords.pl:removed
--- kit/ctlwords.pl:1.2	Sat Sep  5 06:05:08 1998
+++ kit/ctlwords.pl	Mon Jan 14 05:10:00 2008
@@ -1,12 +0,0 @@
-#! /usr/bin/perl
-$counter = 0;	# 0 origin
-print "/* generated by ctlwords.awk. do not edit by hand. */\n";
-
-while (<>) {
-	next if (!/^\/\*CTL\*\//);
-	next if ($_ !~ /(CTL_[A-Z0-9]+)/);
-
-	$word = $1;
-	print "#define $word\t$counter\n";
-	$counter++;
-}
Index: kit/draw.c
diff -u kit/draw.c:1.238 kit/draw.c:1.241
--- kit/draw.c:1.238	Sun Dec 30 00:02:31 2007
+++ kit/draw.c	Mon Jan 14 04:46:54 2008
@@ -26,11 +26,13 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: draw.c,v 1.238 2007/12/29 15:02:31 nishida Exp $
+ * $Id: draw.c,v 1.241 2008/01/13 19:46:54 nishida Exp $
  */
 
 #include "mgp.h"
+#ifdef USE_IMLIB
 #include <Imlib.h>
+#endif
 
 /* state associated with the window - how should we treat this? */
 static struct ctrl *bg_ctl, *bg_ctl_last, *bg_ctl_cache;
@@ -87,7 +89,7 @@
 static int obj_new_icon __P((struct render_state *, int, int, u_int, u_int, u_long, u_int, XPoint *));
 static Pixel obj_image_color __P((Image *, Image *, Pixel, int *));
 static Image *obj_image_trans __P((Image *, u_int, u_int));
-static void obj_draw_image __P((Drawable, u_int, u_int, struct render_object *));
+static void obj_draw_image __P((Drawable, u_int, u_int, struct render_object *, int));
 static void obj_draw __P((struct render_state *, Drawable, u_int, u_int));
 #ifdef VFLIB
 static int obj_new_vfont __P((struct render_state *, int, int, struct vfont *,
@@ -162,18 +164,18 @@
 #endif
 
 #ifdef USE_IMLIB
-static void regist_zimage_position __P((struct render_object *, int, int, int, int));
-static void clear_zimage __P((void));
+static void regist_zimage_position __P((struct render_object *, int, int, int, int, int));
+static void clear_zimage __P((int));
 static void clear_resion __P((int, int, int, int));
 #define ZIMAGENUM 100
 static ImlibImage *zimage[ZIMAGENUM];
 static int zonzoom[ZIMAGENUM];
+static int zpage[ZIMAGENUM];
 static int zx[ZIMAGENUM];
 static int zx[ZIMAGENUM];
 static int zy[ZIMAGENUM];
 static int zwidth[ZIMAGENUM];
 static int zheight[ZIMAGENUM];
-static int zimgnum;
 #endif
 extern int zoomin;
 
@@ -207,7 +209,7 @@
 	if (!repaint) {
 		purgechild(state->page);
 #ifdef USE_IMLIB
-		clear_zimage();
+		clear_zimage(state->page);
 #endif
 	}
 
@@ -262,7 +264,7 @@
 		if (state->page < maxpage) {
 			purgechild(state->page);
 #ifdef USE_IMLIB
-			clear_zimage();
+			clear_zimage(state->page);
 #endif
 			if (mgp_flag & FL_FRDCACHE &&
 				cached_page == state->page + 1) {
@@ -2074,10 +2076,11 @@
 }
 
 static void
-obj_draw_image(target, x, y, obj)
+obj_draw_image(target, x, y, obj, page)
 	Drawable target;
 	u_int x, y;
 	struct render_object *obj;
+	int page;
 {
 	Image *image, *timage;
 	XImageInfo *ximageinfo;
@@ -2113,7 +2116,7 @@
 
 #ifdef USE_IMLIB
 	if (obj->data.image.clkonzoom) {
-		regist_zimage_position(obj, x, y, xim->width, xim->height);
+		regist_zimage_position(obj, x, y, xim->width, xim->height, page);
 	}
 #endif
 	freeXImage(image, ximageinfo);
@@ -2379,7 +2382,7 @@
 			break;
 #endif /* MNG */
 		case O_IMAGE:
-			obj_draw_image(target, x, y, obj);
+			obj_draw_image(target, x, y, obj, state->page);
 			break;
 #ifdef USE_XFT2
 		case O_XTFONT:
@@ -5524,40 +5527,53 @@
 
 #ifdef USE_IMLIB
 void
-regist_zimage_position(obj, x, y, width, height)
+regist_zimage_position(obj, x, y, width, height, page)
 	struct render_object *obj;
-	int x, y, width, height;
+	int x, y, width, height, page;
 {
 	int i;
 
-	for (i = 0; i < zimgnum; i ++){
+	for (i = 0; i < ZIMAGENUM; i ++){
+		/* already registered */
 		if (zimage[i] == obj->data.image.imimage) return;
 	}
-	zimage[zimgnum] = obj->data.image.imimage;
-	zonzoom[zimgnum] = obj->data.image.clkonzoom;
-	zx[zimgnum] = x;
-	zy[zimgnum] = y;
-	zwidth[zimgnum] = width;
-	zheight[zimgnum] = height;
-	zimgnum ++;
+	for (i = 0; i < ZIMAGENUM; i ++){
+		if (!zimage[i]) break;
+	}
+	if (i == ZIMAGENUM) {
+		fprintf(stderr, "Warning: too many images\n");
+		return;
+	}
+	zimage[i] = obj->data.image.imimage;
+	zonzoom[i] = obj->data.image.clkonzoom;
+	zx[i] = x;
+	zy[i] = y;
+	zwidth[i] = width;
+	zheight[i] = height;
+	zpage[i] = page;
 }
 
 static void
-clear_zimage()
+clear_zimage(page)
+	int page;
 {
-	zimgnum = 0;
+	int i;
 	zoomin = 0;
-	manage_pixmap((Pixmap)NULL, 0);
+	manage_pixmap((Pixmap)NULL, 0, page);
+	for (i = 0; i < ZIMAGENUM; i ++){
+		if (zpage[i] == page) zimage[i] = 0;
+	}
 }
 
 int
-search_zimage(x, y)
-	int x, y;
+search_zimage(x, y, page)
+	int x, y, page;
 {
 	int i;
-	for (i = 0; i < zimgnum; i ++){
+	for (i = 0; i < ZIMAGENUM; i ++){
+		if (!zimage[i]) continue;
 		if (zx[i] <= x && zx[i] + zwidth[i] >= x && 
-		    zy[i] <= y && zy[i] + zheight[i] >= y) {
+		    zy[i] <= y && zy[i] + zheight[i] >= y && zpage[i] == page) {
 			return i;
 		}
 	}
@@ -5587,7 +5603,7 @@
 		x = zx[id] + xstep * i;
 		y = zy[id] + ystep * i;
 		pixmap = pixmap_fromimimage(zimage[id], w, h); 
-		manage_pixmap(pixmap, 1);
+		manage_pixmap(pixmap, 1, zpage[id]);
 		if (i > 0) clear_resion(id, i-1, i, 0); 
 		XCopyArea(display, pixmap, window, gcfore, 0,0, w, h, x, y); 
 		XFlush(display);
@@ -5618,13 +5634,13 @@
 		x = zx[id] + xstep * i;
 		y = zy[id] + ystep * i;
 		pixmap = pixmap_fromimimage(zimage[id], w, h); 
-		manage_pixmap(pixmap, 1);
+		manage_pixmap(pixmap, 1, zpage[id]);
 		if (i < ratio) clear_resion(id, i+1, i, 0);
 		XCopyArea(display, pixmap, window, gcfore, 0, 0, w, h, x, y); 
 		XFlush(display);
 		if (i > 0) usleep(10000);
 	}
-	clear_resion(id, ratio, 2, 1);
+	clear_resion(id, ratio, 0, 1);
 }
 
 void
Index: kit/mgp.c
diff -u kit/mgp.c:1.150 kit/mgp.c:1.151
--- kit/mgp.c:1.150	Sun Dec 30 00:02:31 2007
+++ kit/mgp.c	Mon Jan 14 04:46:54 2008
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: mgp.c,v 1.150 2007/12/29 15:02:31 nishida Exp $
+ * $Id: mgp.c,v 1.151 2008/01/13 19:46:54 nishida Exp $
  */
 
 static char *mgp_version = "1.12a (20070123)";
@@ -903,7 +903,7 @@
 						zoomout_zimage(zid);
 						break;
 					}
-					if ((zid = search_zimage(e.xbutton.x, e.xbutton.y)) >= 0){
+					if ((zid = search_zimage(e.xbutton.x, e.xbutton.y, state.page)) >= 0){
 						zoomin_zimage(zid);
 						zoomin = 1;
 						break;
Index: kit/print.c
diff -u kit/print.c:1.112 kit/print.c:1.113
--- kit/print.c:1.112	Mon Dec 24 03:42:57 2007
+++ kit/print.c	Wed Jan  9 02:49:42 2008
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: print.c,v 1.112 2007/12/23 18:42:57 nishida Exp $
+ * $Id: print.c,v 1.113 2008/01/08 17:49:42 nishida Exp $
  */
 /*
  * Paper size selection code is based on psutil.c by Angus J. C. Duggan
@@ -150,6 +150,10 @@
 	{ CTL_TMFONT, KANJI, "*",		"Ryumin-Light-H" },
 #endif
 #endif /*FREETYPE*/
+	{ CTL_XFONT2, ASCII, "century schoolbook l-medium-r", "NewCenturySchlbk-Roman" },
+	{ CTL_XFONT2, ASCII, "century schoolbook l-medium-i", "NewCenturySchlbk-Italic" },
+	{ CTL_XFONT2, ASCII, "century schoolbook l-bold-r", "NewCenturySchlbk-Bold" },
+	{ CTL_XFONT2, ASCII, "century schoolbook l-bold-i", "NewCenturySchlbk-BoldItalic" },
 	{ CTL_XFONT2, ASCII, "times-medium-r",	"Times-Roman" },
 	{ CTL_XFONT2, ASCII, "times-medium-i",	"Times-Italic" },
 	{ CTL_XFONT2, ASCII, "times-bold-r",	"Times-Bold" },
@@ -165,6 +169,7 @@
 	{ CTL_XFONT2, ASCII, "times*",		"Times" },
 	{ CTL_XFONT2, ASCII, "helvetica*",	"Helvetica" },
 	{ CTL_XFONT2, ASCII, "courier*",		"Courier" },
+	{ CTL_XFONT2, ASCII, "symbol*",		"Symbol" },
 	{ CTL_XFONT2, ASCII, "*",		"Helvetica" },	/*last resort*/
 	{ CTL_XFONT2, KANJI, "*",		"Ryumin-Light-H" }, /*last resort*/
 	/*PSFONT*/
Index: kit/image/gif.h
diff -u kit/image/gif.h:1.2 kit/image/gif.h:removed
--- kit/image/gif.h:1.2	Mon Dec 28 17:23:03 1998
+++ kit/image/gif.h	Mon Jan 14 05:10:01 2008
@@ -1,72 +0,0 @@
-/* gif.h:
- *
- * gifin.h
- * kirk johnson
- * november 1989
- * external interface to gifin.c
- *
- * Copyright 1989 Kirk L. Johnson (see the included file
- * "kljcpyrght.h" for complete copyright information)
- */
-
-/*
- * gifin return codes
- */
-#define GIFIN_SUCCESS       0   /* success */
-#define GIFIN_DONE          1   /* no more images */
-
-#define GIFIN_ERR_BAD_SD   -1   /* bad screen descriptor */
-#define GIFIN_ERR_BAD_SEP  -2   /* bad image separator */
-#define GIFIN_ERR_BAD_SIG  -3   /* bad signature */
-#define GIFIN_ERR_EOD      -4   /* unexpected end of raster data */
-#define GIFIN_ERR_EOF      -5   /* unexpected end of input stream */
-#define GIFIN_ERR_FAO      -6   /* file already open */
-#define GIFIN_ERR_IAO      -7   /* image already open */
-#define GIFIN_ERR_NFO      -8   /* no file open */
-#define GIFIN_ERR_NIO      -9   /* no image open */
-
-/*
- * colormap indices 
- */
-
-#define GIF_RED  0
-#define GIF_GRN  1
-#define GIF_BLU  2
-
-/*
- * typedef BYTE for convenience
- */
-
-typedef unsigned char BYTE;
-
-static int gifin_open_file();
-static int gifin_open_image();
-static int gifin_get_pixel();
-#if 0
-static int gifin_close_image();
-#endif
-static int gifin_close_file();
-static int gifin_load_cmap();
-static int gifin_skip_extension();
-static int gifin_read_data_block();
-static int gifin_push_string();
-static void gifin_add_string();
-static void gifin_fatal();
-
-/* #defines, typedefs, and such
- */
-
-#define GIF_SIG      "GIF87a"
-#define GIF_SIG_89   "GIF89a"
-#define GIF_SIG_LEN  6          /* GIF signature length */
-#define GIF_SD_SIZE  7          /* GIF screen descriptor size */
-#define GIF_ID_SIZE  9          /* GIF image descriptor size */
-
-#define GIF_SEPARATOR   ','     /* GIF image separator */
-#define GIF_EXTENSION   '!'     /* GIF extension block marker */
-#define GIF_TERMINATOR  ';'     /* GIF terminator */
-
-#define STAB_SIZE  4096         /* string table size */
-#define PSTK_SIZE  4096         /* pixel stack size */
-
-#define NULL_CODE  -1           /* string table null code */
Index: kit/image/imlib_loader.c
diff -u kit/image/imlib_loader.c:1.5 kit/image/imlib_loader.c:1.6
--- kit/image/imlib_loader.c:1.5	Sun Dec 30 00:02:31 2007
+++ kit/image/imlib_loader.c	Mon Jan 14 04:46:55 2008
@@ -99,23 +99,37 @@
 	return pixmap;
 }
 
+#define MAXPMAP 100
 void
-manage_pixmap(pixmap, add)
+manage_pixmap(pixmap, add, page)
 	Pixmap pixmap;
 	int add;
+	int page;
 {
-	static int pnum = 0;
-	static Pixmap pmap[100];
+	static Pixmap pmap[MAXPMAP];
+	static int ppage[MAXPMAP];
 	int i;
 
 	if (add) {
-		pmap[pnum] = pixmap;
-		pnum ++;
+		for (i = 0; i < MAXPMAP; i ++) {
+			if (pmap[i] == pixmap) return;
+		}
+		for (i = 0; i < MAXPMAP; i ++) {
+			if (!pmap[i]) break;
+		}
+		if (i == MAXPMAP) {
+			fprintf(stderr, "warning: too many images in manage_pixmap\n");
+			return;
+		}
+		pmap[i] = pixmap;
+		ppage[i] = page;
 	} else {
-		for (i = 0; i < pnum; i ++) {
-			Imlib_free_pixmap(id, pmap[i]);
+		for (i = 0; i < MAXPMAP; i ++) {
+			if (ppage[i] == page){
+				Imlib_free_pixmap(id, pmap[i]);
+				pmap[i] = 0;
+			}
 		}
-		pnum = 0;
 	}
 }
 
Index: kit/sample/cloud.gif
Index: kit/sample/dad.gif
Index: kit/sample/dns-jp.mgp
diff -u kit/sample/dns-jp.mgp:1.5 kit/sample/dns-jp.mgp:removed
--- kit/sample/dns-jp.mgp:1.5	Fri Sep  4 21:33:18 1998
+++ kit/sample/dns-jp.mgp	Mon Jan 14 05:10:01 2008
@@ -1,130 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%	This file is automatically created from the file
-%%	main.pre modified at Fri Jan 23 14:31:24 1998
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%include "default.mgp"
-%% "noop" cancels definitions in default.mgp
-%default 1 left, size 7, fore "light yellow", back "blue4", font "standard", ccolor "white", vgap 35
-%default 2 noop
-%default 3 fore "white", bar "gray70", vgap 10
-%default 4 noop
-%tab 1 noop
-%tab 2 noop
-%tab 3 noop
-%%%
-%page
-%nodefault
-%fore "red", back "blue4", size 9, vgap 15
-%center, fore "yellow", font "thick"
-%ccolor "white"
-
-
-
-Root DNS `M' について
-
-%size 6, fore "red", font "thick"
-加藤   朗
-
-%size 5, fore "white", font "standard"
-東京大学大型計算機センター
-
-
-%font "typewriter"
-kato@wide.ad.jp
-%font "standard"
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  経緯 (1)
-%fore "red", size 6, font "thick"
-   ☆ Root DNS
-%fore "white", size 5, font "standard"
-       ・ ９台で運用
-%fore "white", size 5, font "standard"
-          − ８台が US
-          − Stockholm に１台
-%fore "white", size 5, font "standard"
-       ・ 最大で１３台
-%fore "white", size 5, font "standard"
-          − パケット長の制約
-%fore "red", size 6, font "thick"
-   ☆ Root DNS の運用基準
-%fore "white", size 5, font "standard"
-       ・ RFC 2010
-       ・ gTLD との関係
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  経緯 (2)
-%fore "red", size 6, font "thick"
-   ☆ IEPG で拡張を検討
-   ☆ ヨーロッパ地域
-%fore "white", size 5, font "standard"
-       ・ LINX に新設 : 1997 年 4 月
-%fore "white", size 5, font "standard"
-          − RIPE/NCC が管理
-          − `K'
-%fore "red", size 6, font "thick"
-   ☆ アジア太平洋地域
-%fore "white", size 5, font "standard"
-       ・ NSPIXP-2 ： 1997 年 8 月
-%fore "white", size 5, font "standard"
-          − WIDE が管理
-          − `M'
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  `M'
-%fore "red", size 6, font "thick"
-   ☆ 構成
-%fore "white", size 5, font "standard"
-       ・ ２台の PentiumPro 200MHz
-       ・ Primary/Backup、 自動切り替え
-%fore "red", size 6, font "thick"
-   ☆ Root-only サーバ
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-202.12.27.33
-%font "standard"
-       ・ 400 〜 500 query/sec
-%fore "red", size 6, font "thick"
-   ☆ 運用管理
-%fore "white", size 5, font "standard"
-       ・ WIDE および ISP 有志
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%page
-
-%back "blue4"
-  お願い
-%fore "red", size 6, font "thick"
-   ☆ 最新の root.cache の入れ換え
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-1997082200
-%fore "red", size 6, font "thick"
-   ☆ Named の更新
-%fore "white", size 5, font "standard"
-       ・ 4.9.6/8.8.1
-%fore "red", size 6, font "thick"
-   ☆ 遊ばないで：
-%fore "white", size 5, font "standard"
-       ・ 
-%cont, font "typewriter"
-ping/traceroute
-%font "standard"
-       ・ 
-%cont, font "typewriter"
-telnet/spray/...
-%fore "red", size 6, font "thick"
-   ☆ Thanks to
-%fore "white", size 5, font "standard"
-       ・ 日本 Cisco/多くの ISP
-       ・ `M' 管理グループ
Index: kit/sample/mgp-old1.gif
Index: kit/sample/mgp-old2.gif
Index: kit/sample/mgp-old3.gif
Index: kit/sample/mgp1.gif
Index: kit/sample/mgp2.gif
Index: kit/sample/mgp3.gif
Index: kit/sample/sample.mgp
diff -u kit/sample/sample.mgp:1.34 kit/sample/sample.mgp:1.35
--- kit/sample/sample.mgp:1.34	Sat Dec 29 19:59:57 2007
+++ kit/sample/sample.mgp	Wed Jan  9 02:54:05 2008
@@ -316,7 +316,11 @@
 	You can enlarge images by clicking on them 
 		Use -clkonzoom option in %newimage
 		Click the following image to see this feature
-%center, newimage -xscrzoom 20 -clkonzoom 95 "cloud.jpg"
+
+
+
+
+%center, newimage -xscrzoom 20 -clkonzoom 87 "cloud.jpg"
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %PAGE
 %bgrad 0 0 256 0 0 "skyblue" "white"
Index: kit/sample/v6header.gif