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 May 26 05:10:01 2003 @@ -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/FAQ diff -u kit/FAQ:1.8 kit/FAQ:1.9 --- kit/FAQ:1.8 Tue Apr 17 09:56:13 2001 +++ kit/FAQ Mon May 19 18:19:44 2003 @@ -2,7 +2,7 @@ MagicPoint FAQ - April 16, 2001 + May 19, 2003 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -112,3 +112,16 @@ size then that of the root window. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Q: What is Xft? + +A: Xft is a library designed to interface the FreeType rasterizer + with the X Rendering Extension. Please see + + http://keithp.com/~keithp/render/Xft.tutorial for mode information. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Q: Does mgp support freetype2? + +A: Since mgp supports xft, you can use freetype2 functions with Xft. 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 May 26 05:10:02 2003 @@ -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/mgp.c diff -u kit/mgp.c:1.127 kit/mgp.c:1.128 --- kit/mgp.c:1.127 Thu May 8 17:31:20 2003 +++ kit/mgp.c Wed May 21 18:07:26 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.c,v 1.127 2003/05/08 08:31:20 nishida Exp $ + * $Id: mgp.c,v 1.128 2003/05/21 09:07:26 nishida Exp $ */ static char *mgp_version = "1.09a (20010927)"; @@ -221,7 +221,7 @@ mgpwdir = p; } -#define ACCEPTOPTS "BdvVob:c:eg:f:hlGp:qt:Q:PSUT:D:CORw:X:x:nF:E:" +#define ACCEPTOPTS "Bd:vVob:c:eg:f:hlGp:qt:Q:PSUT:D:CORw:X:x:nF:E:" while ((opt = getopt(argc, argv, ACCEPTOPTS)) != -1) { #undef ACCEPTOPTS switch (opt) { @@ -231,6 +231,8 @@ case 'd': mgp_flag |= FL_DEMO; + if (isdigit(optarg[0])) demointerval = atoi(optarg); + else optind --; break; case 'V': Index: kit/mgp.man diff -u kit/mgp.man:1.59 kit/mgp.man:1.60 --- kit/mgp.man:1.59 Thu Dec 6 10:42:59 2001 +++ kit/mgp.man Wed May 21 18:07:26 2003 @@ -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.59 2001/12/06 01:42:59 itojun Exp $ +.\" $Id: mgp.man,v 1.60 2003/05/21 09:07:26 nishida Exp $ .\" .Dd November 1997 .Dt MGP 1 @@ -92,9 +92,13 @@ (The default value is black) .It Fl c Ar vfcap Specify a VFlib configuration file. -.It Fl d +.It Fl d [ Ar interval ] Demonstration mode. -Browse all page quickly and terminate. +Browse all page automatically, spending +.Ar interval +secounds on each page and terminate. If +.Ar interval +is not specified, it will be set to 0. .It Fl f Ar vfont Specify the font name to be used by VFlib. (The default value is minsl) Index: kit/plist.c diff -u kit/plist.c:1.22 kit/plist.c:1.23 --- kit/plist.c:1.22 Thu Jun 17 16:38:13 1999 +++ kit/plist.c Mon May 19 16:29:45 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: plist.c,v 1.22 1999/06/17 07:38:13 itojun Exp $ + * $Id: plist.c,v 1.23 2003/05/19 07:29:45 nishida Exp $ */ #include "mgp.h" @@ -53,7 +53,7 @@ int i, ny, pl_x; u_int pl_nx, pl_ny, pl_y; - if (pl_titlewin) + if (pl_titlewin || !plfs) return; /* number of pages in x-axis */ @@ -227,7 +227,7 @@ u_int page; int showlast; - if (!pg_mode || !pg_win) + if (!pg_mode || !pg_win || !plfs) return; page = state->page; Index: kit/x11.c diff -u kit/x11.c:1.28 kit/x11.c:1.29 --- kit/x11.c:1.28 Sun Feb 4 03:46:50 2001 +++ kit/x11.c Mon May 19 16:29:45 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: x11.c,v 1.28 2001/02/03 18:46:50 nishida Exp $ + * $Id: x11.c,v 1.29 2003/05/19 07:29:45 nishida Exp $ */ #include "mgp.h" @@ -287,9 +287,16 @@ XSetFont(display, gc_pl, plfs->fid); XSetFont(display, gc_plrev, plfs->fid); XSetFont(display, gc_pta, plfs->fid); - } + } else + fprintf(stderr, + "cannot find %s font. please modify PAGELIST_FONT to display page guide.\n", + PAGELIST_FONT); + if (plkfs) XSetFont(display, gc_ptk, plkfs->fid); + else + fprintf(stderr, "cannot find %s font.\n", PAGELIST_KFONT); + XSetFunction(display, gc_pl, GXcopy); XSetFunction(display, gc_plrev, GXcopy); XSetFunction(display, gc_pta, GXcopy); @@ -298,8 +305,11 @@ XSetBackground(display, gc_pl, WhitePixel(display, screen)); XSetForeground(display, gc_plrev, WhitePixel(display, screen)); XSetBackground(display, gc_plrev, BlackPixel(display, screen)); - pl_fh = (plfs->max_bounds.ascent + plfs->max_bounds.descent) * 1.2; - pl_fw = plfs->max_bounds.rbearing + plfs->max_bounds.lbearing; + if (plfs) { + pl_fh = (plfs->max_bounds.ascent + plfs->max_bounds.descent) * 1.2; + pl_fw = plfs->max_bounds.rbearing + plfs->max_bounds.lbearing; + if (!plkfs) plkfs = plfs; + } } void 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 May 26 05:10:03 2003 @@ -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 May 26 05:10:03 2003 @@ -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/v6header.gif