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
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++)
{
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,
#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);
return gfx.font_bitmap_info[font_bitmap_id].height;
}
+int getTextWidth(char *text, int font_nr)
+{
+ return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0);
+}
+
static char getFontCharPosition(int font_nr, char c)
{
int font_bitmap_id = gfx.select_font_function(font_nr);
gfx.num_fonts > 0 &&
gfx.font_bitmap_info[font_nr].bitmap != NULL)
{
- int text_width = strlen(text) * getFontWidth(font_nr);
-
ClearRectangle(window, 0, ypos, video.width, getFontHeight(font_nr));
- DrawTextExt(window, (video.width - text_width) / 2, ypos, text, font_nr,
- BLIT_OPAQUE);
+ DrawTextExt(window, (video.width - getTextWidth(text, font_nr)) / 2, ypos,
+ text, font_nr, BLIT_OPAQUE);
FlushDisplay();
}
}
if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting");
- DrawText(gfx.sx + (gfx.sxsize - strlen(buffer) * getFontWidth(font_nr)) / 2,
+ DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2,
gfx.sy + y, buffer, font_nr);
}