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

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 2fdd2c20..6b5f03e0 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -15,74 +15,199 @@
 #include <stdarg.h>
 
 #include "text.h"
+#include "misc.h"
 
 
 /* ========================================================================= */
-/* exported variables                                                        */
+/* font functions                                                            */
 /* ========================================================================= */
 
-struct FontInfo		font;
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+static GC	font_clip_gc = None;
 
+static void InitFontClipmasks()
+{
+  XGCValues clip_gc_values;
+  unsigned long clip_gc_valuemask;
+  GC copy_clipmask_gc;
+  int i, j;
+
+  /* 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
+     be set much faster with XSetClipOrigin() and speed things up a lot. */
+
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_valuemask = GCGraphicsExposures;
+  font_clip_gc = XCreateGC(display, window->drawable,
+			   clip_gc_valuemask, &clip_gc_values);
+
+  /* create graphic context structures needed for clipping */
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_valuemask = GCGraphicsExposures;
+  copy_clipmask_gc = XCreateGC(display,
+			       gfx.font_bitmap_info[0].bitmap->clip_mask,
+			       clip_gc_valuemask, &clip_gc_values);
+
+  /* create only those clipping Pixmaps we really need */
+  for (i=0; i < gfx.num_fonts; i++)
+  {
+    if (gfx.font_bitmap_info[i].bitmap == NULL)
+      continue;
 
-/* ========================================================================= */
-/* font functions                                                            */
-/* ========================================================================= */
+    gfx.font_bitmap_info[i].clip_mask =
+      checked_calloc(gfx.font_bitmap_info[i].num_chars * sizeof(Pixmap));
+
+    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 % 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;
+      int src_y = gfx.font_bitmap_info[i].src_y + ypos * height;
+
+      gfx.font_bitmap_info[i].clip_mask[j] =
+	XCreatePixmap(display, window->drawable, width, height, 1);
+
+      XCopyArea(display, src_pixmap, gfx.font_bitmap_info[i].clip_mask[j],
+		copy_clipmask_gc, src_x, src_y, width, height, 0, 0);
+    }
+  }
+
+  XFreeGC(display, copy_clipmask_gc);
+}
 
-void InitFontInfo(Bitmap *bitmap_big, Bitmap *bitmap_medium,
-		  Bitmap *bitmap_small, Bitmap *bitmap_tile)
+static void FreeFontClipmasks()
 {
-  font.bitmap_big = bitmap_big;
-  font.bitmap_medium = bitmap_medium;
-  font.bitmap_small = bitmap_small;
-  font.bitmap_tile = bitmap_tile;
+  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,
+		  int (*select_font_function)(int))
+{
+  gfx.num_fonts = num_fonts;
+  gfx.font_bitmap_info = font_bitmap_info;
+  gfx.select_font_function = select_font_function;
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  InitFontClipmasks();
+#endif
 }
 
-int getFontWidth(int font_size, int font_type)
+void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info)
 {
-  return (font_size == FS_BIG ? FONT1_XSIZE :
-	  font_size == FS_MEDIUM ? FONT6_XSIZE :
-	  font_type == FC_SPECIAL1 ? FONT3_XSIZE :
-	  font_type == FC_SPECIAL2 ? FONT4_XSIZE :
-	  font_type == FC_SPECIAL3 ? FONT5_XSIZE :
-	  FONT2_XSIZE);
+  if (font_bitmap_info == NULL)
+    return;
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  FreeFontClipmasks();
+#endif
+
+  free(font_bitmap_info);
 }
 
-int getFontHeight(int font_size, int font_type)
+int getFontWidth(int font_nr)
 {
-  return (font_size == FS_BIG ? FONT1_YSIZE :
-	  font_size == FS_MEDIUM ? FONT6_YSIZE :
-	  font_type == FC_SPECIAL1 ? FONT3_YSIZE :
-	  font_type == FC_SPECIAL2 ? FONT4_YSIZE :
-	  font_type == FC_SPECIAL3 ? FONT5_YSIZE :
-	  FONT2_YSIZE);
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+
+  return gfx.font_bitmap_info[font_bitmap_id].width;
 }
 
-void DrawInitText(char *text, int ypos, int color)
+int getFontHeight(int font_nr)
 {
-  if (window && font.bitmap_small)
+  int font_bitmap_id = gfx.select_font_function(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)
   {
-    ClearRectangle(window, 0, ypos, video.width, FONT2_YSIZE);
-    DrawTextExt(window, (video.width - strlen(text) * FONT2_XSIZE)/2,
-		ypos, text, FS_SMALL, color);
+    ClearRectangle(window, 0, ypos, video.width, getFontHeight(font_nr));
+    DrawTextExt(window, (video.width - getTextWidth(text, font_nr)) / 2, ypos,
+		text, font_nr, BLIT_OPAQUE);
     FlushDisplay();
   }
 }
 
-void DrawTextFCentered(int y, int font_type, char *format, ...)
+void DrawTextFCentered(int y, int font_nr, char *format, ...)
 {
   char buffer[MAX_OUTPUT_LINESIZE + 1];
-  int font_width = getFontWidth(FS_SMALL, font_type);
   va_list ap;
 
   va_start(ap, format);
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(gfx.sx + (gfx.sxsize - strlen(buffer) * font_width) / 2,
-	   gfx.sy + y, buffer, FS_SMALL, font_type);
+  if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
+    Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting");
+
+  DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2,
+	   gfx.sy + y, buffer, font_nr);
 }
 
-void DrawTextF(int x, int y, int font_type, char *format, ...)
+void DrawTextF(int x, int y, int font_nr, char *format, ...)
 {
   char buffer[MAX_OUTPUT_LINESIZE + 1];
   va_list ap;
@@ -91,12 +216,20 @@ void DrawTextF(int x, int y, int font_type, char *format, ...)
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(gfx.sx + x, gfx.sy + y, buffer, FS_SMALL, font_type);
+  if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
+    Error(ERR_EXIT, "string too long in DrawTextF() -- aborting");
+
+  DrawText(gfx.sx + x, gfx.sy + y, buffer, font_nr);
 }
 
-void DrawText(int x, int y, char *text, int font_size, int font_type)
+void DrawText(int x, int y, char *text, int font_nr)
 {
-  DrawTextExt(drawto, x, y, text, font_size, font_type);
+  int mask_mode = BLIT_OPAQUE;
+
+  if (DrawingOnBackground(x, y))
+    mask_mode = BLIT_ON_BACKGROUND;
+
+  DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
 
   if (x < gfx.dx)
     redraw_mask |= REDRAW_FIELD;
@@ -104,101 +237,116 @@ void DrawText(int x, int y, char *text, int font_size, int font_type)
     redraw_mask |= REDRAW_DOOR_1;
 }
 
-void DrawTextExt(DrawBuffer *bitmap, int x, int y,
-		 char *text, int font_size, int font_type)
+void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
+		 int font_nr, int mask_mode)
 {
-  Bitmap *font_bitmap;
-  int font_width, font_height, font_starty;
-  boolean print_inverse = FALSE;
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+  struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
+  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;
 
-  if (font_size != FS_SMALL && font_size != FS_BIG && font_size != FS_MEDIUM)
-    font_size = FS_SMALL;
-  if (font_type < FC_RED || font_type > FC_SPECIAL3)
-    font_type = FC_RED;
+  /* add offset for drawing font characters */
+  dst_x += font->draw_x;
+  dst_y += font->draw_y;
 
-  font_width = getFontWidth(font_size, font_type);
-  font_height = getFontHeight(font_size, font_type);
+  while (*text_ptr)
+  {
+    char c = *text_ptr++;
 
-  font_bitmap = (font_type == FC_SPECIAL2	? font.bitmap_tile	:
-		 font_size == FS_BIG		? font.bitmap_big	:
-		 font_size == FS_MEDIUM		? font.bitmap_medium	:
-		 font_size == FS_SMALL		? font.bitmap_small	:
-		 font.bitmap_small);
+    if (c == '\n')
+      c = ' ';		/* print space instaed of newline */
 
-  if (font_bitmap == NULL)
-    return;
+    getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
 
-  if (font_type == FC_SPECIAL2)
-    font_starty = (font_size == FS_BIG ? 0 : FONT1_YSIZE) * 5;
-  else
-    font_starty = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
-				font_size == FS_MEDIUM ? FONT6_YSIZE :
-				FONT2_YSIZE) *
-		   FONT_LINES_PER_FONT);
+    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 */
+      {
+	Bitmap *cursor_bitmap;
+	int cursor_x, cursor_y;
 
-  if (font_type == FC_SPECIAL3)
-    font_starty -= FONT2_YSIZE * FONT_LINES_PER_FONT;
+	getFontCharSource(font_nr, FONT_ASCII_CURSOR, &cursor_bitmap,
+			  &cursor_x, &cursor_y);
 
-  while (*text)
-  {
-    char c = *text++;
+	BlitBitmap(cursor_bitmap, dst_bitmap, cursor_x, cursor_y,
+		   font_width, font_height, dst_x, dst_y);
+      }
 
-    if (c == '~' && font_size == FS_SMALL)
-    {
-      print_inverse = TRUE;
-      continue;
+#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
     }
-
-    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 == '´')
+    else if (mask_mode == BLIT_MASKED || mask_mode == BLIT_ON_BACKGROUND)
     {
-      int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
-      int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_starty;
-      int dest_x = x, dest_y = y;
-
-      if (c == '°' || c == '´')		/* map '°' and 'TM' signs */
+      if (mask_mode == BLIT_ON_BACKGROUND)
       {
-	if (font_type == FC_SPECIAL2)
-	{
-	  src_x = (c == '°' ? 1 : 2) * font_width;
-	  src_y = 4 * font_height;
-	}
-	else
-	{
-	  src_x = FONT_CHARS_PER_LINE * font_width;
-	  src_y = (c == '°' ? 1 : 2) * font_height + font_starty;
-	}
+	/* clear font character background */
+	ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y,
+				   font_width, font_height);
       }
 
-      if (print_inverse)
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+      /* use special font tile clipmasks */
       {
-	BlitBitmap(font_bitmap, bitmap,
-		   FONT_CHARS_PER_LINE * font_width,
-		   3 * font_height + font_starty,
-		   font_width, font_height, x, y);
-
-	SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc,
-		      dest_x - src_x, dest_y - src_y);
-	BlitBitmapMasked(font_bitmap, bitmap,
-			 0, 0, font_width, font_height, dest_x, dest_y);
+	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
-	BlitBitmap(font_bitmap, bitmap,
-		   src_x, src_y, font_width, font_height, dest_x, dest_y);
+#else
+      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
+		    dst_x - src_x, dst_y - src_y);
+#endif
+
+      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);
     }
 
-    x += font_width;
+    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);
+
+    area_line++;
   }
 }