From: Holger Schemel Date: Wed, 16 Apr 2003 22:12:23 +0000 (+0200) Subject: rnd-20030417-1-src X-Git-Tag: 3.0.0^2~95 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=57becb68aac2b371506b50cbf8b9b66220003b31;p=rocksndiamonds.git rnd-20030417-1-src --- diff --git a/src/conftime.h b/src/conftime.h index 1f079db0..bd3d7886 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-04-16 20:42]" +#define COMPILE_DATE_STRING "[2003-04-17 00:11]" diff --git a/src/init.c b/src/init.c index 02657be3..34d4ef14 100644 --- a/src/init.c +++ b/src/init.c @@ -363,7 +363,7 @@ void InitFontGraphicInfo() /* ---------- initialize font bitmap array ---------- */ if (font_bitmap_info != NULL) - free(font_bitmap_info); + FreeFontInfo(font_bitmap_info); font_bitmap_info = checked_calloc(num_font_bitmaps * sizeof(struct FontBitmapInfo)); diff --git a/src/libgame/system.h b/src/libgame/system.h index 50b82f3a..706c4fda 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -329,7 +329,6 @@ struct FontBitmapInfo #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) Pixmap *clip_mask; /* single-char-only clip mask array for X11 */ - int last_num_chars; /* to free last font clip masks */ #endif }; diff --git a/src/libgame/text.c b/src/libgame/text.c index a33bf11a..5558fc1c 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -27,34 +27,11 @@ static GC font_clip_gc = None; static void InitFontClipmasks() { - static int last_num_fonts = 0; XGCValues clip_gc_values; unsigned long clip_gc_valuemask; GC copy_clipmask_gc; int i, j; - if (gfx.num_fonts == 0 || gfx.font_bitmap_info[0].bitmap == NULL) - return; - - for (i=0; i < last_num_fonts; i++) - { - if (gfx.font_bitmap_info[i].clip_mask) - { - for (j=0; j < gfx.font_bitmap_info[i].last_num_chars; j++) - XFreePixmap(display, gfx.font_bitmap_info[i].clip_mask[j]); - free(gfx.font_bitmap_info[i].clip_mask); - } - - gfx.font_bitmap_info[i].clip_mask = NULL; - gfx.font_bitmap_info[i].last_num_chars = 0; - } - - last_num_fonts = gfx.num_fonts; - - if (font_clip_gc) - XFreeGC(display, font_clip_gc); - font_clip_gc = None; - /* This stuff is needed because X11 (XSetClipOrigin(), to be precise) is often very slow when preparing a masked XCopyArea() for big Pixmaps. To prevent this, create small (tile-sized) mask Pixmaps which will then @@ -80,7 +57,6 @@ static void InitFontClipmasks() gfx.font_bitmap_info[i].clip_mask = checked_calloc(gfx.font_bitmap_info[i].num_chars * sizeof(Pixmap)); - gfx.font_bitmap_info[i].last_num_chars = gfx.font_bitmap_info[i].num_chars; for (j=0; j < gfx.font_bitmap_info[i].num_chars; j++) { @@ -103,6 +79,31 @@ static void InitFontClipmasks() XFreeGC(display, copy_clipmask_gc); } + +static void FreeFontClipmasks() +{ + int i, j; + + if (gfx.num_fonts == 0 || gfx.font_bitmap_info[0].bitmap == NULL) + return; + + for (i=0; i < gfx.num_fonts; i++) + { + if (gfx.font_bitmap_info[i].clip_mask) + { + for (j=0; j < gfx.font_bitmap_info[i].num_chars; j++) + XFreePixmap(display, gfx.font_bitmap_info[i].clip_mask[j]); + free(gfx.font_bitmap_info[i].clip_mask); + } + + gfx.font_bitmap_info[i].clip_mask = NULL; + gfx.font_bitmap_info[i].num_chars = 0; + } + + if (font_clip_gc) + XFreeGC(display, font_clip_gc); + font_clip_gc = None; +} #endif /* TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND */ void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts, @@ -117,6 +118,18 @@ void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts, #endif } +void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info) +{ + if (font_bitmap_info == NULL) + return; + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + FreeFontClipmasks(); +#endif + + free(font_bitmap_info); +} + int getFontWidth(int font_nr) { int font_bitmap_id = gfx.select_font_function(font_nr); diff --git a/src/libgame/text.h b/src/libgame/text.h index 530a6b2a..5d701fa7 100644 --- a/src/libgame/text.h +++ b/src/libgame/text.h @@ -53,6 +53,7 @@ /* font structure definitions */ void InitFontInfo(struct FontBitmapInfo *, int, int (*function)(int)); +void FreeFontInfo(struct FontBitmapInfo *); int getFontWidth(int); int getFontHeight(int);