X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=42c3384a0cd6c8f518b97138750a370de561134c;hb=391f8c019bdd5591015f8f310d97cf077de93fa2;hp=c841ffed244c9fc66fecc62feda0c463a59120df;hpb=a95264fc39b6eae2473bfd6521c7bf3eef5af804;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index c841ffed..42c3384a 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -47,7 +47,7 @@ Image *newImage(unsigned int width, unsigned int height, unsigned int depth)
   image->bytes_per_row = width * bytes_per_pixel;
 
   image->rgb.used = 0;
-  for (i=0; i<MAX_COLORS; i++)
+  for (i = 0; i < MAX_COLORS; i++)
     image->rgb.color_used[i] = FALSE;
 
   image->type = (depth < 8 ? IMAGETYPE_BITMAP :
@@ -115,14 +115,14 @@ static Pixmap Image_to_Mask(Image *image, Display *display, Window window)
    * the corresponding image pixmap
    */
 
-  for (y=0; y<image->height; y++)
+  for (y = 0; y < image->height; y++)
   {
     bitmask = 0x01;		/* start with leftmost bit in the byte     */
     dst_ptr2 = dst_ptr;		/* start with leftmost byte in the row     */
 
-    for (x=0; x<image->width; x++)
+    for (x = 0; x < image->width; x++)
     {
-      for (i=0; i<image->bytes_per_pixel; i++)
+      for (i = 0; i < image->bytes_per_pixel; i++)
 	if (*src_ptr++)		/* source pixel solid? (pixel index != 0)  */
 	  *dst_ptr2 |= bitmask;	/* then write a bit into the image mask    */
 
@@ -152,7 +152,7 @@ static int bitsPerPixelAtDepth(Display *display, int screen, int depth)
   pixmap_format = XListPixmapFormats(display, &num_pixmap_formats);
 
   /* find format that matches the given depth */
-  for (i=0; i<num_pixmap_formats; i++)
+  for (i = 0; i < num_pixmap_formats; i++)
     if (pixmap_format[i].depth == depth)
       bits_per_pixel = pixmap_format[i].bits_per_pixel;
 
@@ -229,7 +229,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
       /* calculate number of distinct colors in each band */
 
       redcolors = greencolors = bluecolors = 1;
-      for (pixval=1; pixval; pixval <<= 1)
+      for (pixval = 1; pixval; pixval <<= 1)
       {
 	if (pixval & visual->red_mask)
 	  redcolors <<= 1;
@@ -251,7 +251,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
       redbottom = greenbottom = bluebottom = 0;
       redtop = greentop = bluetop = 0;
 
-      for (a=0; a<visual->map_entries; a++)
+      for (a = 0; a < visual->map_entries; a++)
       {
 	if (redbottom < 256)
 	  redtop = redbottom + redstep;
@@ -307,7 +307,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 
       ximageinfo->cmap = global_cmap;
 
-      for (a=0; a<MAX_COLORS; a++)
+      for (a = 0; a < MAX_COLORS; a++)
       {
 	XColor xcolor2;
 	unsigned short mask;
@@ -339,7 +339,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 	    /* allocate the rest of the color cells read/write */
 	    global_cmap_index =
 	      (Pixel *)checked_malloc(sizeof(Pixel) * NOFLASH_COLORS);
-	    for (i=0; i<NOFLASH_COLORS; i++)
+	    for (i = 0; i < NOFLASH_COLORS; i++)
 	      if (!XAllocColorCells(display, global_cmap, FALSE, NULL, 0,
 				    global_cmap_index + i, 1))
 		break;
@@ -352,7 +352,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 	    /* to minimize colormap flashing, copy default colors and try
 	       to keep them as near as possible to the old values */
 
-	    for(i=0; i<num_cmap_entries; i++)
+	    for (i = 0; i < num_cmap_entries; i++)
 	    {
 	      xcolor2.pixel = *(global_cmap_index + i);
 	      XQueryColor(display, DefaultColormap(display, screen), &xcolor2);
@@ -377,7 +377,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 
 	  while (!color_found)
 	  {
-	    for (i=num_cmap_entries-1; i>=0; i--)
+	    for (i = num_cmap_entries - 1; i >= 0; i--)
 	    {
 	      xcolor2.pixel = *(global_cmap_index + i);
 	      xcolor2 = xcolor_private[xcolor2.pixel];
@@ -464,9 +464,9 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
       {
         case IMAGETYPE_RGB:
 	{
-	  for (y=0; y<image->height; y++)		/* general case */
+	  for (y = 0; y < image->height; y++)		/* general case */
 	  {
-	    for (x=0; x<image->width; x++)
+	    for (x = 0; x < image->width; x++)
 	    {
 	      pixval = *src_ptr++;
 	      pixval =
@@ -483,9 +483,9 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 
         case IMAGETYPE_TRUECOLOR:
 	{
-	  for (y=0; y<image->height; y++)		/* general case */
+	  for (y = 0; y < image->height; y++)		/* general case */
 	  {
-	    for (x=0; x<image->width; x++)
+	    for (x = 0; x < image->width; x++)
 	    {
 	      pixval = memory_to_value(src_ptr, image->bytes_per_pixel);
 	      pixval =
@@ -515,15 +515,15 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
     {
       if (display_bytes_per_pixel == 1)		/* special case */
       {
-	for (y=0; y<image->height; y++)
-	  for (x=0; x<image->width; x++)
+	for (y = 0; y < image->height; y++)
+	  for (x = 0; x < image->width; x++)
 	    *dst_ptr++ = ximageinfo->index[c + *src_ptr++];
       }
       else					/* general case */
       {
-	for (y=0; y<image->height; y++)
+	for (y = 0; y < image->height; y++)
 	{
-	  for (x=0; x<image->width; x++)
+	  for (x = 0; x < image->width; x++)
 	  {
 	    value_to_memory(ximageinfo->index[c + *src_ptr++],
 			    dst_ptr, display_bytes_per_pixel);
@@ -560,7 +560,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
   XPutImage(ximageinfo->display, ximageinfo->pixmap, gc,
 	    ximage, 0, 0, 0, 0, ximage->width, ximage->height);
 
-  XDestroyImage(ximage);
+  X11DestroyImage(ximage);
 
   return ximageinfo;
 }
@@ -569,8 +569,8 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
   -----------------------------------------------------------------------------
   ZoomPixmap
 
-  Important note: The scaling code currently only supports scaling down the
-  image by a power of 2 -- scaling up is currently not supported at all!
+  Important note: The scaling code currently only supports scaling of the image
+  up or down by a power of 2 -- other scaling factors currently not supported!
   -----------------------------------------------------------------------------
 */
 
@@ -582,13 +582,33 @@ void ZoomPixmap(Display *display, GC gc, Pixmap src_pixmap, Pixmap dst_pixmap,
   byte *src_ptr, *dst_ptr;
   int bits_per_pixel;
   int bytes_per_pixel;
-  int x, y, i;
+  int x, y, xx, yy, i;
+#if 1
+  boolean scale_down = (src_width > dst_width);
+  int zoom_factor;
+#else
   int zoom_factor = src_width / dst_width;	/* currently very limited! */
+#endif
   int row_skip, col_skip;
 
+  if (scale_down)
+  {
+    zoom_factor = src_width / dst_width;
+
+    /* adjust source image size to integer multiple of destination size */
+    src_width  = dst_width  * zoom_factor;
+    src_height = dst_height * zoom_factor;
+  }
+  else
+  {
+    zoom_factor = dst_width / src_width;
+
+    /* no adjustment needed when scaling up (some pixels may be left blank) */
+  }
+
   /* copy source pixmap to temporary image */
-  src_ximage = XGetImage(display, src_pixmap, 0, 0,
-			 src_width, src_height, AllPlanes, ZPixmap);
+  src_ximage = XGetImage(display, src_pixmap, 0, 0, src_width, src_height,
+			 AllPlanes, ZPixmap);
 
   bits_per_pixel = src_ximage->bits_per_pixel;
   bytes_per_pixel = (bits_per_pixel + 7) / 8;
@@ -603,22 +623,48 @@ void ZoomPixmap(Display *display, GC gc, Pixmap src_pixmap, Pixmap dst_pixmap,
   src_ptr = (byte *)src_ximage->data;
   dst_ptr = (byte *)dst_ximage->data;
 
-  col_skip = (zoom_factor - 1) * bytes_per_pixel;
-  row_skip = col_skip * src_width;
+  if (scale_down)
+  {
+    col_skip = (zoom_factor - 1) * bytes_per_pixel;
+    row_skip = col_skip * src_width;
+
+    /* scale image down by scaling factor 'zoom_factor' */
+    for (y = 0; y < src_height; y += zoom_factor, src_ptr += row_skip)
+      for (x = 0; x < src_width; x += zoom_factor, src_ptr += col_skip)
+	for (i = 0; i < bytes_per_pixel; i++)
+	  *dst_ptr++ = *src_ptr++;
+  }
+  else
+  {
+    row_skip = src_width * bytes_per_pixel;
+
+    /* scale image up by scaling factor 'zoom_factor' */
+    for (y = 0; y < src_height; y++)
+    {
+      for (yy = 0; yy < zoom_factor; yy++)
+      {
+	if (yy > 0)
+	  src_ptr -= row_skip;
+
+	for (x = 0; x < src_width; x++)
+	{
+	  for (xx = 0; xx < zoom_factor; xx++)
+	    for (i = 0; i < bytes_per_pixel; i++)
+	      *dst_ptr++ = *(src_ptr + i);
 
-  /* scale image down by scaling factor 'zoom_factor' */
-  for (y=0; y < src_height; y += zoom_factor, src_ptr += row_skip)
-    for (x=0; x < src_width; x += zoom_factor, src_ptr += col_skip)
-      for (i=0; i<bytes_per_pixel; i++)
-	*dst_ptr++ = *src_ptr++;
+	  src_ptr += i;
+	}
+      }
+    }
+  }
 
   /* copy scaled image to destination pixmap */
   XPutImage(display, dst_pixmap, gc, dst_ximage, 0, 0, 0, 0,
-	    MIN(src_width, dst_width), MIN(src_height, dst_height));
+	    dst_width, dst_height);
 
   /* free temporary images */
-  XDestroyImage(src_ximage);
-  XDestroyImage(dst_ximage);
+  X11DestroyImage(src_ximage);
+  X11DestroyImage(dst_ximage);
 }
 
 void freeXImage(Image *image, XImageInfo *ximageinfo)
@@ -699,7 +745,7 @@ int Read_PCX_to_Pixmap(Display *display, Window window, GC gc, char *filename,
 
 
 /* ========================================================================= */
-/* PLATFORM INDEPENDANT IMAGE FUNCTIONS                                      */
+/* PLATFORM INDEPENDENT IMAGE FUNCTIONS                                      */
 /* ========================================================================= */
 
 struct ImageInfo
@@ -726,7 +772,7 @@ static void *Load_PCX(char *filename)
 
   if ((img_info->bitmap = LoadImage(filename)) == NULL)
   {
-    Error(ERR_WARN, "cannot read image file '%s': LoadImage() failed: %s",
+    Error(ERR_WARN, "cannot load image file '%s': LoadImage() failed: %s",
 	  filename, GetError());
     free(img_info);
     return NULL;
@@ -800,9 +846,29 @@ Bitmap *getBitmapFromImageID(int pos)
 
 char *getTokenFromImageID(int graphic)
 {
+#if 0
+  /* !!! this does not work for dynamic artwork (crash!) !!! */
   struct FileInfo *file_list = (struct FileInfo *)image_info->file_list;
 
   return file_list[graphic].token;
+#else
+  struct FileInfo *file_list = getImageListEntry(graphic);
+
+  return (file_list != NULL ? file_list->token : NULL);
+#endif
+}
+
+int getImageIDFromToken(char *token)
+{
+  struct FileInfo *file_list = image_info->file_list;
+  int num_list_entries = image_info->num_file_list_entries;
+  int i;
+
+  for (i = 0; i < num_list_entries; i++)
+    if (strcmp(file_list[i].token, token) == 0)
+      return i;
+
+  return -1;
 }
 
 char *getImageConfigFilename()
@@ -821,7 +887,7 @@ struct PropertyMapping *getImageListPropertyMapping()
 }
 
 void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
-		   struct ConfigInfo *config_suffix_list,
+		   struct ConfigTypeInfo *config_suffix_list,
 		   char **base_prefixes, char **ext1_suffixes,
 		   char **ext2_suffixes, char **ext3_suffixes,
 		   char **ignore_tokens)
@@ -842,7 +908,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   image_info->dynamic_file_list = NULL;
 
   image_info->num_suffix_list_entries = 0;
-  for (i=0; config_suffix_list[i].token != NULL; i++)
+  for (i = 0; config_suffix_list[i].token != NULL; i++)
     image_info->num_suffix_list_entries++;
 
   image_info->suffix_list = config_suffix_list;
@@ -850,23 +916,23 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   /* ---------- initialize base prefix and suffixes lists ---------- */
 
   image_info->num_base_prefixes = 0;
-  for (i=0; base_prefixes[i] != NULL; i++)
+  for (i = 0; base_prefixes[i] != NULL; i++)
     image_info->num_base_prefixes++;
 
   image_info->num_ext1_suffixes = 0;
-  for (i=0; ext1_suffixes[i] != NULL; i++)
+  for (i = 0; ext1_suffixes[i] != NULL; i++)
     image_info->num_ext1_suffixes++;
 
   image_info->num_ext2_suffixes = 0;
-  for (i=0; ext2_suffixes[i] != NULL; i++)
+  for (i = 0; ext2_suffixes[i] != NULL; i++)
     image_info->num_ext2_suffixes++;
 
   image_info->num_ext3_suffixes = 0;
-  for (i=0; ext3_suffixes[i] != NULL; i++)
+  for (i = 0; ext3_suffixes[i] != NULL; i++)
     image_info->num_ext3_suffixes++;
 
   image_info->num_ignore_tokens = 0;
-  for (i=0; ignore_tokens[i] != NULL; i++)
+  for (i = 0; ignore_tokens[i] != NULL; i++)
     image_info->num_ignore_tokens++;
 
   image_info->base_prefixes = base_prefixes;