void InitProgramInfo(char *unix_userdata_directory, char *program_title,
char *window_title, char *icon_title,
- char *x11_icon_basename, char *x11_iconmask_basename,
- char *msdos_pointer_basename,
+ char *x11_icon_filename, char *x11_iconmask_filename,
+ char *msdos_pointer_filename,
char *cookie_prefix, char *filename_prefix,
int program_version)
{
- char *x11_icon_filename =
- getPath2(options.graphics_directory, x11_icon_basename);
- char *x11_iconmask_filename =
- getPath2(options.graphics_directory, x11_iconmask_basename);
- char *msdos_pointer_filename =
- getPath2(options.graphics_directory, msdos_pointer_basename);
-
#if defined(PLATFORM_UNIX)
program.userdata_directory = unix_userdata_directory;
#else
#if defined(TARGET_SDL)
SDL_QuitSubSystem(SDL_INIT_VIDEO);
#else
+
if (display)
XCloseDisplay(display);
#endif
return new_bitmap;
}
-inline void FreeBitmap(Bitmap *bitmap)
+inline static void FreeBitmapPointers(Bitmap *bitmap)
{
if (bitmap == NULL)
return;
SDL_FreeSurface(bitmap->surface);
if (bitmap->surface_masked)
SDL_FreeSurface(bitmap->surface_masked);
+ bitmap->surface = NULL;
+ bitmap->surface_masked = NULL;
#else
+ /* The X11 version seems to have a memory leak here -- although
+ "XFreePixmap()" is called, the correspondig memory seems not
+ to be freed (according to "ps"). The SDL version apparently
+ does not have this problem. */
+
if (bitmap->drawable)
XFreePixmap(display, bitmap->drawable);
if (bitmap->clip_mask)
XFreePixmap(display, bitmap->clip_mask);
if (bitmap->stored_clip_gc)
XFreeGC(display, bitmap->stored_clip_gc);
+ /* the other GCs are only pointers to GCs used elsewhere */
+ bitmap->drawable = None;
+ bitmap->clip_mask = None;
+ bitmap->stored_clip_gc = None;
#endif
if (bitmap->source_filename)
free(bitmap->source_filename);
+ bitmap->source_filename = NULL;
+}
+
+inline static void TransferBitmapPointers(Bitmap *src_bitmap,
+ Bitmap *dst_bitmap)
+{
+ if (src_bitmap == NULL || dst_bitmap == NULL)
+ return;
+
+ FreeBitmapPointers(dst_bitmap);
+
+ *dst_bitmap = *src_bitmap;
+}
+
+inline void FreeBitmap(Bitmap *bitmap)
+{
+ if (bitmap == NULL)
+ return;
+
+ FreeBitmapPointers(bitmap);
free(bitmap);
}
new_bitmap = X11LoadImage(filename);
#endif
+ new_bitmap->source_filename = getStringCopy(filename);
+
return new_bitmap;
}
Bitmap *LoadCustomImage(char *basename)
{
- char *filename = getStringCopy(getCustomImageFilename(basename));
+ char *filename = getCustomImageFilename(basename);
Bitmap *new_bitmap;
+ if (filename == NULL)
+ Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
+
if ((new_bitmap = LoadImage(filename)) == NULL)
Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
- new_bitmap->source_filename = filename;
-
return new_bitmap;
}
+void ReloadCustomImage(Bitmap *bitmap, char *basename)
+{
+ char *filename = getCustomImageFilename(basename);
+ Bitmap *new_bitmap;
+
+ if (filename == NULL) /* (should never happen) */
+ {
+ Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", basename);
+ return;
+ }
+
+ if (strcmp(filename, bitmap->source_filename) == 0)
+ {
+ /* The old and new image are the same (have the same filename and path).
+ This usually means that this image does not exist in this graphic set
+ and a fallback to the existing image is done. */
+
+ return;
+ }
+
+ if ((new_bitmap = LoadImage(filename)) == NULL)
+ {
+ Error(ERR_WARN, "LoadImage() failed: %s", GetError());
+ return;
+ }
+
+ if (bitmap->width != new_bitmap->width ||
+ bitmap->height != new_bitmap->height)
+ {
+ Error(ERR_WARN, "ReloadCustomImage: new image has wrong dimensions");
+ FreeBitmap(new_bitmap);
+ return;
+ }
+
+ TransferBitmapPointers(new_bitmap, bitmap);
+ free(new_bitmap);
+}
+
/* ========================================================================= */
/* audio functions */