projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20131113-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
text.c
diff --git
a/src/libgame/text.c
b/src/libgame/text.c
index f781a56359f7bde43b887737dde568edf687bb9c..9d4d119300833f774017527494c7ef8b6343639c 100644
(file)
--- a/
src/libgame/text.c
+++ b/
src/libgame/text.c
@@
-28,7
+28,7
@@
static GC font_clip_gc = None;
static void InitFontClipmasks()
{
XGCValues clip_gc_values;
static void InitFontClipmasks()
{
XGCValues clip_gc_values;
- unsigned
long
clip_gc_valuemask;
+ unsigned
int
clip_gc_valuemask;
GC copy_clipmask_gc;
int i, j;
GC copy_clipmask_gc;
int i, j;
@@
-107,11
+107,13
@@
static void FreeFontClipmasks()
#endif /* TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND */
void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
#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.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();
#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
InitFontClipmasks();
@@
-186,13
+188,38
@@
void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y)
}
}
+/* ========================================================================= */
+/* text string helper functions */
+/* ========================================================================= */
+
+int maxWordLengthInString(char *text)
+{
+ char *text_ptr;
+ int max_word_len = 0;
+
+ for (text_ptr = text; *text_ptr; text_ptr++)
+ max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
+
+ return max_word_len;
+}
+
+
/* ========================================================================= */
/* simple text drawing functions */
/* ========================================================================= */
/* ========================================================================= */
/* simple text drawing functions */
/* ========================================================================= */
-void DrawInitText
(char *text, int ypos, int font_nr
)
+void DrawInitText
Ext(char *text, int ypos, int font_nr, boolean force
)
{
{
+ static unsigned int progress_delay = 0;
+ unsigned int progress_delay_value = 100; /* (in milliseconds) */
+
+ UPDATE_BUSY_STATE();
+
+ if (!force && !DelayReached(&progress_delay, progress_delay_value))
+ return;
+
if (window != NULL &&
if (window != NULL &&
+ gfx.draw_init_text &&
gfx.num_fonts > 0 &&
gfx.font_bitmap_info[font_nr].bitmap != NULL)
{
gfx.num_fonts > 0 &&
gfx.font_bitmap_info[font_nr].bitmap != NULL)
{
@@
-209,6
+236,16
@@
void DrawInitText(char *text, int ypos, int font_nr)
}
}
}
}
+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];
void DrawTextF(int x, int y, int font_nr, char *format, ...)
{
char buffer[MAX_OUTPUT_LINESIZE + 1];
@@
-251,6
+288,11
@@
void DrawTextSCentered(int y, int font_nr, char *text)
gfx.sy + y, text, 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),
void DrawTextSAligned(int x, int y, char *text, int font_nr, int align)
{
DrawText(gfx.sx + ALIGNED_XPOS(x, getTextWidth(text, font_nr), align),
@@
-702,7
+744,8
@@
static boolean getCheckedTokenValueFromString(char *string, char **token,
}
static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
}
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);
boolean centered, int current_line)
{
int buffer_len = strlen(buffer);
@@
-713,7
+756,7
@@
static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
(centered ? font_width * (line_length - buffer_len) / 2 : 0);
int final_cut_length = MAX(0, cut_length - offset_chars);
int xx = x + 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
;
+ int yy = y + current_line *
(font_height + line_spacing)
;
buffer[final_cut_length] = '\0';
buffer[final_cut_length] = '\0';
@@
-725,8
+768,8
@@
static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
int line_length, int cut_length, int max_lines,
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)
+ int
line_spacing, int mask_mode, boolean autowrap
,
+ boolean
centered, boolean parse
_comments)
{
#if 0
int font_width = getFontWidth(font_nr);
{
#if 0
int font_width = getFontWidth(font_nr);
@@
-753,7
+796,11
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
char line[MAX_LINE_LEN + 1];
char *line_ptr;
boolean last_line_was_empty = TRUE;
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);
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) */
int i;
/* copy next line from text buffer to line buffer (nearly fgets() style) */
@@
-767,7
+814,7
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
text_buffer++;
/* skip comments (lines directly beginning with '#') */
text_buffer++;
/* skip comments (lines directly beginning with '#') */
- if (line[0] == '#' &&
skip
_comments)
+ if (line[0] == '#' &&
parse
_comments)
{
char *token, *value;
{
char *token, *value;
@@
-778,7
+825,7
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
if (buffer_len > 0 && current_line < max_lines)
{
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
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++;
current_line++;
@@
-786,12
+833,14
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
buffer_len = 0;
}
buffer_len = 0;
}
- if (strEqual(token, ".autowrap"))
+ 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);
autowrap = get_boolean_from_string(value);
else if (strEqual(token, ".centered"))
centered = get_boolean_from_string(value);
- else if (strEqual(token, ".
skip
_comments"))
-
skip
_comments = get_boolean_from_string(value);
+ else if (strEqual(token, ".
parse
_comments"))
+
parse
_comments = get_boolean_from_string(value);
}
continue;
}
continue;
@@
-830,7
+879,6
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
}
else
{
}
else
{
- /* !!! CAN NEVER HAPPEN -- CHECK + CORRECT !!! */
buffer_len = line_length;
strncpy(buffer, line_ptr, line_length);
}
buffer_len = line_length;
strncpy(buffer, line_ptr, line_length);
}
@@
-845,7
+893,7
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
{
#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
{
#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 =
#else
int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
int offset_xsize =
@@
-876,7
+924,7
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
{
#if 1
DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
{
#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 =
#else
int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0);
int offset_xsize =
@@
-901,14
+949,14
@@
int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
int DrawTextFile(int x, int y, char *filename, int font_nr,
int line_length, int cut_length, int max_lines,
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)
+ 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,
{
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);
+
line_spacing, mask_mode, autowrap
,
+
centered, parse
_comments);
checked_free(text_buffer);
return num_lines_printed;
checked_free(text_buffer);
return num_lines_printed;