X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=48974eb74bb67ef34865e4cd0bccd71bee8ef379;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=414c187716422ecf8150a5be6e0a2a9a029991d2;hpb=4f99eecc06f270aa3c8f536c0b3813c743d19ef5;p=rocksndiamonds.git diff --git a/src/libgame/text.c b/src/libgame/text.c index 414c1877..48974eb7 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -18,15 +18,95 @@ /* ========================================================================= */ -/* exported variables */ +/* font functions */ /* ========================================================================= */ -struct FontInfo font; +#define NUM_FONTS 2 +#define NUM_FONT_COLORS 4 +#define NUM_FONT_CHARS (FONT_LINES_PER_FONT * FONT_CHARS_PER_LINE) +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) +static GC tile_clip_gc = None; +static Pixmap tile_clipmask[NUM_FONTS][NUM_FONT_COLORS][NUM_FONT_CHARS]; -/* ========================================================================= */ -/* font functions */ -/* ========================================================================= */ +static struct +{ + Bitmap **bitmap; + int xsize, ysize; +} font_info[NUM_FONTS] = +{ + { &font.bitmap_big, FONT1_XSIZE, FONT1_YSIZE }, + { &font.bitmap_medium, FONT6_XSIZE, FONT6_YSIZE } +}; + +static void InitFontClipmasks() +{ + static boolean clipmasks_initialized = FALSE; + boolean fonts_initialized = TRUE; + XGCValues clip_gc_values; + unsigned long clip_gc_valuemask; + GC copy_clipmask_gc; + int i, j, k; + + for (i=0; idrawable, + clip_gc_valuemask, &clip_gc_values); + + /* create graphic context structures needed for clipping */ + clip_gc_values.graphics_exposures = False; + clip_gc_valuemask = GCGraphicsExposures; + copy_clipmask_gc = XCreateGC(display, (*font_info[0].bitmap)->clip_mask, + clip_gc_valuemask, &clip_gc_values); + + /* create only those clipping Pixmaps we really need */ + for (i=0; iclip_mask; + int xpos = k % FONT_CHARS_PER_LINE; + int ypos = k / FONT_CHARS_PER_LINE; + int xsize = font_info[i].xsize; + int ysize = font_info[i].ysize; + int src_x = xsize * xpos; + int src_y = ysize * (ypos + j * FONT_LINES_PER_FONT); + + tile_clipmask[i][j][k] = + XCreatePixmap(display, window->drawable, xsize, ysize, 1); + + XCopyArea(display, src_pixmap, tile_clipmask[i][j][k], copy_clipmask_gc, + src_x, src_y, xsize, ysize, 0, 0); + } + + XFreeGC(display, copy_clipmask_gc); + + clipmasks_initialized = TRUE; +} +#endif /* TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND */ void InitFontInfo(Bitmap *bitmap_initial, Bitmap *bitmap_big, Bitmap *bitmap_medium, @@ -37,6 +117,10 @@ void InitFontInfo(Bitmap *bitmap_initial, font.bitmap_medium = bitmap_medium; font.bitmap_small = bitmap_small; font.bitmap_tile = bitmap_tile; + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + InitFontClipmasks(); +#endif } int getFontWidth(int font_size, int font_type) @@ -67,7 +151,7 @@ void DrawInitText(char *text, int ypos, int color) { ClearRectangle(window, 0, ypos, video.width, FONT2_YSIZE); DrawTextExt(window, (video.width - strlen(text) * FONT2_XSIZE)/2, - ypos, text, FS_INITIAL, color); + ypos, text, FS_INITIAL, color, FONT_OPAQUE); FlushDisplay(); } } @@ -100,7 +184,12 @@ void DrawTextF(int x, int y, int font_type, char *format, ...) void DrawText(int x, int y, char *text, int font_size, int font_type) { - DrawTextExt(drawto, x, y, text, font_size, font_type); + int mask_mode = FONT_OPAQUE; + + if (DrawingOnBackground(x, y)) + mask_mode = FONT_MASKED; + + DrawTextExt(drawto, x, y, text, font_size, font_type, mask_mode); if (x < gfx.dx) redraw_mask |= REDRAW_FIELD; @@ -109,7 +198,7 @@ void DrawText(int x, int y, char *text, int font_size, int font_type) } void DrawTextExt(DrawBuffer *bitmap, int x, int y, char *text, - int font_size, int font_type) + int font_size, int font_type, int mask_mode) { Bitmap *font_bitmap; int font_width, font_height, font_starty; @@ -187,21 +276,54 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y, char *text, } } - if (print_inverse) + if (print_inverse) /* special mode for text gadgets */ { - BlitBitmap(font_bitmap, bitmap, - FONT_CHARS_PER_LINE * font_width, + /* first step: draw solid colored rectangle (use "cursor" character) */ + BlitBitmap(font_bitmap, bitmap, FONT_CHARS_PER_LINE * font_width, 3 * font_height + font_starty, font_width, font_height, x, y); + /* second step: draw masked black rectangle (use "space" character) */ SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc, dest_x - src_x, dest_y - src_y); BlitBitmapMasked(font_bitmap, bitmap, 0, 0, font_width, font_height, dest_x, dest_y); } - else - BlitBitmap(font_bitmap, bitmap, - src_x, src_y, font_width, font_height, dest_x, dest_y); + else if (mask_mode == FONT_MASKED) + { + /* clear font character background */ + ClearRectangleOnBackground(bitmap, dest_x, dest_y, + font_width, font_height); + +#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) + /* use special font tile clipmasks, if available */ + if (font_size == FS_BIG || font_size == FS_MEDIUM) + { + int font_nr = (font_size == FS_BIG ? 0 : 1); + int font_char = (c >= 32 && c <= 95 ? c - 32 : 0); + + SetClipMask(font_bitmap, tile_clip_gc, + tile_clipmask[font_nr][font_type][font_char]); + SetClipOrigin(font_bitmap, tile_clip_gc, dest_x, dest_y); + } + else + { + SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc, + dest_x - src_x, dest_y - src_y); + } +#else + SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc, + dest_x - src_x, dest_y - src_y); +#endif + + BlitBitmapMasked(font_bitmap, bitmap, src_x, src_y, + font_width, font_height, dest_x, dest_y); + } + else /* normal, non-masked font blitting */ + { + BlitBitmap(font_bitmap, bitmap, src_x, src_y, + font_width, font_height, dest_x, dest_y); + } } x += font_width;