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 Dec  6 05:10:03 1999
@@ -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 Dec  6 05:10:04 1999
@@ -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.159 kit/draw.c:1.160
--- kit/draw.c:1.159	Sun Nov 28 23:35:03 1999
+++ kit/draw.c	Mon Dec  6 02:28:39 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: draw.c,v 1.159 1999/11/28 14:35:03 nishida Exp $
+ * $Id: draw.c,v 1.160 1999/12/05 17:28:39 nishida Exp $
  */
 
 #include "mgp.h"
@@ -1205,6 +1205,7 @@
 			/* fall through */
 		case MODE_UNKNOWN:
 		case MODE_X:
+break;
 			char_len = draw_onechar_x(state, code,
 				state->linewidth, 0, char_size[caching],
 				registry, (len == (charset16 ? 2 : 1)) ? 1 : 0);
@@ -1212,8 +1213,8 @@
 				fprintf(stderr, "can't load font size %d "
 					"(nor font in similar size) for "
 					"font <%s:%d:%s>, glyph 0x%04x\n",
-					char_size, x_findseed(state, registry),
-					char_size, registry, code);
+					char_size[caching], x_findseed(state, registry),
+					char_size[caching], registry, code);
 			}
 			break;
 		}
Index: kit/mgp.c
diff -u kit/mgp.c:1.107 kit/mgp.c:1.108
--- kit/mgp.c:1.107	Sun Nov  7 02:14:55 1999
+++ kit/mgp.c	Mon Dec  6 02:28:42 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: mgp.c,v 1.107 1999/11/06 17:14:55 itojun Exp $
+ * $Id: mgp.c,v 1.108 1999/12/05 17:28:42 nishida Exp $
  */
 
 static char *mgp_version = "1.06a (990728)";
@@ -1091,8 +1091,8 @@
 				if (mgp_flag & FL_FRDCACHE) {
 					cached_page = 0;
 					reset_cache_pixmap();
-					reset_cache_bgimage();
 				}
+				reset_cache_bgimage();
 				draw_reinit(&state);	/*notify*/
 				lastcp = state.cp;
 				state_goto(&state, state.page, 1);
@@ -1139,6 +1139,7 @@
 		XButtonPressedEvent *eb;
 		eb = (XButtonPressedEvent *)e;
 		x = eb->x; y = eb->y;
+		if (e->xbutton.button != 1) return;
 	} else {
 		rakugaki_x = rakugaki_y = -1;
 		return;
Index: kit/parse.c
diff -u kit/parse.c:1.80 kit/parse.c:1.81
--- kit/parse.c:1.80	Fri Sep 10 16:13:44 1999
+++ kit/parse.c	Mon Dec  6 02:28:44 1999
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /*
- * $Id: parse.c,v 1.80 1999/09/10 07:13:44 itojun Exp $
+ * $Id: parse.c,v 1.81 1999/12/05 17:28:44 nishida Exp $
  */
 
 #include "mgp.h"
@@ -896,7 +896,7 @@
 				    {
 					struct ctrl **cpe;	/*empty cp*/
 					cpe = (struct ctrl **)NULL;
-					for (i = 4; i < 10; i++) {
+					for (i = 5; i < 10; i++) {
 					    if (!tmpstr[i]) {
 						if (!cpe)
 						    cpe = &tmpstr[i];
Index: kit/contrib/xmindpath/uucplock.c
diff -u kit/contrib/xmindpath/uucplock.c:1.1 kit/contrib/xmindpath/uucplock.c:1.2
--- kit/contrib/xmindpath/uucplock.c:1.1	Sun Aug 23 13:50:17 1998
+++ kit/contrib/xmindpath/uucplock.c	Thu Dec  2 11:58:31 1999
@@ -55,7 +55,7 @@
 	char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
 	off_t lseek();
 
-	(void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname);
+	(void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
 	fd = open(tbuf, O_RDWR|O_CREAT|O_EXCL, 0664);
 	if (fd < 0) {
 		/*
@@ -104,6 +104,6 @@
 {
 	char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
 
-	(void)sprintf(tbuf, _PATH_LOCKDIRNAME, ttyname);
+	(void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
 	return(unlink(tbuf));
 }
Index: kit/sample/cloud.gif
Index: kit/sample/dad.gif
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/v6header.gif

.