projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020407-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
x11.c
diff --git
a/src/libgame/x11.c
b/src/libgame/x11.c
index 6adfc11d4787855eb2c9e47923c33065f5a538a2..cfa0ce78857abc3ee46afc846e42bd63b201cf45 100644
(file)
--- a/
src/libgame/x11.c
+++ b/
src/libgame/x11.c
@@
-14,6
+14,7
@@
#include "system.h"
#include "pcx.h"
#include "misc.h"
#include "system.h"
#include "pcx.h"
#include "misc.h"
+#include "setup.h"
#if defined(TARGET_X11)
#if defined(TARGET_X11)
@@
-144,7
+145,7
@@
static DrawWindow *X11InitWindow()
icon_pic.picture_filename);
#endif
if (XReadBitmapFile(display, new_window->drawable,
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'",
&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,
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'",
&icon_width, &icon_height, &iconmask_pixmap,
&icon_hot_x, &icon_hot_y) != BitmapSuccess)
Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
@@
-231,9
+232,20
@@
static DrawWindow *X11InitWindow()
return new_window;
}
return new_window;
}
+static void SetImageDimensions(Bitmap *bitmap)
+{
+ Window root;
+ int x, y;
+ unsigned int border_width, depth;
+
+ XGetGeometry(display, bitmap->drawable, &root, &x, &y,
+ &bitmap->width, &bitmap->height, &border_width, &depth);
+}
+
Bitmap *X11LoadImage(char *filename)
{
Bitmap *new_bitmap = CreateBitmapStruct();
Bitmap *X11LoadImage(char *filename)
{
Bitmap *new_bitmap = CreateBitmapStruct();
+ char *error = "Read_PCX_to_Pixmap(): %s '%s'";
int pcx_err;
#if defined(PLATFORM_MSDOS)
int pcx_err;
#if defined(PLATFORM_MSDOS)
@@
-247,28
+259,46
@@
Bitmap *X11LoadImage(char *filename)
case PCX_Success:
break;
case PCX_OpenFailed:
case PCX_Success:
break;
case PCX_OpenFailed:
- Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
+ SetError(error, "cannot open PCX file", filename);
+ return NULL;
case PCX_ReadFailed:
case PCX_ReadFailed:
- Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
+ SetError(error, "cannot read PCX file", filename);
+ return NULL;
case PCX_FileInvalid:
case PCX_FileInvalid:
- Error(ERR_EXIT, "invalid PCX file '%s'", filename);
+ SetError(error, "invalid PCX file", filename);
+ return NULL;
case PCX_NoMemory:
case PCX_NoMemory:
- Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
+ SetError(error, "not enough memory for PCX file", filename);
+ return NULL;
case PCX_ColorFailed:
case PCX_ColorFailed:
- Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
+ SetError(error, "cannot get colors for PCX file", filename);
+ return NULL;
+ case PCX_OtherError:
+ /* this should already have called SetError() */
+ return NULL;
default:
default:
- break;
+ SetError(error, "unknown error reading PCX file", filename);
+ return NULL;
}
if (!new_bitmap->drawable)
}
if (!new_bitmap->drawable)
- Error(ERR_EXIT, "cannot get graphics for '%s'", filename);
+ {
+ SetError("X11LoadImage(): cannot get graphics for '%s'", filename);
+ return NULL;
+ }
if (!new_bitmap->clip_mask)
if (!new_bitmap->clip_mask)
- Error(ERR_EXIT, "cannot get clipmask for '%s'", filename);
+ {
+ SetError("X11LoadImage(): cannot get clipmask for '%s'", filename);
+ return NULL;
+ }
/* set GraphicContext inheritated from Window */
new_bitmap->gc = window->gc;
/* set GraphicContext inheritated from Window */
new_bitmap->gc = window->gc;
+ /* set image width and height */
+ SetImageDimensions(new_bitmap);
+
return new_bitmap;
}
return new_bitmap;
}