X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=83be1dfc0213e972569fa708731c121dd8458bbb;hb=462bca0782be497b984922afda26b5bf12bd3d75;hp=de70abc34c6faeb0289e2330ec0cc0347a9981a1;hpb=fa628a204ea4662806244b0ed994a48b40ece2ca;p=rocksndiamonds.git diff --git a/src/libgame/text.c b/src/libgame/text.c index de70abc3..83be1dfc 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -130,6 +130,13 @@ void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info) free(font_bitmap_info); } +struct FontBitmapInfo *getFontBitmapInfo(int font_nr) +{ + int font_bitmap_id = gfx.select_font_function(font_nr); + + return &gfx.font_bitmap_info[font_bitmap_id]; +} + int getFontWidth(int font_nr) { int font_bitmap_id = gfx.select_font_function(font_nr); @@ -149,12 +156,12 @@ int getTextWidth(char *text, int font_nr) return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0); } -static char getFontCharPosition(int font_nr, char c) +static int getFontCharPosition(int font_nr, char c) { int font_bitmap_id = gfx.select_font_function(font_nr); struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id]; boolean default_font = (font->num_chars == DEFAULT_NUM_CHARS_PER_FONT); - int font_pos = c - 32; + int font_pos = (unsigned char)c - 32; /* map some special characters to their ascii values in default font */ if (default_font) @@ -180,14 +187,20 @@ void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y) void DrawInitText(char *text, int ypos, int font_nr) { - if (window && + if (window != NULL && gfx.num_fonts > 0 && gfx.font_bitmap_info[font_nr].bitmap != NULL) { - ClearRectangle(window, 0, ypos, video.width, getFontHeight(font_nr)); - DrawTextExt(window, (video.width - getTextWidth(text, font_nr)) / 2, ypos, - text, font_nr, BLIT_OPAQUE); - FlushDisplay(); + int x = (video.width - getTextWidth(text, font_nr)) / 2; + int y = ypos; + int width = video.width; + int height = getFontHeight(font_nr); + + ClearRectangle(drawto, 0, y, width, height); + DrawTextExt(drawto, x, y, text, font_nr, BLIT_OPAQUE); + + /* this makes things significantly faster than directly drawing to window */ + BlitBitmap(drawto, window, 0, y, width, height, 0, y); } } @@ -233,6 +246,18 @@ void DrawTextSCentered(int y, int font_nr, char *text) gfx.sy + y, text, font_nr); } +void DrawTextSAligned(int x, int y, char *text, int font_nr, int align) +{ + DrawText(gfx.sx + ALIGNED_XPOS(x, getTextWidth(text, font_nr), align), + gfx.sx + y, text, font_nr); +} + +void DrawTextAligned(int x, int y, char *text, int font_nr, int align) +{ + DrawText(ALIGNED_XPOS(x, getTextWidth(text, font_nr), align), + y, text, font_nr); +} + void DrawText(int x, int y, char *text, int font_nr) { int mask_mode = BLIT_OPAQUE; @@ -251,37 +276,61 @@ void DrawText(int x, int y, char *text, int font_nr) void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, int font_nr, int mask_mode) { +#if 1 + struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); +#else int font_bitmap_id = gfx.select_font_function(font_nr); struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id]; +#endif int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); +#if 0 int border_1 = gfx.sx + gfx.sxsize; int border_2 = gfx.dx + gfx.dxsize; + int dst_x_start = dst_x; +#endif Bitmap *src_bitmap; int src_x, src_y; - int dst_x_start = dst_x; char *text_ptr = text; if (font->bitmap == NULL) return; + /* skip text to be printed outside the window (left/right will be clipped) */ + if (dst_y < 0 || dst_y + font_height > video.height) + return; + /* add offset for drawing font characters */ - dst_x += font->draw_x; - dst_y += font->draw_y; + dst_x += font->draw_xoffset; + dst_y += font->draw_yoffset; while (*text_ptr) { char c = *text_ptr++; if (c == '\n') - c = ' '; /* print space instaed of newline */ + c = ' '; /* print space instead of newline */ getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y); - /* make sure that text does not run off the screen at the right side */ + /* clip text at the left side of the window */ + if (dst_x < 0) + { + dst_x += font_width; + + continue; + } + + /* clip text at the right side of the window */ +#if 1 + if (dst_x + font_width > video.width) + break; +#else + /* (this does not work well when trying to print text to whole screen) */ if ((dst_x_start < border_1 && dst_x + font_width > border_1) || (dst_x_start < border_2 && dst_x + font_width > border_2)) break; +#endif if (mask_mode == BLIT_INVERSE) /* special mode for text gadgets */ { @@ -474,7 +523,7 @@ void DrawTextWrapped(int x, int y, char *text, int font_nr, int line_length, } int DrawTextFromFile(int x, int y, char *filename, int font_nr, - int line_length, int max_lines) + int line_length, int max_lines, boolean rewrap) { int font_height = getFontHeight(font_nr); char line[MAX_LINE_LEN]; @@ -525,10 +574,41 @@ int DrawTextFromFile(int x, int y, char *filename, int font_nr, while (*line_ptr && current_line < max_lines) { +#if 1 + boolean buffer_filled; + + if (rewrap) + { + buffer_filled = RenderLineToBuffer(&line_ptr, + buffer, &buffer_len, + last_line_was_empty, + line_length); + } + else + { + if (strlen(line_ptr) <= line_length) + { + buffer_len = strlen(line_ptr); + strcpy(buffer, line_ptr); + } + else + { + buffer_len = line_length; + strncpy(buffer, line_ptr, line_length); + } + + buffer[buffer_len] = '\0'; + line_ptr += buffer_len; + + buffer_filled = TRUE; + } +#else boolean buffer_filled = RenderLineToBuffer(&line_ptr, buffer, &buffer_len, last_line_was_empty, line_length); +#endif + if (buffer_filled) { DrawText(x, y + current_line * font_height, buffer, font_nr);