-/***********************************************************
-* Artsoft Retro-Game Library *
-*----------------------------------------------------------*
-* (c) 1994-2006 Artsoft Entertainment *
-* Holger Schemel *
-* Detmolder Strasse 189 *
-* 33604 Bielefeld *
-* Germany *
-* e-mail: info@artsoft.org *
-*----------------------------------------------------------*
-* text.c *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+// Holger Schemel
+// info@artsoft.org
+// https://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// text.c
+// ============================================================================
#include <stdio.h>
#include <stdarg.h>
#include "misc.h"
-/* ========================================================================= */
-/* font functions */
-/* ========================================================================= */
-
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-static GC font_clip_gc = None;
-
-static void InitFontClipmasks()
-{
- XGCValues clip_gc_values;
- unsigned long clip_gc_valuemask;
- GC copy_clipmask_gc;
- int i, j;
-
- /* 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
- be set much faster with XSetClipOrigin() and speed things up a lot. */
-
- clip_gc_values.graphics_exposures = False;
- clip_gc_valuemask = GCGraphicsExposures;
- font_clip_gc = XCreateGC(display, window->drawable,
- 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,
- gfx.font_bitmap_info[0].bitmap->clip_mask,
- clip_gc_valuemask, &clip_gc_values);
-
- /* create only those clipping Pixmaps we really need */
- for (i = 0; i < gfx.num_fonts; i++)
- {
- if (gfx.font_bitmap_info[i].bitmap == NULL)
- continue;
-
- gfx.font_bitmap_info[i].clip_mask =
- checked_calloc(gfx.font_bitmap_info[i].num_chars * sizeof(Pixmap));
-
- for (j = 0; j < gfx.font_bitmap_info[i].num_chars; j++)
- {
- Bitmap *src_bitmap = gfx.font_bitmap_info[i].bitmap;
- Pixmap src_pixmap = src_bitmap->clip_mask;
- int xpos = j % gfx.font_bitmap_info[i].num_chars_per_line;
- int ypos = j / gfx.font_bitmap_info[i].num_chars_per_line;
- int width = gfx.font_bitmap_info[i].width;
- int height = gfx.font_bitmap_info[i].height;
- int src_x = gfx.font_bitmap_info[i].src_x + xpos * width;
- int src_y = gfx.font_bitmap_info[i].src_y + ypos * height;
-
- gfx.font_bitmap_info[i].clip_mask[j] =
- XCreatePixmap(display, window->drawable, width, height, 1);
-
- XCopyArea(display, src_pixmap, gfx.font_bitmap_info[i].clip_mask[j],
- copy_clipmask_gc, src_x, src_y, width, height, 0, 0);
- }
- }
-
- 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 */
+// ============================================================================
+// font functions
+// ============================================================================
void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
int (*select_font_function)(int),
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;
-
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
- InitFontClipmasks();
-#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);
}
return gfx.font_bitmap_info[font_bitmap_id].height;
}
+int getFontDrawOffsetX(int font_nr)
+{
+ int font_bitmap_id = gfx.select_font_function(font_nr);
+
+ return gfx.font_bitmap_info[font_bitmap_id].draw_xoffset;
+}
+
+int getFontDrawOffsetY(int font_nr)
+{
+ int font_bitmap_id = gfx.select_font_function(font_nr);
+
+ return gfx.font_bitmap_info[font_bitmap_id].draw_yoffset;
+}
+
int getTextWidth(char *text, int font_nr)
{
return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0);
boolean default_font = (font->num_chars == DEFAULT_NUM_CHARS_PER_FONT);
int font_pos = (unsigned char)c - 32;
- /* map some special characters to their ascii values in default font */
+ // map some special characters to their ascii values in default font
if (default_font)
font_pos = MAP_FONT_ASCII(c) - 32;
- /* this allows dynamic special characters together with special font */
+ // this allows dynamic special characters together with special font
if (font_pos < 0 || font_pos >= font->num_chars)
font_pos = 0;
int font_bitmap_id = gfx.select_font_function(font_nr);
struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
int font_pos = getFontCharPosition(font_nr, c);
+ int offset_x = (font->offset_x != 0 ? font->offset_x : font->width);
+ int offset_y = (font->offset_y != 0 ? font->offset_y : font->height);
*bitmap = font->bitmap;
- *x = font->src_x + (font_pos % font->num_chars_per_line) * font->width;
- *y = font->src_y + (font_pos / font->num_chars_per_line) * font->height;
+ *x = font->src_x + (font_pos % font->num_chars_per_line) * offset_x;
+ *y = font->src_y + (font_pos / font->num_chars_per_line) * offset_y;
}
-/* ========================================================================= */
-/* text string helper functions */
-/* ========================================================================= */
+// ============================================================================
+// text string helper functions
+// ============================================================================
-int maxWordLengthInString(char *text)
+int maxWordLengthInRequestString(char *text)
{
char *text_ptr;
- int max_word_len = 0;
+ int word_len = 0, max_word_len = 0;
for (text_ptr = text; *text_ptr; text_ptr++)
- max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
+ {
+ word_len = (*text_ptr != ' ' &&
+ *text_ptr != '?' &&
+ *text_ptr != '!' ? word_len + 1 : 0);
+
+ max_word_len = MAX(word_len, max_word_len);
+ }
return max_word_len;
}
-/* ========================================================================= */
-/* simple text drawing functions */
-/* ========================================================================= */
+// ============================================================================
+// simple text drawing functions
+// ============================================================================
-void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
+void DrawInitText(char *text, int ypos, int font_nr)
{
- static unsigned long progress_delay = 0;
- unsigned long progress_delay_value = 100; /* (in milliseconds) */
+ LimitScreenUpdates(TRUE);
UPDATE_BUSY_STATE();
- if (!force && !DelayReached(&progress_delay, progress_delay_value))
- return;
-
if (window != NULL &&
gfx.draw_init_text &&
gfx.num_fonts > 0 &&
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);
+ BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0);
}
}
-void DrawInitText(char *text, int ypos, int font_nr)
-{
- DrawInitTextExt(text, ypos, font_nr, TRUE);
-}
-
-void DrawInitTextIfNeeded(char *text, int ypos, int font_nr)
-{
- DrawInitTextExt(text, ypos, font_nr, FALSE);
-}
-
void DrawTextF(int x, int y, int font_nr, char *format, ...)
{
char buffer[MAX_OUTPUT_LINESIZE + 1];
va_end(ap);
if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
- Error(ERR_EXIT, "string too long in DrawTextF() -- aborting");
+ Fail("string too long in DrawTextF() -- aborting");
DrawText(gfx.sx + x, gfx.sy + y, buffer, font_nr);
}
va_end(ap);
if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
- Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting");
+ Fail("string too long in DrawTextFCentered() -- aborting");
DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2,
gfx.sy + y, buffer, font_nr);
gfx.sy + y, text, font_nr);
}
-void DrawTextCentered(int y, int font_nr, char *text)
-{
- DrawText((gfx.sxsize - getTextWidth(text, font_nr)) / 2, 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);
+ gfx.sy + y, text, font_nr);
}
void DrawTextAligned(int x, int y, char *text, int font_nr, int align)
DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
- if (x < gfx.dx)
+ if (IN_GFX_FIELD_FULL(x, y))
redraw_mask |= REDRAW_FIELD;
- else if (y < gfx.vy || gfx.vy == 0)
+ else if (IN_GFX_DOOR_1(x, y))
redraw_mask |= REDRAW_DOOR_1;
+ else if (IN_GFX_DOOR_2(x, y))
+ redraw_mask |= REDRAW_DOOR_2;
+ else if (IN_GFX_DOOR_3(x, y))
+ redraw_mask |= REDRAW_DOOR_3;
+ else
+ redraw_mask |= REDRAW_ALL;
}
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;
char *text_ptr = text;
if (font->bitmap == NULL)
return;
- /* skip text to be printed outside the window (left/right will be clipped) */
+ // 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 */
+ // add offset for drawing font characters
dst_x += font->draw_xoffset;
dst_y += font->draw_yoffset;
char c = *text_ptr++;
if (c == '\n')
- c = ' '; /* print space instead of newline */
+ c = ' '; // print space instead of newline
getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
- /* clip text at the left side of the window */
+ // 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
+ // clip text at the right side of the window
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 */
+ if (mask_mode == BLIT_INVERSE) // special mode for text gadgets
{
- /* first step: draw solid colored rectangle (use "cursor" character) */
- if (strlen(text) == 1) /* only one char inverted => draw cursor */
+ // first step: draw solid colored rectangle (use "cursor" character)
+ if (strlen(text) == 1) // only one char inverted => draw cursor
{
Bitmap *cursor_bitmap;
int cursor_x, cursor_y;
font_width, font_height, dst_x, dst_y);
}
-#if defined(TARGET_SDL)
- /* second step: draw masked inverted character */
+ // second step: draw masked inverted character
SDLCopyInverseMasked(src_bitmap, dst_bitmap, src_x, src_y,
font_width, font_height, dst_x, dst_y);
-#else
- /* second step: draw masked black rectangle (use "space" character) */
- SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
- dst_x - src_x, dst_y - src_y);
- BlitBitmapMasked(src_bitmap, dst_bitmap, 0, 0,
- font_width, font_height, dst_x, dst_y);
-#endif
}
else if (mask_mode == BLIT_MASKED || mask_mode == BLIT_ON_BACKGROUND)
{
if (mask_mode == BLIT_ON_BACKGROUND)
{
- /* clear font character background */
+ // clear font character background
ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y,
font_width, font_height);
}
-#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
- /* use special font tile clipmasks */
- {
- int font_pos = getFontCharPosition(font_nr, c);
-
- SetClipMask(src_bitmap, font_clip_gc, font->clip_mask[font_pos]);
- SetClipOrigin(src_bitmap, font_clip_gc, dst_x, dst_y);
- }
-#else
- SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
- dst_x - src_x, dst_y - src_y);
-#endif
-
BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y,
font_width, font_height, dst_x, dst_y);
}
- else /* normal, non-masked font blitting */
+ else // normal, non-masked font blitting
{
BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y,
font_width, font_height, dst_x, dst_y);
}
-/* ========================================================================= */
-/* text buffer drawing functions */
-/* ========================================================================= */
+// ============================================================================
+// text buffer drawing functions
+// ============================================================================
#define MAX_LINES_FROM_FILE 1024
char *GetTextBufferFromFile(char *filename, int max_lines)
{
- FILE *file;
+ File *file;
char *buffer;
int num_lines = 0;
if (filename == NULL)
return NULL;
- if (!(file = fopen(filename, MODE_READ)))
+ if (!(file = openFile(filename, MODE_READ)))
return NULL;
- buffer = checked_calloc(1); /* start with valid, but empty text buffer */
+ buffer = checked_calloc(1); // start with valid, but empty text buffer
- while (!feof(file) && num_lines < max_lines)
+ while (!checkEndOfFile(file) && num_lines < max_lines)
{
char line[MAX_LINE_LEN];
- /* read next line of input file */
- if (!fgets(line, MAX_LINE_LEN, file))
+ // read next line of input file
+ if (!getStringFromFile(file, line, MAX_LINE_LEN))
break;
buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1);
num_lines++;
}
- fclose(file);
+ closeFile(file);
return buffer;
}
-void DrawTextToTextArea_OLD(int x, int y, char *text, int font_nr, int line_length,
- int area_xsize, int area_ysize, int mask_mode)
-{
- int area_line = 0;
- int font_height = getFontHeight(font_nr);
-
- if (text == NULL)
- return;
-
- while (*text && area_line < area_ysize)
- {
- char buffer[MAX_OUTPUT_LINESIZE + 1];
- int i;
-
- for (i = 0; i < line_length && *text; i++)
- if ((buffer[i] = *text++) == '\n')
- break;
- buffer[MIN(i, area_xsize)] = '\0';
-
- DrawTextExt(drawto, x, y + area_line * font_height, buffer, font_nr,
- mask_mode);
-
- area_line++;
- }
-
- redraw_mask |= REDRAW_FIELD;
-}
-
static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
int *dst_buffer_len, int line_length,
boolean last_line_was_empty)
char *word_ptr;
int word_len;
- /* skip leading whitespaces */
+ // skip leading whitespaces
while (*text_ptr == ' ' || *text_ptr == '\t')
text_ptr++;
word_ptr = text_ptr;
word_len = 0;
- /* look for end of next word */
+ // look for end of next word
while (*word_ptr != ' ' && *word_ptr != '\t' && *word_ptr != '\0')
{
word_ptr++;
{
continue;
}
- else if (*text_ptr == '\n') /* special case: force empty line */
+ else if (*text_ptr == '\n') // special case: force empty line
{
if (buffer_len == 0)
text_ptr++;
- /* prevent printing of multiple empty lines */
+ // prevent printing of multiple empty lines
if (buffer_len > 0 || !last_line_was_empty)
buffer_filled = TRUE;
}
else if (word_len < line_length - buffer_len)
{
- /* word fits into text buffer -- add word */
+ // word fits into text buffer -- add word
if (buffer_len > 0)
buffer[buffer_len++] = ' ';
}
else if (buffer_len > 0)
{
- /* not enough space left for word in text buffer -- print buffer */
+ // not enough space left for word in text buffer -- print buffer
buffer_filled = TRUE;
}
else
{
- /* word does not fit at all into empty text buffer -- cut word */
+ // word does not fit at all into empty text buffer -- cut word
strncpy(buffer, text_ptr, line_length);
buffer[line_length] = '\0';
return buffer_filled;
}
-#if 0
-void DrawTextWrapped_OLD(int x, int y, char *text, int font_nr, int line_length,
- int max_lines)
-{
- char *text_ptr = text;
- int current_line = 0;
- int font_height = getFontHeight(font_nr);
-
- while (*text_ptr && current_line < max_lines)
- {
- char buffer[line_length + 1];
- int buffer_len = 0;
-
- buffer[0] = '\0';
-
- RenderLineToBuffer(&text_ptr, buffer, &buffer_len, line_length, TRUE);
-
- DrawText(x, y + current_line * font_height, buffer, font_nr);
- current_line++;
- }
-}
-#endif
-
-#if 0
-int DrawTextFromFile_OLD(int x, int y, char *filename, int font_nr,
- int line_length, int max_lines, boolean wrap_text)
-{
- int font_height = getFontHeight(font_nr);
- char line[MAX_LINE_LEN];
- char buffer[line_length + 1];
- int buffer_len;
- int current_line = 0;
- FILE *file;
-
- if (current_line >= max_lines)
- return 0;
-
- if (filename == NULL)
- return 0;
-
- if (!(file = fopen(filename, MODE_READ)))
- return 0;
-
- buffer[0] = '\0';
- buffer_len = 0;
-
- while (!feof(file) && current_line < max_lines)
- {
- char *line_ptr;
- boolean last_line_was_empty = TRUE;
-
- /* read next line of input file */
- if (!fgets(line, MAX_LINE_LEN, file))
- break;
-
- /* skip comments (lines directly beginning with '#') */
- if (line[0] == '#')
- continue;
-
- /* cut trailing newline from input line */
- for (line_ptr = line; *line_ptr; line_ptr++)
- {
- if (*line_ptr == '\n' || *line_ptr == '\r')
- {
- *line_ptr = '\0';
- break;
- }
- }
-
- if (strlen(line) == 0) /* special case: force empty line */
- strcpy(line, "\n");
-
- line_ptr = line;
-
- while (*line_ptr && current_line < max_lines)
- {
-#if 1
- boolean buffer_filled;
-
- if (wrap_text)
- {
- buffer_filled = RenderLineToBuffer(&line_ptr, buffer, &buffer_len,
- line_length, last_line_was_empty);
- }
- 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,
- line_length, last_line_was_empty);
-#endif
-
- if (buffer_filled)
- {
- DrawText(x, y + current_line * font_height, buffer, font_nr);
- current_line++;
-
- last_line_was_empty = (buffer_len == 0);
-
- buffer[0] = '\0';
- buffer_len = 0;
- }
- }
- }
-
- fclose(file);
-
- if (buffer_len > 0 && current_line < max_lines)
- {
- DrawText(x, y + current_line * font_height, buffer, font_nr);
- current_line++;
- }
-
- return current_line;
-}
-#endif
-
static boolean getCheckedTokenValueFromString(char *string, char **token,
char **value)
{
if (!getTokenValueFromString(string, token, value))
return FALSE;
- if (**token != '.') /* token should begin with dot */
+ if (**token != '.') // token should begin with dot
return FALSE;
- for (ptr = *token; *ptr; ptr++) /* token should contain no whitespace */
+ for (ptr = *token; *ptr; ptr++) // token should contain no whitespace
if (*ptr == ' ' || *ptr == '\t')
return FALSE;
- for (ptr = *value; *ptr; ptr++) /* value should contain no whitespace */
+ for (ptr = *value; *ptr; ptr++) // value should contain no whitespace
if (*ptr == ' ' || *ptr == '\t')
return FALSE;
static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
int line_length, int cut_length,
- int line_spacing, int mask_mode,
- boolean centered, int current_line)
+ int mask_mode, boolean centered,
+ int current_ypos)
{
int buffer_len = strlen(buffer);
int font_width = getFontWidth(font_nr);
- int font_height = getFontHeight(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 final_cut_length = MAX(0, cut_length - offset_chars);
int xx = x + offset_xsize;
- int yy = y + current_line * (font_height + line_spacing);
+ int yy = y + current_ypos;
buffer[final_cut_length] = '\0';
int line_spacing, int mask_mode, boolean autowrap,
boolean centered, boolean parse_comments)
{
-#if 0
- int font_width = getFontWidth(font_nr);
- int font_height = getFontHeight(font_nr);
-#endif
char buffer[line_length + 1];
int buffer_len;
+ int font_height = getFontHeight(font_nr);
+ int line_height = font_height + line_spacing;
int current_line = 0;
+ int current_ypos = 0;
+ int max_ysize = max_lines * line_height;
if (text_buffer == NULL || *text_buffer == '\0')
return 0;
buffer[0] = '\0';
buffer_len = 0;
- while (*text_buffer && current_line < max_lines)
+ while (*text_buffer && current_ypos < max_ysize)
{
char line[MAX_LINE_LEN + 1];
char *line_ptr;
boolean last_line_was_empty = TRUE;
-#if 1
int num_line_chars = MAX_LINE_LEN;
-#else
- int num_line_chars = (autowrap ? MAX_LINE_LEN : line_length);
-#endif
int i;
- /* copy next line from text buffer to line buffer (nearly fgets() style) */
+ // 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')
break;
line[i] = '\0';
- /* prevent 'num_line_chars' sized lines to cause additional empty line */
+ // prevent 'num_line_chars' sized lines to cause additional empty line
if (i == num_line_chars && *text_buffer == '\n')
text_buffer++;
- /* skip comments (lines directly beginning with '#') */
+ // skip comments (lines directly beginning with '#')
if (line[0] == '#' && parse_comments)
{
char *token, *value;
- /* try to read generic token/value pair definition after comment sign */
+ // try to read generic token/value pair definition after comment sign
if (getCheckedTokenValueFromString(line + 1, &token, &value))
{
- /* if found, flush the current buffer, if non-empty */
- if (buffer_len > 0 && current_line < max_lines)
+ // 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,
- line_spacing, mask_mode, centered, current_line);
-
+ mask_mode, centered, current_ypos);
+ current_ypos += line_height;
current_line++;
buffer[0] = '\0';
centered = get_boolean_from_string(value);
else if (strEqual(token, ".parse_comments"))
parse_comments = get_boolean_from_string(value);
+
+ // if font has changed, depending values need to be updated as well
+ font_height = getFontHeight(font_nr);
+ line_height = font_height + line_spacing;
}
continue;
}
- /* cut trailing newline and carriage return from input line */
+ // cut trailing newline and carriage return from input line
for (line_ptr = line; *line_ptr; line_ptr++)
{
if (*line_ptr == '\n' || *line_ptr == '\r')
}
}
- if (strlen(line) == 0) /* special case: force empty line */
+ if (strlen(line) == 0) // special case: force empty line
strcpy(line, "\n");
line_ptr = line;
- while (*line_ptr && current_line < max_lines)
+ while (*line_ptr && current_ypos < max_ysize)
{
boolean buffer_filled;
if (buffer_filled)
{
-#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
- line_spacing, mask_mode, centered, current_line);
-#else
- int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
- int offset_xsize =
- (centered ? font_width * (line_length - buffer_len) / 2 : 0);
- int final_cut_length = MAX(0, cut_length - offset_chars);
- int xx = x + offset_xsize;
-
- buffer[final_cut_length] = '\0';
-
- if (mask_mode != -1)
- DrawTextExt(drawto, xx, y + current_line * font_height, buffer,
- font_nr, mask_mode);
- else
- DrawText(xx, y + current_line * font_height, buffer, font_nr);
-#endif
-
+ mask_mode, centered, current_ypos);
+ current_ypos += line_height;
current_line++;
last_line_was_empty = (buffer_len == 0);
}
}
- if (buffer_len > 0 && current_line < max_lines)
+ if (buffer_len > 0 && current_ypos < max_ysize)
{
-#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
- line_spacing, mask_mode, centered, current_line);
-#else
- int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
- int offset_xsize =
- (centered ? font_width * (line_length - buffer_len) / 2 : 0);
- int final_cut_length = MAX(0, cut_length - offset_chars);
- int xx = x + offset_xsize;
-
- buffer[final_cut_length] = '\0';
-
- if (mask_mode != -1)
- DrawTextExt(drawto, xx, y + current_line * font_height, buffer,
- font_nr, mask_mode);
- else
- DrawText(xx, y + current_line * font_height, buffer, font_nr);
-#endif
-
+ mask_mode, centered, current_ypos);
+ current_ypos += line_height;
current_line++;
}
return current_line;
}
+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,
+ boolean centered, boolean parse_comments)
+{
+ char text_buffer[MAX_OUTPUT_LINESIZE];
+ int text_length = vsnprintf(text_buffer, MAX_OUTPUT_LINESIZE, format, ap);
+
+ if (text_length >= MAX_OUTPUT_LINESIZE)
+ Warn("string too long in DrawTextBufferVA() -- truncated");
+
+ int num_lines_printed = DrawTextBuffer(x, y, text_buffer, font_nr,
+ line_length, cut_length, max_lines,
+ line_spacing, mask_mode, autowrap,
+ centered, parse_comments);
+ return num_lines_printed;
+}
+
int DrawTextFile(int x, int y, char *filename, int font_nr,
int line_length, int cut_length, int max_lines,
int line_spacing, int mask_mode, boolean autowrap,
return num_lines_printed;
}
-
-#if 0
-void DrawTextWrapped(int x, int y, char *text, int font_nr, int line_length,
- int max_lines)
-{
- DrawTextBuffer(x, y, text, font_nr, line_length, -1, max_lines, -1, TRUE,
- FALSE, FALSE);
-}
-
-void DrawTextToTextArea(int x, int y, char *text, int font_nr, int line_length,
- int cut_length, int max_lines, int mask_mode)
-{
- DrawTextBuffer(x, y, text, font_nr, line_length, cut_length, max_lines,
- mask_mode, FALSE, FALSE, FALSE);
-}
-#endif