X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=d8356fbb63b658031f46a5a97032cea6e06c33f1;hb=72d9100181f212718c4cd0a6863ef3adaa8e1950;hp=fef8bcf9ed2e74590ac69efa2bc97bde04f0fef8;hpb=94b124e87edbd2e12d7b83f45254fcbfff8554cd;p=rocksndiamonds.git

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index fef8bcf9..d8356fbb 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,23 +1,25 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+* (c) 1994-2000 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  x11.c                                                   *
+* x11.c                                                    *
 ***********************************************************/
 
-#include "libgame.h"
+#include "system.h"
+#include "pcx.h"
+#include "misc.h"
+
 
 #if defined(TARGET_X11)
 
 static void X11InitDisplay();
-static DrawWindow X11InitWindow();
+static DrawWindow *X11InitWindow();
 
 inline void X11InitVideoDisplay(void)
 {
@@ -28,7 +30,7 @@ inline void X11InitVideoDisplay(void)
   video.default_depth = XDefaultDepth(display, screen);
 }
 
-inline void X11InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window)
+inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
 {
   *window = X11InitWindow();
 
@@ -85,9 +87,9 @@ static void X11InitDisplay()
 #endif /* !PLATFORM_MSDOS */
 }
 
-static DrawWindow X11InitWindow()
+static DrawWindow *X11InitWindow()
 {
-  DrawWindow new_window = CreateBitmapStruct();
+  DrawWindow *new_window = CreateBitmapStruct();
   unsigned int border_width = 4;
   XGCValues gc_values;
   unsigned long gc_valuemask;
@@ -96,7 +98,9 @@ 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;
@@ -110,6 +114,7 @@ static DrawWindow X11InitWindow()
   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)
@@ -145,22 +150,24 @@ static DrawWindow X11InitWindow()
 	  options.ro_base_directory, GRAPHICS_DIRECTORY,
 	  icon_pic.picture_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_icon_filename,
-		  &icon_width, &icon_height,
-		  &icon_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!icon_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+		      program.x11_icon_filename,
+		      &icon_width, &icon_height, &icon_pixmap,
+		      &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+	  program.x11_icon_filename);
 
 #if 0
   sprintf(icon_filename, "%s/%s/%s",
 	  options.ro_base_directory, GRAPHICS_DIRECTORY,
 	  icon_pic.picturemask_filename);
 #endif
-  XReadBitmapFile(display, new_window->drawable, program.x11_iconmask_filename,
-		  &icon_width, &icon_height,
-		  &iconmask_pixmap, &icon_hot_x, &icon_hot_y);
-  if (!iconmask_pixmap)
-    Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
+  if (XReadBitmapFile(display, new_window->drawable,
+		      program.x11_iconmask_filename,
+		      &icon_width, &icon_height, &iconmask_pixmap,
+		      &icon_hot_x, &icon_hot_y) != BitmapSuccess)
+    Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
+	  program.x11_iconmask_filename);
 
   size_hints.width  = size_hints.min_width  = size_hints.max_width  = width;
   size_hints.height = size_hints.min_height = size_hints.max_height = height;
@@ -212,7 +219,65 @@ static DrawWindow X11InitWindow()
   new_window->gc =
     XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
 
+  /* create GCs for line drawing (black and white) */
+  for(i=0; i<2; i++)
+  {
+    gc_values.graphics_exposures = False;
+    gc_values.foreground = (i ? pen_fg : pen_bg);
+    gc_values.background = pen_bg;
+    gc_values.line_width = 4;
+    gc_values.line_style = LineSolid;
+    gc_values.cap_style = CapRound;
+    gc_values.join_style = JoinRound;
+
+    gc_valuemask = GCGraphicsExposures | GCForeground | GCBackground |
+                   GCLineWidth | GCLineStyle | GCCapStyle | GCJoinStyle;
+    new_window->line_gc[i] =
+      XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
+  }
+
   return new_window;
 }
 
+Bitmap *X11LoadImage(char *filename)
+{
+  Bitmap *new_bitmap = CreateBitmapStruct();
+  int pcx_err;
+
+#if defined(PLATFORM_MSDOS)
+  rest(100);
+#endif
+
+  pcx_err = Read_PCX_to_Pixmap(display, window->drawable, window->gc, filename,
+			       &new_bitmap->drawable, &new_bitmap->clip_mask);
+  switch(pcx_err)
+  {
+    case PCX_Success:
+      break;
+    case PCX_OpenFailed:
+      Error(ERR_EXIT, "cannot open PCX file '%s'", filename);
+    case PCX_ReadFailed:
+      Error(ERR_EXIT, "cannot read PCX file '%s'", filename);
+    case PCX_FileInvalid:
+      Error(ERR_EXIT, "invalid PCX file '%s'", filename);
+    case PCX_NoMemory:
+      Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename);
+    case PCX_ColorFailed:
+      Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename);
+    default:
+      break;
+  }
+
+  if (!new_bitmap->drawable)
+    Error(ERR_EXIT, "cannot get graphics for '%s'", filename);
+
+  if (!new_bitmap->clip_mask)
+    Error(ERR_EXIT, "cannot get clipmask for '%s'", filename);
+
+  /* set GraphicContext inheritated from Window */
+  new_bitmap->gc = window->gc;
+
+  return new_bitmap;
+}
+
 #endif /* TARGET_X11 */