rnd-20060819-3-src

[rocksndiamonds.git] / src / libgame / x11.c

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 2a21abcc89af91b55eb78c2c134cb0d1042bb5d6..a9f2343101993f08c5473efc9e4336ebf674a5c7 100644 (file)
--- 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,
@@ -328,8 +307,8 @@ Bitmap *X11LoadImage(char *filename)
   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;
 
@@ -348,7 +327,7 @@ inline void X11CreateBitmapContent(Bitmap *new_bitmap,
   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
@@ -367,30 +346,43 @@ inline void X11FreeBitmapPointers(Bitmap *bitmap)
   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)
+{
+  /* fading currently not supported -- simply copy backbuffer to screen */
+
+  if (fade_mode == FADE_MODE_FADE_OUT)
+    X11FillRectangle(window, x, y, width, height, BLACK_PIXEL);
+  else
+    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);
 }
 
-inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
+Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
 {
   XImage *pixel_image;
   Pixel pixel_value;
@@ -405,8 +397,8 @@ inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
 }
 
 #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;
@@ -423,14 +415,16 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
 }
 #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 */
   if (ximage->data != NULL)
   {
     free(ximage->data);
     ximage->data = NULL;
   }
+#endif /* TARGET_X11_NATIVE */
 
   XDestroyImage(ximage);
 }