X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=e1ac9ccc26659467c0490607596c87ed8e235ca2;hb=69e8efac8d856859c55237e085ff8b514ae1aa3c;hp=3d26c3ce336feade18cd77c86313cc2bcbea8622;hpb=222cd4187e6632bd904a937f167a2f1c70b8f66d;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 3d26c3ce..e1ac9ccc 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,33 +1,30 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Artsoft Retro-Game Library * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1994-2001 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* system.c * +* system.c * ***********************************************************/ -#include "libgame.h" +#include +#include -/* ========================================================================= */ -/* internal variables */ -/* ========================================================================= */ +#include "platform.h" -Display *display = NULL; -Visual *visual = NULL; -int screen = 0; -Colormap cmap = None; - -DrawWindow window = None; -DrawBuffer backbuffer = None; -GC gc = None; +#if defined(PLATFORM_MSDOS) +#include +#endif -int FrameCounter = 0; +#include "system.h" +#include "sound.h" +#include "setup.h" +#include "joystick.h" +#include "misc.h" /* ========================================================================= */ @@ -35,53 +32,189 @@ int FrameCounter = 0; /* ========================================================================= */ struct ProgramInfo program; +struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; -struct OptionInfo options; +struct GfxInfo gfx; +struct ArtworkInfo artwork; +struct JoystickInfo joystick; +struct SetupInfo setup; + +LevelDirTree *leveldir_first = NULL; +LevelDirTree *leveldir_current = NULL; +int level_nr; + +Display *display = NULL; +Visual *visual = NULL; +int screen = 0; +Colormap cmap = None; + +DrawWindow *window = NULL; +DrawBuffer *backbuffer = NULL; +DrawBuffer *drawto = NULL; + +int button_status = MB_NOT_PRESSED; +boolean motion_status = FALSE; + +int redraw_mask = REDRAW_NONE; +int redraw_tiles = 0; + +int FrameCounter = 0; /* ========================================================================= */ -/* video functions */ +/* init/close functions */ /* ========================================================================= */ -inline static int GetRealDepth(int depth) +void InitCommandName(char *argv0) { - return (depth == DEFAULT_DEPTH ? video.default_depth : depth); + program.command_basename = + (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0); } -inline void InitProgramInfo(char *command_name, char *program_title, - char *window_title, char *icon_title, - char *x11_icon_filename, - char *x11_iconmask_filename, - char *msdos_pointer_filename) +void InitExitFunction(void (*exit_function)(int)) { - program.command_name = command_name; + program.exit_function = exit_function; + + /* set signal handlers to custom exit function */ + signal(SIGINT, exit_function); + signal(SIGTERM, exit_function); + +#if defined(TARGET_SDL) + /* set exit function to automatically cleanup SDL stuff after exit() */ + atexit(SDL_Quit); +#endif +} + +void InitPlatformDependantStuff(void) +{ +#if defined(PLATFORM_MSDOS) + _fmode = O_BINARY; +#endif + +#if !defined(PLATFORM_UNIX) + program.userdata_directory = "userdata"; + initErrorFile(); +#endif + +#if defined(TARGET_SDL) + if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) + Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); +#endif +} + +void ClosePlatformDependantStuff(void) +{ +#if !defined(PLATFORM_UNIX) + dumpErrorFile(); +#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); } -inline void InitScrollbufferSize(int scrollbuffer_width, - int scrollbuffer_height) +void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, + int real_sx, int real_sy, + int full_sxsize, int full_sysize) +{ + gfx.sx = sx; + gfx.sy = sy; + gfx.sxsize = sxsize; + gfx.sysize = sysize; + gfx.real_sx = real_sx; + gfx.real_sy = real_sy; + gfx.full_sxsize = full_sxsize; + gfx.full_sysize = full_sysize; + + SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ +} + +void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize) +{ + gfx.dx = dx; + gfx.dy = dy; + gfx.dxsize = dxsize; + gfx.dysize = dysize; +} + +void InitGfxDoor2Info(int vx, int vy, int vxsize, int vysize) +{ + gfx.vx = vx; + gfx.vy = vy; + gfx.vxsize = vxsize; + gfx.vysize = vysize; +} + +void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) { /* currently only used by MSDOS code to alloc VRAM buffer, if available */ - video.scrollbuffer_width = scrollbuffer_width; - video.scrollbuffer_height = scrollbuffer_height; + gfx.scrollbuffer_width = scrollbuffer_width; + gfx.scrollbuffer_height = scrollbuffer_height; +} + +void SetDrawDeactivationMask(int draw_deactivation_mask) +{ + gfx.draw_deactivation_mask = draw_deactivation_mask; +} + + +/* ========================================================================= */ +/* video functions */ +/* ========================================================================= */ + +inline static int GetRealDepth(int depth) +{ + return (depth == DEFAULT_DEPTH ? video.default_depth : depth); } inline void InitVideoDisplay(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLInitVideoDisplay(); #else X11InitVideoDisplay(); #endif } -inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window, +inline void CloseVideoDisplay(void) +{ + KeyboardAutoRepeatOn(); + +#if defined(TARGET_SDL) + SDL_QuitSubSystem(SDL_INIT_VIDEO); +#else + + if (display) + XCloseDisplay(display); +#endif +} + +inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, int width, int height, int depth, boolean fullscreen) { @@ -98,8 +231,18 @@ inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window, #endif } -inline Bitmap CreateBitmap(int width, int height, int depth) +inline Bitmap *CreateBitmapStruct(void) { +#ifdef TARGET_SDL + return checked_calloc(sizeof(struct SDLSurfaceInfo)); +#else + return checked_calloc(sizeof(struct X11DrawableInfo)); +#endif +} + +inline Bitmap *CreateBitmap(int width, int height, int depth) +{ + Bitmap *new_bitmap = CreateBitmapStruct(); int real_depth = GetRealDepth(depth); #ifdef TARGET_SDL @@ -115,95 +258,319 @@ inline Bitmap CreateBitmap(int width, int height, int depth) SDL_FreeSurface(surface_tmp); - return surface_native; + new_bitmap->surface = surface_native; #else Pixmap pixmap; - if (!(pixmap = XCreatePixmap(display, window, width, height, real_depth))) + if ((pixmap = XCreatePixmap(display, window->drawable, + width, height, real_depth)) + == None) Error(ERR_EXIT, "cannot create pixmap"); - return 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]; #endif + + return new_bitmap; } -inline void FreeBitmap(Bitmap bitmap) +inline static void FreeBitmapPointers(Bitmap *bitmap) { + if (bitmap == NULL) + return; + #ifdef TARGET_SDL - SDL_FreeSurface(bitmap); + if (bitmap->surface) + SDL_FreeSurface(bitmap->surface); + if (bitmap->surface_masked) + SDL_FreeSurface(bitmap->surface_masked); + bitmap->surface = NULL; + bitmap->surface_masked = NULL; #else - XFreePixmap(display, bitmap); + /* 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 void ClearRectangle(Bitmap bitmap, int x, int y, int width, int height) +inline static void TransferBitmapPointers(Bitmap *src_bitmap, + Bitmap *dst_bitmap) { -#ifdef TARGET_SDL - SDLFillRectangle(bitmap, x, y, width, height, 0x000000); -#else - XFillRectangle(display, bitmap, gc, x, y, width, height); + 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); +} + +inline void CloseWindow(DrawWindow *window) +{ +#ifdef TARGET_X11 + if (window->drawable) + { + XUnmapWindow(display, window->drawable); + XDestroyWindow(display, window->drawable); + } + if (window->gc) + XFreeGC(display, window->gc); #endif } -inline void BlitBitmap(Bitmap src_bitmap, Bitmap dst_bitmap, +inline boolean DrawingDeactivated(int x, int y, int width, int height) +{ + if (gfx.draw_deactivation_mask != REDRAW_NONE) + { + if ((gfx.draw_deactivation_mask & REDRAW_FIELD) && + x < gfx.sx + gfx.sxsize) + return TRUE; + else if ((gfx.draw_deactivation_mask & REDRAW_DOORS) && + x > gfx.dx) + { + if ((gfx.draw_deactivation_mask & REDRAW_DOOR_1) && + y < gfx.dy + gfx.dysize) + return TRUE; + else if ((gfx.draw_deactivation_mask & REDRAW_DOOR_2) && + y > gfx.vy) + return TRUE; + } + } + + return FALSE; +} + +inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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); + 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 +} + +inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) +{ + if (DrawingDeactivated(x, y, width, height)) + return; + +#ifdef TARGET_SDL + SDLFillRectangle(bitmap, x, y, width, height, 0x000000); #else - XCopyArea(display, src_bitmap, dst_bitmap, gc, - src_x, src_y, width, height, dst_x, dst_y); + XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height); #endif } +#if 0 #ifndef TARGET_SDL static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ #endif +#endif -inline void SetClipMask(GC clip_gc, Pixmap clip_pixmap) +inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) { -#ifndef TARGET_SDL - XSetClipMask(display, clip_gc, clip_pixmap); +#ifdef TARGET_X11 + if (clip_gc) + { + bitmap->clip_gc = clip_gc; + XSetClipMask(display, bitmap->clip_gc, clip_pixmap); + } +#if 0 last_clip_gc = clip_gc; #endif +#endif } -inline void SetClipOrigin(GC clip_gc, int clip_x, int clip_y) +inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) { -#ifndef TARGET_SDL - XSetClipOrigin(display, clip_gc, clip_x, clip_y); +#ifdef TARGET_X11 + if (clip_gc) + { + bitmap->clip_gc = clip_gc; + XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y); + } +#if 0 last_clip_gc = clip_gc; #endif +#endif } -inline void BlitBitmapMasked(Bitmap src_bitmap, Bitmap dst_bitmap, +inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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); + src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_MASKED); #else - XCopyArea(display, src_bitmap, dst_bitmap, last_clip_gc, - src_x, src_y, width, height, dst_x, dst_y); + XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, + src_bitmap->clip_gc, src_x, src_y, width, height, dst_x, dst_y); #endif } -inline void DrawSimpleWhiteLine(Bitmap bitmap, int from_x, int from_y, +inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, int to_x, int to_y) { #ifdef TARGET_SDL SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff); #else - XSetForeground(display, gc, WhitePixel(display, screen)); - XDrawLine(display, bitmap, gc, from_x, from_y, to_x, to_y); + 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 +} + +#if !defined(TARGET_X11_NATIVE) +inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y, Pixel pixel, int line_width) +{ + int x, y; + + for (x=0; xdrawable, from_x + dx, from_y + dy, + to_x + dx, to_y + dy, pixel); +#endif + } + } +} +#endif + +inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, + Pixel pixel) +{ +#if !defined(TARGET_X11_NATIVE) + int line_width = 4; + int i; + + for (i=0; isurface, points, num_points, pixel); + */ +#else + 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 } +inline Pixel GetPixel(Bitmap *bitmap, int x, int y) +{ +#if defined(TARGET_SDL) + return SDLGetPixel(bitmap, x, 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; +#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); +#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; +#endif + + return pixel; +} + +inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) +{ + unsigned int color_r = (color >> 16) & 0xff; + unsigned int color_g = (color >> 8) & 0xff; + unsigned int color_b = (color >> 0) & 0xff; + + return GetPixelFromRGB(bitmap, color_r, color_g, color_b); +} + /* execute all pending screen drawing operations */ inline void FlushDisplay(void) { @@ -227,7 +594,8 @@ inline void KeyboardAutoRepeatOn(void) SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); #else - XAutoRepeatOn(display); + if (display) + XAutoRepeatOn(display); #endif } @@ -237,24 +605,25 @@ inline void KeyboardAutoRepeatOff(void) SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); #else - XAutoRepeatOff(display); + if (display) + XAutoRepeatOff(display); #endif } -inline boolean PointerInWindow(DrawWindow window) +inline boolean PointerInWindow(DrawWindow *window) { #ifdef TARGET_SDL return TRUE; #else - DrawWindow root, child; + Window root, child; int root_x, root_y; unsigned int mask; int win_x, win_y; /* if XQueryPointer() returns False, the pointer is not on the same screen as the specified window */ - return XQueryPointer(display, window, &root, &child, &root_x, &root_y, - &win_x, &win_y, &mask); + return XQueryPointer(display, window->drawable, &root, &child, + &root_x, &root_y, &win_x, &win_y, &mask); #endif } @@ -290,51 +659,126 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) return fullscreen; } +Bitmap *LoadImage(char *filename) +{ + Bitmap *new_bitmap; -/* ========================================================================= */ -/* audio functions */ -/* ========================================================================= */ +#if defined(TARGET_SDL) + new_bitmap = SDLLoadImage(filename); +#else + new_bitmap = X11LoadImage(filename); +#endif + + new_bitmap->source_filename = getStringCopy(filename); + + return new_bitmap; +} -inline boolean OpenAudio(struct AudioSystemInfo *audio) +Bitmap *LoadCustomImage(char *basename) { - audio->sound_available = FALSE; - audio->loops_available = FALSE; - audio->soundserver_pipe[0] = audio->soundserver_pipe[1] = 0; - audio->soundserver_pid = 0; - audio->device_name = NULL; - audio->device_fd = 0; + char *filename = getCustomImageFilename(basename); + Bitmap *new_bitmap; -#if defined(TARGET_SDL) - if (SDLOpenAudio()) + 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()); + + return new_bitmap; +} + +void ReloadCustomImage(Bitmap *bitmap, char *basename) +{ + char *filename = getCustomImageFilename(basename); + Bitmap *new_bitmap; + + if (filename == NULL) /* (should never happen) */ { - audio->sound_available = TRUE; - audio->loops_available = TRUE; + Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", basename); + return; } -#elif defined(PLATFORM_MSDOS) - if (MSDOSOpenAudio()) + + if (strcmp(filename, bitmap->source_filename) == 0) { - audio->sound_available = TRUE; - audio->loops_available = TRUE; + /* 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 */ +/* ========================================================================= */ + +inline void OpenAudio(void) +{ + /* always start with reliable default values */ + audio.sound_available = FALSE; + audio.music_available = FALSE; + audio.loops_available = FALSE; + audio.mods_available = FALSE; + audio.sound_enabled = FALSE; + + audio.sound_deactivated = FALSE; + + audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0; + audio.soundserver_pid = -1; + audio.device_name = NULL; + audio.device_fd = 0; + + audio.channels = 0; + audio.music_channel = 0; + audio.music_nr = 0; + +#if defined(TARGET_SDL) + SDLOpenAudio(); #elif defined(PLATFORM_UNIX) - UnixOpenAudio(audio); + UnixOpenAudio(); +#elif defined(PLATFORM_MSDOS) + MSDOSOpenAudio(); #endif - - return audio->sound_available; } -inline void CloseAudio(struct AudioSystemInfo *audio) +inline void CloseAudio(void) { #if defined(TARGET_SDL) SDLCloseAudio(); +#elif defined(PLATFORM_UNIX) + UnixCloseAudio(); #elif defined(PLATFORM_MSDOS) MSDOSCloseAudio(); -#elif defined(PLATFORM_UNIX) - UnixCloseAudio(audio); #endif - audio->sound_available = FALSE; - audio->loops_available = FALSE; + audio.sound_enabled = FALSE; +} + +inline void SetAudioMode(boolean enabled) +{ + if (!audio.sound_available) + return; + + audio.sound_enabled = enabled; } @@ -362,7 +806,7 @@ inline boolean PendingEvent(void) inline void NextEvent(Event *event) { #ifdef TARGET_SDL - SDL_WaitEvent(event); + SDLNextEvent(event); #else XNextEvent(display, event); #endif @@ -404,7 +848,7 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) #if defined(TARGET_SDL) return TRUE; /* the only possible message here is SDL_QUIT */ #elif defined(PLATFORM_UNIX) - if ((event->window == window) && + if ((event->window == window->drawable) && (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE))) return TRUE; #endif @@ -413,9 +857,39 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) } -inline void dummy(void) +/* ========================================================================= */ +/* joystick functions */ +/* ========================================================================= */ + +inline void InitJoysticks() { -#ifdef TARGET_SDL -#else + int i; + +#ifdef NO_JOYSTICK + return; /* joysticks generally deactivated by compile-time directive */ +#endif + + /* always start with reliable default values */ + joystick.status = JOYSTICK_NOT_AVAILABLE; + for (i=0; i