X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=f0cdb01adaecedd75fb3325b440ba40dd840b1dd;hb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;hp=f781a56359f7bde43b887737dde568edf687bb9c;hpb=74ed6f367314f4b4f373b45f82cedd04595a2608;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index f781a563..f0cdb01a 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -107,11 +107,13 @@ static void FreeFontClipmasks()
 #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();
@@ -190,9 +192,18 @@ void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y)
 /* 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)
   {
@@ -209,6 +220,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];
@@ -251,6 +272,11 @@ void DrawTextSCentered(int y, int font_nr, char *text)
 	   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),
@@ -726,7 +752,7 @@ 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 mask_mode, boolean autowrap, boolean centered,
-		   boolean skip_comments)
+		   boolean parse_comments)
 {
 #if 0
   int font_width = getFontWidth(font_nr);
@@ -753,7 +779,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;
+#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) */
@@ -767,7 +797,7 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
       text_buffer++;
 
     /* skip comments (lines directly beginning with '#') */
-    if (line[0] == '#' && skip_comments)
+    if (line[0] == '#' && parse_comments)
     {
       char *token, *value;
 
@@ -786,12 +816,14 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
 	  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);
-	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;
@@ -830,7 +862,6 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
 	}
 	else
 	{
-	  /* !!! CAN NEVER HAPPEN -- CHECK + CORRECT !!! */
 	  buffer_len = line_length;
 	  strncpy(buffer, line_ptr, line_length);
 	}
@@ -902,13 +933,13 @@ 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 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;