X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=4de7319a7e131a6bf4a996cac727f5caaa506e40;hb=311a3f217666744c8ce72093c37c58acf952c115;hp=36096240203880ba31d6744f0c9bab2d9cc05eb0;hpb=b17343806da99bd24842f0b2e58d8513e0108bb7;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 36096240..4de7319a 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -223,12 +223,6 @@ void DrawTextSAligned(int x, int y, char *text, int font_nr, int align)
 	   gfx.sy + y, text, font_nr);
 }
 
-void DrawTextAligned(int x, int y, char *text, int font_nr, int align)
-{
-  DrawText(ALIGNED_XPOS(x, getTextWidth(text, font_nr), align),
-	   y, text, font_nr);
-}
-
 void DrawText(int x, int y, char *text, int font_nr)
 {
   int mask_mode = BLIT_OPAQUE;
@@ -357,11 +351,24 @@ char *GetTextBufferFromFile(char *filename, int max_lines)
   while (!checkEndOfFile(file) && num_lines < max_lines)
   {
     char line[MAX_LINE_LEN];
+    char *line_ptr;
+    int line_len;
 
     // read next line of input file
     if (!getStringFromFile(file, line, MAX_LINE_LEN))
       break;
 
+    line_len = strlen(line);
+
+    // cut trailing line break (this can be newline and/or carriage return)
+    for (line_ptr = &line[line_len]; line_ptr >= line; line_ptr--)
+      if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0')
+	*line_ptr = '\0';
+
+    // re-add newline (so the result is terminated by newline, but not CR/LF)
+    if (strlen(line) != line_len)
+      strcat(line, "\n");
+
     buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1);
 
     strcat(buffer, line);
@@ -371,6 +378,15 @@ char *GetTextBufferFromFile(char *filename, int max_lines)
 
   closeFile(file);
 
+  if (getTextEncoding(buffer) == TEXT_ENCODING_UTF_8)
+  {
+    char *body_latin1 = getLatin1FromUTF8(buffer);
+
+    checked_free(buffer);
+
+    buffer = body_latin1;
+  }
+
   return buffer;
 }
 
@@ -388,6 +404,9 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
     char *word_ptr;
     int word_len;
 
+    if (strEqual(text_ptr, "  "))	// special case: force line break
+      buffer_filled = TRUE;
+
     // skip leading whitespaces
     while (*text_ptr == ' ' || *text_ptr == '\t')
       text_ptr++;
@@ -497,10 +516,11 @@ static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr,
     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 line_spacing, int mask_mode, boolean autowrap,
-		   boolean centered, boolean parse_comments)
+static int DrawTextBufferExt(int x, int y, char *text_buffer, 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,
+			     boolean is_text_area)
 {
   char buffer[line_length + 1];
   int buffer_len;
@@ -532,8 +552,16 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
 
     // copy next line from text buffer to line buffer (nearly fgets() style)
     for (i = 0; i < num_line_chars && *text_buffer; i++)
+    {
       if ((line[i] = *text_buffer++) == '\n')
+      {
+	// in text areas, 'line_length' sized lines cause additional empty line
+	if (i == line_length && is_text_area)
+	  text_buffer--;
+
 	break;
+      }
+    }
     line[i] = '\0';
 
     // prevent 'num_line_chars' sized lines to cause additional empty line
@@ -646,6 +674,28 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
   return current_line;
 }
 
+int DrawTextArea(int x, int y, char *text_buffer, 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)
+{
+  return DrawTextBufferExt(x, y, text_buffer, font_nr,
+			   line_length, cut_length, max_lines,
+			   line_spacing, mask_mode, autowrap,
+			   centered, parse_comments, TRUE);
+}
+
+int DrawTextBuffer(int x, int y, char *text_buffer, 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)
+{
+  return DrawTextBufferExt(x, y, text_buffer, font_nr,
+			   line_length, cut_length, max_lines,
+			   line_spacing, mask_mode, autowrap,
+			   centered, parse_comments, FALSE);
+}
+
 int DrawTextBufferS(int x, int y, char *text_buffer, int font_nr,
 		    int line_length, int cut_length, int max_lines,
 		    int line_spacing, int mask_mode, boolean autowrap,