X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=d8e5186398c603e502c12190793d7bfddba10964;hb=3d52a86d358f5b1a4b36b80df5d659bce1f5a3a6;hp=7d45a493a28b771e3a4c6bb3dc1183b92aa9d7b2;hpb=7891415ca10eb882506eaaa3bca720ec75723a0e;p=rocksndiamonds.git

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 7d45a493..d8e51863 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment                      *
+* (c) 1994-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -232,6 +232,21 @@ 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)
+  AllegroZoomBitmap(src_bitmap->drawable, dst_bitmap->drawable,
+		    src_bitmap->width, src_bitmap->height,
+		    dst_bitmap->width, dst_bitmap->height);
+#else
+  X11NativeZoomBitmap(src_bitmap, dst_bitmap);
+#endif
+}
+
 static void SetImageDimensions(Bitmap *bitmap)
 {
 #if defined(TARGET_ALLEGRO)
@@ -254,6 +269,8 @@ Bitmap *X11LoadImage(char *filename)
   Bitmap *new_bitmap = CreateBitmapStruct();
   char *error = "Read_PCX_to_Pixmap(): %s '%s'";
   int pcx_err;
+  XGCValues clip_gc_values;
+  unsigned long clip_gc_valuemask;
 
   pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename,
 			       &new_bitmap->drawable, &new_bitmap->clip_mask);
@@ -296,6 +313,12 @@ Bitmap *X11LoadImage(char *filename)
     return NULL;
   }
 
+  clip_gc_values.graphics_exposures = False;
+  clip_gc_values.clip_mask = new_bitmap->clip_mask;
+  clip_gc_valuemask = GCGraphicsExposures | GCClipMask;
+  new_bitmap->stored_clip_gc = XCreateGC(display, window->drawable,
+					 clip_gc_valuemask, &clip_gc_values);
+
   /* set GraphicContext inheritated from Window */
   new_bitmap->gc = window->gc;