rnd-20020803-1-src

[rocksndiamonds.git] / src / libgame / x11.c

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index fd1d8b80c7f44b15e5af4f56c6e65af627edaeb3..4ef1bd16f258cbb3c6eb3cb206cdf98bdd870410 100644 (file)
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment                      *
+* (c) 1994-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -14,6 +14,7 @@
 #include "system.h"
 #include "pcx.h"
 #include "misc.h"
+#include "setup.h"
 
 
 #if defined(TARGET_X11)
@@ -144,7 +145,7 @@ static DrawWindow *X11InitWindow()
          icon_pic.picture_filename);
 #endif
   if (XReadBitmapFile(display, new_window->drawable,
-                     program.x11_icon_filename,
+                     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'",
@@ -155,7 +156,7 @@ static DrawWindow *X11InitWindow()
          icon_pic.picturemask_filename);
 #endif
   if (XReadBitmapFile(display, new_window->drawable,
-                     program.x11_iconmask_filename,
+                     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'",
@@ -231,16 +232,29 @@ 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;
 
-#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)
@@ -285,6 +299,9 @@ Bitmap *X11LoadImage(char *filename)
   /* set GraphicContext inheritated from Window */
   new_bitmap->gc = window->gc;
 
+  /* set image width and height */
+  SetImageDimensions(new_bitmap);
+
   return new_bitmap;
 }