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 15 05:10:00 2007 @@ -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/configure diff -u kit/configure:1.99 kit/configure:1.100 --- kit/configure:1.99 Fri Sep 1 01:17:56 2006 +++ kit/configure Fri Jan 12 19:38:55 2007 @@ -6541,7 +6541,7 @@ gif_h_ok=yes fi if test "x$gif_h_ok" != "xyes"; then - echo 'FATAL: can not find gif_lib.h. pass proper CPPFLAGS to configure.' + echo 'FATAL: cannot find gif_lib.h. pass proper CPPFLAGS to configure.' exit 1 fi fi @@ -6659,7 +6659,7 @@ imlib_h_ok=yes fi if test "x$imlib_h_ok" != "xyes"; then - echo 'FATAL: can not find Imlib.h. pass proper CPPFLAGS to configure.' + echo 'FATAL: cannot find Imlib.h. pass proper CPPFLAGS to configure.' exit 1 fi fi Index: kit/configure.in diff -u kit/configure.in:1.97 kit/configure.in:1.98 --- kit/configure.in:1.97 Fri Sep 1 01:17:56 2006 +++ kit/configure.in Fri Jan 12 19:38:55 2007 @@ -3,7 +3,7 @@ dnl independent (using srcdir), however, xmkmf and Imake.tmpl do not dnl allow us to switch compilation directory. dnl -dnl $Id: configure.in,v 1.97 2006/08/31 16:17:56 nishida Exp $ +dnl $Id: configure.in,v 1.98 2007/01/12 10:38:55 nishida Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -432,7 +432,7 @@ gif_h_ok=yes fi if test "x$gif_h_ok" != "xyes"; then - echo 'FATAL: can not find gif_lib.h. pass proper CPPFLAGS to configure.' + echo 'FATAL: cannot find gif_lib.h. pass proper CPPFLAGS to configure.' exit 1 fi fi @@ -475,7 +475,7 @@ imlib_h_ok=yes fi if test "x$imlib_h_ok" != "xyes"; then - echo 'FATAL: can not find Imlib.h. pass proper CPPFLAGS to configure.' + echo 'FATAL: cannot find Imlib.h. pass proper CPPFLAGS to configure.' exit 1 fi fi 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 15 05:10:01 2007 @@ -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.231 kit/draw.c:1.232 --- kit/draw.c:1.231 Sun Jan 7 18:41:53 2007 +++ kit/draw.c Fri Jan 12 19:38:55 2007 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: draw.c,v 1.231 2007/01/07 09:41:53 nishida Exp $ + * $Id: draw.c,v 1.232 2007/01/12 10:38:55 nishida Exp $ */ #include "mgp.h" @@ -3859,7 +3859,7 @@ reparent_child_window(window_id, window_width, window_height); else { if (mgp_flag & FL_VERBOSE) { - fprintf(stderr, "WARN: %%xsystem can not find child window:"); + fprintf(stderr, "WARN: %%xsystem cannot find child window:"); for (i = 0; i < cp->cta_argc; i++) { fprintf(stderr, "%c%s", (i == 0) ? '"' : ' ', cp->cta_argv[i]); Index: kit/mgp.c diff -u kit/mgp.c:1.141 kit/mgp.c:1.142 --- kit/mgp.c:1.141 Sun Oct 15 05:40:12 2006 +++ kit/mgp.c Mon Jan 15 00:59:57 2007 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.c,v 1.141 2006/10/14 20:40:12 nishida Exp $ + * $Id: mgp.c,v 1.142 2007/01/14 15:59:57 nishida Exp $ */ static char *mgp_version = "1.11b (20040925)"; @@ -1148,7 +1148,7 @@ /* compress expose event */ while (XEventsQueued(display, QueuedAfterReading) > 0) { XPeekEvent(display, &ahead); - if (ahead.type != Expose) + if (ahead.type != Expose && ahead.type != ConfigureNotify) break; if (ahead.xexpose.window != window) break; @@ -1167,6 +1167,15 @@ ((mgp_flag & FL_OVER) || e.xconfigure.window != RootWindow(display, screen))) break; + /* compress expose event */ + while (XEventsQueued(display, QueuedAfterReading) > 0) { + XPeekEvent(display, &ahead); + if (ahead.type != Expose && ahead.type != ConfigureNotify) + break; + if (ahead.xconfigure.window != window) + break; + XNextEvent(display, &e); + } if (window_width != e.xconfigure.width || window_height != e.xconfigure.height) { struct ctrl *lastcp; Index: kit/mgp.man diff -u kit/mgp.man:1.63 kit/mgp.man:1.64 --- kit/mgp.man:1.63 Sat Aug 14 00:53:51 2004 +++ kit/mgp.man Mon Jan 15 00:40:04 2007 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: mgp.man,v 1.63 2004/08/13 15:53:51 nishida Exp $ +.\" $Id: mgp.man,v 1.64 2007/01/14 15:40:04 nishida Exp $ .\" .Dd November 1997 .Dt MGP 1 @@ -249,6 +249,7 @@ .It Fl U Be unsecure. Enable directives that fork/exec the child process. +Allow to use non-ASCII filename. .It Fl T Ar timestampfile If the option is specified, .Nm Index: kit/parse.c diff -u kit/parse.c:1.101 kit/parse.c:1.102 --- kit/parse.c:1.101 Sun May 28 18:59:34 2006 +++ kit/parse.c Fri Jan 12 19:38:56 2007 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: parse.c,v 1.101 2006/05/28 09:59:34 nishida Exp $ + * $Id: parse.c,v 1.102 2007/01/12 10:38:56 nishida Exp $ */ #include "mgp.h" @@ -1671,7 +1671,7 @@ fprintf(stderr, "File %s found\n", p); return 0; } - fprintf(stderr, "File %s can not found\n", p); + fprintf(stderr, "File %s not found\n", p); parse_error++; return -1; } Index: kit/scanner.l diff -u kit/scanner.l:1.26 kit/scanner.l:1.27 --- kit/scanner.l:1.26 Sun May 28 18:59:34 2006 +++ kit/scanner.l Mon Jan 15 00:40:04 2007 @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ /* - * $Id: scanner.l,v 1.26 2006/05/28 09:59:34 nishida Exp $ + * $Id: scanner.l,v 1.27 2007/01/14 15:40:04 nishida Exp $ */ /* * partly derived from lbl libpcap source code, which has the following @@ -185,6 +185,16 @@ yylval.s[strlen(yylval.s) - 1] = '\0'; return STR; } +\"({XSTR}|{ASTRN})*\" { + if (mgp_flag & FL_NOFORK) { + yyerror("invalid character <%c>", *(char *)yytext); + } else { + yylval.s = strdup((char *)yytext) + 1; + if (strlen(yylval.s)) + yylval.s[strlen(yylval.s) - 1] = '\0'; + return STR; + } + } . { yyerror("invalid character <%c>", *(char *)yytext); } 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 15 05:10:02 2007 @@ -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/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 15 05:10:02 2007 @@ -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.30 kit/sample/sample.mgp:1.31 --- kit/sample/sample.mgp:1.30 Tue Sep 14 23:48:47 2004 +++ kit/sample/sample.mgp Mon Jan 15 01:18:09 2007 @@ -260,6 +260,20 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %PAGE + +New Functions from 1.12a + + %tsystem directive + If %xsystem does not work properly on your system, please try to use %tsystem +%center +%tsystem "xclock -geometry %30x30+25+60 -update 1 -bg white -fg blue -hands green" +%left + + Image rotation + You can rotate your image with newimage directive +%center, newimage -xscrzoom 20 -rotate 90 "cloud.jpg" +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%PAGE %bgrad 0 0 256 0 0 "skyblue" "white" %PCACHE 1 1 0 30 Index: kit/sample/v6header.gif