/* 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 */
-
void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
int (*select_font_function)(int),
int (*get_font_from_token_function)(char *))
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);
}
}
+/* ========================================================================= */
+/* text string helper functions */
+/* ========================================================================= */
+
+int maxWordLengthInString(char *text)
+{
+ char *text_ptr;
+ int word_len = 0, max_word_len = 0;
+
+ for (text_ptr = text; *text_ptr; text_ptr++)
+ {
+ word_len = (*text_ptr != ' ' ? word_len + 1 : 0);
+
+ max_word_len = MAX(word_len, max_word_len);
+ }
+
+ return max_word_len;
+}
+
+
/* ========================================================================= */
/* simple text drawing functions */
/* ========================================================================= */
-void DrawInitText(char *text, int ypos, int font_nr)
+void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
{
+#if 1
+#if 0
+ static unsigned int progress_delay = 0;
+ unsigned int progress_delay_value = 100; /* (in milliseconds) */
+#endif
+
+ // LimitScreenUpdates(TRUE); // (ignore "force" for now)
+ // LimitScreenUpdates(!force);
+ LimitScreenUpdates(TRUE);
+
+ UPDATE_BUSY_STATE();
+
+#if 0
+ if (!force && !DelayReached(&progress_delay, progress_delay_value))
+ return;
+#endif
+
if (window != NULL &&
+ gfx.draw_init_text &&
+ gfx.num_fonts > 0 &&
+ gfx.font_bitmap_info[font_nr].bitmap != NULL)
+ {
+ 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);
+
+ BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0);
+ }
+#else
+ static unsigned int progress_delay = 0;
+ unsigned int progress_delay_value = 100; /* (in milliseconds) */
+
+ // LimitScreenUpdates(TRUE); // (ignore "force" for now)
+ LimitScreenUpdates(!force);
+
+ 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)
{
/* this makes things significantly faster than directly drawing to window */
BlitBitmap(drawto, window, 0, y, width, height, 0, y);
}
+#endif
+}
+
+void DrawInitText(char *text, int ypos, int font_nr)
+{
+ // DrawInitTextExt(text, ypos, font_nr, TRUE);
+ DrawInitTextExt(text, ypos, font_nr, FALSE);
+}
+
+void DrawInitTextAlways(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, ...)
DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
+#if 1
+ if (IN_GFX_FIELD_FULL(x, y))
+ redraw_mask |= REDRAW_FIELD;
+ 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;
+#else
if (x < gfx.dx)
redraw_mask |= REDRAW_FIELD;
else if (y < gfx.vy || gfx.vy == 0)
redraw_mask |= REDRAW_DOOR_1;
+#endif
}
void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
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);
#define MAX_LINES_FROM_FILE 1024
+#if 1
+
+char *GetTextBufferFromFile(char *filename, int max_lines)
+{
+ File *file;
+ char *buffer;
+ int num_lines = 0;
+
+ if (filename == NULL)
+ return NULL;
+
+ if (!(file = openFile(filename, MODE_READ)))
+ return NULL;
+
+ buffer = checked_calloc(1); /* start with valid, but empty text buffer */
+
+ while (!checkEndOfFile(file) && num_lines < max_lines)
+ {
+ char line[MAX_LINE_LEN];
+
+ /* read next line of input file */
+ if (!getStringFromFile(file, line, MAX_LINE_LEN))
+ break;
+
+ buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1);
+
+ strcat(buffer, line);
+
+ num_lines++;
+ }
+
+ closeFile(file);
+
+ return buffer;
+}
+
+#else
+
char *GetTextBufferFromFile(char *filename, int max_lines)
{
FILE *file;
return buffer;
}
+#endif
+
void DrawTextToTextArea_OLD(int x, int y, char *text, int font_nr, int line_length,
int area_xsize, int area_ysize, int mask_mode)
{
}
static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
- int line_length, int cut_length, int mask_mode,
+ int line_length, int cut_length,
+ int line_spacing, int mask_mode,
boolean centered, int current_line)
{
int buffer_len = strlen(buffer);
(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;
+ int yy = y + current_line * (font_height + line_spacing);
buffer[final_cut_length] = '\0';
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 parse_comments)
+ int line_spacing, int mask_mode, boolean autowrap,
+ boolean centered, boolean parse_comments)
{
#if 0
int font_width = getFontWidth(font_nr);
if (buffer_len > 0 && current_line < max_lines)
{
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
- mask_mode, centered, current_line);
+ line_spacing, mask_mode, centered, current_line);
current_line++;
{
#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
- mask_mode, centered, current_line);
+ line_spacing, mask_mode, centered, current_line);
#else
int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
int offset_xsize =
{
#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
- mask_mode, centered, current_line);
+ line_spacing, mask_mode, centered, current_line);
#else
int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
int offset_xsize =
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)
+ Error(ERR_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 mask_mode, boolean autowrap, boolean centered,
- boolean parse_comments)
+ int line_spacing, int mask_mode, boolean autowrap,
+ boolean centered, 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,
- parse_comments);
+ line_spacing, mask_mode, autowrap,
+ centered, parse_comments);
checked_free(text_buffer);
return num_lines_printed;