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

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 7d33a623..d8356fbb 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -12,6 +12,7 @@
 ***********************************************************/
 
 #include "system.h"
+#include "pcx.h"
 #include "misc.h"
 
 
@@ -97,7 +98,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;
@@ -147,22 +150,24 @@ static DrawWindow *X11InitWindow()
 	  options.ro_base_directory, 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,
+		      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,
 	  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,
+		      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 +239,45 @@ static DrawWindow *X11InitWindow()
   return new_window;
 }
 
+Bitmap *X11LoadImage(char *filename)
+{
+  Bitmap *new_bitmap = CreateBitmapStruct();
+  int pcx_err;
+
+#if defined(PLATFORM_MSDOS)
+  rest(100);
+#endif
+
+  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:
+      Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
+    case PCX_ReadFailed:
+      Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
+    case PCX_FileInvalid:
+      Error(ERR_EXIT, "invalid PCX file '%s'", filename);
+    case PCX_NoMemory:
+      Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
+    case PCX_ColorFailed:
+      Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
+    default:
+      break;
+  }
+
+  if (!new_bitmap->drawable)
+    Error(ERR_EXIT, "cannot get graphics for '%s'", filename);
+
+  if (!new_bitmap->clip_mask)
+    Error(ERR_EXIT, "cannot get clipmask for '%s'", filename);
+
+  /* set GraphicContext inheritated from Window */
+  new_bitmap->gc = window->gc;
+
+  return new_bitmap;
+}
+
 #endif /* TARGET_X11 */