/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment *
+* (c) 1994-2006 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
static void X11InitDisplay();
static DrawWindow *X11InitWindow();
-inline void X11InitVideoDisplay(void)
+void X11InitVideoDisplay(void)
{
/* initialize X11 video */
X11InitDisplay();
video.default_depth = XDefaultDepth(display, screen);
}
-inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
+void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
{
*window = X11InitWindow();
return new_bitmap;
}
-inline void X11CreateBitmapContent(Bitmap *new_bitmap,
- int width, int height, int depth)
+void X11CreateBitmapContent(Bitmap *new_bitmap,
+ int width, int height, int depth)
{
Pixmap pixmap;
new_bitmap->line_gc[1] = window->line_gc[1];
}
-inline void X11FreeBitmapPointers(Bitmap *bitmap)
+void X11FreeBitmapPointers(Bitmap *bitmap)
{
/* The X11 version seems to have a memory leak here -- although
"XFreePixmap()" is called, the corresponding memory seems not
bitmap->stored_clip_gc = None;
}
-inline 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)
+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);
}
-inline void X11FillRectangle(Bitmap *bitmap, int x, int y,
- int width, int height, Pixel color)
+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);
}
-inline void X11DrawSimpleLine(Bitmap *bitmap, int from_x, int from_y,
- int to_x, int to_y, Pixel color)
+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, x, y, 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);
}
-inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
+Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
{
XImage *pixel_image;
Pixel pixel_value;
}
#if defined(TARGET_X11_NATIVE)
-inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
- unsigned int color_b)
+Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
+ unsigned int color_b)
{
XColor xcolor;
Pixel pixel;
}
#endif /* TARGET_X11_NATIVE */
-inline void X11DestroyImage(XImage *ximage)
+void X11DestroyImage(XImage *ximage)
{
#if defined(TARGET_X11_NATIVE)
/* this seems to be needed for OS/2, but does not hurt on other platforms */