X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=680ff2d51ff568024693f9b53c4b4ab5536e3d42;hb=e4bf86b0ac3fd50612eee1439beba2fbaaa7cd09;hp=119bf479bb7a55c3061e27b31a990aa746f1c908;hpb=078d932701464a5152c3889007e5818f87f609c7;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 119bf479..680ff2d5 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -36,7 +36,6 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; -struct AnimInfo anim; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; @@ -67,10 +66,31 @@ int FrameCounter = 0; /* 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)) @@ -91,13 +111,6 @@ void InitPlatformDependantStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; -#endif - -#if !defined(PLATFORM_UNIX) - program.userdata_directory = "userdata"; -#endif - -#if defined(PLATFORM_MSDOS) initErrorFile(); #endif @@ -114,37 +127,10 @@ void ClosePlatformDependantStuff(void) #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; @@ -155,6 +141,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, 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; @@ -284,6 +272,29 @@ inline static int GetRealDepth(int depth) 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) @@ -478,32 +489,28 @@ inline boolean DrawingOnBackground(int x, int y) } 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, BlackPixel(display, screen)); } inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, @@ -557,13 +564,8 @@ inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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, @@ -571,7 +573,7 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, int width, int height, int dst_x, int dst_y) { - if (DrawingOnBackground(src_x, src_y)) + if (DrawingOnBackground(dst_x, dst_y)) { /* draw background */ BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, @@ -596,7 +598,6 @@ inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, #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)); #endif } @@ -649,9 +650,6 @@ inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, 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 } @@ -662,40 +660,20 @@ inline Pixel GetPixel(Bitmap *bitmap, int x, int y) #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)