#endif /* TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND */
void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
- int (*select_font_function)(int))
+ int (*select_font_function)(int),
+ int (*get_font_from_token_function)(char *))
{
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;
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
InitFontClipmasks();
/* simple text drawing functions */
/* ========================================================================= */
-void DrawInitText(char *text, int ypos, int font_nr)
+void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
{
+ static unsigned long progress_delay = 0;
+ unsigned long progress_delay_value = 100; /* (in milliseconds) */
+
+ UPDATE_BUSY_STATE();
+
+ if (!force && !DelayReached(&progress_delay, progress_delay_value))
+ return;
+
if (window != NULL &&
+ gfx.draw_init_text &&
gfx.num_fonts > 0 &&
gfx.font_bitmap_info[font_nr].bitmap != NULL)
{
}
}
+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];
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),
}
#endif
+static boolean getCheckedTokenValueFromString(char *string, char **token,
+ char **value)
+{
+ char *ptr;
+
+ if (!getTokenValueFromString(string, token, value))
+ return FALSE;
+
+ if (**token != '.') /* token should begin with dot */
+ return FALSE;
+
+ 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 */
+ if (*ptr == ' ' || *ptr == '\t')
+ return FALSE;
+
+ return TRUE;
+}
+
+static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
+ int line_length, int cut_length, int mask_mode,
+ boolean centered, int current_line)
+{
+ 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;
+
+ buffer[final_cut_length] = '\0';
+
+ if (mask_mode != -1)
+ DrawTextExt(drawto, xx, yy, buffer, font_nr, mask_mode);
+ else
+ 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 mask_mode, boolean autowrap, boolean centered,
- boolean skip_comments)
+ 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 current_line = 0;
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) */
break;
line[i] = '\0';
+ /* 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 '#') */
- if (line[0] == '#' && skip_comments)
+ if (line[0] == '#' && parse_comments)
+ {
+ char *token, *value;
+
+ /* 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)
+ {
+ DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+ mask_mode, centered, current_line);
+
+ current_line++;
+
+ buffer[0] = '\0';
+ buffer_len = 0;
+ }
+
+ if (strEqual(token, ".font"))
+ font_nr = gfx.get_font_from_token_function(value);
+ else if (strEqual(token, ".autowrap"))
+ autowrap = get_boolean_from_string(value);
+ else if (strEqual(token, ".centered"))
+ centered = get_boolean_from_string(value);
+ else if (strEqual(token, ".parse_comments"))
+ parse_comments = get_boolean_from_string(value);
+ }
+
continue;
+ }
/* cut trailing newline and carriage return from input line */
for (line_ptr = line; *line_ptr; line_ptr++)
if (buffer_filled)
{
+#if 1
+ DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+ 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);
font_nr, mask_mode);
else
DrawText(xx, y + current_line * font_height, buffer, font_nr);
+#endif
current_line++;
if (buffer_len > 0 && current_line < max_lines)
{
+#if 1
+ DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+ 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);
font_nr, mask_mode);
else
DrawText(xx, y + current_line * font_height, buffer, font_nr);
+#endif
current_line++;
}
int DrawTextFile(int x, int y, char *filename, int font_nr,
int line_length, int cut_length, int max_lines,
int mask_mode, boolean autowrap, boolean centered,
- boolean skip_comments)
+ boolean parse_comments)
{
char *text_buffer = GetTextBufferFromFile(filename, MAX_LINES_FROM_FILE);
int num_lines_printed = DrawTextBuffer(x, y, text_buffer, font_nr,
line_length, cut_length, max_lines,
mask_mode, autowrap, centered,
- skip_comments);
+ parse_comments);
checked_free(text_buffer);
return num_lines_printed;