X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=45fb77c1e86471cc7861b27ec3af6ab88b045770;hb=de8b3ae622eae10f1caf96872fb1790f7bd9644b;hp=680ff2d51ff568024693f9b53c4b4ab5536e3d42;hpb=e4bf86b0ac3fd50612eee1439beba2fbaaa7cd09;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 680ff2d5..45fb77c1 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -70,7 +70,7 @@ 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 *msdos_cursor_filename, char *cookie_prefix, char *filename_prefix, int program_version) { @@ -83,7 +83,7 @@ void InitProgramInfo(char *argv0, 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.msdos_cursor_filename = msdos_cursor_filename; program.cookie_prefix = cookie_prefix; program.filename_prefix = filename_prefix; @@ -275,7 +275,7 @@ inline static int GetRealDepth(int depth) inline static void sysFillRectangle(Bitmap *bitmap, int x, int y, int width, int height, Pixel color) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLFillRectangle(bitmap, x, y, width, height, color); #else X11FillRectangle(bitmap, x, y, width, height, color); @@ -286,12 +286,12 @@ 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); +#if defined(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); + X11CopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y, mask_mode); #endif } @@ -311,7 +311,6 @@ inline void CloseVideoDisplay(void) #if defined(TARGET_SDL) SDL_QuitSubSystem(SDL_INIT_VIDEO); #else - if (display) XCloseDisplay(display); #endif @@ -327,7 +326,7 @@ inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, video.fullscreen_available = FULLSCREEN_STATUS; video.fullscreen_enabled = FALSE; -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLInitVideoBuffer(backbuffer, window, fullscreen); #else X11InitVideoBuffer(backbuffer, window); @@ -336,7 +335,7 @@ inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, inline Bitmap *CreateBitmapStruct(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return checked_calloc(sizeof(struct SDLSurfaceInfo)); #else return checked_calloc(sizeof(struct X11DrawableInfo)); @@ -348,37 +347,10 @@ inline Bitmap *CreateBitmap(int width, int height, int depth) Bitmap *new_bitmap = CreateBitmapStruct(); 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; +#if defined(TARGET_SDL) + 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; @@ -392,29 +364,10 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) if (bitmap == NULL) 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; +#if defined(TARGET_SDL) + 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) @@ -445,7 +398,7 @@ inline void FreeBitmap(Bitmap *bitmap) inline void CloseWindow(DrawWindow *window) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (window->drawable) { XUnmapWindow(display, window->drawable); @@ -510,7 +463,7 @@ inline void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height, inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) { - FillRectangle(bitmap, x, y, width, height, BlackPixel(display, screen)); + FillRectangle(bitmap, x, y, width, height, BLACK_PIXEL); } inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, @@ -530,7 +483,7 @@ static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (clip_gc) { bitmap->clip_gc = clip_gc; @@ -544,7 +497,7 @@ inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) { -#ifdef TARGET_X11 +#if defined(TARGET_X11) if (clip_gc) { bitmap->clip_gc = clip_gc; @@ -593,11 +546,10 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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); +#if defined(TARGET_SDL) + 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); + X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); #endif } @@ -655,6 +607,10 @@ inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, inline Pixel GetPixel(Bitmap *bitmap, int x, int y) { + if (x < 0 || x >= bitmap->width || + y < 0 || y >= bitmap->height) + return BLACK_PIXEL; + #if defined(TARGET_SDL) return SDLGetPixel(bitmap, x, y); #elif defined(TARGET_ALLEGRO) @@ -703,7 +659,7 @@ inline void SyncDisplay(void) inline void KeyboardAutoRepeatOn(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); @@ -715,7 +671,7 @@ inline void KeyboardAutoRepeatOn(void) inline void KeyboardAutoRepeatOff(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); #else @@ -726,7 +682,7 @@ inline void KeyboardAutoRepeatOff(void) inline boolean PointerInWindow(DrawWindow *window) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return TRUE; #else Window root, child; @@ -743,7 +699,7 @@ inline boolean PointerInWindow(DrawWindow *window) inline boolean SetVideoMode(boolean fullscreen) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return SDLSetVideoMode(&backbuffer, fullscreen); #else boolean success = TRUE; @@ -764,7 +720,7 @@ inline boolean SetVideoMode(boolean fullscreen) inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)|| (!fullscreen && video.fullscreen_enabled)) fullscreen = SetVideoMode(fullscreen); @@ -881,7 +837,7 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) FreeBitmap(tmp_bitmap_2); FreeBitmap(tmp_bitmap_8); -#ifdef TARGET_SDL +#if defined(TARGET_SDL) src_bitmap->surface = tmp_bitmap->surface; tmp_bitmap->surface = NULL; #else @@ -895,6 +851,119 @@ void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) } +/* ------------------------------------------------------------------------- */ +/* mouse pointer functions */ +/* ------------------------------------------------------------------------- */ + +/* cursor bitmap in XPM format */ +static const char *cursor_image_playfield[] = +{ + /* width height num_colors chars_per_pixel */ + " 32 32 3 1", + + /* colors */ + "X c #000000", + ". c #ffffff", + " c None", + + " X ", + "X.X ", + " X ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + "1,1" +}; + +static struct MouseCursorInfo *get_cursor_from_image(const char **image) +{ + struct MouseCursorInfo *cursor; + int row, col, i; + + cursor = checked_calloc(sizeof(struct MouseCursorInfo)); + + i = -1; + for (row=0; row<32; ++row) + { + for (col=0; col<32; ++col) + { + if (col % 8) + { + cursor->data[i] <<= 1; + cursor->mask[i] <<= 1; + } + else + { + i++; + cursor->data[i] = cursor->mask[i] = 0; + } + + switch (image[4+row][col]) + { + case 'X': + cursor->data[i] |= 0x01; + cursor->mask[i] |= 0x01; + break; + + case '.': + cursor->mask[i] |= 0x01; + break; + + case ' ': + break; + } + } + } + + sscanf(image[4+row], "%d,%d", &cursor->hot_x, &cursor->hot_y); + + cursor->width = 32; + cursor->height = 32; + + return cursor; +} + +void SetMouseCursor(int mode) +{ + struct MouseCursorInfo *cursor_playfield = NULL; + + if (cursor_playfield == NULL) + cursor_playfield = get_cursor_from_image(cursor_image_playfield); + +#if defined(TARGET_SDL) + SDLSetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); +#elif defined(TARGET_X11_NATIVE) + X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); +#endif +} + + /* ========================================================================= */ /* audio functions */ /* ========================================================================= */ @@ -955,7 +1024,7 @@ inline void SetAudioMode(boolean enabled) inline void InitEventFilter(EventFilter filter_function) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) /* set event filter to filter out certain events */ SDL_SetEventFilter(filter_function); #endif @@ -963,7 +1032,7 @@ inline void InitEventFilter(EventFilter filter_function) inline boolean PendingEvent(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) return (SDL_PollEvent(NULL) ? TRUE : FALSE); #else return (XPending(display) ? TRUE : FALSE); @@ -972,7 +1041,7 @@ inline boolean PendingEvent(void) inline void NextEvent(Event *event) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SDLNextEvent(event); #else XNextEvent(display, event); @@ -981,7 +1050,7 @@ inline void NextEvent(Event *event) inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL) #if 0 printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", (int)event->keysym.unicode, @@ -1034,7 +1103,7 @@ inline void InitJoysticks() { int i; -#ifdef NO_JOYSTICK +#if defined(NO_JOYSTICK) return; /* joysticks generally deactivated by compile-time directive */ #endif