X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=9b9ad87f36f0d7a0b9f4b672d41301268240b000;hp=117c9b1cda08765556a2549163ab6326a8559221;hb=HEAD;hpb=6c9f59b491dfde33305b9d09cf81700afb99e6e6 diff --git a/src/libgame/text.c b/src/libgame/text.c index 117c9b1c..9b9ad87f 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -16,18 +16,37 @@ #include "misc.h" +// ============================================================================ +// static font variables +// ============================================================================ + +boolean text_drawing_enabled = TRUE; + + // ============================================================================ // font functions // ============================================================================ +void EnableDrawingText(void) +{ + text_drawing_enabled = TRUE; +} + +void DisableDrawingText(void) +{ + text_drawing_enabled = FALSE; +} + void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts, int (*select_font_function)(int), - int (*get_font_from_token_function)(char *)) + int (*get_font_from_token_function)(char *), + char * (*get_token_from_font_function)(int)) { gfx.num_fonts = num_fonts; gfx.font_bitmap_info = font_bitmap_info; gfx.select_font_function = select_font_function; gfx.get_font_from_token_function = get_font_from_token_function; + gfx.get_token_from_font_function = get_token_from_font_function; } void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info) @@ -136,8 +155,15 @@ int maxWordLengthInRequestString(char *text) // simple text drawing functions // ============================================================================ -void DrawInitText(char *text, int ypos, int font_nr) +static void DrawInitTextExt(char *text, int ypos, int font_nr, boolean update) { + LimitScreenUpdates(TRUE); + + UPDATE_BUSY_STATE(); + + if (!text_drawing_enabled) + return; + if (window != NULL && gfx.draw_init_text && gfx.num_fonts > 0 && @@ -148,31 +174,27 @@ void DrawInitText(char *text, int ypos, int font_nr) int width = video.width; int height = getFontHeight(font_nr); - ClearRectangle(drawto, 0, y, width, height); - DrawTextExt(drawto, x, y, text, font_nr, BLIT_OPAQUE); + ClearRectangleOnBackground(drawto, 0, y, width, height); + DrawTextExt(drawto, x, y, text, font_nr, BLIT_MASKED); - BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0); + if (update) + BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0); } } -void DrawInitTextHead(char *text) +void DrawInitText(char *text, int ypos, int font_nr) { - // always draw headlines when loading initial stuff - LimitScreenUpdates(FALSE); - - UPDATE_BUSY_STATE(); + DrawInitTextExt(text, ypos, font_nr, FALSE); +} - DrawInitText(text, 120, FC_GREEN); +void DrawInitTextHead(char *text) +{ + DrawInitTextExt(text, 120, FC_GREEN, FALSE); } void DrawInitTextItem(char *text) { - // limit drawing (potentially many) loading items - LimitScreenUpdates(TRUE); - - UPDATE_BUSY_STATE(); - - DrawInitText(text, 150, FC_YELLOW); + DrawInitTextExt(text, 150, FC_YELLOW, TRUE); } void DrawTextF(int x, int y, int font_nr, char *format, ...) @@ -223,12 +245,6 @@ void DrawTextSAligned(int x, int y, char *text, int font_nr, int align) gfx.sy + 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; @@ -260,6 +276,14 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, int src_x, src_y; char *text_ptr = text; + if (!text_drawing_enabled) + return; + +#if DEBUG + Debug("font:token", "'%s' / '%s'", + gfx.get_token_from_font_function(font_nr), text); +#endif + if (font->bitmap == NULL) return; @@ -357,11 +381,24 @@ char *GetTextBufferFromFile(char *filename, int max_lines) while (!checkEndOfFile(file) && num_lines < max_lines) { char line[MAX_LINE_LEN]; + char *line_ptr; + int line_len; // read next line of input file if (!getStringFromFile(file, line, MAX_LINE_LEN)) break; + line_len = strlen(line); + + // cut trailing line break (this can be newline and/or carriage return) + for (line_ptr = &line[line_len]; line_ptr >= line; line_ptr--) + if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0') + *line_ptr = '\0'; + + // re-add newline (so the result is terminated by newline, but not CR/LF) + if (strlen(line) != line_len) + strcat(line, "\n"); + buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1); strcat(buffer, line); @@ -371,6 +408,15 @@ char *GetTextBufferFromFile(char *filename, int max_lines) closeFile(file); + if (getTextEncoding(buffer) == TEXT_ENCODING_UTF_8) + { + char *body_latin1 = getLatin1FromUTF8(buffer); + + checked_free(buffer); + + buffer = body_latin1; + } + return buffer; } @@ -388,6 +434,9 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, char *word_ptr; int word_len; + if (strEqual(text_ptr, " ")) // special case: force line break + buffer_filled = TRUE; + // skip leading whitespaces while (*text_ptr == ' ' || *text_ptr == '\t') text_ptr++; @@ -475,16 +524,18 @@ static boolean getCheckedTokenValueFromString(char *string, char **token, return TRUE; } -static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr, - int line_length, int cut_length, +static void DrawTextBuffer_Flush(int x, int y, char *buffer, int base_font_nr, + int font_nr, int line_length, int cut_length, int mask_mode, boolean centered, int current_ypos) { int buffer_len = strlen(buffer); + int base_font_width = getFontWidth(base_font_nr); int font_width = getFontWidth(font_nr); int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0); - int offset_xsize = - (centered ? font_width * (line_length - buffer_len) / 2 : 0); + int line_width = base_font_width * line_length; + int buffer_width = font_width * buffer_len; + int offset_xsize = (centered ? (line_width - buffer_width) / 2 : 0); int final_cut_length = MAX(0, cut_length - offset_chars); int xx = x + offset_xsize; int yy = y + current_ypos; @@ -497,13 +548,15 @@ static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr, DrawText(xx, yy, buffer, font_nr); } -int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, - int line_length, int cut_length, int max_lines, - int line_spacing, int mask_mode, boolean autowrap, - boolean centered, boolean parse_comments) +static int DrawTextBufferExt(int x, int y, char *text_buffer, int base_font_nr, + int line_length, int cut_length, int max_lines, + int line_spacing, int mask_mode, boolean autowrap, + boolean centered, boolean parse_comments, + boolean is_text_area) { char buffer[line_length + 1]; int buffer_len; + int font_nr = base_font_nr; int font_height = getFontHeight(font_nr); int line_height = font_height + line_spacing; int current_line = 0; @@ -532,8 +585,16 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, // copy next line from text buffer to line buffer (nearly fgets() style) for (i = 0; i < num_line_chars && *text_buffer; i++) + { if ((line[i] = *text_buffer++) == '\n') + { + // in text areas, 'line_length' sized lines cause additional empty line + if (i == line_length && is_text_area) + text_buffer--; + break; + } + } line[i] = '\0'; // prevent 'num_line_chars' sized lines to cause additional empty line @@ -551,8 +612,8 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, // if found, flush the current buffer, if non-empty if (buffer_len > 0 && current_ypos < max_ysize) { - DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; @@ -622,8 +683,8 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, if (buffer_filled) { - DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; @@ -637,8 +698,8 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, if (buffer_len > 0 && current_ypos < max_ysize) { - DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; } @@ -646,6 +707,39 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, return current_line; } +int DrawTextArea(int x, int y, char *text_buffer, int font_nr, + int line_length, int cut_length, int max_lines, + int line_spacing, int mask_mode, boolean autowrap, + boolean centered, boolean parse_comments) +{ + return DrawTextBufferExt(x, y, text_buffer, font_nr, + line_length, cut_length, max_lines, + line_spacing, mask_mode, autowrap, + centered, parse_comments, TRUE); +} + +int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, + int line_length, int cut_length, int max_lines, + int line_spacing, int mask_mode, boolean autowrap, + boolean centered, boolean parse_comments) +{ + return DrawTextBufferExt(x, y, text_buffer, font_nr, + line_length, cut_length, max_lines, + line_spacing, mask_mode, autowrap, + centered, parse_comments, FALSE); +} + +int DrawTextBufferS(int x, int y, char *text_buffer, int font_nr, + int line_length, int cut_length, int max_lines, + int line_spacing, int mask_mode, boolean autowrap, + boolean centered, boolean parse_comments) +{ + return DrawTextBuffer(gfx.sx + x, gfx.sy + y, text_buffer, font_nr, + line_length, cut_length, max_lines, + line_spacing, mask_mode, autowrap, + centered, parse_comments); +} + int DrawTextBufferVA(int x, int y, char *format, va_list ap, int font_nr, int line_length, int cut_length, int max_lines, int line_spacing, int mask_mode, boolean autowrap,