diff --git a/config.h.in b/config.h.in index c3e0a06..33e1af1 100644 --- a/config.h.in +++ b/config.h.in @@ -45,9 +45,6 @@ /* Define this if you have gtk+ >= 2.0.0 */ #undef ENABLE_GTK -/* define this if you use gtk(gdk) font interface */ -#undef ENABLE_GTKFONT - /* define this if you use external midi player */ #undef ENABLE_MIDI_EXTPLAYER diff --git a/configure b/configure index 62257d2..453f800 100755 --- a/configure +++ b/configure @@ -17540,14 +17540,7 @@ _ACEOF SRC_FONT= -if test "x$have_sdl" = xyes; then - if test "x$enable_gtk" = xyes; then - SRC_FONT="font_gtk.c" - -$as_echo "#define ENABLE_GTKFONT 1" >>confdefs.h - - fi -else +if test "x$have_sdl" != xyes; then SRC_FONT="font_x11.c" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmbTextEscapement in -lX11" >&5 $as_echo_n "checking for XmbTextEscapement in -lX11... " >&6; } @@ -18565,11 +18558,7 @@ fi echo "" echo " * font device:" -if test "x$have_sdl" = xyes; then - if test "x$enable_gtk" = xyes; then - echo " - gtk(gdk) font" - fi -else +if test "x$have_sdl" != xyes; then echo " - x11 font" fi if test "x$no_ft" != xyes; then diff --git a/configure.ac b/configure.ac index 7adc162..90e07fb 100644 --- a/configure.ac +++ b/configure.ac @@ -693,12 +693,7 @@ dnl dnl FreeType (Font) dnl SRC_FONT= -if test "x$have_sdl" = xyes; then - if test "x$enable_gtk" = xyes; then - SRC_FONT="font_gtk.c" - AC_DEFINE(ENABLE_GTKFONT,1,[define this if you use gtk(gdk) font interface]) - fi -else +if test "x$have_sdl" != xyes; then SRC_FONT="font_x11.c" AC_CHECK_LIB(X11, XmbTextEscapement, X_LIBS="$X_LIBS -lX11", AC_MSG_ERROR(libX11 needed)) AC_DEFINE(ENABLE_X11FONT,1,[define this if you use X11 font interface]) @@ -882,11 +877,7 @@ echo "" dnl font echo " * font device:" -if test "x$have_sdl" = xyes; then - if test "x$enable_gtk" = xyes; then - echo " - gtk(gdk) font" - fi -else +if test "x$have_sdl" != xyes; then echo " - x11 font" fi if test "x$no_ft" != xyes; then diff --git a/doc/README b/doc/README index b49abfe..8c93039 100644 --- a/doc/README +++ b/doc/README @@ -250,7 +250,7 @@ -noantialias : 常に文字にアンチエリアスをかけません。シナリオ上でアンチ エリアスの指定があっても無視します。 - -devfont : フォントデバイスを指定します。x11/gtk/ttf のいずれかが + -devfont : フォントデバイスを指定します。x11/ttf のいずれかが 使えます。 -noimagecursor : リソースファイルによるカーソル形状の変更(Darcrows等)を無効 diff --git a/src/font.c b/src/font.c index f081d03..9e3b798 100644 --- a/src/font.c +++ b/src/font.c @@ -30,28 +30,20 @@ void font_init(int dev) { switch(dev) { -#ifdef ENAME_X11FONT +#ifdef ENABLE_X11FONT case FONT_X11: nact->ags.font = font_x11_new(); break; #endif -#ifdef ENABLE_GTKFONT - case FONT_GTK: - nact->ags.font = font_gtk_new(); - break; -#endif #ifdef ENABLE_FT2 case FONT_FT2: nact->ags.font = font_ft2_new(); break; #endif default: -#ifdef ENABLE_SDL - nact->ags.font = font_gtk_new(); - break; -#else +#ifndef ENABLE_SDL nact->ags.font = font_x11_new(); - break; #endif + break; } } diff --git a/src/font.h b/src/font.h index 2a217ae..a81cdcf 100644 --- a/src/font.h +++ b/src/font.h @@ -69,10 +69,6 @@ extern FONT *font_sdlttf_new(); extern FONT *font_x11_new(); #endif -#ifdef ENABLE_GTKFONT -extern FONT *font_gtk_new(); -#endif - /* ǥեȤΥե̾ */ #define FONT_DEFAULTNAME_X "-*-*-medium-r-normal--%d-*-*-*-c-*-jisx0208.1983-0,-*-*-medium-r-normal--%d-*-*-*-c-*-jisx0201.1976-0,*" @@ -81,8 +77,6 @@ extern FONT *font_gtk_new(); // typedef enum { FONT_X11, - FONT_GTK, - FONT_TTF, FONT_FT2, FONT_SDLTTF } fontdev_t; diff --git a/src/font_gtk.c b/src/font_gtk.c deleted file mode 100644 index d06a682..0000000 --- a/src/font_gtk.c +++ /dev/null @@ -1,213 +0,0 @@ -/* - * font_gtk.c access to gtk(gdk) font device - * - * Copyright (C) 2000- Fumihiko Murata - * (C) 1997-1998 Masaki Chikama (Wren) - * 1998- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * NOTE: - * sdl_core.c ưޤκ sdl ˰¸ʤ褦ˤ - * -*/ -/* $Id: font_gtk.c,v 1.8 2003/01/25 01:34:50 chikama Exp $ */ - -#include "config.h" - -#include -#include -#include -#include -#include - -#include "portab.h" -#include "system.h" -#include "font.h" -#include "ags.h" -#include "eucsjis.h" -#include "antialiase.h" -#include "image.h" - -/* fontset ΰ٤ξ */ -typedef struct { - int size; - int type; - GdkFont *id; -} FontTable; - -#define FONTTABLEMAX 256 -static FontTable fonttbl[FONTTABLEMAX]; -static int fontcnt = 0; -static GdkFont *fontset; -static int font_ascent, font_descent; - -static GtkWidget *mainwin; -static int gdk_depth = 0; -static agsurface_t img_glyph; - -static FONT *this; - -#define GLYPH_PIXMAP_WIDTH 800 /* ʸ᡼٤Pixmap礭 */ -#define GLYPH_PIXMAP_HEIGHT 150 - -static void font_insert(int size, int type, GdkFont *fontset) { - fonttbl[fontcnt].size = size; - fonttbl[fontcnt].type = type; - fonttbl[fontcnt].id = fontset; - - if (fontcnt >= (FONTTABLEMAX -1)) { - WARNING("Font table is full.\n"); - } else { - fontcnt++; - } -} - -static FontTable *font_lookup(int size, int type) { - int i; - - for (i = 0; i < fontcnt; i++) { - if (fonttbl[i].size == size && fonttbl[i].type == type) { - return &fonttbl[i]; - } - } - return NULL; -} - -static void font_gtk_sel_font(int type, int size) { - FontTable *tbl; - - if (NULL == (tbl = font_lookup(size, type))) { - char name[256]; - - if (type > 3) type = FONT_GOTHIC; - - g_snprintf(name, sizeof(name), this->name[type], size, size); - - fontset = gdk_fontset_load(name); - if (fontset == NULL) { - SYSERROR("can't load font %s\n", name); - } - font_insert(size, type, fontset); - } else { - fontset = tbl->id; - } - - font_ascent = fontset->ascent; - font_descent = fontset->descent; -} - -static void *font_gtk_get_glyph(unsigned char *str) { - agsurface_t *dst; - int h, w, l; - BYTE *conv; - - GdkPixmap *pix_gdk; - GdkGC *gc_gdk; - GdkImage *img_gdk; - GdkColor col_gdk; - - - /* convert string code from sjis to euc (or LANG) */ - conv = sjis2lang(str); - - l = strlen(conv); - w = gdk_text_width(fontset, conv, l); - - if (w == 0) { - free(conv); - return NULL; - } - - h = gdk_text_height(fontset, conv, l); - - if (w > GLYPH_PIXMAP_WIDTH) w = GLYPH_PIXMAP_WIDTH; - if (h > GLYPH_PIXMAP_HEIGHT) h = GLYPH_PIXMAP_HEIGHT; - - pix_gdk = gdk_pixmap_new(mainwin->window, w, h, gdk_depth); - gc_gdk = gdk_gc_new(pix_gdk); - - /* color */ - col_gdk.pixel = 0; - gdk_gc_set_foreground(gc_gdk, &col_gdk); - // gdk_gc_set_background(gc_gdk, &col_gdk); - gdk_draw_rectangle(pix_gdk, gc_gdk, TRUE, 0, 0, w, h); - - col_gdk.pixel = 1; - gdk_gc_set_foreground(gc_gdk, &col_gdk); - gdk_draw_text(pix_gdk, fontset, gc_gdk, 0, fontset->ascent, conv, l); - - gdk_gc_destroy(gc_gdk); - img_gdk = gdk_image_get(&((GdkWindowPrivate *)pix_gdk)->window, - 0, 0, w, h); - gdk_pixmap_unref(pix_gdk); - - dst = g_new(agsurface_t, 1); - - dst->width = w; - dst->height = h; - dst->bytes_per_pixel = (img_gdk->bpp+1)/8; /* ࡼ */ - dst->bytes_per_line = img_gdk->bpl; - dst->pixel = img_gdk->mem; - - image_get_glyph(dst, &img_glyph); - - if (this->antialiase_on) { - aa_make(img_glyph.pixel, w, dst->height, img_glyph.bytes_per_line); - } - - img_glyph.width = w; - img_glyph.height = h; - - g_free(dst); - g_free(conv); - gdk_image_destroy(img_gdk); - - return &img_glyph; -} - -static int font_gtk_draw_glyph(int x, int y, unsigned char *str, int col) { - return 0; -} - -static boolean drawable() { - return FALSE; -} - -FONT *font_gtk_new() { - FONT *f = g_new(FONT, 1); - - f->sel_font = font_gtk_sel_font; - f->get_glyph = font_gtk_get_glyph; - f->draw_glyph = font_gtk_draw_glyph; - f->self_drawable = drawable; - f->antialiase_on = FALSE; - - mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gdk_depth = gdk_visual_get_best_depth(); - - img_glyph.width = GLYPH_PIXMAP_WIDTH; - img_glyph.height = GLYPH_PIXMAP_HEIGHT; - img_glyph.bytes_per_line = GLYPH_PIXMAP_WIDTH; - img_glyph.depth = 8; - img_glyph.bytes_per_pixel = 1; - img_glyph.pixel = g_malloc(GLYPH_PIXMAP_WIDTH * GLYPH_PIXMAP_HEIGHT); - - this = f; - - NOTICE("FontDevice gtk\n"); - - return f; -} diff --git a/src/xsystem35.c b/src/xsystem35.c index a5db3a6..c2509c4 100644 --- a/src/xsystem35.c +++ b/src/xsystem35.c @@ -96,7 +96,7 @@ static boolean isjix0213_tt[FONTTYPEMAX]; static char fontface[FONTTYPEMAX]; #ifdef ENABLE_EDL -static fontdev_t fontdev = FONT_GTK; +static fontdev_t fontdev = FONT_FT2; #else static fontdev_t fontdev = FONT_X11; #endif @@ -171,9 +171,6 @@ static void sys35_usage(boolean verbose) { #ifdef ENABLE_X11FONT puts(" -devfont x11 : x11"); #endif -#ifdef ENABLE_GTKFONT - puts(" -devfont gtk : gtk"); -#endif #ifdef ENABLE_EDL #ifdef ENABLE_GTK @@ -262,18 +259,8 @@ static int check_fontdev(char *devname) { } #endif -#ifdef ENABLE_GTKFONT - if (0 == strcmp(devname, "gtk")) { - return FONT_GTK; - } -#endif - #ifdef ENABLE_SDL -#ifdef ENABLE_GTK - return FONT_GTK; -#else - return FONT_TTF; -#endif + return FONT_FT2; #else return FONT_X11; #endif @@ -504,7 +491,6 @@ static void sys35_init() { for (i = 0; i < FONTTYPEMAX; i++) { switch(fontdev) { - case FONT_TTF: case FONT_FT2: case FONT_SDLTTF: if (fontname_tt[i] == NULL) { @@ -517,7 +503,6 @@ static void sys35_init() { break; case FONT_X11: - case FONT_GTK: if (fontname[i] == NULL) { nact->ags.font->name[i] = strdup(FONT_DEFAULTNAME_X); } else {