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 Apr 21 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/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 Apr 21 05:10:01 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/draw.c diff -u kit/draw.c:1.202 kit/draw.c:1.204 --- kit/draw.c:1.202 Sat Apr 12 07:05:41 2003 +++ kit/draw.c Wed Apr 16 17:02:54 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: draw.c,v 1.202 2003/04/11 22:05:41 nishida Exp $ + * $Id: draw.c,v 1.204 2003/04/16 08:02:54 nishida Exp $ */ #include "mgp.h" @@ -838,8 +838,11 @@ cp->cti_value = 100; } state->opaque = cp->cti_value; + if (mgp_flag & FL_NOXFT && verbose){ + fprintf(stderr, "ignored %%opaque.\n"); + } #else - printf("this mgp cannot use \%opaque\n"); + printf("this mgp cannot use %%opaque, needs to be built with xft2\n"); #endif break; @@ -1195,8 +1198,10 @@ #ifdef USE_XFT2 char *p0; - p0 = xft_draw_fragment(state, p, len, registry, charset16); - if (p0) return p0; + if (!(mgp_flag & FL_NOXFT)){ + p0 = xft_draw_fragment(state, p, len, registry, charset16); + if (p0) return p0; + } #endif if (state->obj) @@ -2112,7 +2117,6 @@ #ifdef USE_XFT2 case O_XTFONT: set_xrender_color(obj->fore, state->opaque); - if (xft_font) XftFontClose(display, xft_font); xft_font = xft_setfont(obj->data.xftfont.fontname, obj->data.xftfont.size, obj->data.xftfont.registry); if (obj->data.xftfont.charset16){ @@ -4516,7 +4520,6 @@ } } if (!fontname) return NULL; - if (xft_font) XftFontClose(display, xft_font); if (!(xft_font = xft_setfont(fontname, char_size[caching], registry))) return NULL; if (charset16) { @@ -4642,16 +4645,20 @@ int csize; char *registry; { - static XftFont *xftfont; + static XftFont *last_xftfont; static char lastfont[100]; + static int lastsize = 0; + XftFont *xftfont; char *p; char style[100]; char font[100]; int stlen; -// if (!strcmp(xfont, lastfont)) return xftfont; + if (!strcmp(xfont, lastfont) && lastsize == csize) return last_xftfont; + if (verbose){ + fprintf(stderr, "using xftfont [%s] size: %d\n", xfont, csize); + } -//printf("xfont [%s] : nonstyle \n", xfont); if (!(p = strchr(xfont, ':'))){ xftfont = XftFontOpen(display, screen, XFT_FAMILY, XftTypeString, xfont, @@ -4672,7 +4679,9 @@ XFT_SIZE, XftTypeDouble, (float)csize * 0.75, 0); if (xftfont == 0) return NULL; } -// strncpy(lastfont, xfont, 99); - return xftfont; + strncpy(lastfont, xfont, (strlen(xfont) >= 100) ? 99 : strlen(xfont)); + lastsize = csize; + last_xftfont = xftfont; + return last_xftfont; } #endif Index: kit/globals.c diff -u kit/globals.c:1.47 kit/globals.c:1.48 --- kit/globals.c:1.47 Tue Mar 25 05:02:50 2003 +++ kit/globals.c Wed Apr 16 07:41:43 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: globals.c,v 1.47 2003/03/24 20:02:50 nishida Exp $ + * $Id: globals.c,v 1.48 2003/04/15 22:41:43 nishida Exp $ */ #include "mgp.h" @@ -150,5 +150,6 @@ /*CTL*/ { CTL_ANIM, T_STR, "anim", 4 }, /*CTL*/ { CTL_VALIGN, T_SP, "valign", 6 }, /*CTL*/ { CTL_AREA, T_SP, "area", 4 }, +/*CTL*/ { CTL_OPAQUE, T_INT, "opaque", 6 }, { 0, 0, NULL, 0 }, }; Index: kit/mgp.c diff -u kit/mgp.c:1.125 kit/mgp.c:1.126 --- kit/mgp.c:1.125 Tue Mar 4 08:48:28 2003 +++ kit/mgp.c Wed Apr 16 17:02:55 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.c,v 1.125 2003/03/03 23:48:28 nishida Exp $ + * $Id: mgp.c,v 1.126 2003/04/16 08:02:55 nishida Exp $ */ static char *mgp_version = "1.09a (20010927)"; @@ -340,6 +340,8 @@ mgp_flag |= FL_NOVFLIB; else if (strcmp(optarg, "freetype") == 0) mgp_flag |= FL_NOFREETYPE; + else if (strcmp(optarg, "xft") == 0) + mgp_flag |= FL_NOXFT; else { fprintf(stderr, "unknown rendering engine %s\n", optarg); Index: kit/mgp.h diff -u kit/mgp.h:1.132 kit/mgp.h:1.133 --- kit/mgp.h:1.132 Sat Apr 12 07:05:42 2003 +++ kit/mgp.h Wed Apr 16 17:02:55 2003 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ /* - * $Id: mgp.h,v 1.132 2003/04/11 22:05:42 nishida Exp $ + * $Id: mgp.h,v 1.133 2003/04/16 08:02:55 nishida Exp $ */ #include @@ -177,6 +177,7 @@ #define FL_NOSTDIN 0x2000 #define FL_GLYPHEDGE 0x4000 #define FL_FRDCACHE 0x8000 +#define FL_NOXFT 0x10000 /* page attribute flags */ #define PGFLAG_NODEF 0x01 /* nodefault */ 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 Apr 21 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 Apr 21 05:10:04 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