X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=2bbf76d558e01c1761c82734dd1acdb9ad3edef3;hb=8b04d496646e102dd15710ba091e2f37cadcec5e;hp=d8e5186398c603e502c12190793d7bfddba10964;hpb=3d52a86d358f5b1a4b36b80df5d659bce1f5a3a6;p=rocksndiamonds.git diff --git a/src/libgame/x11.c b/src/libgame/x11.c index d8e51863..2bbf76d5 100644 --- a/src/libgame/x11.c +++ b/src/libgame/x11.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -22,7 +22,7 @@ static void X11InitDisplay(); static DrawWindow *X11InitWindow(); -inline void X11InitVideoDisplay(void) +void X11InitVideoDisplay(void) { /* initialize X11 video */ X11InitDisplay(); @@ -31,7 +31,7 @@ inline void X11InitVideoDisplay(void) video.default_depth = XDefaultDepth(display, screen); } -inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window) +void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window) { *window = X11InitWindow(); @@ -93,9 +93,6 @@ static DrawWindow *X11InitWindow() Pixmap icon_pixmap, iconmask_pixmap; unsigned int icon_width, icon_height; int icon_hot_x, icon_hot_y; -#if 0 - char icon_filename[256]; -#endif XSizeHints size_hints; XWMHints wm_hints; XClassHint class_hints; @@ -106,21 +103,11 @@ static DrawWindow *X11InitWindow() #endif int screen_width, screen_height; int win_xpos, win_ypos; - unsigned long pen_fg = WhitePixel(display,screen); - unsigned long pen_bg = BlackPixel(display,screen); + unsigned long pen_fg = WhitePixel(display, screen); + unsigned long pen_bg = BlackPixel(display, screen); const int width = video.width, height = video.height; int i; -#if 0 -#if !defined(PLATFORM_MSDOS) - static struct IconFileInfo icon_pic = - { - "rocks_icon.xbm", - "rocks_iconmask.xbm" - }; -#endif -#endif - screen_width = XDisplayWidth(display, screen); screen_height = XDisplayHeight(display, screen); @@ -140,10 +127,6 @@ static DrawWindow *X11InitWindow() XChangeProperty(display, new_window->drawable, proto_atom, XA_ATOM, 32, PropModePrepend, (unsigned char *) &delete_atom, 1); -#if 0 - sprintf(icon_filename, "%s/%s", options.graphics_directory, - icon_pic.picture_filename); -#endif if (XReadBitmapFile(display, new_window->drawable, getCustomImageFilename(program.x11_icon_filename), &icon_width, &icon_height, &icon_pixmap, @@ -151,10 +134,6 @@ static DrawWindow *X11InitWindow() Error(ERR_EXIT, "cannot read icon bitmap file '%s'", program.x11_icon_filename); -#if 0 - sprintf(icon_filename, "%s/%s", options.graphics_directory, - icon_pic.picturemask_filename); -#endif if (XReadBitmapFile(display, new_window->drawable, getCustomImageFilename(program.x11_iconmask_filename), &icon_width, &icon_height, &iconmask_pixmap, @@ -198,8 +177,9 @@ static DrawWindow *X11InitWindow() /* Select event types wanted */ window_event_mask = ExposureMask | StructureNotifyMask | FocusChangeMask | - ButtonPressMask | ButtonReleaseMask | PointerMotionMask | - PointerMotionHintMask | KeyPressMask | KeyReleaseMask; + ButtonPressMask | ButtonReleaseMask | + PointerMotionMask | PointerMotionHintMask | + KeyPressMask | KeyReleaseMask; XSelectInput(display, new_window->drawable, window_event_mask); #endif @@ -213,7 +193,7 @@ static DrawWindow *X11InitWindow() XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values); /* create GCs for line drawing (black and white) */ - for(i=0; i<2; i++) + for (i = 0; i < 2; i++) { gc_values.graphics_exposures = False; gc_values.foreground = (i ? pen_fg : pen_bg); @@ -232,10 +212,6 @@ static DrawWindow *X11InitWindow() return new_window; } -inline void X11NativeZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap) -{ -} - void X11ZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap) { #if defined(TARGET_ALLEGRO) @@ -243,7 +219,10 @@ void X11ZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap) src_bitmap->width, src_bitmap->height, dst_bitmap->width, dst_bitmap->height); #else - X11NativeZoomBitmap(src_bitmap, dst_bitmap); + ZoomPixmap(display, src_bitmap->gc, + src_bitmap->drawable, dst_bitmap->drawable, + src_bitmap->width, src_bitmap->height, + dst_bitmap->width, dst_bitmap->height); #endif } @@ -328,4 +307,180 @@ Bitmap *X11LoadImage(char *filename) return new_bitmap; } +void X11CreateBitmapContent(Bitmap *new_bitmap, + int width, int height, int depth) +{ + Pixmap pixmap; + + if ((pixmap = XCreatePixmap(display, window->drawable, width, height, 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]; +} + +void X11FreeBitmapPointers(Bitmap *bitmap) +{ + /* 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; +} + +void X11CopyArea(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) +{ + XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, + (mask_mode == BLIT_MASKED ? src_bitmap->clip_gc : dst_bitmap->gc), + src_x, src_y, width, height, dst_x, dst_y); +} + +void X11FillRectangle(Bitmap *bitmap, int x, int y, + int width, int height, Pixel color) +{ + XSetForeground(display, bitmap->gc, color); + XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height); +} + +void X11FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, + int fade_mode, int fade_delay, int post_delay, + void (*draw_border_function)(void)) +{ + /* fading currently not supported -- simply copy backbuffer to screen */ + + if (fade_mode == FADE_MODE_FADE_OUT) + X11FillRectangle(backbuffer, x, y, width, height, BLACK_PIXEL); + + if (draw_border_function != NULL) + draw_border_function(); + + X11CopyArea(backbuffer, window, x, y, width, height, 0, 0, BLIT_OPAQUE); + + /* as we currently cannot use the fade delay, also do not use post delay */ +} + +void X11DrawSimpleLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y, Pixel color) +{ + XSetForeground(display, bitmap->gc, color); + XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y); +} + +Pixel X11GetPixel(Bitmap *bitmap, int x, int y) +{ + XImage *pixel_image; + Pixel pixel_value; + + pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1, + AllPlanes, ZPixmap); + pixel_value = XGetPixel(pixel_image, 0, 0); + + X11DestroyImage(pixel_image); + + return pixel_value; +} + +#if defined(TARGET_X11_NATIVE) +Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g, + unsigned int color_b) +{ + XColor xcolor; + Pixel pixel; + + 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 pixel; +} +#endif /* TARGET_X11_NATIVE */ + +void X11DestroyImage(XImage *ximage) +{ +#if defined(TARGET_X11_NATIVE) + /* this seems to be needed for OS/2, but does not hurt on other platforms */ + if (ximage->data != NULL) + { + free(ximage->data); + ximage->data = NULL; + } +#endif /* TARGET_X11_NATIVE */ + + XDestroyImage(ximage); +} + + +/* ------------------------------------------------------------------------- */ +/* mouse pointer functions */ +/* ------------------------------------------------------------------------- */ + +#if defined(TARGET_X11_NATIVE) + +static Cursor create_cursor(struct MouseCursorInfo *cursor_info) +{ + Pixmap pixmap_data, pixmap_mask; + XColor color_fg, color_bg; + Cursor cursor; + + /* shape and mask are single plane pixmaps */ + pixmap_data = + XCreatePixmapFromBitmapData(display, window->drawable, cursor_info->data, + cursor_info->width, cursor_info->height, + 1, 0, 1); + pixmap_mask = + XCreatePixmapFromBitmapData(display, window->drawable, cursor_info->mask, + cursor_info->width, cursor_info->height, + 1, 0, 1); + + XParseColor(display, cmap, "black", &color_fg); + XParseColor(display, cmap, "white", &color_bg); + + cursor = XCreatePixmapCursor(display, pixmap_data, pixmap_mask, + &color_fg, &color_bg, + cursor_info->hot_x, cursor_info->hot_y); + + return cursor; +} + +void X11SetMouseCursor(struct MouseCursorInfo *cursor_info) +{ + static struct MouseCursorInfo *last_cursor_info = NULL; + static Cursor cursor_default = None; + static Cursor cursor_current = None; + + if (cursor_info != NULL && cursor_info != last_cursor_info) + { + cursor_current = create_cursor(cursor_info); + last_cursor_info = cursor_info; + } + + XDefineCursor(display, window->drawable, + cursor_info ? cursor_current : cursor_default); +} +#endif /* TARGET_X11_NATIVE */ + #endif /* TARGET_X11 */