X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=8f8bf8f6d9f4fbfbcaa2b4ad125298832bfc969a;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hp=c8cc667dd98db66e2ce72fbe702965c1bb3c8051;hpb=0868de4751d9e3d4b2f3185c52edb5569217d39a;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index c8cc667d..8f8bf8f6 100644
--- 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;
-  unsigned long clip_gc_valuemask;
+  unsigned int clip_gc_valuemask;
   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,
-		  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();
@@ -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                                             */
 /* ========================================================================= */
 
-void DrawInitText(char *text, int ypos, int font_nr)
+void DrawInitTextExt(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 &&
+      gfx.draw_init_text &&
       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];
@@ -411,6 +448,44 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
 
 #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;
@@ -445,6 +520,8 @@ char *GetTextBufferFromFile(char *filename, int max_lines)
   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)
 {
@@ -707,7 +784,8 @@ static boolean getCheckedTokenValueFromString(char *string, char **token,
 }
 
 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);
@@ -718,7 +796,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;
-  int yy = y + current_line * font_height;
+  int yy = y + current_line * (font_height + line_spacing);
 
   buffer[final_cut_length] = '\0';
 
@@ -730,8 +808,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 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);
@@ -776,7 +854,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;
 
@@ -787,7 +865,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,
-			       mask_mode, centered, current_line);
+			       line_spacing, mask_mode, centered, current_line);
 
 	  current_line++;
 
@@ -795,12 +873,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;
@@ -853,7 +933,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,
-			     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 =
@@ -884,7 +964,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,
-			 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 =
@@ -907,16 +987,34 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
   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 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,
-					 mask_mode, autowrap, centered,
-					 skip_comments);
+					 line_spacing, mask_mode, autowrap,
+					 centered, parse_comments);
   checked_free(text_buffer);
 
   return num_lines_printed;