int getFontWidth(int font_nr)
{
- return gfx.font_bitmap_info[font_nr].width;
+ int font_bitmap_id = gfx.select_font_function(font_nr);
+
+ return gfx.font_bitmap_info[font_bitmap_id].width;
}
int getFontHeight(int font_nr)
{
- return gfx.font_bitmap_info[font_nr].height;
+ int font_bitmap_id = gfx.select_font_function(font_nr);
+
+ return gfx.font_bitmap_info[font_bitmap_id].height;
+}
+
+boolean getFontChar(int font_nr, char c, int *src_x, int *src_y)
+{
+ int font_bitmap_id = gfx.select_font_function(font_nr);
+ struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
+
+ if ((c >= 32 && c <= 95) || c == '°' || c == '´' || c == '|')
+ {
+ *src_x = font->src_x + ((c - 32) % FONT_CHARS_PER_LINE) * font->width;
+ *src_y = font->src_y + ((c - 32) / FONT_CHARS_PER_LINE) * font->height;
+
+ /* map '°' and 'TM' signs and cursor */
+ if (c == '°' || c == '´' || c == '|')
+ {
+ *src_x = font->src_x + FONT_CHARS_PER_LINE * font->width;
+ *src_y = font->src_y + (c == '°' ? 1 : c == '´' ? 2 : 3) * font->height;
+ }
+
+ return TRUE;
+ }
+
+ return FALSE;
}
void DrawInitText(char *text, int ypos, int font_nr)
ClearRectangle(window, 0, ypos, video.width, getFontHeight(font_nr));
DrawTextExt(window, (video.width - text_width) / 2, ypos, text, font_nr,
- FONT_OPAQUE);
+ BLIT_OPAQUE);
FlushDisplay();
}
}
void DrawText(int x, int y, char *text, int font_nr)
{
- int mask_mode = FONT_OPAQUE;
+ int mask_mode = BLIT_OPAQUE;
if (DrawingOnBackground(x, y))
- mask_mode = FONT_MASKED;
+ mask_mode = BLIT_MASKED;
DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
int font_bitmap_id = gfx.select_font_function(font_nr);
struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
boolean print_inverse = FALSE;
+ boolean print_inverse_cursor = FALSE;
+ int src_x, src_y;
if (font->bitmap == NULL)
return;
if (c == '~')
{
print_inverse = TRUE;
+ if (strlen(text) == 1)
+ print_inverse_cursor = TRUE;
+
continue;
}
else if (c == '\\') /* bad luck ... */
c = '/';
- if ((c >= 32 && c <= 95) || c == '°' || c == '´' || c == '|')
+ if (getFontChar(font_nr, c, &src_x, &src_y))
{
- int src_x= font->src_x + ((c - 32) % FONT_CHARS_PER_LINE) * font->width;
- int src_y= font->src_y + ((c - 32) / FONT_CHARS_PER_LINE) * font->height;
-
- if (c == '°' || c == '´' || c == '|') /* map '°' and 'TM' signs */
- {
- src_x = font->src_x + FONT_CHARS_PER_LINE * font->width;
- src_y = font->src_y + (c == '°' ? 1 : c == '´' ? 2 : 3) * font->height;
- }
-
if (print_inverse) /* special mode for text gadgets */
{
/* first step: draw solid colored rectangle (use "cursor" character) */
- BlitBitmap(font->bitmap, dst_bitmap,
- font->src_x + FONT_CHARS_PER_LINE * font->width,
- font->src_y + 3 * font->height,
- font->width, font->height, dst_x, dst_y);
+ if (print_inverse_cursor)
+ BlitBitmap(font->bitmap, dst_bitmap,
+ font->src_x + FONT_CHARS_PER_LINE * font->width,
+ font->src_y + 3 * font->height,
+ font->width, font->height, dst_x, dst_y);
/* second step: draw masked black rectangle (use "space" character) */
SetClipOrigin(font->bitmap, font->bitmap->stored_clip_gc,
BlitBitmapMasked(font->bitmap, dst_bitmap,
0, 0, font->width, font->height, dst_x, dst_y);
}
- else if (mask_mode == FONT_MASKED)
+ else if (mask_mode == BLIT_MASKED)
{
/* clear font character background */
ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y,