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

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index fef8bcf9..7d33a623 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -1,23 +1,24 @@
 /***********************************************************
-*  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 "misc.h"
+
 
 #if defined(TARGET_X11)
 
 static void X11InitDisplay();
-static DrawWindow X11InitWindow();
+static DrawWindow *X11InitWindow();
 
 inline void X11InitVideoDisplay(void)
 {
@@ -28,7 +29,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 +86,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;
@@ -110,6 +111,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)
@@ -212,6 +214,23 @@ 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;
 }