X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=6b5f03e0e521529b36f5f9b088342cd3cb029459;hb=86b0ea5594dc5a9db7ac5d71fa2b7487a4fc1f9d;hp=890d1886a711ab00751b50798ac98495241a0965;hpb=5a5342a6ab48037839b783adc4f3304331834a8c;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 890d1886..6b5f03e0 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -22,44 +22,16 @@
 /* font functions                                                            */
 /* ========================================================================= */
 
-#define NUM_FONT_CHARS		(FONT_LINES_PER_FONT * FONT_CHARS_PER_LINE)
-
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
 static GC	font_clip_gc = None;
 
 static void InitFontClipmasks()
 {
-  static boolean clipmasks_initialized = FALSE;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
   GC copy_clipmask_gc;
   int i, j;
 
-  if (gfx.num_fonts == 0 || gfx.font_bitmap_info[0].bitmap == NULL)
-    return;
-
-  if (!clipmasks_initialized)
-  {
-    for (i=0; i < gfx.num_fonts; i++)
-      gfx.font_bitmap_info[i].clip_mask = NULL;
-
-    clipmasks_initialized = TRUE;
-  }
-
-  for (i=0; i < gfx.num_fonts; i++)
-  {
-    if (gfx.font_bitmap_info[i].clip_mask)
-      for (j=0; j < NUM_FONT_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;
-  }
-
-  if (font_clip_gc)
-    XFreeGC(display, font_clip_gc);
-  font_clip_gc = None;
-
   /* 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
@@ -84,14 +56,14 @@ static void InitFontClipmasks()
       continue;
 
     gfx.font_bitmap_info[i].clip_mask =
-      checked_calloc(NUM_FONT_CHARS * sizeof(Pixmap));
+      checked_calloc(gfx.font_bitmap_info[i].num_chars * sizeof(Pixmap));
 
-    for (j=0; j < NUM_FONT_CHARS; j++)
+    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 % FONT_CHARS_PER_LINE;
-      int ypos = j / FONT_CHARS_PER_LINE;
+      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;
@@ -107,6 +79,31 @@ static void InitFontClipmasks()
 
   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,
@@ -121,6 +118,18 @@ void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
 #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);
+}
+
 int getFontWidth(int font_nr)
 {
   int font_bitmap_id = gfx.select_font_function(font_nr);
@@ -135,17 +144,49 @@ int getFontHeight(int font_nr)
   return gfx.font_bitmap_info[font_bitmap_id].height;
 }
 
+int getTextWidth(char *text, int font_nr)
+{
+  return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0);
+}
+
+static char getFontCharPosition(int font_nr, char c)
+{
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+  struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
+  boolean default_font = (font->num_chars == DEFAULT_NUM_CHARS_PER_FONT);
+  int font_pos = c - 32;
+
+  /* map some special characters to their ascii values in default font */
+  if (default_font)
+    font_pos = MAP_FONT_ASCII(c) - 32;
+
+  /* this allows dynamic special characters together with special font */
+  if (font_pos < 0 || font_pos >= font->num_chars)
+    font_pos = 0;
+
+  return font_pos;
+}
+
+void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y)
+{
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+  struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
+  int font_pos = getFontCharPosition(font_nr, c);
+
+  *bitmap = font->bitmap;
+  *x = font->src_x + (font_pos % font->num_chars_per_line) * font->width;
+  *y = font->src_y + (font_pos / font->num_chars_per_line) * font->height;
+}
+
 void DrawInitText(char *text, int ypos, int font_nr)
 {
   if (window &&
       gfx.num_fonts > 0 &&
       gfx.font_bitmap_info[font_nr].bitmap != NULL)
   {
-    int text_width = strlen(text) * getFontWidth(font_nr);
-
     ClearRectangle(window, 0, ypos, video.width, getFontHeight(font_nr));
-    DrawTextExt(window, (video.width - text_width) / 2, ypos, text, font_nr,
-		FONT_OPAQUE);
+    DrawTextExt(window, (video.width - getTextWidth(text, font_nr)) / 2, ypos,
+		text, font_nr, BLIT_OPAQUE);
     FlushDisplay();
   }
 }
@@ -162,7 +203,7 @@ void DrawTextFCentered(int y, int font_nr, char *format, ...)
   if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
     Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting");
 
-  DrawText(gfx.sx + (gfx.sxsize - strlen(buffer) * getFontWidth(font_nr)) / 2,
+  DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2,
 	   gfx.sy + y, buffer, font_nr);
 }
 
@@ -183,10 +224,10 @@ void DrawTextF(int x, int y, int font_nr, char *format, ...)
 
 void DrawText(int x, int y, char *text, int font_nr)
 {
-  int mask_mode = FONT_OPAQUE;
+  int mask_mode = BLIT_OPAQUE;
 
   if (DrawingOnBackground(x, y))
-    mask_mode = FONT_MASKED;
+    mask_mode = BLIT_ON_BACKGROUND;
 
   DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
 
@@ -201,7 +242,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
 {
   int font_bitmap_id = gfx.select_font_function(font_nr);
   struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
-  boolean print_inverse = FALSE;
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  char *text_ptr = text;
 
   if (font->bitmap == NULL)
     return;
@@ -210,84 +255,98 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
   dst_x += font->draw_x;
   dst_y += font->draw_y;
 
-  while (*text)
+  while (*text_ptr)
   {
-    char c = *text++;
+    char c = *text_ptr++;
 
-    if (c == '~')
-    {
-      print_inverse = TRUE;
-      continue;
-    }
+    if (c == '\n')
+      c = ' ';		/* print space instaed of newline */
 
-    if (c >= 'a' && c <= 'z')
-      c = 'A' + (c - 'a');
-    else if (c == 'ä' || c == 'Ä')
-      c = 91;
-    else if (c == 'ö' || c == 'Ö')
-      c = 92;
-    else if (c == 'ü' || c == 'Ü')
-      c = 93;
-    else if (c == '[' || c == ']')	/* map to normal braces */
-      c = (c == '[' ? '(' : ')');
-    else if (c == '\\')			/* bad luck ... */
-      c = '/';
-
-    if ((c >= 32 && c <= 95) || c == '°' || c == '´' || c == '|')
-    {
-      int src_x= font->src_x + ((c - 32) % FONT_CHARS_PER_LINE) * font->width;
-      int src_y= font->src_y + ((c - 32) / FONT_CHARS_PER_LINE) * font->height;
+    getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
 
-      if (c == '°' || c == '´' || c == '|')	/* map '°' and 'TM' signs */
+    if (mask_mode == BLIT_INVERSE)	/* special mode for text gadgets */
+    {
+      /* first step: draw solid colored rectangle (use "cursor" character) */
+      if (strlen(text) == 1)	/* only one char inverted => draw cursor */
       {
-	src_x = font->src_x + FONT_CHARS_PER_LINE * font->width;
-	src_y = font->src_y + (c == '°' ? 1 : c == '´' ? 2 : 3) * font->height;
-      }
+	Bitmap *cursor_bitmap;
+	int cursor_x, cursor_y;
 
-      if (print_inverse)	/* special mode for text gadgets */
-      {
-	/* first step: draw solid colored rectangle (use "cursor" character) */
-	BlitBitmap(font->bitmap, dst_bitmap,
-		   font->src_x + FONT_CHARS_PER_LINE * font->width,
-		   font->src_y + 3 * font->height,
-		   font->width, font->height, dst_x, dst_y);
-
-	/* second step: draw masked black rectangle (use "space" character) */
-	SetClipOrigin(font->bitmap, font->bitmap->stored_clip_gc,
-		      dst_x - src_x, dst_y - src_y);
-	BlitBitmapMasked(font->bitmap, dst_bitmap,
-			 0, 0, font->width, font->height, dst_x, dst_y);
+	getFontCharSource(font_nr, FONT_ASCII_CURSOR, &cursor_bitmap,
+			  &cursor_x, &cursor_y);
+
+	BlitBitmap(cursor_bitmap, dst_bitmap, cursor_x, cursor_y,
+		   font_width, font_height, dst_x, dst_y);
       }
-      else if (mask_mode == FONT_MASKED)
+
+#if defined(TARGET_SDL)
+      /* second step: draw masked inverted character */
+      SDLCopyInverseMasked(src_bitmap, dst_bitmap, src_x, src_y,
+			   font_width, font_height, dst_x, dst_y);
+#else
+      /* second step: draw masked black rectangle (use "space" character) */
+      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
+		    dst_x - src_x, dst_y - src_y);
+      BlitBitmapMasked(src_bitmap, dst_bitmap, 0, 0,
+		       font_width, font_height, dst_x, dst_y);
+#endif
+    }
+    else if (mask_mode == BLIT_MASKED || mask_mode == BLIT_ON_BACKGROUND)
+    {
+      if (mask_mode == BLIT_ON_BACKGROUND)
       {
 	/* clear font character background */
 	ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y,
-				   font->width, font->height);
+				   font_width, font_height);
+      }
 
 #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
-	/* use special font tile clipmasks */
-	{
-	  int font_char = (c >= 32 && c <= 95 ? c - 32 : 0);
-
-	  SetClipMask(font->bitmap, font_clip_gc,
-		      font->clip_mask[font_char]);
-	  SetClipOrigin(font->bitmap, font_clip_gc, dst_x, dst_y);
-	}
+      /* 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(font->bitmap, font->bitmap->stored_clip_gc,
-		      dst_x - src_x, dst_y - src_y);
+      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
+		    dst_x - src_x, dst_y - src_y);
 #endif
 
-	BlitBitmapMasked(font->bitmap, dst_bitmap, src_x, src_y,
-			 font->width, font->height, dst_x, dst_y);
-      }
-      else	/* normal, non-masked font blitting */
-      {
-	BlitBitmap(font->bitmap, dst_bitmap, src_x, src_y,
-		   font->width, font->height, dst_x, dst_y);
-      }
+      BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y,
+		       font_width, font_height, dst_x, dst_y);
     }
+    else	/* normal, non-masked font blitting */
+    {
+      BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y,
+		 font_width, font_height, dst_x, dst_y);
+    }
+
+    dst_x += font_width;
+  }
+}
+
+void DrawTextToTextArea(int x, int y, char *text, int font_nr,
+			int area_xsize, int area_ysize)
+{
+  int area_line = 0;
+  int font_height = getFontHeight(font_nr);
+
+  if (text == NULL)
+    return;
+
+  while (*text && area_line < area_ysize)
+  {
+    char buffer[MAX_OUTPUT_LINESIZE + 1];
+    int i;
+
+    for (i=0; i < area_xsize && *text; i++)
+      if ((buffer[i] = *text++) == '\n')
+	break;
+    buffer[i] = '\0';
+
+    DrawText(x, y + area_line * font_height, buffer, font_nr);
 
-    dst_x += font->width;
+    area_line++;
   }
 }