/* init/close functions */
/* ========================================================================= */
-void InitCommandName(char *argv0)
+void InitProgramInfo(char *argv0,
+ char *userdata_directory, char *program_title,
+ char *window_title, char *icon_title,
+ char *x11_icon_filename, char *x11_iconmask_filename,
+ char *msdos_pointer_filename,
+ char *cookie_prefix, char *filename_prefix,
+ int program_version)
{
program.command_basename =
(strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0);
+
+ program.userdata_directory = userdata_directory;
+ program.program_title = program_title;
+ program.window_title = window_title;
+ program.icon_title = icon_title;
+ program.x11_icon_filename = x11_icon_filename;
+ program.x11_iconmask_filename = x11_iconmask_filename;
+ program.msdos_pointer_filename = msdos_pointer_filename;
+
+ program.cookie_prefix = cookie_prefix;
+ program.filename_prefix = filename_prefix;
+
+ program.version_major = VERSION_MAJOR(program_version);
+ program.version_minor = VERSION_MINOR(program_version);
+ program.version_patch = VERSION_PATCH(program_version);
}
void InitExitFunction(void (*exit_function)(int))
{
#if defined(PLATFORM_MSDOS)
_fmode = O_BINARY;
-#endif
-
-#if !defined(PLATFORM_UNIX)
- program.userdata_directory = "userdata";
-#endif
-
-#if defined(PLATFORM_MSDOS)
initErrorFile();
#endif
#endif
}
-void InitProgramInfo(char *unix_userdata_directory, char *program_title,
- char *window_title, char *icon_title,
- char *x11_icon_filename, char *x11_iconmask_filename,
- char *msdos_pointer_filename,
- char *cookie_prefix, char *filename_prefix,
- int program_version)
-{
-#if defined(PLATFORM_UNIX)
- program.userdata_directory = unix_userdata_directory;
-#else
- program.userdata_directory = "userdata";
-#endif
-
- program.program_title = program_title;
- program.window_title = window_title;
- program.icon_title = icon_title;
- program.x11_icon_filename = x11_icon_filename;
- program.x11_iconmask_filename = x11_iconmask_filename;
- program.msdos_pointer_filename = msdos_pointer_filename;
-
- program.cookie_prefix = cookie_prefix;
- program.filename_prefix = filename_prefix;
-
- program.version_major = VERSION_MAJOR(program_version);
- program.version_minor = VERSION_MINOR(program_version);
- program.version_patch = VERSION_PATCH(program_version);
-}
-
void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
int real_sx, int real_sy,
- int full_sxsize, int full_sysize)
+ int full_sxsize, int full_sysize,
+ Bitmap *field_save_buffer)
{
gfx.sx = sx;
gfx.sy = sy;
gfx.full_sxsize = full_sxsize;
gfx.full_sysize = full_sysize;
+ gfx.field_save_buffer = field_save_buffer;
+
gfx.background_bitmap = NULL;
gfx.background_bitmap_mask = REDRAW_NONE;
return (depth == DEFAULT_DEPTH ? video.default_depth : depth);
}
+inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
+ int width, int height, Pixel color)
+{
+#ifdef TARGET_SDL
+ SDLFillRectangle(bitmap, x, y, width, height, color);
+#else
+ X11FillRectangle(bitmap, x, y, width, height, color);
+#endif
+}
+
+inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+ int src_x, int src_y, int width, int height,
+ int dst_x, int dst_y, int mask_mode)
+{
+#ifdef TARGET_SDL
+ SDLCopyArea(src_bitmap, dst_bitmap,
+ src_x, src_y, width, height, dst_x, dst_y, mask_mode);
+#else
+ X11CopyArea(src_bitmap, dst_bitmap,
+ src_x, src_y, width, height, dst_x, dst_y, mask_mode);
+#endif
+}
+
inline void InitVideoDisplay(void)
{
#if defined(TARGET_SDL)
#if defined(TARGET_SDL)
SDL_QuitSubSystem(SDL_INIT_VIDEO);
#else
-
if (display)
XCloseDisplay(display);
#endif
int real_depth = GetRealDepth(depth);
#ifdef TARGET_SDL
- SDL_Surface *surface_tmp, *surface_native;
-
- if ((surface_tmp = SDL_CreateRGBSurface(SURFACE_FLAGS, width, height,
- real_depth, 0, 0, 0, 0))
- == NULL)
- Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
- if ((surface_native = SDL_DisplayFormat(surface_tmp)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-
- SDL_FreeSurface(surface_tmp);
-
- new_bitmap->surface = surface_native;
+ SDLCreateBitmapContent(new_bitmap, width, height, real_depth);
#else
- Pixmap pixmap;
-
- if ((pixmap = XCreatePixmap(display, window->drawable,
- width, height, real_depth))
- == None)
- Error(ERR_EXIT, "cannot create pixmap");
-
- new_bitmap->drawable = pixmap;
-
- if (window == NULL)
- Error(ERR_EXIT, "Window GC needed for Bitmap -- create Window first");
-
- new_bitmap->gc = window->gc;
-
- new_bitmap->line_gc[0] = window->line_gc[0];
- new_bitmap->line_gc[1] = window->line_gc[1];
+ X11CreateBitmapContent(new_bitmap, width, height, real_depth);
#endif
new_bitmap->width = width;
return;
#ifdef TARGET_SDL
- if (bitmap->surface)
- SDL_FreeSurface(bitmap->surface);
- if (bitmap->surface_masked)
- SDL_FreeSurface(bitmap->surface_masked);
- bitmap->surface = NULL;
- bitmap->surface_masked = NULL;
+ SDLFreeBitmapPointers(bitmap);
#else
- /* The X11 version seems to have a memory leak here -- although
- "XFreePixmap()" is called, the corresponding 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;
+ X11FreeBitmapPointers(bitmap);
#endif
if (bitmap->source_filename)
}
inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- int src_x, int src_y,
- int width, int height,
+ int src_x, int src_y, int width, int height,
int dst_x, int dst_y)
{
if (DrawingDeactivated(dst_x, dst_y, width, height))
return;
-#ifdef TARGET_SDL
- SDLCopyArea(src_bitmap, dst_bitmap,
- src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_OPAQUE);
-#else
- XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable,
- dst_bitmap->gc, src_x, src_y, width, height, dst_x, dst_y);
-#endif
+ sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
+ dst_x, dst_y, BLIT_OPAQUE);
}
-inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
+inline void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height,
+ Pixel color)
{
if (DrawingDeactivated(x, y, width, height))
return;
-#ifdef TARGET_SDL
- SDLFillRectangle(bitmap, x, y, width, height, 0x000000);
-#else
- XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height);
-#endif
+ sysFillRectangle(bitmap, x, y, width, height, color);
+}
+
+inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
+{
+ FillRectangle(bitmap, x, y, width, height, BLACK_PIXEL);
}
inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y,
if (DrawingDeactivated(dst_x, dst_y, width, height))
return;
-#ifdef TARGET_SDL
- SDLCopyArea(src_bitmap, dst_bitmap,
- src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_MASKED);
-#else
- XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable,
- src_bitmap->clip_gc, src_x, src_y, width, height, dst_x, dst_y);
-#endif
+ sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
+ dst_x, dst_y, BLIT_MASKED);
}
inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap,
int to_x, int to_y)
{
#ifdef TARGET_SDL
- SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff);
+ SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
#else
- XSetForeground(display, bitmap->gc, WhitePixel(display, screen));
- XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y);
- XSetForeground(display, bitmap->gc, BlackPixel(display, screen));
+ X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL);
#endif
}
XSetForeground(display, bitmap->line_gc[1], pixel);
XDrawLines(display, bitmap->drawable, bitmap->line_gc[1],
(XPoint *)points, num_points, CoordModeOrigin);
- /*
- XSetForeground(display, gc, BlackPixel(display, screen));
- */
#endif
}
#elif defined(TARGET_ALLEGRO)
return AllegroGetPixel(bitmap->drawable, x, y);
#else
- unsigned long pixel_value;
- XImage *pixel_image;
-
- pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1,
- AllPlanes, ZPixmap);
- pixel_value = XGetPixel(pixel_image, 0, 0);
-
- XDestroyImage(pixel_image);
-
- return pixel_value;
+ return X11GetPixel(bitmap, x, y);
#endif
}
inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
unsigned int color_g, unsigned int color_b)
{
- Pixel pixel;
-
#if defined(TARGET_SDL)
- pixel = SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b);
+ return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b);
#elif defined(TARGET_ALLEGRO)
- pixel = AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8);
-#elif defined(TARGET_X11_NATIVE)
- XColor xcolor;
-
- xcolor.flags = DoRed | DoGreen | DoBlue;
- xcolor.red = (color_r << 8);
- xcolor.green = (color_g << 8);
- xcolor.blue = (color_b << 8);
- XAllocColor(display, cmap, &xcolor);
- pixel = xcolor.pixel;
+ return AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8);
+#else
+ return X11GetPixelFromRGB(color_r, color_g, color_b);
#endif
-
- return pixel;
}
inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
projects / rocksndiamonds.git / blobdiff