X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=4ef1bd16f258cbb3c6eb3cb206cdf98bdd870410;hb=c9433eab5c4317ed4f89164b386a7d33562e29be;hp=7d33a62354a09b832d072fe7e38979bdc08d1604;hpb=1100054eec7c45458359fd56072341bd661f4a9c;p=rocksndiamonds.git

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 7d33a623..4ef1bd16 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment                      *
+* (c) 1994-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -12,7 +12,9 @@
 ***********************************************************/
 
 #include "system.h"
+#include "pcx.h"
 #include "misc.h"
+#include "setup.h"
 
 
 #if defined(TARGET_X11)
@@ -72,17 +74,11 @@ static void X11InitDisplay()
 
   /* got appropriate visual? */
   if (depth < 8)
-  {
-    printf("Sorry, displays with less than 8 bits per pixel not supported.\n");
-    exit(-1);
-  }
+    Error(ERR_EXIT, "X11 display not supported (less than 8 bits per pixel)");
   else if ((depth ==8 && visual->class != PseudoColor) ||
 	   (depth > 8 && visual->class != TrueColor &&
 	    visual->class != DirectColor))
-  {
-    printf("Sorry, cannot get appropriate visual.\n");
-    exit(-1);
-  }
+    Error(ERR_EXIT, "X11 display not supported (inappropriate visual)");
 #endif /* !PLATFORM_MSDOS */
 }
 
@@ -97,7 +93,9 @@ static DrawWindow *X11InitWindow()
   Pixmap icon_pixmap, iconmask_pixmap;
   unsigned int icon_width, icon_height;
   int icon_hot_x, icon_hot_y;
+#if 0
   char icon_filename[256];
+#endif
   XSizeHints size_hints;
   XWMHints wm_hints;
   XClassHint class_hints;
@@ -143,26 +141,26 @@ static DrawWindow *X11InitWindow()
 		    PropModePrepend, (unsigned char *) &delete_atom, 1);
 
 #if 0
-  sprintf(icon_filename, "%s/%s/%s",
-	  options.ro_base_directory, GRAPHICS_DIRECTORY,
+  sprintf(icon_filename, "%s/%s", options.graphics_directory,
 	  icon_pic.picture_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_icon_filename,
-		  &icon_width, &icon_height,
-		  &icon_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!icon_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+		      getCustomImageFilename(program.x11_icon_filename),
+		      &icon_width, &icon_height, &icon_pixmap,
+		      &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+	  program.x11_icon_filename);
 
 #if 0
-  sprintf(icon_filename, "%s/%s/%s",
-	  options.ro_base_directory, GRAPHICS_DIRECTORY,
+  sprintf(icon_filename, "%s/%s", options.graphics_directory,
 	  icon_pic.picturemask_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_iconmask_filename,
-		  &icon_width, &icon_height,
-		  &iconmask_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!iconmask_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+		      getCustomImageFilename(program.x11_iconmask_filename),
+		      &icon_width, &icon_height, &iconmask_pixmap,
+		      &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+	  program.x11_iconmask_filename);
 
   size_hints.width  = size_hints.min_width  = size_hints.max_width  = width;
   size_hints.height = size_hints.min_height = size_hints.max_height = height;
@@ -234,4 +232,77 @@ static DrawWindow *X11InitWindow()
   return new_window;
 }
 
+static void SetImageDimensions(Bitmap *bitmap)
+{
+#if defined(TARGET_ALLEGRO)
+  BITMAP *allegro_bitmap = (BITMAP *)(bitmap->drawable);
+
+  bitmap->width  = allegro_bitmap->w;
+  bitmap->height = allegro_bitmap->h;
+#else
+  Window root;
+  int x, y;
+  unsigned int border_width, depth;
+
+  XGetGeometry(display, bitmap->drawable, &root, &x, &y,
+	       &bitmap->width, &bitmap->height, &border_width, &depth);
+#endif
+}
+
+Bitmap *X11LoadImage(char *filename)
+{
+  Bitmap *new_bitmap = CreateBitmapStruct();
+  char *error = "Read_PCX_to_Pixmap(): %s '%s'";
+  int pcx_err;
+
+  pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename,
+			       &new_bitmap->drawable, &new_bitmap->clip_mask);
+  switch(pcx_err)
+  {
+    case PCX_Success:
+      break;
+    case PCX_OpenFailed:
+      SetError(error, "cannot open PCX file", filename);
+      return NULL;
+    case PCX_ReadFailed:
+      SetError(error, "cannot read PCX file", filename);
+      return NULL;
+    case PCX_FileInvalid:
+      SetError(error, "invalid PCX file", filename);
+      return NULL;
+    case PCX_NoMemory:
+      SetError(error, "not enough memory for PCX file", filename);
+      return NULL;
+    case PCX_ColorFailed:
+      SetError(error, "cannot get colors for PCX file", filename);
+      return NULL;
+    case PCX_OtherError:
+      /* this should already have called SetError() */
+      return NULL;
+    default:
+      SetError(error, "unknown error reading PCX file", filename);
+      return NULL;
+  }
+
+  if (!new_bitmap->drawable)
+  {
+    SetError("X11LoadImage(): cannot get graphics for '%s'", filename);
+    return NULL;
+  }
+
+  if (!new_bitmap->clip_mask)
+  {
+    SetError("X11LoadImage(): cannot get clipmask for '%s'", filename);
+    return NULL;
+  }
+
+  /* set GraphicContext inheritated from Window */
+  new_bitmap->gc = window->gc;
+
+  /* set image width and height */
+  SetImageDimensions(new_bitmap);
+
+  return new_bitmap;
+}
+
 #endif /* TARGET_X11 */